Merge branch 'develop' for release v2.0v2.0

3 files changed, 50 insertions, 21 deletions

diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index 0cffdd9..5d599aa 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -23,16 +23,15 @@ import Navigation from "@/services/navigation";
 
 const VuexModule = createModule({
   namespaced: "galleryStore",
-  strict: true
-})
+  strict: true,
+});
 
 export default class GalleryStore extends VuexModule {
-
   config: Gallery.Config | null = null;
   galleryIndex: Gallery.Index | null = null;
   tagsIndex: Tag.Index = {};
   tagsCategories: Tag.Category[] = [];
-  currentPath: string = "/";
+  currentPath: string | null = null;
   currentSearch: Tag.Search[] = [];
 
   // ---
@@ -65,8 +64,7 @@ export default class GalleryStore extends VuexModule {
 
   get currentItemPath(): Gallery.Item[] {
     const root = this.galleryIndex?.tree;
-    if (root)
-      return Navigation.searchCurrentItemPath(root, this.currentPath);
+    if (root && this.currentPath) return Navigation.searchCurrentItemPath(root, this.currentPath);
     return [];
   }
 
@@ -79,23 +77,30 @@ export default class GalleryStore extends VuexModule {
     return this.galleryIndex?.properties.galleryTitle ?? "ldgallery";
   }
 
+  get resourceRoot(): string {
+    return process.env.VUE_APP_DATA_URL + this.config!.galleryRoot;
+  }
+
   // ---
 
   // 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())
+    await fetch(`${process.env.VUE_APP_DATA_URL}${GalleryStore.getUrlConfig()}`, { cache: "no-cache" })
+      .then(GalleryStore.responseToJson)
       .then(this.setConfig);
+    return this.config!;
   }
 
   // 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())
+    const index = this.config?.galleryIndex ?? "index.json";
+    await fetch(`${process.env.VUE_APP_DATA_URL}${root}${index}`, { cache: "no-cache" })
+      .then(GalleryStore.responseToJson)
       .then(this.setGalleryIndex)
       .then(this.indexTags)
       .then(this.indexTagCategories);
+    return this.galleryIndex!;
   }
 
   // Indexes the gallery
@@ -119,4 +124,15 @@ export default class GalleryStore extends VuexModule {
     this.setCurrentSearch(results);
     return results;
   }
+
+  private static getUrlConfig() {
+    let search = window.location.search;
+    if (search.length > 1) return search.substr(1) + ".json";
+    return "config.json";
+  }
+
+  private static responseToJson(response: Response) {
+    if (!response.ok) throw new Error(`${response.status}: ${response.statusText}`);
+    return response.json();
+  }
 }
diff --git a/viewer/src/store/index.ts b/viewer/src/store/index.ts
index d5339e8..f86d66b 100644
--- a/viewer/src/store/index.ts
+++ b/viewer/src/store/index.ts
@@ -17,30 +17,30 @@
 -- 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";
 
-Vue.use(Vuex)
+Vue.use(Vuex);
 
 const store = new Vuex.Store({
   modules: {
     ...extractVuexModule(UIStore),
-    ...extractVuexModule(GalleryStore)
+    ...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));
+Vue.use(vue => (vue.prototype.$uiStore = createProxy(store, UIStore)));
+Vue.use(vue => (vue.prototype.$galleryStore = createProxy(store, GalleryStore)));
 
 declare module "vue/types/vue" {
   interface Vue {
-    $uiStore: UIStore,
-    $galleryStore: GalleryStore
+    $uiStore: UIStore;
+    $galleryStore: GalleryStore;
   }
 }
 
diff --git a/viewer/src/store/uiStore.ts b/viewer/src/store/uiStore.ts
index 892d35e..f065cdd 100644
--- a/viewer/src/store/uiStore.ts
+++ b/viewer/src/store/uiStore.ts
@@ -18,17 +18,18 @@
 */
 
 import { createModule, mutation, action } from "vuex-class-component";
+import ItemComparators, { ItemSort } from "@/services/itemComparators";
 
 const VuexModule = createModule({
   namespaced: "uiStore",
-  strict: true
-})
+  strict: true,
+});
 
 export default class UIStore extends VuexModule {
-
   fullscreen: boolean = false;
   fullWidth: boolean = window.innerWidth < Number(process.env.VUE_APP_FULLWIDTH_LIMIT);
   searchMode: boolean = false;
+  sort: ItemSort = ItemComparators.DEFAULT;
 
   // ---
 
@@ -43,4 +44,16 @@ export default class UIStore extends VuexModule {
   @mutation toggleSearchMode(value?: boolean) {
     this.searchMode = value ?? !this.searchMode;
   }
+
+  @mutation setSort(sort: ItemSort) {
+    this.sort = sort;
+  }
+
+  @action async initFromConfig(config: Gallery.Config) {
+    if (config.initialItemSort) {
+      const itemSort = ItemComparators.ITEM_SORTS[config.initialItemSort];
+      if (itemSort) this.setSort(itemSort);
+      else throw new Error("Unknown sort type: " + config.initialItemSort);
+    }
+  }
 }