From 91f4d05694bdd5d212f874fb7c08a82a576749fa Mon Sep 17 00:00:00 2001
From: Margo <116720347+MargoMarm@users.noreply.github.com>
Date: Fri, 29 Sep 2023 17:34:58 +0200
Subject: [PATCH] Revert "update"
---
src/App.jsx | 17 ++++-------------
src/components/Routes/PrivateRoute.jsx | 10 ++--------
src/components/Routes/RestrictedRoute.jsx | 17 -----------------
src/components/Routes/index.js | 1 -
src/pages/Error/Error.jsx | 16 ++--------------
5 files changed, 8 insertions(+), 53 deletions(-)
delete mode 100644 src/components/Routes/RestrictedRoute.jsx
diff --git a/src/App.jsx b/src/App.jsx
index 16157dde..51302ce9 100644
--- 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() {
}
- redirectTo={emptyUserParams ? '/params' : '/diary'}
- />
+ } redirectTo={'/diary'} />
}
/>
} redirectTo="/" />}
+ element={} 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
- ) : (
-
- );
+ return shouldRedirect ? component : ;
};
PrivateRoute.propTypes = {
diff --git a/src/components/Routes/RestrictedRoute.jsx b/src/components/Routes/RestrictedRoute.jsx
deleted file mode 100644
index ba69ca7d..00000000
--- a/src/components/Routes/RestrictedRoute.jsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Navigate } from 'react-router-dom';
-import PropTypes from 'prop-types';
-import { UseAuth } from '../../hooks/useAuth';
-
-const RestrictedRoute = ({ component, redirectTo = '/' }) => {
- const { isLoggedIn, isRefreshing } = UseAuth();
- const shouldRedirect = isLoggedIn && !isRefreshing;
-
- return shouldRedirect ? component : ;
-};
-
-RestrictedRoute.propTypes = {
- component: PropTypes.object.isRequired,
- redirectTo: PropTypes.string,
-};
-
-export default RestrictedRoute;
diff --git a/src/components/Routes/index.js b/src/components/Routes/index.js
index f2c789a4..5bbde539 100644
--- 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
index 842754c7..2da2e902 100644
--- 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 (
@@ -51,7 +39,7 @@ const Error = () => {
type="button"
text={'Go Home'}
isorange={'true'}
- to={redirectRoute()}
+ to={isLoggedIn ? '/diary' : '/'}
/>