Leahnaya/splatoon3.ink
1
0
Fork 0
mirror of https://github.com/misenhower/splatoon3.ink.git synced 2026-08-20 15:44:15 -05:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'fix/tricolor'

Browse Source
This commit is contained in:
Matt Isenhower
2024-09-13 14:33:24 -07:00
parent 950d86ea7e 0cd4b53063
commit cbb485ff69
5 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

11
src/components/TricolorBox.vue
View File

@@ -34,7 +34,7 @@
</div>
</div>
<div class="flex space-x-1">
<div v-if="tricolor?.tricolorStage" class="flex space-x-1">
<div class="flex-1 relative">
<StageImage
img-class="rounded-xl"
@@ -42,6 +42,15 @@
/>
</div>
</div>
<div v-if="tricolor?.tricolorStages" class="flex space-x-1">
<div class="flex-1 relative">
<StageImage
img-class="rounded-xl"
:stage="tricolor?.tricolorStages?.[0]"
/>
</div>
</div>
</div>
</div>
</ProductContainer>

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

@@ -33,13 +33,21 @@
</div>
</div>
<div class="space-y-8">
<div v-if="tricolor?.tricolorStage" class="space-y-8">
<StageImage
img-class="rounded-2xl"
:stage="tricolor?.tricolorStage"
text-size="text-xl"
/>
</div>
<div v-if="tricolor?.tricolorStages" class="space-y-8">
<StageImage
img-class="rounded-2xl"
:stage="tricolor?.tricolorStages[0]"
text-size="text-xl"
/>
</div>
</div>
</div>
</ProductContainer>

10
src/stores/splatfests.mjs
View File

@@ -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 => stage.thumbnailImage = stage.image);
}
return {
...fest,
isTricolorActive: time.isActive(fest.midtermTime, fest.endTime),
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,
};
});

6
src/views/HomeView.vue
View File

@@ -15,10 +15,10 @@
</template>
<template v-else>
<div class="flex flex-wrap justify-center items-center gap-6">
<SplatfestBox :festival="activeFestivals[0]" class="md:max-w-md 2xl:max-w-lg md:-rotate-1" />
<SplatfestBox :festival="activeFestivals[0]" class="md:max-w-md 2xl:max-w-lg md:rotate-1" />
<ScheduleBox type="splatfestOpen" class="md:max-w-md 2xl:max-w-lg md:-rotate-1" />
<ScheduleBox type="splatfestPro" class="md:max-w-md 2xl:max-w-lg md:-rotate-1" />
<TricolorBox v-if="isTricolorActive" class="md:max-w-md 2xl:max-w-lg md:rotate-1" />
<ScheduleBox type="splatfestPro" class="md:max-w-md 2xl:max-w-lg md:rotate-1" />
<TricolorBox v-if="isTricolorActive" class="md:max-w-md 2xl:max-w-lg md:-rotate-1" />
</div>
</template>
</template>