Leahnaya/splatoon3.ink
1
0
Fork 0
mirror of https://github.com/misenhower/splatoon3.ink.git synced 2026-07-19 17:34:09 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #82 from Inkception/main

Browse Source 
Display missing `tricolorStages` in TricolorBoxes
This commit is contained in:
Matt Isenhower 2024-10-26 22:36:21 -07:00 committed by GitHub
commit f1a6099f02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/social/generators/SchedulesStatus.mjs
View File

@ -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');

16
src/components/TricolorBox.vue
View File

@ -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>

5
src/components/screenshots/ScreenshotTricolorBox.vue
View File

@ -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>

4
src/stores/splatfests.mjs
View File

@ -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,
};
});