add updates to deploy #118
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add redux devtools * fix yarn
…yarn install in the image (#95)
* adds temp makefile * necessary changes to deply on prod Co-authored-by: Nikhil Kansal <[email protected]>
This reverts commit 74f78b5.
This reverts commit 9ab807b.
This reverts commit 45ca6ac.
* Google SSO Button * Remove signIn and signUp components and styles. * Remove ResetPassword components. * Add pretty Google sign in button. * Move styles for sign in button. * Remove reducers. * Recklessly delete register components we no longer need. * Fix createHistory warning. * Remove register container. * Remove extra line. * Remove register route. * Remove password update from profile. * Progress on adding new registration for major and year. * Proper register flow behavior. * Require auth for register page. * Update config. * Work on new registration. * Revert to longer website name for official link per UCLA Policy 110. * Add self as contributor : ) * Fix onChange and add comments. * Work on registration. * Fix reducers and route fpr registration. * Iron out last bugs to pto properly redirect; refresh token and initialize isRegistered with existing token. * Fix last redirect bug. * Fix leaderboard modal. * Clean up pass 1. * Add design and teachla to event analytics options. * More specific third-party cookies error message. Co-authored-by: Ellie Cheng <[email protected]>
Co-authored-by: Dylon Tjanaka <[email protected]> Co-authored-by: Nikhil Kansal <[email protected]>
* Start control panel changes. * Work on admins modal. * just keep swimming * additional auth stuff * progress. * Add admin stuff to user reducer. * Work on modal and password reset. * Password reset bar. * Clean up control panel and move everything to modals. * Prettier. * Super Admin title on sidebar. * Feeling prettier. * Misc + config. * ? * Plugging things in. * Add note. * Prettier. * Work on modals. * More work on modals. * Only cleanup and API plugging left. * Switch positions of buttons. * Work on reducers. * Work on auth. * Oops. * Earmarking this for future changes. * Intermediate work. * Delete more. * One-click reducer. * Work on admins reducer. * Reducers and hide broken image icon. * Prettier. * All admins stuff seemingly works; need to fix propTypes warnings and finish one click password. * Prettier. * Clean up some clutter. * Clean up one click reducer. * Add props. * Will move status message to banner. * Should be done except for PropType warnings.
Co-authored-by: Dylon Tjanaka <[email protected]>
Administrative merge commit.
…g names (#112) * fix modal and top users styling for long names * Remove commented HTML in leaderboardModal.jsx
|
NOTE: work in progress, need to resolve issues with deploying before merging |
This reverts commit bd7d276.
This reverts commit db7b3ba.
* 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 <[email protected]> * 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 <[email protected]> * Update src/components/Events/UserEvents/style.scss Co-authored-by: Kevin Duong <[email protected]> * Update src/components/Events/UserEvents/style.scss Co-authored-by: Kevin Duong <[email protected]> --------- Co-authored-by: Kevin Duong <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Update src/components/Events/UserEvents/style.scss Co-authored-by: Kevin Duong <[email protected]> * Update src/components/Events/UserEvents/style.scss Co-authored-by: Kevin Duong <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Update src/components/Events/UserEvents/style.scss Co-authored-by: Kevin Duong <[email protected]> * Update src/components/Events/UserEvents/style.scss Co-authored-by: Kevin Duong <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Update src/components/Events/UserEvents/style.scss Co-authored-by: Kevin Duong <[email protected]> * Update src/components/Events/UserEvents/style.scss Co-authored-by: Kevin Duong <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: Kevin Duong <[email protected]> Co-authored-by: Alex Zheng <[email protected]> * 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 <[email protected]> Co-authored-by: Camillalalala <[email protected]> Co-authored-by: Kevin Duong <[email protected]> Co-authored-by: susiekim101 <[email protected]> Co-authored-by: Najm Hoda <[email protected]> --------- Co-authored-by: Kevin Duong <[email protected]> Co-authored-by: susiekim101 <[email protected]> Co-authored-by: Charles <[email protected]> Co-authored-by: Camillalalala <[email protected]> Co-authored-by: Jason Tran <[email protected]> Co-authored-by: Camillalalala <[email protected]> Co-authored-by: Najm Hoda <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Transfer recent updates from master branch to deploy branch to fire the Jenkins pipeline for deployment