From 221052622208f6f182e3f737015e92f1098e891c Mon Sep 17 00:00:00 2001 From: Made Baruna Date: Fri, 19 Mar 2021 02:42:30 +0800 Subject: [PATCH] Fix banner image --- src/data/banners.js | 25 ++++++++++++++++++ src/routes/wish/[id].svelte | 2 +- ...1-01-12.png => Adrift in the Harbor 1.png} | Bin ...2020-09-28.png => Ballad in Goblets 1.png} | Bin ...2021-03-17.png => Ballad in Goblets 2.png} | Bin ...h 2000-01-01.png => Beginners' Wish 1.png} | Bin ...2021-02-17.png => Dance of Lanterns 1.png} | Bin ...020-09-28.png => Epitome Invocation 1.png} | Bin ...020-10-20.png => Epitome Invocation 2.png} | Bin ...020-11-11.png => Epitome Invocation 3.png} | Bin ...020-12-01.png => Epitome Invocation 4.png} | Bin ...020-12-23.png => Epitome Invocation 5.png} | Bin ...021-01-12.png => Epitome Invocation 6.png} | Bin ...021-02-03.png => Epitome Invocation 7.png} | Bin ...021-02-23.png => Epitome Invocation 8.png} | Bin ...021-03-17.png => Epitome Invocation 9.png} | Bin ...-11-11.png => Farewell of Snezhnaya 1.png} | Bin ...20-12-01.png => Gentry of Hermitage 1.png} | Bin ...3.png => Invitation to Mundane Life 1.png} | Bin ...m 2021-03-02.png => Moment of Bloom 1.png} | Bin ...20-12-23.png => Secretum Secretorum 1.png} | Bin ...s 2020-10-20.png => Sparkling Steps 1.png} | Bin ...-01-01.png => Wanderlust Invocation 1.png} | Bin 23 files changed, 26 insertions(+), 1 deletion(-) rename static/images/banners/{Adrift in the Harbor 2021-01-12.png => Adrift in the Harbor 1.png} (100%) rename static/images/banners/{Ballad in Goblets 2020-09-28.png => Ballad in Goblets 1.png} (100%) rename static/images/banners/{Ballad in Goblets 2021-03-17.png => Ballad in Goblets 2.png} (100%) rename static/images/banners/{Beginners' Wish 2000-01-01.png => Beginners' Wish 1.png} (100%) rename static/images/banners/{Dance of Lanterns 2021-02-17.png => Dance of Lanterns 1.png} (100%) rename static/images/banners/{Epitome Invocation 2020-09-28.png => Epitome Invocation 1.png} (100%) rename static/images/banners/{Epitome Invocation 2020-10-20.png => Epitome Invocation 2.png} (100%) rename static/images/banners/{Epitome Invocation 2020-11-11.png => Epitome Invocation 3.png} (100%) rename static/images/banners/{Epitome Invocation 2020-12-01.png => Epitome Invocation 4.png} (100%) rename static/images/banners/{Epitome Invocation 2020-12-23.png => Epitome Invocation 5.png} (100%) rename static/images/banners/{Epitome Invocation 2021-01-12.png => Epitome Invocation 6.png} (100%) rename static/images/banners/{Epitome Invocation 2021-02-03.png => Epitome Invocation 7.png} (100%) rename static/images/banners/{Epitome Invocation 2021-02-23.png => Epitome Invocation 8.png} (100%) rename static/images/banners/{Epitome Invocation 2021-03-17.png => Epitome Invocation 9.png} (100%) rename static/images/banners/{Farewell of Snezhnaya 2020-11-11.png => Farewell of Snezhnaya 1.png} (100%) rename static/images/banners/{Gentry of Hermitage 2020-12-01.png => Gentry of Hermitage 1.png} (100%) rename static/images/banners/{Invitation to Mundane Life 2021-02-03.png => Invitation to Mundane Life 1.png} (100%) rename static/images/banners/{Moment of Bloom 2021-03-02.png => Moment of Bloom 1.png} (100%) rename static/images/banners/{Secretum Secretorum 2020-12-23.png => Secretum Secretorum 1.png} (100%) rename static/images/banners/{Sparkling Steps 2020-10-20.png => Sparkling Steps 1.png} (100%) rename static/images/banners/{Wanderlust Invocation 2000-01-01.png => Wanderlust Invocation 1.png} (100%) diff --git a/src/data/banners.js b/src/data/banners.js index fc1e628e..b988528b 100644 --- a/src/data/banners.js +++ b/src/data/banners.js @@ -2,20 +2,27 @@ export const banners = { beginners: [ { name: "Beginners' Wish", + shortName: 'Beginners\' Wish', + image: 1, start: '2000-01-01 00:00:00', end: '2200-01-01 00:00:00', + color: '#FFFFFF', }, ], standard: [ { name: 'Wanderlust Invocation', + shortName: 'Wanderlust Invocation', + image: 1, start: '2000-01-01 00:00:00', end: '2200-01-01 00:00:00', + color: '#FFFFFF', }, ], characters: [ { name: 'Ballad in Goblets', + image: 1, shortName: 'Venti', start: '2020-09-28 00:00:00', end: '2020-10-18 18:00:00', @@ -23,6 +30,7 @@ export const banners = { }, { name: 'Sparkling Steps', + image: 1, shortName: 'Klee', start: '2020-10-20 18:00:00', end: '2020-11-10 18:00:00', @@ -30,6 +38,7 @@ export const banners = { }, { name: 'Farewell of Snezhnaya', + image: 1, shortName: 'Tartaglia', start: '2020-11-11 06:00:00', end: '2020-12-01 18:00:00', @@ -37,6 +46,7 @@ export const banners = { }, { name: 'Gentry of Hermitage', + image: 1, shortName: 'Zhongli', start: '2020-12-01 18:00:00', end: '2020-12-22 15:00:00', @@ -44,6 +54,7 @@ export const banners = { }, { name: 'Secretum Secretorum', + image: 1, shortName: 'Albedo', start: '2020-12-23 10:00:00', end: '2021-01-12 16:00:00', @@ -51,6 +62,7 @@ export const banners = { }, { name: 'Adrift in the Harbor', + image: 1, shortName: 'Ganyu', start: '2021-01-12 18:00:00', end: '2021-02-02 15:00:00', @@ -58,6 +70,7 @@ export const banners = { }, { name: 'Invitation to Mundane Life', + image: 1, shortName: 'Xiao', start: '2021-02-03 06:00:00', end: '2021-02-17 16:00:00', @@ -65,6 +78,7 @@ export const banners = { }, { name: 'Dance of Lanterns', + image: 1, shortName: 'Keqing', start: '2021-02-17 18:00:00', end: '2021-03-02 16:00:00', @@ -72,6 +86,7 @@ export const banners = { }, { name: 'Moment of Bloom', + image: 1, shortName: 'Hu Tao', start: '2021-03-02 18:00:00', end: '2021-03-16 15:00:00', @@ -79,6 +94,7 @@ export const banners = { }, { name: 'Ballad in Goblets', + image: 2, shortName: 'Venti', start: '2021-03-17 06:00:00', end: '2021-04-06 16:00:00', @@ -88,6 +104,7 @@ export const banners = { weapons: [ { name: 'Epitome Invocation', + image: 1, start: '2020-09-28 00:00:00', end: '2020-10-18 18:00:00', shortName: 'Amos', @@ -95,6 +112,7 @@ export const banners = { }, { name: 'Epitome Invocation', + image: 2, start: '2020-10-20 18:00:00', end: '2020-11-10 18:00:00', shortName: 'WGS', @@ -102,6 +120,7 @@ export const banners = { }, { name: 'Epitome Invocation', + image: 3, start: '2020-11-11 06:00:00', end: '2020-12-01 18:00:00', shortName: 'Skyward', @@ -109,6 +128,7 @@ export const banners = { }, { name: 'Epitome Invocation', + image: 4, start: '2020-12-01 18:00:00', end: '2020-12-22 15:00:00', shortName: 'Vortex', @@ -116,6 +136,7 @@ export const banners = { }, { name: 'Epitome Invocation', + image: 5, start: '2020-12-23 10:00:00', end: '2021-01-12 16:00:00', shortName: 'Summit', @@ -123,6 +144,7 @@ export const banners = { }, { name: 'Epitome Invocation', + image: 6, start: '2021-01-12 18:00:00', end: '2021-02-02 15:00:00', shortName: 'Amos', @@ -130,6 +152,7 @@ export const banners = { }, { name: 'Epitome Invocation', + image: 7, start: '2021-02-03 06:00:00', end: '2021-02-23 16:00:00', shortName: 'Primordial', @@ -137,6 +160,7 @@ export const banners = { }, { name: 'Epitome Invocation', + image: 8, start: '2021-02-23 18:00:00', end: '2021-03-16 15:00:00', shortName: 'Homa', @@ -144,6 +168,7 @@ export const banners = { }, { name: 'Epitome Invocation', + image: 9, start: '2021-03-17 06:00:00', end: '2021-04-06 16:00:00', shortName: 'Elegy', diff --git a/src/routes/wish/[id].svelte b/src/routes/wish/[id].svelte index 192cabbb..58823312 100644 --- a/src/routes/wish/[id].svelte +++ b/src/routes/wish/[id].svelte @@ -67,7 +67,7 @@ const start = dayjs(e.start, 'YYYY-MM-DD HH:mm:ss').subtract(diff, 'hour'); const end = dayjs(e.end, 'YYYY-MM-DD HH:mm:ss').subtract(diff, 'hour'); - const image = `/images/banners/${e.name} ${start.format('YYYY-MM-DD')}.png`; + const image = `/images/banners/${e.name} ${e.image}.png`; return { ...e, diff --git a/static/images/banners/Adrift in the Harbor 2021-01-12.png b/static/images/banners/Adrift in the Harbor 1.png similarity index 100% rename from static/images/banners/Adrift in the Harbor 2021-01-12.png rename to static/images/banners/Adrift in the Harbor 1.png diff --git a/static/images/banners/Ballad in Goblets 2020-09-28.png b/static/images/banners/Ballad in Goblets 1.png similarity index 100% rename from static/images/banners/Ballad in Goblets 2020-09-28.png rename to static/images/banners/Ballad in Goblets 1.png diff --git a/static/images/banners/Ballad in Goblets 2021-03-17.png b/static/images/banners/Ballad in Goblets 2.png similarity index 100% rename from static/images/banners/Ballad in Goblets 2021-03-17.png rename to static/images/banners/Ballad in Goblets 2.png diff --git a/static/images/banners/Beginners' Wish 2000-01-01.png b/static/images/banners/Beginners' Wish 1.png similarity index 100% rename from static/images/banners/Beginners' Wish 2000-01-01.png rename to static/images/banners/Beginners' Wish 1.png diff --git a/static/images/banners/Dance of Lanterns 2021-02-17.png b/static/images/banners/Dance of Lanterns 1.png similarity index 100% rename from static/images/banners/Dance of Lanterns 2021-02-17.png rename to static/images/banners/Dance of Lanterns 1.png diff --git a/static/images/banners/Epitome Invocation 2020-09-28.png b/static/images/banners/Epitome Invocation 1.png similarity index 100% rename from static/images/banners/Epitome Invocation 2020-09-28.png rename to static/images/banners/Epitome Invocation 1.png diff --git a/static/images/banners/Epitome Invocation 2020-10-20.png b/static/images/banners/Epitome Invocation 2.png similarity index 100% rename from static/images/banners/Epitome Invocation 2020-10-20.png rename to static/images/banners/Epitome Invocation 2.png diff --git a/static/images/banners/Epitome Invocation 2020-11-11.png b/static/images/banners/Epitome Invocation 3.png similarity index 100% rename from static/images/banners/Epitome Invocation 2020-11-11.png rename to static/images/banners/Epitome Invocation 3.png diff --git a/static/images/banners/Epitome Invocation 2020-12-01.png b/static/images/banners/Epitome Invocation 4.png similarity index 100% rename from static/images/banners/Epitome Invocation 2020-12-01.png rename to static/images/banners/Epitome Invocation 4.png diff --git a/static/images/banners/Epitome Invocation 2020-12-23.png b/static/images/banners/Epitome Invocation 5.png similarity index 100% rename from static/images/banners/Epitome Invocation 2020-12-23.png rename to static/images/banners/Epitome Invocation 5.png diff --git a/static/images/banners/Epitome Invocation 2021-01-12.png b/static/images/banners/Epitome Invocation 6.png similarity index 100% rename from static/images/banners/Epitome Invocation 2021-01-12.png rename to static/images/banners/Epitome Invocation 6.png diff --git a/static/images/banners/Epitome Invocation 2021-02-03.png b/static/images/banners/Epitome Invocation 7.png similarity index 100% rename from static/images/banners/Epitome Invocation 2021-02-03.png rename to static/images/banners/Epitome Invocation 7.png diff --git a/static/images/banners/Epitome Invocation 2021-02-23.png b/static/images/banners/Epitome Invocation 8.png similarity index 100% rename from static/images/banners/Epitome Invocation 2021-02-23.png rename to static/images/banners/Epitome Invocation 8.png diff --git a/static/images/banners/Epitome Invocation 2021-03-17.png b/static/images/banners/Epitome Invocation 9.png similarity index 100% rename from static/images/banners/Epitome Invocation 2021-03-17.png rename to static/images/banners/Epitome Invocation 9.png diff --git a/static/images/banners/Farewell of Snezhnaya 2020-11-11.png b/static/images/banners/Farewell of Snezhnaya 1.png similarity index 100% rename from static/images/banners/Farewell of Snezhnaya 2020-11-11.png rename to static/images/banners/Farewell of Snezhnaya 1.png diff --git a/static/images/banners/Gentry of Hermitage 2020-12-01.png b/static/images/banners/Gentry of Hermitage 1.png similarity index 100% rename from static/images/banners/Gentry of Hermitage 2020-12-01.png rename to static/images/banners/Gentry of Hermitage 1.png diff --git a/static/images/banners/Invitation to Mundane Life 2021-02-03.png b/static/images/banners/Invitation to Mundane Life 1.png similarity index 100% rename from static/images/banners/Invitation to Mundane Life 2021-02-03.png rename to static/images/banners/Invitation to Mundane Life 1.png diff --git a/static/images/banners/Moment of Bloom 2021-03-02.png b/static/images/banners/Moment of Bloom 1.png similarity index 100% rename from static/images/banners/Moment of Bloom 2021-03-02.png rename to static/images/banners/Moment of Bloom 1.png diff --git a/static/images/banners/Secretum Secretorum 2020-12-23.png b/static/images/banners/Secretum Secretorum 1.png similarity index 100% rename from static/images/banners/Secretum Secretorum 2020-12-23.png rename to static/images/banners/Secretum Secretorum 1.png diff --git a/static/images/banners/Sparkling Steps 2020-10-20.png b/static/images/banners/Sparkling Steps 1.png similarity index 100% rename from static/images/banners/Sparkling Steps 2020-10-20.png rename to static/images/banners/Sparkling Steps 1.png diff --git a/static/images/banners/Wanderlust Invocation 2000-01-01.png b/static/images/banners/Wanderlust Invocation 1.png similarity index 100% rename from static/images/banners/Wanderlust Invocation 2000-01-01.png rename to static/images/banners/Wanderlust Invocation 1.png