diff --git a/FrontEnd/src/App.jsx b/FrontEnd/src/App.jsx index 614e3f964..e9c40b406 100644 --- a/FrontEnd/src/App.jsx +++ b/FrontEnd/src/App.jsx @@ -1,30 +1,9 @@ import React from 'react'; import './App.css'; -import { createBrowserRouter, RouterProvider } from 'react-router-dom'; -import AdminPage from './components/adminPage/AdminPage'; -import BasicPage from './components/basicPage/BasicPage'; -import { AuthProvider } from './context'; +import { RouterProvider } from 'react-router-dom'; +import router from './routes/Router'; function App() { - const router = createBrowserRouter([ - { - path: '/*', - element: ( - - - - ), - }, - { - path: '/customadmin/*', - element: ( - - - - ), - }, - ]); - return (

diff --git a/FrontEnd/src/components/checkbox/Checkbox.jsx b/FrontEnd/src/components/Checkbox/Checkbox.jsx similarity index 100% rename from FrontEnd/src/components/checkbox/Checkbox.jsx rename to FrontEnd/src/components/Checkbox/Checkbox.jsx diff --git a/FrontEnd/src/components/checkbox/Checkbox.module.css b/FrontEnd/src/components/Checkbox/Checkbox.module.css similarity index 100% rename from FrontEnd/src/components/checkbox/Checkbox.module.css rename to FrontEnd/src/components/Checkbox/Checkbox.module.css diff --git a/FrontEnd/src/tests/CompanyCard.test.js b/FrontEnd/src/components/CompanyCard/tests/CompanyCard.test.js similarity index 96% rename from FrontEnd/src/tests/CompanyCard.test.js rename to FrontEnd/src/components/CompanyCard/tests/CompanyCard.test.js index 06d3f9690..aec90c8a8 100644 --- a/FrontEnd/src/tests/CompanyCard.test.js +++ b/FrontEnd/src/components/CompanyCard/tests/CompanyCard.test.js @@ -1,7 +1,7 @@ import { render, screen, cleanup } from '@testing-library/react'; import { MemoryRouter } from 'react-router-dom'; -import CompanyCard from '../components/CompanyCard/CompanyCard'; +import CompanyCard from '../CompanyCard'; const mockedUser = { email: 'test@test.com', @@ -10,7 +10,7 @@ const mockedUser = { profile_id: 1, surname: 'Test', }; -jest.mock('../hooks/useAuth', () => ({ +jest.mock('../../../hooks/useAuth', () => ({ useAuth: () => { return mockedUser; }, diff --git a/FrontEnd/src/components/Contact/Contact.jsx b/FrontEnd/src/components/Contact/Contact.jsx index 6b9520252..3eba2038b 100644 --- a/FrontEnd/src/components/Contact/Contact.jsx +++ b/FrontEnd/src/components/Contact/Contact.jsx @@ -1,6 +1,6 @@ import React from 'react'; -import renderContent from '../CookiesPolicyPage/RenderContent.jsx'; -import LinkContainer from '../CookiesPolicyPage/LinkContainer.jsx'; +import renderContent from '../../pages/CookiesPolicyPage/RenderContent.jsx'; +import LinkContainer from '../../pages/CookiesPolicyPage/LinkContainer.jsx'; import styles from './Contact.module.css'; import contactText from './text'; import TEXT_CONTENT from './text'; diff --git a/FrontEnd/src/components/cookieacception/CookieMod.jsx b/FrontEnd/src/components/CookieAcception/CookieMod.jsx similarity index 99% rename from FrontEnd/src/components/cookieacception/CookieMod.jsx rename to FrontEnd/src/components/CookieAcception/CookieMod.jsx index e79364887..adeb74350 100644 --- a/FrontEnd/src/components/cookieacception/CookieMod.jsx +++ b/FrontEnd/src/components/CookieAcception/CookieMod.jsx @@ -41,6 +41,7 @@ const CookieMod = ({ active, setActive }) => { про кукі-файли } +

{detailsVisible && (
diff --git a/FrontEnd/src/components/cookieacception/CookieMod.module.css b/FrontEnd/src/components/CookieAcception/CookieMod.module.css similarity index 100% rename from FrontEnd/src/components/cookieacception/CookieMod.module.css rename to FrontEnd/src/components/CookieAcception/CookieMod.module.css diff --git a/FrontEnd/src/tests/CookieModal.test.js b/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js similarity index 95% rename from FrontEnd/src/tests/CookieModal.test.js rename to FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js index d162a968e..150404a7a 100644 --- a/FrontEnd/src/tests/CookieModal.test.js +++ b/FrontEnd/src/components/CookieAcception/tests/CookieModal.test.js @@ -1,7 +1,7 @@ import { render, screen, cleanup } from '@testing-library/react'; import { MemoryRouter } from 'react-router-dom'; -import CookieMod from '../components/cookieacception/CookieMod'; +import CookieMod from '../CookieMod'; afterEach(cleanup); diff --git a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx b/FrontEnd/src/components/Footer/Bottom/FooterBottom.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx rename to FrontEnd/src/components/Footer/Bottom/FooterBottom.jsx diff --git a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css b/FrontEnd/src/components/Footer/Bottom/FooterBottom.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css rename to FrontEnd/src/components/Footer/Bottom/FooterBottom.module.css diff --git a/FrontEnd/src/components/HeaderFooter/footer/Footer.jsx b/FrontEnd/src/components/Footer/Footer.jsx similarity index 76% rename from FrontEnd/src/components/HeaderFooter/footer/Footer.jsx rename to FrontEnd/src/components/Footer/Footer.jsx index dde245bb2..5080b9c60 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/Footer.jsx +++ b/FrontEnd/src/components/Footer/Footer.jsx @@ -1,6 +1,6 @@ -import FooterTop from './top/FooterTop'; -import FooterBottom from './bottom/FooterBottom'; -import ShortFooter from './short/ShortFooter'; +import FooterTop from './Top/FooterTop'; +import FooterBottom from './Bottom/FooterBottom'; +import ShortFooter from './Short/ShortFooter'; import css from './Footer.module.css'; const UNSUITABLE_PAGES = ['login', 'register']; diff --git a/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css b/FrontEnd/src/components/Footer/Footer.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/Footer.module.css rename to FrontEnd/src/components/Footer/Footer.module.css diff --git a/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.jsx b/FrontEnd/src/components/Footer/Short/ShortFooter.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.jsx rename to FrontEnd/src/components/Footer/Short/ShortFooter.jsx diff --git a/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.module.css b/FrontEnd/src/components/Footer/Short/ShortFooter.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.module.css rename to FrontEnd/src/components/Footer/Short/ShortFooter.module.css diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.jsx b/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx similarity index 97% rename from FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.jsx rename to FrontEnd/src/components/Footer/Top/FooterNavigation.jsx index 4a1b7408f..0b26e5ba1 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.jsx +++ b/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx @@ -3,7 +3,7 @@ import { HashLink } from 'react-router-hash-link'; import { Link } from 'react-router-dom'; import axios from 'axios'; import css from './FooterNavigation.module.css'; -import useScrollToTop from '../../../../hooks/useScrollToTop'; +import useScrollToTop from '../../../hooks/useScrollToTop'; const PAGE_NAVIGATION_LINKS = [ { diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.module.css b/FrontEnd/src/components/Footer/Top/FooterNavigation.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.module.css rename to FrontEnd/src/components/Footer/Top/FooterNavigation.module.css diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx b/FrontEnd/src/components/Footer/Top/FooterPolicy.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx rename to FrontEnd/src/components/Footer/Top/FooterPolicy.jsx diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css b/FrontEnd/src/components/Footer/Top/FooterPolicy.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css rename to FrontEnd/src/components/Footer/Top/FooterPolicy.module.css diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterTop.jsx b/FrontEnd/src/components/Footer/Top/FooterTop.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/top/FooterTop.jsx rename to FrontEnd/src/components/Footer/Top/FooterTop.jsx diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterTop.module.css b/FrontEnd/src/components/Footer/Top/FooterTop.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/top/FooterTop.module.css rename to FrontEnd/src/components/Footer/Top/FooterTop.module.css diff --git a/FrontEnd/src/components/HeaderFooter/header/Header.jsx b/FrontEnd/src/components/Header/Header.jsx similarity index 85% rename from FrontEnd/src/components/HeaderFooter/header/Header.jsx rename to FrontEnd/src/components/Header/Header.jsx index c8c62dd67..291c665e8 100644 --- a/FrontEnd/src/components/HeaderFooter/header/Header.jsx +++ b/FrontEnd/src/components/Header/Header.jsx @@ -1,6 +1,6 @@ import css from './Header.module.css'; -import HeaderMenu from './menu/HeaderMenu'; -import Navbar from './navbar/Navbar'; +import HeaderMenu from './Menu/HeaderMenu'; +import Navbar from './Navbar/Navbar'; function Header(props) { return ( diff --git a/FrontEnd/src/components/HeaderFooter/header/Header.module.css b/FrontEnd/src/components/Header/Header.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/Header.module.css rename to FrontEnd/src/components/Header/Header.module.css diff --git a/FrontEnd/src/components/HeaderFooter/header/menu/HeaderMenu.jsx b/FrontEnd/src/components/Header/Menu/HeaderMenu.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/menu/HeaderMenu.jsx rename to FrontEnd/src/components/Header/Menu/HeaderMenu.jsx diff --git a/FrontEnd/src/components/HeaderFooter/header/menu/HeaderMenu.module.css b/FrontEnd/src/components/Header/Menu/HeaderMenu.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/menu/HeaderMenu.module.css rename to FrontEnd/src/components/Header/Menu/HeaderMenu.module.css diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Buttons.jsx b/FrontEnd/src/components/Header/Navbar/Buttons.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/Buttons.jsx rename to FrontEnd/src/components/Header/Navbar/Buttons.jsx diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Buttons.module.css b/FrontEnd/src/components/Header/Navbar/Buttons.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/Buttons.module.css rename to FrontEnd/src/components/Header/Navbar/Buttons.module.css diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/DropdownMenu.jsx b/FrontEnd/src/components/Header/Navbar/DropdownMenu.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/DropdownMenu.jsx rename to FrontEnd/src/components/Header/Navbar/DropdownMenu.jsx diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/DropdownMenu.module.css b/FrontEnd/src/components/Header/Navbar/DropdownMenu.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/DropdownMenu.module.css rename to FrontEnd/src/components/Header/Navbar/DropdownMenu.module.css diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Menu.jsx b/FrontEnd/src/components/Header/Navbar/Menu.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/Menu.jsx rename to FrontEnd/src/components/Header/Navbar/Menu.jsx diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Menu.module.css b/FrontEnd/src/components/Header/Navbar/Menu.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/Menu.module.css rename to FrontEnd/src/components/Header/Navbar/Menu.module.css diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx b/FrontEnd/src/components/Header/Navbar/Navbar.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx rename to FrontEnd/src/components/Header/Navbar/Navbar.jsx diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css b/FrontEnd/src/components/Header/Navbar/Navbar.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css rename to FrontEnd/src/components/Header/Navbar/Navbar.module.css diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx b/FrontEnd/src/components/Header/Navbar/Profile.jsx similarity index 96% rename from FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx rename to FrontEnd/src/components/Header/Navbar/Profile.jsx index d9b7570d0..c8b58684b 100644 --- a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx +++ b/FrontEnd/src/components/Header/Navbar/Profile.jsx @@ -1,6 +1,6 @@ import { Link, useNavigate } from 'react-router-dom'; import axios from 'axios'; -import { useAuth } from '../../../../hooks'; +import { useAuth } from '../../../hooks'; import DropdownMenu from './DropdownMenu'; import css from './Profile.module.css'; diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css b/FrontEnd/src/components/Header/Navbar/Profile.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css rename to FrontEnd/src/components/Header/Navbar/Profile.module.css diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.jsx b/FrontEnd/src/components/Header/Navbar/SearchBox.jsx similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.jsx rename to FrontEnd/src/components/Header/Navbar/SearchBox.jsx diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css b/FrontEnd/src/components/Header/Navbar/SearchBox.module.css similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css rename to FrontEnd/src/components/Header/Navbar/SearchBox.module.css diff --git a/FrontEnd/src/components/loader/Loader.jsx b/FrontEnd/src/components/Loader/Loader.jsx similarity index 100% rename from FrontEnd/src/components/loader/Loader.jsx rename to FrontEnd/src/components/Loader/Loader.jsx diff --git a/FrontEnd/src/components/loader/Loader.module.css b/FrontEnd/src/components/Loader/Loader.module.css similarity index 100% rename from FrontEnd/src/components/loader/Loader.module.css rename to FrontEnd/src/components/Loader/Loader.module.css diff --git a/FrontEnd/src/components/moderation/ModerationModal.jsx b/FrontEnd/src/components/Moderation/ModerationModal.jsx similarity index 95% rename from FrontEnd/src/components/moderation/ModerationModal.jsx rename to FrontEnd/src/components/Moderation/ModerationModal.jsx index 2143146e6..10a4bf44a 100644 --- a/FrontEnd/src/components/moderation/ModerationModal.jsx +++ b/FrontEnd/src/components/Moderation/ModerationModal.jsx @@ -1,8 +1,8 @@ import axios from 'axios'; import{ useState, useEffect } from 'react'; import { useParams, useSearchParams } from 'react-router-dom'; -import MainPage from '../landing-page/MainPage'; -import MyModal from '../ProfilePage/UI/MyModal/MyModal'; +import MainPage from '../../pages/LandingPage/MainPage'; +import MyModal from '../../pages/ProfilePage/UI/MyModal/MyModal'; import classes from './ModerationModal.module.css'; export function ModerationModal() { diff --git a/FrontEnd/src/components/moderation/ModerationModal.module.css b/FrontEnd/src/components/Moderation/ModerationModal.module.css similarity index 100% rename from FrontEnd/src/components/moderation/ModerationModal.module.css rename to FrontEnd/src/components/Moderation/ModerationModal.module.css diff --git a/FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.jsx b/FrontEnd/src/components/TermsAndConditionsApp/terms_conditions/TermsAndConditionsComponent.jsx similarity index 86% rename from FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.jsx rename to FrontEnd/src/components/TermsAndConditionsApp/terms_conditions/TermsAndConditionsComponent.jsx index 30bfbd015..8772bdf9a 100644 --- a/FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.jsx +++ b/FrontEnd/src/components/TermsAndConditionsApp/terms_conditions/TermsAndConditionsComponent.jsx @@ -1,8 +1,8 @@ import styles from './TermsAndConditionsComponent.module.css'; import TermsAndConditionsText from './text'; import TEXT_CONTENT from './text'; -import LinkContainer from '../../CookiesPolicyPage/LinkContainer.jsx'; -import renderContent from '../../CookiesPolicyPage/RenderContent.jsx'; +import LinkContainer from '../../../pages/CookiesPolicyPage/LinkContainer.jsx'; +import renderContent from '../../../pages/CookiesPolicyPage/RenderContent.jsx'; import useScrollToTop from '../../../hooks/useScrollToTop'; diff --git a/FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.module.css b/FrontEnd/src/components/TermsAndConditionsApp/terms_conditions/TermsAndConditionsComponent.module.css similarity index 100% rename from FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.module.css rename to FrontEnd/src/components/TermsAndConditionsApp/terms_conditions/TermsAndConditionsComponent.module.css diff --git a/FrontEnd/src/components/terms-and-conditions-app/terms_conditions/text.js b/FrontEnd/src/components/TermsAndConditionsApp/terms_conditions/text.js similarity index 100% rename from FrontEnd/src/components/terms-and-conditions-app/terms_conditions/text.js rename to FrontEnd/src/components/TermsAndConditionsApp/terms_conditions/text.js diff --git a/FrontEnd/src/components/adminPage/AdminGlobal.css b/FrontEnd/src/pages/AdminPage/AdminGlobal.css similarity index 100% rename from FrontEnd/src/components/adminPage/AdminGlobal.css rename to FrontEnd/src/pages/AdminPage/AdminGlobal.css diff --git a/FrontEnd/src/components/adminPage/AdminPage.module.css b/FrontEnd/src/pages/AdminPage/AdminPage.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/AdminPage.module.css rename to FrontEnd/src/pages/AdminPage/AdminPage.module.css diff --git a/FrontEnd/src/components/adminPage/auto-approve-delay/AutoApproveDelay.jsx b/FrontEnd/src/pages/AdminPage/AutoApproveDelay/AutoApproveDelay.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/auto-approve-delay/AutoApproveDelay.jsx rename to FrontEnd/src/pages/AdminPage/AutoApproveDelay/AutoApproveDelay.jsx diff --git a/FrontEnd/src/components/adminPage/auto-approve-delay/AutoApproveDelay.module.css b/FrontEnd/src/pages/AdminPage/AutoApproveDelay/AutoApproveDelay.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/auto-approve-delay/AutoApproveDelay.module.css rename to FrontEnd/src/pages/AdminPage/AutoApproveDelay/AutoApproveDelay.module.css diff --git a/FrontEnd/src/components/adminPage/detail-view/Contacts.jsx b/FrontEnd/src/pages/AdminPage/DetailView/Contacts.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/Contacts.jsx rename to FrontEnd/src/pages/AdminPage/DetailView/Contacts.jsx diff --git a/FrontEnd/src/components/adminPage/detail-view/Contacts.module.css b/FrontEnd/src/pages/AdminPage/DetailView/Contacts.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/Contacts.module.css rename to FrontEnd/src/pages/AdminPage/DetailView/Contacts.module.css diff --git a/FrontEnd/src/components/adminPage/detail-view/DeleteModal.jsx b/FrontEnd/src/pages/AdminPage/DetailView/DeleteModal.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/DeleteModal.jsx rename to FrontEnd/src/pages/AdminPage/DetailView/DeleteModal.jsx diff --git a/FrontEnd/src/components/adminPage/detail-view/DeleteModal.module.css b/FrontEnd/src/pages/AdminPage/DetailView/DeleteModal.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/DeleteModal.module.css rename to FrontEnd/src/pages/AdminPage/DetailView/DeleteModal.module.css diff --git a/FrontEnd/src/components/adminPage/detail-view/ModerationEmail.jsx b/FrontEnd/src/pages/AdminPage/DetailView/ModerationEmail.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/ModerationEmail.jsx rename to FrontEnd/src/pages/AdminPage/DetailView/ModerationEmail.jsx diff --git a/FrontEnd/src/components/adminPage/detail-view/ModerationEmail.module.css b/FrontEnd/src/pages/AdminPage/DetailView/ModerationEmail.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/ModerationEmail.module.css rename to FrontEnd/src/pages/AdminPage/DetailView/ModerationEmail.module.css diff --git a/FrontEnd/src/components/adminPage/detail-view/ProfileDetail.jsx b/FrontEnd/src/pages/AdminPage/DetailView/ProfileDetail.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/ProfileDetail.jsx rename to FrontEnd/src/pages/AdminPage/DetailView/ProfileDetail.jsx diff --git a/FrontEnd/src/components/adminPage/detail-view/ProfileDetail.module.css b/FrontEnd/src/pages/AdminPage/DetailView/ProfileDetail.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/ProfileDetail.module.css rename to FrontEnd/src/pages/AdminPage/DetailView/ProfileDetail.module.css diff --git a/FrontEnd/src/components/adminPage/detail-view/UserDetail.jsx b/FrontEnd/src/pages/AdminPage/DetailView/UserDetail.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/UserDetail.jsx rename to FrontEnd/src/pages/AdminPage/DetailView/UserDetail.jsx diff --git a/FrontEnd/src/components/adminPage/detail-view/UserDetail.module.css b/FrontEnd/src/pages/AdminPage/DetailView/UserDetail.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/detail-view/UserDetail.module.css rename to FrontEnd/src/pages/AdminPage/DetailView/UserDetail.module.css diff --git a/FrontEnd/src/components/adminPage/header/Header.jsx b/FrontEnd/src/pages/AdminPage/Header/Header.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/header/Header.jsx rename to FrontEnd/src/pages/AdminPage/Header/Header.jsx diff --git a/FrontEnd/src/components/adminPage/header/Header.module.css b/FrontEnd/src/pages/AdminPage/Header/Header.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/header/Header.module.css rename to FrontEnd/src/pages/AdminPage/Header/Header.module.css diff --git a/FrontEnd/src/components/adminPage/mainPage/MainPage.jsx b/FrontEnd/src/pages/AdminPage/MainPage/MainPage.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/mainPage/MainPage.jsx rename to FrontEnd/src/pages/AdminPage/MainPage/MainPage.jsx diff --git a/FrontEnd/src/components/adminPage/mainPage/Text.js b/FrontEnd/src/pages/AdminPage/MainPage/Text.js similarity index 100% rename from FrontEnd/src/components/adminPage/mainPage/Text.js rename to FrontEnd/src/pages/AdminPage/MainPage/Text.js diff --git a/FrontEnd/src/components/adminPage/mainPage/mainPage.module.css b/FrontEnd/src/pages/AdminPage/MainPage/mainPage.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/mainPage/mainPage.module.css rename to FrontEnd/src/pages/AdminPage/MainPage/mainPage.module.css diff --git a/FrontEnd/src/components/adminPage/menu/Menu.jsx b/FrontEnd/src/pages/AdminPage/Menu/Menu.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/menu/Menu.jsx rename to FrontEnd/src/pages/AdminPage/Menu/Menu.jsx diff --git a/FrontEnd/src/components/adminPage/menu/Menu.module.css b/FrontEnd/src/pages/AdminPage/Menu/Menu.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/menu/Menu.module.css rename to FrontEnd/src/pages/AdminPage/Menu/Menu.module.css diff --git a/FrontEnd/src/components/adminPage/table/PaginationButtons.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/PaginationButtons.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/table/PaginationButtons.jsx rename to FrontEnd/src/pages/AdminPage/UserProfilesTable/PaginationButtons.jsx diff --git a/FrontEnd/src/components/adminPage/table/PaginationButtons.module.css b/FrontEnd/src/pages/AdminPage/UserProfilesTable/PaginationButtons.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/table/PaginationButtons.module.css rename to FrontEnd/src/pages/AdminPage/UserProfilesTable/PaginationButtons.module.css diff --git a/FrontEnd/src/components/adminPage/table/ProfilesTable.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/ProfilesTable.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/table/ProfilesTable.jsx rename to FrontEnd/src/pages/AdminPage/UserProfilesTable/ProfilesTable.jsx diff --git a/FrontEnd/src/components/adminPage/table/ProfilesTable.module.css b/FrontEnd/src/pages/AdminPage/UserProfilesTable/ProfilesTable.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/table/ProfilesTable.module.css rename to FrontEnd/src/pages/AdminPage/UserProfilesTable/ProfilesTable.module.css diff --git a/FrontEnd/src/components/adminPage/table/UserTable.jsx b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserTable.jsx similarity index 100% rename from FrontEnd/src/components/adminPage/table/UserTable.jsx rename to FrontEnd/src/pages/AdminPage/UserProfilesTable/UserTable.jsx diff --git a/FrontEnd/src/components/adminPage/table/UserTable.module.css b/FrontEnd/src/pages/AdminPage/UserProfilesTable/UserTable.module.css similarity index 100% rename from FrontEnd/src/components/adminPage/table/UserTable.module.css rename to FrontEnd/src/pages/AdminPage/UserProfilesTable/UserTable.module.css diff --git a/FrontEnd/src/components/adminPage/checkIfStaff.js b/FrontEnd/src/pages/AdminPage/checkIfStaff.js similarity index 100% rename from FrontEnd/src/components/adminPage/checkIfStaff.js rename to FrontEnd/src/pages/AdminPage/checkIfStaff.js diff --git a/FrontEnd/src/components/adminPage/constants.js b/FrontEnd/src/pages/AdminPage/constants.js similarity index 100% rename from FrontEnd/src/components/adminPage/constants.js rename to FrontEnd/src/pages/AdminPage/constants.js diff --git a/FrontEnd/src/components/authorization/AuthorizationPage.jsx b/FrontEnd/src/pages/Authorization/AuthorizationPage.jsx similarity index 92% rename from FrontEnd/src/components/authorization/AuthorizationPage.jsx rename to FrontEnd/src/pages/Authorization/AuthorizationPage.jsx index f9b23bf1a..9631d6b4e 100644 --- a/FrontEnd/src/components/authorization/AuthorizationPage.jsx +++ b/FrontEnd/src/pages/Authorization/AuthorizationPage.jsx @@ -1,4 +1,4 @@ -import Login from '../authorization/Login'; +import Login from './Login'; import classes from './AuthorizationPage.module.css'; const AuthorizationPage = () => { diff --git a/FrontEnd/src/components/authorization/AuthorizationPage.module.css b/FrontEnd/src/pages/Authorization/AuthorizationPage.module.css similarity index 100% rename from FrontEnd/src/components/authorization/AuthorizationPage.module.css rename to FrontEnd/src/pages/Authorization/AuthorizationPage.module.css diff --git a/FrontEnd/src/components/authorization/EyeInvisible.jsx b/FrontEnd/src/pages/Authorization/EyeInvisible.jsx similarity index 100% rename from FrontEnd/src/components/authorization/EyeInvisible.jsx rename to FrontEnd/src/pages/Authorization/EyeInvisible.jsx diff --git a/FrontEnd/src/components/authorization/EyeVisible.jsx b/FrontEnd/src/pages/Authorization/EyeVisible.jsx similarity index 100% rename from FrontEnd/src/components/authorization/EyeVisible.jsx rename to FrontEnd/src/pages/Authorization/EyeVisible.jsx diff --git a/FrontEnd/src/components/authorization/Login.jsx b/FrontEnd/src/pages/Authorization/Login.jsx similarity index 100% rename from FrontEnd/src/components/authorization/Login.jsx rename to FrontEnd/src/pages/Authorization/Login.jsx diff --git a/FrontEnd/src/components/authorization/Login.module.css b/FrontEnd/src/pages/Authorization/Login.module.css similarity index 100% rename from FrontEnd/src/components/authorization/Login.module.css rename to FrontEnd/src/pages/Authorization/Login.module.css diff --git a/FrontEnd/src/components/authorization/LoginPage.jsx b/FrontEnd/src/pages/Authorization/LoginPage.jsx similarity index 98% rename from FrontEnd/src/components/authorization/LoginPage.jsx rename to FrontEnd/src/pages/Authorization/LoginPage.jsx index ed9c3620d..aa44ae703 100644 --- a/FrontEnd/src/components/authorization/LoginPage.jsx +++ b/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 '../adminPage/checkIfStaff'; +import { useAuth } from '../../hooks'; +import checkIfStaff from '../AdminPage/checkIfStaff'; const LoginContent = () => { const { login } = useAuth(); diff --git a/FrontEnd/src/components/authorization/LoginPage.module.css b/FrontEnd/src/pages/Authorization/LoginPage.module.css similarity index 100% rename from FrontEnd/src/components/authorization/LoginPage.module.css rename to FrontEnd/src/pages/Authorization/LoginPage.module.css diff --git a/FrontEnd/src/components/authorization/SignUpInvitation.jsx b/FrontEnd/src/pages/Authorization/SignUpInvitation.jsx similarity index 100% rename from FrontEnd/src/components/authorization/SignUpInvitation.jsx rename to FrontEnd/src/pages/Authorization/SignUpInvitation.jsx diff --git a/FrontEnd/src/components/authorization/SignUpInvitation.module.css b/FrontEnd/src/pages/Authorization/SignUpInvitation.module.css similarity index 100% rename from FrontEnd/src/components/authorization/SignUpInvitation.module.css rename to FrontEnd/src/pages/Authorization/SignUpInvitation.module.css diff --git a/FrontEnd/src/components/CookiesPolicyPage/CookiesPolicyComponent.jsx b/FrontEnd/src/pages/CookiesPolicyPage/CookiesPolicyComponent.jsx similarity index 100% rename from FrontEnd/src/components/CookiesPolicyPage/CookiesPolicyComponent.jsx rename to FrontEnd/src/pages/CookiesPolicyPage/CookiesPolicyComponent.jsx diff --git a/FrontEnd/src/components/CookiesPolicyPage/LinkContainer.jsx b/FrontEnd/src/pages/CookiesPolicyPage/LinkContainer.jsx similarity index 100% rename from FrontEnd/src/components/CookiesPolicyPage/LinkContainer.jsx rename to FrontEnd/src/pages/CookiesPolicyPage/LinkContainer.jsx diff --git a/FrontEnd/src/components/CookiesPolicyPage/RenderContent.jsx b/FrontEnd/src/pages/CookiesPolicyPage/RenderContent.jsx similarity index 100% rename from FrontEnd/src/components/CookiesPolicyPage/RenderContent.jsx rename to FrontEnd/src/pages/CookiesPolicyPage/RenderContent.jsx diff --git a/FrontEnd/src/components/CookiesPolicyPage/RenderingTextContainer.jsx b/FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx similarity index 100% rename from FrontEnd/src/components/CookiesPolicyPage/RenderingTextContainer.jsx rename to FrontEnd/src/pages/CookiesPolicyPage/RenderingTextContainer.jsx diff --git a/FrontEnd/src/components/CookiesPolicyPage/cookiesPolicyComponent.module.css b/FrontEnd/src/pages/CookiesPolicyPage/cookiesPolicyComponent.module.css similarity index 100% rename from FrontEnd/src/components/CookiesPolicyPage/cookiesPolicyComponent.module.css rename to FrontEnd/src/pages/CookiesPolicyPage/cookiesPolicyComponent.module.css diff --git a/FrontEnd/src/components/CookiesPolicyPage/text.js b/FrontEnd/src/pages/CookiesPolicyPage/text.js similarity index 100% rename from FrontEnd/src/components/CookiesPolicyPage/text.js rename to FrontEnd/src/pages/CookiesPolicyPage/text.js diff --git a/FrontEnd/src/components/basicPage/customTheme.js b/FrontEnd/src/pages/CustomThemes/customTheme.js similarity index 100% rename from FrontEnd/src/components/basicPage/customTheme.js rename to FrontEnd/src/pages/CustomThemes/customTheme.js diff --git a/FrontEnd/src/components/basicPage/customToastStyles.css b/FrontEnd/src/pages/CustomThemes/customToastStyles.css similarity index 100% rename from FrontEnd/src/components/basicPage/customToastStyles.css rename to FrontEnd/src/pages/CustomThemes/customToastStyles.css diff --git a/FrontEnd/src/components/errorPages/ErrorPage404.jsx b/FrontEnd/src/pages/ErrorPages/ErrorPage404.jsx similarity index 100% rename from FrontEnd/src/components/errorPages/ErrorPage404.jsx rename to FrontEnd/src/pages/ErrorPages/ErrorPage404.jsx diff --git a/FrontEnd/src/components/errorPages/ErrorPage404.module.css b/FrontEnd/src/pages/ErrorPages/ErrorPage404.module.css similarity index 100% rename from FrontEnd/src/components/errorPages/ErrorPage404.module.css rename to FrontEnd/src/pages/ErrorPages/ErrorPage404.module.css diff --git a/FrontEnd/src/components/landing-page/about-section/About.css b/FrontEnd/src/pages/LandingPage/AboutSection/About.css similarity index 100% rename from FrontEnd/src/components/landing-page/about-section/About.css rename to FrontEnd/src/pages/LandingPage/AboutSection/About.css diff --git a/FrontEnd/src/components/landing-page/about-section/About.jsx b/FrontEnd/src/pages/LandingPage/AboutSection/About.jsx similarity index 92% rename from FrontEnd/src/components/landing-page/about-section/About.jsx rename to FrontEnd/src/pages/LandingPage/AboutSection/About.jsx index e4340ecfd..2456193f5 100644 --- a/FrontEnd/src/components/landing-page/about-section/About.jsx +++ b/FrontEnd/src/pages/LandingPage/AboutSection/About.jsx @@ -1,7 +1,7 @@ import './About.css'; import React from 'react'; -import AboutSectionCards from './cards/AboutCards'; -import AboutSectionText from './about-text/AboutText'; +import AboutSectionCards from './Cards/AboutCards'; +import AboutSectionText from './AboutText/AboutText'; import AboutTextContent from './AboutMainText.js'; const MainAboutSection = () => { diff --git a/FrontEnd/src/components/landing-page/about-section/AboutMainText.js b/FrontEnd/src/pages/LandingPage/AboutSection/AboutMainText.js similarity index 100% rename from FrontEnd/src/components/landing-page/about-section/AboutMainText.js rename to FrontEnd/src/pages/LandingPage/AboutSection/AboutMainText.js diff --git a/FrontEnd/src/components/landing-page/about-section/about-text/AboutText.css b/FrontEnd/src/pages/LandingPage/AboutSection/AboutText/AboutText.css similarity index 100% rename from FrontEnd/src/components/landing-page/about-section/about-text/AboutText.css rename to FrontEnd/src/pages/LandingPage/AboutSection/AboutText/AboutText.css diff --git a/FrontEnd/src/components/landing-page/about-section/about-text/AboutText.jsx b/FrontEnd/src/pages/LandingPage/AboutSection/AboutText/AboutText.jsx similarity index 100% rename from FrontEnd/src/components/landing-page/about-section/about-text/AboutText.jsx rename to FrontEnd/src/pages/LandingPage/AboutSection/AboutText/AboutText.jsx diff --git a/FrontEnd/src/components/landing-page/about-section/about-text/text.js b/FrontEnd/src/pages/LandingPage/AboutSection/AboutText/text.js similarity index 100% rename from FrontEnd/src/components/landing-page/about-section/about-text/text.js rename to FrontEnd/src/pages/LandingPage/AboutSection/AboutText/text.js diff --git a/FrontEnd/src/components/landing-page/about-section/cards/AboutCards.css b/FrontEnd/src/pages/LandingPage/AboutSection/Cards/AboutCards.css similarity index 100% rename from FrontEnd/src/components/landing-page/about-section/cards/AboutCards.css rename to FrontEnd/src/pages/LandingPage/AboutSection/Cards/AboutCards.css diff --git a/FrontEnd/src/components/landing-page/about-section/cards/AboutCards.jsx b/FrontEnd/src/pages/LandingPage/AboutSection/Cards/AboutCards.jsx similarity index 100% rename from FrontEnd/src/components/landing-page/about-section/cards/AboutCards.jsx rename to FrontEnd/src/pages/LandingPage/AboutSection/Cards/AboutCards.jsx diff --git a/FrontEnd/src/components/landing-page/about-section/cards/text.js b/FrontEnd/src/pages/LandingPage/AboutSection/Cards/text.js similarity index 100% rename from FrontEnd/src/components/landing-page/about-section/cards/text.js rename to FrontEnd/src/pages/LandingPage/AboutSection/Cards/text.js diff --git a/FrontEnd/src/components/landing-page/banner/Banner.css b/FrontEnd/src/pages/LandingPage/Banner/Banner.css similarity index 100% rename from FrontEnd/src/components/landing-page/banner/Banner.css rename to FrontEnd/src/pages/LandingPage/Banner/Banner.css diff --git a/FrontEnd/src/components/landing-page/banner/Banner.jsx b/FrontEnd/src/pages/LandingPage/Banner/Banner.jsx similarity index 100% rename from FrontEnd/src/components/landing-page/banner/Banner.jsx rename to FrontEnd/src/pages/LandingPage/Banner/Banner.jsx diff --git a/FrontEnd/src/components/landing-page/companies/Companies.jsx b/FrontEnd/src/pages/LandingPage/Companies/Companies.jsx similarity index 96% rename from FrontEnd/src/components/landing-page/companies/Companies.jsx rename to FrontEnd/src/pages/LandingPage/Companies/Companies.jsx index 5fad295c0..e56a5171c 100644 --- a/FrontEnd/src/components/landing-page/companies/Companies.jsx +++ b/FrontEnd/src/pages/LandingPage/Companies/Companies.jsx @@ -1,7 +1,7 @@ import axios from 'axios'; import { useState, useEffect } from 'react'; import styles from './Companies.module.css'; -import CompanyCard from '../../CompanyCard/CompanyCard'; +import CompanyCard from '../../../components/CompanyCard/CompanyCard'; import PropTypes from 'prop-types'; import useSWR from 'swr'; diff --git a/FrontEnd/src/components/landing-page/companies/Companies.module.css b/FrontEnd/src/pages/LandingPage/Companies/Companies.module.css similarity index 100% rename from FrontEnd/src/components/landing-page/companies/Companies.module.css rename to FrontEnd/src/pages/LandingPage/Companies/Companies.module.css diff --git a/FrontEnd/src/tests/MainCompanies.test.js b/FrontEnd/src/pages/LandingPage/Companies/tests/MainCompanies.test.js similarity index 96% rename from FrontEnd/src/tests/MainCompanies.test.js rename to FrontEnd/src/pages/LandingPage/Companies/tests/MainCompanies.test.js index 8ea076580..1ca395dfe 100644 --- a/FrontEnd/src/tests/MainCompanies.test.js +++ b/FrontEnd/src/pages/LandingPage/Companies/tests/MainCompanies.test.js @@ -1,6 +1,6 @@ import { render, screen } from '@testing-library/react'; import { MemoryRouter } from 'react-router-dom'; -import MainCompanies from '../components/landing-page/companies/Companies'; +import MainCompanies from '../Companies'; afterEach(() => { jest.resetAllMocks(); diff --git a/FrontEnd/src/components/landing-page/login-banner/LoginBanner.css b/FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.css similarity index 100% rename from FrontEnd/src/components/landing-page/login-banner/LoginBanner.css rename to FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.css diff --git a/FrontEnd/src/components/landing-page/login-banner/LoginBanner.jsx b/FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.jsx similarity index 100% rename from FrontEnd/src/components/landing-page/login-banner/LoginBanner.jsx rename to FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.jsx diff --git a/FrontEnd/src/components/landing-page/MainPage.jsx b/FrontEnd/src/pages/LandingPage/MainPage.jsx similarity index 77% rename from FrontEnd/src/components/landing-page/MainPage.jsx rename to FrontEnd/src/pages/LandingPage/MainPage.jsx index a2e4e9be0..82527e016 100644 --- a/FrontEnd/src/components/landing-page/MainPage.jsx +++ b/FrontEnd/src/pages/LandingPage/MainPage.jsx @@ -1,10 +1,10 @@ import { useState } from 'react'; -import MainBanner from './banner/Banner'; +import MainBanner from './Banner/Banner'; // import MainPartners from './partners/Partners'; -import MainCompanies from './companies/Companies'; -import MainLoginBanner from './login-banner/LoginBanner'; -import MainAboutSection from './about-section/About'; -import CookieMod from '../cookieacception/CookieMod'; +import MainCompanies from './Companies/Companies'; +import MainLoginBanner from './LoginBanner/LoginBanner'; +import MainAboutSection from './AboutSection/About'; +import CookieMod from '../../components/CookieAcception/CookieMod'; import css from './MainPage.module.css'; import PropTypes from 'prop-types'; diff --git a/FrontEnd/src/components/landing-page/MainPage.module.css b/FrontEnd/src/pages/LandingPage/MainPage.module.css similarity index 100% rename from FrontEnd/src/components/landing-page/MainPage.module.css rename to FrontEnd/src/pages/LandingPage/MainPage.module.css diff --git a/FrontEnd/src/components/landing-page/partners/Partners.css b/FrontEnd/src/pages/LandingPage/Partners/Partners.css similarity index 100% rename from FrontEnd/src/components/landing-page/partners/Partners.css rename to FrontEnd/src/pages/LandingPage/Partners/Partners.css diff --git a/FrontEnd/src/components/landing-page/partners/Partners.jsx b/FrontEnd/src/pages/LandingPage/Partners/Partners.jsx similarity index 100% rename from FrontEnd/src/components/landing-page/partners/Partners.jsx rename to FrontEnd/src/pages/LandingPage/Partners/Partners.jsx diff --git a/FrontEnd/src/components/PrivacyPolicyPage/PrivacyPolicy.module.css b/FrontEnd/src/pages/PrivacyPolicyPage/PrivacyPolicy.module.css similarity index 100% rename from FrontEnd/src/components/PrivacyPolicyPage/PrivacyPolicy.module.css rename to FrontEnd/src/pages/PrivacyPolicyPage/PrivacyPolicy.module.css diff --git a/FrontEnd/src/components/PrivacyPolicyPage/PrivacyPolicyPage.jsx b/FrontEnd/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.jsx similarity index 100% rename from FrontEnd/src/components/PrivacyPolicyPage/PrivacyPolicyPage.jsx rename to FrontEnd/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.jsx diff --git a/FrontEnd/src/components/PrivacyPolicyPage/text.js b/FrontEnd/src/pages/PrivacyPolicyPage/text.js similarity index 100% rename from FrontEnd/src/components/PrivacyPolicyPage/text.js rename to FrontEnd/src/pages/PrivacyPolicyPage/text.js diff --git a/FrontEnd/src/components/ProfileDetail/BannerImage.jsx b/FrontEnd/src/pages/ProfileDetail/BannerImage.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/BannerImage.jsx rename to FrontEnd/src/pages/ProfileDetail/BannerImage.jsx diff --git a/FrontEnd/src/components/ProfileDetail/BannerImage.module.css b/FrontEnd/src/pages/ProfileDetail/BannerImage.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/BannerImage.module.css rename to FrontEnd/src/pages/ProfileDetail/BannerImage.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Company.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/Company.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/Company.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/Company.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Company.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/Company.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/Company.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/Company.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/CompanyDescription.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/CompanyDescription.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/CompanyDescription.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/CompanyDescription.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/CompanyDescription.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/CompanyDescription.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/CompanyDescription.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/CompanyDescription.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Cooperation.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/Cooperation.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/Cooperation.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/Cooperation.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Cooperation.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/Cooperation.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/Cooperation.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/Cooperation.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/DataContacts.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/DataContacts.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/DataContacts.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/DataContacts.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/DataContacts.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/DataContacts.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/DataContacts.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/DataContacts.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/DetailedInfoSection.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/DetailedInfoSection.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/DetailedInfoSection.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/DetailedInfoSection.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/DetailedInfoSection.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/DetailedInfoSection.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/DetailedInfoSection.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/DetailedInfoSection.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Logistics.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/Logistics.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/Logistics.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/Logistics.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Logistics.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/Logistics.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/Logistics.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/Logistics.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/PhoneEmail.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/PhoneEmail.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/PhoneEmail.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/PhoneEmail.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/PhoneEmail.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/PhoneEmail.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/PhoneEmail.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/PhoneEmail.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ProductsServices.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/ProductsServices.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/ProductsServices.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/ProductsServices.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ProductsServices.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/ProductsServices.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/ProductsServices.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/ProductsServices.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/ReadMore.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/ReadMore.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/ReadMore.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/ReadMore.module.css diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Startup.jsx b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/Startup.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/Startup.jsx rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/Startup.jsx diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Startup.module.css b/FrontEnd/src/pages/ProfileDetail/DetailedInfo/Startup.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/DetailedInfo/Startup.module.css rename to FrontEnd/src/pages/ProfileDetail/DetailedInfo/Startup.module.css diff --git a/FrontEnd/src/components/ProfileDetail/EmptyData.jsx b/FrontEnd/src/pages/ProfileDetail/EmptyData.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/EmptyData.jsx rename to FrontEnd/src/pages/ProfileDetail/EmptyData.jsx diff --git a/FrontEnd/src/components/ProfileDetail/EmptyData.module.css b/FrontEnd/src/pages/ProfileDetail/EmptyData.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/EmptyData.module.css rename to FrontEnd/src/pages/ProfileDetail/EmptyData.module.css diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/DefaultLogo.jsx b/FrontEnd/src/pages/ProfileDetail/MainInfo/DefaultLogo.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/MainInfo/DefaultLogo.jsx rename to FrontEnd/src/pages/ProfileDetail/MainInfo/DefaultLogo.jsx diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/DefaultLogo.module.css b/FrontEnd/src/pages/ProfileDetail/MainInfo/DefaultLogo.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/MainInfo/DefaultLogo.module.css rename to FrontEnd/src/pages/ProfileDetail/MainInfo/DefaultLogo.module.css diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/MainInfoSection.jsx b/FrontEnd/src/pages/ProfileDetail/MainInfo/MainInfoSection.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/MainInfo/MainInfoSection.jsx rename to FrontEnd/src/pages/ProfileDetail/MainInfo/MainInfoSection.jsx diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/MainInfoSection.module.css b/FrontEnd/src/pages/ProfileDetail/MainInfo/MainInfoSection.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/MainInfo/MainInfoSection.module.css rename to FrontEnd/src/pages/ProfileDetail/MainInfo/MainInfoSection.module.css diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/ProfileDetailNavBar.jsx b/FrontEnd/src/pages/ProfileDetail/MainInfo/ProfileDetailNavBar.jsx similarity index 100% rename from FrontEnd/src/components/ProfileDetail/MainInfo/ProfileDetailNavBar.jsx rename to FrontEnd/src/pages/ProfileDetail/MainInfo/ProfileDetailNavBar.jsx diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/ProfileDetailNavBar.module.css b/FrontEnd/src/pages/ProfileDetail/MainInfo/ProfileDetailNavBar.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/MainInfo/ProfileDetailNavBar.module.css rename to FrontEnd/src/pages/ProfileDetail/MainInfo/ProfileDetailNavBar.module.css diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.jsx b/FrontEnd/src/pages/ProfileDetail/MainInfo/TitleInfo.jsx similarity index 96% rename from FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.jsx rename to FrontEnd/src/pages/ProfileDetail/MainInfo/TitleInfo.jsx index b555f2d40..0355a21eb 100644 --- a/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.jsx +++ b/FrontEnd/src/pages/ProfileDetail/MainInfo/TitleInfo.jsx @@ -6,8 +6,8 @@ import classNames from 'classnames'; import { useAuth } from '../../../hooks'; import DefaultLogo from './DefaultLogo'; import classes from './TitleInfo.module.css'; -import CategoryBadges from '../../MiniComponents/CategoryBadges'; -import StarForLike from '../../MiniComponents/StarForLike'; +import CategoryBadges from '../../../components/MiniComponents/CategoryBadges'; +import StarForLike from '../../../components/MiniComponents/StarForLike'; function TitleInfo({ isAuthorized, data }) { const { user } = useAuth(); diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.module.css b/FrontEnd/src/pages/ProfileDetail/MainInfo/TitleInfo.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.module.css rename to FrontEnd/src/pages/ProfileDetail/MainInfo/TitleInfo.module.css diff --git a/FrontEnd/src/components/ProfileDetail/ProfileDetailPage.jsx b/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.jsx similarity index 92% rename from FrontEnd/src/components/ProfileDetail/ProfileDetailPage.jsx rename to FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.jsx index 0ffe54a55..3760e220b 100644 --- a/FrontEnd/src/components/ProfileDetail/ProfileDetailPage.jsx +++ b/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.jsx @@ -4,14 +4,14 @@ import { useState } from 'react'; import { useParams } from 'react-router-dom'; import { PropTypes } from 'prop-types'; -import Loader from '../loader/Loader'; -import ErrorPage404 from '../errorPages/ErrorPage404'; +import Loader from '../../components/Loader/Loader'; +import ErrorPage404 from '../../pages/ErrorPages/ErrorPage404'; import MainInfoSection from './MainInfo/MainInfoSection'; import DetailedInfoSection from './DetailedInfo/DetailedInfoSection'; import BannerImage from './BannerImage'; import { ActiveLinksContext } from '../../context/ActiveLinksContext'; import classes from './ProfileDetailPage.module.css'; -import PendingStatus from '../MiniComponents/PendingModerationIcon/PendingStatus'; +import PendingStatus from '../../components/MiniComponents/PendingModerationIcon/PendingStatus'; function ProfileDetailPage({ isAuthorized }) { const [activeLinks, setActiveLinks] = useState([]); diff --git a/FrontEnd/src/components/ProfileDetail/ProfileDetailPage.module.css b/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.module.css similarity index 100% rename from FrontEnd/src/components/ProfileDetail/ProfileDetailPage.module.css rename to FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.module.css diff --git a/FrontEnd/src/components/profileList/ProfileCard.jsx b/FrontEnd/src/pages/ProfileList/ProfileCard.jsx similarity index 95% rename from FrontEnd/src/components/profileList/ProfileCard.jsx rename to FrontEnd/src/pages/ProfileList/ProfileCard.jsx index a0574dbe6..9f25d2db6 100644 --- a/FrontEnd/src/components/profileList/ProfileCard.jsx +++ b/FrontEnd/src/pages/ProfileList/ProfileCard.jsx @@ -7,9 +7,9 @@ import { PropTypes } from 'prop-types'; import { useAuth } from '../../hooks'; import css from './ProfileCard.module.css'; import axios from 'axios'; -import CategoryBadges from '../MiniComponents/CategoryBadges'; -import StarForLike from '../MiniComponents/StarForLike'; -import BellForUpdates from '../MiniComponents/BellForUpdates'; +import CategoryBadges from '../../components/MiniComponents/CategoryBadges'; +import StarForLike from '../../components/MiniComponents/StarForLike'; +import BellForUpdates from '../../components/MiniComponents/BellForUpdates'; const { Paragraph } = Typography; diff --git a/FrontEnd/src/components/profileList/ProfileCard.module.css b/FrontEnd/src/pages/ProfileList/ProfileCard.module.css similarity index 100% rename from FrontEnd/src/components/profileList/ProfileCard.module.css rename to FrontEnd/src/pages/ProfileList/ProfileCard.module.css diff --git a/FrontEnd/src/components/profileList/ProfileList.jsx b/FrontEnd/src/pages/ProfileList/ProfileList.jsx similarity index 100% rename from FrontEnd/src/components/profileList/ProfileList.jsx rename to FrontEnd/src/pages/ProfileList/ProfileList.jsx diff --git a/FrontEnd/src/components/profileList/ProfileList.module.css b/FrontEnd/src/pages/ProfileList/ProfileList.module.css similarity index 100% rename from FrontEnd/src/components/profileList/ProfileList.module.css rename to FrontEnd/src/pages/ProfileList/ProfileList.module.css diff --git a/FrontEnd/src/components/profileList/ProfileListPage.jsx b/FrontEnd/src/pages/ProfileList/ProfileListPage.jsx similarity index 96% rename from FrontEnd/src/components/profileList/ProfileListPage.jsx rename to FrontEnd/src/pages/ProfileList/ProfileListPage.jsx index d88360290..a7406d7b0 100644 --- a/FrontEnd/src/components/profileList/ProfileListPage.jsx +++ b/FrontEnd/src/pages/ProfileList/ProfileListPage.jsx @@ -5,8 +5,8 @@ import axios from 'axios'; import { Radio } from 'antd'; import useSWR from 'swr'; -import ErrorPage404 from '../errorPages/ErrorPage404'; -import Loader from '../loader/Loader'; +import ErrorPage404 from '../ErrorPages/ErrorPage404'; +import Loader from '../../components/Loader/Loader'; import ProfileList from './ProfileList'; import css from './ProfileListPage.module.css'; diff --git a/FrontEnd/src/components/profileList/ProfileListPage.module.css b/FrontEnd/src/pages/ProfileList/ProfileListPage.module.css similarity index 100% rename from FrontEnd/src/components/profileList/ProfileListPage.module.css rename to FrontEnd/src/pages/ProfileList/ProfileListPage.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/AdditionalInfo.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/AdditionalInfo.jsx similarity index 98% rename from FrontEnd/src/components/ProfilePage/FormComponents/AdditionalInfo.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/AdditionalInfo.jsx index 184e82668..cc0f0fd14 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/AdditionalInfo.jsx +++ b/FrontEnd/src/pages/ProfilePage/FormComponents/AdditionalInfo.jsx @@ -7,7 +7,7 @@ import checkFormIsDirty from '../../../utils/checkFormIsDirty'; import defineChanges from '../../../utils/defineChanges'; import { useAuth, useProfile } from '../../../hooks'; import HalfFormField from './FormFields/HalfFormField'; -import Loader from '../../loader/Loader'; +import Loader from '../../../components/Loader/Loader'; import css from './FormComponents.module.css'; const LABELS = { diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/BanerModeration.css b/FrontEnd/src/pages/ProfilePage/FormComponents/BanerModeration.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/BanerModeration.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/BanerModeration.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/BanerModeration.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/BanerModeration.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/BanerModeration.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/BanerModeration.jsx diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/ChangePassword.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/ChangePassword.jsx similarity index 98% rename from FrontEnd/src/components/ProfilePage/FormComponents/ChangePassword.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/ChangePassword.jsx index 6cc22b49a..32b408fd7 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/ChangePassword.jsx +++ b/FrontEnd/src/pages/ProfilePage/FormComponents/ChangePassword.jsx @@ -6,7 +6,7 @@ import { useContext } from 'react'; import { useForm } from 'react-hook-form'; import { DirtyFormContext } from '../../../context/DirtyFormContext'; import PasswordField from './FormFields/PasswordField'; -import Loader from '../../loader/Loader'; +import Loader from '../../../components/Loader/Loader'; import css from './ChangePassword.module.css'; export default function ChangePassword(props) { diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/ChangePassword.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/ChangePassword.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/ChangePassword.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/ChangePassword.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/ContactsInfo.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/ContactsInfo.jsx similarity index 98% rename from FrontEnd/src/components/ProfilePage/FormComponents/ContactsInfo.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/ContactsInfo.jsx index 3499b910f..6d5f9fe88 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/ContactsInfo.jsx +++ b/FrontEnd/src/pages/ProfilePage/FormComponents/ContactsInfo.jsx @@ -8,7 +8,7 @@ import defineChanges from '../../../utils/defineChanges'; import { formatPhoneNumber } from '../../../utils/formatPhoneNumber'; import FullField from './FormFields/FullField'; import HalfFormField from './FormFields/HalfFormField'; -import Loader from '../../loader/Loader'; +import Loader from '../../../components/Loader/Loader'; import css from './FormComponents.module.css'; import { useMask } from '@react-input/mask'; diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.jsx diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.jsx diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormComponents.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/FormComponents.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormComponents.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormComponents.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/CheckBoxField.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/CheckBoxField.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/CheckBoxField.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/CheckBoxField.jsx diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/CheckBoxField.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/CheckBoxField.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/CheckBoxField.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/CheckBoxField.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/FullField.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/FullField.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/FullField.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/FullField.jsx diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/FullField.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/FullField.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/FullField.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/FullField.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/HalfFormField.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/HalfFormField.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/HalfFormField.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/HalfFormField.jsx diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/HalfFormField.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/HalfFormField.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/HalfFormField.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/HalfFormField.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/ImageField.jsx similarity index 97% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/ImageField.jsx index b5c801207..84b8c86c0 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.jsx +++ b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/ImageField.jsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import preventEnterSubmit from '../../../../utils/preventEnterSubmit'; import css from './ImageField.module.css'; -import PendingStatus from '../../../MiniComponents/PendingModerationIcon/PendingStatus'; +import PendingStatus from '../../../../components/MiniComponents/PendingModerationIcon/PendingStatus'; const ImageField = ({ name, diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/ImageField.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/ImageField.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/MultipleSelectChip.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/MultipleSelectChip.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/MultipleSelectChip.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/MultipleSelectChip.jsx diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/MultipleSelectChip.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/MultipleSelectChip.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/MultipleSelectChip.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/MultipleSelectChip.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/PasswordField.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/PasswordField.jsx similarity index 95% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/PasswordField.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/PasswordField.jsx index 7044fd6a3..79359eadc 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/PasswordField.jsx +++ b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/PasswordField.jsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import { PropTypes } from 'prop-types'; -import EyeInvisible from '../../../authorization/EyeInvisible'; -import EyeVisible from '../../../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'; diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/PasswordField.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/PasswordField.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/PasswordField.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/PasswordField.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/TextField.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/TextField.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/TextField.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/TextField.jsx diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/TextField.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/TextField.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/FormFields/TextField.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/FormFields/TextField.module.css diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/GeneralInfo.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/GeneralInfo.jsx similarity index 99% rename from FrontEnd/src/components/ProfilePage/FormComponents/GeneralInfo.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/GeneralInfo.jsx index dc6f0cf5c..1de7f2ee7 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/GeneralInfo.jsx +++ b/FrontEnd/src/pages/ProfilePage/FormComponents/GeneralInfo.jsx @@ -16,7 +16,7 @@ import HalfFormField from './FormFields/HalfFormField'; import ImageField from './FormFields/ImageField'; import MultipleSelectChip from './FormFields/MultipleSelectChip'; import TextField from './FormFields/TextField'; -import Loader from '../../loader/Loader'; +import Loader from '../../../components/Loader/Loader'; import validateEdrpou from '../../../utils/validateEdrpou'; import validateRnokpp from '../../../utils/validateRnokpp'; import BanerModeration from './BanerModeration'; diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/ProductServiceInfo.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/ProductServiceInfo.jsx similarity index 98% rename from FrontEnd/src/components/ProfilePage/FormComponents/ProductServiceInfo.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/ProductServiceInfo.jsx index fd99c01e8..54aade2c0 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/ProductServiceInfo.jsx +++ b/FrontEnd/src/pages/ProfilePage/FormComponents/ProductServiceInfo.jsx @@ -7,7 +7,7 @@ import checkFormIsDirty from '../../../utils/checkFormIsDirty'; import defineChanges from '../../../utils/defineChanges'; import { useAuth, useProfile } from '../../../hooks'; import TextField from './FormFields/TextField'; -import Loader from '../../loader/Loader'; +import Loader from '../../../components/Loader/Loader'; import css from './FormComponents.module.css'; const LABELS = { diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/StartupInfo.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/StartupInfo.jsx similarity index 98% rename from FrontEnd/src/components/ProfilePage/FormComponents/StartupInfo.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/StartupInfo.jsx index 563d00d3f..376338db9 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/StartupInfo.jsx +++ b/FrontEnd/src/pages/ProfilePage/FormComponents/StartupInfo.jsx @@ -7,7 +7,7 @@ import checkFormIsDirty from '../../../utils/checkFormIsDirty'; import defineChanges from '../../../utils/defineChanges'; import { useAuth, useProfile } from '../../../hooks'; import TextField from './FormFields/TextField'; -import Loader from '../../loader/Loader'; +import Loader from '../../../components/Loader/Loader'; import css from './FormComponents.module.css'; const LABELS = { diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/UserInfo.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/UserInfo.jsx similarity index 99% rename from FrontEnd/src/components/ProfilePage/FormComponents/UserInfo.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/UserInfo.jsx index d070ddb0d..329f01315 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/UserInfo.jsx +++ b/FrontEnd/src/pages/ProfilePage/FormComponents/UserInfo.jsx @@ -7,7 +7,7 @@ import { useAuth, useProfile } from '../../../hooks'; import checkFormIsDirty from '../../../utils/checkFormIsDirty'; import defineChanges from '../../../utils/defineChanges'; import HalfFormField from './FormFields/HalfFormField'; -import Loader from '../../loader/Loader'; +import Loader from '../../../components/Loader/Loader'; import css from './FormComponents.module.css'; const LABELS = { diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx rename to FrontEnd/src/pages/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/WarnUnsavedDataModal.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.module.css rename to FrontEnd/src/pages/ProfilePage/FormComponents/WarnUnsavedDataModal.module.css diff --git a/FrontEnd/src/components/ProfilePage/ProfilePage.jsx b/FrontEnd/src/pages/ProfilePage/ProfilePage.jsx similarity index 89% rename from FrontEnd/src/components/ProfilePage/ProfilePage.jsx rename to FrontEnd/src/pages/ProfilePage/ProfilePage.jsx index 8e8c12694..7de127d7b 100644 --- a/FrontEnd/src/components/ProfilePage/ProfilePage.jsx +++ b/FrontEnd/src/pages/ProfilePage/ProfilePage.jsx @@ -2,8 +2,8 @@ import css from './ProfilePage.module.css'; import Description from './ProfilePageComponents/Description'; import ProfileContent from './ProfilePageComponents/ProfileContent'; import { useState } from 'react'; -import BreadCrumbs from '../BreadCrumbs/BreadCrumbs'; -import Loader from '../loader/Loader'; +import BreadCrumbs from '../../components/BreadCrumbs/BreadCrumbs'; +import Loader from '../../components/Loader/Loader'; import { useAuth, useProfile } from '../../hooks'; const ProfilePage = () => { diff --git a/FrontEnd/src/components/ProfilePage/ProfilePage.module.css b/FrontEnd/src/pages/ProfilePage/ProfilePage.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/ProfilePage.module.css rename to FrontEnd/src/pages/ProfilePage/ProfilePage.module.css diff --git a/FrontEnd/src/components/ProfilePage/ProfilePageComponents/Description.jsx b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/Description.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/ProfilePageComponents/Description.jsx rename to FrontEnd/src/pages/ProfilePage/ProfilePageComponents/Description.jsx diff --git a/FrontEnd/src/components/ProfilePage/ProfilePageComponents/Description.module.css b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/Description.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/ProfilePageComponents/Description.module.css rename to FrontEnd/src/pages/ProfilePage/ProfilePageComponents/Description.module.css diff --git a/FrontEnd/src/components/ProfilePage/ProfilePageComponents/ProfileContent.jsx b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/ProfilePageComponents/ProfileContent.jsx rename to FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.jsx diff --git a/FrontEnd/src/components/ProfilePage/ProfilePageComponents/ProfileContent.module.css b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/ProfilePageComponents/ProfileContent.module.css rename to FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.module.css diff --git a/FrontEnd/src/components/ProfilePage/UI/MyModal/MyModal.jsx b/FrontEnd/src/pages/ProfilePage/UI/MyModal/MyModal.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/UI/MyModal/MyModal.jsx rename to FrontEnd/src/pages/ProfilePage/UI/MyModal/MyModal.jsx diff --git a/FrontEnd/src/components/ProfilePage/UI/MyModal/MyModal.module.css b/FrontEnd/src/pages/ProfilePage/UI/MyModal/MyModal.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/UI/MyModal/MyModal.module.css rename to FrontEnd/src/pages/ProfilePage/UI/MyModal/MyModal.module.css diff --git a/FrontEnd/src/components/ProfilePage/UI/ProfileFormButton/ProfileFormButton.jsx b/FrontEnd/src/pages/ProfilePage/UI/ProfileFormButton/ProfileFormButton.jsx similarity index 100% rename from FrontEnd/src/components/ProfilePage/UI/ProfileFormButton/ProfileFormButton.jsx rename to FrontEnd/src/pages/ProfilePage/UI/ProfileFormButton/ProfileFormButton.jsx diff --git a/FrontEnd/src/components/ProfilePage/UI/ProfileFormButton/ProfileFormButton.module.css b/FrontEnd/src/pages/ProfilePage/UI/ProfileFormButton/ProfileFormButton.module.css similarity index 100% rename from FrontEnd/src/components/ProfilePage/UI/ProfileFormButton/ProfileFormButton.module.css rename to FrontEnd/src/pages/ProfilePage/UI/ProfileFormButton/ProfileFormButton.module.css diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/RestorePasswordForm.jsx b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm.jsx similarity index 90% rename from FrontEnd/src/components/RestorePassword/components/restorepassword/RestorePasswordForm.jsx rename to FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm.jsx index 831414393..346a92b6c 100644 --- a/FrontEnd/src/components/RestorePassword/components/restorepassword/RestorePasswordForm.jsx +++ b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm.jsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import { Link } from 'react-router-dom'; -import { RestorePasswordFormContentComponent } from './restorepassword-form/RestorePasswordFormContent'; +import { RestorePasswordFormContentComponent } from './RestorePasswordForm/RestorePasswordFormContent'; import styles from './RestorePasswordForm.module.css'; diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/RestorePasswordForm.module.css b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm.module.css similarity index 100% rename from FrontEnd/src/components/RestorePassword/components/restorepassword/RestorePasswordForm.module.css rename to FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm.module.css diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.jsx b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm/EmailFormContent.jsx similarity index 100% rename from FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.jsx rename to FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm/EmailFormContent.jsx diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.module.css b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm/EmailFormContent.module.css similarity index 100% rename from FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.module.css rename to FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm/EmailFormContent.module.css diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.jsx b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm/RestorePasswordFormContent.jsx similarity index 97% rename from FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.jsx rename to FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm/RestorePasswordFormContent.jsx index 9dec1b989..a4da46435 100644 --- a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.jsx +++ b/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 '../../../../authorization/EyeInvisible'; -import EyeVisible from '../../../../authorization/EyeVisible'; +import EyeInvisible from '../../../../Authorization/EyeInvisible'; +import EyeVisible from '../../../../Authorization/EyeVisible'; import styles from './RestorePasswordFormContent.module.css'; export function RestorePasswordFormContentComponent({ setIsValid }) { diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.module.css b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm/RestorePasswordFormContent.module.css similarity index 100% rename from FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.module.css rename to FrontEnd/src/pages/RestorePassword/Components/RestorePassword/RestorePasswordForm/RestorePasswordFormContent.module.css diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/SendEmailForm.jsx b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/SendEmailForm.jsx similarity index 97% rename from FrontEnd/src/components/RestorePassword/components/restorepassword/SendEmailForm.jsx rename to FrontEnd/src/pages/RestorePassword/Components/RestorePassword/SendEmailForm.jsx index 0dddc59b1..e287a4428 100644 --- a/FrontEnd/src/components/RestorePassword/components/restorepassword/SendEmailForm.jsx +++ b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/SendEmailForm.jsx @@ -1,5 +1,5 @@ import styles from './SendEmailForm.module.css'; -import { SendEmailRestorePasswordFormContentComponent } from './restorepassword-form/EmailFormContent'; +import { SendEmailRestorePasswordFormContentComponent } from './RestorePasswordForm/EmailFormContent'; import { useState } from 'react'; import { Link } from 'react-router-dom'; diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/SendEmailForm.module.css b/FrontEnd/src/pages/RestorePassword/Components/RestorePassword/SendEmailForm.module.css similarity index 100% rename from FrontEnd/src/components/RestorePassword/components/restorepassword/SendEmailForm.module.css rename to FrontEnd/src/pages/RestorePassword/Components/RestorePassword/SendEmailForm.module.css diff --git a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordFailedPage.jsx b/FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordFailedPage.jsx similarity index 100% rename from FrontEnd/src/components/RestorePassword/pages/RestorePasswordFailedPage.jsx rename to FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordFailedPage.jsx diff --git a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordFailedPage.module.css b/FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordFailedPage.module.css similarity index 100% rename from FrontEnd/src/components/RestorePassword/pages/RestorePasswordFailedPage.module.css rename to FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordFailedPage.module.css diff --git a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordModalPage.jsx b/FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordModalPage.jsx similarity index 100% rename from FrontEnd/src/components/RestorePassword/pages/RestorePasswordModalPage.jsx rename to FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordModalPage.jsx diff --git a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordModalPage.module.css b/FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordModalPage.module.css similarity index 100% rename from FrontEnd/src/components/RestorePassword/pages/RestorePasswordModalPage.module.css rename to FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordModalPage.module.css diff --git a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordPage.jsx b/FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordPage.jsx similarity index 91% rename from FrontEnd/src/components/RestorePassword/pages/RestorePasswordPage.jsx rename to FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordPage.jsx index 3ddd66eea..9fd6aefd4 100644 --- a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordPage.jsx +++ b/FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordPage.jsx @@ -1,6 +1,6 @@ import { Link } from 'react-router-dom'; import styles from './RestorePasswordPage.module.css'; -import { RestorePasswordFormComponent } from '../components/restorepassword/RestorePasswordForm'; +import { RestorePasswordFormComponent } from '../Components/RestorePassword/RestorePasswordForm'; export function RestorePasswordPage() { return ( diff --git a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordPage.module.css b/FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordPage.module.css similarity index 100% rename from FrontEnd/src/components/RestorePassword/pages/RestorePasswordPage.module.css rename to FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordPage.module.css diff --git a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordSuccessPage.jsx b/FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordSuccessPage.jsx similarity index 100% rename from FrontEnd/src/components/RestorePassword/pages/RestorePasswordSuccessPage.jsx rename to FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordSuccessPage.jsx diff --git a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordSuccessPage.module.css b/FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordSuccessPage.module.css similarity index 100% rename from FrontEnd/src/components/RestorePassword/pages/RestorePasswordSuccessPage.module.css rename to FrontEnd/src/pages/RestorePassword/Pages/RestorePasswordSuccessPage.module.css diff --git a/FrontEnd/src/components/RestorePassword/pages/SendEmailRestorePassword.module.css b/FrontEnd/src/pages/RestorePassword/Pages/SendEmailRestorePassword.module.css similarity index 100% rename from FrontEnd/src/components/RestorePassword/pages/SendEmailRestorePassword.module.css rename to FrontEnd/src/pages/RestorePassword/Pages/SendEmailRestorePassword.module.css diff --git a/FrontEnd/src/components/RestorePassword/pages/SendEmailRestorePasswordPage.jsx b/FrontEnd/src/pages/RestorePassword/Pages/SendEmailRestorePasswordPage.jsx similarity index 91% rename from FrontEnd/src/components/RestorePassword/pages/SendEmailRestorePasswordPage.jsx rename to FrontEnd/src/pages/RestorePassword/Pages/SendEmailRestorePasswordPage.jsx index fcc9a5a22..384785e4c 100644 --- a/FrontEnd/src/components/RestorePassword/pages/SendEmailRestorePasswordPage.jsx +++ b/FrontEnd/src/pages/RestorePassword/Pages/SendEmailRestorePasswordPage.jsx @@ -1,6 +1,6 @@ import { Link } from 'react-router-dom'; import styles from './SendEmailRestorePassword.module.css'; -import { SendEmailRestorePasswordFormComponent } from '../components/restorepassword/SendEmailForm'; +import { SendEmailRestorePasswordFormComponent } from '../Components/RestorePassword/SendEmailForm'; export function SendEmailRestorePasswordPage() { return ( diff --git a/FrontEnd/src/components/SearchPage/Search.jsx b/FrontEnd/src/pages/SearchPage/Search.jsx similarity index 97% rename from FrontEnd/src/components/SearchPage/Search.jsx rename to FrontEnd/src/pages/SearchPage/Search.jsx index 49ee5a328..61bfb7ccb 100644 --- a/FrontEnd/src/components/SearchPage/Search.jsx +++ b/FrontEnd/src/pages/SearchPage/Search.jsx @@ -1,8 +1,8 @@ import axios from 'axios'; import { useState, useEffect } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; -import BreadCrumbs from '../BreadCrumbs/BreadCrumbs'; -import SearchResults from './search_field/SearchResults'; +import BreadCrumbs from '../../components/BreadCrumbs/BreadCrumbs'; +import SearchResults from './SearchField/SearchResults'; import link_to_left from './img/link_to_left.svg'; import link_to_right from './img/link_to_right.svg'; import styles from './search.module.css'; diff --git a/FrontEnd/src/components/SearchPage/search_field/SearchResults.jsx b/FrontEnd/src/pages/SearchPage/SearchField/SearchResults.jsx similarity index 93% rename from FrontEnd/src/components/SearchPage/search_field/SearchResults.jsx rename to FrontEnd/src/pages/SearchPage/SearchField/SearchResults.jsx index f8d8adbe8..32e0a9835 100644 --- a/FrontEnd/src/components/SearchPage/search_field/SearchResults.jsx +++ b/FrontEnd/src/pages/SearchPage/SearchField/SearchResults.jsx @@ -1,4 +1,4 @@ -import CompanyCard from '../../CompanyCard/CompanyCard'; +import CompanyCard from '../../../components/CompanyCard/CompanyCard'; import styles from './SearchResulys.module.css'; import PropTypes from 'prop-types'; diff --git a/FrontEnd/src/components/SearchPage/search_field/SearchResulys.module.css b/FrontEnd/src/pages/SearchPage/SearchField/SearchResulys.module.css similarity index 100% rename from FrontEnd/src/components/SearchPage/search_field/SearchResulys.module.css rename to FrontEnd/src/pages/SearchPage/SearchField/SearchResulys.module.css diff --git a/FrontEnd/src/tests/SearchResults.test.js b/FrontEnd/src/pages/SearchPage/SearchField/tests/SearchResults.test.js similarity index 95% rename from FrontEnd/src/tests/SearchResults.test.js rename to FrontEnd/src/pages/SearchPage/SearchField/tests/SearchResults.test.js index d42b2dd61..79a458ef0 100644 --- a/FrontEnd/src/tests/SearchResults.test.js +++ b/FrontEnd/src/pages/SearchPage/SearchField/tests/SearchResults.test.js @@ -1,7 +1,7 @@ import { render, screen, cleanup } from '@testing-library/react'; import { MemoryRouter } from 'react-router-dom'; -import SearchResults from '../components/SearchPage/search_field/SearchResults'; +import SearchResults from '../SearchResults'; const mockedUser = { email: 'test@test.com', @@ -10,7 +10,7 @@ const mockedUser = { profile_id: 1, surname: 'Test' }; -jest.mock('../hooks/useAuth', () => ({ +jest.mock('../../../../hooks/useAuth', () => ({ useAuth: () => { return mockedUser; }, diff --git a/FrontEnd/src/components/SearchPage/img/link_to_left.svg b/FrontEnd/src/pages/SearchPage/img/link_to_left.svg similarity index 100% rename from FrontEnd/src/components/SearchPage/img/link_to_left.svg rename to FrontEnd/src/pages/SearchPage/img/link_to_left.svg diff --git a/FrontEnd/src/components/SearchPage/img/link_to_right.svg b/FrontEnd/src/pages/SearchPage/img/link_to_right.svg similarity index 100% rename from FrontEnd/src/components/SearchPage/img/link_to_right.svg rename to FrontEnd/src/pages/SearchPage/img/link_to_right.svg diff --git a/FrontEnd/src/components/SearchPage/search.module.css b/FrontEnd/src/pages/SearchPage/search.module.css similarity index 100% rename from FrontEnd/src/components/SearchPage/search.module.css rename to FrontEnd/src/pages/SearchPage/search.module.css diff --git a/FrontEnd/src/tests/Search.test.js b/FrontEnd/src/pages/SearchPage/tests/Search.test.js similarity index 97% rename from FrontEnd/src/tests/Search.test.js rename to FrontEnd/src/pages/SearchPage/tests/Search.test.js index f453049ad..3c56e8436 100644 --- a/FrontEnd/src/tests/Search.test.js +++ b/FrontEnd/src/pages/SearchPage/tests/Search.test.js @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import { MemoryRouter } from 'react-router-dom'; -import Search from '../components/SearchPage/Search'; +import Search from '../Search'; afterEach(() => { jest.resetAllMocks(); diff --git a/FrontEnd/src/components/SignUp/components/signup/ResendActivationForm.jsx b/FrontEnd/src/pages/SignUp/ResendActivationForm.jsx similarity index 94% rename from FrontEnd/src/components/SignUp/components/signup/ResendActivationForm.jsx rename to FrontEnd/src/pages/SignUp/ResendActivationForm.jsx index 4aec832a8..10ac29e9a 100644 --- a/FrontEnd/src/components/SignUp/components/signup/ResendActivationForm.jsx +++ b/FrontEnd/src/pages/SignUp/ResendActivationForm.jsx @@ -1,5 +1,5 @@ import styles from './ResendActivationForm.module.css'; -import { ResendActivationFormContentComponent } from './signup-form/ResendActivationFormContent'; +import { ResendActivationFormContentComponent } from './SignupForm/ResendActivationFormContent'; import { useState } from 'react'; import { Link } from 'react-router-dom'; diff --git a/FrontEnd/src/components/SignUp/components/signup/ResendActivationForm.module.css b/FrontEnd/src/pages/SignUp/ResendActivationForm.module.css similarity index 100% rename from FrontEnd/src/components/SignUp/components/signup/ResendActivationForm.module.css rename to FrontEnd/src/pages/SignUp/ResendActivationForm.module.css diff --git a/FrontEnd/src/components/SignUp/pages/ActivateProfileModal.module.css b/FrontEnd/src/pages/SignUp/SignUp/ActivateProfileModal.module.css similarity index 100% rename from FrontEnd/src/components/SignUp/pages/ActivateProfileModal.module.css rename to FrontEnd/src/pages/SignUp/SignUp/ActivateProfileModal.module.css diff --git a/FrontEnd/src/components/SignUp/pages/ActivateProfilePage.jsx b/FrontEnd/src/pages/SignUp/SignUp/ActivateProfilePage.jsx similarity index 97% rename from FrontEnd/src/components/SignUp/pages/ActivateProfilePage.jsx rename to FrontEnd/src/pages/SignUp/SignUp/ActivateProfilePage.jsx index 5a4aa39fe..de99125a0 100644 --- a/FrontEnd/src/components/SignUp/pages/ActivateProfilePage.jsx +++ b/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() { diff --git a/FrontEnd/src/components/SignUp/pages/ResendActivationPage.jsx b/FrontEnd/src/pages/SignUp/SignUp/ResendActivationPage.jsx similarity index 91% rename from FrontEnd/src/components/SignUp/pages/ResendActivationPage.jsx rename to FrontEnd/src/pages/SignUp/SignUp/ResendActivationPage.jsx index 4fa289a8e..430d7dc0d 100644 --- a/FrontEnd/src/components/SignUp/pages/ResendActivationPage.jsx +++ b/FrontEnd/src/pages/SignUp/SignUp/ResendActivationPage.jsx @@ -1,6 +1,6 @@ import { Link } from 'react-router-dom'; import styles from './SignUpPage.module.css'; -import { ResendActivationFormComponent } from '../components/signup/ResendActivationForm'; +import { ResendActivationFormComponent } from '../ResendActivationForm'; export function ResendActivationPage() { return ( diff --git a/FrontEnd/src/components/SignUp/pages/SignUpModalPage.jsx b/FrontEnd/src/pages/SignUp/SignUp/SignUpModalPage.jsx similarity index 100% rename from FrontEnd/src/components/SignUp/pages/SignUpModalPage.jsx rename to FrontEnd/src/pages/SignUp/SignUp/SignUpModalPage.jsx diff --git a/FrontEnd/src/components/SignUp/pages/SignUpModalPage.module.css b/FrontEnd/src/pages/SignUp/SignUp/SignUpModalPage.module.css similarity index 100% rename from FrontEnd/src/components/SignUp/pages/SignUpModalPage.module.css rename to FrontEnd/src/pages/SignUp/SignUp/SignUpModalPage.module.css diff --git a/FrontEnd/src/components/SignUp/pages/SignUpPage.jsx b/FrontEnd/src/pages/SignUp/SignUp/SignUpPage.jsx similarity index 93% rename from FrontEnd/src/components/SignUp/pages/SignUpPage.jsx rename to FrontEnd/src/pages/SignUp/SignUp/SignUpPage.jsx index dcd4dbd9c..5963c65ae 100644 --- a/FrontEnd/src/components/SignUp/pages/SignUpPage.jsx +++ b/FrontEnd/src/pages/SignUp/SignUp/SignUpPage.jsx @@ -1,6 +1,6 @@ import { Link } from 'react-router-dom'; import styles from './SignUpPage.module.css'; -import { SignUpFormComponent } from '../components/signup/SignUpForm'; +import { SignUpFormComponent } from '../SignUpForm'; export function SignUpPage() { return ( diff --git a/FrontEnd/src/components/SignUp/pages/SignUpPage.module.css b/FrontEnd/src/pages/SignUp/SignUp/SignUpPage.module.css similarity index 100% rename from FrontEnd/src/components/SignUp/pages/SignUpPage.module.css rename to FrontEnd/src/pages/SignUp/SignUp/SignUpPage.module.css diff --git a/FrontEnd/src/components/SignUp/components/signup/SignUpForm.jsx b/FrontEnd/src/pages/SignUp/SignUpForm.jsx similarity index 92% rename from FrontEnd/src/components/SignUp/components/signup/SignUpForm.jsx rename to FrontEnd/src/pages/SignUp/SignUpForm.jsx index b5a19daab..cbb8614ac 100644 --- a/FrontEnd/src/components/SignUp/components/signup/SignUpForm.jsx +++ b/FrontEnd/src/pages/SignUp/SignUpForm.jsx @@ -1,5 +1,5 @@ import styles from './SignUpForm.module.css'; -import { SignUpFormContentComponent } from './signup-form/SignUpFormContent'; +import { SignUpFormContentComponent } from './SignupForm/SignUpFormContent'; import { useState } from 'react'; import { Link } from 'react-router-dom'; diff --git a/FrontEnd/src/components/SignUp/components/signup/SignUpForm.module.css b/FrontEnd/src/pages/SignUp/SignUpForm.module.css similarity index 100% rename from FrontEnd/src/components/SignUp/components/signup/SignUpForm.module.css rename to FrontEnd/src/pages/SignUp/SignUpForm.module.css diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/ResendActivationFormContent.jsx b/FrontEnd/src/pages/SignUp/SignupForm/ResendActivationFormContent.jsx similarity index 97% rename from FrontEnd/src/components/SignUp/components/signup/signup-form/ResendActivationFormContent.jsx rename to FrontEnd/src/pages/SignUp/SignupForm/ResendActivationFormContent.jsx index a21e96b77..23b96f197 100644 --- a/FrontEnd/src/components/SignUp/components/signup/signup-form/ResendActivationFormContent.jsx +++ b/FrontEnd/src/pages/SignUp/SignupForm/ResendActivationFormContent.jsx @@ -6,7 +6,7 @@ import { toast } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.css'; import axios from 'axios'; import styles from './ResendActivationFormContent.module.css'; -import { EMAIL_PATTERN } from '../../../../../constants/constants'; +import { EMAIL_PATTERN } from '../../../constants/constants'; export function ResendActivationFormContentComponent({ setIsValid }) { const navigate = useNavigate(); diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/ResendActivationFormContent.module.css b/FrontEnd/src/pages/SignUp/SignupForm/ResendActivationFormContent.module.css similarity index 100% rename from FrontEnd/src/components/SignUp/components/signup/signup-form/ResendActivationFormContent.module.css rename to FrontEnd/src/pages/SignUp/SignupForm/ResendActivationFormContent.module.css diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/RulesModal.jsx b/FrontEnd/src/pages/SignUp/SignupForm/RulesModal.jsx similarity index 100% rename from FrontEnd/src/components/SignUp/components/signup/signup-form/RulesModal.jsx rename to FrontEnd/src/pages/SignUp/SignupForm/RulesModal.jsx diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/RulesModal.module.css b/FrontEnd/src/pages/SignUp/SignupForm/RulesModal.module.css similarity index 100% rename from FrontEnd/src/components/SignUp/components/signup/signup-form/RulesModal.module.css rename to FrontEnd/src/pages/SignUp/SignupForm/RulesModal.module.css diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/Rules_text.js b/FrontEnd/src/pages/SignUp/SignupForm/Rules_text.js similarity index 100% rename from FrontEnd/src/components/SignUp/components/signup/signup-form/Rules_text.js rename to FrontEnd/src/pages/SignUp/SignupForm/Rules_text.js diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.jsx b/FrontEnd/src/pages/SignUp/SignupForm/SignUpFormContent.jsx similarity index 99% rename from FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.jsx rename to FrontEnd/src/pages/SignUp/SignupForm/SignUpFormContent.jsx index 7ae1d9451..f85762894 100644 --- a/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.jsx +++ b/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 { @@ -14,7 +14,7 @@ import { PASSWORD_PATTERN, NAME_SURNAME_PATTERN, COMPANY_NAME_PATTERN, -} from '../../../../../constants/constants'; +} from '../../../constants/constants'; const RulesModal = React.lazy(() => import('./RulesModal')); diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.module.css b/FrontEnd/src/pages/SignUp/SignupForm/SignUpFormContent.module.css similarity index 100% rename from FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.module.css rename to FrontEnd/src/pages/SignUp/SignupForm/SignUpFormContent.module.css diff --git a/FrontEnd/src/components/adminPage/AdminPage.jsx b/FrontEnd/src/routes/AdminRouter.jsx similarity index 61% rename from FrontEnd/src/components/adminPage/AdminPage.jsx rename to FrontEnd/src/routes/AdminRouter.jsx index 9bc801df7..1237273cd 100644 --- a/FrontEnd/src/components/adminPage/AdminPage.jsx +++ b/FrontEnd/src/routes/AdminRouter.jsx @@ -1,22 +1,22 @@ import { ToastContainer } from 'react-toastify'; -import './AdminGlobal.css'; -import Header from './header/Header'; -import Menu from './menu/Menu'; -import UserDetail from './detail-view/UserDetail'; -import UserTable from './table/UserTable'; -import ProfilesTable from './table/ProfilesTable'; -import ProfileDetail from './detail-view/ProfileDetail'; -import css from './AdminPage.module.css'; +import '../pages/AdminPage/AdminGlobal.css'; +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/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'; -import MainPage from './mainPage/MainPage'; -import { useAuth } from '../../hooks'; -import Loader from '../loader/Loader'; -import AutoApproveDelay from './auto-approve-delay/AutoApproveDelay'; -import ModerationEmail from './detail-view/ModerationEmail'; -import Contacts from './detail-view/Contacts'; +import MainPage from '../pages/AdminPage/MainPage/MainPage'; +import { useAuth } from '../hooks'; +import Loader from '../components/Loader/Loader'; +import AutoApproveDelay from '../pages/AdminPage/AutoApproveDelay/AutoApproveDelay'; +import ModerationEmail from '../pages/AdminPage/DetailView/ModerationEmail'; +import Contacts from '../pages/AdminPage/DetailView/Contacts'; -function AdminPage() { +function AdminRouter() { const { isLoading, isAuth, isStaff } = useAuth(); const renderMenu = isStaff && isAuth ? : null; const authRoutes = isStaff && isAuth ? ( @@ -55,4 +55,4 @@ function AdminPage() { ); } -export default AdminPage; +export default AdminRouter; diff --git a/FrontEnd/src/components/basicPage/BasicPage.jsx b/FrontEnd/src/routes/ClientRouter.jsx similarity index 51% rename from FrontEnd/src/components/basicPage/BasicPage.jsx rename to FrontEnd/src/routes/ClientRouter.jsx index 318109ab4..b8c14c1ed 100644 --- a/FrontEnd/src/components/basicPage/BasicPage.jsx +++ b/FrontEnd/src/routes/ClientRouter.jsx @@ -1,42 +1,42 @@ +import React from 'react'; +import { ToastContainer } from 'react-toastify'; import { Route, Routes, Navigate } from 'react-router-dom'; import { ConfigProvider } from 'antd'; import { SWRConfig } from 'swr'; -import { ToastContainer } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.css'; -import './customToastStyles.css'; -import customTheme from './customTheme.js'; +import customTheme from '../pages/CustomThemes/customTheme.js'; -import AuthorizationPage from '../authorization/AuthorizationPage'; -import CookiesPolicyComponent from '../CookiesPolicyPage/CookiesPolicyComponent'; -import Footer from '../HeaderFooter/footer/Footer'; -import Header from '../HeaderFooter/header/Header'; -import Loader from '../loader/Loader'; -import MainPage from '../landing-page/MainPage'; -import PrivacyPolicy from '../PrivacyPolicyPage/PrivacyPolicyPage'; -import ProfileDetailPage from '../ProfileDetail/ProfileDetailPage'; -import ProfileListPage from '../profileList/ProfileListPage'; -import ProfilePage from '../ProfilePage/ProfilePage'; -import { SignUpPage } from '../SignUp/pages/SignUpPage'; -import { SignUpModalPage } from '../SignUp/pages/SignUpModalPage'; -import { ResendActivationPage } from '../SignUp/pages/ResendActivationPage'; -import { ActivationProfilePage } from '../SignUp/pages/ActivateProfilePage'; -import { SendEmailRestorePasswordPage } from '../RestorePassword/pages/SendEmailRestorePasswordPage'; -import { RestorePasswordPage } from '../RestorePassword/pages/RestorePasswordPage'; -import { RestorePasswordModalPage } from '../RestorePassword/pages/RestorePasswordModalPage'; -import { RestorePasswordSuccessPage } from '../RestorePassword/pages/RestorePasswordSuccessPage'; -import { RestorePasswordFailedPage } from '../RestorePassword/pages/RestorePasswordFailedPage'; -import { ModerationModal } from '../moderation/ModerationModal'; -import ScrollToTopButton from '../ScrollToTopButton/ScrollToTopButton'; -import TermsAndConditions from '../terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent'; -import { useAuth } from '../../hooks'; -import { Search } from '../SearchPage/Search'; -import Contact from '../Contact/Contact'; -import ErrorPage404 from '../errorPages/ErrorPage404'; +import AuthorizationPage from '../pages/Authorization/AuthorizationPage'; +import CookiesPolicyComponent from '../pages/CookiesPolicyPage/CookiesPolicyComponent'; +import Footer from '../components/Footer/Footer'; +import Header from '../components/Header/Header'; +import Loader from '../components/Loader/Loader'; +import MainPage from '../pages/LandingPage/MainPage'; +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 '../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'; +import { RestorePasswordSuccessPage } from '../pages/RestorePassword/Pages/RestorePasswordSuccessPage'; +import { RestorePasswordFailedPage } from '../pages/RestorePassword/Pages/RestorePasswordFailedPage'; +import { ModerationModal } from '../components/Moderation/ModerationModal'; +import ScrollToTopButton from '../components/ScrollToTopButton/ScrollToTopButton'; +import TermsAndConditions from '../components/TermsAndConditionsApp/terms_conditions/TermsAndConditionsComponent'; +import { useAuth } from '../hooks'; +import { Search } from '../pages/SearchPage/Search'; +import '../pages/CustomThemes/customToastStyles.css'; +import Contact from '../components/Contact/Contact'; +import ErrorPage404 from '../pages/ErrorPages/ErrorPage404'; -function BasicPage() { +function ClientRouter() { const { isAuth, user, logout, isLoading } = useAuth(); - return ( -
- {isLoading ? : - ( - } /> - {isAuth ? ( - } /> - ) : ( - } /> - )} - } - /> +
+ {isLoading ? : + ( + } /> + {isAuth ? ( + } /> + ) : ( + } /> + )} + } + /> } @@ -133,4 +133,4 @@ function BasicPage() { ); } -export default BasicPage; +export default ClientRouter; diff --git a/FrontEnd/src/routes/Router.js b/FrontEnd/src/routes/Router.js new file mode 100644 index 000000000..90931631f --- /dev/null +++ b/FrontEnd/src/routes/Router.js @@ -0,0 +1,27 @@ +import {createBrowserRouter} from 'react-router-dom'; +import {AuthProvider} from '../context'; +import AdminRouter from './AdminRouter'; +import ClientRouter from './ClientRouter'; +import React from 'react'; + + +const router = createBrowserRouter([ + { + path: '/*', + element: ( + + + + ), + }, + { + path: '/customadmin/*', + element: ( + + + + ), + }, + ]); + +export default router; \ No newline at end of file