Merge pull request #302 from ldgallery/oz-types-normalization

viewer: types normalization

7 files changed, 22 insertions, 15 deletions

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/LdDirectoryViewer.vue
index eec8011..7440f54 100644
--- a/viewer/src/components/item_handlers/LdDirectory.vue
+++ b/viewer/src/components/item_handlers/LdDirectoryViewer.vue
@@ -22,12 +22,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { DirectoryItem } from "@/@types/gallery";
 import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
-export default class LdDirectory extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Directory;
+export default class LdDirectoryViewer extends Vue {
+  @Prop({ required: true }) readonly item!: DirectoryItem;
 
   mounted() {
     this.$uiStore.toggleFullscreen(false);
diff --git a/viewer/src/components/item_handlers/LdDownload.vue b/viewer/src/components/item_handlers/LdDownloadViewer.vue
index 7b09dab..60c7c49 100644
--- a/viewer/src/components/item_handlers/LdDownload.vue
+++ b/viewer/src/components/item_handlers/LdDownloadViewer.vue
@@ -29,12 +29,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
+import { OtherItem } from "@/@types/gallery";
 import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
-export default class LdDownload extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Other;
+export default class LdDownloadViewer extends Vue {
+  @Prop({ required: true }) readonly item!: OtherItem;
 
   get itemFileName(): string {
     return Navigation.getFileName(this.item);
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/LdPictureViewer.vue
index e652afc..003ffe9 100644
--- a/viewer/src/components/item_handlers/LdPicture.vue
+++ b/viewer/src/components/item_handlers/LdPictureViewer.vue
@@ -42,13 +42,14 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, Ref } from "vue-property-decorator";
-import LdZoom from "@/services/ldzoom";
+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 LdPicture extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Picture;
+export default class LdPictureViewer extends Vue {
+  @Prop({ required: true }) readonly item!: PictureItem;
   @Ref() readonly containerElement!: HTMLDivElement;
   @Ref() readonly imageElement!: Vue;
 
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;