Changeset a26f6a1 for frontend/src/App.js

Timestamp:

08/09/22 16:09:32 (23 months ago)

Author:

Danilo <danilo.najkov@…>

Branches:

master

Children:

a569b7c

Parents:

899b19d

Message:

full auth flow

File:

• frontend/src/App.js (modified) (5 diffs)

frontend/src/App.js

@@ -6 +6 @@
 import {Spin} from "antd";
 import React, {useEffect, useState} from "react";
-import {Login, Register} from "./auth";
+import {Login, Register} from "./Auth/auth";
 import Dashboard from "./Dashboard";
 import Reservations from "./Dashboard/Reservations";
@@ -13 +13 @@
 import Menu from "./Dashboard/Menu";
 import Review from "./Dashboard/Review";
+import Confirm from "./Auth/Confirm";
+import SendConfirm from "./Auth/SendConfirm";
+import SendReset from "./Auth/SendReset";
+import Reset from "./Auth/Reset";
 
 
 function App() {
   const [user, setUser] = useState(undefined)
-  const [loading, setLoading] = useState(false)
+  const [loading, setLoading] = useState(true)
   useEffect(()=>{
     getUser()
@@ -24 +28 @@
   const getUser = () => {
     setLoading(true)
-    axios.get(env.api+'Users/authed',{headers:{Authorization:sessionStorage.getItem('Auth')}}).then(res=>{
-      console.log(!res.data)
+    axios.get(env.api+'Users/authed',{headers:{Authorization:localStorage.getItem('Auth')}}).then(res=>{
+      console.log(res.data)
       setUser(res.data)
       setLoading(false)
@@ -32 +36 @@
   const logout = () => {
     setUser(undefined);
-    sessionStorage.removeItem('Auth');
+    localStorage.removeItem('Auth');
     window.location.replace('/')
   }
@@ -48 +52 @@
             <Route path="/login" element={loading ? <Spin /> :  !user ? <Login setUser={setUser}/> :  <Navigate to="/dashboard" replace={true} />}/>
             <Route path="/register" element={loading ? <Spin /> :  !user ? <Register setUser={setUser}/> :  <Navigate to="/dashboard" replace={true} />}/>
+            <Route path="/reset-password" element={loading ? <Spin /> : <SendReset/>}/>
+            <Route path="/reset" element={loading ? <Spin /> : <Reset/>}/>
+            <Route path="/confirm" element={loading ? <Spin /> : <Confirm setUser={setUser} user={user}/>}/>
+            <Route path="/confirm-email" element={loading ? <Spin /> : <SendConfirm setUser={setUser} user={user}/>}/>
             <Route path="/" element={<FrontPage user={user} logout={logout}/>}/>
           </Routes>