-
-
- ドキュメント作成
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ ドキュメント作成
+
+
+
+
+
+
+
-
+
);
}
diff --git a/src/app/docs/page.tsx b/src/app/docs/page.tsx
index ae7c8e78..23011add 100644
--- a/src/app/docs/page.tsx
+++ b/src/app/docs/page.tsx
@@ -1,10 +1,20 @@
+import "@/app/globals.css";
+import AppPageHeader from "@/components/AppPageHeader";
+import { Button } from "@/components/ui/button";
import Docs from "@/app/docs/_components/Docs";
-import SingleLayout from "@/components/layouts/SingleLayout";
+import Link from "next/link";
-export default function DocsPage() {
+export default async function DocsPage() {
return (
-
-
-
+
);
}
diff --git a/src/app/jobs/layout.tsx b/src/app/jobs/layout.tsx
new file mode 100644
index 00000000..6fc6af73
--- /dev/null
+++ b/src/app/jobs/layout.tsx
@@ -0,0 +1,9 @@
+import AppLayout from "@components/layouts/AppLayout";
+
+export default function DashboardLayout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ return AppLayout({ children });
+}
diff --git a/src/app/jobs/page.tsx b/src/app/jobs/page.tsx
new file mode 100644
index 00000000..1e1a3f59
--- /dev/null
+++ b/src/app/jobs/page.tsx
@@ -0,0 +1,19 @@
+"use client";
+
+import AppPageHeader from "@/components/AppPageHeader";
+import Link from "next/link";
+import { Button } from "@/components/ui/button";
+
+export default function CompaniesPage() {
+ return (
+
+ );
+}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 7eab8f4e..a516df36 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -2,6 +2,7 @@ import { Metadata } from "next";
import { Toaster } from "@/components/ui/toaster";
import "./globals.css";
+
export const metadata: Metadata = {
title: "Agent",
description: "Agent application",
diff --git a/src/app/login/layout.tsx b/src/app/login/layout.tsx
index 6c1b6630..6417b899 100644
--- a/src/app/login/layout.tsx
+++ b/src/app/login/layout.tsx
@@ -1,9 +1,9 @@
-import SingleLayout from "@components/layouts/SingleLayout";
+import WelcomeLayout from "@components/layouts/WelcomeLayout";
export default function LoginLayout({
children,
}: {
children: React.ReactNode;
}) {
- return SingleLayout({ children });
+ return WelcomeLayout({ children });
}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index d416e9b8..4329d54d 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,6 +1,7 @@
import "@/app/globals.css";
import Link from "next/link";
-import SingleLayout from "@components/layouts/SingleLayout";
+import WelcomeLayout from "@components/layouts/WelcomeLayout";
+import WelcomeBody from "@/app/welcome/_components/WelcomeBody";
const links = [
{ href: "/dashboard", text: "ダッシュボード" },
@@ -9,15 +10,21 @@ const links = [
export default async function Index() {
return (
-
- トップページ
-
- {links.map((link, index) => (
- -
- {link.text}
-
- ))}
-
-
+ <>
+
+
+
+
+
+ {links.map((link, index) => (
+ -
+ {link.text}
+
+ ))}
+
+
+
+
);
}
diff --git a/src/app/privacy/layout.tsx b/src/app/privacy/layout.tsx
index 528d8ecd..592ebe8b 100644
--- a/src/app/privacy/layout.tsx
+++ b/src/app/privacy/layout.tsx
@@ -1,9 +1,9 @@
-import SingleLayout from "@components/layouts/SingleLayout";
+import WelcomeLayout from "@components/layouts/WelcomeLayout";
export default function PrivacyLayout({
children,
}: {
children: React.ReactNode;
}) {
- return SingleLayout({ children });
+ return WelcomeLayout({ children });
}
diff --git a/src/app/signup/layout.tsx b/src/app/signup/layout.tsx
index 1107fd1f..7527da22 100644
--- a/src/app/signup/layout.tsx
+++ b/src/app/signup/layout.tsx
@@ -1,9 +1,9 @@
-import SingleLayout from "@components/layouts/SingleLayout";
+import WelcomeLayout from "@components/layouts/WelcomeLayout";
export default function SignupLayout({
children,
}: {
children: React.ReactNode;
}) {
- return SingleLayout({ children });
+ return WelcomeLayout({ children });
}
diff --git a/src/app/tos/layout.tsx b/src/app/tos/layout.tsx
index c35656cb..ef90d502 100644
--- a/src/app/tos/layout.tsx
+++ b/src/app/tos/layout.tsx
@@ -1,5 +1,5 @@
-import SingleLayout from "@components/layouts/SingleLayout";
+import WelcomeLayout from "@components/layouts/WelcomeLayout";
export default function TosLayout({ children }: { children: React.ReactNode }) {
- return SingleLayout({ children });
+ return WelcomeLayout({ children });
}
diff --git a/src/app/welcome/_components/WelcomeBody.tsx b/src/app/welcome/_components/WelcomeBody.tsx
new file mode 100644
index 00000000..4200b9e7
--- /dev/null
+++ b/src/app/welcome/_components/WelcomeBody.tsx
@@ -0,0 +1,40 @@
+import Link from "next/link";
+
+export default function WelcomeBody() {
+ return (
+ <>
+
+
+
+
+ Fjord Agent
+
+
+ 自走できるエンジニアの紹介
+
+
+
+
+
+ );
+}
diff --git a/src/components/AppFooter.tsx b/src/components/AppFooter.tsx
new file mode 100644
index 00000000..42c10742
--- /dev/null
+++ b/src/components/AppFooter.tsx
@@ -0,0 +1,32 @@
+import Link from "next/link";
+
+export default function AppFooter() {
+ const footerItems = [
+ { text: "利用規約", url: "/tos" },
+ { text: "プライバシーポリシー", url: "/privacy" },
+ ];
+
+ return (
+
+ );
+}
diff --git a/src/components/Header.test.tsx b/src/components/AppHeader.test.tsx
similarity index 97%
rename from src/components/Header.test.tsx
rename to src/components/AppHeader.test.tsx
index 03485ba3..a165377a 100644
--- a/src/components/Header.test.tsx
+++ b/src/components/AppHeader.test.tsx
@@ -1,5 +1,5 @@
import { render, screen, waitFor } from "@testing-library/react";
-import Header from "./Header";
+import Header from "./AppHeader";
import { AuthCredential, mockUserLoggedIn } from "@/mocks/supabase";
jest.mock("@/utils/supabase/server", () => ({
diff --git a/src/components/AppHeader.tsx b/src/components/AppHeader.tsx
new file mode 100644
index 00000000..fb70edbe
--- /dev/null
+++ b/src/components/AppHeader.tsx
@@ -0,0 +1,85 @@
+import Link from "next/link";
+import { createClient } from "@/utils/supabase/server";
+import {
+ NavigationMenu,
+ NavigationMenuItem,
+ NavigationMenuLink,
+ NavigationMenuList,
+ navigationMenuTriggerStyle,
+} from "@/components/ui/navigation-menu";
+import { Button } from "@/components/ui/button";
+
+export default async function Header() {
+ const supabase = await createClient();
+ const {
+ data: { user },
+ } = await supabase.auth.getUser();
+
+ // ロール取得（userが存在すれば）
+ let role: string | null = null;
+ if (user) {
+ const { data, error } = await supabase
+ .from("users")
+ .select("role")
+ .eq("id", user.id)
+ .single();
+
+ if (data && !error) {
+ role = data.role;
+ }
+ }
+
+ return (
+
+ );
+}
diff --git a/src/components/AppPageHeader.tsx b/src/components/AppPageHeader.tsx
new file mode 100644
index 00000000..face5b37
--- /dev/null
+++ b/src/components/AppPageHeader.tsx
@@ -0,0 +1,23 @@
+import { ReactNode } from "react";
+
+type AppPageHeaderProps = {
+ title: string;
+ children?: ReactNode;
+};
+
+export default function AppPageHeader({ title, children }: AppPageHeaderProps) {
+ return (
+ <>
+
+
+
+
+ );
+}
diff --git a/src/components/AppSidebar.tsx b/src/components/AppSidebar.tsx
new file mode 100644
index 00000000..aff3689d
--- /dev/null
+++ b/src/components/AppSidebar.tsx
@@ -0,0 +1,70 @@
+import Link from "next/link";
+import {
+ ChartPieIcon,
+ BuildingOfficeIcon,
+ UserGroupIcon,
+ LifebuoyIcon,
+ BookOpenIcon,
+} from "@heroicons/react/24/solid";
+
+export default function AppSidebar() {
+ return (
+
+ );
+}
diff --git a/src/components/Auth.tsx b/src/components/Auth.tsx
index 3eb1abaf..1319be3c 100644
--- a/src/components/Auth.tsx
+++ b/src/components/Auth.tsx
@@ -40,7 +40,7 @@ export default function Auth() {