From 859f31065da728fcb1387645ab1c92390b372412 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Thu, 12 Dec 2024 10:14:46 -0500
Subject: refactor _views folder

---
 src/web/_controller/blog.php         |  8 +++---
 src/web/_controller/bucket.php       |  2 +-
 src/web/_controller/error.php        |  2 +-
 src/web/_controller/home.php         |  2 +-
 src/web/_controller/projects.php     |  2 +-
 src/web/_views/apps/blog.php         | 13 ---------
 src/web/_views/apps/blog_post.php    |  8 ------
 src/web/_views/apps/blog_rss.php     | 21 --------------
 src/web/_views/apps/blog_writeup.php |  5 ----
 src/web/_views/apps/bucket.php       | 42 ---------------------------
 src/web/_views/apps/error.php        |  6 ----
 src/web/_views/apps/home.php         | 55 ------------------------------------
 src/web/_views/apps/projects.php     | 11 --------
 src/web/_views/blog/main.php         | 13 +++++++++
 src/web/_views/blog/post.php         |  8 ++++++
 src/web/_views/blog/rss.php          | 21 ++++++++++++++
 src/web/_views/blog/writeup.php      |  5 ++++
 src/web/_views/bucket/main.php       | 42 +++++++++++++++++++++++++++
 src/web/_views/comments.php          |  2 +-
 src/web/_views/error/main.php        |  6 ++++
 src/web/_views/home/main.php         | 55 ++++++++++++++++++++++++++++++++++++
 src/web/_views/projects/main.php     | 11 ++++++++
 22 files changed, 170 insertions(+), 170 deletions(-)
 delete mode 100644 src/web/_views/apps/blog.php
 delete mode 100644 src/web/_views/apps/blog_post.php
 delete mode 100644 src/web/_views/apps/blog_rss.php
 delete mode 100644 src/web/_views/apps/blog_writeup.php
 delete mode 100644 src/web/_views/apps/bucket.php
 delete mode 100644 src/web/_views/apps/error.php
 delete mode 100644 src/web/_views/apps/home.php
 delete mode 100644 src/web/_views/apps/projects.php
 create mode 100644 src/web/_views/blog/main.php
 create mode 100644 src/web/_views/blog/post.php
 create mode 100644 src/web/_views/blog/rss.php
 create mode 100644 src/web/_views/blog/writeup.php
 create mode 100644 src/web/_views/bucket/main.php
 create mode 100644 src/web/_views/error/main.php
 create mode 100644 src/web/_views/home/main.php
 create mode 100644 src/web/_views/projects/main.php

(limited to 'src/web')

diff --git a/src/web/_controller/blog.php b/src/web/_controller/blog.php
index 922ae72..2ea45df 100644
--- a/src/web/_controller/blog.php
+++ b/src/web/_controller/blog.php
@@ -16,7 +16,7 @@ class Blog_controller extends Controller {
 
 		$data = $this->blog_model->get_data();
 		$this->view('header', $data);
-		$this->view('apps/blog', $data);
+		$this->view('blog/main', $data);
 		$this->view('footer', $data);
 	}
 
@@ -44,7 +44,7 @@ class Blog_controller extends Controller {
 			$this->error(404);
 		}
 		$this->view('header', $data);
-		$this->view('apps/blog_post', $data);
+		$this->view('blog/post', $data);
 		$ref = "blog/post/{$name}";
 		$this->comments_controller->comments($data['post']['meta']['name'], $ref);
 		$this->view('footer', $data);
@@ -61,7 +61,7 @@ class Blog_controller extends Controller {
 			$this->error(404);
 		}
 		$this->view('header', $data);
-		$this->view('apps/blog_writeup', $data);
+		$this->view('blog/writeup', $data);
 		$ref = "blog/writeup/{$name}";
 		$this->comments_controller->comments($data['post']['meta']['name'], $ref);
 		$this->view('footer', $data);
@@ -71,7 +71,7 @@ class Blog_controller extends Controller {
 	{
 		$data = $this->blog_model->get_data();
 		header('Content-Type: application/xml');
-		$this->view('apps/blog_rss', $data);
+		$this->view('blog/rss', $data);
 		die();
 	}
 
diff --git a/src/web/_controller/bucket.php b/src/web/_controller/bucket.php
index a7d1023..e14f9b6 100644
--- a/src/web/_controller/bucket.php
+++ b/src/web/_controller/bucket.php
@@ -16,7 +16,7 @@ class Bucket_controller extends Controller {
 			$this->error(400);
 			return;
 		}
-		$this->view('apps/bucket', $data);
+		$this->view('bucket/main', $data);
 	}
 }
 
diff --git a/src/web/_controller/error.php b/src/web/_controller/error.php
index 30bd797..4195531 100644
--- a/src/web/_controller/error.php
+++ b/src/web/_controller/error.php
@@ -15,7 +15,7 @@ class Error_controller extends Controller {
 
 		$data = $this->error_model->get_data($code);
 		$this->view('header', $data);
-		$this->view('apps/error', $data);
+		$this->view('error/main', $data);
 		$this->view('footer', $data);
 	}
 
diff --git a/src/web/_controller/home.php b/src/web/_controller/home.php
index a673e60..89e67e8 100644
--- a/src/web/_controller/home.php
+++ b/src/web/_controller/home.php
@@ -7,7 +7,7 @@ class Home_controller extends Controller {
 
 		$data = Model::get_base_data();
 		$this->view('header', $data);
-		$this->view('apps/home', $data);
+		$this->view('home/main', $data);
 		$this->view('footer', $data);
 	}
 
diff --git a/src/web/_controller/projects.php b/src/web/_controller/projects.php
index cfa28b5..fea4664 100644
--- a/src/web/_controller/projects.php
+++ b/src/web/_controller/projects.php
@@ -14,7 +14,7 @@ class Projects_controller extends Controller {
 
 		$data = $this->projects_model->get_data();
 		$this->view('header', $data);
-		$this->view('apps/projects', $data);
+		$this->view('projects/main', $data);
 		$this->view('footer', $data);
 	}
 
diff --git a/src/web/_views/apps/blog.php b/src/web/_views/apps/blog.php
deleted file mode 100644
index 78abaa7..0000000
--- a/src/web/_views/apps/blog.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php /* Copyright (c) 2024 Freya Murphy */ ?>
-<?=aria_section('blog', lang('title'))?>
-	<p><?=lang('blog_desc', sub: [$this->get_url('rss.xml')])?></p>
-	<?php
-		foreach($blog as $name => $post) {
-			$meta = $post['meta'];
-			$link = $this->get_url('blog/post/' . substr($name, 0, -3));
-			echo '<a href="' . $link . '"><h3>' . $meta['name'] . '</h3></a>';
-			echo '<div class="span">' . $meta['desc'] . '</div>';
-			echo '<div class="span"><time>' . $this->format_date($meta['date']) . '</time></div>';
-		}
-	?>
-</div>
diff --git a/src/web/_views/apps/blog_post.php b/src/web/_views/apps/blog_post.php
deleted file mode 100644
index 1eaef9f..0000000
--- a/src/web/_views/apps/blog_post.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php /* Copyright (c) 2024 Freya Murphy */ ?>
-<?=aria_section('post', $post['meta']['name'])?>
-	<div class="span posted">
-		<?=ucfirst(lang('posted'))?>:
-		<time><?=$this->format_date($post['meta']['date'])?></time>
-	</div>
-	<?=$post['content']?>
-</div>
diff --git a/src/web/_views/apps/blog_rss.php b/src/web/_views/apps/blog_rss.php
deleted file mode 100644
index 121b747..0000000
--- a/src/web/_views/apps/blog_rss.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php /* Copyright (c) 2024 Freya Murphy */ ?>
-<rss version="2.0">
-	<channel>
-		<title><?=lang('title')?></title>
-		<link><?=$this->get_url('blog')?></link>
-		<description><?=lang('blog_short_desc')?></description>
-		<language><?=lang('lang_short')?></language>
-	<?php
-		foreach ($blog as $name => $post) {
-			$name = substr($name, 0, -3);
-			echo '<item>';
-			echo '<title>' . $post['meta']['name'] . '</title>';
-			echo '<description>' . $post['meta']['desc'] . '</description>';
-			echo '<pubDate>' . $post['meta']['date'] . '</pubDate>';
-			echo '<link>' . $this->get_url('blog/post/' . $name) . '</link>';
-			echo '<guid>' . $this->get_url('blog/post/' . $name) . '</guid>';
-			echo '</item>';
-		}
-	?>
-	</channel>
-</rss>
diff --git a/src/web/_views/apps/blog_writeup.php b/src/web/_views/apps/blog_writeup.php
deleted file mode 100644
index b0f18e7..0000000
--- a/src/web/_views/apps/blog_writeup.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php /* Copyright (c) 2024 Freya Murphy */ ?>
-<?=aria_section('writeup', $post['meta']['name'])?>
-	<br>
-	<?=$post['content']?>
-</div>
diff --git a/src/web/_views/apps/bucket.php b/src/web/_views/apps/bucket.php
deleted file mode 100644
index aeb6cf3..0000000
--- a/src/web/_views/apps/bucket.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php /* Copyright (c) 2024 Freya Murphy */ ?>
-    <?php
-        $root='https://webring.bucketfish.me/redirect.html?to=%s&name=' . $name;
-        $this->view('head', $data);
-        if ($lightmode === 'true') {
-            echo $this->link_css('css/bucket_light.css');
-        } else {
-            echo $this->link_css('css/bucket.css');
-        }
-    ?>
-        <base target="_parent" />
-    </head>
-    <body>
-        <div id="webring">
-            <center>
-                <span class="center">
-                    🏳️‍🌈
-                    <a href="https://webring.bucketfish.me" class="header">
-                           <span class="e0">b</span><!--
-                        --><span class="e1">u</span><!--
-                        --><span class="e2">c</span><!--
-                        --><span class="e3">k</span><!--
-                        --><span class="e4">e</span><!--
-                        --><span class="e5">t</span><!--
-                        --> <!--
-                        --><span class="e6">w</span><!--
-                        --><span class="e7">e</span><!--
-                        --><span class="e8">b</span><!--
-                        --><span class="e9">r</span><!--
-                        --><span class="e10">i</span><!--
-                        --><span class="e11">n</span><!--
-                        --><span class="e12">g</span>
-                    </a>
-                    🏳️‍🌈
-                </span>
-            </center>
-            <span class="left">⥼ <a href="<?=sprintf($root, 'prev')?>" class="prev">prev</a></span>
-            <span class="right"><a href="<?=sprintf($root, 'next')?>" class="next">next</a> ⥽</span>
-        </div>
-    </body>
-</html>
-
diff --git a/src/web/_views/apps/error.php b/src/web/_views/apps/error.php
deleted file mode 100644
index efe7546..0000000
--- a/src/web/_views/apps/error.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php /* Copyright (c) 2024 Freya Murphy */ ?>
-<?=aria_section('error')?>
-	<h2><?=lang('haa_haa_hee_hee_hoo_hoo')?></h2>
-	<h1><?=$title?></h1>
-	<h2><?=ucfirst($msg)?></h2>
-</div>
diff --git a/src/web/_views/apps/home.php b/src/web/_views/apps/home.php
deleted file mode 100644
index 50134e3..0000000
--- a/src/web/_views/apps/home.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php /* Copyright (c) 2024 Freya Murphy */ ?>
-<div class="col left">
-	<?=aria_section('about', lang('about'))?>
-		<p><?=lang('section_about')?></p>
-	</div>
-
-	<?=aria_section('whats_new', lang('whats_new'))?>
-		<p><?=lang('section_whats_new')?></p>
-	</div>
-</div>
-
-<div class="col right">
-	<?=aria_section('interests', lang('interests'))?>
-		<table>
-			<tbody>
-				<tr>
-					<th><?=lang('interests_general')?></th>
-					<td><?=lang('interests_general_value')?></td>
-				</tr>
-				<tr>
-					<th><?=lang('interests_music')?></th>
-					<td><?=lang('interests_music_value')?></td>
-				</tr>
-				<tr>
-					<th><?=lang('interests_anime')?></th>
-					<td><?=lang('interests_anime_value')?></td>
-				</tr>
-				<tr>
-					<th><?=lang('interests_comics')?></th>
-					<td><?=lang('interests_comics_value')?></td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-
-	<?=aria_section('contact', lang('contact'))?>
-		<table>
-			<tbody>
-				<tr>
-					<th><?=lang('contact_email')?></th>
-			        <td><a href="mailto:contact@freyacat.org">contact@freyacat.org</a></td>
-			    </tr>
-			    <tr>
-					<th><?=lang('contact_matrix')?></th>
-			        <td><a href="https://matrix.to/#/@freya:freya.cat">@freya:freya.cat</a></td>
-			    </tr>
-			    <tr>
-					<th><?=lang('contact_xmpp')?></th>
-			        <td><a href="xmpp:freya@freya.cat">freya@freya.cat</a></td>
-			    </tr>
-			</tbody>
-		</table>
-	</div>
-</div>
-
diff --git a/src/web/_views/apps/projects.php b/src/web/_views/apps/projects.php
deleted file mode 100644
index 6137942..0000000
--- a/src/web/_views/apps/projects.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?=aria_section('projects', lang('title'))?>
-	<?php
-		foreach($projects as $project) {
-			$meta = $project['meta'];
-			$content = $project['content'];
-			$link = CONFIG['git_url'] . '/' . $meta['repo'];
-			echo '<a href="' . $link . '"><h3>' . $meta['name'] . '</h3></a>';
-			echo $content;
-		}
-	?>
-</div>
diff --git a/src/web/_views/blog/main.php b/src/web/_views/blog/main.php
new file mode 100644
index 0000000..78abaa7
--- /dev/null
+++ b/src/web/_views/blog/main.php
@@ -0,0 +1,13 @@
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+<?=aria_section('blog', lang('title'))?>
+	<p><?=lang('blog_desc', sub: [$this->get_url('rss.xml')])?></p>
+	<?php
+		foreach($blog as $name => $post) {
+			$meta = $post['meta'];
+			$link = $this->get_url('blog/post/' . substr($name, 0, -3));
+			echo '<a href="' . $link . '"><h3>' . $meta['name'] . '</h3></a>';
+			echo '<div class="span">' . $meta['desc'] . '</div>';
+			echo '<div class="span"><time>' . $this->format_date($meta['date']) . '</time></div>';
+		}
+	?>
+</div>
diff --git a/src/web/_views/blog/post.php b/src/web/_views/blog/post.php
new file mode 100644
index 0000000..1eaef9f
--- /dev/null
+++ b/src/web/_views/blog/post.php
@@ -0,0 +1,8 @@
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+<?=aria_section('post', $post['meta']['name'])?>
+	<div class="span posted">
+		<?=ucfirst(lang('posted'))?>:
+		<time><?=$this->format_date($post['meta']['date'])?></time>
+	</div>
+	<?=$post['content']?>
+</div>
diff --git a/src/web/_views/blog/rss.php b/src/web/_views/blog/rss.php
new file mode 100644
index 0000000..121b747
--- /dev/null
+++ b/src/web/_views/blog/rss.php
@@ -0,0 +1,21 @@
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+<rss version="2.0">
+	<channel>
+		<title><?=lang('title')?></title>
+		<link><?=$this->get_url('blog')?></link>
+		<description><?=lang('blog_short_desc')?></description>
+		<language><?=lang('lang_short')?></language>
+	<?php
+		foreach ($blog as $name => $post) {
+			$name = substr($name, 0, -3);
+			echo '<item>';
+			echo '<title>' . $post['meta']['name'] . '</title>';
+			echo '<description>' . $post['meta']['desc'] . '</description>';
+			echo '<pubDate>' . $post['meta']['date'] . '</pubDate>';
+			echo '<link>' . $this->get_url('blog/post/' . $name) . '</link>';
+			echo '<guid>' . $this->get_url('blog/post/' . $name) . '</guid>';
+			echo '</item>';
+		}
+	?>
+	</channel>
+</rss>
diff --git a/src/web/_views/blog/writeup.php b/src/web/_views/blog/writeup.php
new file mode 100644
index 0000000..b0f18e7
--- /dev/null
+++ b/src/web/_views/blog/writeup.php
@@ -0,0 +1,5 @@
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+<?=aria_section('writeup', $post['meta']['name'])?>
+	<br>
+	<?=$post['content']?>
+</div>
diff --git a/src/web/_views/bucket/main.php b/src/web/_views/bucket/main.php
new file mode 100644
index 0000000..aeb6cf3
--- /dev/null
+++ b/src/web/_views/bucket/main.php
@@ -0,0 +1,42 @@
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+    <?php
+        $root='https://webring.bucketfish.me/redirect.html?to=%s&name=' . $name;
+        $this->view('head', $data);
+        if ($lightmode === 'true') {
+            echo $this->link_css('css/bucket_light.css');
+        } else {
+            echo $this->link_css('css/bucket.css');
+        }
+    ?>
+        <base target="_parent" />
+    </head>
+    <body>
+        <div id="webring">
+            <center>
+                <span class="center">
+                    🏳️‍🌈
+                    <a href="https://webring.bucketfish.me" class="header">
+                           <span class="e0">b</span><!--
+                        --><span class="e1">u</span><!--
+                        --><span class="e2">c</span><!--
+                        --><span class="e3">k</span><!--
+                        --><span class="e4">e</span><!--
+                        --><span class="e5">t</span><!--
+                        --> <!--
+                        --><span class="e6">w</span><!--
+                        --><span class="e7">e</span><!--
+                        --><span class="e8">b</span><!--
+                        --><span class="e9">r</span><!--
+                        --><span class="e10">i</span><!--
+                        --><span class="e11">n</span><!--
+                        --><span class="e12">g</span>
+                    </a>
+                    🏳️‍🌈
+                </span>
+            </center>
+            <span class="left">⥼ <a href="<?=sprintf($root, 'prev')?>" class="prev">prev</a></span>
+            <span class="right"><a href="<?=sprintf($root, 'next')?>" class="next">next</a> ⥽</span>
+        </div>
+    </body>
+</html>
+
diff --git a/src/web/_views/comments.php b/src/web/_views/comments.php
index f67a90b..01b1619 100644
--- a/src/web/_views/comments.php
+++ b/src/web/_views/comments.php
@@ -34,7 +34,7 @@
 				type="hidden"
 				class="hidden"
 				name="ref"
-				value="<?=base64_encode($ref)?>">
+				value="<?=esc(base64_encode($ref))?>">
 			<div><input
 				type="hidden"
 				class="hidden"
diff --git a/src/web/_views/error/main.php b/src/web/_views/error/main.php
new file mode 100644
index 0000000..efe7546
--- /dev/null
+++ b/src/web/_views/error/main.php
@@ -0,0 +1,6 @@
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+<?=aria_section('error')?>
+	<h2><?=lang('haa_haa_hee_hee_hoo_hoo')?></h2>
+	<h1><?=$title?></h1>
+	<h2><?=ucfirst($msg)?></h2>
+</div>
diff --git a/src/web/_views/home/main.php b/src/web/_views/home/main.php
new file mode 100644
index 0000000..50134e3
--- /dev/null
+++ b/src/web/_views/home/main.php
@@ -0,0 +1,55 @@
+<?php /* Copyright (c) 2024 Freya Murphy */ ?>
+<div class="col left">
+	<?=aria_section('about', lang('about'))?>
+		<p><?=lang('section_about')?></p>
+	</div>
+
+	<?=aria_section('whats_new', lang('whats_new'))?>
+		<p><?=lang('section_whats_new')?></p>
+	</div>
+</div>
+
+<div class="col right">
+	<?=aria_section('interests', lang('interests'))?>
+		<table>
+			<tbody>
+				<tr>
+					<th><?=lang('interests_general')?></th>
+					<td><?=lang('interests_general_value')?></td>
+				</tr>
+				<tr>
+					<th><?=lang('interests_music')?></th>
+					<td><?=lang('interests_music_value')?></td>
+				</tr>
+				<tr>
+					<th><?=lang('interests_anime')?></th>
+					<td><?=lang('interests_anime_value')?></td>
+				</tr>
+				<tr>
+					<th><?=lang('interests_comics')?></th>
+					<td><?=lang('interests_comics_value')?></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+
+	<?=aria_section('contact', lang('contact'))?>
+		<table>
+			<tbody>
+				<tr>
+					<th><?=lang('contact_email')?></th>
+			        <td><a href="mailto:contact@freyacat.org">contact@freyacat.org</a></td>
+			    </tr>
+			    <tr>
+					<th><?=lang('contact_matrix')?></th>
+			        <td><a href="https://matrix.to/#/@freya:freya.cat">@freya:freya.cat</a></td>
+			    </tr>
+			    <tr>
+					<th><?=lang('contact_xmpp')?></th>
+			        <td><a href="xmpp:freya@freya.cat">freya@freya.cat</a></td>
+			    </tr>
+			</tbody>
+		</table>
+	</div>
+</div>
+
diff --git a/src/web/_views/projects/main.php b/src/web/_views/projects/main.php
new file mode 100644
index 0000000..6137942
--- /dev/null
+++ b/src/web/_views/projects/main.php
@@ -0,0 +1,11 @@
+<?=aria_section('projects', lang('title'))?>
+	<?php
+		foreach($projects as $project) {
+			$meta = $project['meta'];
+			$content = $project['content'];
+			$link = CONFIG['git_url'] . '/' . $meta['repo'];
+			echo '<a href="' . $link . '"><h3>' . $meta['name'] . '</h3></a>';
+			echo $content;
+		}
+	?>
+</div>
-- 
cgit v1.2.3-freya