diff --git a/src/components/ApplicationDashboard.jsx b/src/components/ApplicationDashboard.jsx index 999dfc86..4bac2d7d 100644 --- 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 = ({ - HackCamp 2024 Feature Preference + + {copyText[activeHackathon].hackathonName} Feature Preference +

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?{' '}

handleHcFeatureChange(true)} + checked={marketingFeature} + onChange={() => handleMarketingFeatureChange(true)} label="Yes" /> handleHcFeatureChange(false)} + checked={!marketingFeature} + onChange={() => handleMarketingFeatureChange(false)} label="No" /> diff --git a/src/components/ApplicationForm/ReviewCards.jsx b/src/components/ApplicationForm/ReviewCards.jsx index 11083160..46ef796a 100644 --- a/src/components/ApplicationForm/ReviewCards.jsx +++ b/src/components/ApplicationForm/ReviewCards.jsx @@ -304,12 +304,13 @@ const ReviewCards = ({ formInputs, handleEdit, onChange }) => { Terms & conditions - {/*

+

🤖 {' '} - cmd-f 2024 is an MLH partner event. The following 3 checkboxes are for this partnership. -

*/} + {copyText[activeHackathon].hackathonNameShort} is an MLH partner event. The following 3 + checkboxes are for this partnership. +

{ . - {/* @@ -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. - */} +
- {/* -

- - 🌱 - {' '} - Gender is deeply personal and can look different on each individual. We ask all - participants to trust that everyone attending belongs at cmd-f. -

- - - onChange({ - genderAcknowledgement: !formInputs.termsAndConditions.genderAcknowledgement, - }) - } - > - - I agree - - - -
*/} + {activeHackathon === 'cmd-f' && ( + +

+ + 🌱 + {' '} + Gender is deeply personal and can look different on each individual. We ask all + participants to trust that everyone attending belongs at cmd-f. +

+ + + onChange({ + genderAcknowledgement: !formInputs.termsAndConditions.genderAcknowledgement, + }) + } + > + + I agree + + + +
+ )}

diff --git a/src/containers/Application/Dashboard.jsx b/src/containers/Application/Dashboard.jsx index 77f7fc4b..913cb1e2 100644 --- 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 index 10abb75c..5a0e8adc 100644 --- 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 index ad9883ca..d4e05a78 100644 --- 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 }