🐛 HeadBar的标题显示@verkfi/core

neila-a · Apr 19, 2024 · 77ecde7 · 77ecde7
1 parent a4626d8
commit 77ecde7
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,7 +40,7 @@ bower_components
 # Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release
 out
-public/service-worker.js
+service-worker.js
 next.config.js
 *.vxt
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@verkfi/core",
  "version": "1.7.0",
- "devVersion": "866",
+ "devVersion": "871",
  "dev": true,
  "description": "Platform for Neila's something useless tools.",
  "private": true,

diff --git a/packages/core/public/index.webmanifest b/packages/core/public/index.webmanifest
@@ -44,7 +44,7 @@
  "url": "/handle?handle=%s"
  }
  ],
- "id": "verkfi",
+ "id": "@verkfi/core",
  "display_override": [
  "window-controls-overlay",
  "fullscreen",

diff --git a/packages/core/public/service-worker.js b/packages/core/public/service-worker.js
diff --git a/packages/core/src/app/components/HeadBar.tsx b/packages/core/src/app/components/HeadBar.tsx
@@ -34,6 +34,7 @@ import {
 import Link from 'next/link';
 import {
  forkMeOnGitHub as forkMeOnGitHubContext,
+ repoInfo,
  share as shareContext,
  showSidebar
 } from 'layout/layoutClient';
@@ -53,7 +54,7 @@ export interface HeadBarOption {
 export default function HeadBar(props: HeadBarOption): JSX.Element {
  const forkMeOnGithub = useContext(forkMeOnGitHubContext),
  router = useRouter(),
- upper = pack.name.charAt(0).toUpperCase() + pack.name.slice(1),
+ upper = useContext(repoInfo).name.charAt(0).toUpperCase() + useContext(repoInfo).name.slice(1),
  share = useContext(shareContext).value,
  noDrag: CSSProperties = {
  // @ts-ignore React的CSSProperties中明明有WebkitAppRegion，但是类型中没有

diff --git a/packages/core/src/app/components/getRepoInfo.tsx b/packages/core/src/app/components/getRepoInfo.tsx
@@ -1,8 +1,9 @@
 import pack from "../../../package.json";
+export interface repoInfo {
+ name: string;
+ description: string;
+};
 export async function getRepoInfo() {
- const repoInfo: {
- name: string;
- description: string;
- } = await (await fetch(`https://api.github.com/repos/${pack.repository.replace("github:", "")}`)).json();
+ const repoInfo: repoInfo = await (await fetch(`https://api.github.com/repos/${pack.repository.replace("github:", "")}`)).json();
  return repoInfo;
 }
diff --git a/packages/core/src/app/layout.tsx b/packages/core/src/app/layout.tsx
@@ -79,6 +79,7 @@ import {
 export default async function Layout({
  children
 }) {
+ const repoInfo = await getRepoInfo();
  return (
  <html lang="zh-cmn-Hans-CN">
  <body style={{
@@ -109,7 +110,7 @@ export default async function Layout({
  minHeight: "100vh"
  }}>
  <Suspense fallback={<Loading />}>
- <BaseLayout>
+ <BaseLayout repoInfo={repoInfo}>
  {children}
  </BaseLayout>
  </Suspense>

diff --git a/packages/core/src/app/layout/layoutClient.tsx b/packages/core/src/app/layout/layoutClient.tsx
@@ -75,6 +75,9 @@ import useExtensions, {
  extensionsDispatch
 } from "./useExtensions";
 import composeProviders from "./providerCompose";
+import {
+ repoInfo as repoInfoType
+ } from "components/getRepoInfo";
 export const showSidebar = createContext<{
  show: boolean;
  set: Dispatch<boolean>;
@@ -154,8 +157,10 @@ export const extensions = createContext<{
  value: single[];
  set: Dispatch<extensionsDispatch>;
 }>(null);
+export const repoInfo = createContext<repoInfoType>(null);
 export default function ModifiedApp(props: {
  children: ReactNode;
+ repoInfo: repoInfoType;
 }) {
  const [mode, setMode] = useStoragedState<PaletteMode | "system">("darkmode", "暗色模式", "system"),
  [realWindows, setRealWindows] = useState<WindowOptions[]>([]),
@@ -195,7 +200,7 @@ export default function ModifiedApp(props: {
  [forkMeOnGitHubState, setForkMeOnGithub] = useStoragedState<boolean>("fork-me-on-github", "Fork me on GitHub", false),
  [shareState, setShare] = useStoragedState<boolean>("share", "分享", isBrowser() ? "share" in navigator : false),
  [colorModeState, setColorModeState] = useStoragedState<boolean>("color", "多彩主页", true),
- Provider = composeProviders([first, {
+ Provider = composeProviders([repoInfo, props.repoInfo],[first, {
  value: firstState,
  set: setFirst
  }], [forkMeOnGitHub, {