Merge master to prod #261
Merged
Merge master to prod #261
Conversation
This file contains 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
Merge prod into master to fix history
* Implemented both design fixes * trying to commit update to snapshot test * update test snapshot * updated size attribute if statement --------- Co-authored-by: Pranav Phadke <pranavmphadke@gmail.com>
) * initial changes and create new subscriptions page * added subscriptions to page * displayed section and course info * added WIP header + linting * current changes * implement feedback * fix linting issues * Cleaned up existing code * added View all subscriptions button logic Currently commented out, uncomment once subscription page is finalized * fixed typo * Updated GQL query to give more course information * export section formatting function Also noticed an error on line 39 that only happens on subscription page. Might be fixed now but leaving that comment incase it's still broken * Rewrote logic for finding sections We now use the section ids and course ids in userInfo to find all courses that a user has subscribed to (whether directly to the course for new section alerts or to associated sections for seat opening alerts) * Updated class card and useUserInfo hook * Don't need to cloneDeep here * Update ClassCard.tsx * Update ResultsLoader.tsx * revert generated graphql file * Update graphql.ts * Add toggle to collapse class sections * Align dropdown icon * Include entire table in toggle * updated styling * Update useState and styling names * Update SubscriptionCourse * Add unsubscribe from new sections toggle * Clean up file --------- Co-authored-by: Ally Chao <73146562+allychao@users.noreply.github.com> Co-authored-by: Sebastian Wittrock <sebastianwittrock927@gmail.com> Co-authored-by: Sebastian Wittrock <sebastianwittrock@sebpro.local> Co-authored-by: Pranav Phadke <pranavmphadke@gmail.com>
* initial changes and create new subscriptions page * added subscriptions to page * displayed section and course info * added WIP header + linting * current changes * implement feedback * fix linting issues * Cleaned up existing code * added View all subscriptions button logic Currently commented out, uncomment once subscription page is finalized * fixed typo * Updated GQL query to give more course information * export section formatting function Also noticed an error on line 39 that only happens on subscription page. Might be fixed now but leaving that comment incase it's still broken * Rewrote logic for finding sections We now use the section ids and course ids in userInfo to find all courses that a user has subscribed to (whether directly to the course for new section alerts or to associated sections for seat opening alerts) * Updated class card and useUserInfo hook * Don't need to cloneDeep here * Update ClassCard.tsx * Update ResultsLoader.tsx * revert generated graphql file * Update graphql.ts * Add toggle to collapse class sections * Align dropdown icon * Include entire table in toggle * updated styling * Update useState and styling names * Moved notification signup button to header * Additional Styling and closing menu on outside click * refactor and abstract duplicate code * update snapshots * remove unused prop * include missing prop * linter issues * Clean up userInfo util usage and props * Update Header.tsx * update snapshot * Update ResultsLoader.tsx * Update SubscriptionCourse * Add unsubscribe from new sections toggle * Clean up file * remove unused imports * Update Header.tsx * fix line height * Replaced userIcon and added more styling for splash page menu * Fix useEffect * Refactor to pass props between header and results loader * update snap shots * Update [query].tsx * Always display notif column * Moved checked logic inside SectionCheckBox - Allows checked state to change based on user signed in or not * Updated Sign in modal * New signin modal * Updated dropdown menu * updated snapshot * New "One More Step" modal * Update Result.test.tsx.snap * clear VerificationCode after signin * 30 second timer on verification code resend * Update ClassCard.tsx * add new sections subscription bar to classCard * refactor logic * few more touches to modals * Update Header.tsx * hover for dropdown menu + fixed padding on dropdown item * Fixed styling on verification modal * update mobile view --------- Co-authored-by: Ally Chao <73146562+allychao@users.noreply.github.com> Co-authored-by: Sebastian Wittrock <sebastianwittrock927@gmail.com> Co-authored-by: Sebastian Wittrock <sebastianwittrock@sebpro.local> Co-authored-by: Anzhuo-W <45926251+Anzhuo-W@users.noreply.github.com>
* Adjust text inside meetings table * remove css class that doesn't exist
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
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.
No description provided.