Add Submissions

frontend/components/Applications.tsx

@@ -94,50 +94,55 @@ const AppsContainer = styled.div`
   min-height: 60vh;
 `
 
-function ApplicationsPage({ whartonapplications }): ReactElement {
-  if ('detail' in whartonapplications) {
-    return <Text>{whartonapplications.detail}</Text>
+function ApplicationsPage({ whartonApplications }): ReactElement {
+  if ('detail' in whartonApplications) {
+    return <Text>{whartonApplications.detail}</Text>
   }
 
   return (
     <AppsContainer>
       <div className="columns is-multiline is-desktop is-tablet">
-        {whartonapplications != null && whartonapplications.length > 0 ? (
-          whartonapplications.map((application) => (
-            <CardWrapper className={'column is-half-desktop'}>
-              <Link href={application.external_url} target="_blank">
-                <Card className="card">
-                  <MainInfo>
-                    <div>
-                      <ClubName>{application.name}</ClubName>
-                      <DateInterval
-                        start={application.application_start_time}
-                        end={application.application_end_time}
-                      />
-                    </div>
-                    <div>
-                      {application.club_image_url != null &&
-                        application.club_image_url !== '' && (
-                          <LazyLoad>
-                            <Image src={application.club_image_url} />
-                          </LazyLoad>
-                        )}
-                    </div>
-                  </MainInfo>
-                  {application.description &&
-                    application.description.length && (
-                      <DescriptionWrapper
-                        dangerouslySetInnerHTML={{
-                          __html: application.description,
-                        }}
-                      ></DescriptionWrapper>
-                    )}
-                </Card>
-              </Link>
-            </CardWrapper>
-          ))
+        {whartonApplications != null && whartonApplications.length > 0 ? (
+          <div>
+            <Text>
+              Note: only current Wharton applications are displayed on this page{' '}
+            </Text>
+            {whartonApplications.map((application) => (
+              <CardWrapper className={'column is-half-desktop'}>
+                <Link href={application.external_url} target="_blank">
+                  <Card className="card">
+                    <MainInfo>
+                      <div>
+                        <ClubName>{application.name}</ClubName>
+                        <DateInterval
+                          start={application.application_start_time}
+                          end={application.application_end_time}
+                        />
+                      </div>
+                      <div>
+                        {application.club_image_url != null &&
+                          application.club_image_url !== '' && (
+                            <LazyLoad>
+                              <Image src={application.club_image_url} />
+                            </LazyLoad>
+                          )}
+                      </div>
+                    </MainInfo>
+                    {application.description &&
+                      application.description.length && (
+                        <DescriptionWrapper
+                          dangerouslySetInnerHTML={{
+                            __html: application.description,
+                          }}
+                        ></DescriptionWrapper>
+                      )}
+                  </Card>
+                </Link>
+              </CardWrapper>
+            ))}
+          </div>
         ) : (
-          <Text>No applications are currently available.</Text>
+          <Text>No Wharton applications are currently available.</Text>
         )}
       </div>
     </AppsContainer>
@@ -153,8 +158,9 @@ ApplicationsPage.getInitialProps = async (ctx: NextPageContext) => {
     ['whartonapplications'],
     ctx,
   )) as BulkResp
+
   return {
-    ...data,
+    whartonApplications: data.whartonapplications,
     fair: ctx.query.fair != null ? parseInt(ctx.query.fair as string) : null,
   }
 }

frontend/pages/apply/[[...slug]].tsx

@@ -9,7 +9,7 @@ import ApplicationsPage from '~/components/Applications'
 import SubmissionsPage from '~/components/Submissions'
 import { BrowserTabView } from '~/components/TabView'
 import { APPLY_ROUTE, BG_GRADIENT, WHITE } from '~/constants'
-import { ApplicationSubmission } from '~/types'
+import { Application, ApplicationSubmission } from '~/types'
 
 function ApplyDashboard({
   whartonapplications,
@@ -24,7 +24,7 @@ function ApplyDashboard({
       name: 'applications',
       label: 'Applications',
       content: () => (
-        <ApplicationsPage whartonapplications={whartonapplications} />
+        <ApplicationsPage whartonApplications={whartonapplications} />
       ),
     },
     {
@@ -56,7 +56,7 @@ function ApplyDashboard({
 }
 
 type BulkResp = {
-  whartonapplications: any
+  whartonapplications: Application[]
   submissions: Array<ApplicationSubmission>
 }
 

frontend/pages/settings.tsx

@@ -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 { Application, 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} />,
+    },
     {
       name: 'Requests',
       icon: 'user-check',
@@ -103,4 +124,22 @@ const Settings = ({ userInfo, authenticated }: SettingsProps) => {
   )
 }
 
+type BulkResp = {
+  whartonapplications: Application[]
+  submissions: Array<ApplicationSubmission>
+}
+
+Settings.getInitialProps = async (ctx: NextPageContext) => {
+  const data: BulkResp = (await doBulkLookup(
+    ['whartonapplications', 'submissions'],
+    ctx,
+  )) as BulkResp
+
+  return {
+    whartonApplications: data.whartonapplications,
+    submissions: data.submissions,
+    fair: ctx.query.fair != null ? parseInt(ctx.query.fair as string) : null,
+  }
+}
+
 export default renderPage(Settings)