From 118666b4c3faeaeaf153a2ea7172764a3cbcffab Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Wed, 29 Jan 2020 23:04:30 +0100
Subject: viewer: the loader now correctly waits for the json to be loaded and
 indexes to be processed before displaying the UI. resolves #61

---
 viewer/src/store/galleryStore.ts | 2 +-
 viewer/src/views/MainLayout.vue  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index 663340f..b2ff74e 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -61,7 +61,7 @@ export default class GalleryStore extends VuexModule {
 
     // Fetches the gallery's JSON metadata
     @action async fetchGalleryItems(url: string) {
-        fetch(url)
+        return fetch(url)
             .then(response => response.json())
             .then(this.setGalleryItemsRoot)
             .then(this.indexTags);
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index 7a75eb1..f608b9d 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -19,9 +19,9 @@
 
 <template>
   <div :class="{fullscreen: $uiStore.fullscreen}">
-    <panel-top class="layout layout-top" />
-    <panel-left class="layout layout-left" />
-    <router-view class="layout layout-content scrollbar" />
+    <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" />
     <b-loading :active="isLoading" is-full-page />
   </div>
 </template>
@@ -35,7 +35,7 @@ import PanelTop from "./PanelTop.vue";
   components: { PanelLeft, PanelTop },
 })
 export default class MainLayout extends Vue {
-  isLoading: boolean = false;
+  isLoading: boolean = true;
 
   mounted() {
     this.fetchGalleryItems();
-- 
cgit v1.2.3


From 8670fb146e90f98653c776b01f29d905e5a6fe9f Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Wed, 29 Jan 2020 23:11:55 +0100
Subject: viewer: fixed subdirectory deploiement; all paths are now relative to
 index.html. resolves #17

---
 viewer/src/views/MainLayout.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'viewer/src')

diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index f608b9d..cedef58 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -44,7 +44,7 @@ export default class MainLayout extends Vue {
   fetchGalleryItems() {
     this.isLoading = true;
     this.$galleryStore
-      .fetchGalleryItems(`${process.env.VUE_APP_DATA_URL}/index.json`)
+      .fetchGalleryItems(`${process.env.VUE_APP_DATA_URL}index.json`)
       .finally(() => (this.isLoading = false))
       .catch(this.displayError);
   }
-- 
cgit v1.2.3


From 1a6412e17077b8ea9939edfa9cc700db0730a1c6 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 15:12:34 +0100
Subject: viewer: scrollbars styling closer to flat design

---
 viewer/src/assets/scss/global.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 1903c9e..6488dee 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -50,13 +50,14 @@
   overflow: auto;
 }
 .scrollbar::-webkit-scrollbar {
-  width: 12px;
+  width: 10px;
+  height: 10px;
 }
 .scrollbar::-webkit-scrollbar-corner {
   background-color: transparent;
 }
 .scrollbar::-webkit-scrollbar-thumb {
-  box-shadow: inset 0 0 6px black;
+  box-shadow: inset 0 0 1px black;
   background-color: $toolbar-color;
 }
 
-- 
cgit v1.2.3


From 234d0d13c767786393494810526a77d3d89b0e83 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 17:01:56 +0100
Subject: viewer: global keypress componant. ESC gets out of fullscreen.

---
 viewer/src/components/LdKeyPress.vue | 49 ++++++++++++++++++++++++++++++++++++
 viewer/src/views/MainLayout.vue      |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 viewer/src/components/LdKeyPress.vue

(limited to 'viewer/src')

diff --git a/viewer/src/components/LdKeyPress.vue b/viewer/src/components/LdKeyPress.vue
new file mode 100644
index 0000000..8276607
--- /dev/null
+++ b/viewer/src/components/LdKeyPress.vue
@@ -0,0 +1,49 @@
+<!-- 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/>.
+-->
+
+<script lang="ts">
+import { Component, Vue, Prop, Emit } from "vue-property-decorator";
+
+@Component
+export default class LdKeyPress extends Vue {
+  @Prop({ type: Number, required: true }) readonly keycode!: number;
+  @Prop({ type: String, default: "keyup" }) readonly event!: "keyup" | "keydown" | "keypress";
+
+  mounted() {
+    window.addEventListener(this.event, this.onEvent);
+  }
+
+  destroyed() {
+    window.removeEventListener(this.event, this.onEvent);
+  }
+
+  render() {
+    return null;
+  }
+
+  private onEvent(e: KeyboardEvent) {
+    if (e.keyCode === this.keycode) this.action(e);
+  }
+
+  @Emit()
+  private action(e: KeyboardEvent) {
+    return e;
+  }
+}
+</script>
\ No newline at end of file
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index cedef58..f0809b6 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -23,6 +23,7 @@
     <panel-left v-if="!isLoading" class="layout layout-left" />
     <router-view v-if="!isLoading" class="layout layout-content scrollbar" />
     <b-loading :active="isLoading" is-full-page />
+    <ld-key-press :keycode="27" @action="$uiStore.fullscreen=false" />
   </div>
 </template>
 
-- 
cgit v1.2.3


From 76af6cffce939ef3c9a0952e6f7adc234e92f782 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 17:04:09 +0100
Subject: viewer: directories first and sorted by title in the navigation mode

---
 viewer/src/@types/gallery/index.d.ts  |   9 ++-
 viewer/src/router/index.ts            |   2 +-
 viewer/src/tools.ts                   |  17 ++++++
 viewer/src/views/Gallery.vue          | 104 --------------------------------
 viewer/src/views/GalleryDirectory.vue |   8 ++-
 viewer/src/views/MainGallery.vue      | 108 ++++++++++++++++++++++++++++++++++
 6 files changed, 141 insertions(+), 107 deletions(-)
 delete mode 100644 viewer/src/views/Gallery.vue
 create mode 100644 viewer/src/views/MainGallery.vue

(limited to 'viewer/src')

diff --git a/viewer/src/@types/gallery/index.d.ts b/viewer/src/@types/gallery/index.d.ts
index 25407e8..b112b6d 100644
--- a/viewer/src/@types/gallery/index.d.ts
+++ b/viewer/src/@types/gallery/index.d.ts
@@ -18,6 +18,9 @@
 */
 
 declare namespace Gallery {
+    interface Other extends Item {
+        properties: OtherProperties,
+    }
     interface Picture extends Item {
         properties: PictureProperties,
     }
@@ -31,7 +34,10 @@ declare namespace Gallery {
         tags: RawTag[],
         path: string,
         thumbnail?: string,
-        properties: PictureProperties | DirectoryProperties,
+        properties: OtherProperties | PictureProperties | DirectoryProperties,
+    }
+    interface OtherProperties {
+        type: "other",
     }
     interface PictureProperties {
         type: "picture",
@@ -42,4 +48,5 @@ declare namespace Gallery {
         items: Item[]
     }
     type RawTag = string;
+    type ItemType = "other" | "picture" | "directory";
 }
\ No newline at end of file
diff --git a/viewer/src/router/index.ts b/viewer/src/router/index.ts
index 55b4b6c..0f3d2c7 100644
--- a/viewer/src/router/index.ts
+++ b/viewer/src/router/index.ts
@@ -19,7 +19,7 @@
 
 import Vue from "vue";
 import VueRouter from "vue-router";
-import Gallery from "@/views/Gallery.vue";
+import Gallery from "@/views/MainGallery.vue";
 
 Vue.use(VueRouter);
 
diff --git a/viewer/src/tools.ts b/viewer/src/tools.ts
index 5eb287e..57a889d 100644
--- a/viewer/src/tools.ts
+++ b/viewer/src/tools.ts
@@ -27,4 +27,21 @@ export default class Tools {
       .toLowerCase();
   }
 
+
+  public static checkType(item: Gallery.Item | null, type: Gallery.ItemType): boolean {
+    return item?.properties.type === type ?? false;
+  }
+
+  public static directoriesFirst(items: Gallery.Item[]) {
+    return [
+      ...items
+        .filter(child => Tools.checkType(child, "directory"))
+        .sort((a, b) => a.title.localeCompare(b.title)),
+
+      ...items
+        .filter(child => !Tools.checkType(child, "directory")),
+    ];
+  }
+
+
 }
\ No newline at end of file
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 1df0c4d..d01032d 100644
--- a/viewer/src/views/GalleryDirectory.vue
+++ b/viewer/src/views/GalleryDirectory.vue
@@ -19,7 +19,7 @@
 
 <template>
   <div class="thumbnail-tiles">
-    <div v-for="(item) in directory.properties.items" :key="item.path">
+    <div v-for="(item) in orderedItems" :key="item.path">
       <router-link :to="item.path">
         <gallery-thumbnail :item="item" />
       </router-link>
@@ -32,13 +32,19 @@
 
 <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 },
 })
 export default class GalleryDirectory extends Vue {
   @Prop({ required: true }) readonly directory!: Gallery.Directory;
+
+  get orderedItems() {
+    return Tools.directoriesFirst(this.directory.properties.items);
+  }
 }
 </script>
 
diff --git a/viewer/src/views/MainGallery.vue b/viewer/src/views/MainGallery.vue
new file mode 100644
index 0000000..06cf512
--- /dev/null
+++ b/viewer/src/views/MainGallery.vue
@@ -0,0 +1,108 @@
+<!-- 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 Tools from "@/tools";
+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: Gallery.ItemType): boolean {
+    return Tools.checkType(this.$galleryStore.currentItem, type);
+  }
+
+  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>
-- 
cgit v1.2.3


From e86fd09f406bae45be9176784c6092b2469224c4 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 17:04:38 +0100
Subject: viewer: picture display improvements

---
 viewer/src/assets/scss/global.scss  | 3 +++
 viewer/src/views/GalleryPicture.vue | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'viewer/src')

diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 6488dee..645d4a0 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -72,6 +72,9 @@
     margin: 1px;
   }
 }
+img {
+  image-orientation: from-image;
+}
 
 // === Effect to apply on lazy-image loading
 
diff --git a/viewer/src/views/GalleryPicture.vue b/viewer/src/views/GalleryPicture.vue
index 579e74b..323333a 100644
--- a/viewer/src/views/GalleryPicture.vue
+++ b/viewer/src/views/GalleryPicture.vue
@@ -25,7 +25,7 @@
     @click="onClick"
     @dragscrollstart="dragging=true"
   >
-    <img :src="pictureSrc" />
+    <v-lazy-image :src="pictureSrc" />
   </div>
 </template>
 
@@ -56,6 +56,7 @@ export default class GalleryPicture extends Vue {
   height: 100%;
   & > img {
     object-fit: contain;
+    cursor: zoom-in;
   }
 }
 .originalSize {
@@ -67,6 +68,7 @@ export default class GalleryPicture extends Vue {
     max-width: unset;
     max-height: unset;
     object-fit: none;
+    cursor: zoom-out;
   }
 }
 </style>
-- 
cgit v1.2.3


From 16d319ac092aea56ac9f872129d23fface4b379d Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 18:34:34 +0100
Subject: viewer: thumbnail loader styling

---
 viewer/src/assets/scss/theme.scss     | 2 +-
 viewer/src/views/GalleryThumbnail.vue | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/assets/scss/theme.scss b/viewer/src/assets/scss/theme.scss
index efd5d79..3f2b623 100644
--- a/viewer/src/assets/scss/theme.scss
+++ b/viewer/src/assets/scss/theme.scss
@@ -30,4 +30,4 @@ $content-bgcolor: #1e1e1e;
 
 $toolbar-color: #d62929;
 
-$loader-color: #119;
+$loader-color: #272727;
diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue
index 7ceea4f..433a673 100644
--- a/viewer/src/views/GalleryThumbnail.vue
+++ b/viewer/src/views/GalleryThumbnail.vue
@@ -57,16 +57,14 @@ export default class GalleryThumbnail extends Vue {
   max-height: 250px;
 }
 .preload {
-  background: linear-gradient(to right, rgba(0, 0, 0, 0) 8%, $loader-color 18%, rgba(0, 0, 0, 0) 33%);
-  background-size: 200% 50px;
-  animation: preloadAnimation 2s infinite linear;
+  animation: preloadAnimation 1s infinite ease-in-out alternate;
 }
 @keyframes preloadAnimation {
   from {
-    background-position: -200px 0;
+    background-color: $content-bgcolor;
   }
   to {
-    background-position: 200px 0;
+    background-color: $loader-color;
   }
 }
 // Temporary size until we get the true thumbnail size
-- 
cgit v1.2.3


From 42105af46681d81959a5d5a9a16ec9e98463a92e Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 21:24:15 +0100
Subject: viewer: new breadcrumb. navigation buttons. and styling improvements

---
 viewer/src/assets/scss/buefy.scss       |  3 +-
 viewer/src/assets/scss/global.scss      | 15 +++++++
 viewer/src/assets/scss/theme.scss       |  7 +--
 viewer/src/components/LdProposition.vue | 14 +++---
 viewer/src/plugins/fontawesome.ts       |  8 ++++
 viewer/src/views/GalleryThumbnail.vue   |  2 +-
 viewer/src/views/PanelLeft.vue          |  5 +--
 viewer/src/views/PanelTop.vue           | 78 ++++++++++++++++-----------------
 8 files changed, 74 insertions(+), 58 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/assets/scss/buefy.scss b/viewer/src/assets/scss/buefy.scss
index 7fdb883..735ce6a 100644
--- a/viewer/src/assets/scss/buefy.scss
+++ b/viewer/src/assets/scss/buefy.scss
@@ -24,8 +24,7 @@
 @import "buefy_variables";
 
 // 2. Setup your Custom Colors
-// $linkedin: #0077b5;
-// $linkedin-invert: findColorInvert($linkedin);
+@import "@/assets/scss/theme.scss";
 
 @import "~bulma/sass/utilities/derived-variables";
 
diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 645d4a0..3cfa1a5 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -44,6 +44,21 @@
   align-items: center;
 }
 
+// === Links
+
+.link {
+  color: $link;
+  cursor: pointer;
+  text-decoration: none;
+  & :hover {
+    color: $link-hover;
+  }
+}
+
+.disabled {
+  color: $disabled-color !important;
+}
+
 // === Scrollbar styling
 
 .scrollbar {
diff --git a/viewer/src/assets/scss/theme.scss b/viewer/src/assets/scss/theme.scss
index 3f2b623..2314ee8 100644
--- a/viewer/src/assets/scss/theme.scss
+++ b/viewer/src/assets/scss/theme.scss
@@ -19,7 +19,7 @@
 
 // === Theme
 
-$layout-top: 70px;
+$layout-top: 35px;
 $layout-left: 250px;
 
 $panel-top-bgcolor: #225;
@@ -27,7 +27,8 @@ $panel-top-txtcolor: white;
 $panel-left-bgcolor: $panel-top-bgcolor;
 $panel-left-txtcolor: $panel-top-txtcolor;
 $content-bgcolor: #1e1e1e;
-
 $toolbar-color: #d62929;
-
 $loader-color: #272727;
+$link: $panel-top-txtcolor;
+$link-hover: lightblue;
+$disabled-color: rgba($link, 0.3);
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index 9a32e0a..f653e4d 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -19,7 +19,7 @@
 
 <template>
   <div>
-    <div v-for="proposed in proposedTags" :key="proposed.rawTag" class="proposition">
+    <div v-for="proposed in proposedTags" :key="proposed.rawTag" class="proposition link">
       <fa-icon icon="minus" @click="add(Operation.SUBSTRACTION, proposed.rawTag)" />
       <span
         @click="add(Operation.INTERSECTION, proposed.rawTag)"
@@ -51,13 +51,12 @@ export default class LdTagInput extends Vue {
         .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));
+      Object.entries(this.$galleryStore.tags).forEach(entry => (propositions[entry[0]] = entry[1].items.length));
     }
-    
+
     return Object.entries(propositions)
-      .sort((a,b) => b[1] - a[1])
-      .map(entry => ({rawTag: entry[0], count: entry[1]}));
+      .sort((a, b) => b[1] - a[1])
+      .map(entry => ({ rawTag: entry[0], count: entry[1] }));
   }
 
   extractDistinctItems(currentTags: Tag.Search[]): Gallery.Item[] {
@@ -79,12 +78,13 @@ export default class LdTagInput extends Vue {
 </script>
 
 <style lang="scss">
+@import "@/assets/scss/theme.scss";
+
 .proposition {
   display: flex;
   justify-content: space-between;
   align-items: center;
   margin: 10px;
-  color: lightcyan;
   cursor: pointer;
 }
 .proposition span {
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index bb77c01..c17d4a1 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -28,6 +28,10 @@ import {
     faPlus,
     faMinus,
     faImage,
+    faHome,
+    faArrowLeft,
+    faFilter,
+    faAngleRight,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
@@ -37,6 +41,10 @@ library.add(
     faPlus,
     faMinus,
     faImage,
+    faHome,
+    faArrowLeft,
+    faFilter,
+    faAngleRight,
 );
 
 Vue.component("fa-icon", FontAwesomeIcon);
diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue
index 433a673..66e46d6 100644
--- a/viewer/src/views/GalleryThumbnail.vue
+++ b/viewer/src/views/GalleryThumbnail.vue
@@ -28,7 +28,7 @@
       @load="loading=false"
     />
     <div v-else class="flex-column flex-center">
-      <fa-icon icon="folder" class="fa-4x" />
+      <fa-icon icon="folder" size="4x" />
       {{item.path}}
     </div>
   </div>
diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue
index 16be249..35c092a 100644
--- a/viewer/src/views/PanelLeft.vue
+++ b/viewer/src/views/PanelLeft.vue
@@ -24,7 +24,7 @@
     <h1>{{$t('panelLeft.filters')}}</h1>
     <ld-tag-input />
     <h1>{{$t('panelLeft.propositions')}}</h1>
-    <ld-proposition />
+    <ld-proposition class="scrollbar" />
   </div>
 </template>
 
@@ -36,7 +36,4 @@ export default class PanelLeft extends Vue {}
 </script>
 
 <style lang="scss">
-.label {
-  color: white;
-}
 </style>
diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue
index 0efc9b6..7e24699 100644
--- a/viewer/src/views/PanelTop.vue
+++ b/viewer/src/views/PanelTop.vue
@@ -18,23 +18,25 @@
 -->
 
 <template>
-  <div v-if="isReady">
-    <b-steps
-      v-model="activeStep"
-      class="pathBreadcrumb"
-      type="is-info"
-      :has-navigation="false"
-      :animated="false"
-      @input="onStepClick"
-    >
-      <b-step-item
-        v-for="item in $galleryStore.currentItemPath"
-        :key="item.path"
-        :label="item.title"
-        :icon="getIcon(item)"
-        :to="item.path"
-      />
-    </b-steps>
+  <div class="flex">
+    <div class="command-btns">
+      <fa-icon icon="filter" 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>
   </div>
 </template>
 
@@ -44,23 +46,8 @@ import Gallery from "./Gallery.vue";
 
 @Component
 export default class PanelTop extends Vue {
-  activeStep: number = -1;
-
-  mounted() {
-    this.currentItemPathChanged();
-  }
-
-  get isReady() {
-    return this.activeStep >= 0;
-  }
-
-  @Watch("$galleryStore.currentItemPath")
-  currentItemPathChanged() {
-    this.activeStep = -1;
-    this.$nextTick(() => (this.activeStep = this.$galleryStore.currentItemPath.length - 1));
-  }
-
   getIcon(item: Gallery.Item) {
+    if (item.path.length <= 1) return "home";
     switch (item.properties.type) {
       case "picture":
         return "image";
@@ -68,19 +55,28 @@ export default class PanelTop extends Vue {
         return "folder";
     }
   }
-
-  onStepClick(index: number) {
-    const item = this.$galleryStore.currentItemPath[index];
-    if (item) this.$router.push(item.path);
-  }
 }
 </script>
 
 <style lang="scss">
+@import "@/assets/scss/theme.scss";
+
 .pathBreadcrumb {
-  margin: 3px;
+  display: flex;
+  list-style: none;
+  margin: 5px;
+  a {
+    margin-right: 5px;
+  }
+  li:not(:first-child) {
+    margin-left: 10px;
+  }
 }
-.step-title {
-  color: white;
+.command-btns {
+  display: flex;
+  justify-content: space-around;
+  vertical-align: middle;
+  align-items: center;
+  width: $layout-left;
 }
 </style>
-- 
cgit v1.2.3


From 17b1598c5a5a375e6eaa0763767368c05ba0f56e Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 22:58:27 +0100
Subject: viewer: Improved the proposition layout

---
 viewer/src/assets/scss/global.scss      |  5 ++++-
 viewer/src/assets/scss/theme.scss       |  2 ++
 viewer/src/components/LdProposition.vue | 36 ++++++++++++++++++++++-----------
 viewer/src/components/LdTagInput.vue    |  1 -
 viewer/src/plugins/fontawesome.ts       |  4 ++--
 viewer/src/views/PanelLeft.vue          |  2 +-
 viewer/src/views/PanelTop.vue           |  2 +-
 7 files changed, 34 insertions(+), 18 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 3cfa1a5..b418911 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -32,6 +32,9 @@
 .nowrap {
   white-space: nowrap;
 }
+.no-scroll-x {
+  overflow-x: hidden;
+}
 
 .flex {
   display: flex;
@@ -50,7 +53,7 @@
   color: $link;
   cursor: pointer;
   text-decoration: none;
-  & :hover {
+  &:hover {
     color: $link-hover;
   }
 }
diff --git a/viewer/src/assets/scss/theme.scss b/viewer/src/assets/scss/theme.scss
index 2314ee8..d3aac99 100644
--- a/viewer/src/assets/scss/theme.scss
+++ b/viewer/src/assets/scss/theme.scss
@@ -32,3 +32,5 @@ $loader-color: #272727;
 $link: $panel-top-txtcolor;
 $link-hover: lightblue;
 $disabled-color: rgba($link, 0.3);
+$control-radius: 0;
+$input-radius: 0;
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index f653e4d..02f7fe4 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -19,12 +19,18 @@
 
 <template>
   <div>
-    <div v-for="proposed in proposedTags" :key="proposed.rawTag" class="proposition link">
-      <fa-icon icon="minus" @click="add(Operation.SUBSTRACTION, proposed.rawTag)" />
-      <span
+    <div v-for="proposed in proposedTags" :key="proposed.rawTag" class="proposition">
+      <div class="operation-btns link" @click="add(Operation.SUBSTRACTION, proposed.rawTag)">
+        <fa-icon icon="minus" />
+      </div>
+      <div class="operation-btns link" @click="add(Operation.ADDITION, proposed.rawTag)">
+        <fa-icon icon="plus" />
+      </div>
+      <div
+        class="operation-tag link"
         @click="add(Operation.INTERSECTION, proposed.rawTag)"
-      >{{proposed.rawTag}}&nbsp;x{{proposed.count}}</span>
-      <fa-icon icon="plus" @click="add(Operation.ADDITION, proposed.rawTag)" />
+      >{{proposed.rawTag}}</div>
+      <div class="disabled">x{{proposed.count}}</div>
     </div>
   </div>
 </template>
@@ -72,7 +78,7 @@ export default class LdTagInput extends Vue {
     const node = this.$galleryStore.tags[rawTag];
     const search: Tag.Search = { ...node, operation, display: `${operation}${node.tag}` };
     this.$uiStore.currentTags.push(search);
-    this.$uiStore.mode = "search";
+    setTimeout(() => this.$uiStore.setModeSearch()); // Give time for the UI to display the Tag change
   }
 }
 </script>
@@ -82,12 +88,18 @@ export default class LdTagInput extends Vue {
 
 .proposition {
   display: flex;
-  justify-content: space-between;
   align-items: center;
-  margin: 10px;
-  cursor: pointer;
-}
-.proposition span {
-  padding: 0 10px;
+  padding-right: 7px;
+  .operation-tag {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    flex-grow: 1;
+    cursor: pointer;
+  }
+  .operation-btns {
+    padding: 2px 7px;
+    cursor: pointer;
+  }
 }
 </style>
diff --git a/viewer/src/components/LdTagInput.vue b/viewer/src/components/LdTagInput.vue
index 7c9981f..ff354c6 100644
--- a/viewer/src/components/LdTagInput.vue
+++ b/viewer/src/components/LdTagInput.vue
@@ -27,7 +27,6 @@
     :data="filteredTags"
     field="display"
     type="is-black"
-    icon="tag"
     size="is-medium"
     class="panelTagInput"
     @typing="searchTags"
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index c17d4a1..bf2ff5f 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -30,7 +30,7 @@ import {
     faImage,
     faHome,
     faArrowLeft,
-    faFilter,
+    faTags,
     faAngleRight,
 } from "@fortawesome/free-solid-svg-icons";
 
@@ -43,7 +43,7 @@ library.add(
     faImage,
     faHome,
     faArrowLeft,
-    faFilter,
+    faTags,
     faAngleRight,
 );
 
diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue
index 35c092a..ea35664 100644
--- a/viewer/src/views/PanelLeft.vue
+++ b/viewer/src/views/PanelLeft.vue
@@ -24,7 +24,7 @@
     <h1>{{$t('panelLeft.filters')}}</h1>
     <ld-tag-input />
     <h1>{{$t('panelLeft.propositions')}}</h1>
-    <ld-proposition class="scrollbar" />
+    <ld-proposition class="scrollbar no-scroll-x" />
   </div>
 </template>
 
diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue
index 7e24699..e7421f0 100644
--- a/viewer/src/views/PanelTop.vue
+++ b/viewer/src/views/PanelTop.vue
@@ -20,7 +20,7 @@
 <template>
   <div class="flex">
     <div class="command-btns">
-      <fa-icon icon="filter" size="lg" class="disabled" />
+      <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>
-- 
cgit v1.2.3


From 1628eb40a5154584743fa95466ddfb45a77774d4 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 22:58:49 +0100
Subject: viewer: fixed the directory name

---
 viewer/src/views/GalleryThumbnail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'viewer/src')

diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue
index 66e46d6..41a59e1 100644
--- a/viewer/src/views/GalleryThumbnail.vue
+++ b/viewer/src/views/GalleryThumbnail.vue
@@ -29,7 +29,7 @@
     />
     <div v-else class="flex-column flex-center">
       <fa-icon icon="folder" size="4x" />
-      {{item.path}}
+      {{item.title}}
     </div>
   </div>
 </template>
-- 
cgit v1.2.3


From 293c2803794a5cc4f9a045d48ff28ae99beaa030 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 00:37:55 +0100
Subject: viewer: moved router.ts to the plugins directory for simplicity

---
 viewer/src/main.ts           |  2 +-
 viewer/src/plugins/router.ts | 41 +++++++++++++++++++++++++++++++++++++++++
 viewer/src/router/index.ts   | 41 -----------------------------------------
 3 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 viewer/src/plugins/router.ts
 delete mode 100644 viewer/src/router/index.ts

(limited to 'viewer/src')

diff --git a/viewer/src/main.ts b/viewer/src/main.ts
index 75a238f..a8ff322 100644
--- a/viewer/src/main.ts
+++ b/viewer/src/main.ts
@@ -26,7 +26,7 @@ import "@/plugins/lazyimage";
 import "@/plugins/dragscroll";
 import store from '@/store'
 import i18n from "@/plugins/i18n";
-import router from "@/router";
+import router from "@/plugins/router";
 import MainLayout from "@/views/MainLayout.vue";
 
 Vue.config.productionTip = false;
diff --git a/viewer/src/plugins/router.ts b/viewer/src/plugins/router.ts
new file mode 100644
index 0000000..0f3d2c7
--- /dev/null
+++ b/viewer/src/plugins/router.ts
@@ -0,0 +1,41 @@
+/* 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/>.
+*/
+
+import Vue from "vue";
+import VueRouter from "vue-router";
+import Gallery from "@/views/MainGallery.vue";
+
+Vue.use(VueRouter);
+
+// async way : component: () => import(/* webpackChunkName: "Gallery" */ "@/views/Gallery.vue"),
+
+const routes = [
+  {
+    path: "*",
+    name: "Gallery",
+    component: Gallery,
+    props: true
+  },
+];
+
+const router = new VueRouter({
+  routes,
+});
+
+export default router;
diff --git a/viewer/src/router/index.ts b/viewer/src/router/index.ts
deleted file mode 100644
index 0f3d2c7..0000000
--- a/viewer/src/router/index.ts
+++ /dev/null
@@ -1,41 +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/>.
-*/
-
-import Vue from "vue";
-import VueRouter from "vue-router";
-import Gallery from "@/views/MainGallery.vue";
-
-Vue.use(VueRouter);
-
-// async way : component: () => import(/* webpackChunkName: "Gallery" */ "@/views/Gallery.vue"),
-
-const routes = [
-  {
-    path: "*",
-    name: "Gallery",
-    component: Gallery,
-    props: true
-  },
-];
-
-const router = new VueRouter({
-  routes,
-});
-
-export default router;
-- 
cgit v1.2.3