Merge branch 'develop' into #1375-TeeraTesharojanasup-credits

Author: RChandler234

src/backend/src/controllers/reimbursement-requests.controllers.ts

@@ -182,7 +182,10 @@ export default class ReimbursementRequestsController {
 
       const receipt = await ReimbursementRequestService.uploadReceipt(requestId, file, user);
 
-      res.header('Access-Control-Allow-Origin', 'true');
+      const isProd = process.env.NODE_ENV === 'production';
+      const origin = isProd ? 'https://finishlinebyner.com' : 'http://localhost:3000';
+
+      res.header('Access-Control-Allow-Origin', origin);
       res.status(200).json(receipt);
     } catch (error: unknown) {
       next(error);

src/frontend/src/pages/CreditsPage/CreditsPage.tsx

@@ -84,6 +84,7 @@ const CreditsPage: React.FC = () => {
     { name: 'Yechan Na', color: '#C2B078' },
     { name: 'Liam Kosar', color: '#eb66ff' },
     { name: 'Daniel Yu', color: '#bdc0c7' },
+    { name: 'Jake Wu-Chen', color: '#bdc0c7' },
     { name: 'William Seward', color: '#e53774' },
     {
       name: 'Zach Norman',
@@ -95,7 +96,31 @@ const CreditsPage: React.FC = () => {
     },
     { name: 'Ethan Mouri', color: '#00bbff' },
     { name: 'Laith Taher', color: '#000080' },
-    { name: 'Teera Tesharojanasup', color: '#DC143C', sx: { px: 1, backgroundColor: '#E8D8CC', borderRadius: 10 } }
+    { name: 'Teera Tesharojanasup', color: '#DC143C', sx: { px: 1, backgroundColor: '#E8D8CC', borderRadius: 10 } },
+    { name: 'Griffin Cooper', color: '#02d69a' },
+    { name: 'Amani Scarborough', color: '#e34db6' },
+    { name: 'Peter Moise', color: '#FF0000' },
+    { name: 'Srihari Raman', color: '#FF2400' },
+    { name: 'Kaiyang Zheng', color: '#FFFF00' },
+    { name: 'Waasif Mahmood', color: '#114a13' },
+    { name: 'Matthew Wang', color: '#c657f2' },
+    { name: 'Sharon Yang', color: '#ed8a5f' },
+    { name: 'Stephanie Xu', color: '#ffcd42' },
+    { name: 'Hareg Aderie', color: '#34b46c' },
+    { name: 'Kevin Polackal', color: '#800080' },
+    { name: 'Anika Sharma', color: '#ff0000' },
+    {
+      name: 'Kaan Tural',
+      color: 'transparent',
+      sx: {
+        background: 'linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(0,128,255,1) 100%)',
+        '-webkit-background-clip': 'text',
+        textShadow: '0 0 5px rgba(255,0,0,1), 0 0 10px rgba(0,128,255,1)'
+      }
+    },
+    { name: 'Kevin Polackal', color: '#800080' },
+    { name: 'Lily Shiomitsu', color: '#008080' },
+    { name: 'Kevin Yang', color: '#0000FF' }
   ];
 
   const snark = ['Add your name!', "Shouldn't you do it yourself?", 'Seriously', 'go', 'do', 'it'];