7 files changed, 19 insertions, 218 deletions

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 323333a..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="{fitToScreen: !$uiStore.fullscreen, originalSize: $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">
-.fitToScreen {
-  display: flex;
-  justify-content: space-around;
-  height: 100%;
-  & > img {
-    object-fit: contain;
-    cursor: zoom-in;
-  }
-}
-.originalSize {
-  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 41a59e1..0000000
--- a/viewer/src/views/GalleryThumbnail.vue
+++ /dev/null
@@ -1,76 +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="folder" size="4x" />
-      {{item.title}}
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
-
-@Component
-export default class GalleryThumbnail extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Item;
-
-  loading: boolean = false;
-
-  get pictureSrc() {
-    return `${process.env.VUE_APP_DATA_URL}${this.item.thumbnail}`;
-  }
-}
-</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>