From c3ed47741d59991d439d42035b50d4260c1e67b8 Mon Sep 17 00:00:00 2001 From: sexyoung Date: Tue, 11 Jul 2023 00:00:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20header&footer=20rwd=20=E5=A4=A7?= =?UTF-8?q?=E8=87=B4=E5=AE=9A=E7=BE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/footer.tsx | 21 +++++++++++++++++++++ app/components/header.tsx | 13 +++++++++++++ app/components/links.tsx | 26 ++++++++++++++++++++++++++ app/root.tsx | 29 +++++------------------------ app/routes/_index.tsx | 7 ++++++- app/routes/assessment.tsx | 7 ++++++- app/routes/choice.tsx | 7 ++++++- app/routes/contact.tsx | 7 ++++++- app/routes/curing.tsx | 7 ++++++- app/routes/plan.tsx | 7 ++++++- 10 files changed, 101 insertions(+), 30 deletions(-) create mode 100644 app/components/footer.tsx create mode 100644 app/components/header.tsx create mode 100644 app/components/links.tsx diff --git a/app/components/footer.tsx b/app/components/footer.tsx new file mode 100644 index 0000000..7e5481e --- /dev/null +++ b/app/components/footer.tsx @@ -0,0 +1,21 @@ +import logo from "~/images/logo.png"; +import Links from "./links"; + +export default function Footer() { + return ( + + ); +} diff --git a/app/components/header.tsx b/app/components/header.tsx new file mode 100644 index 0000000..0a9f175 --- /dev/null +++ b/app/components/header.tsx @@ -0,0 +1,13 @@ +import logo from "~/images/logo.png"; +import Links from "./links"; + +export default function Header() { + return ( +
+ Home + +
+ ); +} diff --git a/app/components/links.tsx b/app/components/links.tsx new file mode 100644 index 0000000..7ade377 --- /dev/null +++ b/app/components/links.tsx @@ -0,0 +1,26 @@ +import { Link } from "@remix-run/react"; + +export default function Links() { + return ( + <> +
  • + 首頁 +
    • +
  • + 計畫自由選 +
    • +
  • + 選擇障礙專區 +
    • +
  • + CP 值專區 +
    • +
  • + 專業評估 +
    • +
  • + 關於我們 +
    • + + ); +} diff --git a/app/root.tsx b/app/root.tsx index 47fd478..3ab1ecb 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -2,7 +2,6 @@ import { cssBundleHref } from "@remix-run/css-bundle"; import type { LinksFunction, LoaderArgs } from "@remix-run/node"; import { json } from "@remix-run/node"; import { - Link, Links, LiveReload, Meta, @@ -14,6 +13,9 @@ import { import { getUser } from "~/session.server"; import stylesheet from "~/tailwind.css"; +import Header from "./components/header"; +import Footer from "./components/footer"; + export const links: LinksFunction = () => [ { rel: "stylesheet", href: stylesheet }, ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []), @@ -33,30 +35,9 @@ export default function App() { -
    -
      -
    • - 首頁 -
      • -
    • - 計畫自由選 -
      • -
    • - 選擇障礙專區 -
      • -
    • - CP 值專區 -
      • -
    • - 專業評估 -
      • -
    • - 關於我們 -
      • -
    -
    +
    -
    footer
    +