From fd17056c128c339fad0089546258d629b680ce41 Mon Sep 17 00:00:00 2001
From: NaitLee <naitlee@disroot.org>
Date: Fri, 26 Sep 2025 18:34:59 +0800
Subject: [PATCH] feat: better content, initial omnisrv compat

---
 mk.sh                                   |  2 +-
 src/assets/frontpage.css                |  1 +
 src/assets/main.css                     | 16 ++++++-
 src/index.md                            |  6 +--
 src/page/index.md                       |  7 +++
 src/page/伺服器出租.md                  | 29 ++++++++++++
 src/page/服務器出租.md                  | 26 ----------
 src/pages.md                            |  5 --
 src/tmpl.html                           | 63 +++++++++++++++++++++++++
 tpl/default.php                         | 22 ++++++++-
 tpl/{pages-index.php => page-index.php} |  3 +-
 11 files changed, 140 insertions(+), 40 deletions(-)
 create mode 100644 src/page/index.md
 create mode 100644 src/page/伺服器出租.md
 delete mode 100644 src/page/服務器出租.md
 delete mode 100644 src/pages.md
 create mode 100644 src/tmpl.html
 rename tpl/{pages-index.php => page-index.php} (96%)

diff --git a/mk.sh b/mk.sh
index 641a700..57794d6 100755
--- a/mk.sh
+++ b/mk.sh
@@ -19,7 +19,7 @@ if ! php --version >>/dev/null; then
   echo "error: Please install PHP, prefer version 8+"
   exit 1
 fi
-if ! echo "<?php mb_strlen(\"hello\") ?>" | php 2>>/dev/null; then
+if ! echo "<?php mb_strlen(\"\") ?>" | php 2>>/dev/null; then
   echo "error: php_mbstring is not installed, dummy-ssg will not work"
   exit 1
 fi
diff --git a/src/assets/frontpage.css b/src/assets/frontpage.css
index 9aa8c24..40a1903 100644
--- a/src/assets/frontpage.css
+++ b/src/assets/frontpage.css
@@ -66,6 +66,7 @@
     top: 5em;
   }
 }
+
 @media (max-width: 520px) {
   .bio__pic {
     top: 9em;
diff --git a/src/assets/main.css b/src/assets/main.css
index de6016c..b4392a0 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -36,7 +36,7 @@ main {
   max-width: 100%;
   margin: 2em auto;
   padding: 8pt;
-  line-height: 1.5;
+  line-height: 1.8;
 }
 
 nav {
@@ -86,6 +86,20 @@ dd {
   margin: 0 0 0 4pt;
 }
 
+table {
+  border-collapse: collapse;
+  /* margin: 0 auto; */
+}
+tr {
+  border-bottom: 1px solid var(--shade);
+}
+thead, tbody tr:nth-last-child(1) {
+  border-bottom: 2px solid var(--fore);
+}
+td {
+  padding: 2pt 8pt;
+}
+
 @media (max-width: 520px) {
   nav {
     flex-direction: column;
diff --git a/src/index.md b/src/index.md
index 93a6210..7286029 100644
--- a/src/index.md
+++ b/src/index.md
@@ -1,12 +1,10 @@
 ---
-{
-  "title": "Amaharacya.one"
-}
+title Amaharacya.one
 ---
 
 一隻元氣滿滿的貓娘
 
-有時候我會發一點點[文章](/pages.html)
+有時候我會發一點點[文章](/page)
 
 我的一些信息：
 
diff --git a/src/page/index.md b/src/page/index.md
new file mode 100644
index 0000000..dd169fc
--- /dev/null
+++ b/src/page/index.md
@@ -0,0 +1,7 @@
+---
+title 文章 | Amaharacya.one
+---
+
+# 文章
+
+## 索引
diff --git a/src/page/伺服器出租.md b/src/page/伺服器出租.md
new file mode 100644
index 0000000..ba0fbd6
--- /dev/null
+++ b/src/page/伺服器出租.md
@@ -0,0 +1,29 @@
+# 本站提供伺服器出租服務
+
+## 簡介
+
+本站提供遊戲伺服器出租服務，由 [MCSManage](https://www.mcsmanager.com/) 驅動。
+
+支援 Minecraft 和主流的可開服的聯機遊戲。
+
+## 價格
+
+貨幣皆為人民幣 (CNY)。
+
+### Minecraft
+
+純淨服（任何版本都支援，主流版本提供<abbr title="Plugin, 臺譯「外掛」">插件</abbr>支援服務需加價 10 元）每月 25 元。
+
+Mod 服（具體價格依據遊戲版本和 mod 數量決定）底價為每月 35 元。
+
+### Steam 聯機遊戲（試運營中）
+
+需聯絡客服，根據具體情況制定價格，底價為每月 35 元。
+
+## 客服聯絡方式
+
+|   |   |
+|:-:|:--|
+| 微信 | amaharaneko56 |
+| QQ | 2139623169 |
+| 郵箱 | amaharaneko@disroot.org |
diff --git a/src/page/服務器出租.md b/src/page/服務器出租.md
deleted file mode 100644
index 9de522f..0000000
--- a/src/page/服務器出租.md
+++ /dev/null
@@ -1,26 +0,0 @@
-#本站提供服務器出租服務
-
-##簡介
-
-本站提供遊戲服務器出租服務，由[MCSManage](https://www.mcsmanager.com/)驅動。
-支持Mc和主流的可開服的聯機遊戲。
-
-##價格
-
-###MC
-
-純淨服（任何版本都支持，主流版本提供插件支持服務需加價10元）每月25元。
-
-Mod服（具體價格依據遊戲版本和mod數量決定）底價爲每月35元。
-
-###Steam聯機遊戲（試運營中）
-
-需聯繫客服，根據具體情況制定價格，底價爲每月35元。
-
-##客服聯繫方式
-
-微信 amaharaneko56
-
-QQ  2139623169
-
-郵箱 amaharaneko@disroot.org
diff --git a/src/pages.md b/src/pages.md
deleted file mode 100644
index 949eefc..0000000
--- a/src/pages.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-{
-  "title": "文章 | Amaharacya.one"
-}
----
diff --git a/src/tmpl.html b/src/tmpl.html
new file mode 100644
index 0000000..9277f97
--- /dev/null
+++ b/src/tmpl.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<!-- Powered by omnisrv -->
+<html lang="{{if .Head.lang}}{{.Head.lang}}{{else}}en{{end}}">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>{{.Title}}</title>
+  <link rel="stylesheet" href="/assets/main.css" />
+  {{- if eq .Url "/"}}<link rel="stylesheet" href="/assets/frontpage.css" />{{end -}}
+</head>
+<body>
+  {{- template "nav" -}}
+  <main>
+    {{if eq .Url "/" -}}
+      {{- template "bio" . -}}
+    {{- else if eq .Url "/page" -}}
+      {{- template "pages" . -}}
+    {{- else if .Contentful -}}
+      {{- .Html -}}
+    {{- else -}}
+      <p>此頁為空</p>
+    {{- end}}
+  </main>
+</body>
+</html>
+
+{{define "nav"}}
+<nav>
+  <a href="/" class="logo-link">
+    <svg class="logo" height="36" viewBox="0 0 512 64" aria-label="Amaharacya.one">
+      <use xlink:href="/assets/logo.svg#amaharacya-one-logo" />
+    </svg>
+  </a>
+  <div class="nav__links">
+    <a href="/pages">文章</a>
+    <a href="/">關於</a>
+  </div>
+</nav>
+{{end}}
+
+{{define "bio"}}
+<div class="bio">
+  <div class="bio__pic">
+    <img height="640" src="/assets/amahara-full.webp" alt="雨晴的立繪">
+  </div>
+  <div class="bio__name">
+    <h1 class="bio__name__main">緒山 雨晴</h1>
+    <p class="bio__name__sub">Amahara Oyama</p>
+  </div>
+  <div class="bio__intro">
+    {{.Html}}
+  </div>
+</div>
+{{end}}
+
+{{define "pages"}}
+{{.Html}}
+<ul>
+  {{range .List -}}
+  <li><a href="{{.Url}}">{{.Date}} | {{.Title}}</a></li>
+  {{- end}}
+</ul>
+{{end}}
diff --git a/tpl/default.php b/tpl/default.php
index 5d84f71..2d8dd09 100644
--- a/tpl/default.php
+++ b/tpl/default.php
@@ -1,4 +1,24 @@
 <!DOCTYPE html>
+<!-- Powered by dummy-ssg -->
+<?php
+  // let's use simple key-value headers instead of json
+	$raw = file_get_contents("src/" . $page["path"]);
+	preg_match('/^---\n\s*(.*?)\s*\n---\n/s', $raw, $matches);
+	if (!empty($matches[1])) {
+    foreach (explode("\n", $matches[1]) as $line) {
+      $line = trim($line);
+      if ($line === '') {
+        continue;
+      }
+      $kv = explode(' ', $line, 2);
+      if (empty($kv[1])) {
+        $page[$kv[0]] = true;
+      } else {
+        $page[$kv[0]] = $kv[1];
+      }
+    }
+  }
+?>
 <html lang="<?php if (empty($page["lang"])) echo "zh-TW"; else echo $page["lang"]; ?>">
 <head>
   <meta charset="UTF-8">
@@ -12,7 +32,7 @@
   <main>
     <?php
       if ($page["path"] === "index.md") include "bio.php";
-      else if ($page["path"] === "pages.md") include "pages-index.php";
+      else if ($page["path"] === "page/index.md") include "page-index.php";
       else if (!empty($page["content"])) echo $page["content"];
       else echo "此頁為空";
     ?>
diff --git a/tpl/pages-index.php b/tpl/page-index.php
similarity index 96%
rename from tpl/pages-index.php
rename to tpl/page-index.php
index 5c93853..5709291 100644
--- a/tpl/pages-index.php
+++ b/tpl/page-index.php
@@ -29,8 +29,7 @@ array_multisort(
 	$child_pages
 );
 ?>
-<h1>文章</h1>
-<h2>索引</h2>
+<?php echo $page["content"] ?>
 <ul class="pages-index">
 <?php
 foreach ($child_pages as $page)