task/wg-198-Pull-out-pages-react-refactor (#184)

react/src/components/AppRouter.tsx → react/src/AppRouter.tsx

@@ -7,15 +7,15 @@ import {
   Navigate,
   useLocation,
 } from 'react-router-dom';
-import * as ROUTES from '../constants/routes';
-import MapProject from './MapProject';
-import MainMenu from './MainMenu';
-import Logout from './Authentication/Logout/Logout';
-import Login from './Authentication/Login/Login';
-import Callback from './Authentication/Callback/Callback';
-import StreetviewCallback from './Authentication/StreetviewCallback/StreetviewCallback';
-import { RootState } from '../redux/store';
-import { isTokenValid } from '../utils/authUtils';
+import * as ROUTES from './constants/routes';
+import MapProject from './pages/MapProject';
+import MainMenu from './pages/MainMenu';
+import Logout from './pages/Logout/Logout';
+import Login from './pages/Login/Login';
+import Callback from './pages/Callback/Callback';
+import StreetviewCallback from './pages/StreetviewCallback/StreetviewCallback';
+import { RootState } from './redux/store';
+import { isTokenValid } from './utils/authUtils';
 
 interface ProtectedRouteProps {
   isAuthenticated: boolean;

react/src/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import App from './components/AppRouter';
+import App from './AppRouter';
 import './index.css';
 import store from './redux/store';
 import { Provider } from 'react-redux';

react/src/components/Authentication/Callback/Callback.test.tsx → react/src/pages/Callback/Callback.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
 import { render } from '@testing-library/react';
-import store from '../../../redux/store';
+import store from '../../redux/store';
 import Callback from './Callback';
 
 test('renders callback', async () => {

react/src/components/Authentication/Callback/Callback.tsx → react/src/pages/Callback/Callback.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
-import { loginSuccess, logout } from '../../../redux/authSlice';
+import { loginSuccess, logout } from '../../redux/authSlice';
 
 export default function CallbackPage() {
   const dispatch = useDispatch();

react/src/components/Authentication/Login/Login.test.tsx → react/src/pages/Login/Login.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { render, waitFor } from '@testing-library/react';
 import Login from './Login';
 import { Provider } from 'react-redux';
-import store from '../../../redux/store';
+import store from '../../redux/store';
 import { MemoryRouter } from 'react-router';
 
 test('renders login', async () => {

react/src/components/Authentication/Login/Login.tsx → react/src/pages/Login/Login.tsx

@@ -1,8 +1,8 @@
 import React, { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { useSelector } from 'react-redux';
-import { RootState } from '../../../redux/store';
-import { isTokenValid } from '../../../utils/authUtils';
+import { RootState } from '../../redux/store';
+import { isTokenValid } from '../../utils/authUtils';
 
 function Login() {
   const location = useLocation();

react/src/components/Authentication/Logout/Logout.test.tsx → react/src/pages/Logout/Logout.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import Logout from './Logout';
 import { Provider } from 'react-redux';
-import store from '../../../redux/store';
+import store from '../../redux/store';
 import { BrowserRouter } from 'react-router-dom';
 
 test('renders logout', async () => {

react/src/components/Authentication/Logout/Logout.tsx → react/src/pages/Logout/Logout.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
-import { logout } from '../../../redux/authSlice';
+import { logout } from '../../redux/authSlice';
 
 function Logout() {
   const dispatch = useDispatch();

react/src/components/MapProject/MapProject.tsx → react/src/pages/MapProject/MapProject.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import Map from '../Map';
+import Map from '../../components/Map';
 import { tileServerLayers } from '../../__fixtures__/tileServerLayerFixture';
 import { featureCollection } from '../../__fixtures__/featuresFixture';
 import { useParams } from 'react-router-dom';