-
+
+
+
+
+
+
+
+ Current Shifty Stations
+
+
+
+
@@ -33,15 +51,17 @@ import { mapGetters } from 'vuex';
import Wrapper from '@/web/components/screenshots/Wrapper.vue';
import ScheduleBox from './ScheduleBox.vue';
import SplatfestBox from '@/web/components/splatoon/SplatfestBox.vue';
+import Stage from '@/web/components/splatoon/Stage.vue';
export default {
- components: { Wrapper, ScheduleBox, SplatfestBox },
+ components: { Wrapper, ScheduleBox, SplatfestBox, Stage },
computed: {
...mapGetters('splatoon/splatfests', {
'currentSplatfestNA': 'na/currentSplatfest',
'currentSplatfestEU': 'eu/currentSplatfest',
'currentSplatfestJP': 'jp/currentSplatfest',
}),
+ ...mapGetters('splatoon/finalFest', { shiftySchedule: 'activeSchedule' }),
globalSplatfestIsActiveInAllRegions() {
// Do we have a Splatfest in each region?
if (!this.currentSplatfestNA || !this.currentSplatfestEU || !this.currentSplatfestJP)
diff --git a/src/web/components/splatoon/FinalFestDialog.vue b/src/web/components/splatoon/FinalFestDialog.vue
index 85e6ea3..56b7ded 100644
--- a/src/web/components/splatoon/FinalFestDialog.vue
+++ b/src/web/components/splatoon/FinalFestDialog.vue
@@ -71,7 +71,7 @@ export default {
props: ['region'],
computed: {
...mapGetters('splatoon', ['now']),
- ...mapGetters('splatoon/finalFest', ['schedules']),
+ ...mapGetters('splatoon/finalFest', { schedules: 'currentSchedules' }),
allSchedules() {
return this.schedules.map(schedule => ({
@@ -81,14 +81,9 @@ export default {
}));
},
- currentSchedules() {
- if (this.now && this.allSchedules)
- return this.allSchedules.filter(s => s.end_time > this.now);
- },
-
- first() { return this.currentSchedules && this.currentSchedules[0]; },
- second() { return this.currentSchedules && this.currentSchedules[1]; },
- others() { return this.currentSchedules && this.currentSchedules.slice(2); },
+ first() { return this.allSchedules && this.allSchedules[0]; },
+ second() { return this.allSchedules && this.allSchedules[1]; },
+ others() { return this.allSchedules && this.allSchedules.slice(2); },
},
};
diff --git a/src/web/store/splatoon/finalFest.js b/src/web/store/splatoon/finalFest.js
index 959a1a2..5929703 100644
--- a/src/web/store/splatoon/finalFest.js
+++ b/src/web/store/splatoon/finalFest.js
@@ -31,4 +31,17 @@ export const getters = {
schedules(state) {
return state.schedules;
},
+ currentSchedules(state, getters, { splatoon }) {
+ let now = splatoon.now
+ let schedules = state.schedules;
+
+ if (now && schedules)
+ return schedules.filter(s => s.end_time > now);
+ },
+ activeSchedule(state, getters, { splatoon }) {
+ let now = splatoon.now;
+
+ if (now && getters.currentSchedules)
+ return getters.currentSchedules.find(s => s.start_time <= now);
+ },
}