From 9a44ad2358330e41c6f9950279ebb8c546f18b56 Mon Sep 17 00:00:00 2001
From: Lewin Kelly <heli@odex.cf>
Date: Wed, 19 Jul 2023 17:16:54 +0100
Subject: [PATCH] Fix some styling issues and add example posts and revivals to
 fix build issues

---
 pages/blog/welcome.md               |  6 ++++++
 pages/blogExample.md                |  3 ++-
 pages/revivalExample.md             |  3 ++-
 pages/revivals/mercury.md           | 11 +++++++++++
 src/routes/post/[post]/+page.svelte |  2 +-
 src/routes/reviews/+page.svelte     |  3 +++
 src/routes/revivals/+page.svelte    |  7 ++++---
 7 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 pages/blog/welcome.md
 create mode 100644 pages/revivals/mercury.md

diff --git a/pages/blog/welcome.md b/pages/blog/welcome.md
new file mode 100644
index 0000000..c2a7603
--- /dev/null
+++ b/pages/blog/welcome.md
@@ -0,0 +1,6 @@
+---
+title: Welcome!
+date: 2023-07-19 05:08 PM
+---
+
+Welcome to the Revival Archive!
diff --git a/pages/blogExample.md b/pages/blogExample.md
index 29560fa..e6fc929 100644
--- a/pages/blogExample.md
+++ b/pages/blogExample.md
@@ -1,7 +1,8 @@
 ---
 # Save as /pages/blog/{whatever}.md
+# Try not to have spaces in the filename
 
-title: Second blog post
+title: Second blog post # Two posts shouldn't have the same title
 # Date will show as "Not yet published" if omitted
 date: 2023-07-09 11:40 AM # Must be in any valid JS date format
 # updated: 2023-07-12 05:52 AM
diff --git a/pages/revivalExample.md b/pages/revivalExample.md
index 80cdd9e..ac46029 100644
--- a/pages/revivalExample.md
+++ b/pages/revivalExample.md
@@ -1,7 +1,8 @@
 ---
 # Save as /pages/revivals/{whatever}.md
+# Try not to have spaces in the filename
 
-name: Mercury
+name: Mercury # Two revivals shouldn't have the same name
 date: 2023-07-09 01:58 PM # Must be in any valid JS date format
 logo: mercury.svg # Optional, stored in /static/logos/{whatever}
 clients: # Optional, list of client years available
diff --git a/pages/revivals/mercury.md b/pages/revivals/mercury.md
new file mode 100644
index 0000000..6909791
--- /dev/null
+++ b/pages/revivals/mercury.md
@@ -0,0 +1,11 @@
+---
+# Save as /pages/revivals/{whatever}.md
+
+name: Mercury
+logo: mercury.svg
+clients:
+    - 2013
+overview: |
+    Example revival
+---
+
diff --git a/src/routes/post/[post]/+page.svelte b/src/routes/post/[post]/+page.svelte
index 7586ad8..e7863d7 100644
--- a/src/routes/post/[post]/+page.svelte
+++ b/src/routes/post/[post]/+page.svelte
@@ -10,7 +10,7 @@
 </svelte:head>
 
 <div class="xl:max-w-300 flex flex-col xl:flex-row">
-	<article class="max-w-180 pt-8">
+	<article class="xl:w-180 pt-8">
 		<div class="-ms-4">
 			<a href="/blog" class="hover:text-#888">← Back to blog</a>
 			<div class="ms-4">
diff --git a/src/routes/reviews/+page.svelte b/src/routes/reviews/+page.svelte
index a4d0e28..ba1582c 100644
--- a/src/routes/reviews/+page.svelte
+++ b/src/routes/reviews/+page.svelte
@@ -4,7 +4,10 @@
 	export let data
 
 	const reviews = data.reviews
+		// Filter only revivals with reviews and ratings
 		.filter(revival => revival.rating)
+		// Sort by non-defunct revivals first, then by rating
+		.sort((a, b) => (a.defunct ? 1 : 0) - (b.defunct ? 1 : 0))
 		.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
 </script>
 
diff --git a/src/routes/revivals/+page.svelte b/src/routes/revivals/+page.svelte
index 1d75c18..baf9bfb 100644
--- a/src/routes/revivals/+page.svelte
+++ b/src/routes/revivals/+page.svelte
@@ -17,9 +17,10 @@
 
 	export let data
 
-	const revivals = data.revivals.sort(
-		(a, b) => (b?.rating?.overall || 0) - (a?.rating?.overall || 0)
-	)
+	const revivals = data.revivals
+		// Sort by non-defunct revivals first, then by rating
+		.sort((a, b) => (a.defunct ? 1 : 0) - (b.defunct ? 1 : 0))
+		.sort((a, b) => (b?.rating?.overall || 0) - (a?.rating?.overall || 0))
 </script>
 
 <svelte:head>