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

Reorganized the usage of the main element in vocabulary search page #1756

Merged
merged 7 commits into from
Jan 30, 2025

Conversation

joelit
Copy link
Contributor

@joelit joelit commented Jan 29, 2025

Reasons for creating this PR

Vocabulary search page was mis-using the main element, causing there to be a duplicate structure:
image

This could be further refactored by using the values of the pageType variable as the CSS classes for different page styles. PageTypes are:

  • vocab-home
  • vocab-search
  • global-search
  • feedback
  • error
  • about
  • concept
  • landing

This PR makes the following changes:

  • vocabpage -> vocab-home
  • searchpage -> vocab-search
  • termpage -> concept
  • frontpage -> landing
  • feedbackpage -> feedback
  • infopage -> about
  • (searchpage-multi-vocab -> global-search implemented in PR Global Search twig-template #1758)

Description of the changes in this PR

  • Brought the structure of vocabulary search page more in line with vocabulary front page and concept page
  • Removed references to global search page for now

Known problems or uncertainties in this PR

None

Checklist

  • phpUnit tests pass locally with my changes
  • I have added tests that show that the new code works, or tests are not relevant for this PR (e.g. only HTML/CSS changes)
  • The PR doesn't reduce accessibility of the front-end code (e.g. tab focus, scaling to different resolutions, use of .sr-only class, color contrast)
  • The PR doesn't introduce unintended code changes (e.g. empty lines or useless reindentation)

@joelit joelit added this to the 3.0 milestone Jan 29, 2025
@joelit joelit self-assigned this Jan 29, 2025
Copy link

codecov bot commented Jan 29, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.94%. Comparing base (53aa787) to head (e689a69).
Report is 8 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #1756   +/-   ##
=========================================
  Coverage     70.94%   70.94%           
  Complexity     1650     1650           
=========================================
  Files            33       33           
  Lines          4330     4330           
=========================================
  Hits           3072     3072           
  Misses         1258     1258           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@osma osma self-requested a review January 29, 2025 14:36
@joelit
Copy link
Contributor Author

joelit commented Jan 29, 2025

Ok, this contains now the major refactoring of the page type classes. They are all checked against the visual spec. Now, all that remains is to resolve the inevitable conflcts with the responsive layout commits.

@joelit joelit changed the base branch from main to kinow-fix-559 January 29, 2025 16:20
@joelit joelit changed the base branch from kinow-fix-559 to main January 29, 2025 16:21
@joelit joelit force-pushed the fix-searchpage-structure branch from 94f2ade to 149654b Compare January 29, 2025 16:38
@joelit joelit requested a review from osma January 29, 2025 16:40
@joelit joelit mentioned this pull request Jan 30, 2025
4 tasks
@joelit joelit requested a review from osma January 30, 2025 10:39
Copy link
Member

@osma osma left a comment

Choose a reason for hiding this comment

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

LGTM. It's likely that something broke but I couldn't find it :)

@joelit joelit merged commit c433803 into main Jan 30, 2025
13 checks passed
@joelit joelit deleted the fix-searchpage-structure branch January 30, 2025 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Issue/PR closed
Development

Successfully merging this pull request may close these issues.

2 participants