fix bugs

Garage-at-EEE · Dec 12, 2023 · 2b62f40 · 2b62f40
1 parent 200de67
commit 2b62f40
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 34 deletions.
diff --git a/docs/asset-manifest.json b/docs/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/css/main.12d852b1.css",
-    "main.js": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/js/main.c3b7729e.js",
+    "main.js": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/js/main.8b94b85f.js",
     "static/media/garage_gang_pic.jpg": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/media/garage_gang_pic.05e4f5e3d144f588b8dc.jpg",
     "static/media/PROFILE PIC.png": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/media/PROFILE PIC.798457f7c8eec972d467.png",
     "static/media/Garage_Gang_Pic.png": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/media/Garage_Gang_Pic.d9cc2493b522d787db5e.png",
@@ -16,10 +16,10 @@
     "index.html": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/index.html",
     "static/media/noise.svg": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/media/noise.047c0d2fa455122226961c4b6ae3ffe8.svg",
     "main.12d852b1.css.map": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/css/main.12d852b1.css.map",
-    "main.c3b7729e.js.map": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/js/main.c3b7729e.js.map"
+    "main.8b94b85f.js.map": "https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/js/main.8b94b85f.js.map"
   },
   "entrypoints": [
     "static/css/main.12d852b1.css",
-    "static/js/main.c3b7729e.js"
+    "static/js/main.8b94b85f.js"
   ]
 }
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/Garage_Icon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="GEEEnius Investment"/><link rel="apple-touch-icon" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/Garage_Icon.png"/><link rel="manifest" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/manifest.json"/><title>GEEEnius</title><script defer="defer" src="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/js/main.c3b7729e.js"></script><link href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/css/main.12d852b1.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/Garage_Icon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="GEEEnius Investment"/><link rel="apple-touch-icon" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/Garage_Icon.png"/><link rel="manifest" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/manifest.json"/><title>GEEEnius</title><script defer="defer" src="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/js/main.8b94b85f.js"></script><link href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/css/main.12d852b1.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/docs/static/js/main.c3b7729e.js → docs/static/js/main.8b94b85f.js b/docs/static/js/main.c3b7729e.js → docs/static/js/main.8b94b85f.js
diff --git a/docs/static/js/main.c3b7729e.js.LICENSE.txt → docs/static/js/main.8b94b85f.js.LICENSE.txt b/docs/static/js/main.c3b7729e.js.LICENSE.txt → docs/static/js/main.8b94b85f.js.LICENSE.txt
diff --git a/docs/static/js/main.8b94b85f.js.map b/docs/static/js/main.8b94b85f.js.map
diff --git a/docs/static/js/main.c3b7729e.js.map b/docs/static/js/main.c3b7729e.js.map
diff --git a/src/components/MainPage/AccountCard.jsx b/src/components/MainPage/AccountCard.jsx
@@ -31,6 +31,7 @@ const RotationWrapper = styled(motion.div)`
 
 export default function AccountCard(props) {
   // handle mouse move on document
+  const storedObject = JSON.parse(localStorage.getItem("geeenius"));
 
   return (
     <Box {...props}>
@@ -140,7 +141,7 @@ export default function AccountCard(props) {
                         color: "#294283",
                       }}
                     >
-                      Ricky Winarko
+                      {storedObject.name}
                     </Typography>
                     <Typography
                       variant="h5"

diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js
@@ -22,8 +22,42 @@ import GreetingCard from "components/MainPage/InnovatorCard";
 import { AnimatePresence, motion } from "framer-motion";
 import moment from "moment";
 import { Parallax } from "react-parallax";
+import { APP_SCRIPT } from "../../utils/constants";
+
+const fetchData = async (matric_num) => {
+  try {
+    const response = await fetch(APP_SCRIPT, {
+      method: "POST",
+      body: JSON.stringify({
+        action: "profile",
+        value: { matric: matric_num },
+      }),
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`);
+    }
+
+    const result = await response.json();
+
+    if (result.state === 200) {
+      console.log(result);
+      localStorage.setItem("geeenius", JSON.stringify(result.profile));
+    }
+  } catch (error) {
+    console.error("Error:", error.message);
+  }
+};
 
 const HeroComponent = () => {
+  const storedObject = JSON.parse(localStorage.getItem("geeenius"));
+  const [portfolio, setPortfolio] = useState(storedObject);
+
+  useEffect(() => {
+    console.log("sending request");
+    fetchData(portfolio.matric);
+  }, []);
+
   return (
     <Parallax
       bgImage={BACKGROUND_IMG}
@@ -90,7 +124,7 @@ const HeroComponent = () => {
               fontWeight="800"
               color="white"
             >
-              $69.69
+              {"$" + portfolio["total_balance"]}
             </Typography>
             <Button
               variant="contained"
@@ -131,7 +165,6 @@ const HomePage = () => {
   const metadata = useMetadataContext();
   const Navigate = useNavigate();
   const [isLoading, setLoading] = useState(true);
-  const [page, setPage] = useState(1);
 
   useEffect(() => {
     // Simulate a delay using setTimeout

diff --git a/src/pages/Login/Login.js b/src/pages/Login/Login.js
@@ -15,14 +15,20 @@ import Container from "@mui/material/Container";
 import TextField from "@mui/material/TextField";
 import Button from "@mui/material/Button";
 
-import { APP_SCRIPT } from "./constants";
+import { APP_SCRIPT } from "../../utils/constants";
+import { useNavigate } from "react-router-dom";
 
 const LoginPage = () => {
+  const navigate = useNavigate();
   const [isLoading, setLoading] = useState(true);
   const [matricNumber, setMatricNumber] = useState("");
   const [birthday, setBirthday] = useState("");
   const [name, setName] = useState("");
 
+  if (localStorage.getItem("geeenius") != null) {
+    navigate("/home");
+  }
+
   const handleMatricNumberChange = (event) => {
     setMatricNumber(event.target.value);
   };
@@ -35,35 +41,31 @@ const LoginPage = () => {
     setName(event.target.value);
   };
 
-  const value = useMetadataContext();
-
-  console.log(value);
-
   const handleSubmit = async () => {
-    console.log(matricNumber);
-    console.log(birthday);
     setLoading(true);
     try {
-      const response = await fetch(
-        "https://script.google.com/macros/s/AKfycbwjQT61gAbZ0JlnHOMKkWm4EgCyuHHvyf2h6jepAv1v5JCOvszqsjSdNhhtN83iZlLN/exec",
-        {
-          method: "POST",
-          // headers: {
-          //   "Content-Type": "application/json",
-          // },
-          body: JSON.stringify({
-            action: "login",
-            value: { matric: matricNumber, name: name, passcode: birthday },
-          }),
-        }
-      );
+      const response = await fetch(APP_SCRIPT, {
+        method: "POST",
+        // headers: {
+        //   "Content-Type": "application/json",
+        // },
+        body: JSON.stringify({
+          action: "login",
+          value: { matric: matricNumber, name: name, passcode: birthday },
+        }),
+      });
 
       if (!response.ok) {
         throw new Error(`HTTP error! Status: ${response.status}`);
       }
 
       const result = await response.json();
-      console.log("Response:", result);
+      localStorage.setItem(
+        "geeenius",
+        JSON.stringify(result.investment_portfolio)
+      );
+      console.log(result.investment_portfolio);
+      navigate("/home");
     } catch (error) {
       console.error("Error:", error.message);
     }

diff --git a/src/utils/constants.jsx b/src/utils/constants.jsx
@@ -18,7 +18,7 @@ export const GRAPHQL = HOST + "/graphql";
 export const HEADER_HEIGHT = "76px";
 
 export const APP_SCRIPT =
-  "https://script.google.com/macros/s/AKfycbwjQT61gAbZ0JlnHOMKkWm4EgCyuHHvyf2h6jepAv1v5JCOvszqsjSdNhhtN83iZlLN/exec";
+  "https://script.google.com/macros/s/AKfycbz-OVIyhzHK9yt4qXnZ7zzAbAwzjH2sp0stmfSJzdMPOytWi4Sij6yg7dRrhtLeuau8/exec";
 
 const GearAnimation = () => {
   return (

diff --git a/src/utils/router.jsx b/src/utils/router.jsx
@@ -6,7 +6,6 @@ import RoutePaths from "utils/routes";
 const WebRoute = () => {
   const getRoutes = (allRoutes) =>
     allRoutes.map((route) => {
-      console.log(route.route);
       return (
         <Route path={route.route} element={route.component} key={route.key} />
       );
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/Garage_Icon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="GEEEnius Investment"/><link rel="apple-touch-icon" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/Garage_Icon.png"/><link rel="manifest" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/manifest.json"/><title>GEEEnius</title><script defer="defer" src="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/js/main.c3b7729e.js"></script><link href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/css/main.12d852b1.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/Garage_Icon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="GEEEnius Investment"/><link rel="apple-touch-icon" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/Garage_Icon.png"/><link rel="manifest" href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/manifest.json"/><title>GEEEnius</title><script defer="defer" src="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/js/main.8b94b85f.js"></script><link href="https://Garage-at-EEE.github.io/geeenius-pitch-voting/static/css/main.12d852b1.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>