Merge branch 'master' of github.com:cornell-dti/carriage-web into sl2663/greyHolidays

Author: selenaliu1

.github/workflows/ci-check.yml

@@ -1,6 +1,5 @@
 name: CI Check
 on: push
-
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -10,11 +9,25 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: '20.x'
-      - name: Install Dependencies
-        run: npm install
+      - name: Clean Install
+        run: |
+          rm -rf node_modules
+          rm -rf package-lock.json
+          npm cache clean --force
+          npm install
+          echo "Prettier version:"
+          npx prettier --version
+      - name: Debug Prettier
+        run: |
+          echo "Files to be checked:"
+          npx prettier --list-different "**/*.{ts,js,tsx,jsx,css}"
+          echo "Checking specific file:"
+          npx prettier --check "frontend/src/pages/Landing/Landing.tsx"
+          echo "Running full check:"
+          ls -la frontend/src/pages/Landing/
+          cat frontend/src/pages/Landing/Landing.tsx | od -c
+          npm run format:check
       - name: Run Linter
         run: npm run lint
-      - name: Run Prettier
-        run: npm run format:check
       - name: Run Type Check
-        run: npm run type-check
+        run: npm run type-check

README.md

@@ -26,50 +26,72 @@ The **Rider App** branch can be found [here](https://github.com/cornell-dti/carr
 
 ## Contributors:
 
-**Current Contributors**
-
-- Harrison Chin - Software Developer
-- Andrew Choi - Product Manager
-- Rohit Valiveti - Software Developer
-- Pratyush Sudhakar - Technical Project Manager
-- Enoch Chen - Software Developer
-- Desmond Atikpui - Software Developer
-- Stuti Gupta - Software Developer
-- Kevin Lin - Software Developer
-- Colin Wu - Software Developer
-- Raissa Ji - Software Developer
-- Nam Anh Dang - Software Developer
-- Selena Liu - Software Developer
-- Dwain Anderson - Software Developer
-
-**Past Contributors**
-
-- Daniel Wei - Technical Project Manager
-- Bryan Graeser - Product Manager
-- Nina Xie - Product Manager
-- Matthew Guo - Technical Project Manager
-- Aaron Kang - Software Developer
-- Zack Ashen - Software Developer
-- Tucker Stanley - Software Developer
-- Justin Kang - Software Developer
-- Michael Torku - Technical Project Manager
-- Austin Wu - Software Developer
-- Li Fengyu - Software Developer
-- Sam Steinberg - Product Manager
-- Laura Sizemore - Technical Project Manager, Software Developer
-- Christopher Hansen - Technical Project Manager
-- Jessica Chen - Software Developer
-- Bryan Graeser - Software Developer
-- Matthew Guo - Software Developer
-- Ishika Jain - Software Developer
-- Lucy Wang - Software Developer
-- Michael Ye - Software Developer
-- Becky Hu - Software Developer
-- Laura Sizemore - Software Developer
-- Pinxuan Huang - Software Developer
-- Jay Joo - Software Developer
-- Simran Puri - Software Developer
-- Aiden Kim - Designer
-- Yisu Zheng - Designer
-- Chelsea Wang - Designer
-- Joanne Lee - Designer
+## Contributors
+
+### Current Contributors
+
+#### Product Manager
+- Matthias Choi
+
+#### Technical Project Manager
+- Desmond Atikpui
+
+#### Software Developers
+- Dwain Anderson
+- Nam Anh Dang
+- Raissa Ji
+- Selena Liu
+
+---
+
+### Past Contributors
+
+#### Product Managers
+- Andrew Choi
+- Bryan Graeser
+- Nina Xie
+- Sam Steinberg
+- Stephy Chen
+
+#### Technical Project Managers
+- Christopher Hansen
+- Daniel Wei
+- Laura Sizemore
+- Matthew Guo
+- Michael Torku
+- Pratyush Sudhakar
+
+#### Software Developers
+- Aaron Kang
+- Aiden Kim
+- Andrew Choi
+- Becky Hu
+- Bryan Graeser
+- Chelsea Wang
+- Colin Wu
+- Enoch Chen
+- Harrison Chin
+- Ishika Jain
+- Jay Joo
+- Jessica Chen
+- Joanne Lee
+- Justin Kang
+- Kevin Lin
+- Laura Sizemore
+- Li Fengyu
+- Lucy Wang
+- Matthew Guo
+- Michael Ye
+- Pinxuan Huang
+- Rohit Valiveti
+- Simran Puri
+- Stuti Gupta
+- Tucker Stanley
+- Zack Ashen
+
+#### Designers
+- Aiden Kim
+- Chelsea Wang
+- Joanne Lee
+- Yisu Zheng
+

frontend/package-lock.json

@@ -16,46 +16,59 @@
 
 .statsContainer {
   display: flex;
-  flex-wrap: wrap;
-  justify-content: flex-start;
+  gap: 1.5rem;
   align-items: center;
-  box-shadow: 0.25rem 0.25rem 1rem rgba(0, 0, 0, 0.1);
-  padding: 2rem;
-  max-width: 100%;
+  background: white;
+  padding: 1.5rem 2rem;
+  border-radius: 8px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
 }
 
+/* Individual stat box */
 .statsbox {
-  flex-direction: row;
-  min-width: 25%;
   display: flex;
-  flex-flow: row;
   align-items: center;
+  padding: 0.5rem 1rem;
+  min-width: 180px;
 }
 
 .left {
   display: flex;
-  width: 35%;
-  margin: 0.5rem;
-}
-
-.right {
-  width: 65%;
-  margin: 0.5rem;
+  align-items: center;
+  justify-content: center;
+  margin-right: 1rem;
+  flex-shrink: 0;
 }
 
 .icon {
-  border-radius: 100%;
+  border-radius: 50%;
   width: 2.5rem;
   height: 2.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: rgba(0, 0, 0, 0.04);
+}
+
+.right {
+  display: flex;
+  flex-direction: column;
+  align-items: center; /* Center the content */
+  text-align: center; /* Center the text */
+  width: 100%; /* Take full width for proper centering */
 }
 
 .stats {
-  font-size: 1.35rem;
-  font-weight: bold;
-  margin-bottom: -5%;
+  font-size: 1.5rem;
+  font-weight: 600;
+  color: #111827;
+  margin: 0;
+  line-height: 1.2;
 }
 
 .description {
-  font-size: 0.75rem;
-  margin-top: -5%;
+  font-size: 0.875rem;
+  color: #6b7280;
+  margin: 0;
+  margin-top: 0.25rem;
 }

frontend/src/components/AnalyticsOverview/AnalyticsOverview.module.css

@@ -0,0 +1,100 @@
+.statsContainer {
+  display: flex;
+  gap: 1.5rem;
+  align-items: center;
+}
+
+.statsbox {
+  display: flex;
+  align-items: center;
+  padding: 1.25rem 1.5rem;
+  min-width: 180px;
+  background: white;
+  border-radius: 8px;
+  transition: all 0.2s ease;
+}
+
+.left {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 1rem;
+  flex-shrink: 0;
+}
+
+.iconWrapper {
+  border-radius: 50%;
+  width: 2.5rem;
+  height: 2.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: rgba(0, 0, 0, 0.04);
+  transition: all 0.2s ease;
+}
+
+.icon {
+  width: 1.5rem;
+  height: 1.5rem;
+  object-fit: contain;
+}
+
+.right {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  width: 100%;
+}
+
+.stats {
+  font-size: 1.5rem;
+  font-weight: 600;
+  margin: 0;
+  line-height: 1.2;
+}
+
+.description {
+  font-size: 0.875rem;
+  color: #6b7280;
+  margin: 0;
+  margin-top: 0.25rem;
+}
+
+/* Color variants */
+.green .iconWrapper,
+.icon-green {
+  background-color: rgba(34, 197, 94, 0.1);
+}
+
+.stats-green {
+  color: #16a34a;
+}
+
+.gray .iconWrapper,
+.icon-gray {
+  background-color: rgba(107, 114, 128, 0.1);
+}
+
+.stats-gray {
+  color: #4b5563;
+}
+
+.red .iconWrapper,
+.icon-red {
+  background-color: rgba(246, 59, 59, 0.1);
+}
+
+.stats-red {
+  color: #eb2525;
+}
+
+/* Default variant */
+.default .iconWrapper,
+.icon-default {
+  background-color: rgba(0, 0, 0, 0.04);
+}
+
+.stats-default {
+  color: #111827;
+}