Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Final edits #33

Merged
merged 58 commits into from
Sep 4, 2023
Merged

Final edits #33

merged 58 commits into from
Sep 4, 2023

Conversation

ArshMalik02
Copy link
Contributor

Combine all the hard work done by the team 🎉
Resolve conflicts if any

Charles Zhu and others added 30 commits May 16, 2023 17:03
Merge branch 'main' into charles
db81d85
@ChiweiChen
getCommitteeInfo function
3b69bde
@ChiweiChen
getCommitteeInfo function
f4258bc
@ChiweiChen
gets basic info now
35bffd2
@ChiweiChen
test
ff5ecca
@ChiweiChen
landing backend setup
cacebce
@elizabethkim11
Merge branch 'main' of https://github.com/uclaacm/committee-website-t…
02c1d7f 
…emplate-cms into landingBackend
@elizabethkim11
linting
d1bf8f9
@elizabethkim11
Change color var to favicon link
c8e25c6
@elizabethkim11
Landing bg image backend done
4c26307
@elizabethkim11
Linting
48dbc6b
synced officer backend with frontend and changed config
5981115
@andyren12
Reformat board card
f700686
@andyren12
Reformat board card
46e4488
@ChiweiChen
before git pull
04dba68
@ChiweiChen
Merge branch 'landingBackend' of https://github.com/uclaacm/committee…
8c038df 
…-website-template-cms into landingBackend
@elizabethkim11
Merge branch 'landingBackend' into elizabeth
141fbab
@elizabethkim11
Merge branch 'main' of https://github.com/uclaacm/committee-website-t…
e24fec8 
…emplate-cms into elizabeth
@elizabethkim11
Merge branch 'main' of https://github.com/uclaacm/committee-website-t…
9ad7daa 
…emplate-cms into elizabeth
@elizabethkim11
make script write to output.json
840d90d
@elizabethkim11
linting
cf556dd
@ChiweiChen
padding for pages
44734fc
@ChiweiChen
css changes
c8bff1d
@ChiweiChen
Merge branch 'main' into landingBackend
ebbf61c
@ChiweiChen
padding below navbar + main merged into landing page backend
97f8fc0
@andyren12
Test landing page script
2363569
@ChiweiChen
change back to ICPC
fe473fd
@andyren12
Fetch spreadsheet data for footer
060919d
@elizabethkim11
Move output.json to public
cabd8f0
@elizabethkim11
linting
621db6e
andyren12 and others added 22 commits June 1, 2023 01:03
@andyren12
Merge branch 'elizabeth' of https://github.com/uclaacm/committee-webs…
bb8b73b 
…ite-template-cms into andy
@andyren12
Filter by upcoming date
fbf491d
@andyren12
Add committee color
bcc5c7b
finished officers frontend and backend
0d7e215
renamed landing styles file
bb5a40f
renamed landing page styles file
a68f190
@ArshMalik02
fix bug with env variable
d452770
@ArshMalik02
syncing
52d7002
fixed team page errors and removed general members
90ce281
fixed team page errors and removed general members
5b98924
fixed parts of get officers algortihm
9d4927a
fixed parts of get officers algorithm
3000390
@ArshMalik02
Merge branch 'charles' into arsh-final-edits
30178da
@ArshMalik02
fix a bug in officer backend code
25ac472
@ArshMalik02
delete unnecessary console logs
1df07c4
@ArshMalik02
Merge branch 'landingBackend' into arsh-final-edits
b8e52a8
@ArshMalik02
fix bug in events page
6657928
@ArshMalik02
add global var for team page
48e23e5
@ArshMalik02
add global var to landing page
aa1cc8d
@ArshMalik02
fix aliasing
fbd05ef
@ArshMalik02
fix env config
95fab2e
@ArshMalik02
modify env config
d8ce46a
andyren12
andyren12 approved these changes Sep 3, 2023
View reviewed changes
Copy link
Contributor

@andyren12 andyren12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good!

elizabethkim11
elizabethkim11 approved these changes Sep 4, 2023
View reviewed changes
Copy link
Contributor

@elizabethkim11 elizabethkim11 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm :D

@ArshMalik02 ArshMalik02 merged commit 2244eab into main Sep 4, 2023
2 checks passed
@ArshMalik02 ArshMalik02 deleted the arsh-final-edits branch September 4, 2023 04:27
@ArshMalik02 ArshMalik02 restored the arsh-final-edits branch September 4, 2023 04:27
@ArshMalik02 ArshMalik02 deleted the arsh-final-edits branch September 4, 2023 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andyren12 andyren12 andyren12 approved these changes

@elizabethkim11 elizabethkim11 elizabethkim11 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ArshMalik02 @elizabethkim11 @andyren12 @ChiweiChen