Merge pull request #108 from MargoMarm/revert-107-bagfix/retinaImg

Revert "update"
MargoMarm · Sep 29, 2023 · a0391cf · a0391cf
2 parents 389bbdf + 91f4d05
commit a0391cf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 53 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -6,11 +6,7 @@ import { fetchCurrentUser } from './redux/auth/operation';
 
 import SharedLayout from './components/SharedLayout/SharedLayout';
 
-import {
-  PrivateRoute,
-  PublicRoute,
-  RestrictedRoute,
-} from './components/Routes';
+import { PrivateRoute, PublicRoute } from './components/Routes';
 import { UseAuth } from './hooks/useAuth';
 
 const Home = lazy(() => import('../src/pages/Home/Home'));
@@ -31,11 +27,9 @@ const Profile = lazy(() => import('./pages/Profile/Profile'));
 function App() {
   const dispatch = useDispatch();
 
-  const { isRefreshing, isLoggedIn, user } = UseAuth();
+  const { isRefreshing, isLoggedIn } = UseAuth();
   const { pathname } = useLocation();
 
-  const emptyUserParams = Object.keys(user.bodyParameters).length === 0;
-
   if (isLoggedIn && pathname !== '/') {
     localStorage.setItem('location', pathname);
   }
@@ -59,10 +53,7 @@ function App() {
           <Route
             path="/signin"
             element={
-              <PublicRoute
-                component={<SignIn />}
-                redirectTo={emptyUserParams ? '/params' : '/diary'}
-              />
+              <PublicRoute component={<SignIn />} redirectTo={'/diary'} />
             }
           />
           <Route
@@ -77,7 +68,7 @@ function App() {
           />
           <Route
             path="/params"
-            element={<RestrictedRoute component={<Params />} redirectTo="/" />}
+            element={<PrivateRoute component={<Params />} redirectTo="/" />}
           />
           <Route
             path="/exercises"

diff --git a/src/components/Routes/PrivateRoute.jsx b/src/components/Routes/PrivateRoute.jsx
@@ -3,16 +3,10 @@ import PropTypes from 'prop-types';
 import { UseAuth } from '../../hooks/useAuth';
 
 const PrivateRoute = ({ component, redirectTo = '/' }) => {
-  const { isLoggedIn, isRefreshing, user } = UseAuth();
+  const { isLoggedIn, isRefreshing } = UseAuth();
   const shouldRedirect = isLoggedIn && !isRefreshing;
 
-  const emptyUserParams = Object.keys(user.bodyParameters).length === 0;
-
-  return shouldRedirect ? (
-    component
-  ) : (
-    <Navigate to={emptyUserParams ? '/params' : redirectTo} />
-  );
+  return shouldRedirect ? component : <Navigate to={redirectTo} />;
 };
 
 PrivateRoute.propTypes = {

diff --git a/src/components/Routes/RestrictedRoute.jsx b/src/components/Routes/RestrictedRoute.jsx
diff --git a/src/components/Routes/index.js b/src/components/Routes/index.js
@@ -1,3 +1,2 @@
 export { default as PrivateRoute } from './PrivateRoute';
 export { default as PublicRoute } from './PublicRoute';
-export { default as RestrictedRoute } from './RestrictedRoute';
diff --git a/src/pages/Error/Error.jsx b/src/pages/Error/Error.jsx
@@ -13,19 +13,7 @@ import sprite from '../../assets/sprite.svg';
 import { UseAuth } from '../../hooks/useAuth';
 
 const Error = () => {
-  const { isLoggedIn, user } = UseAuth();
-
-  const emptyUserParams = Object.keys(user.bodyParameters).length === 0;
-
-  const redirectRoute = () => {
-    if (isLoggedIn && emptyUserParams) {
-      return '/params';
-    } else if (isLoggedIn && !emptyUserParams) {
-      return 'diary';
-    } else if (isLoggedIn === false) {
-      return '/';
-    }
-  };
+  const { isLoggedIn } = UseAuth();
 
   return (
     <main>
@@ -51,7 +39,7 @@ const Error = () => {
             type="button"
             text={'Go Home'}
             isorange={'true'}
-            to={redirectRoute()}
+            to={isLoggedIn ? '/diary' : '/'}
           />
         </Content>