From cbefc2644f594bd7c4ef62c430f4c5786491c060 Mon Sep 17 00:00:00 2001
From: Nikola Ganchev <nikolamihailovg@gmail.com>
Date: Thu, 9 Nov 2023 11:18:55 +0200
Subject: [PATCH 1/2] Render properly when there are no announcements and an
 announcement doesn't have an href

---
 src/lib/Announcements.svelte | 11 +++++++++--
 src/lib/Navbar.svelte        |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/lib/Announcements.svelte b/src/lib/Announcements.svelte
index 8256bed..5f9c68c 100644
--- a/src/lib/Announcements.svelte
+++ b/src/lib/Announcements.svelte
@@ -6,7 +6,11 @@
 <div class="container">
 	{#each announcements as announcement}
 		<div class="announcement">
-			<a href="{announcement.link}">{announcement.text}<div class="open-in-new"><OpenInNew /></div></a>
+			{#if announcement.href}
+				<a href="{announcement.href}">{announcement.text}<div class="open-in-new"><OpenInNew /></div></a>
+				{:else}
+				<span>{announcement.text}</span>
+			{/if}
 		</div>
 	{/each}
 </div>
@@ -27,7 +31,6 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		pointer-events: auto;
         min-height: 28px;
 		padding-left: 1rem;
         padding-right: 1rem;
@@ -41,6 +44,10 @@
 	}
 
 	.announcement a {
+        pointer-events: auto;
+	}
+
+	.announcement a, .announcement span {
         font-family: 'Roboto', serif;
         font-weight: 300;
         font-size: 18px;
diff --git a/src/lib/Navbar.svelte b/src/lib/Navbar.svelte
index a8b4735..51a7ddd 100644
--- a/src/lib/Navbar.svelte
+++ b/src/lib/Navbar.svelte
@@ -58,7 +58,7 @@
 <div class="nav-container" class:fixed="{fixed}" style="--logo-width: {logoWidth}px; --mobile-breakpoint: {mobileBreakpoint}px">
 
     <ProgressBar />
-    {#if fixed}
+    {#if fixed && announcements.length > 0}
         <Announcements announcements="{announcements}"></Announcements>
     {/if}
     <div class="navbar">

From 3208f130b73cdb1955d3eb31022cc8743f3894ea Mon Sep 17 00:00:00 2001
From: Nikola Ganchev <nikolamihailovg@gmail.com>
Date: Thu, 9 Nov 2023 12:12:12 +0200
Subject: [PATCH 2/2] Fix announcements merge issues

---
 src/lib/OpenInNew.svelte  |  3 +++
 src/routes/+layout.js     | 21 +++++++++++++++++----
 src/routes/+layout.svelte |  3 ++-
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 src/lib/OpenInNew.svelte

diff --git a/src/lib/OpenInNew.svelte b/src/lib/OpenInNew.svelte
new file mode 100644
index 0000000..b9de707
--- /dev/null
+++ b/src/lib/OpenInNew.svelte
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24">
+	<path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"/>
+</svg>
diff --git a/src/routes/+layout.js b/src/routes/+layout.js
index e663a77..1ad2827 100644
--- a/src/routes/+layout.js
+++ b/src/routes/+layout.js
@@ -1,24 +1,37 @@
 import { env } from "$env/dynamic/public";
 
 export async function load({ fetch, data, url }) {
-    const res = await fetch(
+    const res = fetch(
         env.PUBLIC_SERVER_URL +
             `/api/pages-seo-data?where[relativeUrl][equals]=${url.pathname}`
     );
+    const resAnnouncements = fetch(
+        env.PUBLIC_SERVER_URL + `/api/announcements?limit=3&sort=editedAt`
+    );
+
+    const [seoText, announcementsText] = await Promise.all([
+        res,
+        resAnnouncements,
+    ]);
 
-    const json = await res.json();
+    const [seoJson, announcementJson] = await Promise.all([
+        seoText.json(),
+        announcementsText.json(),
+    ]);
 
-    if (json.docs.length !== 1) {
+    if (seoJson.docs.length !== 1) {
         return {
             seoData: undefined,
+            announcementData: announcementJson,
             ...data,
         };
     }
 
-    const remoteSeoData = json.docs[0];
+    const remoteSeoData = seoJson.docs[0];
 
     return {
         seoData: remoteSeoData,
+        announcementData: announcementJson,
         pathname: url.pathname,
         href: url.href,
         ...data,
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 9a282d7..a917e3c 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -109,7 +109,8 @@
 		showTitle="{$layout.navbar.showTitle}"
 		logoHref="{env.PUBLIC_SERVER_URL + data.MainInfo.logo.url}"
 		logoHrefAlt="{data.MainInfo.logo.alt}"
-		logoWidth="{data.MainInfo.logo.width}" />
+		logoWidth="{data.MainInfo.logo.width}"
+		announcements="{data.announcementData.docs}"/>
 
 <slot />