Merge pull request #1605 from Spiteless/ts.vite_2024-03

Ts.vite 2024 03 (Merge into new vite branch)
hackforla · Mar 5, 2024 · e7ace9a · e7ace9a
2 parents b9368c7 + 3aa212c
commit e7ace9a
Show file tree

Hide file tree

Showing 85 changed files with 3,327 additions and 11,963 deletions.
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:
@@ -109,5 +114,4 @@ jobs:
         service: ${{ needs.setup_env.outputs.AWS_APPENV }}
         cluster: ${{ env.AWS_SHARED_CLUSTER }}
         wait-for-service-stability: true
-        wait-for-minutes: 5 minutes
-
+        wait-for-minutes: 5 minutes
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16
+18
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:18-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,21 +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" />
-    <!--
-      Notice the use of %PUBLIC_URL% 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
-      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`.
-    -->
+    <link rel="manifest" href="/manifest.json" />
     <title>VRMS</title>
   </head>
   <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
@@ -21,20 +21,20 @@
     "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-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": {
@@ -55,6 +55,8 @@
   "author": "sarL3y",
   "license": "ISC",
   "devDependencies": {
+    "@vitejs/plugin-react": "^4.0.3",
+    "@vitejs/plugin-react-swc": "^3.3.2",
     "eslint-config-airbnb": "^18.2.0",
     "eslint-config-airbnb-base": "^14.2.0",
     "eslint-config-prettier": "^6.11.0",
@@ -64,7 +66,12 @@
     "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",
+    "vite": "^4.4.4",
+    "vitest": "^0.33.0"
+  },
+  "engines": {
+    "node": "<=18.0.0"
   }
 }
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/ChangesModal.js → client/src/components/ChangesModal.jsx b/client/src/components/ChangesModal.js → client/src/components/ChangesModal.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
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/...c/components/manageProjects/addProject.js → .../components/manageProjects/addProject.jsx b/...c/components/manageProjects/addProject.js → .../components/manageProjects/addProject.jsx
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
diff --git a/.../components/manageProjects/editProject.js → ...components/manageProjects/editProject.jsx b/.../components/manageProjects/editProject.js → ...components/manageProjects/editProject.jsx
diff --git a/...omponents/manageProjects/editableField.js → ...mponents/manageProjects/editableField.jsx b/...omponents/manageProjects/editableField.js → ...mponents/manageProjects/editableField.jsx
diff --git a/...ponents/manageProjects/editableMeeting.js → ...onents/manageProjects/editableMeeting.jsx b/...ponents/manageProjects/editableMeeting.js → ...onents/manageProjects/editableMeeting.jsx
diff --git a/...rc/components/manageProjects/eventForm.js → ...c/components/manageProjects/eventForm.jsx b/...rc/components/manageProjects/eventForm.js → ...c/components/manageProjects/eventForm.jsx
diff --git a/...omponents/manageProjects/selectProject.js → ...mponents/manageProjects/selectProject.jsx b/...omponents/manageProjects/selectProject.js → ...mponents/manageProjects/selectProject.jsx
diff --git a/...t/src/components/parts/boxes/TitledBox.js → .../src/components/parts/boxes/TitledBox.jsx b/...t/src/components/parts/boxes/TitledBox.js → .../src/components/parts/boxes/TitledBox.jsx
diff --git a/...mponents/parts/form/ValidatedTextField.js → ...ponents/parts/form/ValidatedTextField.jsx b/...mponents/parts/form/ValidatedTextField.js → ...ponents/parts/form/ValidatedTextField.jsx
diff --git a/...mponents/presentational/CheckInButtons.js → ...ponents/presentational/CheckInButtons.jsx b/...mponents/presentational/CheckInButtons.js → ...ponents/presentational/CheckInButtons.jsx
diff --git a/.../presentational/CreateNewProfileButton.js → ...presentational/CreateNewProfileButton.jsx b/.../presentational/CreateNewProfileButton.js → ...presentational/CreateNewProfileButton.jsx
diff --git a/...ponents/presentational/DashboardReport.js → ...onents/presentational/DashboardReport.jsx b/...ponents/presentational/DashboardReport.js → ...onents/presentational/DashboardReport.jsx
diff --git a/.../components/presentational/newUserForm.js → ...components/presentational/newUserForm.jsx b/.../components/presentational/newUserForm.js → ...components/presentational/newUserForm.jsx
diff --git a/...s/presentational/profile/ProfileOption.js → .../presentational/profile/ProfileOption.jsx b/...s/presentational/profile/ProfileOption.js → .../presentational/profile/ProfileOption.jsx
diff --git a/...ents/presentational/profile/UserEvents.js → ...nts/presentational/profile/UserEvents.jsx b/...ents/presentational/profile/UserEvents.js → ...nts/presentational/profile/UserEvents.jsx
diff --git a/...nents/presentational/profile/UserTable.js → ...ents/presentational/profile/UserTable.jsx b/...nents/presentational/profile/UserTable.js → ...ents/presentational/profile/UserTable.jsx
diff --git a/...nents/presentational/profile/UserTeams.js → ...ents/presentational/profile/UserTeams.jsx b/...nents/presentational/profile/UserTeams.js → ...ents/presentational/profile/UserTeams.jsx
diff --git a/...esentational/projectDashboardContainer.js → ...sentational/projectDashboardContainer.jsx b/...esentational/projectDashboardContainer.js → ...sentational/projectDashboardContainer.jsx
diff --git a/...mponents/presentational/returnUserForm.js → ...ponents/presentational/returnUserForm.jsx b/...mponents/presentational/returnUserForm.js → ...ponents/presentational/returnUserForm.jsx
diff --git a/...omponents/presentational/upcomingEvent.js → ...mponents/presentational/upcomingEvent.jsx b/...omponents/presentational/upcomingEvent.js → ...mponents/presentational/upcomingEvent.jsx
diff --git a/...rc/components/user-admin/AddNewProject.js → ...c/components/user-admin/AddNewProject.jsx b/...rc/components/user-admin/AddNewProject.js → ...c/components/user-admin/AddNewProject.jsx
diff --git a/...nt/src/components/user-admin/EditUsers.js → ...t/src/components/user-admin/EditUsers.jsx b/...nt/src/components/user-admin/EditUsers.js → ...t/src/components/user-admin/EditUsers.jsx
diff --git a/...c/components/user-admin/UserManagement.js → .../components/user-admin/UserManagement.jsx b/...c/components/user-admin/UserManagement.js → .../components/user-admin/UserManagement.jsx
diff --git a/client/src/context/authContext.js → client/src/context/authContext.jsx b/client/src/context/authContext.js → client/src/context/authContext.jsx
diff --git a/client/src/context/snackbarContext.js → client/src/context/snackbarContext.jsx b/client/src/context/snackbarContext.js → client/src/context/snackbarContext.jsx
diff --git a/client/src/context/userContext.js → client/src/context/userContext.jsx b/client/src/context/userContext.js → client/src/context/userContext.jsx
diff --git a/client/src/hooks/useAuth.js → client/src/hooks/useAuth.jsx b/client/src/hooks/useAuth.js → client/src/hooks/useAuth.jsx
diff --git a/client/src/index.js → client/src/index.jsx b/client/src/index.js → client/src/index.jsx
diff --git a/client/src/pages/CheckInForm.js → client/src/pages/CheckInForm.jsx b/client/src/pages/CheckInForm.js → client/src/pages/CheckInForm.jsx
diff --git a/client/src/pages/EmailSent.js → client/src/pages/EmailSent.jsx b/client/src/pages/EmailSent.js → client/src/pages/EmailSent.jsx
diff --git a/client/src/pages/Event.js → client/src/pages/Event.jsx b/client/src/pages/Event.js → client/src/pages/Event.jsx
diff --git a/client/src/pages/Events.js → client/src/pages/Events.jsx b/client/src/pages/Events.js → client/src/pages/Events.jsx
diff --git a/client/src/pages/HealthCheck.js → client/src/pages/HealthCheck.jsx b/client/src/pages/HealthCheck.js → client/src/pages/HealthCheck.jsx
diff --git a/client/src/pages/Home.js → client/src/pages/Home.jsx b/client/src/pages/Home.js → client/src/pages/Home.jsx
diff --git a/client/src/pages/ManageProjects.js → client/src/pages/ManageProjects.jsx b/client/src/pages/ManageProjects.js → client/src/pages/ManageProjects.jsx
diff --git a/client/src/pages/NewUser.js → client/src/pages/NewUser.jsx b/client/src/pages/NewUser.js → client/src/pages/NewUser.jsx
diff --git a/client/src/pages/ProjectLeaderDashboard.js → client/src/pages/ProjectLeaderDashboard.jsx b/client/src/pages/ProjectLeaderDashboard.js → client/src/pages/ProjectLeaderDashboard.jsx
diff --git a/client/src/pages/ProjectList.js → client/src/pages/ProjectList.jsx b/client/src/pages/ProjectList.js → client/src/pages/ProjectList.jsx
diff --git a/client/src/pages/ReturningUser.js → client/src/pages/ReturningUser.jsx b/client/src/pages/ReturningUser.js → client/src/pages/ReturningUser.jsx
diff --git a/client/src/pages/SecretPassword.js → client/src/pages/SecretPassword.jsx b/client/src/pages/SecretPassword.js → client/src/pages/SecretPassword.jsx
diff --git a/client/src/pages/Success.js → client/src/pages/Success.jsx b/client/src/pages/Success.js → client/src/pages/Success.jsx
diff --git a/client/src/pages/UserAdmin.js → client/src/pages/UserAdmin.jsx b/client/src/pages/UserAdmin.js → client/src/pages/UserAdmin.jsx
diff --git a/client/src/pages/UserDashboard.js → client/src/pages/UserDashboard.jsx b/client/src/pages/UserDashboard.js → client/src/pages/UserDashboard.jsx
diff --git a/client/src/pages/UserProfile.js → client/src/pages/UserProfile.jsx b/client/src/pages/UserProfile.js → client/src/pages/UserProfile.jsx
diff --git a/client/src/pages/UserWelcome.js → client/src/pages/UserWelcome.jsx b/client/src/pages/UserWelcome.js → client/src/pages/UserWelcome.jsx
diff --git a/client/vite.config.js b/client/vite.config.js
@@ -0,0 +1,27 @@
+import { defineConfig, loadEnv } from 'vite'
+import react from '@vitejs/plugin-react-swc'
+import svgr from "vite-plugin-svgr";
+
+export default defineConfig(({ mode }) => {
+  // Load env file based on`mode in the current working directory.
+  const env = loadEnv(mode, process.cwd(), '');
+  return {
+    plugins: [
+      svgr(),
+      react(),
+    ],
+    server: {
+      port: env.CLIENT_PORT,
+      proxy: {
+        '/api': {
+          target: env.REACT_APP_PROXY,
+          changeOrigin: true,
+          secure: false,
+        },
+      },
+    },
+    build: {
+      outDir: 'build',
+    },
+  };
+});