merging searchbox to navbar

searchbox import fix searchbox import 2 ts-ignore searchbox import just work damn it
fusky-labs · Sep 17, 2022 · 59e0225 · 59e0225
1 parent 7ab2384
commit 59e0225
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/typescript-check.yml b/.github/workflows/typescript-check.yml
@@ -27,3 +27,7 @@ jobs:
 
       - name: Checking types
         run: yarn --cwd ./app ./node_modules/.bin/tsc --noEmit
+
+      - name: Checking types (attempt 2)
+        run: yarn --cwd ./app tsc --noEmit
+
diff --git a/app/src/components/base/Navbar/Navbar.tsx b/app/src/components/base/Navbar/Navbar.tsx
@@ -1,18 +1,13 @@
-import { useRouter } from "next/router"
 import { NavbarRoot } from "./NavbarRoot"
 import { LogoNav } from "./LogoNav"
-import SearchBox from "../SearchBox"
 import Options from "../Options"
+import SearchBox from "./SearchBox"
 
 export default function Navbar() {
-  const router = useRouter()
-
   return (
     <NavbarRoot>
       <LogoNav />
-      {router.pathname === "/" || router.pathname === "/about" ? null : (
-        <SearchBox />
-      )}
+      <SearchBox />
       <Options />
     </NavbarRoot>
   )

diff --git a/...c/components/base/Searchbox/SearchBox.tsx → app/src/components/base/Navbar/SearchBox.tsx b/...c/components/base/Searchbox/SearchBox.tsx → app/src/components/base/Navbar/SearchBox.tsx
diff --git a/...ponents/base/Searchbox/SearchDropdown.tsx → ...components/base/Navbar/SearchDropdown.tsx b/...ponents/base/Searchbox/SearchDropdown.tsx → ...components/base/Navbar/SearchDropdown.tsx
diff --git a/app/src/components/base/Navbar/index.tsx b/app/src/components/base/Navbar/index.tsx
@@ -1,3 +1 @@
 export { default } from "./Navbar"
-export { NavbarRoot } from "./NavbarRoot"
-export { LogoNav } from "./LogoNav"
diff --git a/app/src/components/base/Searchbox/index.tsx b/app/src/components/base/Searchbox/index.tsx