From 7408ce82a54994ce6715e1c1a3577ca377a653d7 Mon Sep 17 00:00:00 2001 From: Matiboux Date: Wed, 12 Jun 2024 15:42:42 +0200 Subject: [PATCH 1/4] Move discord logos to public dir --- app/{src => public}/assets/2021-discord-logo.png | Bin app/{src => public}/assets/2023-discord-logo.webp | Bin app/{src => public}/assets/2027-discord-logo.png | Bin app/{src => public}/assets/2028-discord-logo.png | Bin app/{src => public}/assets/2029-discord-logo.png | Bin 5 files changed, 0 insertions(+), 0 deletions(-) rename app/{src => public}/assets/2021-discord-logo.png (100%) rename app/{src => public}/assets/2023-discord-logo.webp (100%) rename app/{src => public}/assets/2027-discord-logo.png (100%) rename app/{src => public}/assets/2028-discord-logo.png (100%) rename app/{src => public}/assets/2029-discord-logo.png (100%) diff --git a/app/src/assets/2021-discord-logo.png b/app/public/assets/2021-discord-logo.png similarity index 100% rename from app/src/assets/2021-discord-logo.png rename to app/public/assets/2021-discord-logo.png diff --git a/app/src/assets/2023-discord-logo.webp b/app/public/assets/2023-discord-logo.webp similarity index 100% rename from app/src/assets/2023-discord-logo.webp rename to app/public/assets/2023-discord-logo.webp diff --git a/app/src/assets/2027-discord-logo.png b/app/public/assets/2027-discord-logo.png similarity index 100% rename from app/src/assets/2027-discord-logo.png rename to app/public/assets/2027-discord-logo.png diff --git a/app/src/assets/2028-discord-logo.png b/app/public/assets/2028-discord-logo.png similarity index 100% rename from app/src/assets/2028-discord-logo.png rename to app/public/assets/2028-discord-logo.png diff --git a/app/src/assets/2029-discord-logo.png b/app/public/assets/2029-discord-logo.png similarity index 100% rename from app/src/assets/2029-discord-logo.png rename to app/public/assets/2029-discord-logo.png From 8b96dbf97666c8f84e26126eaaeca2b21eb2bb6f Mon Sep 17 00:00:00 2001 From: Matiboux Date: Wed, 12 Jun 2024 15:43:21 +0200 Subject: [PATCH 2/4] Update url path to discord logos --- app/src/data/2021.yml | 2 +- app/src/data/2023.yml | 2 +- app/src/data/2027.yml | 2 +- app/src/data/2028.yml | 2 +- app/src/data/2029.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/data/2021.yml b/app/src/data/2021.yml index 80b6da7..724e619 100644 --- a/app/src/data/2021.yml +++ b/app/src/data/2021.yml @@ -4,7 +4,7 @@ icon: icon-[fa-brands--discord] href: https://discordapp.com/invite/WbhavjX class: tile-wide - background_image: /src/assets/2021-discord-logo.png + background_image: /assets/2021-discord-logo.png style: - 'background-color: #202225' diff --git a/app/src/data/2023.yml b/app/src/data/2023.yml index bd6fd98..3a2c0ea 100644 --- a/app/src/data/2023.yml +++ b/app/src/data/2023.yml @@ -4,7 +4,7 @@ icon: icon-[fa-brands--discord] href: https://discordapp.com/invite/r3vn4U6 class: tile-wide - background_image: /src/assets/2023-discord-logo.webp + background_image: /assets/2023-discord-logo.webp style: - 'background-color: #202225' diff --git a/app/src/data/2027.yml b/app/src/data/2027.yml index 98ba337..ef5a4b7 100644 --- a/app/src/data/2027.yml +++ b/app/src/data/2027.yml @@ -4,7 +4,7 @@ icon: icon-[fa-brands--discord] href: https://discord.gg/3ZJDy7h9pY class: tile-wide - background_image: /src/assets/2027-discord-logo.png + background_image: /assets/2027-discord-logo.png style: - 'background-color: #202225' diff --git a/app/src/data/2028.yml b/app/src/data/2028.yml index b57a3d0..a903bb1 100644 --- a/app/src/data/2028.yml +++ b/app/src/data/2028.yml @@ -4,7 +4,7 @@ icon: icon-[fa-brands--discord] href: https://discord.gg/AbqK9R2mPW class: tile-wide - background_image: /src/assets/2028-discord-logo.png + background_image: /assets/2028-discord-logo.png style: - 'background-color: #202225' diff --git a/app/src/data/2029.yml b/app/src/data/2029.yml index 7bb2308..2f88879 100644 --- a/app/src/data/2029.yml +++ b/app/src/data/2029.yml @@ -4,7 +4,7 @@ icon: icon-[fa-brands--discord] href: https://discord.gg/EuXuGTxyc8 class: tile-wide - background_image: /src/assets/2029-discord-logo.png + background_image: /assets/2029-discord-logo.png style: - 'background-color: #202225' From a9e033d425d95f892946f1759c4e9ddbc8a52689 Mon Sep 17 00:00:00 2001 From: Matiboux Date: Wed, 12 Jun 2024 15:57:34 +0200 Subject: [PATCH 3/4] Update backgroundImage value parsing --- app/src/components/GridLoader.astro | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/components/GridLoader.astro b/app/src/components/GridLoader.astro index c6c5bcc..6e9915a 100644 --- a/app/src/components/GridLoader.astro +++ b/app/src/components/GridLoader.astro @@ -36,13 +36,21 @@ async function prepareItems(items: any) return src } - if (src.startsWith('http:') || src.startsWith('https:') || src.startsWith('data:')) + if ( + src.startsWith('http:') || + src.startsWith('https:') || + src.startsWith('data:') || + src.startsWith('.') || + src.startsWith('/') + ) { return `url(${encodeURI(src)})` } - if (src.startsWith('.') || src.startsWith('/')) + if (src.startsWith('~')) { + src = `/src${src.slice(1)}` + try { // Try to import local file From bf3c64004d7e7405e4558e0fc90eddd25b3d6bce Mon Sep 17 00:00:00 2001 From: Matiboux Date: Wed, 12 Jun 2024 15:58:32 +0200 Subject: [PATCH 4/4] Update url path to discord logos in archive --- app/src/data/archive.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/data/archive.yml b/app/src/data/archive.yml index 0a5ecb2..be156e4 100644 --- a/app/src/data/archive.yml +++ b/app/src/data/archive.yml @@ -4,7 +4,7 @@ - name: 2021 relurl: /2021 class: tile-medium - background_image: /src/assets/2021-discord-logo.webp + background_image: /assets/2021-discord-logo.png style: - 'background-color: #202225' @@ -18,7 +18,7 @@ - name: 2023 relurl: /2023 class: tile-medium - background_image: /src/assets/2023-discord-logo.webp + background_image: /assets/2023-discord-logo.webp style: - 'background-color: #202225'