From 724a0016072bf5a3c666cbe4e78ad20010d5ff00 Mon Sep 17 00:00:00 2001
From: dash <1549469775@qq.com>
Date: Sun, 31 Aug 2025 17:29:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E7=AB=A0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=94=AF=E6=8C=81=E5=88=86=E7=B1=BB=E3=80=81?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=92=8C=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bun.lockb                                 | Bin 162124 -> 162470 bytes
 database/development.sqlite3-shm          | Bin 32768 -> 32768 bytes
 database/development.sqlite3-wal          | Bin 12392 -> 267832 bytes
 docs/dev.md                               |   6 +
 package.json                              |   1 +
 src/controllers/Page/ArticleController.js | 123 +++++++++++++++
 src/controllers/Page/PageController.js    |   6 +-
 src/db/models/ArticleModel.js             | 128 ++++++++--------
 src/views/layouts/empty.pug               |   6 +-
 src/views/layouts/root.pug                |   4 +-
 src/views/page/articles/article.pug       |  70 +++++++++
 src/views/page/articles/category.pug      |  29 ++++
 src/views/page/articles/index.pug         | 240 ++++++++++++++++--------------
 src/views/page/articles/search.pug        |  34 +++++
 src/views/page/articles/tag.pug           |  32 ++++
 src/views/page/auth/no-auth.pug           |   2 +-
 src/views/page/index/index.pug            |   6 +-
 src/views/page/login/index.pug            |   2 +-
 src/views/page/register/index.pug         |   2 +-
 19 files changed, 499 insertions(+), 192 deletions(-)
 create mode 100644 docs/dev.md
 create mode 100644 src/controllers/Page/ArticleController.js
 create mode 100644 src/views/page/articles/article.pug
 create mode 100644 src/views/page/articles/category.pug
 create mode 100644 src/views/page/articles/search.pug
 create mode 100644 src/views/page/articles/tag.pug

diff --git a/bun.lockb b/bun.lockb
index 98b29ec432036451f1db9a97eb874c63281199ec..965abd33c955d96ae14025205955841900f3b8fb 100644
GIT binary patch
delta 18487
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
Rp-QUdXi>Pfo#P)p{|iTQKo$T1

delta 18331
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

diff --git a/database/development.sqlite3-shm b/database/development.sqlite3-shm
index cdf5f2786e1c2ec79da2b9abf92c43d74d2fb2b9..c28f6006ac258adabdb7d6320220d66911867cae 100644
GIT binary patch
literal 32768
zcmeI*H%<dV6oBC$OpeARlXK2Fr;>(>o`O4Y0iOXu$ra26kT?V#4JV+agISA}R+fx}
zsEq$7J<aUw+u42J0d}%)OGGgkvI^2?Va$Ylxq8Uo-{x``*IhT4k58}p=l8drkGu2i
zFYCirg^2e3OvLvxQ{R(R7;8h;g-p()Zz+`>;oeUfKNr_T*YUj6n5;?8OVuaW<M$Ph
zQBAy8JSLxu=b_9{Kmi35P(T3%6i`3`1r$&~0R<FLKmi35P(T3%6i`3`1r$&~0R<FL
zKmi35P(T3%6i`3`1r$&~0R<FLKmi35P(T3%6i`3`1r$&~0R<FLKmi35P~e{nR8jNK
zJG4Co6i`5cVu9+yzvhZpy;h(S1X6{+ELK9N_NagY3Mim}0tzUgfC36Apnw7jD4>7>
z3Mim}0tzUgfC36ApnwA9FVIFi>2T&_hEBTZCQBa!;jGIch8ba$F~*q;XHd>C%N+A8
zu*ee2tgy-&yX<qw5yzZxN_2vyp+NZv)YCvCO*GR&D?Rkm&jiz~v%w}?Y_r222j$a{
SU#frt3Mim}0tzVbXMr!%xHtI#

delta 170
zcmZo@U}|V!s+V}A%K!t63=9IyK#mX)7ja)>s9SURnqRU=S;(gScXjpVT$!!1^De3C
uVP=EO{f`8o;!F(86B~s$Phm`RU%Y@32sTe-{LRY91f>2lF){-wZao0WLo=@c

diff --git a/database/development.sqlite3-wal b/database/development.sqlite3-wal
index e5145a5f085469ae0b98f06b53512114fca00ddb..fd0f3fc3e3fde3d7e761b0f8c997783bc10248c9 100644
GIT binary patch
literal 267832
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%0AQ6{s5h;b>>^rhinAPHMmAkq#iQbSSh4$5s#
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
P&BgF<&<k9oUf}-&!1xEz

delta 8
Pcmdn7M&L!lh71D$6Z8ZH

diff --git a/docs/dev.md b/docs/dev.md
new file mode 100644
index 0000000..862bc6a
--- /dev/null
+++ b/docs/dev.md
@@ -0,0 +1,6 @@
+
+# 开发文档
+
+## 记录说明
+
+本系统存在token和session两种机制，因此，ctx.session表明session，会影响到客户端的cookie, 由于此机制，ctx.session.user和ctx.state.user都存放了用户信息，注意区别使用。
\ No newline at end of file
diff --git a/package.json b/package.json
index 8d9da88..e1ddd8d 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "koa-session": "^7.0.2",
     "lodash": "^4.17.21",
     "log4js": "^6.9.1",
+    "marked": "^16.2.1",
     "minimatch": "^9.0.0",
     "node-cron": "^4.1.0",
     "path-to-regexp": "^8.2.0",
diff --git a/src/controllers/Page/ArticleController.js b/src/controllers/Page/ArticleController.js
new file mode 100644
index 0000000..a0a1fa6
--- /dev/null
+++ b/src/controllers/Page/ArticleController.js
@@ -0,0 +1,123 @@
+import { ArticleModel } from "../../db/models/ArticleModel.js"
+import Router from "utils/router.js"
+import { marked } from "marked"
+
+class ArticleController {
+    async index(ctx) {
+        const { page = 1, view = 'grid' } = ctx.query
+        const limit = 12 // 每页显示的文章数量
+        const offset = (page - 1) * limit
+
+        // 获取文章总数
+        const total = await ArticleModel.getPublishedArticleCount()
+        const totalPages = Math.ceil(total / limit)
+
+        // 获取分页文章
+        const articles = await ArticleModel.findPublished(offset, limit)
+
+        // 获取所有分类和标签
+        const categories = await ArticleModel.getArticleCountByCategory()
+        const allArticles = await ArticleModel.findPublished()
+        const tags = new Set()
+        allArticles.forEach(article => {
+            if (article.tags) {
+                article.tags.split(',').forEach(tag => {
+                    tags.add(tag.trim())
+                })
+            }
+        })
+
+        return ctx.render("page/articles/index", {
+            articles,
+            categories: categories.map(c => c.category),
+            tags: Array.from(tags),
+            currentPage: parseInt(page),
+            totalPages,
+            view,
+            title: "文章列表",
+        }, {
+            includeUser: true,
+            includeSite: true,
+        })
+    }
+
+    async show(ctx) {
+        const { slug } = ctx.params
+        console.log(slug);
+        
+        const article = await ArticleModel.findBySlug(slug)
+
+        if (!article) {
+            ctx.throw(404, "文章不存在")
+        }
+
+        // 增加阅读次数
+        await ArticleModel.incrementViewCount(article.id)
+
+        // 将文章内容解析为HTML
+        article.content = marked(article.content || '')
+
+        // 获取相关文章
+        const relatedArticles = await ArticleModel.getRelatedArticles(article.id)
+
+        return ctx.render("page/articles/article", {
+            article,
+            relatedArticles,
+            title: article.title,
+        }, {
+            includeUser: true,
+        })
+    }
+
+    async byCategory(ctx) {
+        const { category } = ctx.params
+        const articles = await ArticleModel.findByCategory(category)
+
+        return ctx.render("page/articles/category", {
+            articles,
+            category,
+            title: `${category} - 分类文章`,
+        }, {
+            includeUser: true,
+        })
+    }
+
+    async byTag(ctx) {
+        const { tag } = ctx.params
+        const articles = await ArticleModel.findByTags(tag)
+
+        return ctx.render("page/articles/tag", {
+            articles,
+            tag,
+            title: `${tag} - 标签文章`,
+        }, {
+            includeUser: true,
+        })
+    }
+
+    async search(ctx) {
+        const { q } = ctx.query
+        const articles = await ArticleModel.searchByKeyword(q)
+
+        return ctx.render("page/articles/search", {
+            articles,
+            keyword: q,
+            title: `搜索：${q}`,
+        })
+    }
+
+    static createRoutes() {
+        const controller = new ArticleController()
+        const router = new Router({ auth: true, prefix: "/articles" })
+        router.get("", controller.index, { auth: false }) // 允许未登录访问
+        router.get("/", controller.index, { auth: false }) // 允许未登录访问
+        router.get("/search", controller.search)
+        router.get("/category/:category", controller.byCategory)
+        router.get("/tag/:tag", controller.byTag)
+        router.get("/:slug", controller.show)
+        return router
+    }
+}
+
+export default ArticleController
+export { ArticleController }
diff --git a/src/controllers/Page/PageController.js b/src/controllers/Page/PageController.js
index 3deeda6..3c7f94f 100644
--- a/src/controllers/Page/PageController.js
+++ b/src/controllers/Page/PageController.js
@@ -16,7 +16,7 @@ class PageController {
 
     // 首页
     async indexGet(ctx) {
-        const blogs = await this.articleService.getAllArticles()
+        const blogs = await this.articleService.getPublishedArticles()
         return await ctx.render(
             "page/index/index",
             {
@@ -176,8 +176,8 @@ class PageController {
         // 未授权报错页
         router.get("/no-auth", controller.indexNoAuth.bind(controller), { auth: false })
 
-        router.get("/article/:id", controller.pageGet("page/articles/index"), { auth: false })
-        router.get("/articles", controller.pageGet("page/articles/index"), { auth: false })
+        // router.get("/article/:id", controller.pageGet("page/articles/index"), { auth: false })
+        // router.get("/articles", controller.pageGet("page/articles/index"), { auth: false })
 
         router.get("/about", controller.pageGet("page/about/index"), { auth: false })
         router.get("/terms", controller.pageGet("page/extra/terms"), { auth: false })
diff --git a/src/db/models/ArticleModel.js b/src/db/models/ArticleModel.js
index 4b83535..4bf5fa9 100644
--- a/src/db/models/ArticleModel.js
+++ b/src/db/models/ArticleModel.js
@@ -5,17 +5,22 @@ class ArticleModel {
         return db("articles").orderBy("created_at", "desc")
     }
 
-    static async findPublished() {
-        return db("articles")
+    static async findPublished(offset, limit) {
+        let query = db("articles")
             .where("status", "published")
             .whereNotNull("published_at")
             .orderBy("published_at", "desc")
+        if (typeof offset === "number") {
+            query = query.offset(offset)
+        }
+        if (typeof limit === "number") {
+            query = query.limit(limit)
+        }
+        return query
     }
 
     static async findDrafts() {
-        return db("articles")
-            .where("status", "draft")
-            .orderBy("updated_at", "desc")
+        return db("articles").where("status", "draft").orderBy("updated_at", "desc")
     }
 
     static async findById(id) {
@@ -27,22 +32,16 @@ class ArticleModel {
     }
 
     static async findByAuthor(author) {
-        return db("articles")
-            .where("author", author)
-            .where("status", "published")
-            .orderBy("published_at", "desc")
+        return db("articles").where("author", author).where("status", "published").orderBy("published_at", "desc")
     }
 
     static async findByCategory(category) {
-        return db("articles")
-            .where("category", category)
-            .where("status", "published")
-            .orderBy("published_at", "desc")
+        return db("articles").where("category", category).where("status", "published").orderBy("published_at", "desc")
     }
 
     static async findByTags(tags) {
         // 支持多个标签搜索，标签以逗号分隔
-        const tagArray = tags.split(',').map(tag => tag.trim())
+        const tagArray = tags.split(",").map(tag => tag.trim())
         return db("articles")
             .where("status", "published")
             .whereRaw("tags LIKE ?", [`%${tagArray[0]}%`])
@@ -52,7 +51,7 @@ class ArticleModel {
     static async searchByKeyword(keyword) {
         return db("articles")
             .where("status", "published")
-            .where(function() {
+            .where(function () {
                 this.where("title", "like", `%${keyword}%`)
                     .orWhere("content", "like", `%${keyword}%`)
                     .orWhere("keywords", "like", `%${keyword}%`)
@@ -71,7 +70,11 @@ class ArticleModel {
         // 处理标签，确保格式一致
         let tags = data.tags
         if (tags && typeof tags === "string") {
-            tags = tags.split(',').map(tag => tag.trim()).filter(tag => tag).join(', ')
+            tags = tags
+                .split(",")
+                .map(tag => tag.trim())
+                .filter(tag => tag)
+                .join(", ")
         }
 
         // 生成slug（如果未提供）
@@ -92,17 +95,19 @@ class ArticleModel {
             excerpt = this.generateExcerpt(data.content)
         }
 
-        return db("articles").insert({
-            ...data,
-            tags,
-            slug,
-            reading_time: readingTime,
-            excerpt,
-            status: data.status || "draft",
-            view_count: 0,
-            created_at: db.fn.now(),
-            updated_at: db.fn.now(),
-        }).returning("*")
+        return db("articles")
+            .insert({
+                ...data,
+                tags,
+                slug,
+                reading_time: readingTime,
+                excerpt,
+                status: data.status || "draft",
+                view_count: 0,
+                created_at: db.fn.now(),
+                updated_at: db.fn.now(),
+            })
+            .returning("*")
     }
 
     static async update(id, data) {
@@ -114,7 +119,11 @@ class ArticleModel {
         // 处理标签，确保格式一致
         let tags = data.tags
         if (tags && typeof tags === "string") {
-            tags = tags.split(',').map(tag => tag.trim()).filter(tag => tag).join(', ')
+            tags = tags
+                .split(",")
+                .map(tag => tag.trim())
+                .filter(tag => tag)
+                .join(", ")
         }
 
         // 生成slug（如果标题改变且未提供slug）
@@ -141,15 +150,18 @@ class ArticleModel {
             publishedAt = db.fn.now()
         }
 
-        return db("articles").where("id", id).update({
-            ...data,
-            tags: tags || current.tags,
-            slug: slug || current.slug,
-            reading_time: readingTime || current.reading_time,
-            excerpt: excerpt || current.excerpt,
-            published_at: publishedAt || current.published_at,
-            updated_at: db.fn.now(),
-        }).returning("*")
+        return db("articles")
+            .where("id", id)
+            .update({
+                ...data,
+                tags: tags || current.tags,
+                slug: slug || current.slug,
+                reading_time: readingTime || current.reading_time,
+                excerpt: excerpt || current.excerpt,
+                published_at: publishedAt || current.published_at,
+                updated_at: db.fn.now(),
+            })
+            .returning("*")
     }
 
     static async delete(id) {
@@ -183,10 +195,7 @@ class ArticleModel {
     }
 
     static async incrementViewCount(id) {
-        return db("articles")
-            .where("id", id)
-            .increment("view_count", 1)
-            .returning("*")
+        return db("articles").where("id", id).increment("view_count", 1).returning("*")
     }
 
     static async findByDateRange(startDate, endDate) {
@@ -202,10 +211,7 @@ class ArticleModel {
     }
 
     static async getPublishedArticleCount() {
-        const result = await db("articles")
-            .where("status", "published")
-            .count("id as count")
-            .first()
+        const result = await db("articles").where("status", "published").count("id as count").first()
         return result ? result.count : 0
     }
 
@@ -219,33 +225,19 @@ class ArticleModel {
     }
 
     static async getArticleCountByStatus() {
-        return db("articles")
-            .select("status")
-            .count("id as count")
-            .groupBy("status")
-            .orderBy("count", "desc")
+        return db("articles").select("status").count("id as count").groupBy("status").orderBy("count", "desc")
     }
 
     static async getRecentArticles(limit = 10) {
-        return db("articles")
-            .where("status", "published")
-            .orderBy("published_at", "desc")
-            .limit(limit)
+        return db("articles").where("status", "published").orderBy("published_at", "desc").limit(limit)
     }
 
     static async getPopularArticles(limit = 10) {
-        return db("articles")
-            .where("status", "published")
-            .orderBy("view_count", "desc")
-            .limit(limit)
+        return db("articles").where("status", "published").orderBy("view_count", "desc").limit(limit)
     }
 
     static async getFeaturedArticles(limit = 5) {
-        return db("articles")
-            .where("status", "published")
-            .whereNotNull("featured_image")
-            .orderBy("published_at", "desc")
-            .limit(limit)
+        return db("articles").where("status", "published").whereNotNull("featured_image").orderBy("published_at", "desc").limit(limit)
     }
 
     static async getRelatedArticles(articleId, limit = 5) {
@@ -255,12 +247,12 @@ class ArticleModel {
         return db("articles")
             .where("status", "published")
             .where("id", "!=", articleId)
-            .where(function() {
+            .where(function () {
                 if (current.category) {
                     this.orWhere("category", current.category)
                 }
                 if (current.tags) {
-                    const tags = current.tags.split(',').map(tag => tag.trim())
+                    const tags = current.tags.split(",").map(tag => tag.trim())
                     tags.forEach(tag => {
                         this.orWhereRaw("tags LIKE ?", [`%${tag}%`])
                     })
@@ -274,9 +266,9 @@ class ArticleModel {
     static generateSlug(title) {
         return title
             .toLowerCase()
-            .replace(/[^\w\s-]/g, '')
-            .replace(/\s+/g, '-')
-            .replace(/-+/g, '-')
+            .replace(/[^\w\s-]/g, "")
+            .replace(/\s+/g, "-")
+            .replace(/-+/g, "-")
             .trim()
     }
 
diff --git a/src/views/layouts/empty.pug b/src/views/layouts/empty.pug
index 78d79f6..5011437 100644
--- a/src/views/layouts/empty.pug
+++ b/src/views/layouts/empty.pug
@@ -15,8 +15,7 @@ block $$content
                 #{$site.site_title}
         // 桌面端菜单
         .left.menu.desktop-only
-            a.menu-item(href="/about") 明月照佳人
-            a.menu-item(href="/about") 岁月催人老
+            a.menu-item(href="/articles") 所有文章
         if !isLogin
             .right.menu.desktop-only
                 a.menu-item(href="/login") 登录
@@ -35,8 +34,7 @@ block $$content
         // 移动端菜单内容（与桌面端一致）
         .mobile-menu.container
             .left.menu
-            a.menu-item(href="/about") 明月照佳人
-            a.menu-item(href="/about") 岁月催人老
+            a.menu-item(href="/articles") 所有文章
             if !isLogin
                 .right.menu
                     a.menu-item(href="/login") 登录
diff --git a/src/views/layouts/root.pug b/src/views/layouts/root.pug
index ba4c10e..479f568 100644
--- a/src/views/layouts/root.pug
+++ b/src/views/layouts/root.pug
@@ -12,12 +12,12 @@ html(lang="zh-CN")
     meta(charset="utf-8")
     meta(name="viewport" content="width=device-width, initial-scale=1")
     +css('lib/reset.css')
-    +css('lib/simplebar.css', true)
+    +css('lib/simplebar.css')
     +css('lib/simplebar-shim.css')
     +css('css/layouts/root.css')
     +js('lib/htmx.min.js')
     +js('lib/tailwindcss.3.4.17.js')
-    +js('lib/simplebar.min.js', true)
+    +js('lib/simplebar.min.js')
   body
     noscript
       style.
diff --git a/src/views/page/articles/article.pug b/src/views/page/articles/article.pug
new file mode 100644
index 0000000..a92df10
--- /dev/null
+++ b/src/views/page/articles/article.pug
@@ -0,0 +1,70 @@
+extends /layouts/empty.pug
+
+block pageContent
+  .container.mx-auto.px-4.py-8
+    article.max-w-4xl.mx-auto
+      header.mb-8
+        h1.text-4xl.font-bold.mb-4= article.title
+        .flex.flex-wrap.items-center.text-gray-600.mb-4
+          span.mr-4
+            i.fas.fa-calendar-alt.mr-1
+            = new Date(article.published_at).toLocaleDateString()
+          span.mr-4
+            i.fas.fa-eye.mr-1
+            = article.view_count + " 阅读"
+          if article.reading_time
+            span.mr-4
+              i.fas.fa-clock.mr-1
+              = article.reading_time + " 分钟阅读"
+          if article.category
+            a.text-blue-600.mr-4(href=`/articles/category/${article.category}` class="hover:text-blue-800")
+              i.fas.fa-folder.mr-1
+              = article.category
+          if article.status === "draft"
+            span(class="ml-2 px-2 py-0.5 text-xs bg-yellow-200 text-yellow-800 rounded align-middle") 未发布
+
+        if article.tags
+          .flex.flex-wrap.gap-2.mb-4
+            each tag in article.tags.split(',')
+              a.bg-gray-100.text-gray-700.px-3.py-1.rounded-full.text-sm(href=`/articles/tag/${tag.trim()}` class="hover:bg-gray-200")
+                i.fas.fa-tag.mr-1
+                = tag.trim()
+
+      if article.featured_image
+        .mb-8
+          img.w-full.rounded-lg.shadow-lg(src=article.featured_image alt=article.title)
+
+      .prose.prose-lg.max-w-none.mb-8.markdown-content(class="prose-pre:bg-gray-100 prose-pre:p-4 prose-pre:rounded-lg prose-code:text-blue-600 prose-blockquote:border-l-4 prose-blockquote:border-gray-300 prose-blockquote:pl-4 prose-blockquote:italic prose-img:rounded-lg prose-img:shadow-md")
+        != article.content
+
+      if article.keywords || article.description
+        .bg-gray-50.rounded-lg.p-6.mb-8
+          if article.keywords
+            .mb-4
+              h3.text-lg.font-semibold.mb-2 关键词
+              .flex.flex-wrap.gap-2
+                each keyword in article.keywords.split(',')
+                  span.bg-white.px-3.py-1.rounded-full.text-sm= keyword.trim()
+          if article.description
+            h3.text-lg.font-semibold.mb-2 描述
+            p.text-gray-600= article.description
+
+      if relatedArticles && relatedArticles.length
+        section.border-t.pt-8.mt-8
+          h2.text-2xl.font-bold.mb-6 相关文章
+          .grid.grid-cols-1.gap-6(class="md:grid-cols-2")
+            each related in relatedArticles
+              .bg-white.shadow-md.rounded-lg.overflow-hidden
+                if related.featured_image
+                  img.w-full.h-48.object-cover(src=related.featured_image alt=related.title)
+                .p-6
+                  h3.text-xl.font-semibold.mb-2
+                    a(href=`/articles/${related.slug}` class="hover:text-blue-600")= related.title
+                  if related.excerpt
+                    p.text-gray-600.text-sm.mb-4= related.excerpt
+                  .flex.justify-between.items-center.text-sm.text-gray-500
+                    span
+                      i.fas.fa-calendar-alt.mr-1
+                      = new Date(related.published_at).toLocaleDateString()
+                    if related.category
+                      a.text-blue-600(href=`/articles/category/${related.category}` class="hover:text-blue-800")= related.category
diff --git a/src/views/page/articles/category.pug b/src/views/page/articles/category.pug
new file mode 100644
index 0000000..fde2be6
--- /dev/null
+++ b/src/views/page/articles/category.pug
@@ -0,0 +1,29 @@
+extends /layouts/empty.pug
+
+block pageContent
+  .container.mx-auto.px-4.py-8
+    h1.text-3xl.font-bold.mb-8
+      span.text-gray-600 分类：
+      = category
+
+    .grid.grid-cols-1.gap-6(class="md:grid-cols-2 lg:grid-cols-3")
+      each article in articles
+        .bg-white.shadow-md.rounded-lg.overflow-hidden
+          if article.featured_image
+            img.w-full.h-48.object-cover(src=article.featured_image alt=article.title)
+          .p-6
+            h2.text-xl.font-semibold.mb-2
+              a(href=`/articles/${article.slug}` class="hover:text-blue-600")= article.title
+            if article.excerpt
+              p.text-gray-600.mb-4= article.excerpt
+            .flex.justify-between.items-center.text-sm.text-gray-500
+              span
+                i.fas.fa-calendar-alt.mr-1
+                = new Date(article.published_at).toLocaleDateString()
+              span
+                i.fas.fa-eye.mr-1
+                = article.view_count + " 阅读"
+
+    if !articles.length
+      .text-center.py-8
+        p.text-gray-500 该分类下暂无文章
diff --git a/src/views/page/articles/index.pug b/src/views/page/articles/index.pug
index 0c1d940..1f16fe0 100644
--- a/src/views/page/articles/index.pug
+++ b/src/views/page/articles/index.pug
@@ -1,113 +1,133 @@
-extends /layouts/page.pug
+extends /layouts/empty.pug
 
 block pageContent
-  .article-list-container-full
-    - const articles = []
-    - articles.push({ id: 1, title: '文章标题1', author: '作者1', created_at: '2023-08-01', summary: '这是文章摘要...' })
-    - articles.push({ id: 2, title: '文章标题2', author: '作者2', created_at: '2023-08-02', summary: '这是另一篇文章摘要...' })
-    //- 文章列表
-    if articles && articles.length
-      each article in articles
-        .article-item-full
-          h2.article-title-full
-            a(href=`/articles/${article.id}`) #{article.title}
-          .article-meta-full
-            span 作者：#{article.author} | 发布时间：#{article.created_at}
-          p.article-summary-full #{article.summary}
-    else
-      p.no-articles 暂无文章
+  .flex.flex-col
+    .flex-1.p-8.bg-gray-50
+      .container.mx-auto
+        // 页头
+        .flex.justify-between.items-center.mb-8
+          h1.text-2xl.font-bold 文章列表
+          .flex.gap-4
+            // 搜索框
+            .relative
+              input#searchInput.w-64.pl-10.pr-4.py-2.border.rounded-lg(
+                type="text" 
+                placeholder="搜索文章..."
+                hx-get="/articles/search"
+                hx-trigger="keyup changed delay:500ms"
+                hx-target="#articleList"
+                name="q"
+                class="focus:outline-none focus:ring-blue-500 focus:ring-2"
+              )
+              i.fas.fa-search.absolute.left-3.top-3.text-gray-400
 
-    //- 分页控件
-    if totalPages > 1
-      .pagination-full
-        if page > 1
-          a.page-btn-full(href=`?page=${page-1}`) 上一页
-        else
-          span.page-btn-full.disabled 上一页
-        span.page-info-full 第 #{page} / #{totalPages} 页
-        if page < totalPages
-          a.page-btn-full(href=`?page=${page+1}`) 下一页
-        else
-          span.page-btn-full.disabled 下一页
-  style.
-    .article-list-container-full {
-      width: 100%;
-      max-width: 100%;
-      margin: 40px 0 0 0;
-      background: transparent;
-      border-radius: 0;
-      box-shadow: none;
-      padding: 0;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-    }
-    .article-item-full {
-      width: 90vw;
-      max-width: 1200px;
-      background: #fff;
-      border-radius: 14px;
-      box-shadow: 0 2px 16px #e0e7ef;
-      margin-bottom: 28px;
-      padding: 28px 36px 18px 36px;
-      border-left: 6px solid #6dd5fa;
-      transition: box-shadow 0.2s, border-color 0.2s;
-    }
-    .article-item-full:hover {
-      box-shadow: 0 4px 32px #cbe7ff;
-      border-left: 6px solid #ff6a88;
-    }
-    .article-title-full {
-      margin: 0 0 8px 0;
-      font-size: 1.6em;
-    }
-    .article-title-full a {
-      color: #2b7cff;
-      text-decoration: none;
-      transition: color 0.2s;
-    }
-    .article-title-full a:hover {
-      color: #ff6a88;
-    }
-    .article-meta-full {
-      color: #888;
-      font-size: 1em;
-      margin-bottom: 8px;
-    }
-    .article-summary-full {
-      color: #444;
-      font-size: 1.13em;
-    }
-    .no-articles {
-      text-align: center;
-      color: #aaa;
-      margin: 40px 0;
-    }
-    .pagination-full {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin: 32px 0 0 0;
-      gap: 18px;
-    }
-    .page-btn-full {
-      padding: 7px 22px;
-      border-radius: 22px;
-      background: linear-gradient(90deg, #6dd5fa, #ff6a88);
-      color: #fff;
-      text-decoration: none;
-      font-weight: bold;
-      transition: background 0.2s;
-      cursor: pointer;
-      font-size: 1.08em;
-    }
-    .page-btn-full.disabled {
-      background: #eee;
-      color: #bbb;
-      cursor: not-allowed;
-      pointer-events: none;
-    }
-    .page-info-full {
-      color: #666;
-      font-size: 1.12em;
-    }
\ No newline at end of file
+            // 视图切换按钮
+            .flex.items-center.gap-2.bg-white.p-1.rounded-lg.border
+              button.p-2.rounded(
+                class="hover:bg-gray-100"
+                hx-get="/articles?view=grid"
+                hx-target="#articleList"
+              )
+                i.fas.fa-th-large
+              button.p-2.rounded(
+                class="hover:bg-gray-100"
+                hx-get="/articles?view=list"
+                hx-target="#articleList"
+              )
+                i.fas.fa-list
+
+        // 筛选栏
+        .bg-white.rounded-lg.shadow-sm.p-4.mb-6
+          .flex.flex-wrap.gap-4
+            if categories && categories.length
+              .flex.items-center.gap-2
+                span.text-gray-600 分类：
+                each cat in categories
+                  a.px-3.py-1.rounded-full(
+                    class="hover:bg-blue-50 hover:text-blue-600" + (cat === currentCategory ? " bg-blue-100 text-blue-600" : "")
+                    href=`/articles/category/${cat}`
+                  )= cat
+
+            if tags && tags.length
+              .flex.items-center.gap-2
+                span.text-gray-600 标签：
+                each tag in tags
+                  a.px-3.py-1.rounded-full(
+                    class="hover:bg-blue-50 hover:text-blue-600" + (tag === currentTag ? " bg-blue-100 text-blue-600" : "")
+                    href=`/articles/tag/${tag}`
+                  )= tag
+
+        // 文章列表
+        #articleList.grid.grid-cols-1.gap-6(class="md:grid-cols-2 lg:grid-cols-3")
+          each article in articles
+            .bg-white.rounded-lg.shadow-sm.overflow-hidden.transition.duration-300.transform(class="hover:-translate-y-1 hover:shadow-md")
+              if article.featured_image
+                .relative.h-48
+                  img.w-full.h-full.object-cover(src=article.featured_image alt=article.title)
+                  if article.category
+                    a.absolute.top-3.right-3.px-3.py-1.bg-blue-600.text-white.text-sm.rounded-full.opacity-90(
+                      href=`/articles/category/${article.category}`
+                      class="hover:opacity-100"
+                    )= article.category
+              .p-6
+                h2.text-xl.font-bold.mb-3
+                  a(href=`/articles/${article.slug}` class="hover:text-blue-600")= article.title
+                if article.excerpt
+                  p.text-gray-600.text-sm.mb-4.line-clamp-2= article.excerpt
+                
+                .flex.flex-wrap.gap-2.mb-4
+                  if article.tags
+                    each tag in article.tags.split(',')
+                      a.text-sm.text-gray-500(
+                        href=`/articles/tag/${tag.trim()}`
+                        class="hover:text-blue-600"
+                      )
+                        i.fas.fa-tag.mr-1
+                        = tag.trim()
+                
+                .flex.justify-between.items-center.text-sm.text-gray-500
+                  .flex.items-center.gap-4
+                    span
+                      i.far.fa-calendar.mr-1
+                      = new Date(article.published_at).toLocaleDateString()
+                    if article.reading_time
+                      span
+                        i.far.fa-clock.mr-1
+                        = article.reading_time + "分钟"
+                  span
+                    i.far.fa-eye.mr-1
+                    = article.view_count + " 阅读"
+
+          if !articles.length
+            .col-span-full.py-16.text-center
+              .text-gray-400.mb-4
+                i.fas.fa-inbox.text-6xl
+              p.text-gray-500 暂无文章
+
+        // 分页
+        if totalPages > 1
+          .flex.justify-center.mt-8
+            nav.flex.items-center.gap-1(aria-label="Pagination")
+              // 上一页
+              if currentPage > 1
+                a.px-3.py-1.rounded-md.bg-white.border(
+                  href=`/articles?page=${currentPage - 1}`
+                  class="text-gray-500 hover:text-gray-700 hover:bg-gray-50"
+                ) 上一页
+              
+              // 页码
+              each page in Array.from({length: totalPages}, (_, i) => i + 1)
+                if page === currentPage
+                  span.px-3.py-1.rounded-md.bg-blue-50.text-blue-600.border.border-blue-200= page
+                else
+                  a.px-3.py-1.rounded-md.bg-white.border(
+                    href=`/articles?page=${page}`
+                    class="text-gray-500 hover:text-gray-700 hover:bg-gray-50"
+                  )= page
+              
+              // 下一页
+              if currentPage < totalPages
+                a.px-3.py-1.rounded-md.bg-white.border(
+                  href=`/articles?page=${currentPage + 1}`
+                  class="text-gray-500 hover:text-gray-700 hover:bg-gray-50"
+                ) 下一页
diff --git a/src/views/page/articles/search.pug b/src/views/page/articles/search.pug
new file mode 100644
index 0000000..555c2e7
--- /dev/null
+++ b/src/views/page/articles/search.pug
@@ -0,0 +1,34 @@
+extends /layouts/empty.pug
+
+block pageContent
+  .container.mx-auto.px-4.py-8
+    .mb-8
+      h1.text-3xl.font-bold.mb-4
+        span.text-gray-600 搜索结果：
+        = keyword
+      p.text-gray-500 找到 #{articles.length} 篇相关文章
+
+    .grid.grid-cols-1.md:grid-cols-2.lg:grid-cols-3.gap-6
+      each article in articles
+        .bg-white.shadow-md.rounded-lg.overflow-hidden
+          if article.featured_image
+            img.w-full.h-48.object-cover(src=article.featured_image alt=article.title)
+          .p-6
+            h2.text-xl.font-semibold.mb-2
+              a.hover:text-blue-600(href=`/articles/${article.slug}`)= article.title
+            if article.excerpt
+              p.text-gray-600.mb-4= article.excerpt
+            .flex.justify-between.items-center
+              .text-sm.text-gray-500
+                span.mr-4
+                  i.fas.fa-calendar-alt.mr-1
+                  = new Date(article.published_at).toLocaleDateString()
+                span
+                  i.fas.fa-eye.mr-1
+                  = article.view_count + " 阅读"
+              if article.category
+                a.text-sm.bg-blue-100.text-blue-600.px-3.py-1.rounded-full.hover:bg-blue-200(href=`/articles/category/${article.category}`)= article.category
+
+    if !articles.length
+      .text-center.py-8
+        p.text-gray-500 未找到相关文章
diff --git a/src/views/page/articles/tag.pug b/src/views/page/articles/tag.pug
new file mode 100644
index 0000000..d52241b
--- /dev/null
+++ b/src/views/page/articles/tag.pug
@@ -0,0 +1,32 @@
+extends /layouts/empty.pug
+
+block pageContent
+  .container.mx-auto.px-4.py-8
+    h1.text-3xl.font-bold.mb-8
+      span.text-gray-600 标签：
+      = tag
+
+    .grid.grid-cols-1.gap-6(class="md:grid-cols-2 lg:grid-cols-3")
+      each article in articles
+        .bg-white.shadow-md.rounded-lg.overflow-hidden
+          if article.featured_image
+            img.w-full.h-48.object-cover(src=article.featured_image alt=article.title)
+          .p-6
+            h2.text-xl.font-semibold.mb-2
+              a(href=`/articles/${article.slug}` class="hover:text-blue-600")= article.title
+            if article.excerpt
+              p.text-gray-600.mb-4= article.excerpt
+            .flex.justify-between.items-center
+              .text-sm.text-gray-500
+                span.mr-4
+                  i.fas.fa-calendar-alt.mr-1
+                  = new Date(article.published_at).toLocaleDateString()
+                span
+                  i.fas.fa-eye.mr-1
+                  = article.view_count + " 阅读"
+              if article.category
+                a.text-sm.bg-blue-100.text-blue-600.px-3.py-1.rounded-full(href=`/articles/category/${article.category}` class="hover:bg-blue-200")= article.category
+
+    if !articles.length
+      .text-center.py-8
+        p.text-gray-500 该标签下暂无文章
diff --git a/src/views/page/auth/no-auth.pug b/src/views/page/auth/no-auth.pug
index 5db22eb..d578636 100644
--- a/src/views/page/auth/no-auth.pug
+++ b/src/views/page/auth/no-auth.pug
@@ -1,4 +1,4 @@
-extends /layouts/page.pug
+extends /layouts/empty.pug
 
 block pageContent
   .no-auth-container
diff --git a/src/views/page/index/index.pug b/src/views/page/index/index.pug
index 4224ea3..69232cb 100644
--- a/src/views/page/index/index.pug
+++ b/src/views/page/index/index.pug
@@ -14,7 +14,9 @@ mixin item(url, desc)
 mixin card(blog)
   .article-card(class="bg-white rounded-[12px] shadow p-6 transition hover:shadow-lg border border-gray-100")
     h3.article-title(class="text-lg font-semibold text-gray-900 mb-2") 
-      a(href="/article/1" class="hover:text-blue-600 transition-colors duration-200") #{blog.title}
+      a(href="/articles/"+blog.slug class="hover:text-blue-600 transition-colors duration-200") #{blog.title}
+      if blog.status === "draft"
+        span(class="ml-2 px-2 py-0.5 text-xs bg-yellow-200 text-yellow-800 rounded align-middle") 未发布
     p.article-meta(class="text-sm text-gray-400 mb-3 flex")
       span(class="mr-2 line-clamp-1" title=blog.author)
         span 作者：
@@ -30,7 +32,7 @@ mixin card(blog)
       style="height: 2.8em; overflow: hidden;"
     )
       | #{blog.description}
-    a(href="/article/1" class="inline-block text-sm text-blue-600 hover:underline transition-colors duration-200") 阅读全文 →
+    a(href="/articles/"+blog.slug class="inline-block text-sm text-blue-600 hover:underline transition-colors duration-200") 阅读全文 →
 
 mixin empty()
   .div-placeholder(class="h-[100px] w-full bg-gray-100 text-center flex items-center justify-center text-[16px]")
diff --git a/src/views/page/login/index.pug b/src/views/page/login/index.pug
index 765ae21..e1ee926 100644
--- a/src/views/page/login/index.pug
+++ b/src/views/page/login/index.pug
@@ -1,4 +1,4 @@
-extends /layouts/pure.pug
+extends /layouts/empty.pug
 
 block pageScripts 
   script(src="js/login.js")
diff --git a/src/views/page/register/index.pug b/src/views/page/register/index.pug
index 96809e3..72b3d67 100644
--- a/src/views/page/register/index.pug
+++ b/src/views/page/register/index.pug
@@ -1,4 +1,4 @@
-extends /layouts/pure.pug
+extends /layouts/empty.pug
 
 block pageHead
     style.