Moved pages

FrontEnd/src/pages/UserProfilesTable/PaginationButtons.jsx → FrontEnd/src/pages/AdminPage/UserProfilesTable/PaginationButtons.jsx

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import css from './PaginationButtons.module.css';
-import { PAGE_SIZES_SELECTOR } from '../AdminPage/constants';
+import { PAGE_SIZES_SELECTOR } from '../constants';
 
 function PaginationButtons({ currentPage, totalPages, onPageChange, pageSize, onPageSizeChange }) {
     const goToPreviousPage = () => {

FrontEnd/src/pages/UserProfilesTable/ProfilesTable.jsx → FrontEnd/src/pages/AdminPage/UserProfilesTable/ProfilesTable.jsx

@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
 import PaginationButtons from './PaginationButtons';
 import axios from 'axios';
 import useSWR from 'swr';
-import { DEFAULT_PAGE_SIZE } from '../AdminPage/constants';
+import { DEFAULT_PAGE_SIZE } from '../constants';
 
 const COLUMN_NAMES = [
     'ID', 'Person', 'Position', 'Company', 'Region ID', 'Phone', 'EDRPOU', 'Adress', 'IsDeleted', 'IsApproved'

FrontEnd/src/pages/UserProfilesTable/UserTable.jsx → FrontEnd/src/pages/AdminPage/UserProfilesTable/UserTable.jsx

@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
 import PaginationButtons from './PaginationButtons';
 import axios from 'axios';
 import useSWR from 'swr';
-import { DEFAULT_PAGE_SIZE } from '../AdminPage/constants';
+import { DEFAULT_PAGE_SIZE } from '../constants';
 
 const COLUMN_NAMES = ['ID', 'ФІО', 'Пошта'];
 

FrontEnd/src/components/Authorization/AuthorizationPage.jsx → FrontEnd/src/pages/Authorization/AuthorizationPage.jsx

@@ -1,4 +1,4 @@
-import Login from './/Login';
+import Login from './Login';
 import classes from './AuthorizationPage.module.css';
 
 const AuthorizationPage = () => {

FrontEnd/src/components/Authorization/LoginPage.jsx → FrontEnd/src/pages/Authorization/LoginPage.jsx

@@ -9,8 +9,8 @@ import validator from 'validator';
 import EyeVisible from './EyeVisible';
 import EyeInvisible from './EyeInvisible';
 import classes from './LoginPage.module.css';
-import { useAuth } from '../../hooks/';
-import checkIfStaff from '../../pages/AdminPage/checkIfStaff';
+import { useAuth } from '../../hooks';
+import checkIfStaff from '../AdminPage/checkIfStaff';
 
 const LoginContent = () => {
   const { login } = useAuth();

FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/PasswordField.jsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { PropTypes } from 'prop-types';
-import EyeInvisible from '../../../../components/Authorization/EyeInvisible';
-import EyeVisible from '../../../../components/Authorization/EyeVisible';
+import EyeInvisible from '../../../Authorization/EyeInvisible';
+import EyeVisible from '../../../Authorization/EyeVisible';
 import preventEnterSubmit from '../../../../utils/preventEnterSubmit';
 import css from './PasswordField.module.css';
 import { PASSWORD_PATTERN } from '../../../../constants/constants';

FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm/RestorePasswordFormContent.jsx

@@ -5,8 +5,8 @@ import { useNavigate } from 'react-router-dom';
 import { useParams } from 'react-router-dom';
 import { PropTypes } from 'prop-types';
 import { PASSWORD_PATTERN } from '../../../../../constants/constants';
-import EyeInvisible from '../../../../../components/Authorization/EyeInvisible';
-import EyeVisible from '../../../../../components/Authorization/EyeVisible';
+import EyeInvisible from '../../../../Authorization/EyeInvisible';
+import EyeVisible from '../../../../Authorization/EyeVisible';
 import styles from './RestorePasswordFormContent.module.css';
 
 export function RestorePasswordFormContentComponent({ setIsValid }) {

FrontEnd/src/components/SignUp/SignUp/ActivateProfilePage.jsx → FrontEnd/src/pages/SignUp/SignUp/ActivateProfilePage.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import axios from 'axios';
 import { useParams } from 'react-router-dom';
-import AuthorizationPage from '../../Authorization/AuthorizationPage';
+import AuthorizationPage from '../../../pages/Authorization/AuthorizationPage';
 import styles from './ActivateProfileModal.module.css';
 
 export function ActivationProfilePage() {

FrontEnd/src/components/SignUp/SignupForm/SignUpFormContent.jsx → FrontEnd/src/pages/SignUp/SignupForm/SignUpFormContent.jsx

@@ -5,8 +5,8 @@ import { useNavigate } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import axios from 'axios';
 import { Tooltip } from 'antd';
-import EyeInvisible from '../../Authorization/EyeInvisible';
-import EyeVisible from '../../Authorization/EyeVisible';
+import EyeInvisible from '../../../pages/Authorization/EyeInvisible';
+import EyeVisible from '../../../pages/Authorization/EyeVisible';
 import styles from './SignUpFormContent.module.css';
 import PropTypes from 'prop-types';
 import {

FrontEnd/src/routes/AdminRouter.jsx

@@ -1,10 +1,10 @@
 import { ToastContainer } from 'react-toastify';
 import '../pages/AdminPage/AdminGlobal.css';
-import Header from '../components/Admin/Header/Header';
+import Header from '../pages/AdminPage/Header/Header';
 import Menu from '../pages/AdminPage/Menu/Menu';
 import UserDetail from '../pages/AdminPage/DetailView/UserDetail';
-import UserTable from '../pages/UserProfilesTable/UserTable';
-import ProfilesTable from '../pages/UserProfilesTable/ProfilesTable';
+import UserTable from '../pages/AdminPage/UserProfilesTable/UserTable';
+import ProfilesTable from '../pages/AdminPage/UserProfilesTable/ProfilesTable';
 import ProfileDetail from '../pages/AdminPage/DetailView/ProfileDetail';
 import css from '../pages/AdminPage/AdminPage.module.css';
 import { Routes, Route } from 'react-router-dom';

FrontEnd/src/routes/ClientRouter.jsx

@@ -7,7 +7,7 @@ import { SWRConfig } from 'swr';
 import 'react-toastify/dist/ReactToastify.css';
 import customTheme from '../pages/CustomThemes/customTheme.js';
 
-import AuthorizationPage from '../components/Authorization/AuthorizationPage';
+import AuthorizationPage from '../pages/Authorization/AuthorizationPage';
 import CookiesPolicyComponent from '../pages/CookiesPolicyPage/CookiesPolicyComponent';
 import Footer from '../components/Footer/Footer';
 import Header from '../components/Header/Header';
@@ -17,10 +17,10 @@ import PrivacyPolicy from '../pages/PrivacyPolicyPage/PrivacyPolicyPage';
 import ProfileDetailPage from '../pages/ProfileDetail/ProfileDetailPage';
 import ProfileListPage from '../pages/ProfileList/ProfileListPage';
 import ProfilePage from '../pages/ProfilePage/ProfilePage';
-import { SignUpPage } from '../components/SignUp/SignUp/SignUpPage';
-import { SignUpModalPage } from '../components/SignUp/SignUp/SignUpModalPage';
-import { ResendActivationPage } from '../components/SignUp/SignUp/ResendActivationPage';
-import { ActivationProfilePage } from '../components/SignUp/SignUp/ActivateProfilePage';
+import { SignUpPage } from '../pages/SignUp/SignUp/SignUpPage';
+import { SignUpModalPage } from '../pages/SignUp/SignUp/SignUpModalPage';
+import { ResendActivationPage } from '../pages/SignUp/SignUp/ResendActivationPage';
+import { ActivationProfilePage } from '../pages/SignUp/SignUp/ActivateProfilePage';
 import { SendEmailRestorePasswordPage } from '../pages/RestorePassword/Pages/SendEmailRestorePasswordPage';
 import { RestorePasswordPage } from '../pages/RestorePassword/Pages/RestorePasswordPage';
 import { RestorePasswordModalPage } from '../pages/RestorePassword/Pages/RestorePasswordModalPage';