Skip to content
Snippets Groups Projects
Commit 9747dc9f authored by Sarthak Shrivastava's avatar Sarthak Shrivastava
Browse files

login working despite refresh. Giving up on a sign out button.

parent 775d3c2f
No related branches found
No related tags found
No related merge requests found
......@@ -16,27 +16,29 @@ import PrivateRoutes from "./routes/PrivateRoutes";
function App() {
// const [token, setToken] = useState();
const { token, setToken } = useToken();
const {token, setToken} = useToken();
// const token = getToken();
// if (!token)
// {
// return <Login setToken={setToken}/>
// }
console.log(token);
return (
<div className="App">
<Navbar />
<Routes>
<Route path="/" element={<Home />} />
<Route path="/login" element={<Login setToken={setToken}/>} />
<Route path="/register" element={<Register />} />
<Route element={<PrivateRoutes token={token}/>}>
<Route path='/accountinfo' element={<AccountInformation token={token}/>} />
</Route>
{/* <Route path="/deleteUser" element={<DeleteUser token={token}/>} />
<div className="App">
<Navbar token={token} />
<Routes>
<Route path="/" element={<Home/>}/>
<Route path="/login" element={<Login setToken={setToken}/>}/>
<Route path="/register" element={<Register/>}/>
<Route element={<PrivateRoutes token={token}/>}>
<Route path='/accountinfo' element={<AccountInformation token={token}/>}/>
</Route>
{/* <Route path="/deleteUser" element={<DeleteUser token={token}/>} />
<Route path="/updatepassword" element={<UpdatePassword />} />
<Route path="/accountinfo" element={<AccountInformation token={token}/> } /> */}
</Routes>
</div>
</Routes>
</div>
);
}
......
......@@ -2,7 +2,7 @@ import "./Navbar.css";
import React, { useState } from "react";
import { Link, NavLink } from "react-router-dom";
export const Navbar = () => {
export const Navbar = ({token}) => {
const [menuOpen, setMenuOpen] = useState(false);
return (
<nav className="navbar">
......@@ -19,21 +19,31 @@ export const Navbar = () => {
<span></span>
</div>
<ul className={menuOpen ? "open" : ""}>
<li>
<NavLink to="/login">Login</NavLink>
</li>
<li>
<NavLink to="/register">Register</NavLink>
</li>
<li>
<NavLink to="/deleteUser">Delete User</NavLink>
</li>
<li>
<NavLink to="/updatepassword">Update Password</NavLink>
</li>
<li>
<NavLink to="/accountinfo">Account Information</NavLink>
</li>
<>
{
token == null ? <>
<li>
<NavLink to="/login">Login</NavLink>
</li>
<li>
<NavLink to="/register">Register</NavLink>
</li>
</>
:
<>
<li>
<NavLink to="/accountinfo">Account Information</NavLink>
</li>
</>
}
</>
{/*<li>*/}
{/* <NavLink to="/login">Login</NavLink>*/}
{/*</li>*/}
{/*<li>*/}
{/* <NavLink to="/accountinfo">Account Information</NavLink>*/}
{/*</li>*/}
</ul>
</nav>
);
......
......@@ -4,20 +4,21 @@ import Axios from "axios";
export default function useToken() {
const getToken = () => {
const tokenString = sessionStorage.getItem('token');
if (!tokenString)
if (!tokenString || tokenString == "undefined")
return null;
console.log(tokenString);
const userToken = JSON.parse(tokenString);
console.log(userToken);
if (userToken.jwt != null)
{
Axios.post("http://localhost:8080/auth/verify", {
jwt: userToken.jwt
}).then((response) => {
console.log(response);
if (response.user)
return response;
});
// Axios.post("http://localhost:8080/auth/verify", {
// jwt: userToken.jwt
// }).then((response) => {
// console.log(response);
// if (response.user)
// return response;
// });
return userToken;
}
return null;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment