Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1009 commits
Select commit Hold shift + click to select a range
509ced1
fix: navbar main link for not authenticated #prod
TheBoyRoy05 Dec 21, 2025
3e89a7f
fix: hover card on mobile
TheBoyRoy05 Dec 22, 2025
b52bb6f
fix: hover card on mobile
TheBoyRoy05 Dec 22, 2025
7c329a0
Fix: projects links #prod
TheBoyRoy05 Dec 23, 2025
32ca8a4
Fix: projects links #prod
TheBoyRoy05 Dec 23, 2025
b9a894d
Feat: Admin page wireframe
Jaerinx Dec 31, 2025
e7080b1
Feat: Admin page wireframe
Jaerinx Dec 31, 2025
82d4f0e
Chore: Component Compartmentalisation
Jaerinx Jan 3, 2026
7d0a9b4
Chore: Component Compartmentalisation
Jaerinx Jan 3, 2026
9d255f0
Feat: Member Look up and set Admin
Jaerinx Jan 3, 2026
3493408
Feat: Member Look up and set Admin
Jaerinx Jan 3, 2026
e831579
Feat: Admin Management (remove add, filter)
Jaerinx Jan 3, 2026
42f94fc
Feat: Admin Management (remove add, filter)
Jaerinx Jan 3, 2026
cb7d27a
Fix: move triggerFetchAdmin to the right place
Jaerinx Jan 3, 2026
92eebc0
Fix: move triggerFetchAdmin to the right place
Jaerinx Jan 3, 2026
31e2e60
Feat: Made only admins able to access admin page
Jaerinx Jan 5, 2026
99c1c75
Feat: Made only admins able to access admin page
Jaerinx Jan 5, 2026
3c4a7bc
Feat: Event management
Jaerinx Jan 5, 2026
f59c387
Feat: Event management
Jaerinx Jan 5, 2026
69f50f2
Feat: New UI fields for Sign up
Jaerinx Jan 5, 2026
2399f10
Feat: New UI fields for Sign up
Jaerinx Jan 5, 2026
f9a6963
Sign up stuff
TheBoyRoy05 Jan 6, 2026
f87899a
Sign up stuff
TheBoyRoy05 Jan 6, 2026
31200af
admin remove button color
TheBoyRoy05 Jan 6, 2026
d9d2754
admin remove button color
TheBoyRoy05 Jan 6, 2026
5ae0763
Feat: Profile and signup new fields
Jaerinx Jan 6, 2026
f7ac42d
Feat: Profile and signup new fields
Jaerinx Jan 6, 2026
849c618
Merge branch 'feature/Admin-page' of https://github.com/ucsdds3/main-…
Jaerinx Jan 6, 2026
2bed510
Merge branch 'feature/Admin-page' of https://github.com/ucsdds3/main-…
Jaerinx Jan 6, 2026
1a5039c
fix: snake cased db stuff
TheBoyRoy05 Jan 6, 2026
4cacb8c
fix: snake cased db stuff
TheBoyRoy05 Jan 6, 2026
533386e
fix: member navbar home button
TheBoyRoy05 Jan 6, 2026
b92830a
fix: member navbar home button
TheBoyRoy05 Jan 6, 2026
2c85c02
fix: member events touching the footer
TheBoyRoy05 Jan 6, 2026
8546057
fix: member events touching the footer
TheBoyRoy05 Jan 6, 2026
a85d8c2
changed xp to experience everywhere
TheBoyRoy05 Jan 6, 2026
686dd5e
changed xp to experience everywhere
TheBoyRoy05 Jan 6, 2026
8b068cc
fix: local user storage
TheBoyRoy05 Jan 7, 2026
b92894c
fix: local user storage
TheBoyRoy05 Jan 7, 2026
9ce5d37
fix: resume required for talent pool
TheBoyRoy05 Jan 7, 2026
a9056b5
fix: resume required for talent pool
TheBoyRoy05 Jan 7, 2026
2c80c1a
Merge pull request #126 from ucsdds3:feature/Admin-page
TheBoyRoy05 Jan 7, 2026
ceaca4e
Merge pull request #126 from ucsdds3:feature/Admin-page
TheBoyRoy05 Jan 7, 2026
68c99dd
fix: check ucsd email for fogot password #prod
TheBoyRoy05 Jan 7, 2026
7797738
fix: check ucsd email for fogot password #prod
TheBoyRoy05 Jan 7, 2026
267b945
fix redirect #prod
TheBoyRoy05 Jan 7, 2026
3728994
fix redirect #prod
TheBoyRoy05 Jan 7, 2026
7074d62
talent pool true #prod
TheBoyRoy05 Jan 7, 2026
54c7bb7
talent pool true #prod
TheBoyRoy05 Jan 7, 2026
35ae9f0
resume preview text #prod
TheBoyRoy05 Jan 7, 2026
393e7cc
resume preview text #prod
TheBoyRoy05 Jan 7, 2026
682aaf9
fix:url params #prod
TheBoyRoy05 Jan 7, 2026
570de18
fix:url params #prod
TheBoyRoy05 Jan 7, 2026
9d4c3ba
fix: some bs #prod
TheBoyRoy05 Jan 7, 2026
956f892
fix: some bs #prod
TheBoyRoy05 Jan 7, 2026
e0faa5e
fix: div in p #prod
TheBoyRoy05 Jan 7, 2026
e5c0e57
fix: div in p #prod
TheBoyRoy05 Jan 7, 2026
6ee12f4
undisabled sign up talent pool #prod
TheBoyRoy05 Jan 7, 2026
13b0b96
undisabled sign up talent pool #prod
TheBoyRoy05 Jan 7, 2026
2780c42
fix: update profile #prod
TheBoyRoy05 Jan 8, 2026
8ad369b
fix: update profile #prod
TheBoyRoy05 Jan 8, 2026
456f7a8
feat: projects app #prod
TheBoyRoy05 Jan 8, 2026
4d8b026
feat: projects app #prod
TheBoyRoy05 Jan 8, 2026
ab6eb5c
Updated 25-26 board w images, added new advisor
anagha166 Jan 9, 2026
38fc915
Updated 25-26 board w images, added new advisor
anagha166 Jan 9, 2026
803a020
Added a few more people
anagha166 Jan 12, 2026
5660096
Added a few more people
anagha166 Jan 12, 2026
86366cd
fix: changed readme
TheBoyRoy05 Jan 16, 2026
8b0f5c6
fix: changed readme
TheBoyRoy05 Jan 16, 2026
ee2f32c
Merge pull request #127 from ucsdds3/board-updates
TheBoyRoy05 Jan 16, 2026
176d738
Merge pull request #127 from ucsdds3/board-updates
TheBoyRoy05 Jan 16, 2026
67bbbae
Events update
TheBoyRoy05 Jan 22, 2026
a20359f
Events update
TheBoyRoy05 Jan 22, 2026
5936848
deleted old events files
TheBoyRoy05 Jan 22, 2026
0f0db5b
deleted old events files
TheBoyRoy05 Jan 22, 2026
618a759
feat: datetimes and locations
TheBoyRoy05 Jan 22, 2026
97582fc
feat: datetimes and locations
TheBoyRoy05 Jan 22, 2026
2d9bad9
Merge branch 'fix/events'
TheBoyRoy05 Jan 22, 2026
84c0d8f
Merge branch 'fix/events'
TheBoyRoy05 Jan 22, 2026
408182f
fix: browsercard
TheBoyRoy05 Jan 22, 2026
cc1ce2a
fix: browsercard
TheBoyRoy05 Jan 22, 2026
4e32e4c
fix: admin stats
TheBoyRoy05 Jan 22, 2026
d9ff639
hella bug fixes on member lookup
TheBoyRoy05 Jan 22, 2026
4ab0b3d
splitting up memberlookup
TheBoyRoy05 Jan 22, 2026
c1d19c5
continuing spliting member lookup
TheBoyRoy05 Jan 23, 2026
7574eb1
moved countdown
TheBoyRoy05 Jan 23, 2026
e12a6db
moved countdown
TheBoyRoy05 Jan 23, 2026
ee69fe3
moved useEvents
TheBoyRoy05 Jan 23, 2026
b4bf953
moved useEvents
TheBoyRoy05 Jan 23, 2026
57383ba
moved about
TheBoyRoy05 Jan 23, 2026
5a7c10e
moved about
TheBoyRoy05 Jan 23, 2026
1e58d3a
refactor: consulting refactored
TheBoyRoy05 Jan 23, 2026
c6d9422
refactor: consulting refactored
TheBoyRoy05 Jan 23, 2026
279b7c6
refactor: main home
TheBoyRoy05 Jan 23, 2026
e181d16
refactor: main home
TheBoyRoy05 Jan 23, 2026
13ee892
refactor: consulting fr this time
TheBoyRoy05 Jan 23, 2026
a48c212
refactor: consulting fr this time
TheBoyRoy05 Jan 23, 2026
80ec8a8
idk, more refactoring
TheBoyRoy05 Jan 23, 2026
bc1899d
idk, more refactoring
TheBoyRoy05 Jan 23, 2026
c6a84b8
hella refactoring
TheBoyRoy05 Jan 23, 2026
52f928e
hella refactoring
TheBoyRoy05 Jan 23, 2026
2f4361a
refactor refactor
TheBoyRoy05 Jan 23, 2026
e0f5970
refactor refactor
TheBoyRoy05 Jan 23, 2026
6fd4636
refactor projects
TheBoyRoy05 Jan 23, 2026
023404d
refactor projects
TheBoyRoy05 Jan 23, 2026
3ddf03e
refactor partners
TheBoyRoy05 Jan 23, 2026
a8c7b56
refactor partners
TheBoyRoy05 Jan 23, 2026
f7e1c21
refactor: main site
TheBoyRoy05 Jan 23, 2026
c37fdb8
refactor: main site
TheBoyRoy05 Jan 23, 2026
d6180b0
refactor: parts of members
TheBoyRoy05 Jan 23, 2026
316cffb
refactor: parts of members
TheBoyRoy05 Jan 23, 2026
f77c2fe
refactor: member site
TheBoyRoy05 Jan 23, 2026
0ce3608
refactor: member site
TheBoyRoy05 Jan 23, 2026
70e733d
fix: projects scraper path
TheBoyRoy05 Jan 23, 2026
9cd10fc
fix: projects scraper path
TheBoyRoy05 Jan 23, 2026
2b7e8a7
fix: various things
TheBoyRoy05 Jan 23, 2026
8bab7dd
fix: various things
TheBoyRoy05 Jan 23, 2026
1cd8424
pushing to #prod
TheBoyRoy05 Jan 23, 2026
5392199
pushing to #prod
TheBoyRoy05 Jan 23, 2026
855994d
Merge branch 'refactor/file-structure' into fix/admin
TheBoyRoy05 Jan 24, 2026
24d31f7
handled critical errors, still linting errors
TheBoyRoy05 Jan 24, 2026
6396df8
starting from scratch on admin page
TheBoyRoy05 Jan 24, 2026
a4e8aae
packages stuff
TheBoyRoy05 Jan 24, 2026
1703260
feat: events
TheBoyRoy05 Jan 24, 2026
09085af
Merge pull request #129 from ucsdds3/feat/admin #prod
TheBoyRoy05 Jan 24, 2026
9146dcb
feat: rest of events
TheBoyRoy05 Jan 24, 2026
fafcbe9
fix: event card
TheBoyRoy05 Jan 24, 2026
404b8cc
Merge pull request #130 from ucsdds3/feat/admin #prod
TheBoyRoy05 Jan 24, 2026
9e688e7
feat: members and items tables
TheBoyRoy05 Jan 24, 2026
6f8494b
hotfix: logo #prod
TheBoyRoy05 Jan 24, 2026
0a75ee6
Merge pull request #131 from ucsdds3/feat/admin
TheBoyRoy05 Jan 26, 2026
f9b8c95
fix: adminlevel #prod
TheBoyRoy05 Jan 26, 2026
e18dfb7
hotfix: admin page access
TheBoyRoy05 Jan 26, 2026
fe23c75
hotfix: update tables with falsey values
TheBoyRoy05 Jan 26, 2026
93057bf
hotfix: timezones for events
TheBoyRoy05 Jan 28, 2026
60f5696
hotfix: added other option to gender
TheBoyRoy05 Jan 28, 2026
e5c32b8
hotfix: supaabse.ts
TheBoyRoy05 Feb 2, 2026
293afc4
hotfix: secret name
TheBoyRoy05 Feb 2, 2026
4ad13c7
Trimmed the texts of various cards to make images crop better
SammyG82 Feb 2, 2026
8f05d2a
Merge branch 'main' of https://github.com/ucsdds3/main-site
TheBoyRoy05 Feb 2, 2026
592181a
feat: new dino for under construction #prod
TheBoyRoy05 Feb 2, 2026
b870c4b
hotfix: removed old admin components
TheBoyRoy05 Feb 2, 2026
8e00c39
Merge pull request #133 from ucsdds3/trim-text
TheBoyRoy05 Feb 3, 2026
b645e74
hotfix: fetch points from members table
TheBoyRoy05 Feb 3, 2026
d4160a8
Merge branch 'main' of https://github.com/ucsdds3/main-site
TheBoyRoy05 Feb 3, 2026
fda1824
hotfix: xp
TheBoyRoy05 Feb 3, 2026
bbbf4eb
removed console log
TheBoyRoy05 Feb 3, 2026
13e1abc
added tags and modified dates on attended cards
TheBoyRoy05 Feb 3, 2026
d7a2b2e
feat: event stats
TheBoyRoy05 Feb 3, 2026
1dac134
feat: responsiveness
TheBoyRoy05 Feb 3, 2026
372a960
Merge pull request #135 from ucsdds3:fix/members/events
TheBoyRoy05 Feb 3, 2026
a9dc45b
Update datahacks.json
TheBoyRoy05 Feb 3, 2026
1720979
hotfix: admin datetime select timezone bug
TheBoyRoy05 Feb 3, 2026
f16e511
Merge branch 'main' of https://github.com/ucsdds3/main-site
TheBoyRoy05 Feb 3, 2026
f0e088a
change monthly attendance stat to be past 30 days #prod
TheBoyRoy05 Feb 3, 2026
4a19fca
hotfix: sign images for 100 years instead of 1 hour
TheBoyRoy05 Feb 3, 2026
bcb766b
feat: added download to admin table #prod
TheBoyRoy05 Feb 3, 2026
20b37c0
Merge branch 'main' of https://github.com/ucsdds3/main-site
TheBoyRoy05 Feb 3, 2026
9e85303
Feat: Added Fundraiser event tag type
Jaerinx Feb 6, 2026
0fc45c2
Merge pull request #136 from ucsdds3/Feat-Fundraiser-event_tag
TheBoyRoy05 Feb 6, 2026
e8d5d83
fix, member: spacing on events
TheBoyRoy05 Feb 9, 2026
8f04ec9
updated profile layout
TheBoyRoy05 Feb 9, 2026
200d10d
fix: use user profile picture before rand_dino
TheBoyRoy05 Feb 9, 2026
7d567f4
feat: profile pictures
TheBoyRoy05 Feb 9, 2026
4fd1edb
feat: redirect URLs
TheBoyRoy05 Feb 9, 2026
75b74e0
Merge pull request #138 from ucsdds3:feat/redirctURL
TheBoyRoy05 Feb 9, 2026
a39e906
hotfix: inifinite auth loop
TheBoyRoy05 Feb 9, 2026
a259521
Merge pull request #139 from ucsdds3:update/profile #prod
TheBoyRoy05 Feb 9, 2026
3090c5f
feat: event codes in search params #prod
TheBoyRoy05 Feb 9, 2026
9959a33
feat: event codes
TheBoyRoy05 Feb 9, 2026
05a75f9
fix: avatar dropdown on member #prod
TheBoyRoy05 Feb 9, 2026
9a6254c
fix: qr scanning
TheBoyRoy05 Feb 9, 2026
576efb8
Merge pull request #140 from ucsdds3:feat/eventqr #prod
TheBoyRoy05 Feb 9, 2026
862784b
fix: event error toasts #prod
TheBoyRoy05 Feb 9, 2026
991f74d
hotfix: can't save bc qr code
TheBoyRoy05 Feb 9, 2026
5e69850
hotfix: qr code name
TheBoyRoy05 Feb 9, 2026
048ad37
hotfix: malformed event url on sign in
TheBoyRoy05 Feb 9, 2026
1cacf06
hotfix: pfp upload on safari
TheBoyRoy05 Feb 11, 2026
a32d1c3
hotfix: max file size to 10mb
TheBoyRoy05 Feb 11, 2026
3b6bc3e
hotfix: set in talent pool false by default
TheBoyRoy05 Feb 11, 2026
c275a8f
hotfix: safari dropdowns
TheBoyRoy05 Feb 11, 2026
d7f3b26
hotfix: landscape profile pics
TheBoyRoy05 Feb 11, 2026
a352b68
fix: rename redirect to next to prevent phishing flag
TheBoyRoy05 Feb 14, 2026
0ea1e60
fix: delete nextURL after use
TheBoyRoy05 Feb 14, 2026
52ccb1d
fix: expired otp
TheBoyRoy05 Feb 14, 2026
984a666
fix: png logo
TheBoyRoy05 Feb 14, 2026
fb627a0
Merge pull request #141 from ucsdds3:fix/reset-password #prod
TheBoyRoy05 Feb 14, 2026
627fcf3
style: margin on events section on members page #prod
TheBoyRoy05 Feb 14, 2026
d64b87c
hotfix?: temporary fix to go to reset password
TheBoyRoy05 Feb 14, 2026
7d79c07
hotfix: expired link reprompt
TheBoyRoy05 Feb 14, 2026
b15f96a
removed auth local storage #prod
TheBoyRoy05 Feb 14, 2026
1661887
hotfix: all .edu emails are allowed
TheBoyRoy05 Feb 17, 2026
7386d62
feat: add vercel analytics
DanielM7852 Feb 16, 2026
912fb34
hotfix styles
DanielM7852 Feb 18, 2026
8694aea
used an api to change the online content cards
RishikaS7 Feb 18, 2026
cf6fc4d
used an api to change the online content cards
RishikaS7 Feb 18, 2026
73282f6
update email #prod
TheBoyRoy05 Feb 18, 2026
0cb0fbd
hotfix: notify user to check inbox on email change
TheBoyRoy05 Feb 18, 2026
69e56bf
hotfix: alert user if email doesn't exist for forgot password
TheBoyRoy05 Feb 18, 2026
7bf9c4e
hotfix: email is now case insensitive
TheBoyRoy05 Feb 18, 2026
3cb4722
hotfix: arrow rotates on dropdown
TheBoyRoy05 Feb 18, 2026
1862fbb
Fixed percentage and experience point error
RishikaS7 Feb 19, 2026
04e8ea0
Fixed percentage and experience point error
RishikaS7 Feb 19, 2026
0a5e3c8
hotfix: get around RLS for forgot password
TheBoyRoy05 Feb 19, 2026
b5dd2b5
feat: added talent pool stuff to member table
TheBoyRoy05 Feb 20, 2026
7a1e370
Fix: mobile table sizing
TheBoyRoy05 Feb 20, 2026
7f0dd10
feat: empty/non-empty filter
TheBoyRoy05 Feb 20, 2026
ef31bac
hotfix: events show end date if different from start date
TheBoyRoy05 Feb 20, 2026
a9bb2f0
hotfix: give execs perms to edit members
TheBoyRoy05 Feb 20, 2026
aa6d6a7
Merge pull request #143 from ucsdds3/rounding-membership-experience
TheBoyRoy05 Feb 20, 2026
995cfd1
feat: attendance table
TheBoyRoy05 Feb 20, 2026
ea6c101
fix: paginate
TheBoyRoy05 Feb 20, 2026
6dbbf9c
fix: ids to fields
TheBoyRoy05 Feb 20, 2026
d59838e
feat: better event pages
TheBoyRoy05 Feb 20, 2026
dd0a593
fix: removed "notable events"
TheBoyRoy05 Feb 20, 2026
b3a2675
Merge pull request #144 from ucsdds3:update/events #prod
TheBoyRoy05 Feb 20, 2026
3f0e776
hotfix: package vulnerablities
TheBoyRoy05 Feb 20, 2026
ba8dd1d
fix: fundraiser color
TheBoyRoy05 Feb 20, 2026
9f59b3c
feat: extend event
TheBoyRoy05 Feb 20, 2026
43a86d5
fix: removed redundant long logic
TheBoyRoy05 Feb 20, 2026
002483b
working sort
TheBoyRoy05 Feb 20, 2026
b1caf6f
centrilized logic
TheBoyRoy05 Feb 20, 2026
00ecbd2
centrilized filter
TheBoyRoy05 Feb 20, 2026
769cca8
changed icons
TheBoyRoy05 Feb 20, 2026
8aa586f
style: border color
TheBoyRoy05 Feb 20, 2026
a387663
fix: better responsiveness
TheBoyRoy05 Feb 20, 2026
d728d52
style: removed colored borders
TheBoyRoy05 Feb 20, 2026
c90959e
fix: qr spacing
TheBoyRoy05 Feb 20, 2026
5513e0a
Merge pull request #145 from ucsdds3:update/table #prod
TheBoyRoy05 Feb 20, 2026
d30d3cb
hotfix: dropdowns
TheBoyRoy05 Feb 22, 2026
118c8b1
fixed the online content alignment
RishikaS7 Feb 22, 2026
f86148f
hotfix removed apply
DanielM7852 Feb 22, 2026
26219e2
Merge branch 'main' of https://github.com/ucsdds3/main-site
DanielM7852 Feb 22, 2026
1b42f64
hotfix import
DanielM7852 Feb 22, 2026
f47dbd9
fix: linter error
TheBoyRoy05 Feb 23, 2026
9ed994d
hotfix: add event without temp end
TheBoyRoy05 Feb 26, 2026
682eaa6
Updated DataHacks application link in datahacks.json
Feb 26, 2026
851b7da
Merge pull request #148 from ucsdds3/fix/datahacks-apply
TheBoyRoy05 Feb 26, 2026
9a7bda4
fix: removed all past board members
anagha166 Feb 26, 2026
a1e3f67
Merge pull request #149 from ucsdds3/board_edits #prod
TheBoyRoy05 Feb 26, 2026
5ca0165
Fix: Avatar dropdown not dropping down
Jaerinx Feb 26, 2026
ebc4adc
Merge pull request #150 from ucsdds3/hotfix-avatar-dropdwon
TheBoyRoy05 Feb 26, 2026
84196da
fixed the descriptions
RishikaS7 Mar 2, 2026
9d089d1
no more comments
RishikaS7 Mar 2, 2026
14e6e5a
used an api to change the online content cards
RishikaS7 Feb 18, 2026
756a2d7
used an api to change the online content cards
RishikaS7 Feb 18, 2026
b301c90
fixed the online content alignment
RishikaS7 Feb 22, 2026
e2a74c9
fixed the descriptions
RishikaS7 Mar 2, 2026
65576f6
no more comments
RishikaS7 Mar 2, 2026
c336707
merge
RishikaS7 Mar 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
85 changes: 46 additions & 39 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,49 +1,56 @@
name: Deploy
name: Deploy to Vercel

on:
push:
branches:
- main
workflow_dispatch:

jobs:
build:
name: Build
runs-on: ubuntu-latest

steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4

- name: Install dependencies
uses: bahmutov/npm-install@v1

- name: Build project
run: npm run build

- name: Upload production-ready build files
uses: actions/upload-artifact@v4
with:
name: production-files
path: ./dist

deploy:
name: Deploy
needs: build
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'

steps:
- name: Download artifact
uses: actions/download-artifact@v4
with:
name: production-files
path: ./dist

- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./dist
- uses: actions/checkout@v4

- name: Get commit message
id: commit
run: |
msg=$(git log -1 --pretty=%B | tr -d '\n')
echo "message=$msg" >> "$GITHUB_OUTPUT"

- name: Install Vercel CLI
run: npm install -g vercel

- name: Pull Vercel project config
env:
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
run: |
vercel pull --yes --token=$VERCEL_TOKEN

- name: Build
env:
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
VITE_GOOGLE_CALENDAR_ID: ${{ secrets.VITE_GOOGLE_CALENDAR_ID }}
VITE_GOOGLE_CALENDAR_API_KEY: ${{ secrets.VITE_GOOGLE_CALENDAR_API_KEY }}
VITE_SUPABASE_URL: ${{ secrets.VITE_SUPABASE_URL }}
VITE_SUPABASE_ANON_KEY: ${{ secrets.VITE_SUPABASE_ANON_KEY }}
run: |
if [[ "${{ github.event_name }}" == "workflow_dispatch" || "${{ steps.commit.outputs.message }}" == *"#prod"* || "${{ steps.commit.outputs.message }}" == *"hotfix"* ]]; then
echo "🏗️ Building for Production"
vercel build --prod --token=$VERCEL_TOKEN
else
echo "🏗️ Building for Preview"
vercel build --token=$VERCEL_TOKEN
fi

- name: Deploy
env:
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
run: |
if [[ "${{ github.event_name }}" == "workflow_dispatch" || "${{ steps.commit.outputs.message }}" == *"#prod"* || "${{ steps.commit.outputs.message }}" == *"hotfix"* ]]; then
echo "🚀 Auto Production Deploy (from commit)"
vercel deploy --prebuilt --prod --token=$VERCEL_TOKEN
else
echo "👀 Preview Deploy"
vercel deploy --prebuilt --token=$VERCEL_TOKEN
fi
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,24 @@ dist
dist-ssr
*.local

# Environment variables
.env
.env.local
.env.*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
!.vscode/settings.json
!.vscode/typescriptreact.code-snippets
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

# Python
.venv/
__pycache__/
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules
dist
build
.vscode
*.min.js
package-lock.json
9 changes: 9 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"semi": true,
"singleQuote": false,
"tabWidth": 2,
"trailingComma": "es5",
"printWidth": 100,
"arrowParens": "avoid",
"endOfLine": "lf"
}
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"esbenp.prettier-vscode",
"rodrigovallades.es7-react-js-snippets",
"bradlc.vscode-tailwindcss"
]
}
15 changes: 15 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"prettier.printWidth": 100,
"[html][javascript][javascriptreact][css][typescript][typescriptreact][jsonc][json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.tabSize": 2
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
}
36 changes: 36 additions & 0 deletions .vscode/typescriptreact.code-snippets
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"cpg": {
"prefix": "cpg",
"body": [
"import Page from \"${1|../../Components/Page/Page,../../../Components/Page/Page,../../../../Components/Page/Page|}\"",
"",
"const ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}/} = () => {",
" return (",
" <Page>",
" $0",
" </Page>",
" )",
"}",
"",
"export default ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}/}"
],
"description": "Create a new page component with Page wrapper"
},
"csec": {
"prefix": "csec",
"body": [
"import Section from \"${1|../../Components/Section,../../../Components/Section,../../../../Components/Section|}\"",
"",
"const ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}/} = () => {",
" return (",
" <Section>",
" $0",
" </Section>",
" )",
"}",
"",
"export default ${TM_FILENAME_BASE/(.*)/${1:/pascalcase}/}"
],
"description": "Create a new section component with Section wrapper"
}
}
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# DS3 Main Site Documentation
# 🚀 DS3 Main Site Documentation for the github workshop

## Getting Started
## 🎯 Getting Started

1. Clone the repo with `git clone https://github.com/ucsdds3/main-site.git`
2. Open the repo in your preferred code editor (For VSCode, use the command `code main-site`)
3. Run `npm install` to install dependencies
4. Run `npm run dev` to start the development server

## Contribution Guidelines
## 🤝 Contribution Guidelines

To make contributions to the DS3 Main Site, please follow these guidelines:

Expand All @@ -17,9 +17,9 @@ To make contributions to the DS3 Main Site, please follow these guidelines:
4. Create a pull request from your branch to the main branch. Write a summary of your changes in the pull request description.
5. Once the pull request is merged, you can safely delete your branch using the command `git branch -d <branch-name>`.

## Project Structure
## 📁 Project Structure

Stick to the project structure shown below to keep things organized. The project is structured as follows:
Stick to the project structure shown below to keep things organized:

```
main-site/
Expand All @@ -39,14 +39,14 @@ main-site/
│ │ └── types.ts # Utility types
```

## Dependencies
## 📦 Dependencies

Check the depencencies listed below for this project before starting. Use these to your advantage so you don't have to do more work! There are more dependencies that you can find in the `package.json` file, but these are the ones you should be familiar with.

- [Vite](https://vitejs.dev/) - Build Tool
- [React](https://react.dev/) - Frontend Framework
- [React Router](https://reactrouter.com/en/main) - Routing
- [Tailwind CSS](https://tailwindcss.com/) - CSS Framework (prefer this over making your own styles)
- [React Icons](https://react-icons.github.io/react-icons/) - Icon Library (prefer this over svgs)
- [Daisy UI](https://daisyui.com/) - Tailwind CSS Component Library (prefer this over making your own components)
- [Framer Motion](https://www.framer.com/motion/) - Animation Library (prefer this over making your own animations)
- [Vite](https://vitejs.dev/) - Build Tool
- [React](https://react.dev/) - Frontend Framework ⚛️
- [React Router](https://reactrouter.com/en/main) - Routing 🛣️
- [Tailwind CSS](https://tailwindcss.com/) - CSS Framework 🎨
- [React Icons](https://react-icons.github.io/react-icons/) - Icon Library 🖼️
- [Daisy UI](https://daisyui.com/) - Tailwind CSS Component Library 🎯
- [Framer Motion](https://www.framer.com/motion/) - Animation Library
5 changes: 4 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@300;400;500;600;700&display=swap" rel="stylesheet">
<link rel="icon" type="image/svg+xml" href="/src/Assets/Images/ds3_logo.png" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Darker+Grotesque:wght@300..900&family=Jost:ital,wght@0,100..900;1,100..900&family=Jura:wght@300..700&display=swap" rel="stylesheet">
<title>DS3 @ UCSD</title>
</head>
<body>
Expand Down
Loading