From 79ac113e5f4ef8e96a83354162f4ee374e483067 Mon Sep 17 00:00:00 2001 From: Inkception Date: Fri, 13 Sep 2024 20:34:35 +0200 Subject: [PATCH 1/6] Include Tricolor on social media posts again --- app/social/generators/SchedulesStatus.mjs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/social/generators/SchedulesStatus.mjs b/app/social/generators/SchedulesStatus.mjs index aa2a5d6..ae1cc05 100644 --- a/app/social/generators/SchedulesStatus.mjs +++ b/app/social/generators/SchedulesStatus.mjs @@ -45,9 +45,13 @@ export default class SchedulesStatus extends StatusGenerator `– Pro: ${festProStages[0].name} and ${festProStages[1].name}`, ]; - if(stages.tricolor?.isTricolorActive) { + if(stages.tricolor?.isTricolorActive && stages.tricolor.tricolorStage) { lines.push(`– Tricolor: ${stages.tricolor.tricolorStage.name}`); } + + if(stages.tricolor?.isTricolorActive && stages.tricolor.tricolorStages) { + lines.push(`– Tricolor: ${stages.tricolor.tricolorStages[0].name}`); + } return lines.join('\n'); } From abe0dd1c52ef2c4efebeb47ac03756164f2900d5 Mon Sep 17 00:00:00 2001 From: Inkception Date: Fri, 13 Sep 2024 20:36:28 +0200 Subject: [PATCH 2/6] Display tricolor stage again --- src/components/TricolorBox.vue | 12 +++++++++++- src/components/screenshots/ScreenshotTricolorBox.vue | 10 +++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/components/TricolorBox.vue b/src/components/TricolorBox.vue index 96b01c3..7c9ddc9 100644 --- a/src/components/TricolorBox.vue +++ b/src/components/TricolorBox.vue @@ -34,7 +34,7 @@ -
+
+ +
+
+ +
+
+
diff --git a/src/components/screenshots/ScreenshotTricolorBox.vue b/src/components/screenshots/ScreenshotTricolorBox.vue index 9eaa0c0..b52d961 100644 --- a/src/components/screenshots/ScreenshotTricolorBox.vue +++ b/src/components/screenshots/ScreenshotTricolorBox.vue @@ -33,13 +33,21 @@ -
+
+ +
+ +
From 09098b8c2360e8cb413f24b084c21d2a35be8ab2 Mon Sep 17 00:00:00 2001 From: Inkception Date: Fri, 13 Sep 2024 20:37:02 +0200 Subject: [PATCH 3/6] Add thumbnailImage to all tricolorStage schedules --- src/stores/splatfests.mjs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/stores/splatfests.mjs b/src/stores/splatfests.mjs index 3375d46..7bc0743 100644 --- a/src/stores/splatfests.mjs +++ b/src/stores/splatfests.mjs @@ -65,16 +65,20 @@ function defineSplatfestRegionStore(region) { // Move the thumbnail image to "thumbnailImage" and pull in the high-res image for the stage if (fest.tricolorStage && !fest.tricolorStage.thumbnailImage) { - fest.tricolorStage.thumbnailImage = fest.tricolorStage.image; + fest.tricolorStage.thumbnailImage = fest.tricolorStage.image.url; fest.tricolorStage.image = vsStages.nodes.find(s => s.id === fest.tricolorStage.id)?.originalImage || fest.tricolorStage.image; } + if (fest.tricolorStages) { + fest.tricolorStages.forEach(stage => { if (!stage.thumbnailImage) stage.thumbnailImage = stage.image }); + } + return { ...fest, - isTricolorActive: time.isActive(fest.midtermTime, fest.endTime), - startTime: fest.midtermTime, + isTricolorActive: time.startTime == time.midtermTime ? time.isActive(fest.startTime, fest.endTime) : time.isActive(time.midtermTime), + startTime: time.startTime == time.midtermTime ? fest.startTime : fest.midtermTime, endTime: fest.endTime, }; }); From 49bc0b27c9f78af35c2ec01b3181c1cc87cb0e1a Mon Sep 17 00:00:00 2001 From: Inkception Date: Fri, 13 Sep 2024 20:37:21 +0200 Subject: [PATCH 4/6] Fixed rotations of multiple boxes --- src/views/HomeView.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 0a14cb1..21aaff4 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -15,10 +15,10 @@ From 149f767b2897e109b1b25b4daaa5574f52b556f7 Mon Sep 17 00:00:00 2001 From: Inkception Date: Fri, 13 Sep 2024 20:43:15 +0200 Subject: [PATCH 5/6] Fixed a little oversight for startTime and isTricolorActive --- src/stores/splatfests.mjs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stores/splatfests.mjs b/src/stores/splatfests.mjs index 7bc0743..7db7a0b 100644 --- a/src/stores/splatfests.mjs +++ b/src/stores/splatfests.mjs @@ -72,13 +72,13 @@ function defineSplatfestRegionStore(region) { } if (fest.tricolorStages) { - fest.tricolorStages.forEach(stage => { if (!stage.thumbnailImage) stage.thumbnailImage = stage.image }); + fest.tricolorStages.forEach(stage => stage.thumbnailImage = stage.image); } return { ...fest, - isTricolorActive: time.startTime == time.midtermTime ? time.isActive(fest.startTime, fest.endTime) : time.isActive(time.midtermTime), - startTime: time.startTime == time.midtermTime ? fest.startTime : fest.midtermTime, + isTricolorActive: fest.tricolorStages ? time.isActive(fest.startTime, fest.endTime) : time.isActive(time.midtermTime, time.endTime), + startTime: fest.tricolorStages ? fest.startTime : fest.midtermTime, endTime: fest.endTime, }; }); From 0cd4b5306396a04180b663ddbe7b1637e37505de Mon Sep 17 00:00:00 2001 From: Inkception Date: Fri, 13 Sep 2024 20:55:59 +0200 Subject: [PATCH 6/6] Fix linting issues --- src/components/TricolorBox.vue | 5 ++--- src/components/screenshots/ScreenshotTricolorBox.vue | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/TricolorBox.vue b/src/components/TricolorBox.vue index 7c9ddc9..32c5ef5 100644 --- a/src/components/TricolorBox.vue +++ b/src/components/TricolorBox.vue @@ -34,7 +34,7 @@ -
+
-
+
-
diff --git a/src/components/screenshots/ScreenshotTricolorBox.vue b/src/components/screenshots/ScreenshotTricolorBox.vue index b52d961..920adf9 100644 --- a/src/components/screenshots/ScreenshotTricolorBox.vue +++ b/src/components/screenshots/ScreenshotTricolorBox.vue @@ -33,7 +33,7 @@
-
+
-
+