From abdce615e4776dedf8048d83451188af884857c6 Mon Sep 17 00:00:00 2001
From: Alberto Defendi <1369-ahl-berto@users.noreply.gitlab.inf.unibz.it>
Date: Thu, 6 May 2021 09:32:18 +0200
Subject: [PATCH] Move api in lower folder for better structure.
---
src/App.tsx | 10 +++++-----
src/{components => }/api/PrivateRoute/PrivateRoute.tsx | 2 +-
src/{components => }/api/routes.ts | 0
src/{components => }/api/userRoles.ts | 0
4 files changed, 6 insertions(+), 6 deletions(-)
rename src/{components => }/api/PrivateRoute/PrivateRoute.tsx (96%)
rename src/{components => }/api/routes.ts (100%)
rename src/{components => }/api/userRoles.ts (100%)
diff --git a/src/App.tsx b/src/App.tsx
index 702565a..fcee455 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3,11 +3,11 @@ import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
import { HomePage } from 'components/AuthUser/HomePage/HomePage';
import { AuthUser } from 'components/AuthUser/AuthUser';
import { LandingPage } from 'components/NonAuthUser/LandingPage/LandingPage';
-import { PrivateRoute } from 'components/api/PrivateRoute/PrivateRoute';
-import { AuthRoutes, NonAuthRoutes } from 'components/api/routes';
+import { PrivateRoute } from 'api/PrivateRoute/PrivateRoute';
+import { AuthRoutes, NonAuthRoutes } from 'api/routes';
import { NotFound } from 'components/NonAuthUser/NotFound/NotFound';
-import { ProfilePage } from 'components/ProfilePage/ProfilePage';
-import { Roles } from 'components/api/userRoles';
+import { ProfilePage } from 'components/AuthUser/ProfilePage/ProfilePage';
+import { Roles } from 'api/userRoles';
import { Unauthorized } from 'components/NonAuthUser/Unauthorized/Unauthorized';
import axios from 'axios';
@@ -30,7 +30,7 @@ export const App: FC = () => {
return null;
};
if (!isCookieFetched) fetchCookie();
- }, []);
+ }, [isCookieFetched]);
return (
<Router>
diff --git a/src/components/api/PrivateRoute/PrivateRoute.tsx b/src/api/PrivateRoute/PrivateRoute.tsx
similarity index 96%
rename from src/components/api/PrivateRoute/PrivateRoute.tsx
rename to src/api/PrivateRoute/PrivateRoute.tsx
index e9e431c..95065f0 100644
--- a/src/components/api/PrivateRoute/PrivateRoute.tsx
+++ b/src/api/PrivateRoute/PrivateRoute.tsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import axios from 'axios';
import { Route, Redirect, RouteProps } from 'react-router-dom';
-import { NonAuthRoutes } from 'components/api/routes';
+import { NonAuthRoutes } from 'api/routes';
/**
* A wrapper for <Route> that redirects to the login screen if you're not yet authenticated.
diff --git a/src/components/api/routes.ts b/src/api/routes.ts
similarity index 100%
rename from src/components/api/routes.ts
rename to src/api/routes.ts
diff --git a/src/components/api/userRoles.ts b/src/api/userRoles.ts
similarity index 100%
rename from src/components/api/userRoles.ts
rename to src/api/userRoles.ts
--
GitLab