Merge pull request #666 from nwplus/dev

hide links if portal not live
nwplus · Jan 3, 2025 · 819c1a4 · 819c1a4
2 parents 85eaf24 + 0b8cc04
commit 819c1a4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/components/ApplicationDashboard.jsx b/src/components/ApplicationDashboard.jsx
@@ -283,6 +283,7 @@ export const hackerStatuses = (relevantDates, hackerName = null, activeHackathon
     blurb: `Congratulations! We loved the passion and drive we saw in your application, and we'd love even more for you to join us at ${copyText[activeHackathon]?.hackathonName} over the weekend of ${relevantDates?.hackathonWeekend}! Please RSVP before ${relevantDates?.rsvpBy} to confirm your spot.`,
   },
   acceptedAndAttending: {
+    sidebarText: "RSVP'd!",
     cardText: (
       <>
         Accepted &amp; RSVP'd{' '}

diff --git a/src/components/Page.jsx b/src/components/Page.jsx
@@ -49,6 +49,7 @@ const Page = ({ hackerStatus, children }) => {
         isJudgingReleased={livesiteDoc.judgingReleased[activeHackathon]}
         isSubmissionsOpen={livesiteDoc.submissionsOpen[activeHackathon]}
         isApplicationOpen={livesiteDoc.applicationsOpen[activeHackathon]}
+        isPortalLive={livesiteDoc.portalLive[activeHackathon]}
         showMobileSidebar={showMobileSidebar}
         hideSidebarCallback={() => setShowMobileSidebar(false)}
         hackerStatus={hackerStatus}

diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx
@@ -183,6 +183,7 @@ const Sidebar = ({
   isJudgingReleased,
   isSubmissionsOpen,
   isApplicationOpen,
+  isPortalLive,
   hideSidebarCallback,
   hackerStatus,
 }) => {
@@ -291,7 +292,7 @@ const Sidebar = ({
         {/* <SponsorIcon src={poweredBy} alt="powered by Livepeer" /> */}
       </LogoContainer>
       <ItemsContainer>
-        {!hackerStatus || hackerStatus === 'acceptedAndAttending' ? (
+        {!hackerStatus || (hackerStatus === 'acceptedAndAttending' && isPortalLive) ? (
           <>
             {Object.entries(links).map((t, k) => {
               return (

diff --git a/src/containers/Application/Dashboard.jsx b/src/containers/Application/Dashboard.jsx
@@ -7,6 +7,7 @@ import { uploadWaiverToStorage, useHackerApplication } from '../../utility/Hacke
 import { MAX_WAIVER_FILE_SIZE_MB } from '../../utility/Validation'
 import { currentHackathonRef, getLivesiteDoc, livesiteDocRef } from '../../utility/firebase'
 import { useHackathon } from '../../utility/HackathonProvider'
+import Loading from '../../components/Loading'
 
 const ApplicationDashboardContainer = () => {
   const { activeHackathon, dbHackathonName } = useHackathon()
@@ -49,6 +50,10 @@ const ApplicationDashboardContainer = () => {
     return unsubscribe
   }, [activeHackathon])
 
+  if (!application) {
+    return <Loading />
+  }
+
   const { applicationStatus, responded, attending } = application.status
   let hackerStatus