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

Make add and edit year a modal #419

Merged
merged 17 commits into from
Feb 15, 2024
Merged

Make add and edit year a modal #419

merged 17 commits into from
Feb 15, 2024

Conversation

Awesome-E
Copy link
Member

Description

When you click the "add year" or "edit year" buttons, there will now be a modal window to add/edit details instead of a floating popover. it also combines "add quarter" and "edit year" functionalities into the same menu and allows you to add or remove several years at once a bit faster.

Because this makes changes to the edit year menu, I have also made that use an OverlayTrigger like the add year was previously.

Screenshots

BEFORE:

image image image

AFTER:

image image image

Steps to verify/test this change:

  • Verify changes work as expected on staging instance

Final Checks:

  • Verify successful deployment

Issues

Closes #398

@js0mmer
Copy link
Member

js0mmer commented Feb 8, 2024

Fixes #252

@js0mmer js0mmer linked an issue Feb 8, 2024 that may be closed by this pull request
Copy link
Member

@js0mmer js0mmer left a comment

Choose a reason for hiding this comment

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

Noted a few things. will take a closer look this weekend

site/src/pages/RoadmapPage/AddYearPopup.scss Outdated Show resolved Hide resolved
site/src/pages/RoadmapPage/CourseYear.tsx Outdated Show resolved Hide resolved
site/src/pages/RoadmapPage/CourseYear.tsx Outdated Show resolved Hide resolved
site/src/pages/RoadmapPage/AddYearPopup.scss Outdated Show resolved Hide resolved
site/src/pages/RoadmapPage/CourseYear.tsx Outdated Show resolved Hide resolved
@Awesome-E Awesome-E requested a review from js0mmer February 14, 2024 03:37
@Awesome-E Awesome-E mentioned this pull request Feb 14, 2024
4 tasks
site/src/pages/RoadmapPage/AddYearPopup.scss Outdated Show resolved Hide resolved
site/src/pages/RoadmapPage/AddYearPopup.scss Outdated Show resolved Hide resolved
site/src/pages/RoadmapPage/YearModal.tsx Outdated Show resolved Hide resolved
site/src/pages/RoadmapPage/YearModal.tsx Outdated Show resolved Hide resolved
@Awesome-E Awesome-E requested a review from js0mmer February 14, 2024 17:55
@Awesome-E
Copy link
Member Author

Alright, addressed the remaining comments. Let me know if there's anything else you'd like me to change.

Copy link
Member

@js0mmer js0mmer left a comment

Choose a reason for hiding this comment

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

LGTM! I left a small suggestion on refactoring/renaming variables in the quarterValues function. I will go ahead and give you the approval and leave that up to you if you want to implement (I think the suggested variable names make it a little clearer).

edit: breaking issue with usage of 'summer 1'/'summer 2' instead of 'summer I'/'summer II'

site/src/pages/RoadmapPage/YearModal.tsx Outdated Show resolved Hide resolved
Copy link

Deployed staging instance to https://staging-419.peterportal.org

@Awesome-E
Copy link
Member Author

Testing locally, this still seems to work with editing quarters. @js0mmer I think it'd be good if you verify on staging real quick then if it does go ahead and merge it for me.

@js0mmer
Copy link
Member

js0mmer commented Feb 15, 2024

LGTM!

@js0mmer js0mmer merged commit a2c8843 into master Feb 15, 2024
3 checks passed
@js0mmer js0mmer deleted the year-modal branch February 15, 2024 04:11
@js0mmer js0mmer linked an issue Feb 15, 2024 that may be closed by this pull request
@Awesome-E Awesome-E mentioned this pull request Feb 26, 2024
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment