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.

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

add updates to deploy #118

Open
wants to merge 25 commits into
base: deploy
Choose a base branch
from
Open

add updates to deploy #118

wants to merge 25 commits into from

Conversation

ArshMalik02
Copy link
Contributor

Transfer recent updates from master branch to deploy branch to fire the Jenkins pipeline for deployment

mattxwang and others added 20 commits May 7, 2021 23:03
* add redux devtools

* fix yarn
* adds temp makefile

* necessary changes to deply on prod

Co-authored-by: Nikhil Kansal <[email protected]>
This reverts commit 74f78b5.
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.
Administrative merge commit.
…g names (#112)

* fix modal and top users styling for long names

* Remove commented HTML in leaderboardModal.jsx
@ajtadeo
Copy link
Contributor

ajtadeo commented Dec 1, 2023

NOTE: work in progress, need to resolve issues with deploying before merging

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.

8 participants