From 252dd6fc6f53ecd8b28e05a0514429472d53d08e Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 06:46:31 +0100
Subject: viewer: finalized the command buttons. added the 'up to parent'
 command

---
 viewer/src/locales/en.json         |  6 +++-
 viewer/src/plugins/fontawesome.ts  |  6 ++--
 viewer/src/store/uiStore.ts        |  5 +++
 viewer/src/views/MainLayout.vue    |  7 ++--
 viewer/src/views/PanelTop.vue      | 64 +++++++----------------------------
 viewer/src/views/TopBreadcrumb.vue | 63 +++++++++++++++++++++++++++++++++++
 viewer/src/views/TopCommand.vue    | 68 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 162 insertions(+), 57 deletions(-)
 create mode 100644 viewer/src/views/TopBreadcrumb.vue
 create mode 100644 viewer/src/views/TopCommand.vue

(limited to 'viewer/src')

diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index d44a116..987d4d1 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -7,5 +7,9 @@
   "mode.search": "Search",
   "search.no-results": "No results",
   "panelLeft.propositions": "Proposed tags",
-  "gallery.unknowntype": "Unknown item type"
+  "gallery.unknowntype": "Unknown item type",
+  "title.tags": "Tags",
+  "title.home": "Home",
+  "title.back": "Back",
+  "title.parent": "Parent"
 }
\ No newline at end of file
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index bf2ff5f..fdbfcdb 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -24,27 +24,29 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import {
     faFolder,
     faSearch,
-    faTag,
     faPlus,
     faMinus,
     faImage,
     faHome,
     faArrowLeft,
+    faLevelUpAlt,
     faTags,
     faAngleRight,
+    faWindowClose,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
     faFolder,
     faSearch,
-    faTag,
     faPlus,
     faMinus,
     faImage,
     faHome,
     faArrowLeft,
+    faLevelUpAlt,
     faTags,
     faAngleRight,
+    faWindowClose,
 );
 
 Vue.component("fa-icon", FontAwesomeIcon);
diff --git a/viewer/src/store/uiStore.ts b/viewer/src/store/uiStore.ts
index 6bcc538..f7484de 100644
--- a/viewer/src/store/uiStore.ts
+++ b/viewer/src/store/uiStore.ts
@@ -27,6 +27,7 @@ const VuexModule = createModule({
 export default class UIStore extends VuexModule {
 
     fullscreen: boolean = false;
+    fullWidth: boolean = true;
     mode: "navigation" | "search" = "navigation";
     currentTags: Tag.Search[] = [];
 
@@ -46,6 +47,10 @@ export default class UIStore extends VuexModule {
         this.fullscreen = !this.fullscreen;
     }
 
+    @mutation toggleFullWidth() {
+        this.fullWidth = !this.fullWidth;
+    }
+
     @mutation setModeNavigation() {
         this.mode = "navigation";
     }
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index f0809b6..c202def 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -18,7 +18,7 @@
 -->
 
 <template>
-  <div :class="{fullscreen: $uiStore.fullscreen}">
+  <div :class="{fullscreen: $uiStore.fullscreen, fullWidth: $uiStore.fullWidth}">
     <panel-top v-if="!isLoading" class="layout layout-top" />
     <panel-left v-if="!isLoading" class="layout layout-left" />
     <router-view v-if="!isLoading" class="layout layout-content scrollbar" />
@@ -98,8 +98,11 @@ html {
   }
 }
 .fullscreen {
-  --layout-left: 0px;
   --layout-top: 0px;
+  @extend .fullWidth;
+}
+.fullWidth {
+  --layout-left: 0px;
   .layout {
     &.layout-left {
       transform: translate(-$layout-left, 0);
diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue
index e7421f0..3553789 100644
--- a/viewer/src/views/PanelTop.vue
+++ b/viewer/src/views/PanelTop.vue
@@ -19,64 +19,24 @@
 
 <template>
   <div class="flex">
-    <div class="command-btns">
-      <fa-icon icon="tags" size="lg" class="disabled" />
-      <router-link to="/" :class="{disabled: $galleryStore.currentItemPath.length <= 1}">
-        <fa-icon icon="home" size="lg" />
-      </router-link>
-      <div class="link" @click="$router.go(-1)">
-        <fa-icon icon="arrow-left" size="lg" />
-      </div>
-    </div>
-    <ul class="pathBreadcrumb">
-      <li v-for="(item,idx) in $galleryStore.currentItemPath" :key="item.path">
-        <router-link :to="item.path">
-          <fa-icon :icon="getIcon(item)" size="lg" />
-          {{item.title}}
-        </router-link>
-        <fa-icon v-if="(idx+1) < $galleryStore.currentItemPath.length" icon="angle-right" />
-      </li>
-    </ul>
+    <top-command />
+    <top-breadcrumb />
   </div>
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, Watch } from "vue-property-decorator";
-import Gallery from "./Gallery.vue";
+import { Component, Vue } from "vue-property-decorator";
+import TopBreadcrumb from "./TopBreadcrumb.vue";
+import TopCommand from "./TopCommand.vue";
 
-@Component
-export default class PanelTop extends Vue {
-  getIcon(item: Gallery.Item) {
-    if (item.path.length <= 1) return "home";
-    switch (item.properties.type) {
-      case "picture":
-        return "image";
-      case "directory":
-        return "folder";
-    }
-  }
-}
+@Component({
+  components: {
+    TopCommand,
+    TopBreadcrumb,
+  },
+})
+export default class PanelTop extends Vue {}
 </script>
 
 <style lang="scss">
-@import "@/assets/scss/theme.scss";
-
-.pathBreadcrumb {
-  display: flex;
-  list-style: none;
-  margin: 5px;
-  a {
-    margin-right: 5px;
-  }
-  li:not(:first-child) {
-    margin-left: 10px;
-  }
-}
-.command-btns {
-  display: flex;
-  justify-content: space-around;
-  vertical-align: middle;
-  align-items: center;
-  width: $layout-left;
-}
 </style>
diff --git a/viewer/src/views/TopBreadcrumb.vue b/viewer/src/views/TopBreadcrumb.vue
new file mode 100644
index 0000000..1a14123
--- /dev/null
+++ b/viewer/src/views/TopBreadcrumb.vue
@@ -0,0 +1,63 @@
+<!-- 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>
+  <ul class="pathBreadcrumb">
+    <li v-for="(item,idx) in $galleryStore.currentItemPath" :key="item.path">
+      <router-link :to="item.path">
+        <fa-icon :icon="getIcon(item)" size="lg" />
+        {{item.title}}
+      </router-link>
+      <fa-icon v-if="(idx+1) < $galleryStore.currentItemPath.length" icon="angle-right" />
+    </li>
+  </ul>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+
+@Component
+export default class TopBreadcrumb extends Vue {
+  getIcon(item: Gallery.Item) {
+    if (item.path.length <= 1) return "home";
+    switch (item.properties.type) {
+      case "picture":
+        return "image";
+      case "directory":
+        return "folder";
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.pathBreadcrumb {
+  border-left: 2px solid rgba(white, 0.1);
+  padding-left: 15px;
+  display: flex;
+  list-style: none;
+  margin: 5px;
+  a {
+    margin-right: 5px;
+  }
+  li:not(:first-child) {
+    margin-left: 10px;
+  }
+}
+</style>
diff --git a/viewer/src/views/TopCommand.vue b/viewer/src/views/TopCommand.vue
new file mode 100644
index 0000000..b5d16e8
--- /dev/null
+++ b/viewer/src/views/TopCommand.vue
@@ -0,0 +1,68 @@
+<!-- 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 class="flex command-btns">
+    <div class="link" title="$t('title.tags')" @click="$uiStore.toggleFullWidth()">
+      <fa-icon :icon="commandTagsIcon()" size="lg" />
+    </div>
+    <router-link to="/" :class="{disabled: isRoot()}" title="$t('title.home')">
+      <fa-icon icon="home" size="lg" />
+    </router-link>
+    <div class="link" title="$t('title.back')" @click="$router.go(-1)">
+      <fa-icon icon="arrow-left" size="lg" />
+    </div>
+    <router-link :class="{disabled: isRoot()}" title="$t('title.parent')" :to="parent()">
+      <fa-icon icon="folder" size="xs" />
+      <fa-icon icon="level-up-alt" size="lg" />
+    </router-link>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+import { RawLocation } from "vue-router";
+
+@Component
+export default class TopCommand extends Vue {
+  commandTagsIcon(): string {
+    return this.$uiStore.fullWidth ? "tags" : "window-close";
+  }
+
+  isRoot(): boolean {
+    return this.$galleryStore.currentItemPath.length <= 1;
+  }
+
+  parent(): RawLocation {
+    if (!this.isRoot()) return this.$galleryStore.currentItemPath[this.$galleryStore.currentItemPath.length - 2];
+    return "";
+  }
+}
+</script>
+
+<style lang="scss">
+@import "@/assets/scss/theme.scss";
+
+.command-btns {
+  justify-content: space-around;
+  vertical-align: middle;
+  align-items: center;
+  width: $layout-left;
+}
+</style>
-- 
cgit v1.2.3


From 914aa63cb65f869be9b1707c160847be16f79a68 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 06:55:37 +0100
Subject: viewer: unified CSS classes to kebab case

---
 viewer/src/components/LdTagInput.vue  | 4 ++--
 viewer/src/views/GalleryPicture.vue   | 6 +++---
 viewer/src/views/GalleryThumbnail.vue | 2 +-
 viewer/src/views/MainLayout.vue       | 6 +++---
 viewer/src/views/TopBreadcrumb.vue    | 4 ++--
 viewer/src/views/TopCommand.vue       | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/components/LdTagInput.vue b/viewer/src/components/LdTagInput.vue
index ff354c6..7bbecec 100644
--- a/viewer/src/components/LdTagInput.vue
+++ b/viewer/src/components/LdTagInput.vue
@@ -28,7 +28,7 @@
     field="display"
     type="is-black"
     size="is-medium"
-    class="panelTagInput"
+    class="paneltag-input"
     @typing="searchTags"
     @add="onAdd"
     @remove="onRemove"
@@ -119,7 +119,7 @@ export default class LdTagInput extends Vue {
 </script>
 
 <style lang="scss">
-.panelTagInput .autocomplete .dropdown-content {
+.paneltag-input .autocomplete .dropdown-content {
   max-height: 300px;
 }
 </style>
diff --git a/viewer/src/views/GalleryPicture.vue b/viewer/src/views/GalleryPicture.vue
index 323333a..9f26282 100644
--- a/viewer/src/views/GalleryPicture.vue
+++ b/viewer/src/views/GalleryPicture.vue
@@ -21,7 +21,7 @@
   <div
     v-dragscroll
     class="scrollbar"
-    :class="{fitToScreen: !$uiStore.fullscreen, originalSize: $uiStore.fullscreen}"
+    :class="{'fit-to-screen': !$uiStore.fullscreen, 'original-size': $uiStore.fullscreen}"
     @click="onClick"
     @dragscrollstart="dragging=true"
   >
@@ -50,7 +50,7 @@ export default class GalleryPicture extends Vue {
 </script>
 
 <style lang="scss">
-.fitToScreen {
+.fit-to-screen {
   display: flex;
   justify-content: space-around;
   height: 100%;
@@ -59,7 +59,7 @@ export default class GalleryPicture extends Vue {
     cursor: zoom-in;
   }
 }
-.originalSize {
+.original-size {
   display: block;
   text-align: center;
   cursor: grab;
diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue
index 41a59e1..2ed0bc2 100644
--- a/viewer/src/views/GalleryThumbnail.vue
+++ b/viewer/src/views/GalleryThumbnail.vue
@@ -18,7 +18,7 @@
 -->
 
 <template>
-  <div class="forcedsize" :class="{preload: loading}">
+  <div class="forcedsize" :class="{'preload': loading}">
     <v-lazy-image
       v-if="item.thumbnail"
       class="thumbnail"
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index c202def..78d8a8a 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -18,7 +18,7 @@
 -->
 
 <template>
-  <div :class="{fullscreen: $uiStore.fullscreen, fullWidth: $uiStore.fullWidth}">
+  <div :class="{'fullscreen': $uiStore.fullscreen, 'fullwidth': $uiStore.fullWidth}">
     <panel-top v-if="!isLoading" class="layout layout-top" />
     <panel-left v-if="!isLoading" class="layout layout-left" />
     <router-view v-if="!isLoading" class="layout layout-content scrollbar" />
@@ -99,9 +99,9 @@ html {
 }
 .fullscreen {
   --layout-top: 0px;
-  @extend .fullWidth;
+  @extend .fullwidth;
 }
-.fullWidth {
+.fullwidth {
   --layout-left: 0px;
   .layout {
     &.layout-left {
diff --git a/viewer/src/views/TopBreadcrumb.vue b/viewer/src/views/TopBreadcrumb.vue
index 1a14123..eb7fdd1 100644
--- a/viewer/src/views/TopBreadcrumb.vue
+++ b/viewer/src/views/TopBreadcrumb.vue
@@ -18,7 +18,7 @@
 -->
 
 <template>
-  <ul class="pathBreadcrumb">
+  <ul class="ld-breadcrumb">
     <li v-for="(item,idx) in $galleryStore.currentItemPath" :key="item.path">
       <router-link :to="item.path">
         <fa-icon :icon="getIcon(item)" size="lg" />
@@ -47,7 +47,7 @@ export default class TopBreadcrumb extends Vue {
 </script>
 
 <style lang="scss">
-.pathBreadcrumb {
+.ld-breadcrumb {
   border-left: 2px solid rgba(white, 0.1);
   padding-left: 15px;
   display: flex;
diff --git a/viewer/src/views/TopCommand.vue b/viewer/src/views/TopCommand.vue
index b5d16e8..dc79fa7 100644
--- a/viewer/src/views/TopCommand.vue
+++ b/viewer/src/views/TopCommand.vue
@@ -22,13 +22,13 @@
     <div class="link" title="$t('title.tags')" @click="$uiStore.toggleFullWidth()">
       <fa-icon :icon="commandTagsIcon()" size="lg" />
     </div>
-    <router-link to="/" :class="{disabled: isRoot()}" title="$t('title.home')">
+    <router-link to="/" :class="{'disabled': isRoot()}" title="$t('title.home')">
       <fa-icon icon="home" size="lg" />
     </router-link>
     <div class="link" title="$t('title.back')" @click="$router.go(-1)">
       <fa-icon icon="arrow-left" size="lg" />
     </div>
-    <router-link :class="{disabled: isRoot()}" title="$t('title.parent')" :to="parent()">
+    <router-link :class="{'disabled': isRoot()}" title="$t('title.parent')" :to="parent()">
       <fa-icon icon="folder" size="xs" />
       <fa-icon icon="level-up-alt" size="lg" />
     </router-link>
-- 
cgit v1.2.3


From 1e0b65a0a4556810ad4a7acac764a57a7daf8cf0 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 07:10:34 +0100
Subject: viewer: minor code cleaning

---
 viewer/src/plugins/router.ts     |  8 ++++----
 viewer/src/store/galleryStore.ts | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/plugins/router.ts b/viewer/src/plugins/router.ts
index 0f3d2c7..8b4a8dc 100644
--- a/viewer/src/plugins/router.ts
+++ b/viewer/src/plugins/router.ts
@@ -19,17 +19,17 @@
 
 import Vue from "vue";
 import VueRouter from "vue-router";
-import Gallery from "@/views/MainGallery.vue";
+import MainGallery from "@/views/MainGallery.vue";
 
 Vue.use(VueRouter);
 
-// async way : component: () => import(/* webpackChunkName: "Gallery" */ "@/views/Gallery.vue"),
+// async way : component: () => import(/* webpackChunkName: "MainGallery" */ "@/views/MainGallery.vue"),
 
 const routes = [
   {
     path: "*",
-    name: "Gallery",
-    component: Gallery,
+    name: "MainGallery",
+    component: MainGallery,
     props: true
   },
 ];
diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index b2ff74e..1c95fe7 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -46,15 +46,15 @@ export default class GalleryStore extends VuexModule {
     }
 
     get currentItemPath(): Gallery.Item[] {
-        const galleryItemsRoot = this.galleryItemsRoot;
-        if (galleryItemsRoot)
-            return GalleryStore.searchCurrentItemPath(galleryItemsRoot, this.currentPath);
+        const root = this.galleryItemsRoot;
+        if (root)
+            return GalleryStore.searchCurrentItemPath(root, this.currentPath);
         return [];
     }
 
     get currentItem(): Gallery.Item | null {
-        const currentItemPath = this.currentItemPath;
-        return currentItemPath.length > 0 ? currentItemPath[currentItemPath.length - 1] : null;
+        const path = this.currentItemPath;
+        return path.length > 0 ? path[path.length - 1] : null;
     }
 
     // ---
@@ -69,9 +69,9 @@ export default class GalleryStore extends VuexModule {
 
     // Indexes the gallery
     @action async indexTags() {
+        const root = this.galleryItemsRoot;
         let index = {};
-        if (this.galleryItemsRoot)
-            GalleryStore.pushTagsForItem(index, this.galleryItemsRoot);
+        if (root) GalleryStore.pushTagsForItem(index, root);
         console.log("Index: ", index);
         this.setTags(index);
     }
-- 
cgit v1.2.3


From 63e7ef894755deef318d9dcb129a94d34f33bdf2 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 07:59:58 +0100
Subject: viewer: unknown types now show a question mark icon instead of a
 folder icon. this is unified with the breadcrumb

---
 viewer/src/plugins/fontawesome.ts     |  2 ++
 viewer/src/tools.ts                   | 12 ++++++++++++
 viewer/src/views/GalleryThumbnail.vue | 11 ++++++++---
 viewer/src/views/TopBreadcrumb.vue    |  9 ++-------
 4 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index fdbfcdb..460e407 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -33,6 +33,7 @@ import {
     faTags,
     faAngleRight,
     faWindowClose,
+    faQuestionCircle,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
@@ -47,6 +48,7 @@ library.add(
     faTags,
     faAngleRight,
     faWindowClose,
+    faQuestionCircle,
 );
 
 Vue.component("fa-icon", FontAwesomeIcon);
diff --git a/viewer/src/tools.ts b/viewer/src/tools.ts
index 57a889d..94fdf33 100644
--- a/viewer/src/tools.ts
+++ b/viewer/src/tools.ts
@@ -43,5 +43,17 @@ export default class Tools {
     ];
   }
 
+  public static getIcon(item: Gallery.Item): string {
+    if (item.path.length <= 1) return "home";
+    switch (item.properties.type) {
+      case "picture":
+        return "image";
+      case "directory":
+        return "folder";
+      case "other":
+      default:
+        return "question-circle";
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue
index 2ed0bc2..2a372cd 100644
--- a/viewer/src/views/GalleryThumbnail.vue
+++ b/viewer/src/views/GalleryThumbnail.vue
@@ -22,13 +22,13 @@
     <v-lazy-image
       v-if="item.thumbnail"
       class="thumbnail"
-      :src="pictureSrc"
+      :src="pictureSrc()"
       :title="item.path"
       @intersect="loading=true"
       @load="loading=false"
     />
     <div v-else class="flex-column flex-center">
-      <fa-icon icon="folder" size="4x" />
+      <fa-icon :icon="getIcon()" size="4x" />
       {{item.title}}
     </div>
   </div>
@@ -36,6 +36,7 @@
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
+import Tools from "@/tools";
 
 @Component
 export default class GalleryThumbnail extends Vue {
@@ -43,9 +44,13 @@ export default class GalleryThumbnail extends Vue {
 
   loading: boolean = false;
 
-  get pictureSrc() {
+  pictureSrc() {
     return `${process.env.VUE_APP_DATA_URL}${this.item.thumbnail}`;
   }
+
+  getIcon() {
+    return Tools.getIcon(this.item);
+  }
 }
 </script>
 
diff --git a/viewer/src/views/TopBreadcrumb.vue b/viewer/src/views/TopBreadcrumb.vue
index eb7fdd1..9104b80 100644
--- a/viewer/src/views/TopBreadcrumb.vue
+++ b/viewer/src/views/TopBreadcrumb.vue
@@ -31,17 +31,12 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
+import Tools from "@/tools";
 
 @Component
 export default class TopBreadcrumb extends Vue {
   getIcon(item: Gallery.Item) {
-    if (item.path.length <= 1) return "home";
-    switch (item.properties.type) {
-      case "picture":
-        return "image";
-      case "directory":
-        return "folder";
-    }
+    return Tools.getIcon(item);
   }
 }
 </script>
-- 
cgit v1.2.3


From a7d459a2620fa9523dd7ce8c9de519133ad5b1b7 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 08:01:23 +0100
Subject: viewer: tag propositions depend on current's directory. resolves #22

---
 viewer/src/components/LdProposition.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index 02f7fe4..a380021 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -56,8 +56,10 @@ export default class LdTagInput extends Vue {
         .filter(rawTag => !currentTags.find(currentTag => currentTag.tag === rawTag))
         .forEach(rawTag => (propositions[rawTag] = (propositions[rawTag] ?? 0) + 1));
     } else {
-      // Tags count from the whole gallery
-      Object.entries(this.$galleryStore.tags).forEach(entry => (propositions[entry[0]] = entry[1].items.length));
+      // Tags count from the current directory
+      this.$galleryStore.currentItem?.tags
+        .map(tag => this.$galleryStore.tags[tag]) // FIXME: Folders with the same name are merged in the index
+        .forEach(tagindex => (propositions[tagindex.tag] = tagindex.items.length));
     }
 
     return Object.entries(propositions)
-- 
cgit v1.2.3


From 170da2d55fec0359cbac780786383710b734eda7 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 09:17:57 +0100
Subject: viewer: code cleaning, moved some views to components

---
 viewer/src/@types/Operation.ts          | 24 ++++++++++
 viewer/src/@types/gallery.d.ts          | 52 +++++++++++++++++++++
 viewer/src/@types/gallery/index.d.ts    | 52 ---------------------
 viewer/src/@types/tag.d.ts              | 34 ++++++++++++++
 viewer/src/@types/tag/Operation.ts      | 24 ----------
 viewer/src/@types/tag/index.d.ts        | 34 --------------
 viewer/src/components/LdBreadcrumb.vue  | 58 +++++++++++++++++++++++
 viewer/src/components/LdCommand.vue     | 68 +++++++++++++++++++++++++++
 viewer/src/components/LdPicture.vue     | 74 ++++++++++++++++++++++++++++++
 viewer/src/components/LdProposition.vue |  4 +-
 viewer/src/components/LdTagInput.vue    |  2 +-
 viewer/src/components/LdThumbnail.vue   | 81 +++++++++++++++++++++++++++++++++
 viewer/src/views/GalleryDirectory.vue   |  8 +---
 viewer/src/views/GalleryPicture.vue     | 74 ------------------------------
 viewer/src/views/GallerySearch.vue      |  7 +--
 viewer/src/views/GalleryThumbnail.vue   | 81 ---------------------------------
 viewer/src/views/MainGallery.vue        | 10 ++--
 viewer/src/views/PanelTop.vue           | 13 ++----
 viewer/src/views/TopBreadcrumb.vue      | 58 -----------------------
 viewer/src/views/TopCommand.vue         | 68 ---------------------------
 20 files changed, 407 insertions(+), 419 deletions(-)
 create mode 100644 viewer/src/@types/Operation.ts
 create mode 100644 viewer/src/@types/gallery.d.ts
 delete mode 100644 viewer/src/@types/gallery/index.d.ts
 create mode 100644 viewer/src/@types/tag.d.ts
 delete mode 100644 viewer/src/@types/tag/Operation.ts
 delete mode 100644 viewer/src/@types/tag/index.d.ts
 create mode 100644 viewer/src/components/LdBreadcrumb.vue
 create mode 100644 viewer/src/components/LdCommand.vue
 create mode 100644 viewer/src/components/LdPicture.vue
 create mode 100644 viewer/src/components/LdThumbnail.vue
 delete mode 100644 viewer/src/views/GalleryPicture.vue
 delete mode 100644 viewer/src/views/GalleryThumbnail.vue
 delete mode 100644 viewer/src/views/TopBreadcrumb.vue
 delete mode 100644 viewer/src/views/TopCommand.vue

(limited to 'viewer/src')

diff --git a/viewer/src/@types/Operation.ts b/viewer/src/@types/Operation.ts
new file mode 100644
index 0000000..f1e7a41
--- /dev/null
+++ b/viewer/src/@types/Operation.ts
@@ -0,0 +1,24 @@
+/* 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/>.
+*/
+
+export enum Operation {
+    INTERSECTION = '',
+    ADDITION = '+',
+    SUBSTRACTION = '-',
+};
\ No newline at end of file
diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
new file mode 100644
index 0000000..b112b6d
--- /dev/null
+++ b/viewer/src/@types/gallery.d.ts
@@ -0,0 +1,52 @@
+/* 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/>.
+*/
+
+declare namespace Gallery {
+    interface Other extends Item {
+        properties: OtherProperties,
+    }
+    interface Picture extends Item {
+        properties: PictureProperties,
+    }
+    interface Directory extends Item {
+        properties: DirectoryProperties,
+    }
+    interface Item {
+        title: string,
+        datetime: string,
+        description: string,
+        tags: RawTag[],
+        path: string,
+        thumbnail?: string,
+        properties: OtherProperties | PictureProperties | DirectoryProperties,
+    }
+    interface OtherProperties {
+        type: "other",
+    }
+    interface PictureProperties {
+        type: "picture",
+        resource: string,
+    }
+    interface DirectoryProperties {
+        type: "directory",
+        items: Item[]
+    }
+    type RawTag = string;
+    type ItemType = "other" | "picture" | "directory";
+}
\ No newline at end of file
diff --git a/viewer/src/@types/gallery/index.d.ts b/viewer/src/@types/gallery/index.d.ts
deleted file mode 100644
index b112b6d..0000000
--- a/viewer/src/@types/gallery/index.d.ts
+++ /dev/null
@@ -1,52 +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/>.
-*/
-
-declare namespace Gallery {
-    interface Other extends Item {
-        properties: OtherProperties,
-    }
-    interface Picture extends Item {
-        properties: PictureProperties,
-    }
-    interface Directory extends Item {
-        properties: DirectoryProperties,
-    }
-    interface Item {
-        title: string,
-        datetime: string,
-        description: string,
-        tags: RawTag[],
-        path: string,
-        thumbnail?: string,
-        properties: OtherProperties | PictureProperties | DirectoryProperties,
-    }
-    interface OtherProperties {
-        type: "other",
-    }
-    interface PictureProperties {
-        type: "picture",
-        resource: string,
-    }
-    interface DirectoryProperties {
-        type: "directory",
-        items: Item[]
-    }
-    type RawTag = string;
-    type ItemType = "other" | "picture" | "directory";
-}
\ No newline at end of file
diff --git a/viewer/src/@types/tag.d.ts b/viewer/src/@types/tag.d.ts
new file mode 100644
index 0000000..1d5df88
--- /dev/null
+++ b/viewer/src/@types/tag.d.ts
@@ -0,0 +1,34 @@
+/* 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/>.
+*/
+
+declare namespace Tag {
+    interface Node {
+        tag: Gallery.RawTag;
+        tagfiltered: Gallery.RawTag;
+        items: Gallery.Item[];
+        children: Index;
+    }
+    interface Search extends Node {
+        parent?: Node;
+        operation: string; // Enum Operation
+        display: string;
+    }
+    type SearchByOperation = { [index: string]: Tag.Search[] };
+    type Index = { [index: string]: Node };
+}
\ No newline at end of file
diff --git a/viewer/src/@types/tag/Operation.ts b/viewer/src/@types/tag/Operation.ts
deleted file mode 100644
index f1e7a41..0000000
--- a/viewer/src/@types/tag/Operation.ts
+++ /dev/null
@@ -1,24 +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/>.
-*/
-
-export enum Operation {
-    INTERSECTION = '',
-    ADDITION = '+',
-    SUBSTRACTION = '-',
-};
\ No newline at end of file
diff --git a/viewer/src/@types/tag/index.d.ts b/viewer/src/@types/tag/index.d.ts
deleted file mode 100644
index 1d5df88..0000000
--- a/viewer/src/@types/tag/index.d.ts
+++ /dev/null
@@ -1,34 +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/>.
-*/
-
-declare namespace Tag {
-    interface Node {
-        tag: Gallery.RawTag;
-        tagfiltered: Gallery.RawTag;
-        items: Gallery.Item[];
-        children: Index;
-    }
-    interface Search extends Node {
-        parent?: Node;
-        operation: string; // Enum Operation
-        display: string;
-    }
-    type SearchByOperation = { [index: string]: Tag.Search[] };
-    type Index = { [index: string]: Node };
-}
\ No newline at end of file
diff --git a/viewer/src/components/LdBreadcrumb.vue b/viewer/src/components/LdBreadcrumb.vue
new file mode 100644
index 0000000..8c5b7eb
--- /dev/null
+++ b/viewer/src/components/LdBreadcrumb.vue
@@ -0,0 +1,58 @@
+<!-- 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>
+  <ul class="ld-breadcrumb">
+    <li v-for="(item,idx) in $galleryStore.currentItemPath" :key="item.path">
+      <router-link :to="item.path">
+        <fa-icon :icon="getIcon(item)" size="lg" />
+        {{item.title}}
+      </router-link>
+      <fa-icon v-if="(idx+1) < $galleryStore.currentItemPath.length" icon="angle-right" />
+    </li>
+  </ul>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+import Tools from "@/tools";
+
+@Component
+export default class LdBreadcrumb extends Vue {
+  getIcon(item: Gallery.Item) {
+    return Tools.getIcon(item);
+  }
+}
+</script>
+
+<style lang="scss">
+.ld-breadcrumb {
+  border-left: 2px solid rgba(white, 0.1);
+  padding-left: 15px;
+  display: flex;
+  list-style: none;
+  margin: 5px;
+  a {
+    margin-right: 5px;
+  }
+  li:not(:first-child) {
+    margin-left: 10px;
+  }
+}
+</style>
diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
new file mode 100644
index 0000000..484e56a
--- /dev/null
+++ b/viewer/src/components/LdCommand.vue
@@ -0,0 +1,68 @@
+<!-- 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 class="flex command-btns">
+    <div class="link" title="$t('title.tags')" @click="$uiStore.toggleFullWidth()">
+      <fa-icon :icon="commandTagsIcon()" size="lg" />
+    </div>
+    <router-link to="/" :class="{'disabled': isRoot()}" title="$t('title.home')">
+      <fa-icon icon="home" size="lg" />
+    </router-link>
+    <div class="link" title="$t('title.back')" @click="$router.go(-1)">
+      <fa-icon icon="arrow-left" size="lg" />
+    </div>
+    <router-link :class="{'disabled': isRoot()}" title="$t('title.parent')" :to="parent()">
+      <fa-icon icon="folder" size="xs" />
+      <fa-icon icon="level-up-alt" size="lg" />
+    </router-link>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+import { RawLocation } from "vue-router";
+
+@Component
+export default class LdCommand extends Vue {
+  commandTagsIcon(): string {
+    return this.$uiStore.fullWidth ? "tags" : "window-close";
+  }
+
+  isRoot(): boolean {
+    return this.$galleryStore.currentItemPath.length <= 1;
+  }
+
+  parent(): RawLocation {
+    if (!this.isRoot()) return this.$galleryStore.currentItemPath[this.$galleryStore.currentItemPath.length - 2];
+    return "";
+  }
+}
+</script>
+
+<style lang="scss">
+@import "@/assets/scss/theme.scss";
+
+.command-btns {
+  justify-content: space-around;
+  vertical-align: middle;
+  align-items: center;
+  width: $layout-left;
+}
+</style>
diff --git a/viewer/src/components/LdPicture.vue b/viewer/src/components/LdPicture.vue
new file mode 100644
index 0000000..b6a719f
--- /dev/null
+++ b/viewer/src/components/LdPicture.vue
@@ -0,0 +1,74 @@
+<!-- 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
+    v-dragscroll
+    class="scrollbar"
+    :class="{'fit-to-screen': !$uiStore.fullscreen, 'original-size': $uiStore.fullscreen}"
+    @click="onClick"
+    @dragscrollstart="dragging=true"
+  >
+    <v-lazy-image :src="pictureSrc" />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop } from "vue-property-decorator";
+
+@Component
+export default class LdPicture extends Vue {
+  @Prop({ required: true }) readonly picture!: Gallery.Picture;
+
+  dragging: boolean = false;
+
+  get pictureSrc() {
+    return `${process.env.VUE_APP_DATA_URL}${this.picture.properties.resource}`;
+  }
+
+  onClick() {
+    if (!this.dragging) this.$uiStore.toggleFullscreen();
+    this.dragging = false;
+  }
+}
+</script>
+
+<style lang="scss">
+.fit-to-screen {
+  display: flex;
+  justify-content: space-around;
+  height: 100%;
+  & > img {
+    object-fit: contain;
+    cursor: zoom-in;
+  }
+}
+.original-size {
+  display: block;
+  text-align: center;
+  cursor: grab;
+  height: 100%;
+  & > img {
+    max-width: unset;
+    max-height: unset;
+    object-fit: none;
+    cursor: zoom-out;
+  }
+}
+</style>
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index a380021..6be0aee 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -37,10 +37,10 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
-import { Operation } from "@/@types/tag/Operation";
+import { Operation } from "@/@types/Operation";
 
 @Component
-export default class LdTagInput extends Vue {
+export default class LdProposition extends Vue {
   get Operation() {
     return Operation;
   }
diff --git a/viewer/src/components/LdTagInput.vue b/viewer/src/components/LdTagInput.vue
index 7bbecec..eff02e6 100644
--- a/viewer/src/components/LdTagInput.vue
+++ b/viewer/src/components/LdTagInput.vue
@@ -40,7 +40,7 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
-import { Operation } from "@/@types/tag/Operation";
+import { Operation } from "@/@types/Operation";
 import Tools from "@/tools";
 
 @Component
diff --git a/viewer/src/components/LdThumbnail.vue b/viewer/src/components/LdThumbnail.vue
new file mode 100644
index 0000000..44a4c00
--- /dev/null
+++ b/viewer/src/components/LdThumbnail.vue
@@ -0,0 +1,81 @@
+<!-- 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 class="forcedsize" :class="{'preload': loading}">
+    <v-lazy-image
+      v-if="item.thumbnail"
+      class="thumbnail"
+      :src="pictureSrc()"
+      :title="item.path"
+      @intersect="loading=true"
+      @load="loading=false"
+    />
+    <div v-else class="flex-column flex-center">
+      <fa-icon :icon="getIcon()" size="4x" />
+      {{item.title}}
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop } from "vue-property-decorator";
+import Tools from "@/tools";
+
+@Component
+export default class LdThumbnail extends Vue {
+  @Prop({ required: true }) readonly item!: Gallery.Item;
+
+  loading: boolean = false;
+
+  pictureSrc() {
+    return `${process.env.VUE_APP_DATA_URL}${this.item.thumbnail}`;
+  }
+
+  getIcon() {
+    return Tools.getIcon(this.item);
+  }
+}
+</script>
+
+<style lang="scss">
+@import "@/assets/scss/theme.scss";
+
+.thumbnail {
+  max-width: 250px;
+  max-height: 250px;
+}
+.preload {
+  animation: preloadAnimation 1s infinite ease-in-out alternate;
+}
+@keyframes preloadAnimation {
+  from {
+    background-color: $content-bgcolor;
+  }
+  to {
+    background-color: $loader-color;
+  }
+}
+// Temporary size until we get the true thumbnail size
+.forcedsize {
+  width: 250px;
+  height: 250px;
+  text-align: center;
+}
+</style>
diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue
index d01032d..baf627e 100644
--- a/viewer/src/views/GalleryDirectory.vue
+++ b/viewer/src/views/GalleryDirectory.vue
@@ -21,7 +21,7 @@
   <div class="thumbnail-tiles">
     <div v-for="(item) in orderedItems" :key="item.path">
       <router-link :to="item.path">
-        <gallery-thumbnail :item="item" />
+        <ld-thumbnail :item="item" />
       </router-link>
     </div>
     <div>
@@ -33,12 +33,8 @@
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
 import Tools from "@/tools";
-import GalleryThumbnail from "./GalleryThumbnail.vue";
-import Gallery from "./Gallery.vue";
 
-@Component({
-  components: { GalleryThumbnail },
-})
+@Component
 export default class GalleryDirectory extends Vue {
   @Prop({ required: true }) readonly directory!: Gallery.Directory;
 
diff --git a/viewer/src/views/GalleryPicture.vue b/viewer/src/views/GalleryPicture.vue
deleted file mode 100644
index 9f26282..0000000
--- a/viewer/src/views/GalleryPicture.vue
+++ /dev/null
@@ -1,74 +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
-    v-dragscroll
-    class="scrollbar"
-    :class="{'fit-to-screen': !$uiStore.fullscreen, 'original-size': $uiStore.fullscreen}"
-    @click="onClick"
-    @dragscrollstart="dragging=true"
-  >
-    <v-lazy-image :src="pictureSrc" />
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
-
-@Component
-export default class GalleryPicture extends Vue {
-  @Prop({ required: true }) readonly picture!: Gallery.Picture;
-
-  dragging: boolean = false;
-
-  get pictureSrc() {
-    return `${process.env.VUE_APP_DATA_URL}${this.picture.properties.resource}`;
-  }
-
-  onClick() {
-    if (!this.dragging) this.$uiStore.toggleFullscreen();
-    this.dragging = false;
-  }
-}
-</script>
-
-<style lang="scss">
-.fit-to-screen {
-  display: flex;
-  justify-content: space-around;
-  height: 100%;
-  & > img {
-    object-fit: contain;
-    cursor: zoom-in;
-  }
-}
-.original-size {
-  display: block;
-  text-align: center;
-  cursor: grab;
-  height: 100%;
-  & > img {
-    max-width: unset;
-    max-height: unset;
-    object-fit: none;
-    cursor: zoom-out;
-  }
-}
-</style>
diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue
index 870d3e2..4e843b9 100644
--- a/viewer/src/views/GallerySearch.vue
+++ b/viewer/src/views/GallerySearch.vue
@@ -21,7 +21,7 @@
   <div class="thumbnail-tiles">
     <div v-for="(item) in items" :key="item.path">
       <router-link :to="item.path" @click.native="$uiStore.setModeNavigation()">
-        <gallery-thumbnail :item="item" />
+        <ld-thumbnail :item="item" />
       </router-link>
     </div>
     <div v-if="items.length===0">{{$t('search.no-results')}}</div>
@@ -33,11 +33,8 @@
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
-import GalleryThumbnail from "./GalleryThumbnail.vue";
 
-@Component({
-  components: { GalleryThumbnail },
-})
+@Component
 export default class GalleryPicture extends Vue {
   @Prop({ required: true }) readonly items!: Gallery.Item[];
 }
diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue
deleted file mode 100644
index 2a372cd..0000000
--- a/viewer/src/views/GalleryThumbnail.vue
+++ /dev/null
@@ -1,81 +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 class="forcedsize" :class="{'preload': loading}">
-    <v-lazy-image
-      v-if="item.thumbnail"
-      class="thumbnail"
-      :src="pictureSrc()"
-      :title="item.path"
-      @intersect="loading=true"
-      @load="loading=false"
-    />
-    <div v-else class="flex-column flex-center">
-      <fa-icon :icon="getIcon()" size="4x" />
-      {{item.title}}
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
-import Tools from "@/tools";
-
-@Component
-export default class GalleryThumbnail extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Item;
-
-  loading: boolean = false;
-
-  pictureSrc() {
-    return `${process.env.VUE_APP_DATA_URL}${this.item.thumbnail}`;
-  }
-
-  getIcon() {
-    return Tools.getIcon(this.item);
-  }
-}
-</script>
-
-<style lang="scss">
-@import "@/assets/scss/theme.scss";
-
-.thumbnail {
-  max-width: 250px;
-  max-height: 250px;
-}
-.preload {
-  animation: preloadAnimation 1s infinite ease-in-out alternate;
-}
-@keyframes preloadAnimation {
-  from {
-    background-color: $content-bgcolor;
-  }
-  to {
-    background-color: $loader-color;
-  }
-}
-// Temporary size until we get the true thumbnail size
-.forcedsize {
-  width: 250px;
-  height: 250px;
-  text-align: center;
-}
-</style>
diff --git a/viewer/src/views/MainGallery.vue b/viewer/src/views/MainGallery.vue
index 06cf512..5767cce 100644
--- a/viewer/src/views/MainGallery.vue
+++ b/viewer/src/views/MainGallery.vue
@@ -21,21 +21,23 @@
   <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" />
+    <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/tag/Operation";
+import { Operation } from "@/@types/Operation";
 import Tools from "@/tools";
 import GallerySearch from "./GallerySearch.vue";
 import GalleryDirectory from "./GalleryDirectory.vue";
-import GalleryPicture from "./GalleryPicture.vue";
 
 @Component({
-  components: { GallerySearch, GalleryDirectory, GalleryPicture },
+  components: {
+    GallerySearch,
+    GalleryDirectory,
+  },
 })
 export default class Gallery extends Vue {
   @Prop(String) readonly pathMatch!: string;
diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue
index 3553789..60722cd 100644
--- a/viewer/src/views/PanelTop.vue
+++ b/viewer/src/views/PanelTop.vue
@@ -19,22 +19,15 @@
 
 <template>
   <div class="flex">
-    <top-command />
-    <top-breadcrumb />
+    <ld-command />
+    <ld-breadcrumb />
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
-import TopBreadcrumb from "./TopBreadcrumb.vue";
-import TopCommand from "./TopCommand.vue";
 
-@Component({
-  components: {
-    TopCommand,
-    TopBreadcrumb,
-  },
-})
+@Component
 export default class PanelTop extends Vue {}
 </script>
 
diff --git a/viewer/src/views/TopBreadcrumb.vue b/viewer/src/views/TopBreadcrumb.vue
deleted file mode 100644
index 9104b80..0000000
--- a/viewer/src/views/TopBreadcrumb.vue
+++ /dev/null
@@ -1,58 +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>
-  <ul class="ld-breadcrumb">
-    <li v-for="(item,idx) in $galleryStore.currentItemPath" :key="item.path">
-      <router-link :to="item.path">
-        <fa-icon :icon="getIcon(item)" size="lg" />
-        {{item.title}}
-      </router-link>
-      <fa-icon v-if="(idx+1) < $galleryStore.currentItemPath.length" icon="angle-right" />
-    </li>
-  </ul>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-property-decorator";
-import Tools from "@/tools";
-
-@Component
-export default class TopBreadcrumb extends Vue {
-  getIcon(item: Gallery.Item) {
-    return Tools.getIcon(item);
-  }
-}
-</script>
-
-<style lang="scss">
-.ld-breadcrumb {
-  border-left: 2px solid rgba(white, 0.1);
-  padding-left: 15px;
-  display: flex;
-  list-style: none;
-  margin: 5px;
-  a {
-    margin-right: 5px;
-  }
-  li:not(:first-child) {
-    margin-left: 10px;
-  }
-}
-</style>
diff --git a/viewer/src/views/TopCommand.vue b/viewer/src/views/TopCommand.vue
deleted file mode 100644
index dc79fa7..0000000
--- a/viewer/src/views/TopCommand.vue
+++ /dev/null
@@ -1,68 +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 class="flex command-btns">
-    <div class="link" title="$t('title.tags')" @click="$uiStore.toggleFullWidth()">
-      <fa-icon :icon="commandTagsIcon()" size="lg" />
-    </div>
-    <router-link to="/" :class="{'disabled': isRoot()}" title="$t('title.home')">
-      <fa-icon icon="home" size="lg" />
-    </router-link>
-    <div class="link" title="$t('title.back')" @click="$router.go(-1)">
-      <fa-icon icon="arrow-left" size="lg" />
-    </div>
-    <router-link :class="{'disabled': isRoot()}" title="$t('title.parent')" :to="parent()">
-      <fa-icon icon="folder" size="xs" />
-      <fa-icon icon="level-up-alt" size="lg" />
-    </router-link>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-property-decorator";
-import { RawLocation } from "vue-router";
-
-@Component
-export default class TopCommand extends Vue {
-  commandTagsIcon(): string {
-    return this.$uiStore.fullWidth ? "tags" : "window-close";
-  }
-
-  isRoot(): boolean {
-    return this.$galleryStore.currentItemPath.length <= 1;
-  }
-
-  parent(): RawLocation {
-    if (!this.isRoot()) return this.$galleryStore.currentItemPath[this.$galleryStore.currentItemPath.length - 2];
-    return "";
-  }
-}
-</script>
-
-<style lang="scss">
-@import "@/assets/scss/theme.scss";
-
-.command-btns {
-  justify-content: space-around;
-  vertical-align: middle;
-  align-items: center;
-  width: $layout-left;
-}
-</style>
-- 
cgit v1.2.3


From b049f1abd6d00b76afae76d6dc212be213b26c68 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 10:48:21 +0100
Subject: viewer: buefy optimization (importing only used components)

---
 viewer/src/plugins/buefy.ts | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/plugins/buefy.ts b/viewer/src/plugins/buefy.ts
index 9fa73b6..fbffd55 100644
--- a/viewer/src/plugins/buefy.ts
+++ b/viewer/src/plugins/buefy.ts
@@ -19,10 +19,24 @@
 
 import Vue from "vue";
 
-import Buefy from "buefy";
+// @ts-ignore
+import Taginput from 'buefy/src/components/taginput';
+// @ts-ignore
+import Loading from 'buefy/src/components/loading';
+// @ts-ignore
+import Radio from 'buefy/src/components/radio';
+// @ts-ignore
+import SnackBar from 'buefy/src/components/snackbar';
+
 import "@/assets/scss/buefy.scss";
 
-Vue.use(Buefy, {
-    defaultIconComponent: 'fa-icon',
-    defaultIconPack: 'fas',
-});
+Vue.use(Taginput);
+Vue.use(Loading);
+Vue.use(Radio);
+Vue.use(SnackBar);
+
+declare module 'vue/types/vue' {
+    interface Vue {
+        $buefy: any;
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 9ea63a39883c63bdc0200e66caed6fa82f83bf7e Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 10:48:32 +0100
Subject: viewer: loader background color

---
 viewer/src/assets/scss/theme.scss | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'viewer/src')

diff --git a/viewer/src/assets/scss/theme.scss b/viewer/src/assets/scss/theme.scss
index d3aac99..1b474e8 100644
--- a/viewer/src/assets/scss/theme.scss
+++ b/viewer/src/assets/scss/theme.scss
@@ -29,8 +29,11 @@ $panel-left-txtcolor: $panel-top-txtcolor;
 $content-bgcolor: #1e1e1e;
 $toolbar-color: #d62929;
 $loader-color: #272727;
+
+// Overrides - Buefy
 $link: $panel-top-txtcolor;
 $link-hover: lightblue;
 $disabled-color: rgba($link, 0.3);
 $control-radius: 0;
 $input-radius: 0;
+$loading-background: $panel-top-bgcolor;
-- 
cgit v1.2.3


From 2d48a8f15970d7af8092e9450057a05b4d3f9333 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 13:22:52 +0100
Subject: viewer: when loading a picture, displays a preview based on the
 thumbnail on slow connections This works on Chrome, but FireFox presents some
 issues: - the picture background is sometimes white instead of transparent,
 hidding the background - image-orientation doesn't work for background
 pictures or for negative values

---
 viewer/src/assets/scss/global.scss  | 14 ++++++-----
 viewer/src/components/LdPicture.vue | 49 +++++++++++++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 8 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index b418911..5de5946 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -96,10 +96,12 @@ img {
 
 // === Effect to apply on lazy-image loading
 
-.v-lazy-image {
-  opacity: 0;
-  transition: opacity 0.4s;
-}
-.v-lazy-image-loaded {
-  opacity: 1;
+img {
+  &.v-lazy-image {
+    opacity: 0;
+    transition: opacity 0.4s;
+  }
+  &.v-lazy-image-loaded {
+    opacity: 1;
+  }
 }
diff --git a/viewer/src/components/LdPicture.vue b/viewer/src/components/LdPicture.vue
index b6a719f..5425a00 100644
--- a/viewer/src/components/LdPicture.vue
+++ b/viewer/src/components/LdPicture.vue
@@ -25,7 +25,13 @@
     @click="onClick"
     @dragscrollstart="dragging=true"
   >
-    <v-lazy-image :src="pictureSrc" />
+    <v-lazy-image
+      :src="pictureSrc()"
+      :class="{'slow-loading': Boolean(slowLoadingStyle)}"
+      :style="slowLoadingStyle"
+      @load="clearTimer"
+    />
+    <b-loading :active="Boolean(slowLoadingStyle)" :is-full-page="false" class="ld-picture-loader" />
   </div>
 </template>
 
@@ -36,12 +42,35 @@ import { Component, Vue, Prop } from "vue-property-decorator";
 export default class LdPicture extends Vue {
   @Prop({ required: true }) readonly picture!: Gallery.Picture;
 
+  readonly SLOW_LOADING_TIMEOUT_MS: number = 1500;
+
   dragging: boolean = false;
+  slowLoadingStyle: string | null = null;
+  timer: NodeJS.Timeout | null = null;
+
+  mounted() {
+    if (this.picture.thumbnail) this.timer = setTimeout(this.generateSlowLoadingStyle, this.SLOW_LOADING_TIMEOUT_MS);
+  }
+
+  destroyed() {
+    this.clearTimer();
+  }
+
+  clearTimer() {
+    if (this.timer) clearTimeout(this.timer);
+    this.timer = null;
+    this.slowLoadingStyle = null;
+  }
 
-  get pictureSrc() {
+  pictureSrc() {
     return `${process.env.VUE_APP_DATA_URL}${this.picture.properties.resource}`;
   }
 
+  generateSlowLoadingStyle() {
+    this.clearTimer();
+    this.slowLoadingStyle = `background-image: url('${process.env.VUE_APP_DATA_URL}${this.picture.thumbnail}');`;
+  }
+
   onClick() {
     if (!this.dragging) this.$uiStore.toggleFullscreen();
     this.dragging = false;
@@ -50,6 +79,22 @@ export default class LdPicture extends Vue {
 </script>
 
 <style lang="scss">
+@import "@/assets/scss/theme.scss";
+
+.ld-picture-loader {
+  position: relative;
+  & .loading-background {
+    background: none !important;
+  }
+}
+img.slow-loading {
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: contain;
+  background-color: $content-bgcolor;
+  background-blend-mode: soft-light;
+  opacity: 1 !important;
+}
 .fit-to-screen {
   display: flex;
   justify-content: space-around;
-- 
cgit v1.2.3


From 4cf2727131829bd48c062896fdf237cf68a0b472 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 14:05:09 +0100
Subject: viewer: Unify the minor size differences between command icons

---
 viewer/src/components/LdCommand.vue | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'viewer/src')

diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
index 484e56a..07cb354 100644
--- a/viewer/src/components/LdCommand.vue
+++ b/viewer/src/components/LdCommand.vue
@@ -64,5 +64,11 @@ export default class LdCommand extends Vue {
   vertical-align: middle;
   align-items: center;
   width: $layout-left;
+  > * {
+    // Unify the minor size differences between icons
+    width: 26px;
+    height: 26px;
+    margin-top: 2px;
+  }
 }
 </style>
-- 
cgit v1.2.3


From be8ec3edaed843f08dac3d2bf2f10f7247ef3d3a Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 15:06:44 +0100
Subject: viewer: fixed a CSP issue with inlined SVG CSS; FontAwesome CSS is
 now external

---
 viewer/src/plugins/fontawesome.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'viewer/src')

diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index 460e407..a15f4ce 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -19,7 +19,7 @@
 
 import Vue from "vue";
 
-import { library } from "@fortawesome/fontawesome-svg-core";
+import { library, config } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import {
     faFolder,
@@ -51,4 +51,7 @@ library.add(
     faQuestionCircle,
 );
 
+config.autoAddCss = false;
+import "@fortawesome/fontawesome-svg-core/styles.css";
+
 Vue.component("fa-icon", FontAwesomeIcon);
-- 
cgit v1.2.3