-reorganized src/app folder by adding more subfolders and shuffling files around.

-updated package.json to include v23 contributors
-accepted a merge conflict in typedoc.json

Author: jrosengrant

.gitignore

@@ -13,6 +13,5 @@ src/extension/build.pem
 bower_components
 sandboxes/manual-tests/NextJS/.next
 .vscode
-src/app/components/Map.tsx
 package-lock.json
 yarn.lock

package.json

@@ -55,6 +55,7 @@
     "David Bernstein",
     "David Chai",
     "David Kim",
+    "David Moore",
     "Dennis Lopez",
     "Edar Liu",
     "Edwin Menendez",
@@ -73,7 +74,9 @@
     "James Nghiem",
     "Jasmine Noor",
     "Jason Victor",
+    "Jesse Rosengrant",
     "Jimmy Phy",
+    "John Banks",
     "Joseph Park",
     "Joseph Stern",
     "Josh Kim",
@@ -87,6 +90,7 @@
     "Kristina Wallen",
     "Kyle Bell",
     "Lance Ziegler",
+    "Liam Donaher",
     "Lina Shin",
     "Mark Teets",
     "Mike Bednarz",

src/app/components/App.tsx src/app/App.tsxsrc/app/components/App.tsx renamed to src/app/App.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { MemoryRouter as Router } from 'react-router-dom';
-import MainContainer from '../containers/MainContainer';
+import MainContainer from './containers/MainContainer';
 import { ThemeProvider } from '@mui/material/styles';
-import theme from './theme';
+import theme from './styles/theme';
 
 /*
   'currentTab' is the current active tab within Google Chrome.

src/app/__tests__/ActionContainer.test.tsx

@@ -132,7 +132,7 @@ const customStore = configureStore({
 const render = (component) => rtlRender(<Provider store={customStore}>{component}</Provider>);
 
 const MockRouteDescription = jest.fn();
-jest.mock('../components/RouteDescription', () => () => {
+jest.mock('../components/Actions/RouteDescription', () => () => {
   MockRouteDescription();
   return <div>MockRouteDescription</div>;
 });

src/app/__tests__/ErrorMsg.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom'; // needed this to extend the jest-dom assertions  (ex toHaveTextContent)
-import ErrorMsg from '../components/ErrorMsg';
+import ErrorMsg from '../components/ErrorHandling/ErrorMsg';
 
 const props = {
   loadingArray: [false],

src/app/__tests__/Loader.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import '@testing-library/jest-dom'; // needed this to extend the jest-dom assertions  (ex toHaveTextContent)
-import Loader from '../components/Loader';
+import Loader from '../components/ErrorHandling/Loader';
 
 describe('unit testing for Loader.tsx', () => {
   test('renders a loading icon', () => {

src/app/__tests__/MainSlider.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render as rtlRender, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import MainSlider from '../components/MainSlider';
+import MainSlider from '../components/TimeTravel/MainSlider';
 import { mainSlice } from '../slices/mainSlice';
 import { Provider } from 'react-redux';
 import { configureStore } from '@reduxjs/toolkit';

src/app/__tests__/TravelContainer.test.tsx

@@ -6,7 +6,7 @@ import { configureStore } from '@reduxjs/toolkit';
 import { mainSlice } from '../slices/mainSlice';
 import { useDispatch } from 'react-redux';
 import { ThemeProvider } from '@mui/material/styles';
-import theme from '../components/theme';
+import theme from '../styles/theme';
 import '@testing-library/jest-dom'; // needed this to extend the jest-dom assertions  (ex toHaveTextContent)
 
 const customTabs = {

src/app/__tests__/Tutorial.test.tsx

@@ -4,7 +4,7 @@ import '@testing-library/jest-dom';
 import { TextEncoder } from 'util';
 global.TextEncoder = TextEncoder;
 import '@testing-library/jest-dom';
-import Tutorial from '../components/Tutorial';
+import Tutorial from '../components/Buttons/Tutorial';
 
 const dispatch = jest.fn();
 const props = {

src/app/__tests__/WebMetrics.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render as rtlRender } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import WebMetrics from '../components/WebMetrics';
+import WebMetrics from '../components/StateRoute/WebMetrics/WebMetrics';
 import { useDispatch, Provider } from 'react-redux';
 import { configureStore } from '@reduxjs/toolkit';
 import { mainSlice } from '../slices/mainSlice';