Merge pull request #156 from nigeljacob/Nigel

fixed create account issue
nigeljacob · Mar 25, 2024 · 3e44d4e · 3e44d4e
2 parents 5ca1ab9 + 3486d9a
commit 3e44d4e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Frontend/src/App.jsx b/Frontend/src/App.jsx
@@ -502,35 +502,31 @@ function App() {
     return (
       <>
         <div className="titleBar"></div>
-        {isLoading ? (
-          <Loading message="Signing In" background={true} />
-        ) : (
-          <HashRouter>
-            <Routes>
-              <Route
-                path="/"
-                exact
-                element={
-                  <Login
-                    setUser={setUser}
-                    setIsLoggedIn={setIsLoggedIn}
-                    loadingTrigger={setLoading}
-                  />
-                }
-              />
-              <Route
-                path="/createAccount"
-                element={
-                  <CreateAccount
-                    setUser={setUser}
-                    setIsLoggedIn={setIsLoggedIn}
-                    loadingTrigger={setLoading}
-                  />
-                }
-              />
-            </Routes>
-          </HashRouter>
-        )}
+        <HashRouter>
+          <Routes>
+            <Route
+              path="/"
+              exact
+              element={
+                <Login
+                  setUser={setUser}
+                  setIsLoggedIn={setIsLoggedIn}
+                  loadingTrigger={setLoading}
+                />
+              }
+            />
+            <Route
+              path="/createAccount"
+              element={
+                <CreateAccount
+                  setUser={setUser}
+                  setIsLoggedIn={setIsLoggedIn}
+                  loadingTrigger={setLoading}
+                />
+              }
+            />
+          </Routes>
+        </HashRouter>
       </>
     );
   } else if (user != null && isLoggedIn) {

diff --git a/Frontend/src/Pages/CreateAccount/CreateAccount.jsx b/Frontend/src/Pages/CreateAccount/CreateAccount.jsx
@@ -38,7 +38,6 @@ const CreateAccount = (props) => {
     });
 
     if (auth.currentUser != null) {
-      props.loadingTrigger(true)
       props.setIsLoggedIn(true);
       localStorage.setItem("loggedIN", "true");
       localStorage.setItem("currentUser", getCurrentUser);

diff --git a/Frontend/src/Pages/Login/Login.jsx b/Frontend/src/Pages/Login/Login.jsx
@@ -33,7 +33,6 @@ function Login(props) {
     });
 
     if (auth.currentUser != null) {
-      props.loadingTrigger(true);
       props.setIsLoggedIn(true);
       localStorage.setItem("loggedIN", "true");
       localStorage.setItem("currentUser", getCurrentUser);