Skip to content

Commit

Permalink
Revert "Move submissions from /apply to user profile (#638)" (#673)
Browse files Browse the repository at this point in the history
This reverts commit 29d9a12.
  • Loading branch information
aviupadhyayula authored Apr 21, 2024
1 parent fcab615 commit 5888ff4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 40 deletions.
1 change: 0 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
"react-toastify": "^10.0.4",
"react-tooltip": "^5.26.3",
"react-vis": "^1.12.1",
"ruff": "^1.5.4",
"showdown": "^2.1.0",
"styled-components": "^6.1.8",
"use-places-autocomplete": "^4.0.1",
Expand Down
30 changes: 3 additions & 27 deletions frontend/pages/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@ 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 { ApplicationSubmission, UserInfo } from 'types'
import { UserInfo } from 'types'
import { OBJECT_NAME_TITLE, SHOW_MEMBERSHIP_REQUEST } from 'utils/branding'

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};
Expand All @@ -33,12 +30,11 @@ const Notification = styled.span`
`

type SettingsProps = {
userInfo?: UserInfo
userInfo: UserInfo
authenticated: boolean | null
submissions: ApplicationSubmission[]
}

const Settings = ({ userInfo, authenticated, submissions }: SettingsProps) => {
const Settings = ({ userInfo, authenticated }: SettingsProps) => {
/**
* Display the message to the user in the form of a toast.
* @param The message to show to the user.
Expand Down Expand Up @@ -71,11 +67,6 @@ const Settings = ({ userInfo, authenticated, submissions }: SettingsProps) => {
icon: 'bookmark',
content: <FavoritesTab key="subscription" keyword="subscription" />,
},
{
name: 'submissions',
label: 'Submissions',
content: () => <SubmissionsPage initialSubmissions={submissions} />,
},
{
name: 'Requests',
icon: 'user-check',
Expand Down Expand Up @@ -106,19 +97,4 @@ const Settings = ({ userInfo, authenticated, submissions }: SettingsProps) => {
)
}

type BulkResp = {
submissions: Array<ApplicationSubmission>
}

Settings.getInitialProps = async (ctx: NextPageContext) => {
const data: BulkResp = (await doBulkLookup(
['submissions', '/submissions/?format=json'],
ctx,
)) as BulkResp
return {
...data,
fair: ctx.query.fair != null ? parseInt(ctx.query.fair as string) : null,
}
}

export default renderPage(Settings)
12 changes: 0 additions & 12 deletions frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5547,11 +5547,6 @@ electron-to-chromium@^1.4.668:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.676.tgz#95179dd62f43926c636ca06c555a1da8754073ff"
integrity sha512-uHt4FB8SeYdhcOsj2ix/C39S7sPSNFJpzShjxGOm1KdF4MHyGqGi389+T5cErsodsijojXilYaHIKKqJfqh7uQ==

emitify@^3.0.1:
version "3.1.0"
resolved "https://registry.yarnpkg.com/emitify/-/emitify-3.1.0.tgz#fa5a08011b0f1f64e440aa2e7c2713c55f8a5568"
integrity sha512-pucUCyaeC8TJoRXniRiNb81Odoqlf2lMaFARA8tci2PaORFIeXBoIQHEzuA3dxPsU1l7AVb7xmFra4iJwVU8wg==

"emoji-regex@>=6.0.0 <=6.1.1":
version "6.1.1"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"
Expand Down Expand Up @@ -9386,13 +9381,6 @@ rimraf@^3.0.0, rimraf@^3.0.2:
dependencies:
glob "^7.1.3"

ruff@^1.5.4:
version "1.5.4"
resolved "https://registry.yarnpkg.com/ruff/-/ruff-1.5.4.tgz#c19346bffbd263f67a301b51ba92601254091797"
integrity sha512-42kBjp78DFDAgZw8ywPpB3bo0oZrSifukCRMB49dnFeGPbg1s4jdtXZug06mkxue1JrD3dP/ng2mxPYg7gx3Jw==
dependencies:
emitify "^3.0.1"

run-parallel@^1.1.9:
version "1.2.0"
resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
Expand Down

0 comments on commit 5888ff4

Please sign in to comment.