Modularize General Meeting page

.github/workflows/lint.yml

@@ -22,16 +22,25 @@ jobs:
       matrix:
         node-version: [16.x]
 
+    env:
+      EVENTS_SPREADSHEET_ID: ${{ secrets.EVENTS_SPREADSHEET_ID }}
+      SERVICE_ACCOUNT: ${{ secrets.SERVICE_ACCOUNT }}
+      DIRECTORY_SPREADSHEET_ID: ${{ secrets.DIRECTORY_SPREADSHEET_ID }}
+      TOWNHALL_SPREADSHEET_ID: ${{ secrets.TOWNHALL_SPREADSHEET_ID }}
+      GM_SPREADSHEET_ID: ${{ secrets.GM_SPREADSHEET_ID }}
+
     steps:
     - uses: actions/checkout@v2
+
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+
     - run: npm install
+
     - run: npm run ofp
-      env:
-        EVENTS_SPREADSHEET_ID: ${{ secrets.EVENTS_SPREADSHEET_ID }}
-        SERVICE_ACCOUNT: ${{ secrets.SERVICE_ACCOUNT }}
-        DIRECTORY_SPREADSHEET_ID: ${{ secrets.DIRECTORY_SPREADSHEET_ID }}
+
+    - run: npm run thp
+
     - run: npm run lint

.github/workflows/node-build.yml

@@ -22,23 +22,29 @@ jobs:
       matrix:
         node-version: [16.x]
 
+    env:
+      EVENTS_SPREADSHEET_ID: ${{ secrets.EVENTS_SPREADSHEET_ID }}
+      SERVICE_ACCOUNT: ${{ secrets.SERVICE_ACCOUNT }}
+      DIRECTORY_SPREADSHEET_ID: ${{ secrets.DIRECTORY_SPREADSHEET_ID }}
+      TOWNHALL_SPREADSHEET_ID: ${{ secrets.TOWNHALL_SPREADSHEET_ID }}
+      GM_SPREADSHEET_ID: ${{ secrets.GM_SPREADSHEET_ID }}
+
     steps:
     - uses: actions/checkout@v2
+
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+
     - run: npm install
+
     - run: npm run ofp
-      env:
-        EVENTS_SPREADSHEET_ID: ${{ secrets.EVENTS_SPREADSHEET_ID }}
-        SERVICE_ACCOUNT: ${{ secrets.SERVICE_ACCOUNT }}
-        DIRECTORY_SPREADSHEET_ID: ${{ secrets.DIRECTORY_SPREADSHEET_ID }}
+
+    - run: npm run thp
+
     - run: npm run build
-      env:
-        EVENTS_SPREADSHEET_ID: ${{ secrets.EVENTS_SPREADSHEET_ID }}
-        SERVICE_ACCOUNT: ${{ secrets.SERVICE_ACCOUNT }}
-        DIRECTORY_SPREADSHEET_ID: ${{ secrets.DIRECTORY_SPREADSHEET_ID }}
+
     - run: npm test
       env:
         CI: true

.gitignore

@@ -36,3 +36,6 @@ yarn-error.log*
 *.csv
 output.json
 offoutput.json
+townhall.json
+past-townhall.json
+gmData.json

_redirects

@@ -1,3 +1,2 @@
 /fallgm         /gm/f22
-/town-hall      /town-hall/s22
 /wintergm       /gm/w22

components/Footer.js

@@ -7,8 +7,8 @@ import SocialMedia from './SocialMedia';
 const footerACMLinks = [
 	{ title: 'About', path: '/about' },
 	{ title: 'Events', path: '/events' },
-	{ title: 'General Meeting', path: '/gm/w24' },
-	{ title: 'CS Town Hall', path: '/town-hall/f23' },
+	{ title: 'General Meeting', path: '/gm' },
+	{ title: 'CS Town Hall', path: '/town-hall' },
 	{ title: 'Internship Program', path: '/internship' },
 	{ title: 'Dev Team', path: '/dev'},
 	{ title: 'Sponsors', path: '/sponsors' },

netlify.toml

@@ -1,5 +1,5 @@
 [build]
-  command = "npm run ofp; npm run build"
+  command = "npm run ofp; npm run thp; npm run gmp; npm run build"
   publish = "build"
 
 [[plugins]]

next.config.js

@@ -15,6 +15,7 @@ module.exports = {
       'jcfp.site',
       'photos.google.com',
       'photos.app.goo.gl',
+      'www.uclaacm.com',
     ],
   },
   target: 'serverless',

package.json

@@ -24,7 +24,7 @@
   "scripts": {
     "start": "next dev",
     "start-production": "next start",
-    "build": "node scripts/officer-parser.mjs && next build",
+    "build": "npm run ofp && npm run thp && npm run gmp && next build",
     "lint-js": "eslint \"**/*.js\"",
     "lint-js-fix": "eslint --fix \"**/*.js\"",
     "lint-css": "stylelint \"**/*.css\" \"**/*.scss\"",
@@ -34,6 +34,8 @@
     "reg": "node scripts/recurring-event-generator.mjs",
     "seg": "node scripts/single-event-generator.mjs",
     "ofp": "node scripts/officer-parser.mjs",
+    "thp": "node scripts/town-hall-generator.mjs",
+    "gmp": "node scripts/gm-generator.mjs",
     "test": "jest --env=jsdom"
   },
   "eslintConfig": {