Allow a nomination to be viewed if it is yours or it is voting period

Signed-off-by: miam-miam100 <[email protected]>
ecss-soton · Mar 2, 2024 · 5bab7d4 · 5bab7d4
1 parent 756782a
commit 5bab7d4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/app/(pages)/elections/page.tsx b/src/app/(pages)/elections/page.tsx
@@ -76,7 +76,7 @@ export default async function Elections() {
             </p>
             <Positions
               positions={positions}
-              electionId={id}
+              election={election}
               canCreateNominations={canCreateNomination}
               user={user}
             />

diff --git a/src/app/_components/Nominations/index.tsx b/src/app/_components/Nominations/index.tsx
@@ -23,10 +23,10 @@ import classes from './index.module.scss'
 
 export const Nominations: React.FC<{
   positionId?: string
-  electionId?: string
+  election?: Election
   user?: User
 }> = props => {
-  const { positionId, electionId, user } = props
+  const { positionId, election, user } = props
 
   let [nominations, setNominations] = useState<Nomination[] | null>(null)
 
@@ -47,7 +47,7 @@ export const Nominations: React.FC<{
                   },
                 ],
               },
-              { election: { equals: electionId } },
+              { election: { equals: election.id } },
               { position: { equals: positionId } },
             ],
           },
@@ -69,8 +69,12 @@ export const Nominations: React.FC<{
       }
     }
     getPositions().then(setNominations)
-  }, [user, positionId, electionId])
-  // underline nickname when the nomination has dropped out
+  }, [user, positionId, election.id])
+
+  const isBeingVoted =
+    new Date().getTime() >= Date.parse(election.votingStart) &&
+    new Date().getTime() <= Date.parse(election.votingEnd)
+
   return (
     <div>
       {nominations?.map((nomination, index) => {
@@ -91,6 +95,13 @@ export const Nominations: React.FC<{
                   {nickname ?? nomineeNames} ({usernames}){' '}
                 </span>
               )}
+              {(isBeingVoted || populatedNominees.map(n => n.id).includes(user.id)) && (
+                <Button
+                  appearance={'primary'}
+                  label={'View'}
+                  href={`/nominations/${nomination.id}`}
+                />
+              )}
               <SupportNomination nominationId={id} supporters={supporters} />
             </h5>
           </Fragment>

diff --git a/src/app/_components/Positions/index.tsx b/src/app/_components/Positions/index.tsx
@@ -23,11 +23,11 @@ import classes from './index.module.scss'
 
 export const Positions: React.FC<{
   positions?: Position[]
-  electionId?: string
+  election?: Election
   canCreateNominations?: boolean
   user?: User
 }> = props => {
-  const { user, positions, electionId, canCreateNominations } = props
+  const { user, positions, election, canCreateNominations } = props
 
   // const { slug, title, categories, meta } = doc || {}
   // const { description, image: metaImage } = meta || {}
@@ -48,12 +48,12 @@ export const Positions: React.FC<{
             <p>{description}</p>
             {canCreateNominations && (
               <Button
-                href={`/nominations/${electionId}/${position.id}`}
+                href={`/nominations/${election.id}/${position.id}`}
                 appearance="primary"
                 label={'Create Nomination'}
               ></Button>
             )}
-            <Nominations positionId={position.id} electionId={electionId} user={user} />
+            <Nominations positionId={position.id} election={election} user={user} />
           </Fragment>
         )
       })}