Organise imports

src/App.vue

@@ -6,10 +6,8 @@
 </template>
 
 <script setup>
-	import { useJsonDataStore } from "@/stores/jsonData"
-	import AppFooter from "@/components/AppFooter"
-	import BackgroundLayer from "@/components/BackgroundLayer"
-	import SiteHeader from "@/components/SiteHeader"
+	import { AppFooter, BackgroundLayer, SiteHeader } from "@/components"
+	import { useJsonDataStore } from "@/stores"
 
 	const jsonData = useJsonDataStore()
 	jsonData.sync()

src/components/AppFooter.vue

@@ -16,8 +16,8 @@
 </template>
 
 <script setup>
-	import { useJsonDataStore } from "@/stores/jsonData"
-	import { useStrings } from "@/hooks/strings"
+	import { useJsonDataStore } from "@/stores"
+	import { useStrings } from "@/hooks"
 
 	const strings = useStrings()
 	const json = useJsonDataStore()

src/components/CharacterCard.vue

@@ -33,9 +33,8 @@
 
 <script setup>
 	import { computed } from "vue"
-	import { useJsonDataStore } from "@/stores/jsonData"
-	import ElementBadge from "@/components/ElementBadge"
-	import ConstellationBadge from "@/components/ConstellationBadge"
+	import { ConstellationBadge, ElementBadge } from "@/components"
+	import { useJsonDataStore } from "@/stores"
 
 	const jsonData = useJsonDataStore()
 	const props = defineProps({

src/components/CharacterSelectionPopup.vue

@@ -21,12 +21,10 @@
 </template>
 
 <script setup>
+	import { CharacterCard, PopupShell, SelectButton } from "@/components"
 	import { computed, ref, onBeforeUnmount } from "vue"
-	import { sortingOptions, useCharacterIdList } from "@/hooks/characterIdList"
-	import { useUserDataStore } from "@/stores/userData"
-	import CharacterCard from "@/components/CharacterCard"
-	import PopupShell from "@/components/PopupShell"
-	import SelectButton from "@/components/SelectButton"
+	import { sortingOptions, useCharacterIdList } from "@/hooks"
+	import { useUserDataStore } from "@/stores"
 
 	const emit = defineEmits(["close", "select"])
 	const props = defineProps({ meta: Object, exclude: Array })

src/components/ConstellationBadge.vue

@@ -6,7 +6,7 @@
 
 <script setup>
 	import { computed } from "vue"
-	import { useUserDataStore } from "@/stores/userData"
+	import { useUserDataStore } from "@/stores"
 
 	const userData = useUserDataStore()
 

src/components/ConstellationPopup.vue

@@ -18,9 +18,8 @@
 
 <script setup>
 	import { computed, onBeforeUnmount } from "vue"
-	import { useJsonDataStore } from "@/stores/jsonData"
-	import { useUserDataStore } from "@/stores/userData"
-	import PopupShell from "@/components/PopupShell"
+	import { PopupShell } from "@/components"
+	import { useJsonDataStore, useUserDataStore } from "@/stores"
 
 	const emit = defineEmits(["abort"])
 	const jsonData = useJsonDataStore()

src/components/ElementBadge.vue

@@ -16,7 +16,7 @@
 
 <script setup>
 	import { computed } from "vue"
-	import { useJsonDataStore } from "@/stores/jsonData"
+	import { useJsonDataStore } from "@/stores"
 
 	const props = defineProps({
 		elementId: { type: String, required: true },

src/components/ImportPopup.vue

@@ -29,10 +29,10 @@
 </template>
 
 <script setup>
+	import { PopupShell } from "@/components"
 	import { readGOOD } from "@/utils"
 	import { ref } from "vue"
-	import { useUserDataStore } from "@/stores/userData"
-	import PopupShell from "@/components/PopupShell"
+	import { useUserDataStore } from "@/stores"
 
 	const emit = defineEmits(["abort"])
 	const error = ref("")

src/components/PartyRow.vue

@@ -23,9 +23,9 @@
 </template>
 
 <script setup>
+	import { CharacterCard } from "@/components"
 	import { computed } from "vue"
-	import { useUserDataStore } from "@/stores/userData"
-	import CharacterCard from "./CharacterCard"
+	import { useUserDataStore } from "@/stores"
 
 	const emit = defineEmits(["cardClick"])
 	const props = defineProps({

src/components/TierLine.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script setup>
-	import CharacterCard from "@/components/CharacterCard"
+	import { CharacterCard } from "@/components"
 
 	defineProps({
 		tier: { type: String, required: true },

src/components/index.ts

@@ -0,0 +1,13 @@
+export { default as AppFooter } from "./AppFooter.vue"
+export { default as BackgroundLayer } from "./BackgroundLayer.vue"
+export { default as CharacterCard } from "./CharacterCard.vue"
+export { default as CharacterSelectionPopup } from "./CharacterSelectionPopup.vue"
+export { default as ConstellationBadge } from "./ConstellationBadge.vue"
+export { default as ConstellationPopup } from "./ConstellationPopup.vue"
+export { default as ElementBadge } from "./ElementBadge.vue"
+export { default as ImportPopup } from "./ImportPopup.vue"
+export { default as PartyRow } from "./PartyRow.vue"
+export { default as PopupShell } from "./PopupShell.vue"
+export { default as SelectButton } from "./SelectButton.vue"
+export { default as SiteHeader } from "./SiteHeader.vue"
+export { default as TierLine } from "./TierLine.vue"

src/hooks/characterIdList.ts

@@ -1,5 +1,5 @@
 import { computed, readonly } from "vue"
-import { useJsonDataStore } from "@/stores/jsonData"
+import { useJsonDataStore } from "@/stores"
 import type { Ref } from "vue"
 
 export const sortingOptions = [

src/hooks/index.ts

@@ -0,0 +1,5 @@
+export { sortingOptions, useCharacterIdList } from "./characterIdList"
+export { useInsights } from "./insights"
+export { useStrings } from "./strings"
+export { useSuggested } from "./suggested"
+export { useTierList } from "./tierList"

src/hooks/insights.ts

@@ -1,9 +1,8 @@
 import _capitalise from "lodash/capitalize"
 import _difference from "lodash/difference"
 import { computed } from "vue"
-import { useJsonDataStore } from "@/stores/jsonData"
+import { useJsonDataStore, useUserDataStore } from "@/stores"
 import { useRoute } from "vue-router"
-import { useUserDataStore } from "@/stores/userData"
 
 const reactionRequirements: { [key: string]: string[][] } = {
 	aggravate: [

src/hooks/suggested.ts

@@ -4,9 +4,8 @@ import _shuffle from "lodash/shuffle"
 import _sum from "lodash/sum"
 import _uniq from "lodash/uniq"
 import { computed } from "vue"
-import { useJsonDataStore } from "@/stores/jsonData"
+import { useJsonDataStore, useUserDataStore } from "@/stores"
 import { useRoute } from "vue-router"
-import { useUserDataStore } from "@/stores/userData"
 import type { Character, ProcessedCharacter, Preset, JSONData } from "@/types"
 
 function processCharacter(id: string, character: Character, constellation: number): ProcessedCharacter {

src/hooks/tierList.ts

@@ -1,7 +1,6 @@
 import _range from "lodash/range"
 import { computed, readonly } from "vue"
-import { useJsonDataStore } from "@/stores/jsonData"
-import { useUserDataStore } from "@/stores/userData"
+import { useJsonDataStore, useUserDataStore } from "@/stores"
 import type { Ref } from "vue"
 
 // Arbitrary letters used for each rank

src/stores/index.ts

@@ -0,0 +1,2 @@
+export { useJsonDataStore } from "./jsonData"
+export { useUserDataStore } from "./userData"

src/views/CharactersView.vue

@@ -30,16 +30,12 @@
 </template>
 
 <script setup>
+	import { CharacterCard, ConstellationPopup, ImportPopup, SelectButton } from "@/components"
 	import { ref, onBeforeUnmount } from "vue"
-	import { sortingOptions, useCharacterIdList } from "@/hooks/characterIdList"
+	import { sortingOptions, useCharacterIdList, useStrings } from "@/hooks"
 	import { useHead } from "@vueuse/head"
 	import { useRouter } from "vue-router"
-	import { useStrings } from "@/hooks/strings"
-	import { useUserDataStore } from "@/stores/userData"
-	import CharacterCard from "@/components/CharacterCard"
-	import ConstellationPopup from "@/components/ConstellationPopup"
-	import ImportPopup from "@/components/ImportPopup"
-	import SelectButton from "@/components/SelectButton"
+	import { useUserDataStore } from "@/stores"
 
 	const router = useRouter()
 	const strings = useStrings()

src/views/LandingView.vue

@@ -12,8 +12,8 @@
 	import { onBeforeUnmount } from "vue"
 	import { useHead } from "@vueuse/head"
 	import { useRouter } from "vue-router"
-	import { useStrings } from "@/hooks/strings"
-	import { useUserDataStore } from "@/stores/userData"
+	import { useStrings } from "@/hooks"
+	import { useUserDataStore } from "@/stores"
 
 	const router = useRouter()
 	const strings = useStrings()

src/views/PartiesView.vue

@@ -20,11 +20,11 @@
 
 <script setup>
 	import { onMounted } from "vue"
+	import { PartyRow } from "@/components"
 	import { useHead } from "@vueuse/head"
 	import { useRouter } from "vue-router"
-	import { useStrings } from "@/hooks/strings"
-	import { useUserDataStore } from "@/stores/userData"
-	import PartyRow from "@/components/PartyRow"
+	import { useStrings } from "@/hooks"
+	import { useUserDataStore } from "@/stores"
 
 	useHead({ title: `My parties | ${process.env.VUE_APP_SITE_NAME}` })
 

src/views/PartyBuilderView.vue

@@ -57,16 +57,13 @@
 </template>
 
 <script setup>
+	import { CharacterCard, CharacterSelectionPopup, PartyRow } from "@/components"
 	import { getRandomReassurance } from "@/utils"
 	import { ref, computed, onBeforeUnmount } from "vue"
 	import { useHead } from "@vueuse/head"
-	import { useInsights } from "@/hooks/insights"
+	import { useInsights, useSuggested } from "@/hooks"
 	import { useRouter, useRoute } from "vue-router"
-	import { useSuggested } from "@/hooks/suggested"
-	import { useUserDataStore } from "@/stores/userData"
-	import CharacterCard from "@/components/CharacterCard"
-	import CharacterSelectionPopup from "@/components/CharacterSelectionPopup"
-	import PartyRow from "@/components/PartyRow"
+	import { useUserDataStore } from "@/stores"
 
 	useHead({ title: `Edit party | ${process.env.VUE_APP_SITE_NAME}` })
 

src/views/TierListView.vue

@@ -19,11 +19,9 @@
 
 <script setup>
 	import { ref } from "vue"
-	import { useStrings } from "@/hooks/strings"
-	import { useTierList } from "@/hooks/tierList"
-	import { useUserDataStore } from "@/stores/userData"
-	import SelectButton from "@/components/SelectButton"
-	import TierLine from "@/components/TierLine"
+	import { SelectButton, TierLine } from "@/components"
+	import { useStrings, useTierList } from "@/hooks"
+	import { useUserDataStore } from "@/stores"
 
 	const displayUnowned = ref(false)