From 65e8b7ffc8fdbf54b9edd8622504d775428587d5 Mon Sep 17 00:00:00 2001
From: Mario Linz <mario@webmakers.de>
Date: Wed, 15 Jun 2022 08:57:51 +0200
Subject: [PATCH] =?UTF-8?q?Verlinkung=20zu=20externen=20URLs=20f=C3=BCr=20?=
 =?UTF-8?q?Article=20hinzugef=C3=BCgt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/collections/content.yml                | 20 ++++++-------
 src/components/widgets/Article.svelte      | 34 ++++++++++++++++++++++
 src/css/theme-2022/components/article.less |  4 +++
 src/localization/de.json                   |  3 +-
 src/localization/en.json                   |  3 +-
 5 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/api/collections/content.yml b/api/collections/content.yml
index 49b203d..437f85f 100644
--- a/api/collections/content.yml
+++ b/api/collections/content.yml
@@ -45,9 +45,9 @@ meta:
               meta:
                   label: { de: "Allgemein", en: "General" }
               subFields:
+                  - source: path
                   - source: locale
                   - source: tags
-                  - source: path
                   - source: priority
             - name: meta
               meta:
@@ -125,6 +125,15 @@ hooks:
 
 # Feldliste der Kollektion
 fields:
+    - name: path
+      type: string
+      index: [single, unique]
+      meta:
+          hideInRoot: true
+          label: { de: "Pfad", en: "Path" }
+          helperText:
+              de: "Der Pfad muss eindeutig sein und ohne ein Slash (/) beginnen und enden."
+              en: "The path must be unique and must start and end without a slash (/)."
     - !include fields/_locale.yml
     - name: tags
       type: string[]
@@ -145,15 +154,6 @@ fields:
                   name: "name"
               params:
                   sort: "name"
-    - name: path
-      type: string
-      index: [single, unique]
-      meta:
-          hideInRoot: true
-          label: { de: "Pfad", en: "Path" }
-          helperText:
-              de: "Der Pfad muss eindeutig sein und ohne ein Slash (/) beginnen und enden."
-              en: "The path must be unique and must start and end without a slash (/)."
     - name: priority
       type: number
       meta:
diff --git a/src/components/widgets/Article.svelte b/src/components/widgets/Article.svelte
index 426a80c..d690cfb 100644
--- a/src/components/widgets/Article.svelte
+++ b/src/components/widgets/Article.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { fade } from "svelte/transition"
+    import { _ } from "svelte-i18n"
     // import { navigate } from "svelte-routing"
 
     import TibiArticleMediaFile from "./TibiArticleMediaFile.svelte"
@@ -86,6 +87,14 @@
                 <div class="article-teaser">{@html article?.content?.types?.teaser}</div>
             {/if}
 
+            {#if article?.link?.url}
+                <a
+                    href="{article?.link?.url}"
+                    target="{article?.link?.target ? article?.link?.target : '_self'}"
+                    class="article-link">{@html article?.link?.text ? article?.link?.text : $_("details")}</a
+                >
+            {/if}
+
             {#if article?.content?.types?.details && showDetails}
                 <div class="article-details">{@html article?.content?.types?.details}</div>
             {/if}
@@ -104,6 +113,14 @@
                         <div class="article-teaser">{@html article?.content?.types?.teaser}</div>
                     {/if}
 
+                    {#if article?.link?.url}
+                        <a
+                            href="{article?.link?.url}"
+                            target="{article?.link?.target ? article?.link?.target : '_self'}"
+                            class="article-link">{@html article?.link?.text ? article?.link?.text : $_("details")}</a
+                        >
+                    {/if}
+
                     {#if article?.content?.types?.details && showDetails}
                         <div class="article-details">{@html article?.content?.types?.details}</div>
                     {/if}
@@ -131,9 +148,18 @@
                 <div class="article-teaser">{@html article?.content?.types?.teaser}</div>
             {/if}
 
+            {#if article?.link?.url}
+                <a
+                    href="{article?.link?.url}"
+                    target="{article?.link?.target ? article?.link?.target : '_self'}"
+                    class="article-link">{@html article?.link?.text ? article?.link?.text : $_("details")}</a
+                >
+            {/if}
+
             {#if article?.content?.types?.details && showDetails}
                 <div class="article-details">{@html article?.content?.types?.details}</div>
             {/if}
+
             {#if article?.content?.types?.media?.files?.length}
                 <TibiArticleMediaFile
                     collectionName="articles"
@@ -165,6 +191,14 @@
                         <div class="article-teaser">{@html article?.content?.types?.teaser}</div>
                     {/if}
 
+                    {#if article?.link?.url}
+                        <a
+                            href="{article?.link?.url}"
+                            target="{article?.link?.target ? article?.link?.target : '_self'}"
+                            class="article-link">{@html article?.link?.text ? article?.link?.text : $_("details")}</a
+                        >
+                    {/if}
+
                     {#if article?.content?.types?.details && showDetails}
                         <div class="article-details">{@html article?.content?.types?.details}</div>
                     {/if}
diff --git a/src/css/theme-2022/components/article.less b/src/css/theme-2022/components/article.less
index fab0c0d..0823924 100644
--- a/src/css/theme-2022/components/article.less
+++ b/src/css/theme-2022/components/article.less
@@ -20,4 +20,8 @@ article,
         font-size: 1.4rem;
         line-height: 1.8rem;
     }
+
+    .article-link {
+        text-decoration: underline;
+    }
 }
diff --git a/src/localization/de.json b/src/localization/de.json
index 60fc4ae..d0aab11 100644
--- a/src/localization/de.json
+++ b/src/localization/de.json
@@ -3,5 +3,6 @@
     "pageNotFoundInformation": "Die gesuchte Seite existiert nicht oder es ist ein anderer Fehler aufgetreten.<br/>Gehen Sie <a href=\"{backUrl}\"><strong>zurück</strong></a> oder gehen Sie zu <a href=\"{url}\"><strong>{url}</strong></a>, um eineneue Richtung zu wählen.",
     "connectedContentNotFound": "Zur aktuellen Seite <a href=\"{url}\"><strong>{url}</strong></a> wurde für die gewählte Sprache \"<strong>{lang}</strong>\" keine Übersetzung gefunden!",
     "de": "Deutsch",
-    "en": "Englisch"
+    "en": "Englisch",
+    "details": "Details"
 }
\ No newline at end of file
diff --git a/src/localization/en.json b/src/localization/en.json
index a45817d..9811b84 100644
--- a/src/localization/en.json
+++ b/src/localization/en.json
@@ -3,5 +3,6 @@
     "pageNotFoundInformation": "The page you are looking for doesn't exist or an other error occurred.<br/><a href=\"{backUrl}\"><strong>Go back</strong></a>, or head over to <a href=\"{url}\"><strong>{url}</strong></a> to choose a new direction.",
     "connectedContentNotFound": "No translation was found for the selected language \"<strong>{lang}</strong>\" for the current page <a href=\"{url}\"><strong>{url}</strong></a>!",
     "de": "German",
-    "en": "English"
+    "en": "English",
+    "details": "Details"
 }
\ No newline at end of file