Minor fix

AI4Bharat · Feb 8, 2024 · 2451538 · 2451538
1 parent d2ac3cc
commit 2451538
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 49 deletions.
diff --git a/src/app/ui/pages/chat/chat.js b/src/app/ui/pages/chat/chat.js
@@ -6,26 +6,7 @@ import { InfoOutlined} from "@material-ui/icons";
 import SettingsOutlinedIcon from "@mui/icons-material/SettingsOutlined";
 import Image from "next/image";
 import { useRouter } from "next/navigation";
-
-const dummyData = [
-    {
-      "prompt": "Hii Anudesh",
-      "output": "Hello! How can I assist you today?"
-    },
-    {
-      "prompt": "What is a computer?",
-      "output": "Computer is an electronic device"
-    },
-    {
-      "prompt": "What is it used for?",
-      "output": "It is used for computation"
-    },
-    {
-      "prompt": "Thanks, any additional points?",
-      "output": "No"
-    }
-  ];
-
+import dummyData from './dummyData.json';
 
 const Chat = () =>{
 

diff --git a/src/app/ui/pages/chat/dummyData.json b/src/app/ui/pages/chat/dummyData.json
@@ -0,0 +1,18 @@
+[
+    {
+      "prompt": "Hii Anudesh",
+      "output": "Hello! How can I assist you today?"
+    },
+    {
+      "prompt": "What is a computer?",
+      "output": "Computer is an electronic device"
+    },
+    {
+      "prompt": "What is it used for?",
+      "output": "It is used for computation"
+    },
+    {
+      "prompt": "Thanks, any additional points?",
+      "output": "No"
+    }
+]
diff --git a/src/app/ui/pages/home/home.js b/src/app/ui/pages/home/home.js
diff --git a/src/app/ui/pages/login/login.js b/src/app/ui/pages/login/login.js
@@ -21,7 +21,7 @@ import LoginAPI from "../../../actions/api/user/Login";
 import { auth, googleAuthProvider } from "@/firebase";
 import { signInWithPopup } from "firebase/auth";
 import GoogleLoginAPI from "../../../actions/api/user/GoogleLogin";
-import { authenticateUser } from "@/utils/utils";
+import { authenticateUser,getLoggedInUserData } from "@/utils/utils";
 import { FetchLoggedInUserData } from "@/Lib/Features/getLoggedInData";
 
 export default function Login() {
@@ -31,10 +31,11 @@ export default function Login() {
     const dispatch=useDispatch()
 
     useEffect(() => {
-        if (authenticateUser()) {
-          navigate('/projects');
+        const isLoggedIn = localStorage.getItem("isLoggedIn");
+        if (isLoggedIn === "true") {
+            navigate('/projects');
         }
-      }, [navigate]);
+    }, []);
 
     const classes = LoginStyle();
     const [snackbar, setSnackbarInfo] = useState({
@@ -61,6 +62,7 @@ export default function Login() {
     const getLoggedInUserData = () => {
         dispatch(FetchLoggedInUserData("me"));
     };
+
 
 
     const handleSubmit = async () => {
@@ -77,7 +79,7 @@ export default function Login() {
       localStorage.setItem("anudesh_access_token", rsp_data.access);
       localStorage.setItem("anudesh_refresh_token", rsp_data.refresh);
       localStorage.setItem("email_id", credentials.email.toLowerCase());
-      getLoggedInUserData();
+      localStorage.setItem("isLoggedIn", "true");
       navigate("/projects");
     } else{
       setSnackbarInfo({

diff --git a/src/components/common/Header.jsx b/src/components/common/Header.jsx
@@ -69,7 +69,7 @@ const Header = () => {
   const handleChange = (event, newValue) => {
     setValue(newValue);
   };
-
+   
 
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("md"));
@@ -733,32 +733,36 @@ const handleopenproject=(id,type)=>{
         ) : (
           <AppBar>
             <Toolbar className={classes.toolbar}>
-              <Grid
-                sx={{ display: "flex", alignItems: "center" }}
-                xs={12}
-                sm={12}
-                md={3}
-              >
-                <Link href="/projects">
+            <Grid
+              sx={{ display: "flex", alignItems: "center" }}
+              xs={12}
+              sm={12}
+              md={3}
+            >   
+                <a style={{ display: "flex", alignItems: "center" }}>
                   <img
-
+                    onClick={() => navigate("/")} 
                     src="https://i.imgur.com/56Ut9oz.png"
                     alt="anudesh"
                     className={classes.headerLogo}
                     sx={{ marginTop: "5%" }}
                   />
-                </Link>
-                <Typography
-                  variant="h4"
-                  className={classes.headerTitle}
-                  sx={{
-                    fontSize: "28px",
-                    fontWeight: "lighter",
-                  }}
-                >
-                  Anudesh
-                </Typography>
-              </Grid>
+                  <Typography
+
+                    onClick={() => navigate("/")} 
+                    variant="h4"
+                    className={classes.headerTitle}
+                    sx={{
+                      fontSize: "28px",
+                      fontWeight: "lighter",
+                    }}
+                  >
+                    Anudesh
+                  </Typography>
+                </a>
+
+
+            </Grid>
 
               {/* <Grid
                 container