Merge branch 'dev' of https://github.com/nwplus/portal into dev

nwplus · Nov 12, 2024 · f7f365c · f7f365c
2 parents 3e3deac + 04be9c0
commit f7f365c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/src/components/Judging/ViewProject.jsx b/src/components/Judging/ViewProject.jsx
@@ -36,6 +36,7 @@ const StyledYoutube = styled(Youtube)`
 
 const StyledP = styled(P)`
   margin: 1em 0;
+  color: ${p => p.theme.colors.text};
 `
 
 const StyledA = styled(A)`
@@ -47,14 +48,16 @@ const StyledA = styled(A)`
 `
 
 const ExternalLink = styled(A)`
-  color: ${p => 'white'};
+  color: ${p => p.theme.colors.tertiaryHover};
+  font-weight: bold;
 
   &:hover {
     color: ${p => p.theme.colors.tertiaryHover};
   }
 `
 
 const StyledLabel = styled(Label)`
+  color: ${p => p.theme.colors.textSecondary};
   display: block;
   margin: 1em 0 0.25em 0;
 `
@@ -134,7 +137,7 @@ const ViewProject = ({ project, score, error, success, isSubmitting, onChange, o
           <ExternalLink
             target="_blank"
             rel="noreferrer noopener"
-            href="https://www.notion.so/nwplus/Judging-Rubric-2023-026e041c729d48ca8c75efa63d430c42"
+            href="https://nwplus.notion.site/PUBLIC-HackCamp-2024-Peer-Judging-Rubric-23ecd01e56b04442a7dfe0c7cbabbc62"
           >
             Hacker Package
           </ExternalLink>

diff --git a/src/pages/Judging/index.jsx b/src/pages/Judging/index.jsx
@@ -16,21 +16,19 @@ const StyledJudgingCard = styled(JudgingCard)`
 const getProjects = async (userId, projectId, dbHackathonName) => {
   const getAndAssignProjects = async () => {
     try {
-      return db.runTransaction(async transaction => {
-        const projectDocs = await transaction.get(
-          projectsRef(dbHackathonName)
-            .where('draftStatus', '==', 'public')
-            .orderBy('countAssigned')
-            .limit(PROJECTS_TO_JUDGE_COUNT + 1) // get an extra in case we got our own project
-        )
+      const projectSnapshot = await projectsRef(dbHackathonName)
+        .where('draftStatus', '==', 'public')
+        .orderBy('countAssigned')
+        .limit(PROJECTS_TO_JUDGE_COUNT + 1)
+        .get()
 
-        let projectIds = projectDocs.docs.map(project => project.id)
-        projectIds = projectIds.filter(id => id !== projectId)
-        if (projectIds.length > PROJECTS_TO_JUDGE_COUNT) {
-          projectIds.pop()
-        }
+      let projectIds = projectSnapshot.docs.map(project => project.id)
+      projectIds = projectIds.filter(id => id !== projectId)
+      if (projectIds.length > PROJECTS_TO_JUDGE_COUNT) {
+        projectIds.pop()
+      }
 
-        // increment assigned counters
+      await db.runTransaction(async transaction => {
         projectIds.forEach(projectId => {
           const projectRef = projectsRef(dbHackathonName).doc(projectId)
           transaction.update(projectRef, {
@@ -43,8 +41,9 @@ const getProjects = async (userId, projectId, dbHackathonName) => {
         transaction.update(applicantRef, {
           projectsAssigned: projectIds,
         })
-        return projectIds
       })
+
+      return projectIds
     } catch (error) {
       console.error('Error assigning projects:', error)
     }

diff --git a/src/utility/Constants.js b/src/utility/Constants.js
@@ -106,9 +106,9 @@ export const JUDGING_RUBRIC = [
   // ------------------ HC
   {
     id: 'presentation',
-    label: 'Presentation',
+    label: 'Presentation/Pitch',
     description:
-      'Is the presentation well-prepared and smooth? Does it make a good business case for the project? Are statistics used when relevant?',
+      'Is the presentation or pitch is well-prepared and smooth? Does it make a good business case for the project? Are statistics used when relevant?',
     value: 5,
     // weight: 3 / 18,
     weight: 1 / 4,