diff --git a/index.html b/index.html index cc7165c..32bd1b1 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + Eatsfine - +
diff --git a/public/EatsfineLogo.png b/public/EatsfineLogo.png new file mode 100644 index 0000000..22b568d Binary files /dev/null and b/public/EatsfineLogo.png differ diff --git "a/public/\354\236\207\354\270\240\355\214\214\354\235\270\353\241\234\352\263\240.webp" "b/public/\354\236\207\354\270\240\355\214\214\354\235\270\353\241\234\352\263\240.webp" deleted file mode 100644 index 32868fd..0000000 Binary files "a/public/\354\236\207\354\270\240\355\214\214\354\235\270\353\241\234\352\263\240.webp" and /dev/null differ diff --git a/src/App.tsx b/src/App.tsx index ece471a..bee32d0 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -9,25 +9,32 @@ import NotFound from "./pages/NotFound"; import Intro from "./pages/Intro"; import SearchPage from "./pages/SearchPage"; import CustomerSupportPage from "./pages/CustomerSupportPage"; +import PublicLayout from "./layouts/PublicLayout"; export const queryClient = new QueryClient(); const routes: RouteObject[] = [ { - path: "/", - element: , + element: ( + + ), errorElement: , + children: [{ path: "/search", element: }], }, { - path: "/search", - element: , + path: "/", + element: , errorElement: , }, + { path: "/customer-support", element: , errorElement: , - } + }, ]; const router = createBrowserRouter(routes); diff --git a/src/layouts/PublicLayout.tsx b/src/layouts/PublicLayout.tsx new file mode 100644 index 0000000..f71661a --- /dev/null +++ b/src/layouts/PublicLayout.tsx @@ -0,0 +1,36 @@ +import { Link, Outlet } from "react-router-dom"; + +type PublicLayoutProps = { + title?: string; + subtitle?: string; +}; + +export default function PublicLayout({ + title = "잇츠파인", + subtitle, +}: PublicLayoutProps) { + return ( +
+
+
+ + 잇츠파인 로고 + +
+

{title}

+ {subtitle ? ( +

{subtitle}

+ ) : null} +
+
+
+
+ +
+
+ ); +} diff --git a/src/pages/SearchPage.tsx b/src/pages/SearchPage.tsx index fe155b6..007ba01 100644 --- a/src/pages/SearchPage.tsx +++ b/src/pages/SearchPage.tsx @@ -64,6 +64,7 @@ export default function SearchPage() { setConfirmOpen(false); setSelected(null); setCompleteOpen(false); + setPaymentOpen(false); }; const results = useMemo(() => { @@ -83,64 +84,53 @@ export default function SearchPage() { }; return ( -
-
-
-

잇츠파인

-

- 원하는 자리를 직접 선택하는 스마트 식당 예약 -

+ <> + {/* 검색창 */} +
+
+ setQuery(e.target.value)} + /> +
-
- -
- {/* 검색창 */} -
-
- setQuery(e.target.value)} - /> - -
-
- - {/* 지도는 API연동을 위해 지금 비워둠 */} -
-
-
-
-

카카오맵 API 연동 영역

-
+
+ + {/* 지도는 API연동을 위해 지금 비워둠 */} +
+
+
+
+

카카오맵 API 연동 영역

-
- {results.map((r) => ( - - ))} -
- -
- {query.trim() ? ( - - ) : null} +
+ {results.map((r) => ( + + ))}
-
+
+ +
+ {query.trim() ? ( + + ) : null} +
{/* 상세 페이지 모달 */} {selected && ( )} - + ); }