actually redirects to terms

account/src/App/Restricted.js

@@ -8,7 +8,7 @@ import { useNavigate, useLocation } from 'react-router-dom';
  */
 
 const Restricted = ({ children }) => {
-  const { authenticated, hasAuthenticated,terms } = useSelector((state) => state.user);
+  const { authenticated, hasAuthenticated, terms } = useSelector((state) => state.user);
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const location = useLocation();
@@ -22,9 +22,10 @@ const Restricted = ({ children }) => {
     if (authenticated) {
       if ((pathname != "/terms") && (terms != 1.1)) {
         navigate("/terms")
-      }
+      } else {
         return children;
       }
+    }
     else {
       navigate("/login")
     }

account/src/User/Login.js

@@ -1,7 +1,7 @@
 import { useState } from "react";
-import { useNavigate, useSearchParams, Link  } from 'react-router-dom';
+import { useNavigate, useSearchParams, Link, useLocation } from 'react-router-dom';
+import { useSelector, useDispatch } from 'react-redux'
 import { loginUser } from "../features/user/userSlice";
-import {  useDispatch } from 'react-redux';
 import {
   Container,
   Header,
@@ -28,20 +28,24 @@ const forgotStyle = {
 
 
 const Login = (props) => {
+  const { terms } = useSelector((state) => state.user);
   const [loginMessage, setLoginMessage] = useState("");
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
   const navigate = useNavigate();
   let [searchParams] = useSearchParams();
   const nextLocation = searchParams.get("nextLocation");
+  const location = useLocation();
+  const { hash, pathname, search } = location;
   const dispatch = useDispatch();
 
   const loginSubmit = async (event) => {
     event.preventDefault();
-    const result = await dispatch(loginUser({email,password})).unwrap();
+    const result = await dispatch(loginUser({ email, password })).unwrap();
     if (result.success) {
-        
+      if ((pathname != "/terms") && (terms != 1.1)) {
-        if (nextLocation) {
+        navigate("/terms")
+      } else if (nextLocation) {
           switch (nextLocation) {
             case "frontend":
               window.location = process.env.REACT_APP_FRONTEND_SERVER;
@@ -73,7 +77,7 @@ const Login = (props) => {
     }
   }
 
-  let loginMessageDisplay =(<></>)
+  let loginMessageDisplay = (<></>)
 
   if (loginMessage) {
     loginMessageDisplay = (
@@ -135,7 +139,7 @@ const Login = (props) => {
             <Button
               size="large"
               content="Register"
-                onClick={()=>navigate("/register")}
+              onClick={() => navigate("/register")}
               fluid
             />
             <Divider style={dividerStyle} horizontal>Or</Divider>
@@ -179,7 +183,7 @@ const Login = (props) => {
       </Grid>
     </Container>
   );
-  }
+}
 
 
 export default Login;