From 9165cc1efcf7791f78b61b2c51a9de651b1b09aa Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 2 Jul 2021 22:53:16 +0200
Subject: viewer: types normalization - gallery.d.ts
GitHub: closes #301
---
viewer/src/store/galleryStore.ts | 15 ++++++++-------
viewer/src/store/index.ts | 7 +++----
viewer/src/store/uiStore.ts | 5 +++--
3 files changed, 14 insertions(+), 13 deletions(-)
(limited to 'viewer/src/store')
diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index 6d64e12..3ef2036 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -17,9 +17,10 @@
-- along with this program. If not, see .
*/
-import { createModule, mutation, action } from "vuex-class-component";
+import { Config, Index, Item } from "@/@types/gallery";
import IndexFactory from "@/services/indexfactory";
import Navigation from "@/services/navigation";
+import { action, createModule, mutation } from "vuex-class-component";
const VuexModule = createModule({
namespaced: "galleryStore",
@@ -27,8 +28,8 @@ const VuexModule = createModule({
});
export default class GalleryStore extends VuexModule {
- config: Gallery.Config | null = null;
- galleryIndex: Gallery.Index | null = null;
+ config: Config | null = null;
+ galleryIndex: Index | null = null;
tagsIndex: Tag.Index = {};
tagsCategories: Tag.Category[] = [];
currentPath: string | null = null;
@@ -36,11 +37,11 @@ export default class GalleryStore extends VuexModule {
// ---
- @mutation private setConfig(config: Gallery.Config) {
+ @mutation private setConfig(config: Config) {
this.config = config;
}
- @mutation setGalleryIndex(galleryIndex: Gallery.Index) {
+ @mutation setGalleryIndex(galleryIndex: Index) {
this.galleryIndex = Object.freeze(galleryIndex);
}
@@ -62,13 +63,13 @@ export default class GalleryStore extends VuexModule {
// ---
- get currentItemPath(): Gallery.Item[] {
+ get currentItemPath(): Item[] {
const root = this.galleryIndex?.tree;
if (root && this.currentPath) return Navigation.searchCurrentItemPath(root, this.currentPath);
return [];
}
- get currentItem(): Gallery.Item | null {
+ get currentItem(): Item | null {
const path = this.currentItemPath;
return path.length > 0 ? path[path.length - 1] : null;
}
diff --git a/viewer/src/store/index.ts b/viewer/src/store/index.ts
index f86d66b..1f49589 100644
--- a/viewer/src/store/index.ts
+++ b/viewer/src/store/index.ts
@@ -17,12 +17,11 @@
-- along with this program. If not, see .
*/
+import GalleryStore from "@/store/galleryStore";
+import UIStore from "@/store/uiStore";
import Vue from "vue";
import Vuex from "vuex";
-import { extractVuexModule } from "vuex-class-component";
-import { createProxy } from "vuex-class-component";
-import UIStore from "@/store/uiStore";
-import GalleryStore from "@/store/galleryStore";
+import { createProxy, extractVuexModule } from "vuex-class-component";
Vue.use(Vuex);
diff --git a/viewer/src/store/uiStore.ts b/viewer/src/store/uiStore.ts
index f065cdd..f5bb898 100644
--- a/viewer/src/store/uiStore.ts
+++ b/viewer/src/store/uiStore.ts
@@ -17,8 +17,9 @@
-- along with this program. If not, see .
*/
-import { createModule, mutation, action } from "vuex-class-component";
+import { Config } from "@/@types/gallery";
import ItemComparators, { ItemSort } from "@/services/itemComparators";
+import { action, createModule, mutation } from "vuex-class-component";
const VuexModule = createModule({
namespaced: "uiStore",
@@ -49,7 +50,7 @@ export default class UIStore extends VuexModule {
this.sort = sort;
}
- @action async initFromConfig(config: Gallery.Config) {
+ @action async initFromConfig(config: Config) {
if (config.initialItemSort) {
const itemSort = ItemComparators.ITEM_SORTS[config.initialItemSort];
if (itemSort) this.setSort(itemSort);
--
cgit v1.2.3
From 92cb34b719b481faf417760f307241e8f6d777a9 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 2 Jul 2021 22:59:56 +0200
Subject: viewer: types normalization - tag.d.ts
GitHub: closes #301
---
viewer/src/store/galleryStore.ts | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
(limited to 'viewer/src/store')
diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index 3ef2036..e2adf18 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -18,6 +18,7 @@
*/
import { Config, Index, Item } from "@/@types/gallery";
+import { TagCategory, TagIndex, TagSearch } from "@/@types/tag";
import IndexFactory from "@/services/indexfactory";
import Navigation from "@/services/navigation";
import { action, createModule, mutation } from "vuex-class-component";
@@ -30,10 +31,10 @@ const VuexModule = createModule({
export default class GalleryStore extends VuexModule {
config: Config | null = null;
galleryIndex: Index | null = null;
- tagsIndex: Tag.Index = {};
- tagsCategories: Tag.Category[] = [];
+ tagsIndex: TagIndex = {};
+ tagsCategories: TagCategory[] = [];
currentPath: string | null = null;
- currentSearch: Tag.Search[] = [];
+ currentSearch: TagSearch[] = [];
// ---
@@ -45,11 +46,11 @@ export default class GalleryStore extends VuexModule {
this.galleryIndex = Object.freeze(galleryIndex);
}
- @mutation private setTagsIndex(tagsIndex: Tag.Index) {
+ @mutation private setTagsIndex(tagsIndex: TagIndex) {
this.tagsIndex = Object.freeze(tagsIndex);
}
- @mutation private setTagsCategories(tagsCategories: Tag.Category[]) {
+ @mutation private setTagsCategories(tagsCategories: TagCategory[]) {
this.tagsCategories = tagsCategories;
}
@@ -57,7 +58,7 @@ export default class GalleryStore extends VuexModule {
this.currentPath = currentPath;
}
- @mutation setCurrentSearch(currentSearch: Tag.Search[]) {
+ @mutation setCurrentSearch(currentSearch: TagSearch[]) {
this.currentSearch = currentSearch;
}
--
cgit v1.2.3