Merge branch 'develop' of github.com:ita-social-projects/Forum into #…

…792CorrectTheTextInTheAboutUsSection

BackEnd/profiles/fixtures/activities.yaml

@@ -14,7 +14,7 @@
   pk: 4
   fields:
     name: HORECA
-  model: profiles.activity
+- model: profiles.activity
   pk: 5
   fields:
-    name: Інші послуги
+    name: Інші послуги

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: (
-        <AuthProvider>
-          <BasicPage />
-        </AuthProvider>
-      ),
-    },
-    {
-      path: '/customadmin/*',
-      element: (
-        <AuthProvider>
-          <AdminPage />
-        </AuthProvider>
-      ),
-    },
-  ]);
-
   return (
     <div className="App">
       <h1>

FrontEnd/src/tests/CompanyCard.test.js → 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;
   },

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';

FrontEnd/src/components/cookieacception/CookieMod.jsx → FrontEnd/src/components/CookieAcception/CookieMod.jsx

@@ -41,6 +41,7 @@ const CookieMod = ({ active, setActive }) => {
               про кукі-файли
             </Link>
           }
+
         </p>
         {detailsVisible && (
           <div className={styles['cookie-details']}>

FrontEnd/src/tests/CookieModal.test.js → 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);
 

FrontEnd/src/components/HeaderFooter/footer/Footer.jsx → 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'];

FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.jsx → 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 = [
   {

FrontEnd/src/components/HeaderFooter/header/Header.jsx → 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 (

FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx → 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';

FrontEnd/src/components/moderation/ModerationModal.jsx → 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() {

FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.jsx → 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';
 
 

FrontEnd/src/components/authorization/AuthorizationPage.jsx → 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 = () => {

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

@@ -9,8 +9,8 @@ import validator from 'validator';
 import EyeVisible from './EyeVisible';
 import EyeInvisible from './EyeInvisible';
 import classes from './LoginPage.module.css';
-import { useAuth } from '../../hooks/';
-import checkIfStaff from '../adminPage/checkIfStaff';
+import { useAuth } from '../../hooks';
+import checkIfStaff from '../AdminPage/checkIfStaff';
 
 const LoginContent = () => {
   const { login } = useAuth();
@@ -57,13 +57,14 @@ const LoginContent = () => {
       errorMessage = errors.password.message;
     } else if (errors.unspecifiedError?.message) {
       errorMessage = errors.unspecifiedError.message;
+      toast.error(errorMessage);
     } else if (errors.rateError?.message) {
       errorMessage = errors.rateError.message;
+      toast.error(errorMessage);
     } else if (errors.blockedUserError?.message) {
       errorMessage = errors.blockedUserError.message;
+      toast.error(errorMessage);
     }
-
-    errorMessage && toast.error(errorMessage);
   }, [
     errors.email?.message,
     errors.password?.message,

FrontEnd/src/components/landing-page/about-section/About.jsx → 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 = () => {

FrontEnd/src/components/landing-page/companies/Companies.jsx → 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';
 

FrontEnd/src/tests/MainCompanies.test.js → 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();

FrontEnd/src/components/landing-page/MainPage.jsx → 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';
 

FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.jsx → 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();

FrontEnd/src/components/ProfileDetail/ProfileDetailPage.jsx → 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([]);

FrontEnd/src/components/profileList/ProfileCard.jsx → 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;
 

FrontEnd/src/components/profileList/ProfileListPage.jsx → 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';

FrontEnd/src/components/ProfilePage/FormComponents/AdditionalInfo.jsx → 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 = {

FrontEnd/src/components/ProfilePage/FormComponents/ChangePassword.jsx → 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) {

FrontEnd/src/components/ProfilePage/FormComponents/ContactsInfo.jsx → 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';
 

FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.jsx → 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,

FrontEnd/src/components/ProfilePage/FormComponents/FormFields/PasswordField.jsx → 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';

FrontEnd/src/components/ProfilePage/FormComponents/GeneralInfo.jsx → 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';

FrontEnd/src/components/ProfilePage/FormComponents/ProductServiceInfo.jsx → 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 = {

FrontEnd/src/components/ProfilePage/FormComponents/StartupInfo.jsx → 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 = {

FrontEnd/src/components/ProfilePage/FormComponents/UserInfo.jsx → 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 = {

FrontEnd/src/components/ProfilePage/ProfilePage.jsx → 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 = () => {

FrontEnd/src/components/RestorePassword/components/restorepassword/RestorePasswordForm.jsx → 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';
 
 

FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.jsx → 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 }) {

FrontEnd/src/components/RestorePassword/components/restorepassword/SendEmailForm.jsx → 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';