From 1110f6228f22840e3b4ec93d2669299945741250 Mon Sep 17 00:00:00 2001 From: lachie-underhill Date: Mon, 5 Jun 2023 12:33:24 +1000 Subject: [PATCH] Migrate remaining components to SFC --- package.json | 4 +- src/components/AppFooter.vue | 62 ++++----- src/components/SeasonIcon.vue | 24 +--- src/components/SkillIcon.vue | 24 +--- src/components/bundles/BundleItems.vue | 13 +- src/components/changelog/ChangeLog.vue | 26 ---- .../{Version.vue => VersionDisplay.vue} | 66 +++++----- .../{item_card => item-card}/BundleButton.vue | 0 .../{item_card => item-card}/ItemCard.vue | 0 src/components/item-card/SeasonList.vue | 20 +++ src/components/item-card/SeasonTag.vue | 13 ++ src/components/item-card/SkillList.vue | 18 +++ src/components/item-card/SkillTag.vue | 13 ++ src/components/item-table/ItemTable.vue | 35 +++++ src/components/item-table/ItemTableRow.vue | 39 ++++++ src/components/item_card/SeasonList.vue | 51 -------- src/components/item_card/SeasonTag.vue | 26 ---- src/components/item_card/SkillList.vue | 27 ---- src/components/item_card/SkillTag.vue | 27 ---- src/components/item_table/ItemTable.vue | 49 ------- src/components/item_table/ItemTableRow.vue | 121 ------------------ src/components/search/SearchForm.vue | 25 +--- src/components/search/SeasonFilter.vue | 29 +---- src/components/search/SkillFilter.vue | 25 +--- src/router/index.ts | 4 +- src/views/BundlesView.vue | 19 +-- src/views/ChangelogView.vue | 15 +++ src/views/SearchView.vue | 6 +- vite.config.js | 15 --- vite.config.ts | 15 +++ yarn.lock | 9 +- 31 files changed, 281 insertions(+), 539 deletions(-) delete mode 100644 src/components/changelog/ChangeLog.vue rename src/components/changelog/{Version.vue => VersionDisplay.vue} (51%) rename src/components/{item_card => item-card}/BundleButton.vue (100%) rename src/components/{item_card => item-card}/ItemCard.vue (100%) create mode 100644 src/components/item-card/SeasonList.vue create mode 100644 src/components/item-card/SeasonTag.vue create mode 100644 src/components/item-card/SkillList.vue create mode 100644 src/components/item-card/SkillTag.vue create mode 100644 src/components/item-table/ItemTable.vue create mode 100644 src/components/item-table/ItemTableRow.vue delete mode 100644 src/components/item_card/SeasonList.vue delete mode 100644 src/components/item_card/SeasonTag.vue delete mode 100644 src/components/item_card/SkillList.vue delete mode 100644 src/components/item_card/SkillTag.vue delete mode 100644 src/components/item_table/ItemTable.vue delete mode 100644 src/components/item_table/ItemTableRow.vue create mode 100644 src/views/ChangelogView.vue delete mode 100644 vite.config.js create mode 100644 vite.config.ts diff --git a/package.json b/package.json index d55aa6b..140e0ac 100644 --- a/package.json +++ b/package.json @@ -38,9 +38,11 @@ "@vue/tsconfig": "^0.4.0", "autoprefixer": "^10.4.14", "eslint": "^8.42.0", - "eslint-plugin-vue": "^9.11.0", + "eslint-plugin-vue": "^9.14.1", + "postcss": "^8.4.24", "postcss-import": "^15.1.0", "postcss-url": "^10.1.3", + "prettier": "^2.8.8", "typescript": "^5.1.3", "vite": "^4.3.5" }, diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue index d71b3cf..01eb7f8 100644 --- a/src/components/AppFooter.vue +++ b/src/components/AppFooter.vue @@ -1,57 +1,49 @@ + + - + diff --git a/src/components/SeasonIcon.vue b/src/components/SeasonIcon.vue index af049c4..1480f40 100644 --- a/src/components/SeasonIcon.vue +++ b/src/components/SeasonIcon.vue @@ -1,5 +1,9 @@ + + - - diff --git a/src/components/changelog/Version.vue b/src/components/changelog/VersionDisplay.vue similarity index 51% rename from src/components/changelog/Version.vue rename to src/components/changelog/VersionDisplay.vue index 4f1a1a5..a74bfa0 100644 --- a/src/components/changelog/Version.vue +++ b/src/components/changelog/VersionDisplay.vue @@ -1,3 +1,32 @@ + + - - diff --git a/src/components/item_card/BundleButton.vue b/src/components/item-card/BundleButton.vue similarity index 100% rename from src/components/item_card/BundleButton.vue rename to src/components/item-card/BundleButton.vue diff --git a/src/components/item_card/ItemCard.vue b/src/components/item-card/ItemCard.vue similarity index 100% rename from src/components/item_card/ItemCard.vue rename to src/components/item-card/ItemCard.vue diff --git a/src/components/item-card/SeasonList.vue b/src/components/item-card/SeasonList.vue new file mode 100644 index 0000000..5653e2e --- /dev/null +++ b/src/components/item-card/SeasonList.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/components/item-card/SeasonTag.vue b/src/components/item-card/SeasonTag.vue new file mode 100644 index 0000000..9ae0110 --- /dev/null +++ b/src/components/item-card/SeasonTag.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/components/item-card/SkillList.vue b/src/components/item-card/SkillList.vue new file mode 100644 index 0000000..da968d4 --- /dev/null +++ b/src/components/item-card/SkillList.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/components/item-card/SkillTag.vue b/src/components/item-card/SkillTag.vue new file mode 100644 index 0000000..dcdc9d8 --- /dev/null +++ b/src/components/item-card/SkillTag.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/components/item-table/ItemTable.vue b/src/components/item-table/ItemTable.vue new file mode 100644 index 0000000..05ccf5a --- /dev/null +++ b/src/components/item-table/ItemTable.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/components/item-table/ItemTableRow.vue b/src/components/item-table/ItemTableRow.vue new file mode 100644 index 0000000..8c59178 --- /dev/null +++ b/src/components/item-table/ItemTableRow.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/components/item_card/SeasonList.vue b/src/components/item_card/SeasonList.vue deleted file mode 100644 index 5cb3d4d..0000000 --- a/src/components/item_card/SeasonList.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/src/components/item_card/SeasonTag.vue b/src/components/item_card/SeasonTag.vue deleted file mode 100644 index 7f55aaf..0000000 --- a/src/components/item_card/SeasonTag.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/src/components/item_card/SkillList.vue b/src/components/item_card/SkillList.vue deleted file mode 100644 index 6909cce..0000000 --- a/src/components/item_card/SkillList.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/src/components/item_card/SkillTag.vue b/src/components/item_card/SkillTag.vue deleted file mode 100644 index f504fc4..0000000 --- a/src/components/item_card/SkillTag.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/src/components/item_table/ItemTable.vue b/src/components/item_table/ItemTable.vue deleted file mode 100644 index 5b52397..0000000 --- a/src/components/item_table/ItemTable.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - - - diff --git a/src/components/item_table/ItemTableRow.vue b/src/components/item_table/ItemTableRow.vue deleted file mode 100644 index 76def19..0000000 --- a/src/components/item_table/ItemTableRow.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - diff --git a/src/components/search/SearchForm.vue b/src/components/search/SearchForm.vue index a9e0e31..cc2e793 100644 --- a/src/components/search/SearchForm.vue +++ b/src/components/search/SearchForm.vue @@ -9,34 +9,19 @@ interface Filters { skillFilter: { selectedSkills: string[]; skillExclusive: boolean } } -const props = defineProps<{ - filters: Filters -}>() -const emit = defineEmits<{ (e: 'update:filters', val: Filters): void }>() - -function updateName(name: string) { - emit('update:filters', { ...props.filters, nameFilter: name }) -} - -function updateSeasons(seasonFilter: typeof props.filters.seasonFilter) { - emit('update:filters', { ...props.filters, seasonFilter }) -} - -function updateSkills(skillFilter: typeof props.filters.skillFilter) { - emit('update:filters', { ...props.filters, skillFilter }) -} +const filters = defineModel() diff --git a/src/components/search/SeasonFilter.vue b/src/components/search/SeasonFilter.vue index 5f17cce..14651d1 100644 --- a/src/components/search/SeasonFilter.vue +++ b/src/components/search/SeasonFilter.vue @@ -3,23 +3,14 @@ import SeasonIcon from '@/components/SeasonIcon.vue' import ButtonCheckbox from '@/components/ButtonCheckbox.vue' import { useGeneralStore } from '@/store' +const store = useGeneralStore() + interface ModelValue { selectedSeasons: string[] seasonExclusive: boolean } -const props = defineProps<{ modelValue: ModelValue }>() -const emit = defineEmits<{ (e: 'update:modelValue', value: ModelValue): void }>() - -const store = useGeneralStore() - -function updateSeasons(val: string[]) { - emit('update:modelValue', { ...props.modelValue, selectedSeasons: val }) -} - -function updateExclusive(val: boolean) { - emit('update:modelValue', { ...props.modelValue, seasonExclusive: val }) -} +const modelValue = defineModel()