From 2e2522c4871eb308c3350e6096e01b33b6430d67 Mon Sep 17 00:00:00 2001
From: Matt Isenhower <matt@isenhower.com>
Date: Sat, 29 Oct 2022 14:30:21 -0700
Subject: [PATCH] Consolidate schedule types to a single file

---
 src/components/ScheduleBox.vue                | 42 +++----------------
 src/components/concerns/scheduleTypes.mjs     | 40 ++++++++++++++++++
 .../screenshots/ScreenshotScheduleBox.vue     | 42 +++----------------
 3 files changed, 50 insertions(+), 74 deletions(-)
 create mode 100644 src/components/concerns/scheduleTypes.mjs

diff --git a/src/components/ScheduleBox.vue b/src/components/ScheduleBox.vue
index ce6e267..59a27c0 100644
--- a/src/components/ScheduleBox.vue
+++ b/src/components/ScheduleBox.vue
@@ -4,10 +4,10 @@
       <div class="flex items-center space-x-2 mx-2">
         <img :src="type.img" />
         <div class="font-splatoon1 lg:text-2xl xl:text-3xl text-shadow">
-          {{ $t(`schedule.types.${type.name}`) }}
+          {{ $t(type.name) }}
         </div>
         <div v-if="type.badge" class="font-splatoon2 text-xs lg:text-sm xl:text-base bg-splatoon-blue rounded px-1 drop-shadow">
-          {{ $t(`schedule.types.${type.badge}`) }}
+          {{ $t(type.badge) }}
         </div>
       </div>
 
@@ -72,17 +72,14 @@
 </template>
 
 <script setup>
-import { computed } from '@vue/reactivity';
-import { useAnarchyOpenSchedulesStore, useAnarchySeriesSchedulesStore, useRegularSchedulesStore, useSplatfestSchedulesStore } from '../stores/schedules';
+import { computed } from 'vue';
 import { useUSSplatfestsStore } from '@/stores/splatfests';
 import ProductContainer from './ProductContainer.vue';
 import StageImage from './StageImage.vue';
 import ScheduleRow from './ScheduleRow.vue';
-
-import battleRegularSvg from '@/assets/img/modes/regular.svg';
-import battleBankaraSvg from '@/assets/img/modes/bankara.svg';
 import RuleIcon from './RuleIcon.vue';
 import SquidTape from './SquidTape.vue';
+import { useScheduleTypes } from './concerns/scheduleTypes.mjs';
 
 const props = defineProps({
   type: {
@@ -91,36 +88,7 @@ const props = defineProps({
   },
 });
 
-const types = {
-  regular: {
-    name: 'regular',
-    badge: null,
-    store: useRegularSchedulesStore(),
-    img: battleRegularSvg,
-    bg: 'bg-splatoon-battle-regular bg-tapes',
-  },
-  anarchySeries: {
-    name: 'anarchy',
-    badge: 'series',
-    store: useAnarchySeriesSchedulesStore(),
-    img: battleBankaraSvg,
-    bg: 'bg-splatoon-battle-ranked bg-tapes',
-  },
-  anarchyOpen: {
-    name: 'anarchy',
-    badge: 'open',
-    store: useAnarchyOpenSchedulesStore(),
-    img: battleBankaraSvg,
-    bg: 'bg-splatoon-battle-ranked bg-tapes',
-  },
-  splatfest: {
-    name: 'splatfest',
-    badge: null,
-    store: useSplatfestSchedulesStore(),
-    img: battleRegularSvg,
-    bg: 'bg-splatoon-battle-regular bg-tapes',
-  },
-};
+const { types } = useScheduleTypes();
 
 const type = computed(() => types[props.type]);
 const store = computed(() => type.value.store);
diff --git a/src/components/concerns/scheduleTypes.mjs b/src/components/concerns/scheduleTypes.mjs
new file mode 100644
index 0000000..efd3930
--- /dev/null
+++ b/src/components/concerns/scheduleTypes.mjs
@@ -0,0 +1,40 @@
+import { useAnarchyOpenSchedulesStore, useAnarchySeriesSchedulesStore, useRegularSchedulesStore, useSplatfestSchedulesStore } from '@/stores/schedules';
+import battleRegularSvg from '@/assets/img/modes/regular.svg';
+import battleBankaraSvg from '@/assets/img/modes/bankara.svg';
+
+export function useScheduleTypes() {
+  const types = {
+    regular: {
+      name: 'schedule.types.regular',
+      badge: null,
+      store: useRegularSchedulesStore(),
+      img: battleRegularSvg,
+      bg: 'bg-splatoon-battle-regular bg-tapes',
+    },
+    anarchySeries: {
+      name: 'schedule.types.anarchy',
+      badge: 'schedule.types.series',
+      store: useAnarchySeriesSchedulesStore(),
+      img: battleBankaraSvg,
+      bg: 'bg-splatoon-battle-ranked bg-tapes',
+    },
+    anarchyOpen: {
+      name: 'schedule.types.anarchy',
+      badge: 'schedule.types.open',
+      store: useAnarchyOpenSchedulesStore(),
+      img: battleBankaraSvg,
+      bg: 'bg-splatoon-battle-ranked bg-tapes',
+    },
+    splatfest: {
+      name: 'schedule.types.splatfest',
+      badge: null,
+      store: useSplatfestSchedulesStore(),
+      img: battleRegularSvg,
+      bg: 'bg-splatoon-battle-regular bg-tapes',
+    },
+  };
+
+  return { types };
+}
+
+
diff --git a/src/components/screenshots/ScreenshotScheduleBox.vue b/src/components/screenshots/ScreenshotScheduleBox.vue
index 296bc8d..87c3c62 100644
--- a/src/components/screenshots/ScreenshotScheduleBox.vue
+++ b/src/components/screenshots/ScreenshotScheduleBox.vue
@@ -3,7 +3,7 @@
     <div class="space-y-2">
       <div class="flex items-center justify-center space-x-1 mx-2">
         <div class="font-splatoon1 text-4xl text-shadow">
-          {{ type.name }}
+          {{ $t(type.name) }}
         </div>
       </div>
 
@@ -20,7 +20,7 @@
             <div class="flex items-center" v-if="type.badge">
               <img :src="type.img" class="h-10" />
               <div v-if="type.badge" class="font-splatoon2 text-2xl bg-splatoon-blue px-2 drop-shadow rounded">
-                {{ type.badge }}
+                {{ $t(type.badge) }}
               </div>
             </div>
           </div>
@@ -55,15 +55,12 @@
 </template>
 
 <script setup>
-import { computed } from '@vue/reactivity';
-import { useAnarchyOpenSchedulesStore, useAnarchySeriesSchedulesStore, useRegularSchedulesStore, useSplatfestSchedulesStore } from '@/stores/schedules';
+import { computed } from 'vue';
 import { useUSSplatfestsStore } from '@/stores/splatfests';
 import ProductContainer from '../ProductContainer.vue';
 import StageImage from '../StageImage.vue';
-
-import battleRegularSvg from '@/assets/img/modes/regular.svg';
-import battleBankaraSvg from '@/assets/img/modes/bankara.svg';
 import RuleIcon from '../RuleIcon.vue';
+import { useScheduleTypes } from '@/components/concerns/scheduleTypes.mjs';
 
 const props = defineProps({
   type: {
@@ -72,36 +69,7 @@ const props = defineProps({
   },
 });
 
-const types = {
-  regular: {
-    name: 'Regular Battle',
-    badge: null,
-    store: useRegularSchedulesStore(),
-    img: battleRegularSvg,
-    bg: 'bg-splatoon-battle-regular bg-tapes',
-  },
-  anarchySeries: {
-    name: 'Anarchy Battle',
-    badge: 'Series',
-    store: useAnarchySeriesSchedulesStore(),
-    img: battleBankaraSvg,
-    bg: 'bg-splatoon-battle-ranked bg-tapes',
-  },
-  anarchyOpen: {
-    name: 'Anarchy Battle',
-    badge: 'Open',
-    store: useAnarchyOpenSchedulesStore(),
-    img: battleBankaraSvg,
-    bg: 'bg-splatoon-battle-ranked bg-tapes',
-  },
-  splatfest: {
-    name: 'Splatfest Battle',
-    badge: null,
-    store: useSplatfestSchedulesStore(),
-    img: battleRegularSvg,
-    bg: 'bg-splatoon-battle-regular bg-tapes',
-  },
-};
+const { types } = useScheduleTypes();
 
 const type = computed(() => types[props.type]);
 const store = computed(() => type.value.store);