From dc251fffc2998f1cf4f8e9631928c4b92ac0d90e Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Sun, 22 Dec 2019 07:40:55 +0100
Subject: viewer: Implemented the search by tags. Pushed the special urls to
 ENV.

---
 viewer/src/assets/scss/buefy.scss     | 24 ++++++++----------------
 viewer/src/assets/scss/global.scss    | 11 +++++++++++
 viewer/src/components/LdModeRadio.vue | 22 ++++++++++++++++++++++
 viewer/src/locales/en.json            |  8 ++++++--
 viewer/src/plugins/fontawesome.ts     |  4 ++--
 viewer/src/store/galleryStore.ts      | 21 +++++++++++++++++++--
 viewer/src/store/uiStore.ts           | 19 +++++++++++++++++++
 viewer/src/views/Gallery.vue          | 31 ++++++++++++++++---------------
 viewer/src/views/GalleryDirectory.vue |  5 +----
 viewer/src/views/GalleryImage.vue     |  2 +-
 viewer/src/views/GallerySearch.vue    | 25 +++++++++++++++++++++++++
 viewer/src/views/GalleryThumbnail.vue | 10 ++++++++--
 viewer/src/views/MainLayout.vue       |  2 +-
 viewer/src/views/PanelLeft.vue        |  9 +++++----
 14 files changed, 144 insertions(+), 49 deletions(-)
 create mode 100644 viewer/src/components/LdModeRadio.vue
 create mode 100644 viewer/src/views/GallerySearch.vue

(limited to 'viewer/src')

diff --git a/viewer/src/assets/scss/buefy.scss b/viewer/src/assets/scss/buefy.scss
index 5249899..b018fd3 100644
--- a/viewer/src/assets/scss/buefy.scss
+++ b/viewer/src/assets/scss/buefy.scss
@@ -5,28 +5,20 @@
 @import "buefy_variables";
 
 // 2. Setup your Custom Colors
-$linkedin: #0077b5;
-$linkedin-invert: findColorInvert($linkedin);
-$twitter: #55acee;
-$twitter-invert: findColorInvert($twitter);
-$github: #333;
-$github-invert: findColorInvert($github);
+// $linkedin: #0077b5;
+// $linkedin-invert: findColorInvert($linkedin);
 
 @import "~bulma/sass/utilities/derived-variables";
 
 // 3. Add new color variables to the color map.
 $addColors: (
-  "twitter": (
-    $twitter,
-    $twitter-invert
+  "green": (
+    $green,
+    $green-invert
   ),
-  "linkedin": (
-    $linkedin,
-    $linkedin-invert
-  ),
-  "github": (
-    $github,
-    $github-invert
+  "purple": (
+    $purple,
+    $purple-invert
   )
 );
 $colors: map-merge($colors, $addColors);
diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 0bfeab9..5d12976 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -12,3 +12,14 @@
 .nowrap {
   white-space: nowrap;
 }
+
+.flex {
+  display: flex;
+}
+.flex-column {
+  display: flex;
+  flex-direction: column;
+}
+.flex-center {
+  align-items: center;
+}
diff --git a/viewer/src/components/LdModeRadio.vue b/viewer/src/components/LdModeRadio.vue
new file mode 100644
index 0000000..614bf33
--- /dev/null
+++ b/viewer/src/components/LdModeRadio.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="flex">
+    <b-radio-button v-model="$uiStore.mode" native-value="navigation" type="is-green">
+      <fa-icon icon="folder" />
+      <span>{{$t('mode.navigation')}}</span>
+    </b-radio-button>
+    <b-radio-button v-model="$uiStore.mode" native-value="search" type="is-purple">
+      <fa-icon icon="search" />
+      <span>{{$t('mode.search')}}</span>
+    </b-radio-button>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdModeRadio extends Vue {}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index f24ac1f..d885872 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -1,5 +1,9 @@
 {
   "tagInput.placeholder": "Tags",
-  "panelLeft.title": "Filters",
-  "tagInput.nomatch": "No match"
+  "panelLeft.filters": "Filters",
+  "tagInput.nomatch": "No match",
+  "panelLeft.mode": "Mode",
+  "mode.navigation": "Navigation",
+  "mode.search": "Search",
+  "search.no-results": "No results"
 }
\ No newline at end of file
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index 9bf4dba..3af77b6 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -1,9 +1,9 @@
 import Vue from "vue";
 
 import { library } from "@fortawesome/fontawesome-svg-core";
-import { faExpandArrowsAlt } from "@fortawesome/free-solid-svg-icons";
+import { faExpandArrowsAlt, faFolder, faSearch } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 
-library.add(faExpandArrowsAlt);
+library.add(faExpandArrowsAlt, faFolder, faSearch);
 
 Vue.component("fa-icon", FontAwesomeIcon);
diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index c875837..ca36a32 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -22,6 +22,7 @@ export default class GalleryStore extends VuexModule {
 
     // ---
 
+    // Fetches the gallery's JSON metadata
     @action async fetchGalleryItems(url: string) {
         fetch(url)
             .then(response => response.json())
@@ -29,14 +30,18 @@ export default class GalleryStore extends VuexModule {
             .then(this.indexTags);
     }
 
+    // Indexes the gallery
     @action async indexTags() {
         let index = {};
         if (this.galleryItemsRoot)
             GalleryStore.pushTagsForItem(index, this.galleryItemsRoot);
-        console.log(index);
+        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);
         for (const tag of item.tags) {
@@ -44,7 +49,7 @@ export default class GalleryStore extends VuexModule {
             let lastPart: string | null = null;
             for (const part of parts) {
                 if (!index[part]) index[part] = { tag: part, items: [], children: {} };
-                index[part].items.push(item);
+                if (!index[part].items.includes(item)) index[part].items.push(item);
                 if (lastPart) index[lastPart].children[part] = index[part];
                 lastPart = part;
             }
@@ -52,4 +57,16 @@ export default class GalleryStore extends VuexModule {
         if (item.properties.type === "directory")
             item.properties.items.forEach(item => this.pushTagsForItem(index, item));
     }
+
+    // Searches for an item by path from a root item (navigation)
+    static searchCurrentItem(item: Gallery.Item, path: string): Gallery.Item | null {
+        if (path === item.path) return item;
+        if (item.properties.type === "directory" && path.startsWith(item.path)) {
+            const itemFound = item.properties.items
+                .map(item => this.searchCurrentItem(item, path))
+                .find(item => Boolean(item));
+            return itemFound || null;
+        }
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/viewer/src/store/uiStore.ts b/viewer/src/store/uiStore.ts
index e04b507..4a6f487 100644
--- a/viewer/src/store/uiStore.ts
+++ b/viewer/src/store/uiStore.ts
@@ -8,11 +8,30 @@ const VuexModule = createModule({
 export default class UIStore extends VuexModule {
 
     fullscreen: boolean = false;
+    mode: "navigation" | "search" = "navigation";
     currentTags: Tag.Node[] = [];
 
     // ---
 
+    get isModeSearch() {
+        return this.mode === "search";
+    }
+
+    get isModeNavigation() {
+        return this.mode === "navigation";
+    }
+
+    // ---
+
     @mutation toggleFullscreen() {
         this.fullscreen = !this.fullscreen;
     }
+
+    @mutation setModeNavigation() {
+        this.mode = "navigation";
+    }
+
+    @mutation setModeSearch() {
+        this.mode = "search";
+    }
 }
diff --git a/viewer/src/views/Gallery.vue b/viewer/src/views/Gallery.vue
index 2020280..38199b9 100644
--- a/viewer/src/views/Gallery.vue
+++ b/viewer/src/views/Gallery.vue
@@ -1,17 +1,20 @@
 <template>
   <div>
-    <gallery-directory v-if="isDirectory" :directory="currentItem" />
-    <gallery-image v-if="isImage" :image="currentItem" />
+    <gallery-search v-if="$uiStore.isModeSearch" :items="currentSearch" />
+    <gallery-directory v-else-if="isDirectory" :directory="currentItem" />
+    <gallery-image v-else-if="isImage" :image="currentItem" />
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
+import GallerySearch from "./GallerySearch.vue";
 import GalleryDirectory from "./GalleryDirectory.vue";
 import GalleryImage from "./GalleryImage.vue";
+import GalleryStore from "../store/galleryStore";
 
 @Component({
-  components: { GalleryDirectory, GalleryImage },
+  components: { GallerySearch, GalleryDirectory, GalleryImage },
 })
 export default class Gallery extends Vue {
   @Prop(String) readonly pathMatch!: string;
@@ -24,25 +27,23 @@ export default class Gallery extends Vue {
     return this.checkType("image");
   }
 
+  // Results of the search (by tags)
+  get currentSearch(): Gallery.Item[] {
+    const currentTags = this.$uiStore.currentTags;
+    let items = new Set<Gallery.Item>();
+    currentTags.flatMap(tag => tag.items).forEach(item => items.add(item));
+    return [...items];
+  }
+
+  // Item pointed by the URL (navigation)
   get currentItem(): Gallery.Item | null {
     const galleryItemsRoot = this.$galleryStore.galleryItemsRoot;
-    if (galleryItemsRoot) return this.searchCurrentItem(galleryItemsRoot, this.pathMatch);
+    if (galleryItemsRoot) return GalleryStore.searchCurrentItem(galleryItemsRoot, this.pathMatch);
     return null;
   }
 
   // ---
 
-  private searchCurrentItem(item: Gallery.Item, currentPath: string): Gallery.Item | null {
-    if (currentPath === item.path) return item;
-    if (item.properties.type === "directory" && currentPath.startsWith(item.path)) {
-      const itemFound = item.properties.items
-        .map(item => this.searchCurrentItem(item, currentPath))
-        .find(item => Boolean(item));
-      return itemFound || null;
-    }
-    return null;
-  }
-
   private checkType(type: string): boolean {
     return (this.currentItem && this.currentItem.properties.type === type) || false;
   }
diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue
index 1dda027..d464a07 100644
--- a/viewer/src/views/GalleryDirectory.vue
+++ b/viewer/src/views/GalleryDirectory.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <strong>Directory: {{directory.path}}</strong>
-    <div class="flex-thumbnails">
+    <div class="flex">
       <div v-for="(item) in directory.properties.items" :key="item.path">
         <router-link :to="item.path">
           <gallery-thumbnail :item="item" />
@@ -24,7 +24,4 @@ export default class GalleryDirectory extends Vue {
 </script>
 
 <style lang="scss">
-.flex-thumbnails {
-  display: flex;
-}
 </style>
diff --git a/viewer/src/views/GalleryImage.vue b/viewer/src/views/GalleryImage.vue
index 07f8cc8..04d29d9 100644
--- a/viewer/src/views/GalleryImage.vue
+++ b/viewer/src/views/GalleryImage.vue
@@ -13,7 +13,7 @@ export default class GalleryImage extends Vue {
   @Prop({ required: true }) readonly image!: Gallery.Image;
 
   get imageSrc() {
-    return `/gallery${this.image.path}`;
+    return `${process.env.VUE_APP_DATA_URL}${this.image.path}`;
   }
 }
 </script>
diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue
new file mode 100644
index 0000000..887c1a3
--- /dev/null
+++ b/viewer/src/views/GallerySearch.vue
@@ -0,0 +1,25 @@
+<template>
+  <div class="flex">
+    <div v-for="(item) in items" :key="item.path">
+      <router-link :to="item.path" @click.native="$uiStore.setModeNavigation()">
+        <gallery-thumbnail :item="item" />
+      </router-link>
+    </div>
+    <div v-if="items.length===0">{{$t('search.no-results')}}</div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop } from "vue-property-decorator";
+import GalleryThumbnail from "./GalleryThumbnail.vue";
+
+@Component({
+  components: { GalleryThumbnail },
+})
+export default class GalleryImage extends Vue {
+  @Prop({ required: true }) readonly items!: Gallery.Item[];
+}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue
index 8e3e826..fdfd9d3 100644
--- a/viewer/src/views/GalleryThumbnail.vue
+++ b/viewer/src/views/GalleryThumbnail.vue
@@ -1,5 +1,11 @@
 <template>
-  <img class="thumbnail" :src="imageSrc" :title="item.path" />
+  <div>
+    <img v-if="item.thumbnail" class="thumbnail" :src="imageSrc" :title="item.path" />
+    <div v-else class="flex-column flex-center">
+      <fa-icon icon="folder" class="fa-4x" />
+      {{item.path}}
+    </div>
+  </div>
 </template>
 
 <script lang="ts">
@@ -10,7 +16,7 @@ export default class GalleryThumbnail extends Vue {
   @Prop({ required: true }) readonly item!: Gallery.Item;
 
   get imageSrc() {
-    return `/gallery${this.item.thumbnail.path}`;
+    return `${process.env.VUE_APP_DATA_URL}${this.item.thumbnail}`;
   }
 }
 </script>
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index 2afd4b9..2a87ff1 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -25,7 +25,7 @@ export default class MainLayout extends Vue {
   fetchGalleryItems() {
     this.isLoading = true;
     this.$galleryStore
-      .fetchGalleryItems("/gallery/index.json")
+      .fetchGalleryItems(`${process.env.VUE_APP_DATA_URL}/index.json`)
       .finally(() => (this.isLoading = false))
       .catch(this.displayError);
   }
diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue
index 4b5bce0..c187ce6 100644
--- a/viewer/src/views/PanelLeft.vue
+++ b/viewer/src/views/PanelLeft.vue
@@ -1,8 +1,9 @@
 <template>
-  <div>
-    <b-field :label="$t('panelLeft.title')">
-      <ld-tag-input />
-    </b-field>
+  <div class="flex-column">
+    <h1>{{$t('panelLeft.mode')}}</h1>
+    <ld-mode-radio />
+    <h1>{{$t('panelLeft.filters')}}</h1>
+    <ld-tag-input />
   </div>
 </template>
 
-- 
cgit v1.2.3