mmakes changes

.eslintrc.cjs

@@ -7,14 +7,14 @@ module.exports = {
     'plugin:react/jsx-runtime',
     'plugin:react-hooks/recommended',
   ],
+  globals: {
+    React: true,
+  },
   ignorePatterns: ['dist', '.eslintrc.cjs'],
   parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
-  settings: { react: { version: '18.2' } },
+  settings: { react: { version: 'detect' } },
   plugins: ['react-refresh'],
   rules: {
-    'react-refresh/only-export-components': [
-      'warn',
-      { allowConstantExport: true },
-    ],
+    'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
   },
-}
+};

.github/workflows/CD-prod.yml

@@ -0,0 +1,51 @@
+name: S3 Prod Deploy
+on:
+  push:
+    branches:
+      - main
+env:
+  NODE_ENV: ${{ secrets.NODE_ENV }}
+  VITE_FIREBASE_APIKEY: ${{ secrets.VITE_FIREBASE_APIKEY }}
+  VITE_FIREBASE_AUTHDOMAIN: ${{ secrets.VITE_FIREBASE_AUTHDOMAIN }}
+  VITE_FIREBASE_PROJECTID: ${{ secrets.VITE_FIREBASE_PROJECTID }}
+  VITE_FIREBASE_STORAGEBUCKET: ${{ secrets.VITE_FIREBASE_STORAGEBUCKET }}
+  VITE_FIREBASE_MESSAGINGSENDERID: ${{ secrets.VITE_FIREBASE_MESSAGINGSENDERID }}
+  VITE_FIREBASE_APPID: ${{ secrets.VITE_FIREBASE_APPID }}
+  VITE_EMAIL_USERNAME: ${{ secrets.VITE_EMAIL_USERNAME }}
+  VITE_BACKEND_HOSTNAME: ${{ secrets.PROD_VITE_BACKEND_HOSTNAME }}
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.PROD_AWS_SECRET_ACCESS_KEY }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+
+      - name: Install dependencies
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: install
+
+      - name: Build
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: build
+
+      - name: Deploy
+        uses: reggionick/s3-deploy@v4
+        with:
+          folder: dist
+          bucket: ${{ secrets.PROD_S3_BUCKET }}
+          bucket-region: ${{ secrets.S3_BUCKET_REGION }}
+          dist-id: ${{ secrets.PROD_CLOUDFRONT_DISTRIBUTION_ID }}
+          invalidation: /
+          delete-removed: true
+          no-cache: true
+          private: true
+          filesToInclude: '.*/*,*/*,**'

.github/workflows/CD.yml

@@ -2,7 +2,7 @@ name: S3 Deploy
 on:
   push:
     branches:
-      - dev-deployment
+      - main
 env:
   NODE_ENV: ${{ secrets.NODE_ENV }}
   VITE_FIREBASE_APIKEY: ${{ secrets.VITE_FIREBASE_APIKEY }}
@@ -48,4 +48,4 @@ jobs:
           delete-removed: true
           no-cache: true
           private: true
-          filesToInclude: '.*/*,*/*,**'
+          filesToInclude: '.*/*,*/*,**'

.github/workflows/CI.yml

@@ -1,14 +1,13 @@
 name: CI
 
-on:
-  [pull_request]
-
+on: [pull_request]
+
 permissions: read-all
 
 jobs:
-  eslint:  
+  eslint:
     runs-on: ubuntu-latest
-    steps:    
+    steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
@@ -21,16 +20,16 @@ jobs:
           reporter: github-pr-review
           fail_on_error: false
           eslint_flags: '**/*.{js,jsx}'
-          
+
   detect-secrets:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Run detect-secrets with reviewdog
-      uses: reviewdog/action-detect-secrets@master
-      with:
-        github_token: ${{ secrets.CTC_DEVOPS_ORG_PAT }}
-        reporter: github-pr-review
+      - uses: actions/checkout@v2
+      - name: Run detect-secrets with reviewdog
+        uses: reviewdog/action-detect-secrets@master
+        with:
+          github_token: ${{ secrets.CTC_DEVOPS_ORG_PAT }}
+          reporter: github-pr-review
 
-        # Prevents false positives from failing job
-        fail_on_error: false
+          # Prevents false positives from failing job
+          fail_on_error: false

.github/workflows/scripts/reviewReviewed.js

@@ -40,11 +40,11 @@ const messageAssignee = async ({ context }) => {
     try {
       const UserModel = getUserModel();
       const slackAssignees = await Promise.allSettled(
-        githubAssignees.map(assignee => UserModel.findOne({ github: assignee.login })),
+        githubAssignees.map((assignee) => UserModel.findOne({ github: assignee.login })),
       );
       if (context.payload.review.state === 'approved') {
         await Promise.all(
-          slackAssignees.map(assignee =>
+          slackAssignees.map((assignee) =>
             Bot.client.chat.postMessage({
               channel: assignee.value?.slackId,
               text: `One of your pull requests has been APPROVED by ${reviewer}! <${url}|View Review> :shrek::thumbsup:`,
@@ -53,7 +53,7 @@ const messageAssignee = async ({ context }) => {
         );
       } else {
         await Promise.all(
-          slackAssignees.map(assignee =>
+          slackAssignees.map((assignee) =>
             Bot.client.chat.postMessage({
               channel: assignee.value?.slackId,
               text: `One of your pull requests has been REVIEWED by ${reviewer}! <${url}|View Review> :shrek:`,