Skip to content

Commit 56cfd6b

Browse files
smalex-zKevin-D23susiekim101Charleslbj23Camillalalala
authored
Production Release - Redesign Stage 1 (#145)
* Added memberView option for admins in control panel (#133) * 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 * pull request template (#134) * New event card design (#130) * new event card ui & frontend * new event status ui & frontend * Update eventCard.jsx * Add search and select bars to improve filtering capabilities (#129) Co-authored-by: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com> * Modified event card container (#128) * 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> * Update README.md (#138) * Added Event Filtering (#137) * Added filtering for events using search/select bars * Fixed event filtering logic to show today's events * Events Committee Dropdown (#139) * Added dropdown for committees when adding events as admin * Added committee colors to dropdown * Add admin frontend (#141) * Add a dummy button to Profile page to change to admin account * connect to backend * added to control panel, changed text * Login Page Redesign (#143) * 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> * Cloud committee (#144) * Spacing fix on month * Added Cloud as a committee * Added past events to event filter (#146) * 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 RSVP functionality and integrate with events (#153) * 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> * Removed grouping of events by day (#149) * Landing page (#158) * 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> --------- 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: Charles <121031191+Charleslbj23@users.noreply.github.com> Co-authored-by: Camillalalala <188892765+Camillalalala@users.noreply.github.com> Co-authored-by: Jason Tran <106890256+Jsontran5@users.noreply.github.com> Co-authored-by: Camillalalala <camilla4clubs@gmail.com> Co-authored-by: Najm Hoda <69488679+NajmKHoda@users.noreply.github.com>
1 parent 3db47cf commit 56cfd6b

File tree

121 files changed

+23732
-1141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+23732
-1141
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
## Description
2+
3+
<!--- Describe your changes in detail -->
4+
5+
## Related Issue
6+
7+
Resolves # (issue)
8+
9+
## Steps to view & test changes:
10+
11+
-
12+
13+
## How Has This Been Tested?
14+
15+
- [ ] Manual tests
16+
- [ ] Responsive View
17+
18+
## Screenshots (if appropriate)

‎README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ $ yarn
1212

1313
## Development
1414

15-
```bash
16-
$ cd ../membership-portal-deployments
17-
$ make
18-
```
15+
To start membership portal, follow the README on the [deployment repo](https://github.com/uclaacm/membership-portal-deployment)
1916

2017
You can access the site from `http://localhost:8000` and the app will communicate with the backend directly on port `8080`.

0 commit comments

Comments
 (0)