From 015dd13e1aba1d1703aef247ce218eaa16fc5f14 Mon Sep 17 00:00:00 2001 From: emily Date: Tue, 17 Mar 2026 21:15:37 -0700 Subject: [PATCH 1/6] added events page --- src/Components/Navbar/UserNavbar.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Components/Navbar/UserNavbar.js b/src/Components/Navbar/UserNavbar.js index 301860e9d..fe0130c51 100644 --- a/src/Components/Navbar/UserNavbar.js +++ b/src/Components/Navbar/UserNavbar.js @@ -14,6 +14,8 @@ export default function UserNavbar(props) { { title: 'About', route: '/about' }, { title: 'Projects', route: '/projects' }, { title: 'Summer Internship', route: '/s/internship', newTab: true }, + { title: 'SCEvents', route: '/events', newTab: true }, + ]; const authedRoutes = [ From 88916b68e1eb9b54f7368bdfe3ac69d81ca47c5f Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 20 Mar 2026 13:27:53 -0700 Subject: [PATCH 2/6] updated config.example.json --- api/config/config.example.json | 5 ++++- src/Components/Navbar/UserNavbar.js | 3 +-- src/config/config.example.json | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/api/config/config.example.json b/api/config/config.example.json index b0f786da7..3e65ddb1b 100644 --- a/api/config/config.example.json +++ b/api/config/config.example.json @@ -35,5 +35,8 @@ "membershipPayment": { "API_KEY": "GO_AWAY_LOL" }, - "secretKey": "super duper secret key" + "secretKey": "super duper secret key", + "SCEvents": { + "ENABLED": false + } } \ No newline at end of file diff --git a/src/Components/Navbar/UserNavbar.js b/src/Components/Navbar/UserNavbar.js index fe0130c51..6a8a5beb7 100644 --- a/src/Components/Navbar/UserNavbar.js +++ b/src/Components/Navbar/UserNavbar.js @@ -14,8 +14,7 @@ export default function UserNavbar(props) { { title: 'About', route: '/about' }, { title: 'Projects', route: '/projects' }, { title: 'Summer Internship', route: '/s/internship', newTab: true }, - { title: 'SCEvents', route: '/events', newTab: true }, - + { title: 'Events', route: '/events', newTab: true }, ]; const authedRoutes = [ diff --git a/src/config/config.example.json b/src/config/config.example.json index 78eecdc0b..6bdcd64bb 100644 --- a/src/config/config.example.json +++ b/src/config/config.example.json @@ -1,5 +1,6 @@ { "sitekey": "super secret key", "TINYMCE_API_KEY": "XXXXXXXXXXXXXXXXXXXXX", - "GOOGLE_API_CLIENT_ID": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.apps.googleusercontent.com" + "GOOGLE_API_CLIENT_ID": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.apps.googleusercontent.com", + "SCEvents": "XXXXXXXXXXX" } From b017389cfa5119016a2412f15e69d30339e5204b Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 20 Mar 2026 15:24:20 -0700 Subject: [PATCH 3/6] gated events page --- src/Components/Navbar/UserNavbar.js | 3 ++- src/config/config.example.json | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Components/Navbar/UserNavbar.js b/src/Components/Navbar/UserNavbar.js index 6a8a5beb7..0ae965ef7 100644 --- a/src/Components/Navbar/UserNavbar.js +++ b/src/Components/Navbar/UserNavbar.js @@ -1,6 +1,7 @@ import React, { useState, useEffect, useRef } from 'react'; import { membershipState } from '../../Enums'; import { useSCE } from '../context/SceContext'; +import config from '../../config/config.json'; export default function UserNavbar(props) { const { user, authenticated } = useSCE(); @@ -14,7 +15,7 @@ export default function UserNavbar(props) { { title: 'About', route: '/about' }, { title: 'Projects', route: '/projects' }, { title: 'Summer Internship', route: '/s/internship', newTab: true }, - { title: 'Events', route: '/events', newTab: true }, + ...(config.SCEvents?.ENABLED ? [{ title: 'SCEvents', route: '/events', newTab: true }] : []), ]; const authedRoutes = [ diff --git a/src/config/config.example.json b/src/config/config.example.json index 6bdcd64bb..031ea1559 100644 --- a/src/config/config.example.json +++ b/src/config/config.example.json @@ -2,5 +2,7 @@ "sitekey": "super secret key", "TINYMCE_API_KEY": "XXXXXXXXXXXXXXXXXXXXX", "GOOGLE_API_CLIENT_ID": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.apps.googleusercontent.com", - "SCEvents": "XXXXXXXXXXX" + "SCEvents": { + "ENABLED": false + } } From 90bfbba57d8502a277ecfe33f7822ab781cf33de Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 20 Mar 2026 21:12:49 -0700 Subject: [PATCH 4/6] added events page --- src/Components/Navbar/UserNavbar.js | 2 +- src/Pages/Events/Events.js | 4 ++++ src/Routes.js | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/Pages/Events/Events.js diff --git a/src/Components/Navbar/UserNavbar.js b/src/Components/Navbar/UserNavbar.js index 0ae965ef7..af0b5330c 100644 --- a/src/Components/Navbar/UserNavbar.js +++ b/src/Components/Navbar/UserNavbar.js @@ -15,7 +15,7 @@ export default function UserNavbar(props) { { title: 'About', route: '/about' }, { title: 'Projects', route: '/projects' }, { title: 'Summer Internship', route: '/s/internship', newTab: true }, - ...(config.SCEvents?.ENABLED ? [{ title: 'SCEvents', route: '/events', newTab: true }] : []), + ...(config.SCEvents?.ENABLED ? [{ title: 'SCEvents', route: '/events' }] : []), ]; const authedRoutes = [ diff --git a/src/Pages/Events/Events.js b/src/Pages/Events/Events.js new file mode 100644 index 000000000..ec241d38a --- /dev/null +++ b/src/Pages/Events/Events.js @@ -0,0 +1,4 @@ + +export default function EventsPage() { + return

Events Page

; +} diff --git a/src/Routes.js b/src/Routes.js index 406a4afe2..ee643e3ea 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -19,6 +19,7 @@ import Home from './Pages/Home/Home.js'; import CardReader from './Pages/CardReader/CardReader.js'; import AuditLogsPage from './Pages/AuditLog/AuditLog.js'; import PermissionRequestPage from './Pages/PermissionRequest/PermissionRequest.js'; +import EventsPage from './Pages/Events/Events.js'; // Declare an enum for permission check export const allowedIf = { @@ -197,6 +198,11 @@ export const signedOutRoutes = [ path: '/projects', pageName: 'Projects' }, + { + Component: EventsPage, + path: '/events', + pageName: 'Events' + }, { Component: EmailPreferencesPage, path: '/emailPreferences', From 461baa715a2068e4628f2596ee8434b8a9f80042 Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 20 Mar 2026 21:17:05 -0700 Subject: [PATCH 5/6] ran lint --- src/Pages/Events/Events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/Events/Events.js b/src/Pages/Events/Events.js index ec241d38a..664994c73 100644 --- a/src/Pages/Events/Events.js +++ b/src/Pages/Events/Events.js @@ -1,4 +1,4 @@ export default function EventsPage() { - return

Events Page

; + return

Events Page

; } From ab3da1a8dea98729adfd1ed4fa3b279ddfcdd678 Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 20 Mar 2026 21:41:55 -0700 Subject: [PATCH 6/6] gate events page --- src/Pages/Events/Events.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Pages/Events/Events.js b/src/Pages/Events/Events.js index 664994c73..0da2fb2ff 100644 --- a/src/Pages/Events/Events.js +++ b/src/Pages/Events/Events.js @@ -1,4 +1,8 @@ +import config from '../../config/config.json'; +import NotFoundPage from '../NotFoundPage/NotFoundPage.js'; +import { Redirect } from 'react-router-dom'; + export default function EventsPage() { - return

Events Page

; + return config.SCEvents.ENABLED ?

Events Page

: ; }