@bbki.ng/site 1.0.10 → 1.0.12

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @bbki.ng/site
 
+## 1.0.12
+
+## 1.0.11
+
 ## 1.0.10
 
 ## 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "code behind bbki.ng",
   "main": "index.js",
   "scripts": {
@@ -16,7 +16,7 @@
     "url": "git+https://github.com/bbbottle/bbki.ng.git"
   },
   "dependencies": {
-    "@bbki.ng/components": "workspace:2.1.30",
+    "@bbki.ng/components": "workspace:2.1.31",
     "@supabase/supabase-js": "^1.30.6",
     "classnames": "2.3.1",
     "react": "^18.0.0",

package/src/app.tsx

@@ -49,7 +49,7 @@ export const App = () => {
   return (
     <SWR>
       <HotKeyNav>
-        <Stickers />
+        {/*<Stickers />*/}
         <GlobalLoadingStateProvider>
           <Routes>
             <Route path="/" element={<Layout />}>

package/src/articles/index.ts

@@ -1,11 +1,6 @@
-import * as 说明书 from "./bbking-manual.mdx";
 import * as 回暖 from "./warming-up.mdx";
-import * as 可以攻玉 from "./quote.mdx";
 import * as 离开 from "./travel.mdx";
 import * as 降温 from "./cooldown.mdx";
-import * as 与或非禁区 from "./anti-logic.mdx";
-import * as 没有女人的男人们 from "./men-without-women.mdx";
-import * as 一天计划 from "./movie-day.mdx";
 import * as 大雪 from "./fall.mdx";
 import * as 大寒 from "./major-cold.mdx";
 import * as 春雨 from "./spring-rain.mdx";
@@ -13,9 +8,6 @@ import * as 春寒 from "./spring-cooldown.mdx";
 import * as 入夏 from "./web-burnning.mdx";
 import * as 六月 from "./black-river.mdx";
 import * as 立秋 from "./liqiu.mdx";
-import * as 春风模拟 from "./pseudo-spring.mdx";
-import * as 庆典 from "./celebration.mdx";
-import * as 爱情 from "./love.mdx";
 import * as 照片 from "./photos.mdx";
 import * as 小乌鸦 from "./xwy.mdx";
 import * as 我要看雪 from "./xwy-and-snowing.mdx";
@@ -30,13 +22,8 @@ import * as 站一下 from "./moment.mdx";
 import * as 干衣服 from "./cloth.mdx";
 
 export const MdxArticleList = [
-  说明书,
-  与或非禁区,
-  可以攻玉,
   离开,
   降温,
-  没有女人的男人们,
-  一天计划,
   大雪,
   大寒,
   回暖,
@@ -45,9 +32,6 @@ export const MdxArticleList = [
   入夏,
   六月,
   立秋,
-  春风模拟,
-  庆典,
-  爱情,
   照片,
   小乌鸦,
   我要看雪,

package/src/constants/routes.ts

@@ -12,7 +12,8 @@ export const ROUTE_NAME = {
   unknown: "未知",
 };
 
-export const GITHUB_REPO_ADDRESS = "https://github.com/bbbottle/bottle/tree/main/packages/site";
+export const GITHUB_REPO_ADDRESS =
+  "https://github.com/bbbottle/bottle/tree/main/packages/site";
 export const OSS_ADDRESS = "https://zjh-im-res.oss-cn-shenzhen.aliyuncs.com";
 export const API_ENDPOINT = "https://api.bbki.ng";
 export const API = {
@@ -21,4 +22,5 @@ export const API = {
   MOVIES: "movies",
   IMAGES: "images",
   BOOKS: "books",
+  POSTS: "posts",
 };

package/src/hooks/use_posts.ts

@@ -0,0 +1,34 @@
+import { API } from "@/constants/routes";
+import useSWR from "swr";
+import { useContext, useEffect } from "react";
+import { GlobalLoadingContext } from "@/global_loading_state_provider";
+
+export const usePosts = (name: string = "", suspense?: boolean) => {
+  const { data, error } = useSWR(API.POSTS, {
+    revalidateOnFocus: false,
+    suspense,
+  });
+
+  let isLoading = !data && !error;
+  const { setIsLoading } = useContext(GlobalLoadingContext);
+  const titleList = isLoading
+    ? []
+    : data.map((p: any) => ({
+        name: p.title,
+        to: p.title,
+      }));
+
+  useEffect(() => {
+    setIsLoading(isLoading);
+  }, [isLoading]);
+
+  const posts =
+    isLoading || name == "" ? data : data.find((p: any) => p.title == name);
+
+  return {
+    posts: posts,
+    titleList,
+    isError: error,
+    isLoading: !data && !error,
+  };
+};

package/src/pages/cover/index.tsx

@@ -1,10 +1,20 @@
 import React from "react";
-import { Article } from "@bbki.ng/components";
+import { LinkList } from "@bbki.ng/components";
 
 export const Cover = (props: { className: string }) => {
   return (
-    <Article title="">
-      <div className="bg-white">This page intentionally left blank</div>
-    </Article>
+    <LinkList
+      links={[
+        {
+          to: "/projects",
+          name: "cd /projects",
+        },
+        {
+          to: "/blog",
+          name: "cd /posts",
+        },
+      ]}
+      title="history"
+    />
   );
 };

package/src/pages/extensions/txt/article.tsx

@@ -4,6 +4,8 @@ import { withArticleWrapper } from "@/components";
 import { MdxArticle } from "@/types/articles";
 import { Article, NotFound } from "@bbki.ng/components";
 import { useParams } from "react-router-dom";
+import { usePosts } from "@/hooks/use_posts";
+import { ArticlePage } from "@/components/article";
 
 type TArticleMap = {
   [key: string]: ReactElement;
@@ -19,8 +21,23 @@ MdxArticleList.forEach((article: unknown) => {
 
 export default () => {
   const { title } = useParams();
-  if (!title || !ArticleMap[title]) {
+  const { posts, isError, isLoading } = usePosts(title);
+
+  if (!title) {
     return <NotFound />;
   }
-  return ArticleMap[title];
+
+  if (ArticleMap[title]) {
+    return ArticleMap[title];
+  }
+
+  if (isError) {
+    return <NotFound />;
+  }
+
+  if (isLoading) {
+    return null;
+  }
+
+  return <ArticlePage title={title}>{posts.content}</ArticlePage>;
 };

package/src/pages/extensions/txt/index.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 import { ArticleList } from "./consts";
-// import Tags from "@/pages/tags";
 import { LinkList, LinkProps } from "@bbki.ng/components";
 import { useRouteName } from "@/hooks";
+import { usePosts } from "@/hooks/use_posts";
 
 type TxtProps = {
   title?: string;
@@ -11,11 +11,12 @@ type TxtProps = {
 
 export default (props: TxtProps) => {
   const name = useRouteName();
+  const { titleList, isLoading, isError } = usePosts();
+
+  const links =
+    isError || isLoading ? ArticleList : [...ArticleList, ...titleList];
+
   return (
-    <LinkList
-      links={props.articleList || ArticleList}
-      title={props.title || name}
-      // description={<Tags inline className="ml-0" withAll />}
-    />
+    <LinkList links={props.articleList || links} title={props.title || name} />
   );
 };