From 9ae7f330962d21a8fc0508164a6ad7423ab39563 Mon Sep 17 00:00:00 2001
From: Inkception <marvineichler18@gmail.com>
Date: Sun, 27 Oct 2024 02:12:56 +0100
Subject: [PATCH 1/3] Display all `tricolorStages` in TricolorBoxes

---
 src/components/TricolorBox.vue                   | 16 ++++++++++++++--
 .../screenshots/ScreenshotTricolorBox.vue        |  5 ++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/TricolorBox.vue b/src/components/TricolorBox.vue
index 32c5ef5..b4686ec 100644
--- a/src/components/TricolorBox.vue
+++ b/src/components/TricolorBox.vue
@@ -43,14 +43,26 @@
           </div>
         </div>
 
-        <div v-if="tricolor?.tricolorStages" class="flex space-x-1">
-          <div class="flex-1 relative">
+        <div v-if="tricolor?.tricolorStages">
+          <div v-if="tricolor?.tricolorStages.length == 1" class="flex space-x-1">
             <StageImage
               img-class="rounded-xl"
               :stage="tricolor?.tricolorStages?.[0]"
             />
           </div>
+          
+          <div v-else class="flex space-x-1">
+            <StageImage
+              img-class="rounded-l-xl"
+              :stage="tricolor?.tricolorStages?.[0]"
+            />
+            <StageImage
+              img-class="rounded-r-xl"
+              :stage="tricolor?.tricolorStages?.[1]"
+            />
+          </div>
         </div>
+
       </div>
     </div>
   </ProductContainer>
diff --git a/src/components/screenshots/ScreenshotTricolorBox.vue b/src/components/screenshots/ScreenshotTricolorBox.vue
index 920adf9..a383be5 100644
--- a/src/components/screenshots/ScreenshotTricolorBox.vue
+++ b/src/components/screenshots/ScreenshotTricolorBox.vue
@@ -43,8 +43,11 @@
 
         <div v-if="tricolor?.tricolorStages" class="space-y-8">
           <StageImage
+            v-for="tricolorStage in tricolor.tricolorStages"
+            :key="tricolorStage.id"
+            class="flex-1"
             img-class="rounded-2xl"
-            :stage="tricolor?.tricolorStages[0]"
+            :stage="tricolorStage"
             text-size="text-xl"
           />
         </div>

From 18f19a84b8dbe983179b7715ab750e317ad1b9c0 Mon Sep 17 00:00:00 2001
From: Inkception <marvineichler18@gmail.com>
Date: Sun, 27 Oct 2024 02:59:36 +0100
Subject: [PATCH 2/3] Add second tricolorStage to social posts

---
 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 bf42771..7c87d1e 100644
--- a/app/social/generators/SchedulesStatus.mjs
+++ b/app/social/generators/SchedulesStatus.mjs
@@ -50,7 +50,11 @@ export default class SchedulesStatus extends StatusGenerator
       }
 
       if(stages.tricolor?.isTricolorActive && stages.tricolor.tricolorStages) {
-        lines.push(`– Tricolor: ${stages.tricolor.tricolorStages[0].name}`);
+        if(stages.tricolor.tricolorStages.length == 1) {
+          lines.push(`– Tricolor: ${stages.tricolor.tricolorStages[0].name}`);
+        } else {
+          lines.push(`– Tricolor: ${stages.tricolor.tricolorStages[0].name} and ${stages.tricolor.tricolorStages[1].name}`);
+        }
       }
       return lines.join('\n');
 

From 3cce45f7eff6213e4f2028b8ceb518139e92daf0 Mon Sep 17 00:00:00 2001
From: Inkception <marvineichler18@gmail.com>
Date: Sun, 27 Oct 2024 03:08:37 +0100
Subject: [PATCH 3/3] Revert 149f767

---
 src/stores/splatfests.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/stores/splatfests.mjs b/src/stores/splatfests.mjs
index 7db7a0b..565004e 100644
--- a/src/stores/splatfests.mjs
+++ b/src/stores/splatfests.mjs
@@ -77,8 +77,8 @@ function defineSplatfestRegionStore(region) {
 
       return {
         ...fest,
-        isTricolorActive: fest.tricolorStages ? time.isActive(fest.startTime, fest.endTime) : time.isActive(time.midtermTime, time.endTime),
-        startTime: fest.tricolorStages ? fest.startTime : fest.midtermTime,
+        isTricolorActive: time.isActive(fest.midtermTime, fest.endTime),
+        startTime: fest.midtermTime,
         endTime: fest.endTime,
       };
     });