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

Refactor: Enrollment index #1502

Merged
merged 7 commits into from Jul 10, 2023
Merged

Refactor: Enrollment index #1502

merged 7 commits into from Jul 10, 2023

Conversation

thekaveman
Copy link
Member

@thekaveman thekaveman commented Jul 8, 2023

Closes #1479
Closes #1480 (copy)

Does not change how the sign out button works - this was getting a little more complicated and I didn't want to block this PR any longer. Plus that may depend on what happens in #1508.

@github-actions github-actions bot added i18n Copy: Language files or Django i18n framework back-end Django views, sessions, middleware, models, migrations etc. tests Related to automated testing (unit, UI, integration, etc.) front-end HTML/CSS/JavaScript and Django templates labels Jul 8, 2023
@thekaveman thekaveman added this to the Veterans milestone Jul 10, 2023
Base automatically changed from refactor/eligibility-start to dev July 10, 2023 18:58
@thekaveman thekaveman marked this pull request as ready for review July 10, 2023 21:19
@thekaveman thekaveman requested a review from a team as a code owner July 10, 2023 21:19
@thekaveman thekaveman force-pushed the refactor/enrollment-index branch 2 times, most recently from fb29378 to eb7d759 Compare July 10, 2023 21:28
@machikoyasuda
Copy link
Member

🔥🔥🔥
image

@thekaveman thekaveman force-pushed the refactor/enrollment-index branch 2 times, most recently from 6f1d5c0 to 6103572 Compare July 10, 2023 21:45
@machikoyasuda
Copy link
Member

machikoyasuda commented Jul 10, 2023

This is not something I think we should change in this PR or any of the subsequent copy PRs, but I wanted to note this:
image

The Media Item parent container width looks a bit too wide now. Not sure if this is a change in Figma, copy or what. It's something we can look into at the very very very end with @srhhnry once we finish everything else first -- after all the Modal links are in, I think.

machikoyasuda
machikoyasuda previously approved these changes Jul 10, 2023
Copy link
Member

@angela-tran angela-tran left a comment

Choose a reason for hiding this comment

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

These code changes look good to me. I'm seeing something weird with the loading_text though. Not sure if it's just me or what might be happening there.

benefits/enrollment/templates/enrollment/index.html Outdated Show resolved Hide resolved
otherwise variable is not available
@thekaveman
Copy link
Member Author

Thanks for that find @angela-tran! I think it is because the variables aren't available outside of the {% block %} tags.

In 3f8017e I moved the extra translate to within the button block.

Copy link
Member

@angela-tran angela-tran left a comment

Choose a reason for hiding this comment

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

🙌

@thekaveman thekaveman merged commit 25b91b1 into dev Jul 10, 2023
11 checks passed
@thekaveman thekaveman deleted the refactor/enrollment-index branch July 10, 2023 23:33
@thekaveman thekaveman mentioned this pull request Jul 11, 2023
20 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
back-end Django views, sessions, middleware, models, migrations etc. front-end HTML/CSS/JavaScript and Django templates i18n Copy: Language files or Django i18n framework tests Related to automated testing (unit, UI, integration, etc.)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enrollment Index - Update copy (All flows) Enrollment Index - Remove media item (All flows)
3 participants