Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Use correct color for different routes in the default layout #2108

Merged
merged 9 commits into from
Jan 31, 2023
Merged

Use correct color for different routes in the default layout #2108

merged 9 commits into from
Jan 31, 2023

Conversation

obulat
Copy link
Contributor

@obulat obulat commented Jan 30, 2023 •
edited
Loading

Fixes

Fixes #2107 by @obulat

Description

This PR fixes useMatchRoute to not depend on the locale code. With these changes, the locale changes do not revert the layout color to yellow on the search page. Also, the default layout sets the background to yellow if there is a app.nuxt.err to make sure that the Error page stays yellow even after changing the locale, and the path starts with /image/ :)

Testing Instructions

Compare this branch with https://staging.openverse.org (both with with the new_header):

  • Go to the homepage, change the language in the footer, and 1) search for something or 2) go to About page. On staging, the layout stays yellow, and in this branch it is white
  • Go to /image/non-existent: it is white in staging, and yellow in this branch.

Checklist

  • My pull request has a descriptive title (not a vague title like
    Update index.md).
  • My pull request targets the default branch of the repository (main) or
    a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible
    errors.

Developer Certificate of Origin

Developer Certificate of Origin 
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@github-actions
Copy link

github-actions bot commented Jan 30, 2023 •
edited
Loading

Storybook and Tailwind configuration previews: Ready

Storybook: https://wordpress.github.io/openverse-frontend/_preview/2108
Tailwind: https://wordpress.github.io/openverse-frontend/_preview/2108/tailwind

Please note that GitHub pages takes a little time to deploy newly pushed code, if the links above don't work or you see old versions, wait 5 minutes and try again.

You can check the GitHub pages deployment action list to see the current status of the deployments.

@openverse-bot openverse-bot added 🕹 aspect: interface Concerns end-users' experience with the software 🛠 goal: fix Bug fix 🟧 priority: high Stalls work on the project or its dependents labels Jan 30, 2023
@github-actions
Copy link

github-actions bot commented Jan 30, 2023 •
edited
Loading

Size Change: -2.25 kB (0%)

Total Size: 892 kB

Filename Size Change
./.nuxt/dist/client/213.js 0 B -272 B (removed) 🏆
./.nuxt/dist/client/213.modern.js 0 B -276 B (removed) 🏆
./.nuxt/dist/client/214.js 0 B -1.85 kB (removed) 🏆
./.nuxt/dist/client/app.js 145 kB -1.05 kB (-1%)
./.nuxt/dist/client/app.modern.js 120 kB -1.11 kB (-1%)
./.nuxt/dist/client/runtime.js 2.58 kB -42 B (-2%)
./.nuxt/dist/client/runtime.modern.js 2.59 kB -39 B (-1%)
./.nuxt/dist/client/204.js 271 B +271 B (new file) 🆕
./.nuxt/dist/client/204.modern.js 276 B +276 B (new file) 🆕
./.nuxt/dist/client/205.js 1.85 kB +1.85 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./.nuxt/dist/client/commons/app.js 86.7 kB 0 B
./.nuxt/dist/client/commons/app.modern.js 77.4 kB 0 B
./.nuxt/dist/client/components/loading-icon.js 746 B 0 B
./.nuxt/dist/client/components/loading-icon.modern.js 751 B 0 B
./.nuxt/dist/client/components/table-sort-icon.js 508 B 0 B
./.nuxt/dist/client/components/table-sort-icon.modern.js 513 B 0 B
./.nuxt/dist/client/components/v-all-results-grid.js 7.49 kB 0 B
./.nuxt/dist/client/components/v-all-results-grid.modern.js 5.01 kB 0 B
./.nuxt/dist/client/components/v-audio-cell.js 357 B 0 B
./.nuxt/dist/client/components/v-audio-cell.modern.js 361 B 0 B
./.nuxt/dist/client/components/v-audio-details.js 2.54 kB 0 B
./.nuxt/dist/client/components/v-audio-details.modern.js 1.78 kB 0 B
./.nuxt/dist/client/components/v-audio-track-skeleton.js 1.01 kB 0 B
./.nuxt/dist/client/components/v-audio-track-skeleton.modern.js 1.02 kB 0 B
./.nuxt/dist/client/components/v-audio-track.js 5.21 kB 0 B
./.nuxt/dist/client/components/v-audio-track.modern.js 5.16 kB 0 B
./.nuxt/dist/client/components/v-back-to-search-results-link.js 538 B 0 B
./.nuxt/dist/client/components/v-back-to-search-results-link.modern.js 543 B 0 B
./.nuxt/dist/client/components/v-bone.js 684 B 0 B
./.nuxt/dist/client/components/v-bone.modern.js 688 B 0 B
./.nuxt/dist/client/components/v-box-layout.js 1.23 kB 0 B
./.nuxt/dist/client/components/v-box-layout.modern.js 1.23 kB 0 B
./.nuxt/dist/client/components/v-content-link.js 1.11 kB 0 B
./.nuxt/dist/client/components/v-content-link.modern.js 1.09 kB 0 B
./.nuxt/dist/client/components/v-content-page.js 467 B 0 B
./.nuxt/dist/client/components/v-content-page.modern.js 471 B 0 B
./.nuxt/dist/client/components/v-content-report-button.js 776 B 0 B
./.nuxt/dist/client/components/v-content-report-button.modern.js 781 B 0 B
./.nuxt/dist/client/components/v-content-report-form.js 6.09 kB 0 B
./.nuxt/dist/client/components/v-content-report-form.modern.js 3.58 kB 0 B
./.nuxt/dist/client/components/v-content-report-popover.js 1.23 kB 0 B
./.nuxt/dist/client/components/v-content-report-popover.modern.js 4.23 kB 0 B
./.nuxt/dist/client/components/v-copy-button.js 3.99 kB 0 B
./.nuxt/dist/client/components/v-copy-button.modern.js 3.99 kB 0 B
./.nuxt/dist/client/components/v-copy-license.js 1 kB 0 B
./.nuxt/dist/client/components/v-copy-license.modern.js 1 kB 0 B
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/d219393b.js 9.88 kB 0 B
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/d219393b.modern.js 9.86 kB 0 B
./.nuxt/dist/client/components/v-dmca-notice.js 749 B 0 B
./.nuxt/dist/client/components/v-dmca-notice.modern.js 752 B 0 B
./.nuxt/dist/client/components/v-error-image.js 1.69 kB 0 B
./.nuxt/dist/client/components/v-error-image.modern.js 1.68 kB 0 B
./.nuxt/dist/client/components/v-error-section.js 372 B 0 B
./.nuxt/dist/client/components/v-error-section.modern.js 376 B 0 B
./.nuxt/dist/client/components/v-external-search-form.js 1.72 kB 0 B
./.nuxt/dist/client/components/v-external-search-form.modern.js 1.72 kB 0 B
./.nuxt/dist/client/components/v-external-source-list.js 1.15 kB 0 B
./.nuxt/dist/client/components/v-external-source-list.modern.js 1.14 kB 0 B
./.nuxt/dist/client/components/v-full-layout.js 1.59 kB 0 B
./.nuxt/dist/client/components/v-full-layout.modern.js 1.59 kB 0 B
./.nuxt/dist/client/components/v-grid-skeleton.js 1.62 kB 0 B
./.nuxt/dist/client/components/v-grid-skeleton.modern.js 1.62 kB 0 B
./.nuxt/dist/client/components/v-home-gallery.js 4.79 kB 0 B
./.nuxt/dist/client/components/v-home-gallery.modern.js 4.79 kB 0 B
./.nuxt/dist/client/components/v-homepage-content.js 1.73 kB 0 B
./.nuxt/dist/client/components/v-homepage-content.modern.js 1.69 kB 0 B
./.nuxt/dist/client/components/v-image-carousel.js 4.76 kB 0 B
./.nuxt/dist/client/components/v-image-carousel.modern.js 4.74 kB 0 B
./.nuxt/dist/client/components/v-image-cell-square.js 993 B 0 B
./.nuxt/dist/client/components/v-image-cell-square.modern.js 996 B 0 B
./.nuxt/dist/client/components/v-image-cell.js 1.43 kB 0 B
./.nuxt/dist/client/components/v-image-cell.modern.js 1.42 kB 0 B
./.nuxt/dist/client/components/v-image-details.js 2.15 kB 0 B
./.nuxt/dist/client/components/v-image-details.modern.js 1.42 kB 0 B
./.nuxt/dist/client/components/v-image-grid.js 4.88 kB 0 B
./.nuxt/dist/client/components/v-image-grid.modern.js 2.42 kB 0 B
./.nuxt/dist/client/components/v-license-tab-panel.js 521 B 0 B
./.nuxt/dist/client/components/v-license-tab-panel.modern.js 525 B 0 B
./.nuxt/dist/client/components/v-load-more.js 3.16 kB 0 B
./.nuxt/dist/client/components/v-load-more.modern.js 683 B 0 B
./.nuxt/dist/client/components/v-media-license.js 819 B 0 B
./.nuxt/dist/client/components/v-media-license.modern.js 828 B 0 B
./.nuxt/dist/client/components/v-media-reuse.js 1.62 kB 0 B
./.nuxt/dist/client/components/v-media-reuse.modern.js 1.61 kB 0 B
./.nuxt/dist/client/components/v-media-tag.js 428 B 0 B
./.nuxt/dist/client/components/v-media-tag.modern.js 434 B 0 B
./.nuxt/dist/client/components/v-no-results.js 751 B 0 B
./.nuxt/dist/client/components/v-no-results.modern.js 751 B 0 B
./.nuxt/dist/client/components/v-old-homepage-content.js 1.87 kB 0 B
./.nuxt/dist/client/components/v-old-homepage-content.modern.js 1.85 kB 0 B
./.nuxt/dist/client/components/v-radio.js 1.51 kB 0 B
./.nuxt/dist/client/components/v-radio.modern.js 1.47 kB 0 B
./.nuxt/dist/client/components/v-related-audio.js 1.25 kB 0 B
./.nuxt/dist/client/components/v-related-audio.modern.js 1.25 kB 0 B
./.nuxt/dist/client/components/v-related-images.js 1.05 kB 0 B
./.nuxt/dist/client/components/v-related-images.modern.js 2.98 kB 0 B
./.nuxt/dist/client/components/v-report-desc-form.js 965 B 0 B
./.nuxt/dist/client/components/v-report-desc-form.modern.js 969 B 0 B
./.nuxt/dist/client/components/v-row-layout.js 1.7 kB 0 B
./.nuxt/dist/client/components/v-row-layout.modern.js 1.71 kB 0 B
./.nuxt/dist/client/components/v-scroll-button.js 813 B 0 B
./.nuxt/dist/client/components/v-scroll-button.modern.js 819 B 0 B
./.nuxt/dist/client/components/v-search-grid.js 5.54 kB 0 B
./.nuxt/dist/client/components/v-search-grid.modern.js 5.5 kB 0 B
./.nuxt/dist/client/components/v-search-results-title.js 595 B 0 B
./.nuxt/dist/client/components/v-search-results-title.modern.js 598 B 0 B
./.nuxt/dist/client/components/v-search-type-radio.js 791 B 0 B
./.nuxt/dist/client/components/v-search-type-radio.modern.js 769 B 0 B
./.nuxt/dist/client/components/v-server-timeout.js 299 B 0 B
./.nuxt/dist/client/components/v-server-timeout.modern.js 303 B 0 B
./.nuxt/dist/client/components/v-sketch-fab-viewer.js 3.37 kB 0 B
./.nuxt/dist/client/components/v-sketch-fab-viewer.modern.js 895 B 0 B
./.nuxt/dist/client/components/v-skip-to-content-container.js 888 B 0 B
./.nuxt/dist/client/components/v-skip-to-content-container.modern.js 894 B 0 B
./.nuxt/dist/client/components/v-snackbar.js 1.18 kB 0 B
./.nuxt/dist/client/components/v-snackbar.modern.js 1.19 kB 0 B
./.nuxt/dist/client/components/v-sources-table.js 16.6 kB 0 B
./.nuxt/dist/client/components/v-sources-table.modern.js 16.6 kB 0 B
./.nuxt/dist/client/components/v-warning-suppressor.js 299 B 0 B
./.nuxt/dist/client/components/v-warning-suppressor.modern.js 303 B 0 B
./.nuxt/dist/client/pages/about.js 1.51 kB 0 B
./.nuxt/dist/client/pages/about.modern.js 1.51 kB +1 B (0%)
./.nuxt/dist/client/pages/audio/_id/index.js 7.96 kB 0 B
./.nuxt/dist/client/pages/audio/_id/index.modern.js 4.79 kB -1 B (0%)
./.nuxt/dist/client/pages/external-sources.js 1.53 kB 0 B
./.nuxt/dist/client/pages/external-sources.modern.js 1.53 kB 0 B
./.nuxt/dist/client/pages/feedback.js 1.31 kB 0 B
./.nuxt/dist/client/pages/feedback.modern.js 1.31 kB -1 B (0%)
./.nuxt/dist/client/pages/image/_id/index.js 9.26 kB 0 B
./.nuxt/dist/client/pages/image/_id/index.modern.js 7.33 kB -1 B (0%)
./.nuxt/dist/client/pages/image/_id/report.js 3.59 kB -1 B (0%)
./.nuxt/dist/client/pages/image/_id/report.modern.js 4.2 kB -1 B (0%)
./.nuxt/dist/client/pages/index.js 8.63 kB -1 B (0%)
./.nuxt/dist/client/pages/index.modern.js 8.52 kB +1 B (0%)
./.nuxt/dist/client/pages/preferences.js 1.22 kB 0 B
./.nuxt/dist/client/pages/preferences.modern.js 1.21 kB 0 B
./.nuxt/dist/client/pages/privacy.js 983 B 0 B
./.nuxt/dist/client/pages/privacy.modern.js 983 B 0 B
./.nuxt/dist/client/pages/search-help.js 1.61 kB 0 B
./.nuxt/dist/client/pages/search-help.modern.js 1.61 kB +1 B (0%)
./.nuxt/dist/client/pages/search.js 5.1 kB 0 B
./.nuxt/dist/client/pages/search.modern.js 2.6 kB 0 B
./.nuxt/dist/client/pages/search/audio.js 6.14 kB 0 B
./.nuxt/dist/client/pages/search/audio.modern.js 3.65 kB 0 B
./.nuxt/dist/client/pages/search/image.js 659 B 0 B
./.nuxt/dist/client/pages/search/image.modern.js 2.73 kB +1 B (0%)
./.nuxt/dist/client/pages/search/index.js 542 B 0 B
./.nuxt/dist/client/pages/search/index.modern.js 547 B 0 B
./.nuxt/dist/client/pages/search/model-3d.js 243 B 0 B
./.nuxt/dist/client/pages/search/model-3d.modern.js 246 B 0 B
./.nuxt/dist/client/pages/search/search-page.types.js 266 B 0 B
./.nuxt/dist/client/pages/search/search-page.types.modern.js 271 B 0 B
./.nuxt/dist/client/pages/search/video.js 239 B -1 B (0%)
./.nuxt/dist/client/pages/search/video.modern.js 243 B -1 B (0%)
./.nuxt/dist/client/pages/sources.js 1.55 kB 0 B
./.nuxt/dist/client/pages/sources.modern.js 1.54 kB 0 B
./.nuxt/dist/client/vendors/app.js 63.7 kB 0 B
./.nuxt/dist/client/vendors/app.modern.js 63.1 kB 0 B

compressed-size-action

@obulat obulat changed the title Use correct color in default layout routes Use correct color for different routes in the default layout Jan 31, 2023
@obulat obulat marked this pull request as ready for review January 31, 2023 05:54
@obulat obulat requested a review from a team as a code owner January 31, 2023 05:54
@obulat obulat requested review from zackkrida and dhruvkb January 31, 2023 05:54
dhruvkb
dhruvkb approved these changes Jan 31, 2023
View reviewed changes
Copy link
Member

@dhruvkb dhruvkb left a comment

Choose a reason for hiding this comment

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

This is really good. I have some non-blocking suggestions and a note about a comment that might be out-of-sync with the code.

test/playwright/playwright.config.ts Show resolved Hide resolved
src/layouts/default.vue Show resolved Hide resolved
src/composables/use-match-routes.ts Outdated Show resolved Hide resolved
test/playwright/utils/navigation.ts Outdated Show resolved Hide resolved
test/playwright/visual-regression/pages/pages.spec.ts Show resolved Hide resolved
zackkrida
zackkrida approved these changes Jan 31, 2023
View reviewed changes
Copy link
Member

@zackkrida zackkrida left a comment

Choose a reason for hiding this comment

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

LGTM with @dhruvkb's suggestion about the cookie type. Great approach of checking for a nuxt error in the (now named correctly) default layout.

@github-actions
Copy link

Playwright Failure Test Results

It looks like some of the Playwright tests failed. You can download the Playwright trace
output for both Storybook and Nuxt Playwright tests that have failed at the bottom of this
page, under the "Artifacts" section:

https://github.com/WordPress/openverse-frontend/actions/runs/4054156965

Read more about how to use this artifact here: https://github.com/WordPress/openverse-frontend/blob/main/test/playwright/README.md#debugging

@obulat obulat merged commit d2b7573 into main Jan 31, 2023
@obulat obulat deleted the fix/layout_bg branch January 31, 2023 13:14
github-actions bot pushed a commit that referenced this pull request Jan 31, 2023
@openverse-bot
Clean preview for PR #2108
6dc9430
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dhruvkb dhruvkb dhruvkb approved these changes

@zackkrida zackkrida zackkrida approved these changes

Assignees
No one assigned
Labels
🕹 aspect: interface Concerns end-users' experience with the software 🛠 goal: fix Bug fix 🟧 priority: high Stalls work on the project or its dependents
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Yellow background is incorrectly used sometimes
4 participants
@obulat @zackkrida @dhruvkb @openverse-bot