@bbki.ng/site 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @bbki.ng/site
 
+## 1.1.2
+
 ## 1.1.1
 
 ## 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "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.33",
+    "@bbki.ng/components": "workspace:2.1.34",
     "@supabase/supabase-js": "^1.30.6",
     "classnames": "2.3.1",
     "react": "^18.0.0",

package/src/app.tsx

@@ -1,6 +1,6 @@
 import React, { useContext } from "react";
 import { Routes, Route, Outlet } from "react-router-dom";
-import { Nav, Page, NotFound } from "@bbki.ng/components";
+import { Nav, Page, NotFound, Link } from "@bbki.ng/components";
 import { HotKeyNav, Stickers } from "./components";
 import { threeColWrapper } from "@/components/with_wrapper";
 import { Cover } from "./pages";
@@ -21,6 +21,7 @@ import {
   GlobalLoadingStateProvider,
 } from "@/global_loading_state_provider";
 import { UploadPage } from "@/pages/upload";
+import { Footer } from "@/components/Footer";
 
 const Layout = () => {
   const { isLoading } = useContext(GlobalLoadingContext);
@@ -31,7 +32,7 @@ const Layout = () => {
           <Nav paths={usePaths()} className="blur-cover" loading={isLoading} />
         }
         main={<Outlet />}
-        footer={null}
+        footer={<Footer />}
       />
     </>
   );

package/src/components/Footer.tsx

@@ -0,0 +1,26 @@
+import React, { useContext } from "react";
+import { Link } from "@bbki.ng/components";
+import { useLocation } from "react-router-dom";
+import { usePaths } from "@/hooks";
+import { GlobalLoadingContext } from "@/global_loading_state_provider";
+
+export const Footer = () => {
+  const location = useLocation();
+  const isRoot = location.pathname === "/";
+  const { isLoading } = useContext(GlobalLoadingContext);
+
+  if (isRoot || isLoading) {
+    return;
+  }
+
+  const paths = usePaths();
+  const prevPath = paths[paths.length - 2];
+
+  return (
+    <div className="w-full flex justify-center md:hidden">
+      <Link to={prevPath.path || ""} className="text-center">
+        cd ..
+      </Link>
+    </div>
+  );
+};

package/src/components/index.tsx

@@ -1,4 +1,5 @@
-export { Footer } from "./footer";
+import React from "react";
+import { LinkList } from "@bbki.ng/components";
 
 export { DisabledText, SmallDisabledText } from "./disabled_text";
 
@@ -25,3 +26,11 @@ export { Tags } from "./tags";
 export { Comment } from "./comment";
 
 export { MySuspense } from "./my_suspense";
+
+export const CenterLinkList = (props: any) => {
+  return (
+    <div className="flex justify-center pr-32">
+      <LinkList {...props} />
+    </div>
+  );
+};

package/src/global_loading_state_provider.tsx

@@ -20,11 +20,6 @@ export const GlobalLoadingContext = createContext<LoadingContext>({
 
 export const GlobalLoadingStateProvider = (props: { children: ReactNode }) => {
   const [isLoading, setIsLoading] = useState(false);
-  const location = useLocation();
-
-  useEffect(() => {
-    setIsLoading(false);
-  }, [location.pathname]);
 
   return (
     <GlobalLoadingContext.Provider value={{ isLoading, setIsLoading }}>

package/src/pages/cover/index.tsx

@@ -1,9 +1,10 @@
 import React from "react";
 import { LinkList } from "@bbki.ng/components";
+import { CenterLinkList } from "@/components";
 
 export const Cover = (props: { className: string }) => {
   return (
-    <LinkList
+    <CenterLinkList
       links={[
         {
           to: "/projects",

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

@@ -1,7 +1,7 @@
 import React from "react";
 import { useProjects } from "@/hooks/use_projects";
 import { Link, Gallery, ImageRenderer, LinkList } from "@bbki.ng/components";
-import { MySuspense } from "@/components";
+import { CenterLinkList, MySuspense } from "@/components";
 
 const Projects = () => {
   const { projects } = useProjects("", true);
@@ -11,7 +11,7 @@ const Projects = () => {
     name: p.name,
   }));
 
-  return <LinkList links={links} title="照片" />;
+  return <CenterLinkList links={links} title=" " />;
 };
 
 export default () => {

package/src/pages/extensions/png/png_projects.tsx

@@ -30,11 +30,6 @@ const ProjectDetail = () => {
       <Gallery images={projects.images.map(imageFormatter)}>
         {renderUploader()}
       </Gallery>
-      <div className="w-full flex justify-center">
-        <Link to="/projects" className="w-full py-32 md:hidden text-center">
-          cd ..
-        </Link>
-      </div>
     </>
   );
 };

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

@@ -3,6 +3,7 @@ import { ArticleList } from "./consts";
 import { LinkList, LinkProps } from "@bbki.ng/components";
 import { useRouteName } from "@/hooks";
 import { usePosts } from "@/hooks/use_posts";
+import { CenterLinkList } from "@/components";
 
 type TxtProps = {
   title?: string;
@@ -13,10 +14,17 @@ export default (props: TxtProps) => {
   const name = useRouteName();
   const { titleList, isLoading, isError } = usePosts();
 
-  const links =
-    isError || isLoading ? ArticleList : [...ArticleList, ...titleList];
+  if (isLoading) {
+    return null;
+  }
 
-  return (
-    <LinkList links={props.articleList || links} title={props.title || name} />
-  );
+  if (isError) {
+    return (
+      <CenterLinkList links={props.articleList || ArticleList} title=" " />
+    );
+  }
+
+  const links = [...ArticleList, ...titleList];
+
+  return <CenterLinkList links={props.articleList || links} title=" " />;
 };