Merge pull request #120 from ITPNYU/main

Release 03.28

.github/workflows/deploy_dev_lucia.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Push to Google Apps Script
         run: |
           cd media_commons_booking_app
-          npm run deploy
+          npm run deploy:local
       - name: Create new version and push
         run: |
           cd media_commons_booking_app

.github/workflows/deploy_dev_noah.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Push to Google Apps Script
         run: |
           cd media_commons_booking_app
-          npm run deploy
+          npm run deploy:local
       - name: Create new version and push
         run: |
           cd media_commons_booking_app

.github/workflows/deploy_dev_riho.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Push to Google Apps Script
         run: |
           cd media_commons_booking_app
-          npm run deploy
+          npm run deploy:local
       - name: Create new version and push
         run: |
           cd media_commons_booking_app

media_commons_booking_app/package.json

@@ -13,14 +13,16 @@
     "setup": "rimraf .clasp.json && mkdirp dist && clasp create --type sheets --title \"My React Project\" --rootDir ./dist && mv ./dist/.clasp.json ./.clasp.json && rimraf dist",
     "open": "clasp open --addon",
     "setup:https": "mkdirp certs && mkcert -key-file ./certs/key.pem -cert-file ./certs/cert.pem localhost 127.0.0.1",
-    "build:dev": "cross-env NODE_ENV=development CALENDAR_ENV=development webpack",
-    "build:staging": "cross-env NODE_ENV=production CALENDAR_ENV=development webpack",
-    "build": "cross-env NODE_ENV=production CALENDAR_ENV=production webpack",
+    "build:local": "cross-env NODE_ENV=development CALENDAR_ENV=development BRANCH_NAME=development webpack",
+    "build:dev": "cross-env NODE_ENV=production CALENDAR_ENV=development BRANCH_NAME=development webpack --mode=production",
+    "build:staging": "cross-env NODE_ENV=production CALENDAR_ENV=development BRANCH_NAME=staging webpack --mode=production",
+    "build": "cross-env NODE_ENV=production CALENDAR_ENV=production BRANCH_NAME=production webpack --mode=production",
+    "deploy:local": "rimraf dist && npm run build:local && npx clasp push",
     "deploy:dev": "rimraf dist && npm run build:dev && npx clasp push",
     "deploy:staging": "rimraf dist && npm run build:staging && npx clasp push",
     "deploy": "rimraf dist && npm run build && npx clasp push",
-    "serve": "cross-env NODE_ENV=development CALENDAR_ENV=development webpack serve",
-    "start": "npm run deploy:dev && npm run serve"
+    "serve": "cross-env NODE_ENV=development CALENDAR_ENV=development BRANCH_NAME=development webpack serve",
+    "start": "npm run deploy:local && npm run serve"
   },
   "keywords": [
     "react",
@@ -51,6 +53,8 @@
     "react-bootstrap": "^2.4.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.45.2",
+    "react-router": "^6.22.3",
+    "react-router-dom": "^6.22.3",
     "react-transition-group": "^4.4.2",
     "tailwind-datepicker-react": "^1.4.2",
     "tailwindcss": "^3.1.6"
@@ -71,10 +75,11 @@
     "@google/clasp": "^2.3.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@types/expect-puppeteer": "^5.0.0",
+    "@types/google-apps-script": "^1.0.82",
     "@types/jest-environment-puppeteer": "^5.0.2",
     "@types/node": "^20.11.28",
     "@types/puppeteer": "^5.4.6",
-    "@types/react": "^18.0.14",
+    "@types/react": "^18.2.67",
     "autoprefixer": "10.4.5",
     "aws-sdk": "^2.1106.0",
     "babel-loader": "^8.2.5",