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.

Sign up for GitHub

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

Jump to bottom

Replace require with import for error section images #2614

Merged
merged 10 commits into from
Jul 12, 2023
Merged

Replace require with import for error section images #2614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e045d94
Remove src:error_images on frontend/src/components/VErrorSection/VEr…
viktoriussuwandi Jul 11, 2023
670c94b
Rename frontend/src/assets/error_images/image_info.json to frontend/s…
viktoriussuwandi Jul 11, 2023
1a74036
Update frontend/src/components/VErrorSection/VErrorImage.vue
viktoriussuwandi Jul 11, 2023
eef95e0
Move assets/error_images.json to /static folder
viktoriussuwandi Jul 11, 2023
3990ff7
Move back file error_images.json from folder frontend/static/assets/ …
viktoriussuwandi Jul 11, 2023
248de57
Update imageInfo on file frontend/src/components/VErrorSection/VError…
viktoriussuwandi Jul 11, 2023
77a45d0
move frontend/src/assets/error_images/ to frontend/src/static/
viktoriussuwandi Jul 11, 2023
01f6fe8
Merge branch 'main' into issue#2607
viktoriussuwandi Jul 11, 2023
287c717
Merge branch 'WordPress:main' into issue#2607
viktoriussuwandi Jul 12, 2023
2ed705e
Rename frontend/assets/image_info.json to frontend/src/assets/error_i…
viktoriussuwandi Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...d/src/assets/error_images/image_info.json → frontend/src/assets/error_images.json
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions frontend/src/components/VErrorSection/VErrorImage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import type { ErrorCode } from "~/constants/errors"
import { AttributableMedia, getAttribution } from "~/utils/attribution-html"
import { useI18n } from "~/composables/use-i18n"

import imageInfo from "~/assets/error_images/image_info.json"
import imageInfo from "~/assets/error_images.json"

interface ErrorImage extends AttributableMedia {
src: string
Expand Down Expand Up @@ -51,7 +51,7 @@ export default defineComponent({
const errorImage: ErrorImage = {
...image,
originalTitle: image.title,
src: require(`~/assets/error_images/${image.file}.jpg`),
src: `/error_images/${image.file}.jpg`,
alt: `errorImages.${image.id}`,
license: image.license as License,
license_version: image.license_version as LicenseVersion,
Expand Down
0 ...ssets/error_images/depressed_musician.jpg → ...tatic/error_images/depressed_musician.jpg
View file
Open in desktop
File renamed without changes
0 ...ssets/error_images/waiting_for_a_bite.jpg → ...tatic/error_images/waiting_for_a_bite.jpg
View file
Open in desktop
File renamed without changes