fix(web): console scroll height

labring · Apr 12, 2023 · fc78e14 · fc78e14
1 parent 4e3be22
commit fc78e14
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 12 deletions.
diff --git a/web/src/components/Editor/JSONViewer.tsx b/web/src/components/Editor/JSONViewer.tsx
@@ -5,6 +5,7 @@ type JSONViewerProps = {
   language?: string;
   showNumber?: boolean;
   colorMode?: string;
+  className?: string;
 };
 
 const JSONViewerStyle: any = {
@@ -235,7 +236,7 @@ const JSONViewerDarkStyle: any = {
   },
 };
 export default function JSONViewer(props: JSONViewerProps) {
-  const { code, language = "json", colorMode = "light" } = props;
+  const { code, language = "json", colorMode = "light", ...rest } = props;
   const lightTheme = { background: "#fdfdfe" };
   const darkTheme = {
     background: "#202631",
@@ -248,6 +249,7 @@ export default function JSONViewer(props: JSONViewerProps) {
         maxHeight: 390,
         overflow: "auto",
       }}
+      {...rest}
     >
       <SyntaxHighlighter
         language={language}

diff --git a/web/src/components/EmptyBox/index.tsx b/web/src/components/EmptyBox/index.tsx
@@ -10,7 +10,7 @@ export default function EmptyBox(props: {
 }) {
   const { children, hideIcon, className } = props;
   return (
-    <Center className={clsx("h-full w-full flex-col", className)}>
+    <Center className={clsx("h-full w-full flex-1 flex-col", className)}>
       {hideIcon ? null : (
         <Icon
           width="150"

diff --git a/web/src/pages/app/functions/mods/ConsolePanel/index.tsx b/web/src/pages/app/functions/mods/ConsolePanel/index.tsx
@@ -31,7 +31,10 @@ function ConsolePanel() {
   return (
     <Panel className="flex-1">
       <Panel.Header title="Console"></Panel.Header>
-      <div className="text-sm relative overflow-y-auto px-2 font-mono " style={{ height: "100%" }}>
+      <div
+        className="text-sm relative flex flex-col overflow-y-auto px-2 font-mono"
+        style={{ height: "100%" }}
+      >
         {currentRequestId && (
           <p className="mb-1 ml-1">
             RequestID: {currentRequestId} <CopyText text={String(currentRequestId)} />

diff --git a/web/src/pages/homepage/footer.tsx b/web/src/pages/homepage/footer.tsx
@@ -139,10 +139,28 @@ const Footer = (props: Props) => {
           <div className="mt-4 flex justify-between">
             <div className="w-1/2 text-lg text-[#14171F]">
               <div className="leading-8 text-[#5E6987]">{t("HomePage.Footer.product")}</div>
-              <ul className="leading-8">
+              <ul className="mb-4 leading-8">
                 <li>
                   <a href={String(t(`HomePage.LafLink`))}>{t("HomePage.Footer.item1_1")}</a>
                 </li>
+                <li>
+                  <a
+                    href="https://github.com/labring/laf/releases"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    {t("HomePage.Footer.item1_3")}
+                  </a>
+                </li>
+                <li>
+                  <a
+                    href="https://marketplace.visualstudio.com/items?itemName=NightWhite.laf-assistant"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    {t("HomePage.Footer.item1_4")}
+                  </a>
+                </li>
                 <li>
                   <a
                     href="https://github.com/labring/laf/releases"
@@ -200,6 +218,11 @@ const Footer = (props: Props) => {
                     {t("HomePage.Footer.item2_4")}
                   </a>
                 </li>
+                <li>
+                  <a href={String(t("HomePage.DocsLink"))} target="_blank" rel="noreferrer">
+                    {t("HomePage.Footer.item2_5")}
+                  </a>
+                </li>
               </ul>
             </div>
           </div>

diff --git a/web/src/pages/homepage/navbar.tsx b/web/src/pages/homepage/navbar.tsx
@@ -172,15 +172,10 @@ const Navbar = (props: Props) => {
             aria-labelledby="dropdownDefaultButton"
           >
             <div>
-              <li>
-                <a href="/homepage/" className="block px-4 py-2 hover:bg-gray-100 ">
-                  主页
-                </a>
-              </li>
               <li>
                 <a
                   target="_blank"
-                  href="https://docs.laf.dev"
+                  href={String(t("HomePage.DocsLink"))}
                   className="block px-4 py-2 hover:bg-gray-100"
                   rel="noreferrer"
                 >
@@ -219,9 +214,9 @@ const Navbar = (props: Props) => {
                 </a>
               ) : null}
 
-              <a href="#" className="flex px-4 py-2 hover:bg-gray-100 ">
+              <div className="flex px-4 py-2 hover:bg-gray-100 ">
                 <Language />
-              </a>
+              </div>
             </div>
           </ul>
         </div>