Merge branch 'master' into fix-mobile-device-horizontal-scrollable

chamhayden · Sep 14, 2024 · bb84b02 · bb84b02
2 parents ad5130d + 0b3f85b
commit bb84b02
Show file tree

Hide file tree

Showing 47 changed files with 16,561 additions and 33,033 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -20,14 +20,14 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/checkout@v2
     - run: ls
-    - run: cd frontend && npm install && npm run build && rm -rf node_modules && cd ..
+    - run: cd frontend && npm install --legacy-peer-deps && npm run build && rm -rf node_modules && cd ..
     - name: Publish
       uses: nogsantos/scp-deploy@master
       with:

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Hi
 
 In a new terminal:  
 `cd frontend`  
-`npm install`  
+`npm install --legacy-peer-deps`  
 `npm start`  
 
 Use Login: z3418003