hackforla · trillium · Aug 24, 2023 · Aug 25, 2023 · Aug 14, 2023 · Aug 28, 2023
diff --git a/.github/workflows/aws-frontend-deploy.yml b/.github/workflows/aws-frontend-deploy.yml
@@ -48,6 +48,11 @@ jobs:
       uses: actions/checkout@v3
       with:
         ref: ${{ github.event.inputs.ref }}
+    - name: Checkout
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18
+        cache: 'npm'
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v2
       with:

diff --git a/backend/Dockerfile.api b/backend/Dockerfile.api
@@ -1,19 +1,19 @@
-FROM node:14.11.0 AS api-development
+FROM node:18.12.0 AS api-development
 RUN mkdir /srv/backend
 WORKDIR /srv/backend
 RUN mkdir -p node_modules
 COPY package.json yarn.lock ./
 RUN yarn install --pure-lockfile
 COPY . .
 
-FROM node:14.11.0 AS api-test
+FROM node:18.12.0 AS api-test
 RUN mkdir /srv/backend
 WORKDIR /srv/backend
 COPY package.json yarn.lock ./
 RUN yarn install --silent
 RUN mkdir -p node_modules
 
-FROM node:14.11.0-slim AS api-production
+FROM node:18.12.0-slim AS api-production
 EXPOSE 4000
 USER node
 WORKDIR /srv/backend

diff --git a/backend/Dockerfile.dev b/backend/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:14.11.0 AS api-development
+FROM node:18.12.0 AS api-development
 RUN mkdir /srv/backend
 WORKDIR /srv/backend
 RUN mkdir -p node_modules

diff --git a/backend/Dockerfile.prod b/backend/Dockerfile.prod
@@ -1,12 +1,12 @@
-FROM node:14.11.0 AS api-builder
+FROM node:18.12.0 AS api-builder
 RUN mkdir /srv/backend
 WORKDIR /srv/backend
 RUN mkdir -p node_modules
 COPY package.json yarn.lock ./
 RUN yarn install --pure-lockfile
 COPY . .
 
-FROM node:14.11.0-slim AS api-production
+FROM node:18.12.0-slim AS api-production
 EXPOSE 4000
 USER node
 WORKDIR /srv/backend

diff --git a/client/Dockerfile.client b/client/Dockerfile.client
@@ -1,12 +1,12 @@
-FROM node:14.11.0 AS client-development
+FROM node:18-alpine AS client-development
 RUN mkdir /srv/client && chown node:node /srv/client
 WORKDIR /srv/client
 USER node
 RUN mkdir -p node_modules
 COPY --chown=node:node package.json package.json ./
 RUN npm install --silent
 
-FROM node:14.11.0-slim AS client-builder
+FROM node:18.12.0-slim AS client-builder
 USER node
 WORKDIR /srv/client
 COPY --from=client-development /srv/client/node_modules node_modules

diff --git a/client/Dockerfile.dev b/client/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:14.11.0 AS client-development
+FROM node:18-alpine AS client-development
 RUN mkdir /srv/client && chown node:node /srv/client
 WORKDIR /srv/client
 USER node

diff --git a/client/Dockerfile.prod b/client/Dockerfile.prod
@@ -1,12 +1,12 @@
-FROM node:14.11.0 AS node-modules-install
+FROM node:20-alpine AS node-modules-install
 RUN mkdir /srv/client && chown node:node /srv/client
 WORKDIR /srv/client
 USER node
 RUN mkdir -p node_modules
 COPY --chown=node:node package.json package.json ./
-RUN npm install --silent
+RUN npm install --no-update-notifier
 
-FROM node:14.11.0-slim AS client-builder
+FROM node:18-slim AS client-builder
 USER node
 WORKDIR /srv/client
 COPY --from=node-modules-install /srv/client/node_modules node_modules

diff --git a/client/public/index.html → client/index.html b/client/public/index.html → client/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
@@ -18,13 +18,13 @@
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="manifest" href="/manifest.json" />
     <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
+      Notice the use of  in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
 
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      Unlike "/favicon.ico" or "favicon.ico", "/favicon.ico" will
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
@@ -33,6 +33,7 @@
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
+    <script type="module" src="/src/index.jsx"></script>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.

diff --git a/client/package.json b/client/package.json
@@ -8,6 +8,8 @@
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@mui/material": "^5.11.12",
+    "@vitejs/plugin-react": "^4.0.3",
+    "@vitejs/plugin-react-swc": "^3.3.2",
     "classnames": "^2.2.6",
     "cross-env": "^7.0.2",
     "cross-var": "^1.1.0",
@@ -20,20 +22,21 @@
     "minimist": "^1.2.6",
     "moment": "^2.29.2",
     "moment-recur": "^1.0.7",
-    "react": "^16.13.1",
-    "react-datepicker": "^3.1.3",
-    "react-dom": "^16.13.1",
+    "react": "^18.2.0",
+    "react-datepicker": "^4.16.0",
+    "react-dom": "^18.2.0",
     "react-hook-form": "^7.44.3",
     "react-router-dom": "^5.1.2",
-    "react-scripts": "^3.4.1",
-    "validator": "^13.7.0"
+    "validator": "^13.7.0",
+    "vite": "^4.4.4",
+    "vite-plugin-svgr": "^3.2.0"
   },
   "scripts": {
-    "start": "dotenv -e .env -e ../backend/.env -- cross-var cross-env PORT=%CLIENT_PORT% react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test --watchAll=false",
-    "test:watch": "react-scripts test",
-    "eject": "react-scripts eject",
+    "vite": "vite",
+    "start": "dotenv -e .env -e ../backend/.env -- cross-var cross-env PORT=%CLIENT_PORT% vite",
+    "build": "vite build",
+    "test": "vitest",
+    "preview": "vite preview",
     "heroku-postbuild": "npm run build"
   },
   "eslintConfig": {
@@ -63,7 +66,11 @@
     "eslint-plugin-react": "^7.20.6",
     "eslint-plugin-react-hooks": "^4.1.2",
     "prettier": "^2.1.1",
-    "react-test-renderer": "^16.13.1",
-    "sass": "^1.49.7"
+    "react-test-renderer": "^18.2.0",
+    "sass": "^1.49.7",
+    "vitest": "^0.33.0"
+  },
+  "engines": {
+    "node": "<=18.0.0"
   }
 }
diff --git a/client/src/App.js → client/src/App.jsx b/client/src/App.js → client/src/App.jsx
diff --git a/client/src/common/tabs/index.js → client/src/common/tabs/index.jsx b/client/src/common/tabs/index.js → client/src/common/tabs/index.jsx
diff --git a/client/src/common/tabs/tab.js → client/src/common/tabs/tab.jsx b/client/src/common/tabs/tab.js → client/src/common/tabs/tab.jsx
diff --git a/client/src/components/DashboardUsers.js → client/src/components/DashboardUsers.jsx b/client/src/components/DashboardUsers.js → client/src/components/DashboardUsers.jsx
diff --git a/client/src/components/ErrorContainer.js → client/src/components/ErrorContainer.jsx b/client/src/components/ErrorContainer.js → client/src/components/ErrorContainer.jsx
diff --git a/client/src/components/Footer.js → client/src/components/Footer.jsx b/client/src/components/Footer.js → client/src/components/Footer.jsx
diff --git a/client/src/components/Form.js → client/src/components/Form.jsx b/client/src/components/Form.js → client/src/components/Form.jsx
diff --git a/client/src/components/Header.js → client/src/components/Header.jsx b/client/src/components/Header.js → client/src/components/Header.jsx
diff --git a/client/src/components/Leaderboard.js → client/src/components/Leaderboard.jsx b/client/src/components/Leaderboard.js → client/src/components/Leaderboard.jsx
diff --git a/client/src/components/Navbar.js → client/src/components/Navbar.jsx b/client/src/components/Navbar.js → client/src/components/Navbar.jsx
diff --git a/client/src/components/ProjectForm.js → client/src/components/ProjectForm.jsx b/client/src/components/ProjectForm.js → client/src/components/ProjectForm.jsx
@@ -63,7 +63,8 @@ export default function ProjectForm({
   formData,
   projectToEdit,
   isEdit,
-  setFormData
+  revertToOriginal,
+  setOriginalProjectData,
 }) {
   const history = useHistory();
 
@@ -119,9 +120,8 @@ export default function ProjectForm({
       console.error(errors);
       return;
     }
-    // setOriginalProjectData(data);
-    setFormData(data);
-    setEditMode(false);
+    setOriginalProjectData(data);
+    setEditMode(true);
   };
 
   // ----------------- Handles and Toggles -----------------
@@ -130,14 +130,10 @@ export default function ProjectForm({
   const handleRadioChange = (event) => {
     setLocationType(event.target.value);
   };
-
   // Toggles the project view to edit mode change.
   const handleEditMode = (event) => {
     setEditMode(!editMode);
-    // React hook form method to reset data back to original values. Triggered when Edit Mode is cancelled.
-    reset({
-      ...formData,
-    });
+    revertToOriginal();
   };
 
   // ----------------- Icons -----------------

diff --git a/client/src/components/ReadyEvents.js → client/src/components/ReadyEvents.jsx b/client/src/components/ReadyEvents.js → client/src/components/ReadyEvents.jsx
diff --git a/...t/src/components/admin/dashboard/index.js → .../src/components/admin/dashboard/index.jsx b/...t/src/components/admin/dashboard/index.js → .../src/components/admin/dashboard/index.jsx
diff --git a/client/src/components/admin/donutChart.js → client/src/components/admin/donutChart.jsx b/client/src/components/admin/donutChart.js → client/src/components/admin/donutChart.jsx
diff --git a/...c/components/admin/donutChartContainer.js → .../components/admin/donutChartContainer.jsx b/...c/components/admin/donutChartContainer.js → .../components/admin/donutChartContainer.jsx
diff --git a/...src/components/admin/donutChartLoading.js → ...rc/components/admin/donutChartLoading.jsx b/...src/components/admin/donutChartLoading.js → ...rc/components/admin/donutChartLoading.jsx
diff --git a/client/src/components/admin/eventOverview.js → ...nt/src/components/admin/eventOverview.jsx b/client/src/components/admin/eventOverview.js → ...nt/src/components/admin/eventOverview.jsx
diff --git a/client/src/components/admin/reports/index.js → ...nt/src/components/admin/reports/index.jsx b/client/src/components/admin/reports/index.js → ...nt/src/components/admin/reports/index.jsx
diff --git a/client/src/components/auth/Auth.js → client/src/components/auth/Auth.jsx b/client/src/components/auth/Auth.js → client/src/components/auth/Auth.jsx
diff --git a/client/src/components/auth/HandleAuth.js → client/src/components/auth/HandleAuth.jsx b/client/src/components/auth/HandleAuth.js → client/src/components/auth/HandleAuth.jsx
diff --git a/...src/components/dashboard/AddTeamMember.js → ...rc/components/dashboard/AddTeamMember.jsx b/...src/components/dashboard/AddTeamMember.js → ...rc/components/dashboard/AddTeamMember.jsx
diff --git a/...src/components/dashboard/AttendeeTable.js → ...rc/components/dashboard/AttendeeTable.jsx b/...src/components/dashboard/AttendeeTable.js → ...rc/components/dashboard/AttendeeTable.jsx
diff --git a/.../components/dashboard/AttendeeTableRow.js → ...components/dashboard/AttendeeTableRow.jsx b/.../components/dashboard/AttendeeTableRow.js → ...components/dashboard/AttendeeTableRow.jsx
diff --git a/...c/components/dashboard/DashboardButton.js → .../components/dashboard/DashboardButton.jsx b/...c/components/dashboard/DashboardButton.js → .../components/dashboard/DashboardButton.jsx
diff --git a/...t/src/components/dashboard/ProjectInfo.js → .../src/components/dashboard/ProjectInfo.jsx b/...t/src/components/dashboard/ProjectInfo.js → .../src/components/dashboard/ProjectInfo.jsx
diff --git a/...t/src/components/dashboard/RosterTable.js → .../src/components/dashboard/RosterTable.jsx b/...t/src/components/dashboard/RosterTable.js → .../src/components/dashboard/RosterTable.jsx
diff --git a/...rc/components/dashboard/RosterTableRow.js → ...c/components/dashboard/RosterTableRow.jsx b/...rc/components/dashboard/RosterTableRow.js → ...c/components/dashboard/RosterTableRow.jsx
diff --git a/client/src/components/manageProjects/addProject.js b/client/src/components/manageProjects/addProject.js
diff --git a/client/src/components/manageProjects/addProject.jsx b/client/src/components/manageProjects/addProject.jsx
@@ -0,0 +1,78 @@
+import React from 'react';
+import ProjectForm from '../ProjectForm';
+import { simpleInputs } from '../data';
+
+function addProject() {
+  // Array filled with default inputs.
+  const simpleInputs = [
+    {
+      label: 'Project Name',
+      name: 'name',
+      type: 'text',
+      placeholder: 'Enter project name',
+    },
+    {
+      label: 'Project Description',
+      name: 'description',
+      type: 'textarea',
+      placeholder: 'Enter project description',
+      value: /^[a-zA-Z0-9].{0,250}$/,
+      errorMessage: 'Description must start with alphanumeric characters, 250 char limit'
+    },
+    {
+      label: 'Location',
+      name: 'location',
+      type: 'text',
+      placeholder: 'Enter location for meeting',
+      value: /https:\/\/[\w-]*\.?zoom.us\/(j|my)\/[\d\w?=-]+/,
+      errorMessage: 'Please enter a valid Zoom URL',
+      addressValue: '',
+      addressError: 'Invalid address',
+    },
+    // Leaving incase we want to add this back in for updating projects
+    // {
+    //   label: 'GitHub Identifier',
+    //   name: 'githubIdentifier',
+    //   type: 'text',
+    //   placeholder: 'Enter GitHub identifier',
+    // },
+    {
+      label: 'GitHub URL',
+      name: 'githubUrl',
+      type: 'text',
+      placeholder: 'htttps://github.com/',
+    },
+    {
+      label: 'Slack Channel Link',
+      name: 'slackUrl',
+      type: 'text',
+      placeholder: 'htttps://slack.com/',
+    },
+    {
+      label: 'Google Drive URL',
+      name: 'googleDriveUrl',
+      type: 'text',
+      placeholder: 'htttps://drive.google.com/',
+    },
+    // Leaving incase we want to add this back in for updating projects
+    // {
+    //   label: 'HFLA Website URL',
+    //   name: 'hflaWebsiteUrl',
+    //   type: 'text',
+    //   placeholder: 'htttps://hackforla.org/projects/',
+    // },
+  ];
+
+  return (
+    <div>
+      <ProjectForm
+        arr={simpleInputs}
+        formData={null}
+        handleChange={null}
+        isEdit={false}
+      />
+    </div>
+  );
+}
+
+export default addProject;
diff --git a/...mponents/manageProjects/createNewEvent.js → ...ponents/manageProjects/createNewEvent.jsx b/...mponents/manageProjects/createNewEvent.js → ...ponents/manageProjects/createNewEvent.jsx
diff --git a/...onents/manageProjects/editMeetingTimes.js → ...nents/manageProjects/editMeetingTimes.jsx b/...onents/manageProjects/editMeetingTimes.js → ...nents/manageProjects/editMeetingTimes.jsx