Merge pull request #65 from pacien/oz-viewer

viewer improvements

7 files changed, 75 insertions, 71 deletions

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/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>
diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue
index 7ceea4f..41a59e1 100644
--- a/viewer/src/views/GalleryThumbnail.vue
+++ b/viewer/src/views/GalleryThumbnail.vue
@@ -28,8 +28,8 @@
       @load="loading=false"
     />
     <div v-else class="flex-column flex-center">
-      <fa-icon icon="folder" class="fa-4x" />
-      {{item.path}}
+      <fa-icon icon="folder" size="4x" />
+      {{item.title}}
     </div>
   </div>
 </template>
@@ -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
diff --git a/viewer/src/views/Gallery.vue b/viewer/src/views/MainGallery.vue
index fad7cc3..06cf512 100644
--- a/viewer/src/views/Gallery.vue
+++ b/viewer/src/views/MainGallery.vue
@@ -28,7 +28,8 @@
 
 <script lang="ts">
 import { Component, Vue, Prop, Watch } from "vue-property-decorator";
-import { Operation } from '@/@types/tag/Operation';
+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";
@@ -40,7 +41,7 @@ export default class Gallery extends Vue {
   @Prop(String) readonly pathMatch!: string;
 
   mounted() {
-    this.pathChanged()
+    this.pathChanged();
   }
 
   @Watch("pathMatch")
@@ -59,14 +60,15 @@ export default class Gallery extends Vue {
 
   // ---
 
-  private checkType(type: string): boolean {
-    return this.$galleryStore.currentItem?.properties.type === type ?? false;
+  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));
+    Object.values(Operation).forEach(
+      operation => (byOperation[operation] = currentTags.filter(tag => tag.operation === operation))
+    );
     return byOperation;
   }
 
@@ -75,8 +77,8 @@ export default class Gallery extends Vue {
     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)
+        .reduce((a, b) => a.filter(c => b.includes(c)))
+        .flatMap(items => items)
         .forEach(item => intersection.add(item));
     }
     return intersection;
@@ -85,14 +87,16 @@ export default class Gallery extends Vue {
   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));
+      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[] {
+  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];
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index 7a75eb1..f0809b6 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -19,10 +19,11 @@
 
 <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 />
+    <ld-key-press :keycode="27" @action="$uiStore.fullscreen=false" />
   </div>