Skip to content
Snippets Groups Projects
Commit 3fe4836a authored by Shrey Patel's avatar Shrey Patel
Browse files

fixed var warnings

parent 5a75698a
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ export const Login = ({ setToken }) => { ...@@ -10,7 +10,7 @@ export const Login = ({ setToken }) => {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [error, setError] = useState(""); const [error, setError] = useState("");
const [loggedIn, setLoggedIn] = useState(false); const [loggedIn, setLoggedIn] = useState(false);
const mytoken = null; const [myToken, setMyToken] = useState();
const handleSubmit = (e) => { const handleSubmit = (e) => {
e.preventDefault(); e.preventDefault();
setLoading(true); setLoading(true);
...@@ -25,7 +25,7 @@ export const Login = ({ setToken }) => { ...@@ -25,7 +25,7 @@ export const Login = ({ setToken }) => {
if (response.data.result === "success") { if (response.data.result === "success") {
setToken(response); setToken(response);
setLoggedIn(true); setLoggedIn(true);
mytoken = response.data; setMyToken(response.data);
} else { } else {
setError("Invalid email or password. Please try again."); setError("Invalid email or password. Please try again.");
} }
...@@ -39,7 +39,7 @@ export const Login = ({ setToken }) => { ...@@ -39,7 +39,7 @@ export const Login = ({ setToken }) => {
}); });
}; };
if (loggedIn) { if (loggedIn) {
return <Navigate to="/accountinfo" token={mytoken} />; return <Navigate to="/accountinfo" token={myToken} />;
} }
return ( return (
<div className="auth-form-container"> <div className="auth-form-container">
......
import { Outlet, Navigate } from 'react-router-dom' import { Outlet, Navigate } from "react-router-dom";
import Axios from "axios"; // import Axios from "axios";
const PrivateRoutes = ({ token }) => { const PrivateRoutes = ({ token }) => {
let auth = {'token':false} // let auth = {'token':false}
return( return token ? <Outlet /> : <Navigate to="/login" />;
token ? <Outlet/> : <Navigate to="/login"/> };
)
}
export default PrivateRoutes export default PrivateRoutes;
\ No newline at end of file
import React from 'react';
import { Route, Navigate } from 'react-router-dom';
const ProtectedRoute = ({ element, token, ...props }) => {
return token ? (
<Route {...props} element={element} />
) : (
<Navigate to="/login" />
);
};
export default ProtectedRoute;
...@@ -74,7 +74,6 @@ public class MainController { ...@@ -74,7 +74,6 @@ public class MainController {
found.setEmail("failed"); found.setEmail("failed");
return found; return found;
} }
System.out.println(res.get("user"));
Optional<User> usr = userRepository.findById(res.get("user")); Optional<User> usr = userRepository.findById(res.get("user"));
if (!usr.isPresent()) if (!usr.isPresent())
{ {
...@@ -100,7 +99,6 @@ public class MainController { ...@@ -100,7 +99,6 @@ public class MainController {
Optional<User> optionalUser = userRepository.findById(email); Optional<User> optionalUser = userRepository.findById(email);
if (optionalUser.isPresent()) if (optionalUser.isPresent())
{ {
System.out.println("in if statement");
found = optionalUser.get(); found = optionalUser.get();
userRepository.deleteById(email); userRepository.deleteById(email);
return found; return found;
......
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