merging searchbox to navbar

fusky-labs · Sep 17, 2022 · 1e6bfc1 · 1e6bfc1
1 parent 0486046
commit 1e6bfc1
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 3 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,7 +1,7 @@
 import { NavbarRoot } from "./NavbarRoot"
 import { LogoNav } from "./LogoNav"
 import Options from "../Options"
-import SearchBox from "../SearchBox"
+import SearchBox from "./SearchBox"
 
 export default function Navbar() {
   return (

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,2 +1 @@
-import SearchBox from "../SearchBox"
 export { default } from "./Navbar"
diff --git a/app/src/components/base/Searchbox/index.tsx b/app/src/components/base/Searchbox/index.tsx