We use cookies to ensure you get the best experience on our website
首页 发现 帮助
注册 登录
0ct0pu5
/
ConvertX
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

feat: show version in footer

Co-authored-by: thejjw <72130076+thejjw@users.noreply.github.com>
C4illin 2 月之前
父节点
d9076bf42a
当前提交
9a49dedaca
共有 2 个文件被更改，包括 70 次插入 和 60 次删除
合并视图 显示文件统计
  1. 58 40
      src/components/base.tsx
  2. 12 20
      src/index.tsx

+ 58 - 40
src/components/base.tsx
查看文件 

@@ -1,40 +1,58 @@
 
-import { Html } from "@elysiajs/html";

-

-export const BaseHtml = ({

-  children,

-  title = "ConvertX",

-  webroot = "",

-}: {

-  children: JSX.Element;

-  title?: string;

-  webroot?: string;

-}) => (

-  <html lang="en">

-    <head>

-      <meta charset="UTF-8" />

-      <meta name="viewport" content="width=device-width, initial-scale=1.0" />

-      <meta name="webroot" content={webroot} />

-      <title safe>{title}</title>

-      <link rel="stylesheet" href={`${webroot}/generated.css`} />

-      <link

-        rel="apple-touch-icon"

-        sizes="180x180"

-        href={`${webroot}/apple-touch-icon.png`}

-      />

-      <link

-        rel="icon"

-        type="image/png"

-        sizes="32x32"

-        href={`${webroot}/favicon-32x32.png`}

-      />

-      <link

-        rel="icon"

-        type="image/png"

-        sizes="16x16"

-        href={`${webroot}/favicon-16x16.png`}

-      />

-      <link rel="manifest" href={`${webroot}/site.webmanifest`} />

-    </head>

-    <body class="w-full bg-neutral-900 text-neutral-200">{children}</body>

-  </html>

-);

+import { Html } from "@elysiajs/html";
 
+import { version } from "../../package.json";
 
+
 
+export const BaseHtml = ({
 
+  children,
 
+  title = "ConvertX",
 
+  webroot = "",
 
+}: {
 
+  children: JSX.Element;
 
+  title?: string;
 
+  webroot?: string;
 
+}) => (
 
+  <html lang="en">
 
+    <head>
 
+      <meta charset="UTF-8" />
 
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+      <meta name="webroot" content={webroot} />
 
+      <title safe>{title}</title>
 
+      <link rel="stylesheet" href={`${webroot}/generated.css`} />
 
+      <link
 
+        rel="apple-touch-icon"
 
+        sizes="180x180"
 
+        href={`${webroot}/apple-touch-icon.png`}
 
+      />
 
+      <link
 
+        rel="icon"
 
+        type="image/png"
 
+        sizes="32x32"
 
+        href={`${webroot}/favicon-32x32.png`}
 
+      />
 
+      <link
 
+        rel="icon"
 
+        type="image/png"
 
+        sizes="16x16"
 
+        href={`${webroot}/favicon-16x16.png`}
 
+      />
 
+      <link rel="manifest" href={`${webroot}/site.webmanifest`} />
 
+    </head>
 
+    <body class="flex min-h-screen w-full flex-col bg-neutral-900 text-neutral-200">
 
+      {children}
 
+      <footer class="w-full">
 
+        <div class="p-4 text-center text-sm text-neutral-500">
 
+          <span>Powered by </span>
 
+          <a
 
+            href="https://github.com/C4illin/ConvertX"
 
+            class={`
 
+              hover:text-accent-500
 
+              text-neutral-400
 
+            `}
 
+          >
 
+            ConvertX{" "}
 
+          </a>
 
+          <span safe>v{version || ""}</span>
 
+        </div>
 
+      </footer>
 
+    </body>
 
+  </html>
 
+);

+ 12 - 20
src/index.tsx
查看文件 

@@ -135,18 +135,6 @@ const app = new Elysia({
 
       prefix: "",
 
       prefix: "",
 
     }),
 
     }),
 
   )
 
   )
 
-  .get("/test", () => {
 
-    return (
 
-      <html lang="en">
 
-        <head>
 
-          <title>Hello World</title>
 
-        </head>
 
-        <body>
 
-          <h1>Hello</h1>
 
-        </body>
 
-      </html>
 
-    );
 
-  })
 
   .get("/setup", ({ redirect }) => {
 
   .get("/setup", ({ redirect }) => {
 
     if (!FIRST_RUN) {
 
     if (!FIRST_RUN) {
 
       return redirect(`${WEBROOT}/login`, 302);
 
       return redirect(`${WEBROOT}/login`, 302);
 
@@ -156,7 +144,7 @@ const app = new Elysia({
 
       <BaseHtml title="ConvertX | Setup" webroot={WEBROOT}>
 
       <BaseHtml title="ConvertX | Setup" webroot={WEBROOT}>
 
         <main
 
         <main
 
           class={`
 
           class={`
 
-            mx-auto w-full max-w-4xl px-2
 
+            mx-auto w-full max-w-4xl flex-1 px-2
 
             sm:px-4
 
             sm:px-4
 
           `}
 
           `}
 
         >
 
         >
 
@@ -222,10 +210,11 @@ const app = new Elysia({
 
             webroot={WEBROOT}
 
             webroot={WEBROOT}
 
             accountRegistration={ACCOUNT_REGISTRATION}
 
             accountRegistration={ACCOUNT_REGISTRATION}
 
             allowUnauthenticated={ALLOW_UNAUTHENTICATED}
 
             allowUnauthenticated={ALLOW_UNAUTHENTICATED}
 
+            hideHistory={HIDE_HISTORY}
 
           />
 
           />
 
           <main
 
           <main
 
             class={`
 
             class={`
 
-              w-full px-2
 
+              w-full flex-1 px-2
 
               sm:px-4
 
               sm:px-4
 
             `}
 
             `}
 
           >
 
           >
 
@@ -357,7 +346,7 @@ const app = new Elysia({
 
           />
 
           />
 
           <main
 
           <main
 
             class={`
 
             class={`
 
-              w-full px-2
 
+              w-full flex-1 px-2
 
               sm:px-4
 
               sm:px-4
 
             `}
 
             `}
 
           >
 
           >
 
@@ -502,10 +491,11 @@ const app = new Elysia({
 
             accountRegistration={ACCOUNT_REGISTRATION}
 
             accountRegistration={ACCOUNT_REGISTRATION}
 
             allowUnauthenticated={ALLOW_UNAUTHENTICATED}
 
             allowUnauthenticated={ALLOW_UNAUTHENTICATED}
 
             hideHistory={HIDE_HISTORY}
 
             hideHistory={HIDE_HISTORY}
 
+            loggedIn
 
           />
 
           />
 
           <main
 
           <main
 
             class={`
 
             class={`
 
-              w-full px-2
 
+              w-full flex-1 px-2
 
               sm:px-4
 
               sm:px-4
 
             `}
 
             `}
 
           >
 
           >
 
@@ -727,12 +717,14 @@ const app = new Elysia({
 
         <>
 
         <>
 
           <Header
 
           <Header
 
             webroot={WEBROOT}
 
             webroot={WEBROOT}
 
+            accountRegistration={ACCOUNT_REGISTRATION}
 
             allowUnauthenticated={ALLOW_UNAUTHENTICATED}
 
             allowUnauthenticated={ALLOW_UNAUTHENTICATED}
 
+            hideHistory={HIDE_HISTORY}
 
             loggedIn
 
             loggedIn
 
           />
 
           />
 
           <main
 
           <main
 
             class={`
 
             class={`
 
-              w-full px-2
 
+              w-full flex-1 px-2
 
               sm:px-4
 
               sm:px-4
 
             `}
 
             `}
 
           >
 
           >
 
@@ -1155,7 +1147,7 @@ const app = new Elysia({
 
           />
 
           />
 
           <main
 
           <main
 
             class={`
 
             class={`
 
-              w-full px-2
 
+              w-full flex-1 px-2
 
               sm:px-4
 
               sm:px-4
 
             `}
 
             `}
 
           >
 
           >
 
@@ -1289,7 +1281,7 @@ const app = new Elysia({
 
             />
 
             />
 
             <main
 
             <main
 
               class={`
 
               class={`
 
-                w-full px-2
 
+                w-full flex-1 px-2
 
                 sm:px-4
 
                 sm:px-4
 
               `}
 
               `}
 
             >
 
             >
 
@@ -1604,7 +1596,7 @@ const app = new Elysia({
 
           />
 
           />
 
           <main
 
           <main
 
             class={`
 
             class={`
 
-              w-full px-2
 
+              w-full flex-1 px-2
 
               sm:px-4
 
               sm:px-4
 
             `}
 
             `}
 
           >
 
           >

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5