Skip to content

Production Release - Redesign Stage 1 #145

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.

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

Merged
merged 17 commits into from
May 22, 2025
Merged

Production Release - Redesign Stage 1 #145

merged 17 commits into from
May 22, 2025

Conversation

smalex-z
Copy link
Contributor

Description

First batch of membership portal redesign changes being pushed into productions. In particular, we have a

  • revamped login page
  • new event cards
  • new event container
  • Events Search bar
  • Events filtering
  • Dropdown for committees when adding an event
  • a "member view" option for admins
  • a button to add new admins on the frontend
  • RSVP functionality on the backend (but not the frontend yet).

Related Issue

Resolves # (issue)

Steps to view & test changes:

  • run git checkout redesign-main then git pull origin in both this repo and the membership portal backend repo.
  • Spin up dev and test out all of the features

How Has This Been Tested?

  • Manual tests
  • Responsive View

Screenshots (if appropriate)

image
image
image

Kevin-D23 and others added 11 commits May 7, 2025 17:02
* Added memberView option for admins in control panel

* Added button to profile page to switch back to admin view

* Added conditional rendering so admin view button only shows for admins
* new event card ui & frontend

* new event status ui & frontend

* Update eventCard.jsx
Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>
* Made event card container responsive and incorporated flex

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

---------

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>
* Added filtering for events using search/select bars

* Fixed event filtering logic to show today's events
* Added dropdown for committees when adding events as admin

* Added committee colors to dropdown
* Add a dummy button to Profile page to change to admin account

* connect to backend

* added to control panel, changed text
* Redesigned login page for desktop

* centralized space

* hardcoded gap

* overflow show

* Added mobile view for login

* Added ACM logo as favicon

* Redesigned /register page

* Added logic for additional screen sizes

* Fixed centering

---------

Co-authored-by: Alex Zheng <75999032+smalex-z@users.noreply.github.com>
* Spacing fix on month

* Added Cloud as a committee
Kevin-D23 and others added 2 commits May 15, 2025 10:58
* Made event card container responsive and incorporated flex

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* removed sidebar component, still struggling with events container

* fixed styling to remove sidebar width

* modified topbar styling, still has rendering issue, trouble removing sidebar from events

* Fixed rendering issue on Topbar  when reloading page

* added logo and fixed styling of topbar

* fixed styling for topbar

* home tab redirects to events

* added profile picture on right

* Included hamburger menu for mobile responsiveness

* updated acm logo

* updated acm logo

* modified .control-panel-wrapper

* Added profile picture to topbar

* Added animation to mobile menu

---------

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>
Kevin-D23
Kevin-D23 previously approved these changes May 18, 2025
Copy link
Contributor

@Kevin-D23 Kevin-D23 left a comment

Choose a reason for hiding this comment

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

Everything looks good to me! I think we are still waiting on a few final touches, like the RSVP functionality on the front end. Otherwise, good to go!

Jsontran5 and others added 3 commits May 20, 2025 13:12
* Add RSVP functionality and integrate with events

* Change event card to only render rsvp button on future events

---------

Co-authored-by: Kevin-D23 <116064184+Kevin-D23@users.noreply.github.com>
* Made event card container responsive and incorporated flex

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* removed sidebar component, still struggling with events container

* fixed styling to remove sidebar width

* modified topbar styling, still has rendering issue, trouble removing sidebar from events

* Fixed rendering issue on Topbar  when reloading page

* added logo and fixed styling of topbar

* fixed styling for topbar

* home tab redirects to events

* added profile picture on right

* Included hamburger menu for mobile responsiveness

* updated acm logo

* updated acm logo

* modified .control-panel-wrapper

* rough layout implmentation of the landing page

* updated profile welcome

* final profile a

* placeholder banner styling

* horizontal stacking

* Added profile picture to topbar

* Added animation to mobile menu

* home is default page

* Welcome banner updates (#150)

* inital profile picture and name configuration

* comments and notation

* scss changes

* imported neural background

* Neural Background added to the welcome banner

* responsive scss

* mobile view fixed lol

* Added design and logic for event checkin (#154)

---------

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* removed extra space from check in

* actually fixed the space

* points bar working

* scss changes

* minor button sizing fixes

* acm blue

* cleaner check

* sizing updates

* Susie/featured events (#156)

* Modified Top Navigation Bar and Removed Sidebar (#148)

* Made event card container responsive and incorporated flex

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* Update src/components/Events/UserEvents/style.scss

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* removed sidebar component, still struggling with events container

* fixed styling to remove sidebar width

* modified topbar styling, still has rendering issue, trouble removing sidebar from events

* Fixed rendering issue on Topbar  when reloading page

* added logo and fixed styling of topbar

* fixed styling for topbar

* home tab redirects to events

* added profile picture on right

* Included hamburger menu for mobile responsiveness

* updated acm logo

* updated acm logo

* modified .control-panel-wrapper

* Added profile picture to topbar

* Added animation to mobile menu

---------

Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>

* committee logos (#152)

* add featured events container to home

* add featured events to home

* add featured event container to home

* change path to featuredEvents in home

* merge

* replace crash fix

* sizing fixes

---------

Co-authored-by: Camillalalala <188892765+Camillalalala@users.noreply.github.com>
Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>
Co-authored-by: Alex Zheng <75999032+smalex-z@users.noreply.github.com>

* scss and bugfixes

* Fixed formatting ruined by lint

* Hydrate home leaderboard widget with live data (#157)

* mobile view updated and featured events changed

* container w/ disappearing events

* responsiveness changes

* enables vertical scrolling

* Resolved merge conflicts

---------

Co-authored-by: Camillalalala <camilla4clubs@gmail.com>
Co-authored-by: Camillalalala <188892765+Camillalalala@users.noreply.github.com>
Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com>
Co-authored-by: susiekim101 <35243112+susiekim101@users.noreply.github.com>
Co-authored-by: Najm Hoda <69488679+NajmKHoda@users.noreply.github.com>
@smalex-z smalex-z merged commit 56cfd6b into master May 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants