From e010df8bc9c03684383aef3cb6e2765bf06e6d31 Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Tue, 5 Apr 2022 20:16:44 +0800
Subject: [PATCH 01/11] feat: global and meta readme

---
 src/pages/list/context.tsx      |  4 ++-
 src/pages/list/layout/index.tsx | 49 ++++++++++++++++-----------------
 src/pages/manage/metas.tsx      |  7 +++++
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/pages/list/context.tsx b/src/pages/list/context.tsx
index 9917adc..94b1b60 100644
--- a/src/pages/list/context.tsx
+++ b/src/pages/list/context.tsx
@@ -36,6 +36,7 @@ export interface Meta {
   driver: string;
   upload: boolean;
   total: number;
+  readme: string;
 }
 
 export interface PathResp {
@@ -132,7 +133,7 @@ export const IContext = createContext<ContextProps>({
   selectFiles: [],
   setSelectFiles: () => {},
   setType: () => {},
-  meta: { driver: "", upload: false, total: 0 },
+  meta: { driver: "", upload: false, total: 0, readme: "" },
   setMeta: () => {},
   loggedIn: false,
   page: { page_num: 1, page_size: 30 },
@@ -263,6 +264,7 @@ const IContextProvider = (props: any) => {
     driver: "",
     upload: false,
     total: 0,
+    readme: "",
   });
   const [loggedIn, setLoggedIn] = React.useState<boolean>(false);
   if (!settingLoaded) {
diff --git a/src/pages/list/layout/index.tsx b/src/pages/list/layout/index.tsx
index 2d55915..f8b84d0 100644
--- a/src/pages/list/layout/index.tsx
+++ b/src/pages/list/layout/index.tsx
@@ -1,14 +1,7 @@
-import React, {
-  lazy,
-  Suspense,
-  useContext,
-  useEffect,
-  useMemo,
-} from "react";
+import React, { lazy, Suspense, useContext, useEffect, useMemo } from "react";
 import {
   Box,
   useColorModeValue,
-  
   Spinner,
   Center,
   VStack,
@@ -21,7 +14,7 @@ import Nav from "./nav";
 import Error from "./error";
 import Markdown from "../preview/markdown";
 import Overlay from "../../../components/overlay";
-import { IContext,File as File_ } from "../context";
+import { IContext, File as File_ } from "../context";
 
 const Files = lazy(() => import("./files"));
 const File = lazy(() => import("./file"));
@@ -29,7 +22,7 @@ const File = lazy(() => import("./file"));
 const KuttyHero = () => {
   // console.log("KuttyHero");
   const bgColor = useColorModeValue("white", "gray.700");
-  
+
   const { t } = useTranslation();
   const {
     getSetting,
@@ -39,30 +32,34 @@ const KuttyHero = () => {
     type,
     msg,
     files,
+    meta,
   } = useContext(IContext);
 
   const readme = useMemo(() => {
     if (type === "file") {
       return undefined;
     }
+    const readmeFile: File_ = {
+      name: "README.md",
+      size: 0,
+      type: -1,
+      driver: "local",
+      updated_at: "",
+      thumbnail: "",
+      url: meta.readme,
+    };
+    if (meta.readme) {
+      return readmeFile;
+    }
     const file = files.find((file) => file.name.toLowerCase() === "readme.md");
-    if (
-      file === undefined &&
-      location.pathname === "/" &&
-      getSetting("home readme url")
-    ) {
-      const homeReadmeFile: File_ = {
-        name: "README.md",
-        size: 0,
-        type: -1,
-        driver: "local",
-        updated_at: "",
-        thumbnail: "",
-        url: getSetting("home readme url"),
-      };
-      return homeReadmeFile;
+    if (file) {
+      return file;
+    }
+    if (getSetting("global readme url")) {
+      readmeFile.url = getSetting("global readme url");
+      return readmeFile;
     }
-    return file;
+    return undefined;
   }, [files, type, settingLoaded]);
 
   return (
diff --git a/src/pages/manage/metas.tsx b/src/pages/manage/metas.tsx
index ce6f7e8..01d1581 100644
--- a/src/pages/manage/metas.tsx
+++ b/src/pages/manage/metas.tsx
@@ -39,6 +39,7 @@ export interface Meta {
   hide: string;
   upload: boolean;
   only_shows: string;
+  readme: string;
 }
 
 const EmptyMeta = {
@@ -48,6 +49,7 @@ const EmptyMeta = {
   hide: "",
   upload: false,
   only_shows: "",
+  readme: "",
 };
 
 const Metas = () => {
@@ -213,6 +215,11 @@ const Metas = () => {
                   description: "Allow visitors to upload",
                   type: "bool",
                 },
+                {
+                  name: "readme",
+                  description: "Readme url",
+                  type: "string",
+                }
               ].map((item) => {
                 return (
                   <FormItem

From 55135917efb9062f961a7b0b8e4aa89148471b5c Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Fri, 8 Apr 2022 19:57:35 +0800
Subject: [PATCH 02/11] feat: add search button

---
 src/pages/list/layout/header.tsx | 200 +++++++++++++++----------------
 src/pages/list/layout/search.tsx |  88 ++++++++++++++
 2 files changed, 188 insertions(+), 100 deletions(-)
 create mode 100644 src/pages/list/layout/search.tsx

diff --git a/src/pages/list/layout/header.tsx b/src/pages/list/layout/header.tsx
index de55872..67f9c17 100644
--- a/src/pages/list/layout/header.tsx
+++ b/src/pages/list/layout/header.tsx
@@ -9,8 +9,9 @@ import {
   Tooltip,
   useColorModeValue,
   Box,
+  SlideFade,
 } from "@chakra-ui/react";
-import React, { useContext, useRef } from "react";
+import React, { useContext, useRef, useState } from "react";
 import { IContext } from "../context";
 import { FaListUl } from "react-icons/fa";
 // import { AiTwotoneCopy } from "react-icons/ai";
@@ -25,6 +26,7 @@ import { Link, useLocation } from "react-router-dom";
 import { copyToClip } from "../../../utils/copy-clip";
 import useFileUrl from "../../../hooks/useFileUrl";
 import Uploader, { UploaderHandle } from "./uploader";
+import Search from "./search";
 
 const Header = () => {
   const { t } = useTranslation();
@@ -46,16 +48,14 @@ const Header = () => {
     logos.split(",").shift(),
     logos.split(",").pop()
   ) as string;
-  const { pathname } = useLocation();
   const uploadRef = useRef<UploaderHandle>(null);
+  const [isSearch, setIsSearch] = useState(false);
   return (
     <Flex className="header" px="2" py="2" justify="space-between" w="full">
       <Link to="/" className="logo">
         {logo.includes("http") ? (
           <Image
-            fallback={
-              <Spinner color={getSetting("icon color") || "#1890ff"} />
-            }
+            fallback={<Spinner color={getSetting("icon color") || "#1890ff"} />}
             rounded="lg"
             h="44px"
             w="auto"
@@ -66,113 +66,113 @@ const Header = () => {
         )}
       </Link>
       <HStack className="buttons" spacing="2">
-        {type === "file" && (
-          <Tooltip
-            shouldWrapChildren
-            hasArrow
-            placement="bottom"
-            label={t("Download")}
-          >
-            <Icon
-              cursor="pointer"
-              boxSize={6}
-              as={BsFillArrowDownCircleFill}
-              onClick={() => {
-                if (type === "file") {
-                  let url = fileUrl();
-                  window.open(url, "_blank");
-                  return;
-                }
-                // if (multiSelect) {
-                //   downPack(selectFiles);
-                //   return;
-                // }
-                // if (type === "folder") {
-                //   downPack(files);
-                //   return;
-                // }
-              }}
-            />
-          </Tooltip>
-        )}
-        {type === "folder" &&
-          !getSetting("no upload").split(",").includes(meta.driver) &&
-          (meta.upload || loggedIn) && (
-            <Box>
+        {type === "folder" && <Search isSearch={isSearch} setIsSearch={setIsSearch} />}
+        {!isSearch&&<SlideFade in={!isSearch} offsetX="20px" offsetY={0}>
+          <HStack spacing="2">
+            {type === "file" && (
               <Tooltip
                 shouldWrapChildren
                 hasArrow
                 placement="bottom"
-                label={t("Upload file")}
+                label={t("Download")}
               >
                 <Icon
                   cursor="pointer"
                   boxSize={6}
-                  as={BsFillArrowUpCircleFill}
+                  as={BsFillArrowDownCircleFill}
                   onClick={() => {
-                    uploadRef.current!.upload();
+                    if (type === "file") {
+                      let url = fileUrl();
+                      window.open(url, "_blank");
+                      return;
+                    }
                   }}
                 />
               </Tooltip>
-              <Uploader ref={uploadRef} />
-            </Box>
-          )}
-        {type !== "error" && (
-          <Tooltip
-            shouldWrapChildren
-            hasArrow
-            placement="bottom"
-            label={t("Copy direct link")}
-          >
-            <Icon
-              cursor="pointer"
-              boxSize={6}
-              as={IoIosCopy}
-              onClick={() => {
-                let content = "";
-                if (type === "file") {
-                  content = fileUrl();
-                } else {
-                  let files_ = files;
-                  if (multiSelect) {
-                    files_ = selectFiles;
-                  }
-                  content = files_
-                    .filter((file) => file.type !== 1)
-                    .map((file) => {
-                      return fileUrl(file);
-                    })
-                    .join("\n");
-                }
-                copyToClip(content);
-                toast({
-                  title: t("Copied"),
-                  status: "success",
-                  duration: 3000,
-                  isClosable: true,
-                });
-              }}
-            />
-          </Tooltip>
-        )}
-        <Tooltip
-          shouldWrapChildren
-          hasArrow
-          placement="bottom"
-          label={t("switch to layout view", {
-            layout: t(show === "list" ? "grid" : "list"),
-          })}
-        >
-          <Icon
-            boxSize={6}
-            cursor="pointer"
-            onClick={() => {
-              setShow!(show === "list" ? "grid" : "list");
-              localStorage.setItem("show", show === "list" ? "grid" : "list");
-            }}
-            as={show === "list" ? BsFillGridFill : FaListUl}
-          />
-        </Tooltip>
+            )}
+            {type === "folder" &&
+              !getSetting("no upload").split(",").includes(meta.driver) &&
+              (meta.upload || loggedIn) && (
+                <Box>
+                  <Tooltip
+                    shouldWrapChildren
+                    hasArrow
+                    placement="bottom"
+                    label={t("Upload file")}
+                  >
+                    <Icon
+                      cursor="pointer"
+                      boxSize={6}
+                      as={BsFillArrowUpCircleFill}
+                      onClick={() => {
+                        uploadRef.current!.upload();
+                      }}
+                    />
+                  </Tooltip>
+                  <Uploader ref={uploadRef} />
+                </Box>
+              )}
+            {type !== "error" && (
+              <Tooltip
+                shouldWrapChildren
+                hasArrow
+                placement="bottom"
+                label={t("Copy direct link")}
+              >
+                <Icon
+                  cursor="pointer"
+                  boxSize={6}
+                  as={IoIosCopy}
+                  onClick={() => {
+                    let content = "";
+                    if (type === "file") {
+                      content = fileUrl();
+                    } else {
+                      let files_ = files;
+                      if (multiSelect) {
+                        files_ = selectFiles;
+                      }
+                      content = files_
+                        .filter((file) => file.type !== 1)
+                        .map((file) => {
+                          return fileUrl(file);
+                        })
+                        .join("\n");
+                    }
+                    copyToClip(content);
+                    toast({
+                      title: t("Copied"),
+                      status: "success",
+                      duration: 3000,
+                      isClosable: true,
+                    });
+                  }}
+                />
+              </Tooltip>
+            )}
+            <Tooltip
+              shouldWrapChildren
+              hasArrow
+              placement="bottom"
+              label={t("switch to layout view", {
+                layout: t(show === "list" ? "grid" : "list"),
+              })}
+            >
+              <Icon
+                boxSize={6}
+                cursor="pointer"
+                onClick={() => {
+                  setShow!(show === "list" ? "grid" : "list");
+                  localStorage.setItem(
+                    "show",
+                    show === "list" ? "grid" : "list"
+                  );
+                }}
+                as={show === "list" ? BsFillGridFill : FaListUl}
+              />
+            </Tooltip>
+          </HStack>
+        </SlideFade>}
       </HStack>
     </Flex>
   );
diff --git a/src/pages/list/layout/search.tsx b/src/pages/list/layout/search.tsx
new file mode 100644
index 0000000..135bd47
--- /dev/null
+++ b/src/pages/list/layout/search.tsx
@@ -0,0 +1,88 @@
+import { Box, HStack, Icon, Input, Tooltip } from "@chakra-ui/react";
+import React, { useContext, useEffect, useRef, useState } from "react";
+import { IContext } from "../context";
+import { FcSearch } from "react-icons/fc";
+import { useTranslation } from "react-i18next";
+import { useHistory } from "react-router-dom";
+
+interface SearchProps {
+  isSearch: boolean;
+  setIsSearch: (isSearch: boolean) => void;
+}
+
+const Search = (props: SearchProps) => {
+  const inputRef = useRef<HTMLInputElement>(null);
+  const { t } = useTranslation();
+  const { getSetting } = useContext(IContext);
+  const [keyword, setKeyword] = useState("");
+  const search = () => {
+    // console.log(keyword);
+    history.push(`?search=${keyword}`);
+  };
+  const history = useHistory();
+  // if (!getSetting("search")) return null;
+  useEffect(() => {
+    if (props.isSearch) {
+      inputRef.current?.focus();
+    }
+    const switchSearch = (e: KeyboardEvent) => {
+      if (["f", "F"].includes(e.key) && e.ctrlKey) {
+        props.setIsSearch(!props.isSearch);
+        e.preventDefault();
+      }
+    };
+    document.addEventListener("keydown", switchSearch);
+    const cancelSearch = (e: MouseEvent) => {
+      props.setIsSearch(false);
+    };
+    document.addEventListener("click", cancelSearch);
+    return () => {
+      document.removeEventListener("keydown", switchSearch);
+      document.removeEventListener("click", cancelSearch);
+    };
+  }, [props.isSearch]);
+  return (
+    <HStack
+      spacing={2}
+      onClick={(e) => {
+        e.stopPropagation();
+      }}
+    >
+      <Input
+        display={props.isSearch ? "block" : "none"}
+        value={keyword}
+        onKeyUp={(e) => {
+          if (e.key === "Enter") {
+            search();
+          }
+        }}
+        onChange={(e) => {
+          setKeyword(e.target.value);
+        }}
+        ref={inputRef}
+      />
+
+      <Tooltip
+        shouldWrapChildren
+        hasArrow
+        placement="bottom"
+        label={t("Search files")}
+      >
+        <Icon
+          boxSize={7}
+          cursor="pointer"
+          onClick={() => {
+            if (!props.isSearch) {
+              props.setIsSearch(true);
+            } else {
+              search();
+            }
+          }}
+          as={FcSearch}
+        />
+      </Tooltip>
+    </HStack>
+  );
+};
+
+export default Search;

From 13d7b5fc8eff9c23ea29f0481bbe8777ed7e93ec Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Fri, 8 Apr 2022 20:11:27 +0800
Subject: [PATCH 03/11] feat: add search route

---
 src/pages/list/context.tsx              |   3 +-
 src/pages/list/index.tsx                |  17 ++-
 src/pages/list/layout/header.tsx        | 194 ++++++++++++------------
 src/pages/list/layout/index.tsx         |   3 +
 src/pages/list/layout/results/index.tsx |  11 ++
 5 files changed, 131 insertions(+), 97 deletions(-)
 create mode 100644 src/pages/list/layout/results/index.tsx

diff --git a/src/pages/list/context.tsx b/src/pages/list/context.tsx
index 94b1b60..94156ba 100644
--- a/src/pages/list/context.tsx
+++ b/src/pages/list/context.tsx
@@ -69,7 +69,8 @@ type TypeType =
   | "error"
   | "loading"
   | "unauthorized"
-  | "nexting";
+  | "nexting"
+  | "search";
 
 interface Sort {
   orderBy?: "name" | "updated_at" | "size";
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index efd7de7..f4b21dc 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -47,11 +47,14 @@ const Do = (props: any) => {
   const history = useHistory();
   const location = useLocation();
   const toast = useToast();
-  const { path,cancelPath } = useApi();
+  const { path, cancelPath } = useApi();
   const refresh = useSyncCallback(() => {
     if (!settingLoaded) {
       return;
     }
+    if (switchToSearch()) {
+      return;
+    }
     cancelPath();
     console.log("refresh");
     console.log(page);
@@ -159,6 +162,18 @@ const Do = (props: any) => {
   useChangeEffect(() => {
     nextPage();
   }, [page]);
+  const switchToSearch = () => {
+    const query = new URLSearchParams(location.search);
+    const search = query.get("search");
+    if (search) {
+      setType("search");
+      return true;
+    }
+    return false;
+  };
+  useEffect(() => {
+    switchToSearch();
+  }, [location.search]);
   const { isOpen, onClose, onOpen } = useDisclosure();
   const initialRef = React.useRef();
   useEffect(() => {
diff --git a/src/pages/list/layout/header.tsx b/src/pages/list/layout/header.tsx
index 67f9c17..7791570 100644
--- a/src/pages/list/layout/header.tsx
+++ b/src/pages/list/layout/header.tsx
@@ -66,113 +66,117 @@ const Header = () => {
         )}
       </Link>
       <HStack className="buttons" spacing="2">
-        {type === "folder" && <Search isSearch={isSearch} setIsSearch={setIsSearch} />}
-        {!isSearch&&<SlideFade in={!isSearch} offsetX="20px" offsetY={0}>
-          <HStack spacing="2">
-            {type === "file" && (
-              <Tooltip
-                shouldWrapChildren
-                hasArrow
-                placement="bottom"
-                label={t("Download")}
-              >
-                <Icon
-                  cursor="pointer"
-                  boxSize={6}
-                  as={BsFillArrowDownCircleFill}
-                  onClick={() => {
-                    if (type === "file") {
-                      let url = fileUrl();
-                      window.open(url, "_blank");
-                      return;
-                    }
-                  }}
-                />
-              </Tooltip>
-            )}
-            {type === "folder" &&
-              !getSetting("no upload").split(",").includes(meta.driver) &&
-              (meta.upload || loggedIn) && (
-                <Box>
-                  <Tooltip
-                    shouldWrapChildren
-                    hasArrow
-                    placement="bottom"
-                    label={t("Upload file")}
-                  >
-                    <Icon
-                      cursor="pointer"
-                      boxSize={6}
-                      as={BsFillArrowUpCircleFill}
-                      onClick={() => {
-                        uploadRef.current!.upload();
-                      }}
-                    />
-                  </Tooltip>
-                  <Uploader ref={uploadRef} />
-                </Box>
+        {["folder", "search"].includes(type) && (
+          <Search isSearch={isSearch} setIsSearch={setIsSearch} />
+        )}
+        {!isSearch && (
+          <SlideFade in={!isSearch} offsetX="20px" offsetY={0}>
+            <HStack spacing="2">
+              {type === "file" && (
+                <Tooltip
+                  shouldWrapChildren
+                  hasArrow
+                  placement="bottom"
+                  label={t("Download")}
+                >
+                  <Icon
+                    cursor="pointer"
+                    boxSize={6}
+                    as={BsFillArrowDownCircleFill}
+                    onClick={() => {
+                      if (type === "file") {
+                        let url = fileUrl();
+                        window.open(url, "_blank");
+                        return;
+                      }
+                    }}
+                  />
+                </Tooltip>
+              )}
+              {type === "folder" &&
+                !getSetting("no upload").split(",").includes(meta.driver) &&
+                (meta.upload || loggedIn) && (
+                  <Box>
+                    <Tooltip
+                      shouldWrapChildren
+                      hasArrow
+                      placement="bottom"
+                      label={t("Upload file")}
+                    >
+                      <Icon
+                        cursor="pointer"
+                        boxSize={6}
+                        as={BsFillArrowUpCircleFill}
+                        onClick={() => {
+                          uploadRef.current!.upload();
+                        }}
+                      />
+                    </Tooltip>
+                    <Uploader ref={uploadRef} />
+                  </Box>
+                )}
+              {type !== "error" && (
+                <Tooltip
+                  shouldWrapChildren
+                  hasArrow
+                  placement="bottom"
+                  label={t("Copy direct link")}
+                >
+                  <Icon
+                    cursor="pointer"
+                    boxSize={6}
+                    as={IoIosCopy}
+                    onClick={() => {
+                      let content = "";
+                      if (type === "file") {
+                        content = fileUrl();
+                      } else {
+                        let files_ = files;
+                        if (multiSelect) {
+                          files_ = selectFiles;
+                        }
+                        content = files_
+                          .filter((file) => file.type !== 1)
+                          .map((file) => {
+                            return fileUrl(file);
+                          })
+                          .join("\n");
+                      }
+                      copyToClip(content);
+                      toast({
+                        title: t("Copied"),
+                        status: "success",
+                        duration: 3000,
+                        isClosable: true,
+                      });
+                    }}
+                  />
+                </Tooltip>
               )}
-            {type !== "error" && (
               <Tooltip
                 shouldWrapChildren
                 hasArrow
                 placement="bottom"
-                label={t("Copy direct link")}
+                label={t("switch to layout view", {
+                  layout: t(show === "list" ? "grid" : "list"),
+                })}
               >
                 <Icon
-                  cursor="pointer"
                   boxSize={6}
-                  as={IoIosCopy}
+                  cursor="pointer"
                   onClick={() => {
-                    let content = "";
-                    if (type === "file") {
-                      content = fileUrl();
-                    } else {
-                      let files_ = files;
-                      if (multiSelect) {
-                        files_ = selectFiles;
-                      }
-                      content = files_
-                        .filter((file) => file.type !== 1)
-                        .map((file) => {
-                          return fileUrl(file);
-                        })
-                        .join("\n");
-                    }
-                    copyToClip(content);
-                    toast({
-                      title: t("Copied"),
-                      status: "success",
-                      duration: 3000,
-                      isClosable: true,
-                    });
+                    setShow!(show === "list" ? "grid" : "list");
+                    localStorage.setItem(
+                      "show",
+                      show === "list" ? "grid" : "list"
+                    );
                   }}
+                  as={show === "list" ? BsFillGridFill : FaListUl}
                 />
               </Tooltip>
-            )}
-            <Tooltip
-              shouldWrapChildren
-              hasArrow
-              placement="bottom"
-              label={t("switch to layout view", {
-                layout: t(show === "list" ? "grid" : "list"),
-              })}
-            >
-              <Icon
-                boxSize={6}
-                cursor="pointer"
-                onClick={() => {
-                  setShow!(show === "list" ? "grid" : "list");
-                  localStorage.setItem(
-                    "show",
-                    show === "list" ? "grid" : "list"
-                  );
-                }}
-                as={show === "list" ? BsFillGridFill : FaListUl}
-              />
-            </Tooltip>
-          </HStack>
-        </SlideFade>}
+            </HStack>
+          </SlideFade>
+        )}
       </HStack>
     </Flex>
   );
diff --git a/src/pages/list/layout/index.tsx b/src/pages/list/layout/index.tsx
index f8b84d0..a7cf03f 100644
--- a/src/pages/list/layout/index.tsx
+++ b/src/pages/list/layout/index.tsx
@@ -15,6 +15,7 @@ import Error from "./error";
 import Markdown from "../preview/markdown";
 import Overlay from "../../../components/overlay";
 import { IContext, File as File_ } from "../context";
+import Results from "./results";
 
 const Files = lazy(() => import("./files"));
 const File = lazy(() => import("./file"));
@@ -98,6 +99,8 @@ const KuttyHero = () => {
                   <Files />
                 ) : type === "file" ? (
                   <File />
+                ) : type === "search" ? (
+                  <Results />
                 ) : (
                   <Error msg={msg} />
                 )}
diff --git a/src/pages/list/layout/results/index.tsx b/src/pages/list/layout/results/index.tsx
new file mode 100644
index 0000000..3646d77
--- /dev/null
+++ b/src/pages/list/layout/results/index.tsx
@@ -0,0 +1,11 @@
+import React from "react";
+
+const Results = ()=>{
+  return (
+    <div>
+      <h1>Results</h1>
+    </div>
+  )
+}
+
+export default Results;
\ No newline at end of file

From b42f0b4075fc3e8fa1a0baa773b17cb2711e07ed Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Fri, 8 Apr 2022 20:31:58 +0800
Subject: [PATCH 04/11] fix: readme display

---
 src/pages/list/layout/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/list/layout/index.tsx b/src/pages/list/layout/index.tsx
index a7cf03f..022ffb5 100644
--- a/src/pages/list/layout/index.tsx
+++ b/src/pages/list/layout/index.tsx
@@ -108,7 +108,7 @@ const KuttyHero = () => {
             </Box>
           )}
         </Box>
-        {type !== "loading" && readme && (
+        {type === "folder" && readme && (
           <Box
             className="readme-box"
             rounded="xl"

From 4762697df4751cd806a744bfc12320f181e901b0 Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Fri, 8 Apr 2022 20:32:20 +0800
Subject: [PATCH 05/11] fix: switch to folder

---
 src/pages/list/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index f4b21dc..cf452ec 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -172,7 +172,9 @@ const Do = (props: any) => {
     return false;
   };
   useEffect(() => {
-    switchToSearch();
+    if(!switchToSearch()){
+      allRefresh();
+    }
   }, [location.search]);
   const { isOpen, onClose, onOpen } = useDisclosure();
   const initialRef = React.useRef();

From 498e06ac423d13c4c7ac59d7c289da27a15d3008 Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Fri, 8 Apr 2022 22:47:29 +0800
Subject: [PATCH 06/11] feat: search results

---
 src/pages/list/layout/results/index.tsx  | 112 +++++++++++++++++++++--
 src/pages/list/layout/results/result.tsx |  80 ++++++++++++++++
 2 files changed, 184 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/list/layout/results/result.tsx

diff --git a/src/pages/list/layout/results/index.tsx b/src/pages/list/layout/results/index.tsx
index 3646d77..5b66459 100644
--- a/src/pages/list/layout/results/index.tsx
+++ b/src/pages/list/layout/results/index.tsx
@@ -1,11 +1,107 @@
-import React from "react";
+import {
+  Center,
+  Flex,
+  HStack,
+  Spinner,
+  VStack,
+  Text,
+  useToast,
+} from "@chakra-ui/react";
+import React, { useContext, useEffect, useState } from "react";
+import { useLocation } from "react-router-dom";
+import { IContext, Resp } from "../../context";
+import request from "~/utils/public";
+import { useTranslation } from "react-i18next";
+import Result from "./result";
 
-const Results = ()=>{
-  return (
-    <div>
-      <h1>Results</h1>
-    </div>
-  )
+export interface Result {
+  path: string;
+  name: string;
+  size: number;
+  type: number;
 }
 
-export default Results;
\ No newline at end of file
+const Results = () => {
+  const location = useLocation();
+  const [loading, setLoading] = useState(true);
+  const { getSetting } = useContext(IContext);
+  const toast = useToast();
+  const [results, setResults] = useState<Result[]>([]);
+  const search = () => {
+    const searchParams = new URLSearchParams(location.search);
+    const path = location.pathname;
+    const keyword = searchParams.get("search");
+    setLoading(true);
+    request
+      .post("search", {
+        path,
+        keyword,
+      })
+      .then((resp) => {
+        setLoading(false);
+        const res: Resp<Result[]> = resp.data;
+        if (res.code === 200) {
+          setResults(res.data);
+        } else {
+          toast({
+            title: res.message,
+            status: "error",
+            duration: 3000,
+            isClosable: true,
+          });
+        }
+      });
+  };
+  useEffect(() => {
+    search();
+  }, [location.search]);
+  const { t } = useTranslation();
+  if (loading) {
+    return (
+      <Center w="full" py="4">
+        <Spinner color={getSetting("icon color") || "#1890ff"} size="xl" />
+      </Center>
+    );
+  }
+  return (
+    <VStack className="results-box" w="full">
+      <HStack className="results-title" w="full" p="2">
+        {[
+          { name: "name", base: 2 / 3, md: "50%", textAlign: "left" },
+          { name: "size", base: 1 / 3, md: 1 / 6, textAlign: "right" },
+          { name: "path", base: 0, md: 1 / 3, textAlign: "right" },
+        ].map((item) => {
+          return (
+            <Flex
+              w={{ base: item.base, md: item.md }}
+              key={item.name}
+              align="center"
+            >
+              <Text
+                w="full"
+                className={`results-title-${item.name}`}
+                fontSize="sm"
+                fontWeight="bold"
+                color="gray.500"
+                textAlign={item.textAlign as any}
+                cursor="pointer"
+                display={
+                  item.name === "path"
+                    ? { base: "none", md: "unset" }
+                    : "unset"
+                }
+              >
+                {t(item.name)}
+              </Text>
+            </Flex>
+          );
+        })}
+      </HStack>
+      {results.map((result) => {
+        return <Result key={result.name} {...result} />;
+      })}
+    </VStack>
+  );
+};
+
+export default Results;
diff --git a/src/pages/list/layout/results/result.tsx b/src/pages/list/layout/results/result.tsx
new file mode 100644
index 0000000..07de19c
--- /dev/null
+++ b/src/pages/list/layout/results/result.tsx
@@ -0,0 +1,80 @@
+import {
+  Box,
+  Flex,
+  HStack,
+  Icon,
+  LinkBox,
+  LinkOverlay,
+  Text,
+  Tooltip,
+} from "@chakra-ui/react";
+import React, { useContext } from "react";
+import { Link } from "react-router-dom";
+import { getFileSize, pathJoin } from "~/utils/file";
+import getIcon from "~/utils/icon";
+import { Result } from ".";
+import { IContext } from "../../context";
+
+const Result = (file: Result) => {
+  const { getSetting } = useContext(IContext);
+
+  return (
+    <Box w="full">
+      <Tooltip placement="bottom-start" label={pathJoin(file.path,file.name)}>
+        <LinkBox
+          className="result"
+          p="2"
+          w="full"
+          rounded="lg"
+          transition="all 0.3s"
+          _hover={{
+            transform: "scale(1.01)",
+            bgColor: "rgba(132,133,141,0.18)",
+          }}
+        >
+          <LinkOverlay as={Link} to={encodeURI(pathJoin(file.path, file.name))}>
+            <HStack spacing={2}>
+              <Flex
+                className="result-name"
+                align="center"
+                w={{ base: 3 / 4, md: "50%" }}
+              >
+                <Icon
+                  color={getSetting("icon color")}
+                  boxSize={6}
+                  as={getIcon(file.type, file.name.split(".").pop() || "")}
+                  mr={2}
+                />
+                <Text
+                  textOverflow="ellipsis"
+                  whiteSpace="nowrap"
+                  overflow="hidden"
+                  fontSize="md"
+                >
+                  {file.name}
+                </Text>
+              </Flex>
+              <Text
+                className="result-size"
+                w={{ base: 1 / 4, md: 1 / 6 }}
+                textAlign="right"
+              >
+                {getFileSize(file.size)}
+              </Text>
+              <Text
+                className="result-path"
+                w={{ base: 0, md: 1 / 3 }}
+                display={{ base: "none", md: "unset" }}
+                textAlign="right"
+              >
+                {file.path}
+              </Text>
+            </HStack>
+          </LinkOverlay>
+        </LinkBox>
+      </Tooltip>
+    </Box>
+  );
+};
+
+export default Result;

From befe71f7c151518798ceb406506076cbaa316c39 Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Tue, 12 Apr 2022 10:34:17 +0800
Subject: [PATCH 07/11] feat: add account loading

---
 src/pages/manage/accounts.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/manage/accounts.tsx b/src/pages/manage/accounts.tsx
index 14b3895..7cbeb6d 100644
--- a/src/pages/manage/accounts.tsx
+++ b/src/pages/manage/accounts.tsx
@@ -172,6 +172,7 @@ const Accounts = () => {
     React.useState<Account>(EmptyAccount);
   const [isEdit, setIsEdit] = React.useState(false);
   const [loading, setLoading] = React.useState(false);
+  const [addAccountLoading, setAddAccountLoading] = React.useState(false);
   const editDisclosure = useDisclosure();
   const initialDrivers = () => {
     admin.get("drivers").then((resp) => {
@@ -464,11 +465,14 @@ const Accounts = () => {
               {t("Paste")}
             </Button>
             <Button
+              isLoading={addAccountLoading}
               onClick={() => {
                 console.log(currentAccount);
+                setAddAccountLoading(true);
                 admin
                   .post(`account/${isEdit ? "save" : "create"}`, currentAccount)
                   .then((resp) => {
+                    setAddAccountLoading(false);
                     const res = resp.data;
                     if (res.code !== 200) {
                       toast({

From 8751e4a6fbd365ee811d05be407cac657a9e0687 Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Tue, 12 Apr 2022 11:09:19 +0800
Subject: [PATCH 08/11] fix: search while keyword is empty

---
 src/pages/list/layout/results/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/list/layout/results/index.tsx b/src/pages/list/layout/results/index.tsx
index 5b66459..55ebd79 100644
--- a/src/pages/list/layout/results/index.tsx
+++ b/src/pages/list/layout/results/index.tsx
@@ -31,6 +31,7 @@ const Results = () => {
     const searchParams = new URLSearchParams(location.search);
     const path = location.pathname;
     const keyword = searchParams.get("search");
+    if(!keyword) return;
     setLoading(true);
     request
       .post("search", {

From 9bc994092febaf9d05a928cca27cbba9fa390d67 Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Tue, 12 Apr 2022 11:23:21 +0800
Subject: [PATCH 09/11] feat: hide search button while disable search

---
 src/pages/list/layout/search.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/list/layout/search.tsx b/src/pages/list/layout/search.tsx
index 135bd47..f0f481c 100644
--- a/src/pages/list/layout/search.tsx
+++ b/src/pages/list/layout/search.tsx
@@ -17,10 +17,9 @@ const Search = (props: SearchProps) => {
   const [keyword, setKeyword] = useState("");
   const search = () => {
     // console.log(keyword);
-    history.push(`?search=${keyword}`);
+    history.push(`?s=${keyword}`);
   };
   const history = useHistory();
-  // if (!getSetting("search")) return null;
   useEffect(() => {
     if (props.isSearch) {
       inputRef.current?.focus();
@@ -41,6 +40,7 @@ const Search = (props: SearchProps) => {
       document.removeEventListener("click", cancelSearch);
     };
   }, [props.isSearch]);
+  // if (!getSetting("enable search")) return null;
   return (
     <HStack
       spacing={2}

From ac4a58af97654c9333c1d5bc39210b4cdc88fa59 Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Tue, 12 Apr 2022 11:24:25 +0800
Subject: [PATCH 10/11] feat: shorten search param

---
 src/pages/list/index.tsx                | 2 +-
 src/pages/list/layout/results/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index cf452ec..06ac247 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -164,7 +164,7 @@ const Do = (props: any) => {
   }, [page]);
   const switchToSearch = () => {
     const query = new URLSearchParams(location.search);
-    const search = query.get("search");
+    const search = query.get("s");
     if (search) {
       setType("search");
       return true;
diff --git a/src/pages/list/layout/results/index.tsx b/src/pages/list/layout/results/index.tsx
index 55ebd79..30ae861 100644
--- a/src/pages/list/layout/results/index.tsx
+++ b/src/pages/list/layout/results/index.tsx
@@ -30,7 +30,7 @@ const Results = () => {
   const search = () => {
     const searchParams = new URLSearchParams(location.search);
     const path = location.pathname;
-    const keyword = searchParams.get("search");
+    const keyword = searchParams.get("s");
     if(!keyword) return;
     setLoading(true);
     request

From 4759c8440ede07f8100ea62d09d1748d56369bfd Mon Sep 17 00:00:00 2001
From: Xhofe <i@nn.ci>
Date: Sun, 17 Apr 2022 17:04:18 +0800
Subject: [PATCH 11/11] feat: legacy support (close Xhofe/alist#954)

---
 index.html     | 35 +++++++++++++++++++++++++++++------
 package.json   |  1 +
 vite.config.ts |  6 +++++-
 yarn.lock      | 40 +++++++++++++++++++++++++++++++++++++++-
 4 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 47c93d0..7d859af 100644
--- a/index.html
+++ b/index.html
@@ -3,24 +3,47 @@
   <head>
     <!-- customize head -->
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg" />
+    <link
+      rel="icon"
+      type="image/svg+xml"
+      href="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"
+    />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="referrer" content="no-referrer">
+    <meta name="referrer" content="no-referrer" />
     <meta name="generator" content="Alist V2" />
     <script src="https://g.alicdn.com/IMM/office-js/1.1.5/aliyun-web-office-sdk.min.js"></script>
+    <script>
+      window.matchMediaBak = window.matchMedia;
+      window.matchMedia = function (e) {
+        let result = window.matchMediaBak(e);
+        if (!result.addEventListener) {
+          result.addEventListener = function (event, listener) {
+            result.addListener(listener);
+          };
+          result.removeEventListener = function (event, listener) {
+            result.removeListener(listener);
+          };
+        }
+        return result;
+      };
+      this.globalThis || (this.globalThis = this);
+    </script>
     <title>Loading...</title>
   </head>
   <body>
     <script>
       window.ALIST = {
-        cdn:"/CDN_URL/",
-        api:undefined,
-      }
+        cdn: "/CDN_URL/",
+        api: undefined,
+      };
     </script>
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
     <noscript>
-      <strong>We're sorry but alist doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong
+        >We're sorry but alist doesn't work properly without JavaScript enabled.
+        Please enable it to continue.</strong
+      >
     </noscript>
     <!-- customize body -->
   </body>
diff --git a/package.json b/package.json
index f59d932..bc910f7 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-router-dom": "^5.1.8",
     "@types/streamsaver": "^2.0.1",
+    "@vitejs/plugin-legacy": "^1.8.1",
     "@vitejs/plugin-react-refresh": "^1.3.1",
     "typescript": "^4.5.4",
     "vite": "^2.7.10",
diff --git a/vite.config.ts b/vite.config.ts
index 46f0f02..6abd00f 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from "vite";
 import reactRefresh from "@vitejs/plugin-react-refresh";
 import pluginRewriteAll from "vite-plugin-rewrite-all";
 import { useDynamicPublicPath } from "vite-plugin-dynamic-publicpath";
+import legacy from "@vitejs/plugin-legacy";
 import path from "path";
 
 // https://vitejs.dev/config/
@@ -16,13 +17,16 @@ export default defineConfig({
   plugins: [
     reactRefresh(),
     pluginRewriteAll(),
+    legacy({
+      targets: ["defaults", "not ie <= 8"],
+    }),
     useDynamicPublicPath(),
   ],
 
   build: {
     target: "es2015",
   },
-  
+
   define: {
     "process.env": {},
   },
diff --git a/yarn.lock b/yarn.lock
index 92a5b82..b857e76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -223,6 +223,11 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/standalone@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.17.9.tgz#208298055c70531a81759435e443586754d693f9"
+  integrity sha512-9wL9AtDlga8avxUrBvQJmhUtJWrelsUL0uV+TcP+49Sb6Pj8/bNIzQzU4dDp0NAPOvnZR/7msFIKsKoCl/W1/w==
+
 "@babel/template@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
@@ -1146,6 +1151,17 @@
   resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52"
   integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI=
 
+"@vitejs/plugin-legacy@^1.8.1":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-legacy/-/plugin-legacy-1.8.1.tgz#9431a983f950b4343d5b80a1916f25cc03d6b9c4"
+  integrity sha512-kmBWKq7EeNvzS4AqPBqUKdoWG/NYQXh7StUFMWR3D21aN5Mfmar7CTO2a7K+bBxJH/vAL9gnnueA0wb7cycCmQ==
+  dependencies:
+    "@babel/standalone" "^7.17.9"
+    core-js "^3.21.1"
+    magic-string "^0.26.1"
+    regenerator-runtime "^0.13.9"
+    systemjs "^6.12.1"
+
 "@vitejs/plugin-react-refresh@^1.3.1":
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-react-refresh/-/plugin-react-refresh-1.3.6.tgz#19818392db01e81746cfeb04e096ab3010e79fe3"
@@ -1313,6 +1329,11 @@ core-js@^3.18.3:
   resolved "https://registry.npmjs.org/core-js/-/core-js-3.20.2.tgz#46468d8601eafc8b266bd2dd6bf9dee622779581"
   integrity sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw==
 
+core-js@^3.21.1:
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.0.tgz#b52007870c5e091517352e833b77f0b2d2b259f3"
+  integrity sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==
+
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
@@ -2049,6 +2070,13 @@ lowlight@^2.0.0:
     fault "^2.0.0"
     highlight.js "~11.3.0"
 
+magic-string@^0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.1.tgz#ba9b651354fa9512474199acecf9c6dbe93f97fd"
+  integrity sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
 markdown-table@^3.0.0:
   version "3.0.2"
   resolved "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz#9b59eb2c1b22fe71954a65ff512887065a7bb57c"
@@ -2931,7 +2959,7 @@ readable-stream@~2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-regenerator-runtime@^0.13.4:
+regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9:
   version "0.13.9"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
@@ -3070,6 +3098,11 @@ source-map@^0.5.0, source-map@^0.5.7:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
+sourcemap-codec@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
 space-separated-tokens@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b"
@@ -3114,6 +3147,11 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
+systemjs@^6.12.1:
+  version "6.12.1"
+  resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-6.12.1.tgz#47cdd23a6ec9f1b01cf5b5f70562c8550da229d3"
+  integrity sha512-hqTN6kW+pN6/qro6G9OZ7ceDQOcYno020zBQKpZQLsJhYTDMCMNfXi/Y8duF5iW+4WWZr42ry0MMkcRGpbwG2A==
+
 tiny-invariant@^1.0.2:
   version "1.2.0"
   resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"