From f4dc88e982b59b385c84c60a91ec42a6914bf575 Mon Sep 17 00:00:00 2001
From: saicaca <zephyird@gmail.com>
Date: Wed, 11 Oct 2023 22:29:23 +0800
Subject: [PATCH] feat: allow collapsing widget content, add categories widget

(cherry picked from commit 9a4ca8f6163d5e1375aa7c612e1338cce5a8c0b5)
---
 src/components/ArchivePanel.astro             |  3 +-
 src/components/Navbar.astro                   |  6 +--
 src/components/widget/Categories.astro        | 33 ++++++++++++
 src/components/widget/CategoriesLink.astro    | 21 ++++++++
 src/components/widget/RecentPost.astro        |  6 +--
 src/components/widget/SideBar.astro           | 16 ++++--
 .../widget/{Tag.astro => Tags.astro}          |  6 ++-
 src/components/widget/WidgetLayout.astro      | 52 +++++++++++++++++--
 src/i18n/i18nKey.ts                           |  2 +
 src/i18n/languages/en.ts                      |  2 +
 src/i18n/languages/zh_CN.ts                   |  2 +
 src/i18n/languages/zh_TW.ts                   |  2 +
 src/pages/page/[page].astro                   | 11 +---
 src/pages/posts/[slug].astro                  |  2 +-
 src/utils/content-utils.ts                    | 30 ++++++++---
 src/utils/url-utils.ts                        | 13 +++++
 16 files changed, 174 insertions(+), 33 deletions(-)
 create mode 100644 src/components/widget/Categories.astro
 create mode 100644 src/components/widget/CategoriesLink.astro
 rename src/components/widget/{Tag.astro => Tags.astro} (70%)

diff --git a/src/components/ArchivePanel.astro b/src/components/ArchivePanel.astro
index 33907f5..eeab882 100644
--- a/src/components/ArchivePanel.astro
+++ b/src/components/ArchivePanel.astro
@@ -7,7 +7,8 @@ interface Props {
 const { keyword, tags, categories} = Astro.props;
 
 import Button from "./control/Button.astro";
-import {getPostUrlBySlug, getSortedPosts} from "../utils/content-utils";
+import {getSortedPosts} from "../utils/content-utils";
+import {getPostUrlBySlug} from "../utils/url-utils";
 
 let posts = await getSortedPosts()
 
diff --git a/src/components/Navbar.astro b/src/components/Navbar.astro
index 18e69f4..93ccd45 100644
--- a/src/components/Navbar.astro
+++ b/src/components/Navbar.astro
@@ -19,10 +19,10 @@ function getLinkName(name: string) {
 }
 
 ---
-<div class:list={[
+<div transition:animate="none" class:list={[
     className,
-    "card-base max-w-[var(--page-width)] h-[72px] rounded-t-none mx-auto flex items-center justify-between px-4"]}>
-    <a href="/"><Button height="52px" class="px-5 font-bold rounded-lg" light>
+    "card-base sticky top-0 overflow-visible max-w-[var(--page-width)] h-[72px] rounded-t-none mx-auto flex items-center justify-between px-4"]}>
+    <a href="/page/1"><Button height="52px" class="px-5 font-bold rounded-lg" light>
         <div class="flex flex-row text-[var(--primary)] items-center text-md">
             <Icon name="material-symbols:home-outline-rounded" size={28} class="mb-1 mr-2" />
             {getConfig().title}
diff --git a/src/components/widget/Categories.astro b/src/components/widget/Categories.astro
new file mode 100644
index 0000000..b707cd7
--- /dev/null
+++ b/src/components/widget/Categories.astro
@@ -0,0 +1,33 @@
+---
+import WidgetLayout from "./WidgetLayout.astro";
+
+import {i18n} from "../../i18n/translation";
+import I18nKey from "../../i18n/i18nKey";
+import {CategoryMap, getCategoryMap} from "../../utils/content-utils";
+import CategoriesLink from "./CategoriesLink.astro";
+
+const categories = await getCategoryMap();
+
+const COLLAPSED_HEIGHT = "120px";
+const COLLAPSE_THRESHOLD = 5;
+
+function count(categoryMap: CategoryMap): number {
+    let res = 0;
+    for (const key in categoryMap) {
+        res++;
+        res += count(categoryMap[key].children);
+    }
+    return res;
+}
+
+const isCollapsed = count(categories) >= COLLAPSE_THRESHOLD;
+
+interface Props {
+    categories: CategoryMap;
+}
+
+---
+
+<WidgetLayout name={i18n(I18nKey.categories)} id="categories" isCollapsed={isCollapsed} collapsedHeight={COLLAPSED_HEIGHT}>
+    <CategoriesLink categories={categories}></CategoriesLink>
+</WidgetLayout>
\ No newline at end of file
diff --git a/src/components/widget/CategoriesLink.astro b/src/components/widget/CategoriesLink.astro
new file mode 100644
index 0000000..75293fa
--- /dev/null
+++ b/src/components/widget/CategoriesLink.astro
@@ -0,0 +1,21 @@
+---
+
+import {CategoryMap} from "../../utils/content-utils";
+import {getCategoryUrl} from "../../utils/url-utils";
+import ButtonLink from "../control/ButtonLink.astro";
+
+interface Props {
+    categories: CategoryMap;
+}
+
+const {categories} = Astro.props;
+
+---
+<div>
+    {Object.entries(categories).map(([key, value]) =>
+        <ButtonLink url={getCategoryUrl(key)} badge={value.count}>{value.name}</ButtonLink>
+        <div class="ml-2">
+            {Object.keys(value.children).length > 0 && <Astro.self categories={value.children}></Astro.self>}
+        </div>
+    )}
+</div>
diff --git a/src/components/widget/RecentPost.astro b/src/components/widget/RecentPost.astro
index b40c112..df5f366 100644
--- a/src/components/widget/RecentPost.astro
+++ b/src/components/widget/RecentPost.astro
@@ -1,17 +1,17 @@
 ---
 import WidgetLayout from "./WidgetLayout.astro";
 import ButtonLink from "../control/ButtonLink.astro";
-import {getPostUrlBySlug, getSortedPosts} from "../../utils/content-utils";
+import {getSortedPosts} from "../../utils/content-utils";
 import {i18n} from "../../i18n/translation";
 import I18nKey from "../../i18n/i18nKey";
+import {getPostUrlBySlug} from "../../utils/url-utils";
 
 let posts = await getSortedPosts()
 
-const LIMIT = 5;
+const LIMIT = 3;
 
 posts = posts.slice(0, LIMIT)
 
-// console.log(posts)
 ---
 <WidgetLayout name={i18n(I18nKey.recentPosts)}>
     {posts.map(post =>
diff --git a/src/components/widget/SideBar.astro b/src/components/widget/SideBar.astro
index 68065e1..c5bebc1 100644
--- a/src/components/widget/SideBar.astro
+++ b/src/components/widget/SideBar.astro
@@ -1,14 +1,20 @@
 ---
 import Profile from "./Profile.astro";
 import RecentPost from "./RecentPost.astro";
-import Tag from "./Tag.astro";
+import Tag from "./Tags.astro";
+import Categories from "./Categories.astro";
 
 const className = Astro.props.class;
 ---
-<div id="sidebar" class:list={[className, "flex flex-col w-full gap-4"]} transition:persist>
-    <Profile></Profile>
-    <RecentPost></RecentPost>
-    <Tag></Tag>
+<div id="sidebar" class:list={[className, "w-full"]} transition:persist>
+    <div class="flex flex-col w-full gap-4 mb-4">
+        <Profile></Profile>
+    </div>
+    <div class="flex flex-col w-full gap-4 top-4 sticky top-4" transition:animate="none">
+        <Categories></Categories>
+        <RecentPost></RecentPost>
+        <Tag></Tag>
+    </div>
 </div>
 
 <style>
diff --git a/src/components/widget/Tag.astro b/src/components/widget/Tags.astro
similarity index 70%
rename from src/components/widget/Tag.astro
rename to src/components/widget/Tags.astro
index 96b3903..46858df 100644
--- a/src/components/widget/Tag.astro
+++ b/src/components/widget/Tags.astro
@@ -8,8 +8,12 @@ import I18nKey from "../../i18n/i18nKey";
 
 const tags = await getTagList();
 
+const COLLAPSED_HEIGHT = "120px";
+
+const isCollapsed = tags.length >= 20;
+
 ---
-<WidgetLayout name={i18n(I18nKey.tags)}>
+<WidgetLayout name={i18n(I18nKey.tags)} id="tags" isCollapsed={isCollapsed} collapsedHeight={COLLAPSED_HEIGHT}>
     <div class="flex gap-2 flex-wrap">
         {tags.map(t => (
             <ButtonTag href={`/archive/tag/${t.name}`}>
diff --git a/src/components/widget/WidgetLayout.astro b/src/components/widget/WidgetLayout.astro
index bdc0216..f1c3348 100644
--- a/src/components/widget/WidgetLayout.astro
+++ b/src/components/widget/WidgetLayout.astro
@@ -1,18 +1,62 @@
 ---
+import Button from "../control/Button.astro";
+import { Icon } from 'astro-icon/components';
+import {i18n} from "../../i18n/translation";
+import I18nKey from "../../i18n/i18nKey";
 interface Props {
+    id: string;
     name?: string;
+    isCollapsed?: boolean;
+    collapsedHeight?: string;
 }
 const props = Astro.props;
 const {
+    id,
     name,
+    isCollapsed,
+    collapsedHeight,
 } = Astro.props
 
 ---
-<div class="pb-4 card-base">
-    <div class="font-bold text-lg text-neutral-900 dark:text-neutral-100 transition relative ml-8 mt-4 mb-2
+<widget-layout data-id={id} data-isCollapsed={isCollapsed} class="pb-4 card-base">
+    <div class="font-bold transition text-lg text-neutral-900 dark:text-neutral-100 relative ml-8 mt-4 mb-2
         before:w-1 before:h-4 before:rounded-md before:bg-[var(--primary)]
         before:absolute before:left-[-16px] before:top-[5.5px]">{name}</div>
-    <div class="px-4">
+    <div id={id} class:list={["collapse-wrapper px-4 overflow-hidden", {"collapsed": isCollapsed}]}>
         <slot></slot>
     </div>
-</div>
\ No newline at end of file
+    {isCollapsed && <div class="expand-btn px-4 -mb-2">
+        <Button light class=" w-full rounded-lg" height="36px">
+            <div class="text-[var(--primary)] flex items-center justify-center gap-2 -translate-x-2">
+                <Icon name="material-symbols:more-horiz" size={28}></Icon> {i18n(I18nKey.more)}
+            </div>
+        </Button>
+    </div>}
+</widget-layout>
+
+<style define:vars={{ collapsedHeight }}>
+    .collapsed {
+        height: var(--collapsedHeight);
+    }
+</style>
+
+<script>
+    class WidgetLayout extends HTMLElement {
+        constructor() {
+            super();
+
+            if (!this.dataset.isCollapsed)
+                return;
+
+            const id = this.dataset.id;
+            const btn = this.querySelector('.expand-btn');
+            const wrapper = this.querySelector(`#${id}`)
+            btn.addEventListener('click', () => {
+                wrapper.classList.remove('collapsed');
+                btn.classList.add('hidden');
+            })
+        }
+    }
+
+    customElements.define('widget-layout', WidgetLayout);
+</script>
\ No newline at end of file
diff --git a/src/i18n/i18nKey.ts b/src/i18n/i18nKey.ts
index 347046f..991c219 100644
--- a/src/i18n/i18nKey.ts
+++ b/src/i18n/i18nKey.ts
@@ -21,6 +21,8 @@ enum I18nKey {
     postsCount = "postsCount",
 
     primaryColor = "primaryColor",
+
+    more = "more",
 }
 
 export default I18nKey;
\ No newline at end of file
diff --git a/src/i18n/languages/en.ts b/src/i18n/languages/en.ts
index a155b37..c45f0b4 100644
--- a/src/i18n/languages/en.ts
+++ b/src/i18n/languages/en.ts
@@ -24,4 +24,6 @@ export const en: Translation = {
     [Key.postsCount]: "posts",
 
     [Key.primaryColor]: "Primary Color",
+
+    [Key.more]: "More",
 };
diff --git a/src/i18n/languages/zh_CN.ts b/src/i18n/languages/zh_CN.ts
index 8cffc66..583111c 100644
--- a/src/i18n/languages/zh_CN.ts
+++ b/src/i18n/languages/zh_CN.ts
@@ -24,4 +24,6 @@ export const zh_CN: Translation = {
     [Key.postsCount]: "篇文章",
 
     [Key.primaryColor]: "主题色",
+
+    [Key.more]: "更多",
 };
\ No newline at end of file
diff --git a/src/i18n/languages/zh_TW.ts b/src/i18n/languages/zh_TW.ts
index 2482217..4e9510b 100644
--- a/src/i18n/languages/zh_TW.ts
+++ b/src/i18n/languages/zh_TW.ts
@@ -24,4 +24,6 @@ export const zh_TW: Translation = {
     [Key.postsCount]: "篇文章",
 
     [Key.primaryColor]: "主題色",
+
+    [Key.more]: "更多",
 };
diff --git a/src/pages/page/[page].astro b/src/pages/page/[page].astro
index c34c60f..346b335 100644
--- a/src/pages/page/[page].astro
+++ b/src/pages/page/[page].astro
@@ -1,24 +1,17 @@
 ---
-import { getCollection, getEntry } from "astro:content";
 import MainGridLayout from "../../layouts/MainGridLayout.astro";
 import TitleCard from "../../components/TitleCardNew.astro";
 import Pagination from "../../components/control/Pagination.astro";
-import {getPostUrlBySlug, getSortedPosts} from "../../utils/content-utils";
-import {getConfig} from "../../utils/config-utils";
+import {getSortedPosts} from "../../utils/content-utils";
+import {getPostUrlBySlug} from "../../utils/url-utils";
 
 export async function getStaticPaths({ paginate }) {
-    // const allBlogPosts = await getCollection("posts");
     const allBlogPosts = await getSortedPosts();
     return paginate(allBlogPosts, { pageSize: 6 });
 }
 
 const {page} = Astro.props;
 
-// page.data.map(entry => console.log(entry));
-// console.log(page)
-
-// console.log(getConfig());
-
 ---
 
 <!-- 显示当前页面。也可以使用 Astro.params.page -->
diff --git a/src/pages/posts/[slug].astro b/src/pages/posts/[slug].astro
index 26a3818..093ff90 100644
--- a/src/pages/posts/[slug].astro
+++ b/src/pages/posts/[slug].astro
@@ -4,11 +4,11 @@ import MainGridLayout from "../../layouts/MainGridLayout.astro";
 import ImageBox from "../../components/misc/ImageBox.astro";
 import {Icon} from "astro-icon/components";
 import PostMetadata from "../../components/PostMetadata.astro";
-import {getPostUrlBySlug} from "../../utils/content-utils";
 import Button from "../../components/control/Button.astro";
 import {getConfig} from "../../utils/config-utils";
 import {i18n} from "../../i18n/translation";
 import I18nKey from "../../i18n/i18nKey";
+import {getPostUrlBySlug} from "../../utils/url-utils";
 
 export async function getStaticPaths() {
     const blogEntries = await getCollection('posts');
diff --git a/src/utils/content-utils.ts b/src/utils/content-utils.ts
index a545137..d2afdaa 100644
--- a/src/utils/content-utils.ts
+++ b/src/utils/content-utils.ts
@@ -20,12 +20,6 @@ export async function getSortedPosts() {
     return sorted;
 }
 
-export function getPostUrlBySlug(slug: string): string | null {
-    if (!slug)
-        return null;
-    return `/posts/${slug}`;
-}
-
 export async function getTagList(): Promise<{ name: string; count: number }[]> {
     const allBlogPosts = await getCollection("posts");
 
@@ -52,3 +46,27 @@ export async function getTagList(): Promise<{ name: string; count: number }[]> {
 
     return keys.map((key) => ({name: key, count: countMap[key]}));
 }
+
+type Category = {
+    name: string;
+    count: number;
+    children: CategoryMap;
+}
+
+export type CategoryMap = { [key: string]: Category };
+
+export async function getCategoryMap(): Promise<CategoryMap> {
+    const allBlogPosts = await getCollection("posts");
+    let root: CategoryMap = {};
+    allBlogPosts.map((post) => {
+        let current = root;
+        if (!post.data.categories)
+            return;
+        for (const c of post.data.categories) {
+            if (!current[c]) current[c] = {name: c, count: 0, children: {}};
+            current[c].count++;
+            current = current[c].children;
+        }
+    });
+    return root;
+}
\ No newline at end of file
diff --git a/src/utils/url-utils.ts b/src/utils/url-utils.ts
index 3dfd248..fdbbe3f 100644
--- a/src/utils/url-utils.ts
+++ b/src/utils/url-utils.ts
@@ -3,3 +3,16 @@ export function pathsEqual(path1: string, path2: string) {
     const normalizedPath2 = path2.replace(/^\/|\/$/g, '').toLowerCase();
     return normalizedPath1 === normalizedPath2;
 }
+
+export function getPostUrlBySlug(slug: string): string | null {
+    if (!slug)
+        return null;
+    return `/posts/${slug}`;
+}
+
+export function getCategoryUrl(category: string): string | null {
+    if (!category)
+        return null;
+    return `/archive/category/${category}`;
+}
+