From 5332f6035ad8efdf1792b4413c5f99c2f2574eba Mon Sep 17 00:00:00 2001
From: John McCardle <mccardle.john@gmail.com>
Date: Mon, 10 Jan 2022 21:09:32 -0500
Subject: [PATCH] feat: Display year/month durations via getters

---
 components/MissionButton.vue  |  4 ++++
 components/ProgressButton.vue | 16 +++++++++++++---
 components/TimeHeader.vue     | 19 +++++--------------
 pages/Missions.vue            |  7 ++-----
 store/index.js                | 19 ++++++++++++++++---
 5 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/components/MissionButton.vue b/components/MissionButton.vue
index e12e1f4..de7bfdc 100644
--- a/components/MissionButton.vue
+++ b/components/MissionButton.vue
@@ -4,6 +4,7 @@
     :description="mission.description"
     :max="max"
     :value="value"
+    :unit="unit"
     @click="complete"
   />
 </template>
@@ -24,6 +25,9 @@ export default {
         ? this.mission.completionCriteria.cost
         : this.$store.state.playerAgeMax
     },
+    unit() {
+      return 'cost' in this.mission.completionCriteria ? 'spareTime' : 'age'
+    },
   },
   methods: {
     complete() {
diff --git a/components/ProgressButton.vue b/components/ProgressButton.vue
index 1185c7a..6ae83f1 100644
--- a/components/ProgressButton.vue
+++ b/components/ProgressButton.vue
@@ -13,8 +13,8 @@
     />
 
     <span class="absolute top-3 right-3 font-semibold text-sm">
-      {{ cappedValue }} / {{ max }}
-      <span class="fas fa-hourglass-half" />
+      {{ cappedValueText }} / {{ maxText }}
+      <span v-if="unit === 'spareTime'" class="fas fa-hourglass-half" />
     </span>
 
     <span
@@ -41,7 +41,7 @@ export default {
     description: { type: String, default: null },
     max: { type: Number, required: true },
     value: { type: [Number, Decimal], required: true },
-    unit: { type: String, default: null },
+    unit: { type: String, default: 'spareTime' },
     current: { type: String, default: null },
     next: { type: String, default: null },
   },
@@ -49,6 +49,16 @@ export default {
     cappedValue() {
       return this.value > this.max ? this.max : this.value
     },
+    cappedValueText() {
+      return this.unit === 'spareTime'
+        ? this.cappedValue
+        : this.$store.getters.ageText
+    },
+    maxText() {
+      return this.unit === 'spareTime'
+        ? this.max
+        : this.$store.getters.ageMaxText
+    },
     clickable() {
       return this.value >= this.max
     },
diff --git a/components/TimeHeader.vue b/components/TimeHeader.vue
index 1390e75..5163da5 100644
--- a/components/TimeHeader.vue
+++ b/components/TimeHeader.vue
@@ -16,28 +16,19 @@
         :max="$store.state.playerAgeMax"
         :value="$store.state.playerAge"
       />
-      {{ ageText }}
+      {{ $store.getters.ageText }}
     </div>
 
-    <div class="text-center pt-2 pb-1 select-none" v-text="maxAgeText" />
+    <div
+      class="text-center pt-2 pb-1 select-none"
+      v-text="$store.getters.ageMaxText"
+    />
   </header>
 </template>
 
 <script>
 export default {
   computed: {
-    ageText() {
-      const year = Math.floor(this.$store.state.playerAge / 12)
-      const month = this.$store.state.playerAge % 12
-
-      return `${year}y${month}m`
-    },
-    maxAgeText() {
-      const year = Math.floor(this.$store.state.playerAgeMax / 12)
-      const month = this.$store.state.playerAgeMax % 12
-
-      return `${year}y${month}m max`
-    },
     colorClasses() {
       const { lightColor, darkColor } = this.$store.getters.activeTab
 
diff --git a/pages/Missions.vue b/pages/Missions.vue
index b08eed9..e25a949 100644
--- a/pages/Missions.vue
+++ b/pages/Missions.vue
@@ -1,12 +1,9 @@
 <template>
   <responsive-grid>
-    <progress-button
+    <mission-button
       v-for="(mission, index) in $store.state.missions"
       :key="index"
-      :label="mission.name"
-      :description="mission.description"
-      :max="mission.completionCriteria.cost"
-      :value="$store.state.currency"
+      :mission="mission"
     />
   </responsive-grid>
 </template>
diff --git a/store/index.js b/store/index.js
index 139a1aa..bf07b8d 100644
--- a/store/index.js
+++ b/store/index.js
@@ -143,7 +143,7 @@ export const state = () => ({
         age: 100,
       },
       completionCriteria: {
-        cost: 150000,
+        maxAge: true,
       },
       available: true,
       viewed: false,
@@ -193,6 +193,18 @@ export const getters = {
   currencySpent: (state) => {
     return Decimal.subtract(state.currencyTotal, state.currency)
   },
+  ageText: (state) => {
+    const year = Math.floor(state.playerAge / 12)
+    const month = state.playerAge % 12
+
+    return `${year}y${month}m`
+  },
+  ageMaxText: (state) => {
+    const year = Math.floor(state.playerAgeMax / 12)
+    const month = state.playerAgeMax % 12
+
+    return `${year}y${month}m`
+  },
 }
 
 export const mutations = {
@@ -217,8 +229,9 @@ export const mutations = {
   setMissionViewed: (state, missionIndex) => {
     Vue.set(state.missions[missionIndex], 'viewed', true)
   },
-  completeMission: (state, missionIndex) => {
-    state.missions[missionIndex].complete = true
+  completeMission: (state, mission) => {
+    const index = state.missions.findIndex((m) => m.name === mission.name)
+    Vue.set(state.missions[index], 'complete', true)
   },
   levelUpApprentice: (state, process) => {
     if (process.nextWorkerCost > state.currency) {