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 (
+
+
+
+
+ );
+}
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 值專區
-
- -
- 專業評估
-
- -
- 關於我們
-
-
-
+
-
+
diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx
index 779b4ae..ef773e4 100644
--- a/app/routes/_index.tsx
+++ b/app/routes/_index.tsx
@@ -1,3 +1,8 @@
export default function () {
- return 首頁
;
+ return (
+
+ );
}
diff --git a/app/routes/assessment.tsx b/app/routes/assessment.tsx
index 1f676e8..291d663 100644
--- a/app/routes/assessment.tsx
+++ b/app/routes/assessment.tsx
@@ -3,5 +3,10 @@ import type { V2_MetaFunction } from "@remix-run/node";
export const meta: V2_MetaFunction = () => [{ title: "專業評估" }];
export default function () {
- return 專業評估
;
+ return (
+
+ );
}
diff --git a/app/routes/choice.tsx b/app/routes/choice.tsx
index fa1e84d..3be773f 100644
--- a/app/routes/choice.tsx
+++ b/app/routes/choice.tsx
@@ -3,5 +3,10 @@ import type { V2_MetaFunction } from "@remix-run/node";
export const meta: V2_MetaFunction = () => [{ title: "選擇障礙專區" }];
export default function () {
- return 選擇障礙專區
;
+ return (
+
+ );
}
diff --git a/app/routes/contact.tsx b/app/routes/contact.tsx
index 470373c..2dc6515 100644
--- a/app/routes/contact.tsx
+++ b/app/routes/contact.tsx
@@ -3,5 +3,10 @@ import type { V2_MetaFunction } from "@remix-run/node";
export const meta: V2_MetaFunction = () => [{ title: "關於我們" }];
export default function () {
- return 關於我們
;
+ return (
+
+ );
}
diff --git a/app/routes/curing.tsx b/app/routes/curing.tsx
index a48dd58..6e7d375 100644
--- a/app/routes/curing.tsx
+++ b/app/routes/curing.tsx
@@ -3,5 +3,10 @@ import type { V2_MetaFunction } from "@remix-run/node";
export const meta: V2_MetaFunction = () => [{ title: "CP 值專區" }];
export default function () {
- return CP 值專區
;
+ return (
+
+ );
}
diff --git a/app/routes/plan.tsx b/app/routes/plan.tsx
index 0cb2737..54e0780 100644
--- a/app/routes/plan.tsx
+++ b/app/routes/plan.tsx
@@ -3,5 +3,10 @@ import type { V2_MetaFunction } from "@remix-run/node";
export const meta: V2_MetaFunction = () => [{ title: "計畫自由選" }];
export default function () {
- return 計畫自由選
;
+ return (
+
+ );
}