Merge branch 'oz-markdown-component' into develop

Reviewed-by: pacien <pacien.trangirard@pacien.net>

6 files changed, 151 insertions, 15 deletions

diff --git a/viewer/src/components/LdInformation.vue b/viewer/src/components/LdInformation.vue
index b161485..68e1817 100644
--- a/viewer/src/components/LdInformation.vue
+++ b/viewer/src/components/LdInformation.vue
@@ -21,16 +21,20 @@
   <div v-if="item" class="flex-column" :class="$style.infopanel">
     <div v-if="item.title" :class="$style.title">{{ item.title }}</div>
     <time v-if="item.datetime" :datetime="item.datetime" :class="$style.datetime">{{ formatDate }}</time>
-    <div v-if="item.description" :class="$style.description" v-html="formatDescription" />
+    <Markdown v-if="item.description" :class="$style.description" :markdown="item.description" />
   </div>
 </template>
 
 <script lang="ts">
 import { Item } from "@/@types/gallery";
-import marked from "marked";
+import { Markdown } from "@/components/async";
 import { Component, Prop, Vue } from "vue-property-decorator";
 
-@Component
+@Component({
+  components: {
+    Markdown,
+  },
+})
 export default class LdInformation extends Vue {
   @Prop({ required: true }) readonly item!: Item;
 
@@ -39,11 +43,6 @@ export default class LdInformation extends Vue {
     const time = this.item.datetime.substr(11, 5);
     return `${date} ${time}`;
   }
-
-  get formatDescription() {
-    if (!this.item.description) return "";
-    return marked(this.item.description);
-  }
 }
 </script>
 
diff --git a/viewer/src/components/async/Markdown.vue b/viewer/src/components/async/Markdown.vue
new file mode 100644
index 0000000..c4e282b
--- /dev/null
+++ b/viewer/src/components/async/Markdown.vue
@@ -0,0 +1,123 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2021  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="$style.markdown" v-html="html" />
+</template>
+
+<script lang="ts">
+import marked from "marked";
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component
+export default class Markdown extends Vue {
+  @Prop({ required: true }) readonly markdown!: string;
+
+  get html(): string {
+    return marked(this.markdown);
+  }
+}
+</script>
+
+<style lang="scss" module>
+.markdown {
+  line-height: 1.7;
+  word-wrap: break-word;
+
+  a {
+    color: #9bcdff;
+    text-decoration: none;
+  }
+
+  hr {
+    background-color: #666;
+  }
+
+  p,
+  blockquote,
+  ul,
+  ol,
+  dl,
+  table,
+  pre {
+    margin: 15px 0;
+  }
+
+  ul,
+  ol {
+    padding-left: 30px;
+  }
+
+  h1 {
+    border-bottom: 1px solid #888;
+    font-size: 2.5em;
+  }
+
+  h2 {
+    border-bottom: 1px solid #666;
+    font-size: 2em;
+  }
+
+  h3 {
+    font-size: 1.5em;
+  }
+
+  h4 {
+    font-size: 1.2em;
+  }
+
+  h5 {
+    font-size: 1em;
+  }
+
+  h6 {
+    color: #777;
+    font-size: 1em;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    font-weight: bold;
+    margin: 1em 0 15px 0;
+  }
+
+  h1 + p,
+  h2 + p,
+  h3 + p {
+    margin-top: 10px;
+  }
+
+  pre {
+    color: white;
+    background-color: #2e4049;
+  }
+
+  code {
+    @extend pre;
+    font-family: Consolas, "Liberation Mono", Courier, monospace;
+    font-size: 0.8em;
+    white-space: pre;
+  }
+}
+</style>
diff --git a/viewer/src/components/async/index.ts b/viewer/src/components/async/index.ts
new file mode 100644
index 0000000..5a7d9a6
--- /dev/null
+++ b/viewer/src/components/async/index.ts
@@ -0,0 +1,4 @@
+// Declare async constants for internal components
+// Their name can't start with 'Ld'
+
+export const Markdown = () => import(/* webpackChunkName: "markdown" */ "./Markdown.vue");
diff --git a/viewer/src/main.ts b/viewer/src/main.ts
index cccb37b..d0ee3af 100644
--- a/viewer/src/main.ts
+++ b/viewer/src/main.ts
@@ -20,18 +20,13 @@
 import "@/assets/scss/global.scss";
 import "@/assets/scss/scrollbar.scss";
 import "@/assets/scss/transition.scss";
+import { MainLayout } from "@/plugins";
 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");
-import(/* webpackChunkName: "ui" */ "@/components");
-import(/* webpackChunkName: "ui" */ "@/plugins/lazyimage");
-import(/* webpackChunkName: "ui" */ "@/plugins/dragscroll");
-import(/* webpackChunkName: "ui" */ "@/plugins/fontawesome");
-const MainLayout = () => import(/* webpackChunkName: "ui" */ "@/views/MainLayout.vue");
+Vue.config.productionTip = false;
 
 declare module "vue/types/vue" {
   interface Vue {
diff --git a/viewer/src/plugins/index.ts b/viewer/src/plugins/index.ts
new file mode 100644
index 0000000..1555882
--- /dev/null
+++ b/viewer/src/plugins/index.ts
@@ -0,0 +1,8 @@
+export const MainLayout = () =>
+  Promise.all([
+    import(/* webpackChunkName: "ui" */ "@/plugins/buefy"),
+    import(/* webpackChunkName: "ui" */ "@/components"),
+    import(/* webpackChunkName: "ui" */ "@/plugins/lazyimage"),
+    import(/* webpackChunkName: "ui" */ "@/plugins/dragscroll"),
+    import(/* webpackChunkName: "ui" */ "@/plugins/fontawesome"),
+  ]).then(() => import(/* webpackChunkName: "ui" */ "@/views/MainLayout.vue"));
diff --git a/viewer/src/services/fetchWithCheck.ts b/viewer/src/services/fetchWithCheck.ts
new file mode 100644
index 0000000..e84e8b6
--- /dev/null
+++ b/viewer/src/services/fetchWithCheck.ts
@@ -0,0 +1,7 @@
+export default class FetchWithCheck {
+  static async get(url: RequestInfo): Promise<Response> {
+    const response = await fetch(url);
+    if (!response.ok) throw new Error(`${response.status}: ${response.statusText}`);
+    return response;
+  }
+}