Merge pull request #71 from dave-b-b/fix-frontend

Fix frontend

src/components/LandingComponent.jsx

@@ -1,4 +1,4 @@
-import { useContext } from "react";
+import {useContext, useEffect} from "react";
 import { Container } from "react-bootstrap";
 import ExpensesTable from "./ExpensesTable.jsx";
 import CategoryModal from "./CategoryModal.jsx";
@@ -12,21 +12,19 @@ import achievementConfig  from "../config/achievementConfig.js";
 import '../App.css';
 
 const LandingComponent = () => {
-    const { setScreen, ocrData, serverResponse, setServerResponse } = useContext(AppContext);
-    const user = new User(JSON.parse(localStorage.getItem('user')))
+    const { setScreen, ocrData, serverResponse, setServerResponse, user } = useContext(AppContext);
     const renderNewScreen = (screen) => {
         if (screen === undefined) {
             return;
         }
         setScreen(screen);
     };
 
-    const handleSubmit = async () => {
-        // const userWithUpdates = new User(user);
-        // userWithUpdates.transactions.push(ocrData);
-        // const result = await user.updateFirebase();
-        // setServerResponse(result);
-    };
+    useEffect(() => {
+        if (serverResponse) {
+            setServerResponse(null);
+        }
+    }, [user]);
 
     return (
         <AchievementProvider  config={achievementConfig} initialState={user.serialize()} badgesButtonPosition={'top-right'}>

src/components/Login.jsx

@@ -39,7 +39,7 @@ export const Login = () => {
             localStorage.setItem('user', user)
             setScreen("landing")
         } catch (err) {
-            console.error(err);
+            console.log(err);
         }
     };
 

src/context/AppContext.jsx

@@ -5,7 +5,7 @@ import FormData from "../models/FormData.js"
 import User from "../models/User.js"
 
 
-const AppContext = createContext();
+const AppContext = createContext({});
 
 const AppProvider = ({ children }) => {
 
@@ -16,11 +16,7 @@ const AppProvider = ({ children }) => {
     }
 
     const [screen, setScreen] = useState();
-    const [user, setUser] = useState({
-        first_name: '',
-        last_name: '',
-        categories: []
-    });
+    const [user, setUser] = useState(new User(JSON.parse(localStorage.getItem('user'))));
     const [modalIsOpen, setModalIsOpen] = useState(true);
     const [show, setShow] = useState(false);
     const [capturedPhoto, setCapturedPhoto] = useState(null);
@@ -32,9 +28,7 @@ const AppProvider = ({ children }) => {
 
     // updating user data based on state
     const fetchUserData = async () => {
-        const endpoint = import.meta.env.MODE === 'development'
-            ? import.meta.env.VITE_DEV_GET_USER_ENDPOINT
-            : import.meta.env.VITE_PROD_GET_USER_ENDPOINT;
+        const endpoint = import.meta.env.VITE_DEV_GET_USER_ENDPOINT;
 
         try {
             const response = await fetch(endpoint);