Merge pull request #111 from Lapkipomoshi/refactor/App

refactor(App): relocate the App component to pages

src/index.js → src/index.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import './index.css';
-import App from './components/App/App';
+import App from './pages/App/App';
 import reportWebVitals from './reportWebVitals';
 
 const root = ReactDOM.createRoot(document.getElementById('root'));

src/pages/ActivateUserPage/ActivateUserPage.jsx

@@ -6,7 +6,7 @@ import Button from '../../ui/Button/Button';
 import MainContainer from '../../components/MainContainer/MainContainer';
 import ProfileContainer from '../../components/ProfileContainer/ProfileContainer';
 import Paw from '../../images/icons/ic_paw.svg';
-import * as auth from '../../components/App/api/auth';
+import * as auth from '../App/api/auth';
 
 const ActivateUserPage = () => {
   const { uid, token } = useParams();

src/components/App/App.jsx → src/pages/App/App.jsx

@@ -3,39 +3,39 @@ import {
   Navigate, Route, Routes, useNavigate,
 } from 'react-router-dom';
 import './App.scss';
-import ProtectedRoute from '../ProtectedRoute';
+import ProtectedRoute from '../../components/ProtectedRoute';
 import Header from '../../modules/Header/Header';
 import Footer from '../../modules/Footer/Footer';
-import MainPage from '../../pages/MainPage/MainPage';
-import MapPage from '../../pages/MapPage/MapPage';
-import SheltersListPage from '../../pages/SheltersListPage/SheltersListPage';
-import * as sheltersListModules from '../../pages/SheltersListPage/modules';
-import ShelterPage from '../../pages/ShelterPage/ShelterPage';
-import * as shelterModules from '../../pages/ShelterPage/modules';
-import PetPage from '../../pages/PetPage/PetPage';
-import AddShelterPage from '../../pages/AddShelterPage/AddShelterPage';
-import PapersPage from '../../pages/PapersPage/PapersPage';
-import PaperPage from '../../pages/PaperPage/PaperPage';
-import NewsPage from '../../pages/NewsPage/NewsPage';
-import NewPage from '../../pages/NewPage/NewPage';
-import LoginPage from '../../pages/LoginPage/LoginPage';
-import RegisterPage from '../../pages/RegisterPage/RegisterPage';
-import NotFoundPage from '../../pages/NotFoundPage/NotFoundPage';
-import PasswordRecovery from '../../pages/PasswordRecovery/PasswordRecovery';
-import NewPassword from '../../pages/NewPassword/NewPassword';
-import SignUpConfirm from '../../pages/SignUpConfirm/SignUpConfirm';
-import ProfilePage from '../../pages/ProfilePage/ProfilePage';
+import MainPage from '../MainPage/MainPage';
+import MapPage from '../MapPage/MapPage';
+import SheltersListPage from '../SheltersListPage/SheltersListPage';
+import * as sheltersListModules from '../SheltersListPage/modules';
+import ShelterPage from '../ShelterPage/ShelterPage';
+import * as shelterModules from '../ShelterPage/modules';
+import PetPage from '../PetPage/PetPage';
+import AddShelterPage from '../AddShelterPage/AddShelterPage';
+import PapersPage from '../PapersPage/PapersPage';
+import PaperPage from '../PaperPage/PaperPage';
+import NewsPage from '../NewsPage/NewsPage';
+import NewPage from '../NewPage/NewPage';
+import LoginPage from '../LoginPage/LoginPage';
+import RegisterPage from '../RegisterPage/RegisterPage';
+import NotFoundPage from '../NotFoundPage/NotFoundPage';
+import PasswordRecovery from '../PasswordRecovery/PasswordRecovery';
+import NewPassword from '../NewPassword/NewPassword';
+import SignUpConfirm from '../SignUpConfirm/SignUpConfirm';
+import ProfilePage from '../ProfilePage/ProfilePage';
 import CurrentUserContext from '../../contexts/CurrentUserContext';
 import * as auth from './api/auth';
 import imageSuccess from '../../images/icons/ic_success.svg';
 import imageError from '../../images/icons/ic_error.svg';
-import InfoTooltip from '../InfoTooltip/InfoTooltip';
+import InfoTooltip from '../../components/InfoTooltip/InfoTooltip';
 import * as userApi from './api/userApi';
 import { register } from './api/auth';
-import EditProfilePage from '../../pages/EditProfilePage/EditProfilePage';
-import SignOutPage from '../../pages/SignOutPage/SignOutPage';
-import ChangePasswordPage from '../../pages/ChangePasswordPage/ChangePasswordPage';
-import ActivateUserPage from '../../pages/ActivateUserPage/ActivateUserPage';
+import EditProfilePage from '../EditProfilePage/EditProfilePage';
+import SignOutPage from '../SignOutPage/SignOutPage';
+import ChangePasswordPage from '../ChangePasswordPage/ChangePasswordPage';
+import ActivateUserPage from '../ActivateUserPage/ActivateUserPage';
 
 const App = () => {
   const navigate = useNavigate();

src/pages/ChangePasswordPage/ChangePasswordPage.jsx

@@ -7,7 +7,7 @@ import Button from '../../ui/Button/Button';
 import UserForm from '../../components/UserForm/UserForm';
 import UserLink from '../../ui/UserLink/UserLink';
 import InfoTooltip from '../../components/InfoTooltip/InfoTooltip';
-import * as auth from '../../components/App/api/auth';
+import * as auth from '../App/api/auth';
 import CurrentUserContext from '../../contexts/CurrentUserContext';
 import imageSuccess from '../../images/icons/ic_success.svg';
 import imageError from '../../images/icons/ic_error.svg';

src/pages/NewPassword/NewPassword.jsx

@@ -10,7 +10,7 @@ import { NUMBER, PASSWORD_REGEX } from '../../utils/regex';
 import {
   PASSWORD_INVALID, PASSWORD_NOT_FOUND, PASSWORD_ONLY_NUMBERS, PASSWORD_TOO_LONG, PASSWORD_TOO_SHORT,
 } from '../../utils/errorMessage';
-import * as auth from '../../components/App/api/auth';
+import * as auth from '../App/api/auth';
 import imageSuccess from '../../images/icons/ic_success.svg';
 import imageError from '../../images/icons/ic_error.svg';
 

src/pages/PasswordRecovery/PasswordRecovery.jsx

@@ -10,7 +10,7 @@ import MainContainer from '../../components/MainContainer/MainContainer';
 import InfoTooltip from '../../components/InfoTooltip/InfoTooltip';
 import { EMAIL_INVALID, EMAIL_NOT_FOUND } from '../../utils/errorMessage';
 import { EMAIL_REGEX } from '../../utils/regex';
-import * as auth from '../../components/App/api/auth';
+import * as auth from '../App/api/auth';
 import imageSuccess from '../../images/icons/ic_success.svg';
 import imageError from '../../images/icons/ic_error.svg';