-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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
Add Submissions #718
Open
owlester12
wants to merge
26
commits into
master
Choose a base branch
from
owen/add-application
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add Submissions #718
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
bbb55b5
finished changes
owlester12 f0ad4cb
Remove Wharton applications from user profile (and update branch) (#641)
aviupadhyayula b11ee47
Bump debounce timeout to 400ms (#640)
aviupadhyayula 8525b8c
merge master
owlester12 5863870
small changes
owlester12 626cf15
added type
owlester12 9365a35
merging
owlester12 00110d9
merging
owlester12 5efd906
merge
owlester12 4affb1f
merge
owlester12 2f0c577
deleted file
owlester12 54e1543
merge
owlester12 c485400
fix submissions page
owlester12 424905c
applications
owlester12 fd75fb8
changes
owlester12 db92122
a
owlester12 8821e7e
remove ruff
owlester12 f072705
just submissions
owlester12 45071d6
add applications page
owlester12 d9c01eb
fix formatting
owlester12 b98818f
fixing nits
owlester12 0cf8f46
fixed Nits
owlester12 3b71f93
merge master
owlester12 39f74f8
update types
owlester12 ab07513
merge
owlester12 4daa2d4
change type
owlester12 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -117,4 +117,4 @@ | |
"engines": { | ||
"node": "^20.0.0" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,16 +5,20 @@ import FavoritesTab from 'components/Settings/FavoritesTab' | |
import MembershipRequestsTab from 'components/Settings/MembershipRequestsTab' | ||
import ProfileTab from 'components/Settings/ProfileTab' | ||
import HashTabView from 'components/TabView' | ||
import { NextPageContext } from 'next' | ||
import React, { ReactNode } from 'react' | ||
import { toast, TypeOptions } from 'react-toastify' | ||
import renderPage from 'renderPage' | ||
import styled from 'styled-components' | ||
import { UserInfo } from 'types' | ||
import { ApplicationSubmission, UserInfo } from 'types' | ||
import { OBJECT_NAME_TITLE, SHOW_MEMBERSHIP_REQUEST } from 'utils/branding' | ||
|
||
import ApplicationsPage from '~/components/Applications' | ||
import TicketsTab from '~/components/Settings/TicketsTab' | ||
import SubmissionsPage from '~/components/Submissions' | ||
import { BG_GRADIENT, CLUBS_BLUE, WHITE } from '~/constants/colors' | ||
import { BORDER_RADIUS } from '~/constants/measurements' | ||
import { doBulkLookup } from '~/utils' | ||
|
||
const Notification = styled.span` | ||
border-radius: ${BORDER_RADIUS}; | ||
|
@@ -31,11 +35,18 @@ const Notification = styled.span` | |
` | ||
|
||
type SettingsProps = { | ||
userInfo: UserInfo | ||
userInfo?: UserInfo | ||
authenticated: boolean | null | ||
submissions: ApplicationSubmission[] | ||
whartonapplications: any | ||
} | ||
|
||
const Settings = ({ userInfo, authenticated }: SettingsProps) => { | ||
const Settings = ({ | ||
userInfo, | ||
authenticated, | ||
whartonapplications, | ||
submissions, | ||
}: SettingsProps) => { | ||
/** | ||
* Display the message to the user in the form of a toast. | ||
* @param The message to show to the user. | ||
|
@@ -68,6 +79,16 @@ const Settings = ({ userInfo, authenticated }: SettingsProps) => { | |
icon: 'bookmark', | ||
content: <FavoritesTab key="subscription" keyword="subscription" />, | ||
}, | ||
{ | ||
name: 'submissions', | ||
label: 'Submissions', | ||
content: <SubmissionsPage initialSubmissions={submissions} />, | ||
}, | ||
{ | ||
name: 'applications', | ||
label: 'Applications', | ||
content: <ApplicationsPage whartonapplications={whartonapplications} />, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Now that the page is more visible in the profile, would be nice to clarify that it's for Wharton Cycle applications specifically (maybe change it to all eventually but not needed now). |
||
}, | ||
{ | ||
name: 'Requests', | ||
icon: 'user-check', | ||
|
@@ -103,4 +124,20 @@ const Settings = ({ userInfo, authenticated }: SettingsProps) => { | |
) | ||
} | ||
|
||
type BulkResp = { | ||
whartonapplications: any | ||
submissions: Array<ApplicationSubmission> | ||
} | ||
|
||
Settings.getInitialProps = async (ctx: NextPageContext) => { | ||
const data: BulkResp = (await doBulkLookup( | ||
['whartonapplications', 'submissions'], | ||
ctx, | ||
)) as BulkResp | ||
return { | ||
...data, | ||
fair: ctx.query.fair != null ? parseInt(ctx.query.fair as string) : null, | ||
} | ||
} | ||
|
||
export default renderPage(Settings) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: camel case variable name and adding types would be nice (I know the reference code didn't have either but it would be good practice)