From 9165cc1efcf7791f78b61b2c51a9de651b1b09aa Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 2 Jul 2021 22:53:16 +0200
Subject: viewer: types normalization - gallery.d.ts

GitHub: closes #301
---
 viewer/src/@types/gallery.d.ts                     | 183 +++++++++++----------
 viewer/src/@types/tag.d.ts                         |   6 +-
 viewer/src/components/LdBreadcrumb.vue             |   7 +-
 viewer/src/components/LdCommand.vue                |   5 +-
 viewer/src/components/LdCommandSort.vue            |   2 +-
 viewer/src/components/LdGallery.vue                |   6 +-
 viewer/src/components/LdInformation.vue            |   5 +-
 viewer/src/components/LdKeyPress.vue               |   2 +-
 viewer/src/components/LdProposition.vue            |   9 +-
 viewer/src/components/LdTagInput.vue               |   4 +-
 viewer/src/components/LdThumbnail.vue              |   5 +-
 viewer/src/components/LdTitle.vue                  |   5 +-
 .../src/components/item_handlers/LdAudioViewer.vue |   5 +-
 .../src/components/item_handlers/LdDirectory.vue   |  42 -----
 .../components/item_handlers/LdDirectoryViewer.vue |  43 +++++
 viewer/src/components/item_handlers/LdDownload.vue |  57 -------
 .../components/item_handlers/LdDownloadViewer.vue  |  58 +++++++
 .../src/components/item_handlers/LdPdfViewer.vue   |   3 +-
 viewer/src/components/item_handlers/LdPicture.vue  | 127 --------------
 .../components/item_handlers/LdPictureViewer.vue   | 128 ++++++++++++++
 .../components/item_handlers/LdPlainTextViewer.vue |   3 +-
 .../src/components/item_handlers/LdVideoViewer.vue |   3 +-
 viewer/src/main.ts                                 |   4 +-
 viewer/src/services/indexfactory.ts                |  13 +-
 viewer/src/services/indexsearch.ts                 |  17 +-
 viewer/src/services/itemComparators.ts             |  13 +-
 viewer/src/services/ldzoom.ts                      |   7 +-
 viewer/src/services/navigation.ts                  |  15 +-
 viewer/src/store/galleryStore.ts                   |  15 +-
 viewer/src/store/index.ts                          |   7 +-
 viewer/src/store/uiStore.ts                        |   5 +-
 viewer/src/views/GalleryNavigation.vue             |   8 +-
 viewer/src/views/GallerySearch.vue                 |   3 +-
 viewer/src/views/MainLayout.vue                    |   4 +-
 viewer/src/views/PanelLeft.vue                     |   5 +-
 35 files changed, 420 insertions(+), 404 deletions(-)
 delete mode 100644 viewer/src/components/item_handlers/LdDirectory.vue
 create mode 100644 viewer/src/components/item_handlers/LdDirectoryViewer.vue
 delete mode 100644 viewer/src/components/item_handlers/LdDownload.vue
 create mode 100644 viewer/src/components/item_handlers/LdDownloadViewer.vue
 delete mode 100644 viewer/src/components/item_handlers/LdPicture.vue
 create mode 100644 viewer/src/components/item_handlers/LdPictureViewer.vue

diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
index e9b80e6..d9e7534 100644
--- a/viewer/src/@types/gallery.d.ts
+++ b/viewer/src/@types/gallery.d.ts
@@ -17,98 +17,99 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-declare namespace Gallery {
-  type ItemSortStr = "title_asc" | "date_asc" | "date_desc";
+import { ItemType } from "./ItemType";
 
-  interface Config {
-    galleryRoot: string;
-    galleryIndex?: string;
-    initialItemSort?: ItemSortStr;
-    initialTagDisplayLimit?: number;
-  }
+export type ItemSortStr = "title_asc" | "date_asc" | "date_desc";
 
-  interface GalleryProperties {
-    galleryTitle: string;
-    tagCategories: RawTag[];
-  }
-  interface Index {
-    properties: GalleryProperties;
-    tree: Directory;
-  }
+export interface Config {
+  galleryRoot: string;
+  galleryIndex?: string;
+  initialItemSort?: ItemSortStr;
+  initialTagDisplayLimit?: number;
+}
+
+export interface Properties {
+  galleryTitle: string;
+  tagCategories: RawTag[];
+}
+export interface Index {
+  properties: Properties;
+  tree: DirectoryItem;
+}
+
+export interface OtherItem extends Item {
+  properties: OtherProperties;
+}
+export interface PictureItem extends Item {
+  properties: PictureProperties;
+}
+export interface PlainTextItem extends Item {
+  properties: PlainTextProperties;
+}
+export interface PDFItem extends Item {
+  properties: PDFProperties;
+}
+export interface VideoItem extends Item {
+  properties: VideoProperties;
+}
+export interface AudioItem extends Item {
+  properties: AudioProperties;
+}
+export interface DirectoryItem extends Item {
+  properties: DirectoryProperties;
+}
+export interface Item {
+  title: string;
+  datetime: string;
+  description: string;
+  tags: RawTag[];
+  path: string;
+  thumbnail?: Thumbnail;
+  properties:
+    | OtherProperties
+    | PictureProperties
+    | PlainTextProperties
+    | PDFProperties
+    | VideoProperties
+    | AudioProperties
+    | DirectoryProperties;
+}
+export interface Resolution {
+  width: number;
+  height: number;
+}
+export interface OtherProperties {
+  type: ItemType.OTHER;
+  resource: string;
+}
+export interface PictureProperties {
+  type: ItemType.PICTURE;
+  resource: string;
+  resolution: Resolution;
+}
+export interface PlainTextProperties {
+  type: ItemType.PLAINTEXT;
+  resource: string;
+}
+export interface PDFProperties {
+  type: ItemType.PDF;
+  resource: string;
+}
+export interface VideoProperties {
+  type: ItemType.VIDEO;
+  resource: string;
+}
+export interface AudioProperties {
+  type: ItemType.AUDIO;
+  resource: string;
+}
+export interface DirectoryProperties {
+  type: ItemType.DIRECTORY;
+  items: Item[];
+}
 
-  interface Other extends Item {
-    properties: OtherProperties;
-  }
-  interface Picture extends Item {
-    properties: PictureProperties;
-  }
-  interface PlainText extends Item {
-    properties: PlainTextProperties;
-  }
-  interface PDF extends Item {
-    properties: PDFProperties;
-  }
-  interface Video extends Item {
-    properties: VideoProperties;
-  }
-  interface Audio extends Item {
-    properties: AudioProperties;
-  }
-  interface Directory extends Item {
-    properties: DirectoryProperties;
-  }
-  interface Item {
-    title: string;
-    datetime: string;
-    description: string;
-    tags: RawTag[];
-    path: string;
-    thumbnail?: Thumbnail;
-    properties:
-      | OtherProperties
-      | PictureProperties
-      | PlainTextProperties
-      | PDFProperties
-      | VideoProperties
-      | AudioProperties
-      | DirectoryProperties;
-  }
-  interface Resolution {
-    width: number;
-    height: number;
-  }
-  interface OtherProperties {
-    type: import("./ItemType").ItemType.OTHER;
-    resource: string;
-  }
-  interface PictureProperties {
-    type: import("./ItemType").ItemType.PICTURE;
-    resource: string;
-    resolution: Resolution;
-  }
-  interface PlainTextProperties {
-    type: import("./ItemType").ItemType.PLAINTEXT;
-    resource: string;
-  }
-  interface PDFProperties {
-    type: import("./ItemType").ItemType.PDF;
-    resource: string;
-  }
-  interface VideoProperties {
-    type: import("./ItemType").ItemType.VIDEO;
-    resource: string;
-  }
-  interface AudioProperties {
-    type: import("./ItemType").ItemType.AUDIO;
-    resource: string;
-  }
-  interface DirectoryProperties {
-    type: import("./ItemType").ItemType.DIRECTORY;
-    items: Item[];
-  }
-  interface Thumbnail {
-    resource: string;
-    resolution: Resolution;
-  }
-  type RawTag = string;
+export interface Thumbnail {
+  resource: string;
+  resolution: Resolution;
 }
+export type RawTag = string;
diff --git a/viewer/src/@types/tag.d.ts b/viewer/src/@types/tag.d.ts
index 59ae779..bb908d3 100644
--- a/viewer/src/@types/tag.d.ts
+++ b/viewer/src/@types/tag.d.ts
@@ -19,11 +19,11 @@
 
 declare namespace Tag {
   interface Node {
-    tag: Gallery.RawTag;
-    tagfiltered: Gallery.RawTag;
+    tag: RawTag;
+    tagfiltered: RawTag;
     rootPart: boolean;
     childPart: boolean;
-    items: Gallery.Item[];
+    items: Item[];
     children: Index;
   }
   interface Search extends Node {
diff --git a/viewer/src/components/LdBreadcrumb.vue b/viewer/src/components/LdBreadcrumb.vue
index 618b15a..2c17554 100644
--- a/viewer/src/components/LdBreadcrumb.vue
+++ b/viewer/src/components/LdBreadcrumb.vue
@@ -47,13 +47,14 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Ref, Watch, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
 import DragScrollClickFix from "@/services/dragscrollclickfix";
 import Navigation from "@/services/navigation";
+import { Component, Prop, Ref, Vue, Watch } from "vue-property-decorator";
 
 @Component
 export default class LdBreadcrumb extends Vue {
-  @Prop({ type: Array, required: true }) readonly currentItemPath!: Gallery.Item[];
+  @Prop({ type: Array, required: true }) readonly currentItemPath!: Item[];
   @Prop(Boolean) readonly searchMode!: boolean;
   @Ref() readonly breadcrumb!: HTMLUListElement;
 
@@ -82,7 +83,7 @@ export default class LdBreadcrumb extends Vue {
     });
   }
 
-  getIcon(item: Gallery.Item) {
+  getIcon(item: Item) {
     return Navigation.getIcon(item);
   }
 }
diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
index 5ba8266..7ffa670 100644
--- a/viewer/src/components/LdCommand.vue
+++ b/viewer/src/components/LdCommand.vue
@@ -40,12 +40,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
+import { Component, Prop, Vue } from "vue-property-decorator";
 import { RawLocation } from "vue-router";
 
 @Component
 export default class LdCommand extends Vue {
-  @Prop({ type: Array, required: true }) readonly currentItemPath!: Gallery.Item[];
+  @Prop({ type: Array, required: true }) readonly currentItemPath!: Item[];
 
   get commandToggleSearchPanelIcon(): string {
     return this.$uiStore.fullWidth ? "search" : "angle-double-left";
diff --git a/viewer/src/components/LdCommandSort.vue b/viewer/src/components/LdCommandSort.vue
index 4c246e6..c8a822e 100644
--- a/viewer/src/components/LdCommandSort.vue
+++ b/viewer/src/components/LdCommandSort.vue
@@ -32,8 +32,8 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
 import ItemComparators, { ItemSort } from "@/services/itemComparators";
+import { Component, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdCommandSort extends Vue {
diff --git a/viewer/src/components/LdGallery.vue b/viewer/src/components/LdGallery.vue
index edd479c..1443927 100644
--- a/viewer/src/components/LdGallery.vue
+++ b/viewer/src/components/LdGallery.vue
@@ -27,12 +27,12 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, Model } from "vue-property-decorator";
-import DragScrollClickFix from "@/services/dragscrollclickfix";
+import { Item } from "@/@types/gallery";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdPicture extends Vue {
-  @Prop({ type: Array, required: true }) readonly items!: Gallery.Item[];
+  @Prop({ type: Array, required: true }) readonly items!: Item[];
   @Prop(String) readonly noresult?: string;
 
   get sortedItems() {
diff --git a/viewer/src/components/LdInformation.vue b/viewer/src/components/LdInformation.vue
index 66ccc80..b161485 100644
--- a/viewer/src/components/LdInformation.vue
+++ b/viewer/src/components/LdInformation.vue
@@ -26,12 +26,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
 import marked from "marked";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdInformation extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Item;
+  @Prop({ required: true }) readonly item!: Item;
 
   get formatDate() {
     const date = this.item.datetime.substr(0, 10);
diff --git a/viewer/src/components/LdKeyPress.vue b/viewer/src/components/LdKeyPress.vue
index c507b33..151d6c6 100644
--- a/viewer/src/components/LdKeyPress.vue
+++ b/viewer/src/components/LdKeyPress.vue
@@ -18,7 +18,7 @@
 -->
 
 <script lang="ts">
-import { Component, Vue, Prop, Emit } from "vue-property-decorator";
+import { Component, Emit, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdKeyPress extends Vue {
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index aa44943..2396d1f 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -54,8 +54,9 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, PropSync, Watch } from "vue-property-decorator";
+import { Item, RawTag } from "@/@types/gallery";
 import { Operation } from "@/@types/Operation";
+import { Component, Prop, PropSync, Vue, Watch } from "vue-property-decorator";
 
 @Component
 export default class LdProposition extends Vue {
@@ -118,16 +119,16 @@ export default class LdProposition extends Vue {
     return this.category?.tag ?? this.$t("panelLeft.propositions.other");
   }
 
-  extractDistinctItems(currentTags: Tag.Search[]): Gallery.Item[] {
+  extractDistinctItems(currentTags: Tag.Search[]): Item[] {
     return [...new Set(currentTags.flatMap(tag => tag.items))];
   }
 
-  rightmost(tag: Gallery.RawTag): Gallery.RawTag {
+  rightmost(tag: RawTag): RawTag {
     const dot = tag.lastIndexOf(":");
     return dot <= 0 ? tag : tag.substr(dot + 1);
   }
 
-  add(operation: Operation, rawTag: Gallery.RawTag) {
+  add(operation: Operation, rawTag: RawTag) {
     const node = this.tagsIndex[rawTag];
     const display = this.category ? `${operation}${this.category.tag}:${node.tag}` : `${operation}${node.tag}`;
     this.model.push({ ...node, parent: this.category, operation, display });
diff --git a/viewer/src/components/LdTagInput.vue b/viewer/src/components/LdTagInput.vue
index ce83ba8..ef585f0 100644
--- a/viewer/src/components/LdTagInput.vue
+++ b/viewer/src/components/LdTagInput.vue
@@ -40,10 +40,8 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, PropSync, Emit } from "vue-property-decorator";
-import { Operation } from "@/@types/Operation";
-import Navigation from "@/services/navigation";
 import IndexFactory from "@/services/indexfactory";
+import { Component, Emit, Prop, PropSync, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdTagInput extends Vue {
diff --git a/viewer/src/components/LdThumbnail.vue b/viewer/src/components/LdThumbnail.vue
index 5b1bc82..3f67a43 100644
--- a/viewer/src/components/LdThumbnail.vue
+++ b/viewer/src/components/LdThumbnail.vue
@@ -37,12 +37,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
 import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdThumbnail extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Item;
+  @Prop({ required: true }) readonly item!: Item;
 
   loading: boolean = false;
 
diff --git a/viewer/src/components/LdTitle.vue b/viewer/src/components/LdTitle.vue
index 074008d..e1d47d1 100644
--- a/viewer/src/components/LdTitle.vue
+++ b/viewer/src/components/LdTitle.vue
@@ -18,12 +18,13 @@
 -->
 
 <script lang="ts">
-import { Component, Vue, Watch, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 
 @Component
 export default class LdTitle extends Vue {
   @Prop({ required: true }) readonly galleryTitle!: string;
-  @Prop() readonly currentItem?: Gallery.Item;
+  @Prop() readonly currentItem?: Item;
 
   render() {
     return null;
diff --git a/viewer/src/components/item_handlers/LdAudioViewer.vue b/viewer/src/components/item_handlers/LdAudioViewer.vue
index 2e0f8dc..559b10a 100644
--- a/viewer/src/components/item_handlers/LdAudioViewer.vue
+++ b/viewer/src/components/item_handlers/LdAudioViewer.vue
@@ -28,12 +28,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
+import { AudioItem } from "@/@types/gallery";
 import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdAudioViewer extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Audio;
+  @Prop({ required: true }) readonly item!: AudioItem;
 
   get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.item.properties.resource;
diff --git a/viewer/src/components/item_handlers/LdDirectory.vue b/viewer/src/components/item_handlers/LdDirectory.vue
deleted file mode 100644
index eec8011..0000000
--- a/viewer/src/components/item_handlers/LdDirectory.vue
+++ /dev/null
@@ -1,42 +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>
-  <ld-gallery :items="orderedItems" :noresult="$t('directory.no-results')" />
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
-import Navigation from "@/services/navigation";
-
-@Component
-export default class LdDirectory extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Directory;
-
-  mounted() {
-    this.$uiStore.toggleFullscreen(false);
-  }
-
-  get orderedItems() {
-    return Navigation.directoriesFirst(this.item.properties.items);
-  }
-}
-</script>
-
-<style lang="scss"></style>
diff --git a/viewer/src/components/item_handlers/LdDirectoryViewer.vue b/viewer/src/components/item_handlers/LdDirectoryViewer.vue
new file mode 100644
index 0000000..7440f54
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdDirectoryViewer.vue
@@ -0,0 +1,43 @@
+<!-- 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>
+  <ld-gallery :items="orderedItems" :noresult="$t('directory.no-results')" />
+</template>
+
+<script lang="ts">
+import { DirectoryItem } from "@/@types/gallery";
+import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdDirectoryViewer extends Vue {
+  @Prop({ required: true }) readonly item!: DirectoryItem;
+
+  mounted() {
+    this.$uiStore.toggleFullscreen(false);
+  }
+
+  get orderedItems() {
+    return Navigation.directoriesFirst(this.item.properties.items);
+  }
+}
+</script>
+
+<style lang="scss"></style>
diff --git a/viewer/src/components/item_handlers/LdDownload.vue b/viewer/src/components/item_handlers/LdDownload.vue
deleted file mode 100644
index 7b09dab..0000000
--- a/viewer/src/components/item_handlers/LdDownload.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
--- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2020  Pacien TRAN-GIRARD
---
--- 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="container-vh-centering">
-    <a :class="$style.content" :download="itemFileName" :href="itemDownloadUrl">
-      <!-- TODO: show thumbnail instead of this generic file download icon? -->
-      <fa-icon :class="$style.icon" icon="file-download" size="6x" />
-      <div>{{ $t("download.download-file-fmt", [itemFileName]) }}</div>
-    </a>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
-import Navigation from "@/services/navigation";
-
-@Component
-export default class LdDownload extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Other;
-
-  get itemFileName(): string {
-    return Navigation.getFileName(this.item);
-  }
-
-  get itemDownloadUrl(): string {
-    return this.$galleryStore.resourceRoot + this.item.properties.resource;
-  }
-}
-</script>
-
-<style lang="scss" module>
-.content {
-  text-align: center;
-}
-
-.icon {
-  margin-bottom: 0.15em;
-}
-</style>
diff --git a/viewer/src/components/item_handlers/LdDownloadViewer.vue b/viewer/src/components/item_handlers/LdDownloadViewer.vue
new file mode 100644
index 0000000..60c7c49
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdDownloadViewer.vue
@@ -0,0 +1,58 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- 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="container-vh-centering">
+    <a :class="$style.content" :download="itemFileName" :href="itemDownloadUrl">
+      <!-- TODO: show thumbnail instead of this generic file download icon? -->
+      <fa-icon :class="$style.icon" icon="file-download" size="6x" />
+      <div>{{ $t("download.download-file-fmt", [itemFileName]) }}</div>
+    </a>
+  </div>
+</template>
+
+<script lang="ts">
+import { OtherItem } from "@/@types/gallery";
+import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdDownloadViewer extends Vue {
+  @Prop({ required: true }) readonly item!: OtherItem;
+
+  get itemFileName(): string {
+    return Navigation.getFileName(this.item);
+  }
+
+  get itemDownloadUrl(): string {
+    return this.$galleryStore.resourceRoot + this.item.properties.resource;
+  }
+}
+</script>
+
+<style lang="scss" module>
+.content {
+  text-align: center;
+}
+
+.icon {
+  margin-bottom: 0.15em;
+}
+</style>
diff --git a/viewer/src/components/item_handlers/LdPdfViewer.vue b/viewer/src/components/item_handlers/LdPdfViewer.vue
index 462c463..e55989a 100644
--- a/viewer/src/components/item_handlers/LdPdfViewer.vue
+++ b/viewer/src/components/item_handlers/LdPdfViewer.vue
@@ -30,11 +30,12 @@
 </template>
 
 <script lang="ts">
+import { PDFItem } from "@/@types/gallery";
 import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdPdfViewer extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.PDF;
+  @Prop({ required: true }) readonly item!: PDFItem;
 
   get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.item.properties.resource;
diff --git a/viewer/src/components/item_handlers/LdPicture.vue b/viewer/src/components/item_handlers/LdPicture.vue
deleted file mode 100644
index e652afc..0000000
--- a/viewer/src/components/item_handlers/LdPicture.vue
+++ /dev/null
@@ -1,127 +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>
-  <!-- FIXME: v-dragscroll interferes with pinch-to-zoom -->
-  <div
-    ref="containerElement"
-    v-dragscroll
-    class="scrollbar ld-picture-container"
-    @click.capture="e => dragScrollClickFix.onClickCapture(e)"
-    @dblclick="$uiStore.toggleFullscreen()"
-    @dragstart.prevent
-    @dragscrollstart="dragScrollClickFix.onDragScrollStart()"
-    @dragscrollend="dragScrollClickFix.onDragScrollEnd()"
-  >
-    <v-lazy-image
-      ref="imageElement"
-      :src="pictureSrc(item.properties.resource)"
-      class="ld-picture-element"
-      :class="{ 'slow-loading': Boolean(slowLoadingStyle) }"
-      :style="slowLoadingStyle"
-      @load="clearSlowLoading"
-    />
-    <b-loading :active="loader" :is-full-page="false" class="ld-picture-loader" />
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop, Ref } from "vue-property-decorator";
-import LdZoom from "@/services/ldzoom";
-import DragScrollClickFix from "@/services/dragscrollclickfix";
-
-@Component
-export default class LdPicture extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Picture;
-  @Ref() readonly containerElement!: HTMLDivElement;
-  @Ref() readonly imageElement!: Vue;
-
-  readonly SLOW_LOADING_TIMEOUT_MS: number = 1500;
-  readonly dragScrollClickFix = new DragScrollClickFix();
-
-  slowLoadingStyle: string | null = null;
-  loader: boolean = false;
-  timer: NodeJS.Timeout | null = null;
-
-  mounted() {
-    this.timer = setTimeout(this.generateSlowLoadingStyle, this.SLOW_LOADING_TIMEOUT_MS);
-    new LdZoom(
-      this.containerElement,
-      this.imageElement.$el as HTMLImageElement,
-      this.item.properties,
-      10,
-      1 / 5
-    ).install();
-  }
-
-  destroyed() {
-    this.clearSlowLoading();
-  }
-
-  clearSlowLoading() {
-    if (this.timer) clearTimeout(this.timer);
-    this.timer = null;
-    this.slowLoadingStyle = null;
-    this.loader = false;
-  }
-
-  pictureSrc(resource: string) {
-    return this.$galleryStore.resourceRoot + resource;
-  }
-
-  generateSlowLoadingStyle() {
-    this.clearSlowLoading();
-    this.loader = true;
-    if (this.item.thumbnail) {
-      const url = this.pictureSrc(this.item.thumbnail.resource);
-      this.slowLoadingStyle = `background-image: url('${url}');`;
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "~@/assets/scss/theme.scss";
-
-.ld-picture-container {
-  height: 100%;
-}
-
-.ld-picture-element {
-  max-width: unset;
-  max-height: unset;
-  cursor: grab;
-}
-
-.slow-loading {
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: contain;
-  background-color: $content-bgcolor;
-  background-blend-mode: soft-light;
-  opacity: 1 !important;
-}
-
-.ld-picture-loader {
-  position: relative;
-  & .loading-background {
-    background: none !important;
-  }
-}
-</style>
diff --git a/viewer/src/components/item_handlers/LdPictureViewer.vue b/viewer/src/components/item_handlers/LdPictureViewer.vue
new file mode 100644
index 0000000..003ffe9
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdPictureViewer.vue
@@ -0,0 +1,128 @@
+<!-- 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>
+  <!-- FIXME: v-dragscroll interferes with pinch-to-zoom -->
+  <div
+    ref="containerElement"
+    v-dragscroll
+    class="scrollbar ld-picture-container"
+    @click.capture="e => dragScrollClickFix.onClickCapture(e)"
+    @dblclick="$uiStore.toggleFullscreen()"
+    @dragstart.prevent
+    @dragscrollstart="dragScrollClickFix.onDragScrollStart()"
+    @dragscrollend="dragScrollClickFix.onDragScrollEnd()"
+  >
+    <v-lazy-image
+      ref="imageElement"
+      :src="pictureSrc(item.properties.resource)"
+      class="ld-picture-element"
+      :class="{ 'slow-loading': Boolean(slowLoadingStyle) }"
+      :style="slowLoadingStyle"
+      @load="clearSlowLoading"
+    />
+    <b-loading :active="loader" :is-full-page="false" class="ld-picture-loader" />
+  </div>
+</template>
+
+<script lang="ts">
+import { PictureItem } from "@/@types/gallery";
+import DragScrollClickFix from "@/services/dragscrollclickfix";
+import LdZoom from "@/services/ldzoom";
+import { Component, Prop, Ref, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdPictureViewer extends Vue {
+  @Prop({ required: true }) readonly item!: PictureItem;
+  @Ref() readonly containerElement!: HTMLDivElement;
+  @Ref() readonly imageElement!: Vue;
+
+  readonly SLOW_LOADING_TIMEOUT_MS: number = 1500;
+  readonly dragScrollClickFix = new DragScrollClickFix();
+
+  slowLoadingStyle: string | null = null;
+  loader: boolean = false;
+  timer: NodeJS.Timeout | null = null;
+
+  mounted() {
+    this.timer = setTimeout(this.generateSlowLoadingStyle, this.SLOW_LOADING_TIMEOUT_MS);
+    new LdZoom(
+      this.containerElement,
+      this.imageElement.$el as HTMLImageElement,
+      this.item.properties,
+      10,
+      1 / 5
+    ).install();
+  }
+
+  destroyed() {
+    this.clearSlowLoading();
+  }
+
+  clearSlowLoading() {
+    if (this.timer) clearTimeout(this.timer);
+    this.timer = null;
+    this.slowLoadingStyle = null;
+    this.loader = false;
+  }
+
+  pictureSrc(resource: string) {
+    return this.$galleryStore.resourceRoot + resource;
+  }
+
+  generateSlowLoadingStyle() {
+    this.clearSlowLoading();
+    this.loader = true;
+    if (this.item.thumbnail) {
+      const url = this.pictureSrc(this.item.thumbnail.resource);
+      this.slowLoadingStyle = `background-image: url('${url}');`;
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "~@/assets/scss/theme.scss";
+
+.ld-picture-container {
+  height: 100%;
+}
+
+.ld-picture-element {
+  max-width: unset;
+  max-height: unset;
+  cursor: grab;
+}
+
+.slow-loading {
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: contain;
+  background-color: $content-bgcolor;
+  background-blend-mode: soft-light;
+  opacity: 1 !important;
+}
+
+.ld-picture-loader {
+  position: relative;
+  & .loading-background {
+    background: none !important;
+  }
+}
+</style>
diff --git a/viewer/src/components/item_handlers/LdPlainTextViewer.vue b/viewer/src/components/item_handlers/LdPlainTextViewer.vue
index cd26d9d..79465d5 100644
--- a/viewer/src/components/item_handlers/LdPlainTextViewer.vue
+++ b/viewer/src/components/item_handlers/LdPlainTextViewer.vue
@@ -27,11 +27,12 @@
 </template>
 
 <script lang="ts">
+import { PlainTextItem } from "@/@types/gallery";
 import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdPlainTextViewer extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.PlainText;
+  @Prop({ required: true }) readonly item!: PlainTextItem;
 
   get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.item.properties.resource;
diff --git a/viewer/src/components/item_handlers/LdVideoViewer.vue b/viewer/src/components/item_handlers/LdVideoViewer.vue
index 2e3a43c..a203b13 100644
--- a/viewer/src/components/item_handlers/LdVideoViewer.vue
+++ b/viewer/src/components/item_handlers/LdVideoViewer.vue
@@ -28,11 +28,12 @@
 </template>
 
 <script lang="ts">
+import { VideoItem } from "@/@types/gallery";
 import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdVideoViewer extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Video;
+  @Prop({ required: true }) readonly item!: VideoItem;
 
   get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.item.properties.resource;
diff --git a/viewer/src/main.ts b/viewer/src/main.ts
index 4d07835..cccb37b 100644
--- a/viewer/src/main.ts
+++ b/viewer/src/main.ts
@@ -17,13 +17,13 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import Vue from "vue";
 import "@/assets/scss/global.scss";
 import "@/assets/scss/scrollbar.scss";
 import "@/assets/scss/transition.scss";
-import store from "@/store";
 import i18n from "@/plugins/i18n";
 import router from "@/plugins/router";
+import store from "@/store";
+import Vue from "vue";
 Vue.config.productionTip = false;
 
 import(/* webpackChunkName: "ui" */ "@/plugins/buefy");
diff --git a/viewer/src/services/indexfactory.ts b/viewer/src/services/indexfactory.ts
index 4b28a60..0c5fdc5 100644
--- a/viewer/src/services/indexfactory.ts
+++ b/viewer/src/services/indexfactory.ts
@@ -17,19 +17,20 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Operation } from "@/@types/Operation";
+import { Item, RawTag } from "@/@types/gallery";
 import { ItemType } from "@/@types/ItemType";
+import { Operation } from "@/@types/Operation";
 import Navigation from "@/services/navigation";
 
 export default class IndexFactory {
-  public static generateTags(root: Gallery.Item | null): Tag.Index {
+  public static generateTags(root: Item | null): Tag.Index {
     const tagsIndex: Tag.Index = {};
     if (root) IndexFactory.pushTagsForItem(tagsIndex, root);
     return tagsIndex;
   }
 
   // Pushes all tags for a root item (and its children) to the index
-  private static pushTagsForItem(tagsIndex: Tag.Index, item: Gallery.Item): void {
+  private static pushTagsForItem(tagsIndex: Tag.Index, item: Item): void {
     if (item.properties.type === ItemType.DIRECTORY) {
       item.properties.items.forEach(item => this.pushTagsForItem(tagsIndex, item));
       return; // Directories are not indexed
@@ -49,7 +50,7 @@ export default class IndexFactory {
     }
   }
 
-  private static pushPartToIndex(index: Tag.Node, part: string, item: Gallery.Item, rootPart: boolean): Tag.Node {
+  private static pushPartToIndex(index: Tag.Node, part: string, item: Item, rootPart: boolean): Tag.Node {
     if (!index)
       index = {
         tag: part,
@@ -131,7 +132,7 @@ export default class IndexFactory {
 
   // ---
 
-  public static generateCategories(tagsIndex: Tag.Index, categoryTags?: Gallery.RawTag[]): Tag.Category[] {
+  public static generateCategories(tagsIndex: Tag.Index, categoryTags?: RawTag[]): Tag.Category[] {
     if (!categoryTags?.length) return [{ tag: "", index: tagsIndex }];
 
     const tagsCategories: Tag.Category[] = [];
@@ -149,7 +150,7 @@ export default class IndexFactory {
     return tagsCategories;
   }
 
-  private static isDiscriminantTagOnly(tags: Gallery.RawTag[], node: Tag.Node): boolean {
+  private static isDiscriminantTagOnly(tags: RawTag[], node: Tag.Node): boolean {
     return !tags.includes(node.tag) || !node.childPart;
   }
 }
diff --git a/viewer/src/services/indexsearch.ts b/viewer/src/services/indexsearch.ts
index 00f8cfc..eda1b27 100644
--- a/viewer/src/services/indexsearch.ts
+++ b/viewer/src/services/indexsearch.ts
@@ -17,11 +17,12 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Item } from "@/@types/gallery";
 import { Operation } from "@/@types/Operation";
 
 export default class IndexSearch {
   // Results of the search (by tags)
-  public static search(searchTags: Tag.Search[]): Gallery.Item[] {
+  public static search(searchTags: Tag.Search[]): Item[] {
     const byOperation = this.extractTagsByOperation(searchTags);
     const intersection = this.extractIntersection(byOperation);
     const substraction = this.extractSubstraction(byOperation);
@@ -36,8 +37,8 @@ export default class IndexSearch {
     return byOperation;
   }
 
-  private static extractIntersection(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    const intersection = new Set<Gallery.Item>();
+  private static extractIntersection(byOperation: Tag.SearchByOperation): Set<Item> {
+    const intersection = new Set<Item>();
     if (byOperation[Operation.INTERSECTION].length > 0) {
       byOperation[Operation.INTERSECTION]
         .map(tag => tag.items)
@@ -48,8 +49,8 @@ export default class IndexSearch {
     return intersection;
   }
 
-  private static extractSubstraction(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    const substraction = new Set<Gallery.Item>();
+  private static extractSubstraction(byOperation: Tag.SearchByOperation): Set<Item> {
+    const substraction = new Set<Item>();
     if (byOperation[Operation.SUBSTRACTION].length > 0) {
       byOperation[Operation.SUBSTRACTION].flatMap(tag => tag.items).forEach(item => substraction.add(item));
     }
@@ -58,9 +59,9 @@ export default class IndexSearch {
 
   private static aggregateAll(
     byOperation: Tag.SearchByOperation,
-    intersection: Set<Gallery.Item>,
-    substraction: Set<Gallery.Item>
-  ): Gallery.Item[] {
+    intersection: Set<Item>,
+    substraction: Set<Item>
+  ): 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/services/itemComparators.ts b/viewer/src/services/itemComparators.ts
index bd9accb..aceff79 100644
--- a/viewer/src/services/itemComparators.ts
+++ b/viewer/src/services/itemComparators.ts
@@ -16,14 +16,15 @@
 -- 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 { TranslateResult } from "vue-i18n";
+import { Item, ItemSortStr } from "@/@types/gallery";
 import i18n from "@/plugins/i18n";
+import { TranslateResult } from "vue-i18n";
 
-export type ItemComparator = (left: Gallery.Item, right: Gallery.Item) => number;
+export type ItemComparator = (left: Item, right: Item) => number;
 export type ItemSort = { text: TranslateResult; fn: ItemComparator };
 
 export default class ItemComparators {
-  static readonly ITEM_SORTS: Record<Gallery.ItemSortStr, ItemSort> = {
+  static readonly ITEM_SORTS: Record<ItemSortStr, ItemSort> = {
     title_asc: {
       text: i18n.t("command.sort.byTitleAsc"),
       fn: ItemComparators.chain(ItemComparators.sortByTitleAsc, ItemComparators.sortByPathAsc),
@@ -40,7 +41,7 @@ export default class ItemComparators {
 
   static readonly DEFAULT = ItemComparators.ITEM_SORTS.date_asc;
 
-  static sortByPathAsc(left: Gallery.Item, right: Gallery.Item): number {
+  static sortByPathAsc(left: Item, right: Item): number {
     return left.path.localeCompare(right.path, undefined, {
       sensitivity: "base",
       ignorePunctuation: true,
@@ -48,7 +49,7 @@ export default class ItemComparators {
     });
   }
 
-  static sortByTitleAsc(left: Gallery.Item, right: Gallery.Item): number {
+  static sortByTitleAsc(left: Item, right: Item): number {
     return left.title.localeCompare(right.title, undefined, {
       sensitivity: "base",
       ignorePunctuation: true,
@@ -56,7 +57,7 @@ export default class ItemComparators {
     });
   }
 
-  static sortByDateAsc(left: Gallery.Item, right: Gallery.Item): number {
+  static sortByDateAsc(left: Item, right: Item): number {
     return left.datetime.localeCompare(right.datetime); // TODO: handle timezones
   }
 
diff --git a/viewer/src/services/ldzoom.ts b/viewer/src/services/ldzoom.ts
index 0fb0848..33a64c8 100644
--- a/viewer/src/services/ldzoom.ts
+++ b/viewer/src/services/ldzoom.ts
@@ -17,6 +17,7 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { PictureProperties, Resolution } from "@/@types/gallery";
 import "hammerjs";
 
 /**
@@ -25,7 +26,7 @@ import "hammerjs";
 export default class LdZoom {
   readonly containerElement: HTMLDivElement;
   readonly imageElement: HTMLImageElement;
-  readonly pictureProperties: Gallery.PictureProperties;
+  readonly pictureProperties: PictureProperties;
   readonly maxScaleFactor: number;
   readonly scrollZoomSpeed: number;
   scaleFactor: number = 0.0;
@@ -33,7 +34,7 @@ export default class LdZoom {
   constructor(
     containerElement: HTMLDivElement,
     imageElement: HTMLImageElement,
-    pictureProperties: Gallery.PictureProperties,
+    pictureProperties: PictureProperties,
     maxScaleFactor: number,
     scrollZoomSpeed: number
   ) {
@@ -83,7 +84,7 @@ export default class LdZoom {
   /**
    * Returns the picture resolution as it should be displayed.
    */
-  private getDisplayResolution(): Gallery.Resolution {
+  private getDisplayResolution(): Resolution {
     return {
       width: this.pictureProperties.resolution.width * this.scaleFactor,
       height: this.pictureProperties.resolution.height * this.scaleFactor,
diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index 5b0716d..9bbd90c 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -17,6 +17,7 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { DirectoryItem, Item } from "@/@types/gallery";
 import { ItemType } from "@/@types/ItemType";
 
 export default class Navigation {
@@ -31,7 +32,7 @@ export default class Navigation {
   };
 
   // Searches for an item by path from a root item (navigation)
-  public static searchCurrentItemPath(root: Gallery.Item, path: string): Gallery.Item[] {
+  public static searchCurrentItemPath(root: Item, path: string): Item[] {
     if (path === root.path) return [root];
     if (root.properties.type === ItemType.DIRECTORY && path.startsWith(root.path)) {
       const itemChain = root.properties.items
@@ -51,20 +52,20 @@ export default class Navigation {
   }
 
   // Checks if the type of an item matches
-  public static checkType(item: Gallery.Item | null, type: ItemType | null): boolean {
+  public static checkType(item: Item | null, type: ItemType | null): boolean {
     return (item?.properties.type ?? null) === type;
   }
 
-  public static getLastDirectory(itemPath: Gallery.Item[]): Gallery.Directory {
+  public static getLastDirectory(itemPath: Item[]): DirectoryItem {
     for (let idx = itemPath.length - 1; idx >= 0; idx--) {
       const item = itemPath[idx];
-      if (Navigation.checkType(item, ItemType.DIRECTORY)) return item as Gallery.Directory;
+      if (Navigation.checkType(item, ItemType.DIRECTORY)) return item as DirectoryItem;
     }
     throw new Error("No directory found");
   }
 
   // Sort a list of items, moving the directories to the beginning of the list
-  public static directoriesFirst(items: Gallery.Item[]) {
+  public static directoriesFirst(items: Item[]) {
     return [
       ...items
         .filter(child => Navigation.checkType(child, ItemType.DIRECTORY))
@@ -75,13 +76,13 @@ export default class Navigation {
   }
 
   // Get the icon for an item
-  public static getIcon(item: Gallery.Item): string {
+  public static getIcon(item: Item): string {
     if (item.path.length <= 1) return "home";
     return Navigation.ICON_BY_TYPE[item.properties.type];
   }
 
   // Get the file name of an item, without its cache timestamp
-  public static getFileName(item: Gallery.Item): string {
+  public static getFileName(item: Item): string {
     if (item.properties.type === ItemType.DIRECTORY) return item.title;
     const timeStamped = item.properties.resource.split("/").pop() ?? "";
     return timeStamped.split("?")[0];
diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index 6d64e12..3ef2036 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -17,9 +17,10 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { createModule, mutation, action } from "vuex-class-component";
+import { Config, Index, Item } from "@/@types/gallery";
 import IndexFactory from "@/services/indexfactory";
 import Navigation from "@/services/navigation";
+import { action, createModule, mutation } from "vuex-class-component";
 
 const VuexModule = createModule({
   namespaced: "galleryStore",
@@ -27,8 +28,8 @@ const VuexModule = createModule({
 });
 
 export default class GalleryStore extends VuexModule {
-  config: Gallery.Config | null = null;
-  galleryIndex: Gallery.Index | null = null;
+  config: Config | null = null;
+  galleryIndex: Index | null = null;
   tagsIndex: Tag.Index = {};
   tagsCategories: Tag.Category[] = [];
   currentPath: string | null = null;
@@ -36,11 +37,11 @@ export default class GalleryStore extends VuexModule {
 
   // ---
 
-  @mutation private setConfig(config: Gallery.Config) {
+  @mutation private setConfig(config: Config) {
     this.config = config;
   }
 
-  @mutation setGalleryIndex(galleryIndex: Gallery.Index) {
+  @mutation setGalleryIndex(galleryIndex: Index) {
     this.galleryIndex = Object.freeze(galleryIndex);
   }
 
@@ -62,13 +63,13 @@ export default class GalleryStore extends VuexModule {
 
   // ---
 
-  get currentItemPath(): Gallery.Item[] {
+  get currentItemPath(): Item[] {
     const root = this.galleryIndex?.tree;
     if (root && this.currentPath) return Navigation.searchCurrentItemPath(root, this.currentPath);
     return [];
   }
 
-  get currentItem(): Gallery.Item | null {
+  get currentItem(): Item | null {
     const path = this.currentItemPath;
     return path.length > 0 ? path[path.length - 1] : null;
   }
diff --git a/viewer/src/store/index.ts b/viewer/src/store/index.ts
index f86d66b..1f49589 100644
--- a/viewer/src/store/index.ts
+++ b/viewer/src/store/index.ts
@@ -17,12 +17,11 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import GalleryStore from "@/store/galleryStore";
+import UIStore from "@/store/uiStore";
 import Vue from "vue";
 import Vuex from "vuex";
-import { extractVuexModule } from "vuex-class-component";
-import { createProxy } from "vuex-class-component";
-import UIStore from "@/store/uiStore";
-import GalleryStore from "@/store/galleryStore";
+import { createProxy, extractVuexModule } from "vuex-class-component";
 
 Vue.use(Vuex);
 
diff --git a/viewer/src/store/uiStore.ts b/viewer/src/store/uiStore.ts
index f065cdd..f5bb898 100644
--- a/viewer/src/store/uiStore.ts
+++ b/viewer/src/store/uiStore.ts
@@ -17,8 +17,9 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { createModule, mutation, action } from "vuex-class-component";
+import { Config } from "@/@types/gallery";
 import ItemComparators, { ItemSort } from "@/services/itemComparators";
+import { action, createModule, mutation } from "vuex-class-component";
 
 const VuexModule = createModule({
   namespaced: "uiStore",
@@ -49,7 +50,7 @@ export default class UIStore extends VuexModule {
     this.sort = sort;
   }
 
-  @action async initFromConfig(config: Gallery.Config) {
+  @action async initFromConfig(config: Config) {
     if (config.initialItemSort) {
       const itemSort = ItemComparators.ITEM_SORTS[config.initialItemSort];
       if (itemSort) this.setSort(itemSort);
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index 69198f6..8bb225a 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -26,10 +26,10 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, Watch } from "vue-property-decorator";
 import { ItemType } from "@/@types/ItemType";
 import Navigation from "@/services/navigation";
 import GallerySearch from "@/views/GallerySearch.vue";
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 
 @Component({
   components: {
@@ -41,13 +41,13 @@ export default class GalleryNavigation extends Vue {
   @Prop(Array) readonly query!: string[];
 
   readonly COMPONENT_BY_TYPE: Record<ItemType, string> = {
-    directory: "ld-directory",
-    picture: "ld-picture",
+    directory: "ld-directory-viewer",
+    picture: "ld-picture-viewer",
     plaintext: "ld-plain-text-viewer",
     pdf: "ld-pdf-viewer",
     video: "ld-video-viewer",
     audio: "ld-audio-viewer",
-    other: "ld-download",
+    other: "ld-download-viewer",
   };
 
   mounted() {
diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue
index fec7216..6d3deb4 100644
--- a/viewer/src/views/GallerySearch.vue
+++ b/viewer/src/views/GallerySearch.vue
@@ -22,9 +22,8 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
-import { Operation } from "@/@types/Operation";
 import IndexSearch from "@/services/indexsearch";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class GalleryPicture extends Vue {
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index 9cd518b..edca4bf 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -29,10 +29,10 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Ref, Watch } from "vue-property-decorator";
+import { Component, Ref, Vue, Watch } from "vue-property-decorator";
+import { Route } from "vue-router";
 import PanelLeft from "./PanelLeft.vue";
 import PanelTop from "./PanelTop.vue";
-import { Route } from "vue-router";
 
 @Component({
   components: { PanelLeft, PanelTop },
diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue
index d2a3656..5c42fa9 100644
--- a/viewer/src/views/PanelLeft.vue
+++ b/viewer/src/views/PanelLeft.vue
@@ -48,10 +48,9 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, Watch } from "vue-property-decorator";
-import { Dictionary, Route } from "vue-router/types/router";
 import Navigation from "@/services/navigation";
-import IndexFactory from "@/services/indexfactory";
+import { Component, Vue, Watch } from "vue-property-decorator";
+import { Dictionary, Route } from "vue-router/types/router";
 
 @Component
 export default class PanelLeft extends Vue {
-- 
cgit v1.2.3