Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Big cmd-f 2024 Merge #567

Merged
merged 32 commits into from
Feb 10, 2024
Merged

Big cmd-f 2024 Merge #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
cea0a3b
Changed firstName, middleName, lastName fields to have a legal- prefix
meleongg Feb 7, 2024
1b961c9
Change dev portal to point to cmd-f 2024
meleongg Feb 7, 2024
ceed91f
Fixed review submission UI - may affect Portal Schedule UI
meleongg Feb 8, 2024
818ff66
Changed theme back to nwTheme
meleongg Feb 8, 2024
8076cf2
Merge pull request #564 from nwplus/preferred-name
meleongg Feb 8, 2024
b6d9b48
Update AppDashboard + App P0 page
meleongg Feb 8, 2024
63e9606
Update P1 mandatory hacker app questions
meleongg Feb 9, 2024
a17e831
Update P1 Optional Questions section
meleongg Feb 9, 2024
d490cc4
Update majors to be multi-select
meleongg Feb 9, 2024
1fd7ede
Update P2 Skills questions
meleongg Feb 9, 2024
17c64c3
Update P3 Final Questions
meleongg Feb 9, 2024
5704d58
Update ReviewCards.js to show all questions
meleongg Feb 9, 2024
525bc58
Update Login.js page, temporarily fixed nwHacks icons
meleongg Feb 9, 2024
b76b8f5
Minor fixes to questions + review card
meleongg Feb 9, 2024
9fe58ad
Spelling
meleongg Feb 9, 2024
392076a
Add missing T&C, fixed small bugs
meleongg Feb 9, 2024
d8179f6
Capitalize Country placeholder text
meleongg Feb 9, 2024
cf34a7b
More fixes, added optional q14
meleongg Feb 10, 2024
a642c9f
Bandaid-fix for review card prefer not to answer
meleongg Feb 10, 2024
64d44e3
Fix minor UI bugs
meleongg Feb 10, 2024
fcd0581
Potential white page error bandaid fix
meleongg Feb 10, 2024
bb0b8f2
Another white page potential fix
meleongg Feb 10, 2024
d8931ea
Revert back to original
meleongg Feb 10, 2024
cd03fb6
fix non-working edit button
kozr Feb 10, 2024
ce2a524
stop putting context everywhere, learn to use it omg
kozr Feb 10, 2024
d49742a
remove spinner of death
kozr Feb 10, 2024
c3306c9
bandaid probably
kozr Feb 10, 2024
290cb26
Update app confirmation date
meleongg Feb 10, 2024
61864ab
Wording changes
sidyakinian Feb 10, 2024
9d9f3f9
Wording changes
sidyakinian Feb 10, 2024
fbf60c9
Adjust submission deadline text
sidyakinian Feb 10, 2024
33a01a0
Merge pull request #565 from nwplus/cmd-f2024-hacker-app-changes
meleongg Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
crossorigin="anonymous"
referrerpolicy="no-referrer"
/>
<title>nwHacks 2024 Portal</title>
<title>cmd-f 2024 Portal</title>
</head>

<body>
Expand Down
76 changes: 22 additions & 54 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,36 +82,18 @@ const ApplicationInProgressRoute = ({ name, handleLogout, path, children, theme
const { isAuthed, user, logout } = useAuth()
return isAuthed ? (
<Route path={path}>
<HackerApplicationProvider>
<ApplicationInProgressContentContainer>
<Navbar
name={name ? user.displayName : undefined}
handleLogout={handleLogout ? logout : undefined}
>
{children}
</Navbar>
</ApplicationInProgressContentContainer>
</HackerApplicationProvider>
<Navbar
name={name ? user.displayName : undefined}
handleLogout={handleLogout ? logout : undefined}
>
{children}
</Navbar>
</Route>
) : (
<Redirect to="/login" />
)
}

const ApplicationInProgressContentContainer = ({ children }) => {
const {
application: {
status: { applicationStatus },
},
} = useHackerApplication()

return applicationStatus === APPLICATION_STATUS.inProgress ? (
<>{children}</>
) : (
<Redirect to="/login" />
)
}

const NoAuthRoute = ({ path, children }) => {
const { isAuthed, user } = useAuth()
return (
Expand Down Expand Up @@ -143,15 +125,7 @@ const NavbarSaveOnLogout = ({ name, handleLogout }) => {
const ApplicationFormContainer = ({ part }) => {
const { isAuthed, user, logout } = useAuth()

const {
application,
// got rid of destructuring in case of null value (not logged in, visits a page on application - maybe it was bookmarked)
// {
// status: {
// applicationStatus
// },
// },
} = useHackerApplication()
const { application } = useHackerApplication()

return isAuthed && application.status.applicationStatus === APPLICATION_STATUS.inProgress ? (
<>
Expand Down Expand Up @@ -189,13 +163,7 @@ const ProjectViewContainer = ({ params }) => (

const ApplicationDashboardRoutingContainer = () => {
const { isAuthed } = useAuth()
return isAuthed ? (
<HackerApplicationProvider>
<Application />
</HackerApplicationProvider>
) : (
<Redirect to="/login" />
)
return isAuthed ? <Application /> : <Redirect to="/login" />
}

function App() {
Expand Down Expand Up @@ -273,20 +241,20 @@ function App() {
<AuthPageRoute path="/submission">
<Submission />
</AuthPageRoute>
<Route path="/application" component={ApplicationDashboardRoutingContainer} />
<ApplicationInProgressRoute path="/application/review" name handleLogout>
<ApplicationReview />
</ApplicationInProgressRoute>
<ApplicationInProgressRoute path="/application/confirmation" handleLogout>
<ApplicationConfirmation />
</ApplicationInProgressRoute>
<Route path="/application/:part">
{params => (
<HackerApplicationProvider>
<ApplicationFormContainer part={params.part} />
</HackerApplicationProvider>
)}
</Route>
<HackerApplicationProvider>
<Switch>
<Route path="/application" component={ApplicationDashboardRoutingContainer} />
<ApplicationInProgressRoute path="/application/review" name handleLogout>
<ApplicationReview />
</ApplicationInProgressRoute>
<ApplicationInProgressRoute path="/application/confirmation" handleLogout>
<ApplicationConfirmation />
</ApplicationInProgressRoute>
<Route path="/application/:part" handleLogout>
{params => <ApplicationFormContainer part={params.part} />}
</Route>
</Switch>
</HackerApplicationProvider>
<Route path="/:rest*">
<NotFound />
</Route>
Expand Down
9 changes: 6 additions & 3 deletions src/components/ApplicationDashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export const hackerStatuses = (relevantDates, hackerName = null) => ({
sidebarText: 'In Review',
cardText: 'Awaiting assessment',
// blurb: `We will send out all acceptances by ${relevantDates?.sendAcceptancesBy}. In the meantime, get connected with our community of hackers on Instagram, Facebook, Medium, and Twitter to stay up to date with the latest news on sponsors, prizes and workshops!`,
blurb: `We will send out all acceptances by January 2024. In the meantime, get connected with our community of hackers on Instagram, Facebook, Medium, and Twitter to stay up to date with the latest news on sponsors, prizes and workshops!`,
blurb: `We will send out all acceptances by late Feb 2024. In the meantime, get connected with our community of hackers on Instagram, Facebook, Medium, and Twitter to stay up to date with the latest news on sponsors, prizes and workshops!`,
},
waitlisted: {
sidebarText: 'Waitlisted',
Expand Down Expand Up @@ -300,7 +300,7 @@ export const hackerStatuses = (relevantDates, hackerName = null) => ({
sidebarText: 'Not Submitted',
cardText: 'Not Submitted',
// blurb: `Your application has not been submitted. Please complete your application and submit before the deadline on ${relevantDates?.applicationDeadline} in order to join us at ${copyText.hackathonName}!`,
blurb: `Your application has not been submitted. Please complete your application and submit before December in order to join us at ${copyText.hackathonName}!`,
blurb: `Your application has not been submitted. Please complete your application and submit before February 22, 2024 in order to join us at ${copyText.hackathonName}!`,
},
})

Expand Down Expand Up @@ -415,7 +415,10 @@ const Dashboard = ({
</AppLinks>
<StatusContainer>
<div>
<AppStatusText>nwHacks 2024 is Western Canada’s largest 24 hour hackathon!</AppStatusText>
<AppStatusText>
cmd-f 2024 is Western Canada's largest hackathon celebrating underrepresented genders in
tech!
</AppStatusText>
<AppStatusText>
Registration status: {hackerStatuses()[hackerStatus]?.cardText}
</AppStatusText>
Expand Down
Loading
Loading