Merge branch 'develop': release v1.0v1.0

3 files changed, 118 insertions, 115 deletions

diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index c4a039f..0cffdd9 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -18,93 +18,105 @@
 */
 
 import { createModule, mutation, action } from "vuex-class-component";
+import IndexFactory from "@/services/indexfactory";
+import Navigation from "@/services/navigation";
 
 const VuexModule = createModule({
-    namespaced: "galleryStore",
-    strict: true
+  namespaced: "galleryStore",
+  strict: true
 })
 
 export default class GalleryStore extends VuexModule {
 
-    galleryItemsRoot: Gallery.Item | null = null;
-    tags: Tag.Index = {};
-    currentPath: string = "/";
-
-    // ---
-
-    @mutation setGalleryItemsRoot(galleryItemsRoot: Gallery.Item) {
-        this.galleryItemsRoot = galleryItemsRoot;
-    }
-
-    @mutation private setTags(tags: Tag.Index) {
-        this.tags = tags;
-    }
-
-    @mutation setCurrentPath(currentPath: string) {
-        this.currentPath = currentPath;
-    }
-
-    get currentItemPath(): Gallery.Item[] {
-        const galleryItemsRoot = this.galleryItemsRoot;
-        if (galleryItemsRoot)
-            return GalleryStore.searchCurrentItemPath(galleryItemsRoot, this.currentPath);
-        return [];
-    }
-
-    get currentItem(): Gallery.Item | null {
-        const currentItemPath = this.currentItemPath;
-        return currentItemPath.length > 0 ? currentItemPath[currentItemPath.length - 1] : null;
-    }
-
-    // ---
-
-    // Fetches the gallery's JSON metadata
-    @action async fetchGalleryItems(url: string) {
-        fetch(url)
-            .then(response => response.json())
-            .then(this.setGalleryItemsRoot)
-            .then(this.indexTags);
-    }
-
-    // Indexes the gallery
-    @action async indexTags() {
-        let index = {};
-        if (this.galleryItemsRoot)
-            GalleryStore.pushTagsForItem(index, this.galleryItemsRoot);
-        console.log("Index: ", index);
-        this.setTags(index);
-    }
-
-    // ---
-
-    // Pushes all tags for a root item (and its children) to the index
-    private static pushTagsForItem(index: Tag.Index, item: Gallery.Item) {
-        console.log("IndexingTagsFor: ", item.path);
-        if (item.properties.type === "directory") {
-            item.properties.items.forEach(item => this.pushTagsForItem(index, item));
-            return; // Directories are not indexed
-        }
-        for (const tag of item.tags) {
-            const parts = tag.split('.');
-            let lastPart: string | null = null;
-            for (const part of parts) {
-                if (!index[part]) index[part] = { tag: part, items: [], children: {} };
-                if (!index[part].items.includes(item)) index[part].items.push(item);
-                if (lastPart) index[lastPart].children[part] = index[part];
-                lastPart = part;
-            }
-        }
-    }
-
-    // Searches for an item by path from a root item (navigation)
-    private static searchCurrentItemPath(item: Gallery.Item, path: string): Gallery.Item[] {
-        if (path === item.path) return [item];
-        if (item.properties.type === "directory" && path.startsWith(item.path)) {
-            const itemChain = item.properties.items
-                .map(item => this.searchCurrentItemPath(item, path))
-                .find(itemChain => itemChain.length > 0);
-            if (itemChain) return [item, ...itemChain];
-        }
-        return [];
-    }
-}
\ No newline at end of file
+  config: Gallery.Config | null = null;
+  galleryIndex: Gallery.Index | null = null;
+  tagsIndex: Tag.Index = {};
+  tagsCategories: Tag.Category[] = [];
+  currentPath: string = "/";
+  currentSearch: Tag.Search[] = [];
+
+  // ---
+
+  @mutation private setConfig(config: Gallery.Config) {
+    this.config = config;
+  }
+
+  @mutation setGalleryIndex(galleryIndex: Gallery.Index) {
+    this.galleryIndex = Object.freeze(galleryIndex);
+  }
+
+  @mutation private setTagsIndex(tagsIndex: Tag.Index) {
+    this.tagsIndex = Object.freeze(tagsIndex);
+  }
+
+  @mutation private setTagsCategories(tagsCategories: Tag.Category[]) {
+    this.tagsCategories = tagsCategories;
+  }
+
+  @mutation setCurrentPath(currentPath: string) {
+    this.currentPath = currentPath;
+  }
+
+  @mutation setCurrentSearch(currentSearch: Tag.Search[]) {
+    this.currentSearch = currentSearch;
+  }
+
+  // ---
+
+  get currentItemPath(): Gallery.Item[] {
+    const root = this.galleryIndex?.tree;
+    if (root)
+      return Navigation.searchCurrentItemPath(root, this.currentPath);
+    return [];
+  }
+
+  get currentItem(): Gallery.Item | null {
+    const path = this.currentItemPath;
+    return path.length > 0 ? path[path.length - 1] : null;
+  }
+
+  get galleryTitle(): string {
+    return this.galleryIndex?.properties.galleryTitle ?? "ldgallery";
+  }
+
+  // ---
+
+  // Fetches the gallery's JSON config
+  @action async fetchConfig() {
+    return fetch(`${process.env.VUE_APP_DATA_URL}config.json`, { cache: "no-cache" })
+      .then(response => response.json())
+      .then(this.setConfig);
+  }
+
+  // Fetches the gallery's JSON metadata
+  @action async fetchGalleryItems() {
+    const root = this.config?.galleryRoot ?? "";
+    return fetch(`${process.env.VUE_APP_DATA_URL}${root}index.json`, { cache: "no-cache" })
+      .then(response => response.json())
+      .then(this.setGalleryIndex)
+      .then(this.indexTags)
+      .then(this.indexTagCategories);
+  }
+
+  // Indexes the gallery
+  @action async indexTags() {
+    const root = this.galleryIndex?.tree ?? null;
+    const index = IndexFactory.generateTags(root);
+    this.setTagsIndex(index);
+    return index;
+  }
+
+  // Indexes the proposed categories
+  @action async indexTagCategories() {
+    const categories = IndexFactory.generateCategories(this.tagsIndex, this.galleryIndex?.properties.tagCategories);
+    this.setTagsCategories(categories);
+    return categories;
+  }
+
+  // Searches for tags
+  @action async search(filters: string[]) {
+    const results = filters.flatMap(filter => IndexFactory.searchTags(this.tagsIndex, filter, true));
+    this.setCurrentSearch(results);
+    return results;
+  }
+}
diff --git a/viewer/src/store/index.ts b/viewer/src/store/index.ts
index 0277fa4..d5339e8 100644
--- a/viewer/src/store/index.ts
+++ b/viewer/src/store/index.ts
@@ -17,12 +17,12 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import Vue from 'vue'
-import Vuex from 'vuex'
+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 UIStore from "@/store/uiStore";
+import GalleryStore from "@/store/galleryStore";
 
 Vue.use(Vuex)
 
@@ -30,13 +30,14 @@ const store = new Vuex.Store({
   modules: {
     ...extractVuexModule(UIStore),
     ...extractVuexModule(GalleryStore)
-  }
+  },
+  strict: process.env.NODE_ENV !== "production",
 });
 
 Vue.use((vue) => vue.prototype.$uiStore = createProxy(store, UIStore));
 Vue.use((vue) => vue.prototype.$galleryStore = createProxy(store, GalleryStore));
 
-declare module 'vue/types/vue' {
+declare module "vue/types/vue" {
   interface Vue {
     $uiStore: UIStore,
     $galleryStore: GalleryStore
diff --git a/viewer/src/store/uiStore.ts b/viewer/src/store/uiStore.ts
index 6bcc538..892d35e 100644
--- a/viewer/src/store/uiStore.ts
+++ b/viewer/src/store/uiStore.ts
@@ -20,37 +20,27 @@
 import { createModule, mutation, action } from "vuex-class-component";
 
 const VuexModule = createModule({
-    namespaced: "uiStore",
-    strict: false
+  namespaced: "uiStore",
+  strict: true
 })
 
 export default class UIStore extends VuexModule {
 
-    fullscreen: boolean = false;
-    mode: "navigation" | "search" = "navigation";
-    currentTags: Tag.Search[] = [];
+  fullscreen: boolean = false;
+  fullWidth: boolean = window.innerWidth < Number(process.env.VUE_APP_FULLWIDTH_LIMIT);
+  searchMode: boolean = false;
 
-    // ---
+  // ---