Merge pull request #2 from oslabs-beta/dev

File cleanup

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

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Welcome to the Reactime contributing guide!
 
-Thank you for investing your time in contributing to our project! :sparkles:. 
+Thank you for investing your time in contributing to our project! :sparkles:.
 
 In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR.
 
@@ -13,16 +13,15 @@ To get an overview of the project, read the [README](README.md). Here are some r
 - [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow)
 - [Collaborating with pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests)
 
-
 ## Getting started
 
-To navigate our codebase with confidence, see the [Developer Guidelines](/src/README.md) :confetti_ball:.
+To navigate our codebase with confidence, see the [Developer Guidelines](src/DEVELOPER_README.md) :confetti_ball:.
 
 ### Issues
 
 #### Create a new issue
 
-If you spot a problem with the docs, [search if an issue already exists](https://github.com/open-source-labs/reactime/issues). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/open-source-labs/reactime/issues/new). 
+If you spot a problem with the docs, [search if an issue already exists](https://github.com/open-source-labs/reactime/issues). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/open-source-labs/reactime/issues/new).
 
 #### Solve an issue
 
@@ -32,14 +31,16 @@ Scan through our [existing issues](https://github.com/open-source-labs/reactime/
 
 #### Make changes in the UI
 
-Click **Make a contribution** at the bottom of any docs page to make small changes such as a typo, sentence fix, or a broken link. This takes you to the `.md` file where you can make your changes and [create a pull request](#pull-request) for a review. 
+Click **Make a contribution** at the bottom of any docs page to make small changes such as a typo, sentence fix, or a broken link. This takes you to the `.md` file where you can make your changes and [create a pull request](#pull-request) for a review.
 
 #### Make changes locally
 
 1. [Install Git LFS](https://docs.github.com/en/github/managing-large-files/versioning-large-files/installing-git-large-file-storage).
 
 2. Fork the repository.
+
 - Using GitHub Desktop:
+
   - [Getting started with GitHub Desktop](https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop) will guide you through setting up Desktop.
   - Once Desktop is set up, you can use it to [fork the repo](https://github.com/open-source-labs/reactime.git)!
 
@@ -55,16 +56,17 @@ Commit the changes once you are happy with them.
 ### Pull Request
 
 When you're finished with the changes, create a pull request, also known as a PR.
-- Fill the "Ready for review" template so that we can review your PR. This template helps reviewers understand your changes as well as the purpose of your pull request. 
+
+- Fill the "Ready for review" template so that we can review your PR. This template helps reviewers understand your changes as well as the purpose of your pull request.
 - Don't forget to [link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) if you are solving one.
 - Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge.
-Once you submit your PR, a Docs team member will review your proposal. We may ask questions or request additional information.
+  Once you submit your PR, a Docs team member will review your proposal. We may ask questions or request additional information.
 - We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments. You can apply suggested changes directly through the UI. You can make any other changes in your fork, then commit them to your branch.
 - As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations).
 - If you run into any merge issues, checkout this [git tutorial](https://github.com/skills/resolve-merge-conflicts) to help you resolve merge conflicts and other issues.
 
 ### Your PR is merged!
 
-Congratulations :tada::tada: The Reactime team thanks you! :sparkles:. 
+Congratulations :tada::tada: The Reactime team thanks you! :sparkles:.
 
 Once your PR is merged, your contributions will be publicly visible on [Reactime](https://github.com/open-source-labs/reactime)!

demo-app-remix/package.json

@@ -4,9 +4,9 @@
   "scripts": {
     "build": "remix build",
     "dev": "npm-run-all build --parallel \"dev:*\"",
-    "dev:node": "cross-env NODE_ENV=development nodemon --require dotenv/config ./server.js --watch ./server.js",
+    "dev:node": "cross-env NODE_ENV=development nodemon --require dotenv/config ./server.ts --watch ./server.ts",
     "dev:remix": "remix watch",
-    "start": "cross-env NODE_ENV=production node ./server.js",
+    "start": "cross-env NODE_ENV=production node ./server.ts",
     "typecheck": "tsc"
   },
   "dependencies": {
@@ -19,7 +19,8 @@
     "isbot": "^3.6.5",
     "morgan": "^1.10.0",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "ts-node": "^10.9.2"
   },
   "devDependencies": {
     "@remix-run/dev": "^1.14.1",

demo-app-remix/server.ts

@@ -1,33 +1,31 @@
-const path = require("path");
-const express = require("express");
-const compression = require("compression");
-const morgan = require("morgan");
-const { createRequestHandler } = require("@remix-run/express");
+export {}; //JR: added to fix this error message: 'server.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.
+const path = require('path');
+const express = require('express');
+const compression = require('compression');
+const morgan = require('morgan');
+const { createRequestHandler } = require('@remix-run/express');
 
-const BUILD_DIR = path.join(process.cwd(), "build");
+const BUILD_DIR = path.join(process.cwd(), 'build');
 
 const app = express();
 
 app.use(compression());
 
 // http://expressjs.com/en/advanced/best-practice-security.html#at-a-minimum-disable-x-powered-by-header
-app.disable("x-powered-by");
+app.disable('x-powered-by');
 
 // Remix fingerprints its assets so we can cache forever.
-app.use(
-  "/build",
-  express.static("public/build", { immutable: true, maxAge: "1y" })
-);
+app.use('/build', express.static('public/build', { immutable: true, maxAge: '1y' }));
 
 // Everything else (like favicon.ico) is cached for an hour. You may want to be
 // more aggressive with this caching.
-app.use(express.static("public", { maxAge: "1h" }));
+app.use(express.static('public', { maxAge: '1h' }));
 
-app.use(morgan("tiny"));
+app.use(morgan('tiny'));
 
 app.all(
-  "*",
-  process.env.NODE_ENV === "development"
+  '*',
+  process.env.NODE_ENV === 'development'
     ? (req: any, res: any, next: any) => {
         purgeRequireCache();
 
@@ -39,7 +37,7 @@ app.all(
     : createRequestHandler({
         build: require(BUILD_DIR),
         mode: process.env.NODE_ENV,
-      })
+      }),
 );
 const port: number | string = process.env.PORT || 3003;
 

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",
@@ -173,7 +177,7 @@
     "html-react-parser": "^5.0.11",
     "intro.js": "^7.2.0",
     "intro.js-react": "^1.0.0",
-    "jsondiffpatch": "^0.6.0",
+    "jsondiffpatch": "^0.5.0",
     "lodash": "^4.17.21",
     "node": "^18.12.1",
     "rc-slider": "^10.5.0",

src/README.md renamed to src/DEVELOPER_README.md

@@ -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/components/App.tsx renamed to src/app/App.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__/ActionContainer.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__/ErrorMsg.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', () => {