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

Feature/homepage #3112

Closed
wants to merge 452 commits into from
Closed

Feature/homepage #3112

wants to merge 452 commits into from

Conversation

Peyton-McKee
Copy link
Contributor

Changes

Home page redesign pre merge conflicts

Checklist

It can be helpful to check the Checks and Files changed tabs.
Please review the contributor guide and reach out to your Tech Lead if anything is unclear.
Please request reviewers and ping on slack only after you've gone through this whole checklist.

  • All commits are tagged with the ticket number
  • No linting errors / newline at end of file warnings
  • All code follows repository-configured prettier formatting
  • No merge conflicts
  • All checks passing
  • Screenshots of UI changes (see Screenshots section)
  • Remove any non-applicable sections of this template
  • Assign the PR to yourself
  • No yarn.lock changes (unless dependencies have changed)
  • Request reviewers & ping on Slack
  • PR is linked to the ticket (fill in the closes line below)

Closes #2012 (issue #)

walker-sean and others added 30 commits November 17, 2024 22:38
@walker-sean
Merge pull request #2904 from Northeastern-Electric-Racing/#2797-Feat…
3a16364 
…ured-Projects-Section

#2797 featured projects section
@caiodasilva2005
Merge branch 'feature/homepage-redesign' of https://github.com/Northe…
a62a9de 
…astern-Electric-Racing/FinishLine into #2940-Caio-SchemaChanges
@caiodasilva2005
#2998-set up get unread notifications endpoint
03124d3
@caiodasilva2005
#2997-set up send notifcations endpoint
5778441
@caiodasilva2005
#2997-created tests
83acfbe
@caiodasilva2005
#2997-updated test
e3b3bb7
@caiodasilva2005
#2998 merged send notifications
d56ddd9
@caiodasilva2005
#2998-wrote tests
6ae13e3
@caiodasilva2005
#3000-set up hooks
6875955
@vindema
#2793: Aligned the title, description, and buttons
8eec4f3
@vindema
#2793: Removed GuestOrganizationInfo component from AdminHomePage
d55f556
@vindema
Merge https://github.com/Northeastern-Electric-Racing/FinishLine into #…
650266b 
…2793-Guest-Organization-Info-Component
@vindema
#2793: Merged changes into branch
77f0770
@vindema
#2793: Fixed merge conflicts
83ea95d
@vindema
#2793: Fixed merged conflicts
c54b9b2
@vindema
#2793: Fixed Prettier issue
03c72c6
@caiodasilva2005
#3000-created notification card
fc44a6c
@walker-sean
Merge pull request #2941 from Northeastern-Electric-Racing/#2940-Caio…
fe2593d 
…-SchemaChanges

#2940-Announcements and Notifications Schema Changes
@jessegarcia1
#2817 added card and section files
375df2e
@caiodasilva2005
#3000-fixed styling
d0c8d8c
@caiodasilva2005
#2821-separated into two files
d2e9cdc
@caiodasilva2005
Merge branch 'feature/homepage-redesign' into #2997-Caio-SendNotifica…
2b8bbb2 
…tions
@caiodasilva2005
#2997-created migration
93728de
@caiodasilva2005
Merge branch 'feature/homepage-redesign' of https://github.com/Northe…
845a83f 
…astern-Electric-Racing/FinishLine into #2769-Caio-EditFeaturedProjects
@chpy04
#2801 uses util function and checks for active wps
0771afc
@chpy04
Merge branch 'feature/homepage-redesign' into #2803-Chris-UnreviewedCRs
4cc35ff
@chpy04
#2803 merge conflict resolution
83d83af
@chpy04
#2809 fixed scrollbar color in firefox
a817b75
@chpy04
#2809 changed example on homepage to correct width
d919f32
@walker-sean
Merge pull request #2891 from Northeastern-Electric-Racing/#2793-Gues…
b6e1f2e 
…t-Organization-Info-Component

#2793: Created the Guest Organization Info Component
caiodasilva2005 and others added 25 commits December 22, 2024 11:04
@caiodasilva2005
Merge branch '#3044-slack-endpoint-listener' of https://github.com/No…
f101571 
…rtheastern-Electric-Racing/FinishLine into #3044-slack-endpoint-listener
@caiodasilva2005
#3075-fixed tests
c8392e9
@caiodasilva2005
#3044-up to date
127c319
@caiodasilva2005
#3074-fixed pop up card
dc35d6d
@caiodasilva2005
Merge branch '#3074-GetUnreadAnnouncements' into #3075-RemoveAnnounce…
42ef1f9 
…ment
@caiodasilva2005
Merge branch '#3074-GetUnreadAnnouncements' into #3044-slack-endpoint…
76e94cf 
…-listener
@Peyton-McKee
Merge pull request #3076 from Northeastern-Electric-Racing/#3074-GetU…
505e858 
…nreadAnnouncements

#3074-Get Unread Announcements
@walker-sean
Merge branch 'feature/homepage-redesign' into #3075-RemoveAnnouncement
decdcbc
@caiodasilva2005
Merge pull request #3095 from Northeastern-Electric-Racing/#3075-Remo…
10a97bb 
…veAnnouncement

#3075-Remove Announcement
@caiodasilva2005
#3044-up to date
5f16229
@caiodasilva2005
#3044-fixed date
1bd863a
@caiodasilva2005
#3044-fixed tests
c94172f
@caiodasilva2005
#3044-small mistake
4d18129
@caiodasilva2005
#3099-hook and api
3019b55
@caiodasilva2005
#3099-created api
64965db
@caiodasilva2005
#3099-created announcements display
b8ea0ab
@caiodasilva2005
#3099-Organizing pages
2b1f55a
@caiodasilva2005
#3099-error check
3d2c816
@chpy04
#3044 refactoring prisma queries and misc changes
1dbb550
@caiodasilva2005
#3099-fixed issues
1b411a1
@caiodasilva2005
#3099-transform result of api call
21d33d5
@Peyton-McKee
Merge pull request #3100 from Northeastern-Electric-Racing/#3099-Disp…
ecc4548 
…layAnnouncements

#3099-Display General Announcements
@caiodasilva2005
#3044-added organization to announcements and pop-ups
659f88c
@caiodasilva2005
#3044-fixed tests
1d118e0
@Peyton-McKee
Merge pull request #3089 from Northeastern-Electric-Racing/#3044-slac…
5a6990e 
…k-endpoint-listener

#3044 slack endpoint listener
@Peyton-McKee
Copy link
Contributor Author

This one is also broken, Im going to have to delete the commit history

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@walker-sean walker-sean Awaiting requested review from walker-sean

Assignees

@chpy04 chpy04

@caiodasilva2005 caiodasilva2005

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Home Page Redesign
6 participants
@Peyton-McKee @chpy04 @caiodasilva2005 @walker-sean @vindema @jessegarcia1