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/package.json                     |  2 +-
 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 ---------------------------
 21 files changed, 408 insertions(+), 420 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')

diff --git a/viewer/package.json b/viewer/package.json
index f5ff0fc..1521dc5 100644
--- a/viewer/package.json
+++ b/viewer/package.json
@@ -47,4 +47,4 @@
     "vue-cli-plugin-i18n": "^0.6.1",
     "vue-template-compiler": "^2.6.10"
   }
-}
\ No newline at end of file
+}
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