Merge pull request #645 from nwplus/dev

nwplus · Nov 14, 2024 · 7ef9e0f · 7ef9e0f
2 parents c9eff50 + 28f1b3b
commit 7ef9e0f
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 49 deletions.
diff --git a/src/components/ApplicationDashboard.jsx b/src/components/ApplicationDashboard.jsx
@@ -395,8 +395,8 @@ const Dashboard = ({
   setSafewalkSelect,
   // nwMentorshipSelect,
   // setNwMentorshipSelect,
-  hcFeatureSelect,
-  setHcFeatureSelect,
+  marketingFeatureSelect,
+  setMarketingFeatureSelect,
   username,
   editApplication,
   relevantDates,
@@ -416,7 +416,7 @@ const Dashboard = ({
   const [willBeAttending, setWillBeAttending] = useState(willBeAttendingCheck || false)
   const [safewalk, setSafewalk] = useState(safewalkSelect || undefined)
   // const [nwMentorship, setNwMentorship] = useState(nwMentorshipSelect || undefined)
-  const [hcFeature, setHcFeature] = useState(hcFeatureSelect || false)
+  const [marketingFeature, setMarketingFeature] = useState(marketingFeatureSelect || false)
 
   const hackerRSVPStatus = hackerStatuses()[hackerStatus]?.sidebarText
 
@@ -464,9 +464,9 @@ const Dashboard = ({
   //   setNwMentorshipSelect(e.target.value)
   // }
 
-  const handleHcFeatureChange = value => {
-    setHcFeature(value)
-    setHcFeatureSelect(value)
+  const handleMarketingFeatureChange = value => {
+    setMarketingFeature(value)
+    setMarketingFeatureSelect(value)
   }
 
   const handleRSVPClick = () => {
@@ -652,24 +652,26 @@ const Dashboard = ({
             </QuestionContainer>
 
             <SelectContainer>
-              <QuestionLabel>HackCamp 2024 Feature Preference</QuestionLabel>
+              <QuestionLabel>
+                {copyText[activeHackathon].hackathonName} Feature Preference
+              </QuestionLabel>
               <P>
                 We are looking for people to be featured in interview videos about their experience
-                at HackCamp. Filming will take ~10 mins and will take place during Build Day
-                (Sunday, November 10th). If chosen, our team will reach out with further
-                instructions. Are you interested in participating?{' '}
+                at {copyText[activeHackathon].hackathonNameShort}. Filming will take ~10 mins and
+                will take place during the hackathon. If chosen, our team will reach out with
+                further instructions. Are you interested in participating?{' '}
               </P>
               <SelectOptionContainer>
                 <Checkbox
-                  checked={hcFeature}
-                  onChange={() => handleHcFeatureChange(true)}
+                  checked={marketingFeature}
+                  onChange={() => handleMarketingFeatureChange(true)}
                   label="Yes"
                 />
               </SelectOptionContainer>
               <SelectOptionContainer>
                 <Checkbox
-                  checked={!hcFeature}
-                  onChange={() => handleHcFeatureChange(false)}
+                  checked={!marketingFeature}
+                  onChange={() => handleMarketingFeatureChange(false)}
                   label="No"
                 />
               </SelectOptionContainer>

diff --git a/src/components/ApplicationForm/ReviewCards.jsx b/src/components/ApplicationForm/ReviewCards.jsx
@@ -304,12 +304,13 @@ const ReviewCards = ({ formInputs, handleEdit, onChange }) => {
         <QuestionHeading>Terms &amp; conditions</QuestionHeading>
 
         <ContentWrapper textBlock>
-          {/* <P>
+          <P>
             <span role="img" aria-label="Robot emoji">
               🤖
             </span>{' '}
-            cmd-f 2024 is an MLH partner event. The following 3 checkboxes are for this partnership.
-          </P> */}
+            {copyText[activeHackathon].hackathonNameShort} is an MLH partner event. The following 3
+            checkboxes are for this partnership.
+          </P>
           <IndentedCheckbox
             flex
             checked={formInputs.termsAndConditions.MLHCodeOfConduct}
@@ -333,7 +334,7 @@ const ReviewCards = ({ formInputs, handleEdit, onChange }) => {
               .<Required />
             </span>
           </IndentedCheckbox>
-          {/* <IndentedCheckbox
+          <IndentedCheckbox
             flex
             checked={formInputs.termsAndConditions.MLHPrivacyPolicy}
             onChange={() =>
@@ -377,33 +378,35 @@ const ReviewCards = ({ formInputs, handleEdit, onChange }) => {
               I authorize MLH to send me occasional emails about relevant events, career
               opportunities, and community announcements.
             </span>
-          </Checkbox> */}
+          </IndentedCheckbox>
         </ContentWrapper>
 
-        {/* <ContentWrapper textBlock>
-          <P>
-            <span role="img" aria-label="Plant sprout emoji">
-              🌱
-            </span>{' '}
-            Gender is deeply personal and can look different on each individual. We ask all
-            participants to trust that everyone attending belongs at cmd-f.
-          </P>
-
-          <IndentedCheckbox
-            flex
-            checked={formInputs.termsAndConditions.genderAcknowledgement}
-            onChange={() =>
-              onChange({
-                genderAcknowledgement: !formInputs.termsAndConditions.genderAcknowledgement,
-              })
-            }
-          >
-            <span>
-              I agree
-              <Required />
-            </span>
-          </IndentedCheckbox>
-        </ContentWrapper> */}
+        {activeHackathon === 'cmd-f' && (
+          <ContentWrapper textBlock>
+            <P>
+              <span role="img" aria-label="Plant sprout emoji">
+                🌱
+              </span>{' '}
+              Gender is deeply personal and can look different on each individual. We ask all
+              participants to trust that everyone attending belongs at cmd-f.
+            </P>
+
+            <IndentedCheckbox
+              flex
+              checked={formInputs.termsAndConditions.genderAcknowledgement}
+              onChange={() =>
+                onChange({
+                  genderAcknowledgement: !formInputs.termsAndConditions.genderAcknowledgement,
+                })
+              }
+            >
+              <span>
+                I agree
+                <Required />
+              </span>
+            </IndentedCheckbox>
+          </ContentWrapper>
+        )}
 
         <ContentWrapper textBlock>
           <P>

diff --git a/src/containers/Application/Dashboard.jsx b/src/containers/Application/Dashboard.jsx
@@ -164,10 +164,10 @@ const ApplicationDashboardContainer = () => {
     forceSave()
   }
 
-  const setHcFeatureSelect = hcFeatureSelect => {
+  const setMarketingFeatureSelect = marketingFeatureSelect => {
     updateApplication({
       basicInfo: {
-        hcFeatureSelect,
+        marketingFeatureSelect,
       },
     })
     forceSave()
@@ -223,8 +223,10 @@ const ApplicationDashboardContainer = () => {
         setSafewalkSelect={safewalkSelect => setSafewalkSelect(safewalkSelect)}
         // nwMentorshipSelect={application.basicInfo.nwMentorshipSelect || undefined}
         // setNwMentorshipSelect={nwMentorshipSelect => setNwMentorshipSelect(nwMentorshipSelect)}
-        hcFeatureSelect={application.basicInfo.hcFeatureSelect || undefined}
-        setHcFeatureSelect={hcFeatureSelect => setHcFeatureSelect(hcFeatureSelect)}
+        marketingFeatureSelect={application.basicInfo.marketingFeatureSelect || undefined}
+        setMarketingFeatureSelect={marketingFeatureSelect =>
+          setMarketingFeatureSelect(marketingFeatureSelect)
+        }
         relevantDates={relevantDates}
         waiversAndForms={waiversAndForms}
         notionLinks={notionLinks}

diff --git a/src/pages/HackathonSelection.jsx b/src/pages/HackathonSelection.jsx
@@ -13,7 +13,7 @@ import nwplus_icon from '../assets/nwplus_icon.svg'
 import HackathonCard from '../components/HackathonCard'
 
 // one of 'HackCamp', 'nwHacks', 'cmd-f', or null (when we're done for the year)
-const UP_NEXT_HACKATHON_NAME = 'HackCamp'
+const UP_NEXT_HACKATHON_NAME = 'nwHacks'
 
 const HackathonSelectionContainer = styled.div`
   display: flex;

diff --git a/src/utility/HackerApplicationContext.jsx b/src/utility/HackerApplicationContext.jsx
@@ -211,7 +211,9 @@ export function HackerApplicationProvider({ children }) {
     return null
   }
 
-  if (!applicationOpen && !window.location.pathname.endsWith('/application')) {
+  const canViewApplication =
+    applicationOpen || window.location.pathname.endsWith('/application') || user?.admin
+  if (!canViewApplication) {
     return <Closed />
   }