9 files changed, 237 insertions, 296 deletions

diff --git a/viewer/src/views/Gallery.vue b/viewer/src/views/Gallery.vue
deleted file mode 100644
index fad7cc3..0000000
--- a/viewer/src/views/Gallery.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<!-- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2019-2020  Guillaume FOUET
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <div>
-    <gallery-search v-if="$uiStore.isModeSearch" :items="currentSearch" />
-    <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
-    <gallery-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
-    <div v-else>{{$t("gallery.unknowntype")}}</div>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop, Watch } from "vue-property-decorator";
-import { Operation } from '@/@types/tag/Operation';
-import GallerySearch from "./GallerySearch.vue";
-import GalleryDirectory from "./GalleryDirectory.vue";
-import GalleryPicture from "./GalleryPicture.vue";
-
-@Component({
-  components: { GallerySearch, GalleryDirectory, GalleryPicture },
-})
-export default class Gallery extends Vue {
-  @Prop(String) readonly pathMatch!: string;
-
-  mounted() {
-    this.pathChanged()
-  }
-
-  @Watch("pathMatch")
-  pathChanged() {
-    console.log("Path: ", this.pathMatch);
-    this.$galleryStore.setCurrentPath(this.pathMatch);
-  }
-
-  // Results of the search (by tags)
-  get currentSearch(): Gallery.Item[] {
-    const byOperation = this.extractTagsByOperation(this.$uiStore.currentTags);
-    const intersection = this.extractIntersection(byOperation);
-    const substraction = this.extractSubstraction(byOperation);
-    return this.aggregateAll(byOperation, intersection, substraction);
-  }
-
-  // ---
-
-  private checkType(type: string): boolean {
-    return this.$galleryStore.currentItem?.properties.type === type ?? false;
-  }
-
-  private extractTagsByOperation(currentTags: Tag.Search[]): Tag.SearchByOperation {
-    let byOperation: Tag.SearchByOperation = {};
-    Object.values(Operation)
-      .forEach(operation => byOperation[operation] = currentTags.filter(tag => tag.operation === operation));
-    return byOperation;
-  }
-
-  private extractIntersection(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    let intersection = new Set<Gallery.Item>();
-    if (byOperation[Operation.INTERSECTION].length > 0) {
-      byOperation[Operation.INTERSECTION]
-        .map(tag => tag.items)
-        .reduce((a,b) => a.filter(c => b.includes(c)))
-        .flatMap(items=>items)
-        .forEach(item => intersection.add(item));
-    }
-    return intersection;
-  }
-
-  private extractSubstraction(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    let substraction = new Set<Gallery.Item>();
-    if (byOperation[Operation.SUBSTRACTION].length > 0) {
-      byOperation[Operation.SUBSTRACTION]
-        .flatMap(tag => tag.items)
-        .forEach(item => substraction.add(item));
-    }
-    return substraction;
-  }
-
-  private aggregateAll(byOperation: Tag.SearchByOperation, intersection: Set<Gallery.Item>, substraction: Set<Gallery.Item>): Gallery.Item[] {
-    byOperation[Operation.ADDITION].flatMap(tag => tag.items).forEach(item => intersection.add(item));
-    substraction.forEach(item => intersection.delete(item));
-    return [...intersection];
-  }
-}
-</script>
-
-<style lang="scss">
-</style>
diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue
index eb98595..30f651c 100644
--- a/viewer/src/views/GalleryDirectory.vue
+++ b/viewer/src/views/GalleryDirectory.vue
@@ -18,26 +18,24 @@
 -->
 
 <template>
-  <div>
-    <div class="flex">
-      <div v-for="(item) in directory.properties.items" :key="item.path">
-        <router-link :to="item.path">
-          <gallery-thumbnail :item="item" />
-        </router-link>
-      </div>
-    </div>
-  </div>
+  <ld-gallery :items="orderedItems()" :noresult="$t('directory.no-results')" />
 </template>
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
-import GalleryThumbnail from "./GalleryThumbnail.vue";
+import Navigation from "@/services/navigation";
 
-@Component({
-  components: { GalleryThumbnail },
-})
+@Component
 export default class GalleryDirectory extends Vue {
   @Prop({ required: true }) readonly directory!: Gallery.Directory;
+
+  mounted() {
+    this.$uiStore.toggleFullscreen(false);
+  }
+
+  orderedItems() {
+    return Navigation.directoriesFirst(this.directory.properties.items);
+  }
 }
 </script>
 
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
new file mode 100644
index 0000000..7c6d11b
--- /dev/null
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -0,0 +1,62 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <div>
+    <gallery-search v-if="query.length" :path="path" />
+    <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
+    <ld-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
+    <div v-else>{{$t("gallery.unknowntype")}}</div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Watch } from "vue-property-decorator";
+import { Operation } from "@/@types/Operation";
+import Navigation from "@/services/navigation";
+import GalleryDirectory from "./GalleryDirectory.vue";
+import GallerySearch from "@/views/GallerySearch.vue";
+
+@Component({
+  components: {
+    GalleryDirectory,
+    GallerySearch,
+  },
+})
+export default class GalleryNavigation extends Vue {
+  @Prop(String) readonly path!: string;
+  @Prop(Array) readonly query!: string[];
+
+  mounted() {
+    this.pathChanged();
+  }
+
+  @Watch("path")
+  pathChanged() {
+    this.$galleryStore.setCurrentPath(this.path);
+  }
+
+  private checkType(type: Gallery.ItemType): boolean {
+    return Navigation.checkType(this.$galleryStore.currentItem, type);
+  }
+}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/viewer/src/views/GalleryPicture.vue b/viewer/src/views/GalleryPicture.vue
deleted file mode 100644
index 3689cb3..0000000
--- a/viewer/src/views/GalleryPicture.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- ldgallery - A static generator which turns a collection of tagged