Merge pull request #558 from nwplus/dev

Merged portal reskin from dev to main
nwplus · Jan 14, 2024 · b3a764b · b3a764b
2 parents 0253c54 + 367c638
commit b3a764b
Show file tree

Hide file tree

Showing 28 changed files with 6,059 additions and 2,543 deletions.
diff --git a/src/App.js b/src/App.js
@@ -9,11 +9,12 @@ import {
   ApplicationForm,
   ApplicationReview,
   Charcuterie,
-  DiscordBot,
+  // DiscordBot,
   Faq,
   Gallery,
-  GettingStarted,
+  // GettingStarted,
   Home,
+  Livestream,
   Judging,
   JudgingAdmin,
   JudgingView,
@@ -240,15 +241,18 @@ function App() {
           <PageRoute path="/schedule">
             <Schedule />
           </PageRoute>
+          <PageRoute path="/livestream">
+            <Livestream />
+          </PageRoute>
           <PageRoute path="/sponsors">
             <Sponsors />
           </PageRoute>
-          <PageRoute path="/getting-started">
+          {/* <PageRoute path="/getting-started">
             <GettingStarted />
-          </PageRoute>
-          <PageRoute path="/discord-bot">
+          </PageRoute> */}
+          {/* <PageRoute path="/discord-bot">
             <DiscordBot />
-          </PageRoute>
+          </PageRoute> */}
           <NoAuthRoute path="/login">
             <Navbar>
               <Login />

diff --git a/src/assets/apple_wallet_button.svg b/src/assets/apple_wallet_button.svg
diff --git a/src/assets/expand_icon.svg b/src/assets/expand_icon.svg
diff --git a/src/assets/logo2024.svg b/src/assets/logo2024.svg