aboutsummaryrefslogtreecommitdiff
path: root/viewer
diff options
context:
space:
mode:
authorpacien2022-04-12 22:29:29 +0200
committerGitHub2022-04-12 22:29:29 +0200
commit87f2f631aec9ffbb794b5475a16353e873dbb2b7 (patch)
tree7bd0c65e680202b8c48ed9d875b9d0c45223b9e2 /viewer
parenta6b4a520f16092f38d8d97d5d746aa6777b8ced5 (diff)
parent581029f1b15b51f90812a47b20bce454014da32a (diff)
downloadldgallery-87f2f631aec9ffbb794b5475a16353e873dbb2b7.tar.gz
Merge pull request #307 from ldgallery/pacien-20210704-markdown-item-handler
viewer: markdown item handler
Diffstat (limited to 'viewer')
-rw-r--r--viewer/src/@types/ItemType.ts1
-rw-r--r--viewer/src/@types/gallery.d.ts8
-rw-r--r--viewer/src/components/item_handlers/LdMarkdownViewer.vue76
-rw-r--r--viewer/src/services/navigation.ts1
-rw-r--r--viewer/src/views/GalleryNavigation.vue1
-rw-r--r--viewer/src/views/SplashScreen.vue1
6 files changed, 88 insertions, 0 deletions
diff --git a/viewer/src/@types/ItemType.ts b/viewer/src/@types/ItemType.ts
index 9974d4e..5ef38d8 100644
--- a/viewer/src/@types/ItemType.ts
+++ b/viewer/src/@types/ItemType.ts
@@ -21,6 +21,7 @@ export enum ItemType {
21 OTHER = "other", 21 OTHER = "other",
22 PICTURE = "picture", 22 PICTURE = "picture",
23 PLAINTEXT = "plaintext", 23 PLAINTEXT = "plaintext",
24 MARKDOWN = "markdown",
24 PDF = "pdf", 25 PDF = "pdf",
25 VIDEO = "video", 26 VIDEO = "video",
26 AUDIO = "audio", 27 AUDIO = "audio",
diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
index 9011f19..0b4cfc4 100644
--- a/viewer/src/@types/gallery.d.ts
+++ b/viewer/src/@types/gallery.d.ts
@@ -48,6 +48,9 @@ export interface PictureItem extends Item {
48export interface PlainTextItem extends Item { 48export interface PlainTextItem extends Item {
49 properties: PlainTextProperties; 49 properties: PlainTextProperties;
50} 50}
51export interface MarkdownItem extends Item {
52 properties: MarkdownProperties;
53}
51export interface PDFItem extends Item { 54export interface PDFItem extends Item {
52 properties: PDFProperties; 55 properties: PDFProperties;
53} 56}
@@ -71,6 +74,7 @@ export interface Item {
71 | OtherProperties 74 | OtherProperties
72 | PictureProperties 75 | PictureProperties
73 | PlainTextProperties 76 | PlainTextProperties
77 | MarkdownProperties
74 | PDFProperties 78 | PDFProperties
75 | VideoProperties 79 | VideoProperties
76 | AudioProperties 80 | AudioProperties
@@ -93,6 +97,10 @@ export interface PlainTextProperties {
93 type: ItemType.PLAINTEXT; 97 type: ItemType.PLAINTEXT;
94 resource: string; 98 resource: string;
95} 99}
100export interface MarkdownProperties {
101 type: ItemType.MARKDOWN;
102 resource: string;
103}
96export interface PDFProperties { 104export interface PDFProperties {
97 type: ItemType.PDF; 105 type: ItemType.PDF;
98 resource: string; 106 resource: string;
diff --git a/viewer/src/components/item_handlers/LdMarkdownViewer.vue b/viewer/src/components/item_handlers/LdMarkdownViewer.vue
new file mode 100644
index 0000000..3b9a8d6
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdMarkdownViewer.vue
@@ -0,0 +1,76 @@
1<!--
2-- ldgallery - A static generator which turns a collection of tagged
3-- pictures into a searchable web gallery.
4--
5-- Copyright (C) 2021 Guillaume FOUET
6--
7-- This program is free software: you can redistribute it and/or modify
8-- it under the terms of the GNU Affero General Public License as
9-- published by the Free Software Foundation, either version 3 of the
10-- License, or (at your option) any later version.
11--
12-- This program is distributed in the hope that it will be useful,
13-- but WITHOUT ANY WARRANTY; without even the implied warranty of
14-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-- GNU Affero General Public License for more details.
16--
17-- You should have received a copy of the GNU Affero General Public License
18-- along with this program. If not, see <https://www.gnu.org/licenses/>.
19-->
20
21<template>
22 <b-loading v-if="isLoading" active />
23 <Markdown v-else-if="markdown" :class="$style.container" :markdown="markdown" />
24</template>
25
26<script lang="ts">
27import { MarkdownItem } from "@/@types/gallery";
28import { Markdown } from "@/components/async";
29import FetchWithCheck from "@/services/fetchWithCheck";
30import { Component, Prop, Vue } from "vue-property-decorator";
31
32@Component({
33 components: {
34 Markdown,
35 },
36})
37export default class LdMarkdownViewer extends Vue {
38 @Prop({ required: true }) readonly item!: MarkdownItem;
39
40 isLoading: boolean = true;
41 markdown: string | null = null;
42
43 created() {
44 this.fetchMarkdown();
45 }
46
47 get itemResourceUrl(): string {
48 return this.$galleryStore.resourceRoot + this.item.properties.resource;
49 }
50
51 // TODO: Identical to SplashScreen.vue, use composition with Vue3.
52 fetchMarkdown() {
53 FetchWithCheck.get(this.itemResourceUrl)
54 .then(response => response.text())
55 .then(text => (this.markdown = text))
56 .finally(() => (this.isLoading = false))
57 .catch(this.displayError);
58 }
59
60 displayError(reason: any) {
61 this.$buefy.snackbar.open({
62 message: `${reason}`,
63 actionText: this.$t("snack.retry"),
64 position: "is-top",
65 type: "is-warning",
66 onAction: this.fetchMarkdown,
67 });
68 }
69}
70</script>
71
72<style lang="scss" module>
73.container {
74 padding: 8px;
75}
76</style>
diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index 9bbd90c..5dcea88 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -25,6 +25,7 @@ export default class Navigation {
25 directory: "folder", 25 directory: "folder",
26 picture: "image", 26 picture: "image",
27 plaintext: "file-alt", 27 plaintext: "file-alt",
28 markdown: "file-alt",
28 pdf: "file-pdf", 29 pdf: "file-pdf",
29 video: "file-video", 30 video: "file-video",
30 audio: "file-audio", 31 audio: "file-audio",
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index fdd3922..200637e 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -44,6 +44,7 @@ export default class GalleryNavigation extends Vue {
44 directory: "ld-directory-viewer", 44 directory: "ld-directory-viewer",
45 picture: "ld-picture-viewer", 45 picture: "ld-picture-viewer",
46 plaintext: "ld-plain-text-viewer", 46 plaintext: "ld-plain-text-viewer",
47 markdown: "ld-markdown-viewer",
47 pdf: "ld-pdf-viewer", 48 pdf: "ld-pdf-viewer",
48 video: "ld-video-viewer", 49 video: "ld-video-viewer",
49 audio: "ld-audio-viewer", 50 audio: "ld-audio-viewer",
diff --git a/viewer/src/views/SplashScreen.vue b/viewer/src/views/SplashScreen.vue
index dcb845d..93d84a1 100644
--- a/viewer/src/views/SplashScreen.vue
+++ b/viewer/src/views/SplashScreen.vue
@@ -30,6 +30,7 @@ export default class SplashScreen extends Vue {
30 this.fetchMarkdown(); 30 this.fetchMarkdown();
31 } 31 }
32 32
33 // TODO: Identical to LdMarkdownViewer.vue, use composition with Vue3.
33 fetchMarkdown() { 34 fetchMarkdown() {
34 FetchWithCheck.get(`${process.env.VUE_APP_DATA_URL}${this.config.resource}?${this.config.acknowledgmentKey ?? ""}`) 35 FetchWithCheck.get(`${process.env.VUE_APP_DATA_URL}${this.config.resource}?${this.config.acknowledgmentKey ?? ""}`)
35 .then(response => response.text()) 36 .then(response => response.text())