Merge pull request #18 from aswanthabam/dev

fix : Login Button Label

src/apis/api.tsx

@@ -3,7 +3,7 @@ import axios, {
   AxiosResponse,
   InternalAxiosRequestConfig,
 } from "axios";
-import { _EventInfo } from "../types";
+import { _EventInfo } from "../utils/types";
 
 /* set the token */
 

src/apis/eventApi.tsx

@@ -1,4 +1,4 @@
-import { _EventInfo } from "../types";
+import { _EventInfo } from "../utils/types";
 import {
   ResponseStatus,
   ResponseType,

src/apis/userApi.tsx

@@ -1,4 +1,9 @@
-import { _UserDetails, _UserLogin, _UserStep1, _UserStep2 } from "../types";
+import {
+  _UserDetails,
+  _UserLogin,
+  _UserStep1,
+  _UserStep2,
+} from "../utils/types";
 import {
   LoginStatus,
   ResponseStatus,

src/components/buttons/LoginButton/LoginButton.module.css

@@ -3,24 +3,28 @@
   height: auto;
   padding: 10px 10px;
   align-items: center;
+  justify-content: center;
   border-radius: 30px;
   background: var(--color-orange);
 
   .icon {
     margin-right: 10px;
-
+    display: flex;
+    align-items: center;
     & img {
       width: 15px;
     }
   }
 
   .text {
-    color: var(--color-white);
-    font-family: Wallpoet;
-    font-size: 15px;
-    font-style: normal;
-    font-weight: 400;
-    line-height: normal;
+    & span {
+      color: var(--color-black);
+      /* font-family: Wallpoet; */
+      font-size: 17px;
+      font-style: normal;
+      font-weight: 400;
+      line-height: normal;
+    }
   }
 }
 

src/components/buttons/LoginButton/LoginButton.tsx

@@ -1,18 +1,25 @@
 import styles from "./LoginButton.module.css";
-import React from "react";
 import googleIcon from "../../../assets/google.png";
 
 interface LoginButtonProps {
   onClick: () => void;
+  text: String;
+  iconVisible: boolean;
 }
-const LoginButton: React.FC<LoginButtonProps> = ({ onClick }) => {
+const LoginButton: React.FC<LoginButtonProps> = ({
+  onClick,
+  text,
+  iconVisible,
+}) => {
   return (
     <div onClick={onClick} className={styles.loginButton}>
-      <div className={styles.icon}>
-        <img src={googleIcon} />
-      </div>
+      {iconVisible && (
+        <div className={styles.icon}>
+          <img src={googleIcon} />
+        </div>
+      )}
       <div className={styles.text}>
-        <span>Register</span>
+        <span>{text}</span>
       </div>
       {/* <div
         className="g_id_signin"

src/components/eventcard/EventCard.tsx

@@ -1,6 +1,6 @@
 import { Link } from "react-router-dom";
 import style from "./EventCard.module.css";
-import { _Event } from "../../types";
+import { _Event } from "../../utils/types";
 interface EventCardProps {
   event: _Event;
 }

src/components/eventlist/EventList.tsx

@@ -2,7 +2,7 @@ import style from "./EventList.module.css";
 import { useEffect, useState } from "react";
 import EventCard from "../eventcard/EventCard";
 import { getEvents } from "../../apis/eventApi";
-import { _Event } from "../../types";
+import { _Event } from "../../utils/types";
 import { useLoader } from "../toploader/useLoader";
 import { useToast } from "../toast/useToast";
 interface EventListProps {}

src/components/sidebar/Sidebar.tsx

@@ -1,5 +1,5 @@
 import style from "./Sidebar.module.css";
-import { _Event } from "../../types";
+import { _Event } from "../../utils/types";
 
 interface SidebarProps {
   state: boolean;

src/components/toast/Toast.tsx

@@ -1,5 +1,5 @@
 import style from "./Toast.module.css";
-import { _Event } from "../../types";
+import { _Event } from "../../utils/types";
 import { useEffect } from "react";
 import { useToast } from "./useToast";
 interface ToastProps {}

src/components/topbar/topbar.module.css

@@ -7,6 +7,7 @@
   position: relative;
   /* background: red; */
   .account {
+    width: auto;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -35,7 +36,7 @@
 
 .desktop {
   display: none;
-  width: calc(100% - 140px);
+  width: calc(100% - 100px);
   padding: 10px 50px;
 
   .menuItems {

src/components/topbar/topbar.tsx

@@ -2,6 +2,7 @@ import { Link, useNavigate } from "react-router-dom";
 import LoginButton from "../buttons/LoginButton/LoginButton";
 import style from "./topbar.module.css";
 import logo from "../../assets/logo.png";
+import React from "react";
 interface TopBarProps {
   theme: string;
   setTheme: (theme: string) => void;
@@ -15,10 +16,32 @@ const TopBar: React.FC<TopBarProps> = ({
   setSidebarState,
   sidebarState,
 }) => {
+  const [text, setText] = React.useState<string>("Register");
+  const [link, setLink] = React.useState<string>("");
+  const [iconVisible, setIconVisible] = React.useState<boolean>(true);
   const redirect = useNavigate();
+
   const handleLoginClick = () => {
-    redirect("/register");
+    redirect(link);
   };
+  React.useEffect(() => {
+    var step = localStorage.getItem("step") as any as number;
+    if (step)
+      if (step == 1) {
+        setText("Continue Registration");
+        setLink("/register/details");
+        setIconVisible(false);
+        return;
+      } else if (step == 2) {
+        setText("Dashboard");
+        setLink("/dashboard");
+        setIconVisible(false);
+        return;
+      }
+    setText("Register");
+    setLink("/register");
+    setIconVisible(true);
+  });
   return (
     <>
       <div className={style.topbar + " " + style.mobile}>
@@ -44,7 +67,11 @@ const TopBar: React.FC<TopBarProps> = ({
               <i className="bi bi-sun"></i>
             )}
           </span>
-          <LoginButton onClick={handleLoginClick} />
+          <LoginButton
+            onClick={handleLoginClick}
+            text={text}
+            iconVisible={iconVisible}
+          />
         </div>
       </div>
 
@@ -80,7 +107,11 @@ const TopBar: React.FC<TopBarProps> = ({
               <i className="bi bi-sun"></i>
             )}
           </span>
-          <LoginButton onClick={handleLoginClick} />
+          <LoginButton
+            onClick={handleLoginClick}
+            text={text}
+            iconVisible={iconVisible}
+          />
         </div>
       </div>
     </>

src/components/usercard/UserCard.tsx

@@ -1,5 +1,5 @@
 import style from "./UserCard.module.css";
-import { _Event, _UserDetails } from "../../types";
+import { _Event, _UserDetails } from "../../utils/types";
 import defaultProfile from "../../assets/frlIf.png";
 
 interface UserCardProps {

src/pages/dashboard/Dashboard.tsx

@@ -5,7 +5,7 @@ import { userDetails } from "../../apis/userApi";
 import { useLoader } from "../../components/toploader/useLoader";
 import { useToast } from "../../components/toast/useToast";
 import { useNavigate } from "react-router-dom";
-import { _UserDetails } from "../../types";
+import { _UserDetails } from "../../utils/types";
 import UserCard from "../../components/usercard/UserCard";
 import EventList from "../../components/eventlist/EventList";
 import { myEvents } from "../../apis/eventApi";

src/pages/event/Event.tsx

@@ -2,7 +2,7 @@ import style from "./Event.module.css";
 // import SecondaryButton from '../../components/buttons/secondary_button/SecondaryButton';
 import Footer from "../../components/footer/Footer";
 import { useEffect, useState } from "react";
-import { _EventInfo } from "../../types";
+import { _EventInfo } from "../../utils/types";
 import { getEvents } from "../../apis/eventApi";
 import { useParams } from "react-router-dom";
 import { useLoader } from "../../components/toploader/useLoader";

src/pages/login/Login.tsx

@@ -3,7 +3,12 @@ import style from "./Login.module.css";
 import { Link, useNavigate } from "react-router-dom";
 // import logo from "../../assets/Logo KBM.png";
 import alien from "../../assets/dehill-spacelove-1-dribble.gif";
-import { _EventInfo, _UserDetails, _UserLogin, _UserStep1 } from "../../types";
+import {
+  _EventInfo,
+  _UserDetails,
+  _UserLogin,
+  _UserStep1,
+} from "../../utils/types";
 import { loginEmail } from "../../apis/userApi";
 import { useLoader } from "../../components/toploader/useLoader";
 import { useToast } from "../../components/toast/useToast";

src/pages/register/Register.tsx

@@ -3,7 +3,7 @@ import style from "./Register.module.css";
 import { Link, useNavigate } from "react-router-dom";
 // import logo from "../../assets/Logo KBM.png";
 import alien from "../../assets/dehill-spacelove-1-dribble.gif";
-import { _EventInfo, _UserDetails, _UserStep1 } from "../../types";
+import { _EventInfo, _UserDetails, _UserStep1 } from "../../utils/types";
 import { createAccount } from "../../apis/userApi";
 import { useLoader } from "../../components/toploader/useLoader";
 import { useToast } from "../../components/toast/useToast";

src/pages/register/RegisterStep2.tsx

@@ -3,7 +3,12 @@ import style from "./Register.module.css";
 import { Link, useNavigate } from "react-router-dom";
 // import logo from "../../assets/Logo KBM.png";
 import alien from "../../assets/dehill-spacelove-1-dribble.gif";
-import { _EventInfo, _UserDetails, _UserStep1, _UserStep2 } from "../../types";
+import {
+  _EventInfo,
+  _UserDetails,
+  _UserStep1,
+  _UserStep2,
+} from "../../utils/types";
 import { useLoader } from "../../components/toploader/useLoader";
 import { useToast } from "../../components/toast/useToast";
 import { completeRegistration } from "../../apis/userApi";