From 57b87d318c3210cb0412d8e715d8a6cfb75684b2 Mon Sep 17 00:00:00 2001
From: "Jill \"oatmealine\" Monoids" <oatmealine@disroot.org>
Date: Wed, 4 May 2022 01:34:53 +0300
Subject: [PATCH] polish

---
 src/lib/Page.svelte                   |  6 +++---
 src/lib/{ => markdown}/Code.svelte    |  0
 src/lib/{ => markdown}/Link.svelte    |  2 +-
 src/lib/{ => markdown}/Section.svelte |  2 +-
 src/routes/p/[...name].js             |  8 +++++---
 src/routes/p/[...name].svelte         | 13 ++++++++++++-
 src/routes/p/_page.svelte             | 12 +++++++++++-
 7 files changed, 33 insertions(+), 10 deletions(-)
 rename src/lib/{ => markdown}/Code.svelte (100%)
 rename src/lib/{ => markdown}/Link.svelte (87%)
 rename src/lib/{ => markdown}/Section.svelte (82%)

diff --git a/src/lib/Page.svelte b/src/lib/Page.svelte
index c7438f1..ab51b6e 100644
--- a/src/lib/Page.svelte
+++ b/src/lib/Page.svelte
@@ -1,9 +1,9 @@
 <script>
 	import Markdown from 'svelte-exmarkdown';
 	import { gfmPlugin } from 'svelte-exmarkdown/gfm';
-  import Code from './Code.svelte';
-import Link from './Link.svelte';
-  import Section from './Section.svelte';
+  import Code from './markdown/Code.svelte';
+  import Link from './markdown/Link.svelte';
+  import Section from './markdown/Section.svelte';
 
   const highlightPlugin = {
     renderer: {
diff --git a/src/lib/Code.svelte b/src/lib/markdown/Code.svelte
similarity index 100%
rename from src/lib/Code.svelte
rename to src/lib/markdown/Code.svelte
diff --git a/src/lib/Link.svelte b/src/lib/markdown/Link.svelte
similarity index 87%
rename from src/lib/Link.svelte
rename to src/lib/markdown/Link.svelte
index 2d04b9f..9f93465 100644
--- a/src/lib/Link.svelte
+++ b/src/lib/markdown/Link.svelte
@@ -18,7 +18,7 @@
 </style>
 
 <!-- svelte-ignore a11y-missing-attribute -->
-<a {...properties} {target}>
+<a {...properties} {target} rel={isExternal ? 'nofollow noreferrer external' : ''}>
   <Children {children} />
   {#if isExternal}
   <span class="icon">
diff --git a/src/lib/Section.svelte b/src/lib/markdown/Section.svelte
similarity index 82%
rename from src/lib/Section.svelte
rename to src/lib/markdown/Section.svelte
index a06cf53..219ad2f 100644
--- a/src/lib/Section.svelte
+++ b/src/lib/markdown/Section.svelte
@@ -1,6 +1,6 @@
 <script>
 	import Children from 'svelte-exmarkdown/renderer/Children.svelte';
-  import { toAnchor } from './anchors';
+  import { toAnchor } from '$lib/anchors';
   export let children;
   export let properties;
 
diff --git a/src/routes/p/[...name].js b/src/routes/p/[...name].js
index cf9eba5..6518403 100644
--- a/src/routes/p/[...name].js
+++ b/src/routes/p/[...name].js
@@ -2,18 +2,19 @@ import { getPost, getPostsFlat, isDir } from "$lib/pages";
 
 export async function get({ params }) {
   let dir = await isDir(params.name);
+  let split = params.name.split('/');
   if (dir === null) {
     return {status: 404};
   } else if (dir) {
     return {
       body: {
-        pages: await getPostsFlat(params.name)
+        pages: await getPostsFlat(params.name),
+        loc: split[split.length - 1]
       }
     }
   } else {
     let pages = [];
 
-    let split = params.name.split('/');
     if (split.length > 1) {
       pages = await getPostsFlat(split[split.length - 2]);
     }
@@ -25,7 +26,8 @@ export async function get({ params }) {
     return {
       body: {
         page: post,
-        pages: pages
+        pages: pages,
+        loc: split[split.length - 2]
       }
     }
   }
diff --git a/src/routes/p/[...name].svelte b/src/routes/p/[...name].svelte
index d6387e5..8940e8b 100644
--- a/src/routes/p/[...name].svelte
+++ b/src/routes/p/[...name].svelte
@@ -3,11 +3,22 @@
   import PageRenderer from './_page.svelte';
   export let page;
   export let pages;
+  export let loc;
 </script>
 
 {#if page}
-  <PageRenderer {page} {pages}/>
+  <PageRenderer {page} {pages} {loc}/>
 {:else if pages}
+  <style>
+    .pagesin {
+      font-size: 1.5em;
+      margin-top: 1em;
+      margin-bottom: 1em;
+    }
+  </style>
+
+  <div class="pagesin">Pages in <b>{loc}</b>:</div>
+
   <Pages {pages}/>
 {:else}
   404!
diff --git a/src/routes/p/_page.svelte b/src/routes/p/_page.svelte
index c007db3..588154b 100644
--- a/src/routes/p/_page.svelte
+++ b/src/routes/p/_page.svelte
@@ -4,6 +4,7 @@
   import Pages from "$lib/Pages.svelte";
   export let page;
   export let pages;
+  export let loc;
 </script>
 
 <style>
@@ -11,6 +12,7 @@
     display: flex;
     flex-direction: row;
     gap: 1em;
+    max-width: 100%;
   }
   .side {
     min-width: 120px;
@@ -40,6 +42,13 @@
     margin-bottom: 1em;
     border-bottom: 1px solid #888;
   }
+
+  .viewall {
+    margin-top: 2em;
+    font-size: 0.9em;
+    color: #bbb;
+  }
+
   @media screen and (max-width: 1300px) {
     .side {
       display: none;
@@ -91,7 +100,7 @@
     </nav>
   </div>
   <content>
-    <Page content={page.content}></Page>
+    <Page content={page.content}/>
   </content>
 </div>
 
@@ -99,4 +108,5 @@
   <div class="other">Other pages in this category:</div>
   <br>
   <Pages pages={pages.slice(0, 3)}/>
+  <a class="viewall" href="/p/{page.path.split('/').slice(0, -1).join('/') + '/'}">View all pages in <b>{loc}</b></a>
 {/if}
\ No newline at end of file