commit aae0c3f0cc513c0a4f6b0071b19aad5204a32c00
parent bebba6bd1ebdcd83b8cd20d80e3fbed51db5d616
Author: ashermorgan <59518073+ashermorgan@users.noreply.github.com>
Date: Tue, 14 Nov 2023 10:47:17 -0800
Fix linter errors
Diffstat:
8 files changed, 60 insertions(+), 70 deletions(-)
diff --git a/src/components/FullscreenModal.vue b/src/components/FullscreenModal.vue
@@ -0,0 +1,45 @@
+<template>
+ <div class="fullscreen-modal">
+ <div class="backdrop"></div>
+ <div class="content-container">
+ <div class="content">
+ <slot></slot>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'FullscreenModal',
+};
+</script>
+
+<style scoped>
+.fullscreen-modal .backdrop {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ z-index: 1000;
+ background-color: #00000080;
+}
+.fullscreen-modal .content-container {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ z-index: 1010;
+ overflow: scroll;
+}
+
+.fullscreen-modal .content {
+ max-width: 500px;
+ margin: 75px auto 1em;
+ padding: 1em;
+ background-color: var(--background1);
+ border-radius: 10px;
+}
+</style>
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
@@ -1,45 +0,0 @@
-<template>
- <div class="modal">
- <div class="backdrop"></div>
- <div class="content-container">
- <div class="content">
- <slot></slot>
- </div>
- </div>
- </div>
-</template>
-
-<script>
-export default {
- name: 'Modal',
-};
-</script>
-
-<style scoped>
-.modal .backdrop {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 1000;
- background-color: #00000080;
-}
-.modal .content-container {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 1010;
- overflow: scroll;
-}
-
-.modal .content {
- max-width: 500px;
- margin: 75px auto 1em;
- padding: 1em;
- background-color: var(--background1);
- border-radius: 10px;
-}
-</style>
diff --git a/src/components/SimpleTargetTable.vue b/src/components/SimpleTargetTable.vue
@@ -39,8 +39,6 @@
</template>
<script>
-import VueFeather from 'vue-feather';
-
import formatUtils from '@/utils/format';
import unitUtils from '@/utils/units';
@@ -49,10 +47,6 @@ import blur from '@/directives/blur';
export default {
name: 'SimpleTargetTable',
- components: {
- VueFeather,
- },
-
directives: {
blur,
},
diff --git a/src/components/TargetSetEditor.vue b/src/components/TargetSetEditor.vue
@@ -66,9 +66,7 @@ import storage from '@/utils/localStorage';
import targetUtils from '@/utils/targets';
import unitUtils from '@/utils/units';
-import DecimalInput from '@/components/DecimalInput.vue';
import TargetEditor from '@/components/TargetEditor.vue';
-import TimeInput from '@/components/TimeInput.vue';
import blur from '@/directives/blur';
@@ -76,9 +74,7 @@ export default {
name: 'TargetSetEditor',
components: {
- DecimalInput,
TargetEditor,
- TimeInput,
VueFeather,
},
@@ -133,7 +129,7 @@ export default {
let old_sets = this.internalValue;
this.internalValue = JSON.parse(JSON.stringify(targetUtils.defaultTargetSets));
for (let key in old_sets) {
- if (!this.internalValue.hasOwnProperty(key)) {
+ if (!Object.keys(this.internalValue).includes(key)) {
this.internalValue[key] = old_sets[key];
}
}
diff --git a/src/views/PaceCalculator.vue b/src/views/PaceCalculator.vue
@@ -34,9 +34,9 @@
<simple-target-table class="output" :calculate-result="calculatePace"
:targets="targetSets[selectedTargetSet] ? targetSets[selectedTargetSet].targets : []"/>
- <Modal v-show="editingTargetSets">
+ <fullscreen-modal v-show="editingTargetSets">
<target-set-editor @close="editingTargetSets = false"/>
- </Modal>
+ </fullscreen-modal>
</div>
</template>
@@ -49,7 +49,7 @@ import targetUtils from '@/utils/targets';
import unitUtils from '@/utils/units';
import DecimalInput from '@/components/DecimalInput.vue';
-import Modal from '@/components/Modal.vue';
+import FullscreenModal from '@/components/FullscreenModal.vue';
import SimpleTargetTable from '@/components/SimpleTargetTable.vue';
import TargetSetEditor from '@/components/TargetSetEditor.vue';
import TimeInput from '@/components/TimeInput.vue';
@@ -61,7 +61,7 @@ export default {
components: {
DecimalInput,
- Modal,
+ FullscreenModal,
SimpleTargetTable,
TargetSetEditor,
TimeInput,
diff --git a/src/views/RaceCalculator.vue b/src/views/RaceCalculator.vue
@@ -68,9 +68,9 @@
<simple-target-table class="output" :calculate-result="predictResult"
:targets="targetSets[selectedTargetSet] ? targetSets[selectedTargetSet].targets : []" show-pace/>
- <Modal v-show="editingTargetSets">
+ <fullscreen-modal v-show="editingTargetSets">
<target-set-editor @close="editingTargetSets = false"/>
- </Modal>
+ </fullscreen-modal>
</div>
</template>
@@ -84,7 +84,7 @@ import targetUtils from '@/utils/targets';
import unitUtils from '@/utils/units';
import DecimalInput from '@/components/DecimalInput.vue';
-import Modal from '@/components/Modal.vue';
+import FullscreenModal from '@/components/FullscreenModal.vue';
import SimpleTargetTable from '@/components/SimpleTargetTable.vue';
import TargetSetEditor from '@/components/TargetSetEditor.vue';
import TimeInput from '@/components/TimeInput.vue';
@@ -96,7 +96,7 @@ export default {
components: {
DecimalInput,
- Modal,
+ FullscreenModal,
SimpleTargetTable,
TargetSetEditor,
TimeInput,
diff --git a/src/views/SplitCalculator.vue b/src/views/SplitCalculator.vue
@@ -18,7 +18,7 @@
<tr>
<th>
<span>Distance</span>
- <span class="mobile-abbreviation">Dist</span>
+ <span class="mobile-abbreviation">Dist.</span>
</th>
<th>Time</th>
@@ -59,9 +59,9 @@
</table>
</div>
- <Modal v-show="editingTargetSets">
+ <fullscreen-modal v-show="editingTargetSets">
<target-set-editor @close="editingTargetSets = false"/>
- </Modal>
+ </fullscreen-modal>
</div>
</template>
@@ -73,7 +73,7 @@ import storage from '@/utils/localStorage';
import targetUtils from '@/utils/targets';
import unitUtils from '@/utils/units';
-import Modal from '@/components/Modal.vue';
+import FullscreenModal from '@/components/FullscreenModal.vue';
import TargetSetEditor from '@/components/TargetSetEditor.vue';
import TimeInput from '@/components/TimeInput.vue';
@@ -83,7 +83,7 @@ export default {
name: 'SplitCalculator',
components: {
- Modal,
+ FullscreenModal,
TargetSetEditor,
TimeInput,
VueFeather,
diff --git a/tests/unit/components/TargetSetEditor.spec.js b/tests/unit/components/TargetSetEditor.spec.js
@@ -1,7 +1,7 @@
/* eslint-disable no-underscore-dangle */
import { test, expect } from 'vitest';
-import { shallowMount, mount } from '@vue/test-utils';
+import { mount } from '@vue/test-utils';
import TargetSetEditor from '@/components/TargetSetEditor.vue';
import targetUtils from '@/utils/targets';
