delete redundant route, return Django admin, change route for UI admi…

…n page
ita-social-projects · Nov 22, 2023 · eff65e3 · eff65e3
1 parent 6b08dcc
commit eff65e3
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 21 deletions.
diff --git a/FrontEnd/src/App.js b/FrontEnd/src/App.js
@@ -5,7 +5,7 @@ import AdminPage from './components/adminPage/AdminPage';
 import BasicPage from './components/basicPage/BasicPage';
 import { AuthContext } from './context';
 import { useProvideAuth } from './hooks';
-import { Search } from './components/SearchPage/Search';
+// import { Search } from './components/SearchPage/Search';
 
 function App() {
   const auth = useProvideAuth();
@@ -16,8 +16,8 @@ function App() {
         <div className="App">
           <Routes>
             <Route path="/*" element={<BasicPage />} />
-            <Route path="/admin/*" element={<AdminPage />} />
-            <Route path="/search" element={<Search isAuthorized={auth} />} />
+            <Route path="/customadmin/*" element={<AdminPage />} />
+            {/* <Route path="/search" element={<Search isAuthorized={auth} />} /> */}
           </Routes>
         </div>
       </BrowserRouter>

diff --git a/FrontEnd/src/components/basicPage/BasicPage.jsx b/FrontEnd/src/components/basicPage/BasicPage.jsx
@@ -63,32 +63,62 @@ function BasicPage() {
     >
       <Header isAuthorized={auth.isAuth} />
       <Routes>
-        <Route path="/" element={<MainPage isAuthorized={auth.isAuth}/>} />
+        <Route path="/" element={<MainPage isAuthorized={auth.isAuth} />} />
         <Route path="/profile/*" element={<ProfilePage />} />
-        <Route path="/profile-detail/:id" element={<ProfileDetailPage isAuthorized={auth.isAuth}/>}/>
-        <Route path="/profiles/:filter" element={<ProfileListPage isAuthorized={auth.isAuth} />}/>
+        <Route
+          path="/profile-detail/:id"
+          element={<ProfileDetailPage isAuthorized={auth.isAuth} />}
+        />
+        <Route
+          path="/profiles/:filter"
+          element={<ProfileListPage isAuthorized={auth.isAuth} />}
+        />
         {auth.isAuth ? (
           <Route path="/login" element={<Navigate to="/profile/user-info" />} />
         ) : (
           <Route path="/login" element={<AuthorizationPage />} />
         )}
         {auth.isAuth ? (
-          <Route path="/sign-up" element={<Navigate to="/profile/user-info" />} />
+          <Route
+            path="/sign-up"
+            element={<Navigate to="/profile/user-info" />}
+          />
         ) : (
           <Route path="/sign-up" element={<SignUpPage />} />
         )}
         <Route path="/sign-up/modal" element={<SignUpModalPage />} />
-        <Route path="/sign-up/resend-activation" element={<ResendActivationPage />} />
-        <Route path="/activate/:uid/:token" element={<ActivationProfilePage />} />
-        <Route path="/reset-password" element={<SendEmailRestorePasswordPage />} />
-        <Route path="/reset-password/modal" element={<RestorePasswordModalPage />} />
-        <Route path="/password/reset/confirm/:uid/:token" element={<RestorePasswordPage />} />
-        <Route path="/reset-password/successfully" element={<RestorePasswordSuccessPage />} />
-        <Route path="/reset-password/failed" element={<RestorePasswordFailedPage />} />
+        <Route
+          path="/sign-up/resend-activation"
+          element={<ResendActivationPage />}
+        />
+        <Route
+          path="/activate/:uid/:token"
+          element={<ActivationProfilePage />}
+        />
+        <Route
+          path="/reset-password"
+          element={<SendEmailRestorePasswordPage />}
+        />
+        <Route
+          path="/reset-password/modal"
+          element={<RestorePasswordModalPage />}
+        />
+        <Route
+          path="/password/reset/confirm/:uid/:token"
+          element={<RestorePasswordPage />}
+        />
+        <Route
+          path="/reset-password/successfully"
+          element={<RestorePasswordSuccessPage />}
+        />
+        <Route
+          path="/reset-password/failed"
+          element={<RestorePasswordFailedPage />}
+        />
         <Route path="/privacy-policy" element={<PrivacyPolicy />} />
         <Route path="/terms-and-conditions" element={<TermsAndConditions />} />
         <Route path="/cookies-policy" element={<CookiesPolicyComponent />} />
-        <Route path="/search" element={<Search isAuthorized={auth.isAuth} />} />
+        <Route path="/search" element={<Search isAuthorized={auth} />} />
       </Routes>
       <Footer />
       <ScrollToTopButton />

diff --git a/configs/nginx/nginx.conf b/configs/nginx/nginx.conf
@@ -18,12 +18,12 @@ server {
     }
 
     # Django Admin
-    #location /admin/ {
-        #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        #proxy_set_header Host $host;
-        #proxy_pass http://api-dev:8000/admin/;
-        #proxy_redirect off;
-    #}
+    location /admin/ {
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_pass http://api-dev:8000/admin/;
+        proxy_redirect off;
+    }
 
     # PGAdmin
     location /pgadmin/ {