Merge pull request #714 from nwplus/dev

cmd-f stuff

Author: DonaldKLee

src/components/Rewards/TotalPoints.jsx

@@ -41,24 +41,25 @@ const TotalPoints = ({ userDetails }) => {
   useEffect(() => {
     ;(async () => {
       if (userDetails && dbHackathonName) {
+        const userCheckedIn = userDetails.dayOf.checkedIn
         const eventIds = userDetails.dayOf.events.map(event => event.eventId)
         const events = await getEvents(dbHackathonName)
         const filteredEvents = events.filter(event => eventIds.includes(event.key))
         console.log(filteredEvents)
         // setName(`${userDetails.basicInfo.preferredName} ${userDetails.basicInfo.legalLastName}`)
-        setTotalPoints(
-          filteredEvents.reduce((accumulator, event) => {
-            const points = parseInt(event.points) // Attempt to convert to integer
-            if (!isNaN(points)) {
-              // Only add valid numbers
-              console.log('Adding Points:', points)
-              return accumulator + points
-            } else {
-              console.log('Skipping Invalid Points:', event.points)
-              return accumulator
-            }
-          }, 0)
-        )
+        const points = filteredEvents.reduce((accumulator, event) => {
+          const points = parseInt(event.points) // Attempt to convert to integer
+          if (!isNaN(points)) {
+            // Only add valid numbers
+            console.log('Adding Points:', points)
+            return accumulator + points
+          } else {
+            console.log('Skipping Invalid Points:', event.points)
+            return accumulator
+          }
+        }, 0)
+
+        setTotalPoints(userCheckedIn ? points + 15 : points)
       }
     })()
   }, [userDetails, dbHackathonName])

src/components/Social/ProfilePicturePopup.jsx

@@ -105,10 +105,9 @@ const Grid = styled.div`
 
 const ProfilePic = styled.img`
   width: 100%;
-  height: 100%;
   object-fit: contain;
   cursor: pointer;
-  border-radius: 100px;
+  border-radius: 100%;
   border: 4px solid
     ${p => (p.selected ? p.theme.colors.button.secondary.background.default : 'transparent')};
   transition: transform 0.3s ease;

src/components/Social/ViewSocial.jsx

@@ -169,6 +169,13 @@ const Name = styled.div`
   font-size: 2.5rem;
   font-weight: 700;
   color: ${p => p.theme.colors.text};
+
+  ${p => p.theme.mediaQueries.mobile} {
+    font-size: 2.25rem;
+    max-width: 65%;
+    text-align: center;
+    word-wrap: break-word;
+  }
 `
 
 const Pronouns = styled.div`

src/containers/Rewards.jsx

@@ -94,21 +94,21 @@ const Rewards = () => {
         const userData = userDoc.data()
 
         if (userData && dbHackathonName) {
+          const userCheckedIn = userData.dayOf.checkedIn
           const eventIds = userData.dayOf.events.map(event => event.eventId)
           const events = await getEvents(dbHackathonName)
           const filteredEvents = events.filter(event => eventIds.includes(event.key))
           // setName(`${userData.basicInfo.preferredName} ${userData.basicInfo.legalLastName}`)
-          setUserPoints(
-            filteredEvents.reduce((accumulator, event) => {
-              const points = parseInt(event.points) // Attempt to convert to integer
-              if (!isNaN(points)) {
-                // Only add valid numbers
-                return accumulator + points
-              } else {
-                return accumulator
-              }
-            }, 0)
-          )
+          const points = filteredEvents.reduce((accumulator, event) => {
+            const eventPoints = parseInt(event.points)
+            if (!isNaN(eventPoints)) {
+              return accumulator + eventPoints
+            } else {
+              return accumulator
+            }
+          }, 0)
+
+          setUserPoints(userCheckedIn ? points + 15 : points)
         }
 
         // const points = userData.points || 0