diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx index 56000e4..a4b7e48 100644 --- a/frontend/app/layout.tsx +++ b/frontend/app/layout.tsx @@ -4,7 +4,6 @@ import { siteConfig } from "@/config/site"; import { fontSans } from "@/config/fonts"; import { Providers } from "./providers"; import { Navbar } from "@/components/navbar"; -import { Link } from "@nextui-org/link"; import clsx from "clsx"; export const metadata: Metadata = { @@ -18,9 +17,9 @@ export const metadata: Metadata = { { media: "(prefers-color-scheme: dark)", color: "black" }, ], icons: { - icon: "/favicon.ico", - shortcut: "/favicon-16x16.png", - apple: "/apple-touch-icon.png", + icon: "/favicon/favicon.ico", + shortcut: "/favicon/favicon-16x16.png", + apple: "/favicon/apple-touch-icon.png", }, }; diff --git a/frontend/app/page.tsx b/frontend/app/page.tsx index 9826a21..8130a06 100644 --- a/frontend/app/page.tsx +++ b/frontend/app/page.tsx @@ -1,5 +1,4 @@ -import { Link } from "@nextui-org/link"; -import { button as buttonStyles } from "@nextui-org/theme"; +import { Link, button as buttonStyles } from "@nextui-org/react"; import { siteConfig } from "@/config/site"; import { title, subtitle } from "@/components/primitives"; import { GithubIcon } from "@/components/icons"; diff --git a/frontend/app/projects/layout.tsx b/frontend/app/projects/layout.tsx index 911d0bc..88bdab8 100644 --- a/frontend/app/projects/layout.tsx +++ b/frontend/app/projects/layout.tsx @@ -1,13 +1,11 @@ -export default function BlogLayout({ +export default function ProjectsLayout({ children, }: { children: React.ReactNode; }) { return ( -
-
- {children} -
+
+ {children}
); } diff --git a/frontend/app/projects/page.tsx b/frontend/app/projects/page.tsx index 4b2f1e5..2471cf0 100644 --- a/frontend/app/projects/page.tsx +++ b/frontend/app/projects/page.tsx @@ -1,9 +1,41 @@ import { title } from "@/components/primitives"; +import { ProjectCard } from "./project-card"; -export default function BlogPage() { +const projects = [ + { + name: "Robot1", + detail: "Embeded system test", + }, + { + name: "Battle-tested in Production", + detail: "All the features you need for production: hybrid static & server rendering, TypeScript support, smart bundling, route pre-fetching, and more.", + }, + { + name: "bank front", + detail: "web frontend application for abc bank", + }, + { + name: "bank API", + detail: "api server code for abc bank", + }, + { + name: "Battle-tested in Production", + detail: "All the features you need for production: hybrid static & server rendering, TypeScript support, smart bundling, route pre-fetching, and more.", + }, +]; + +export default function ProjectsPage() { return (

Projects

+
+ {projects.map((project) => ( + + ))} +
); } diff --git a/frontend/app/projects/project-card.tsx b/frontend/app/projects/project-card.tsx new file mode 100644 index 0000000..47cc9e3 --- /dev/null +++ b/frontend/app/projects/project-card.tsx @@ -0,0 +1,31 @@ +import React from "react"; +import { + Card, + CardHeader, + CardBody, + Divider, + Image, +} from "@nextui-org/react"; + +export function ProjectCard({ projectName, projectDetail }) { + return ( + + + nextui logo +
+

{ projectName }

+
+
+ + +

{projectDetail}

+
+
+ ); +} diff --git a/frontend/app/providers.tsx b/frontend/app/providers.tsx index 9a1ac92..412b800 100644 --- a/frontend/app/providers.tsx +++ b/frontend/app/providers.tsx @@ -1,7 +1,7 @@ "use client"; import * as React from "react"; -import { NextUIProvider } from "@nextui-org/system"; +import { NextUIProvider } from "@nextui-org/react"; import { useRouter } from "next/navigation"; import { ThemeProvider as NextThemesProvider } from "next-themes"; import { ThemeProviderProps } from "next-themes/dist/types"; diff --git a/frontend/components/navbar.tsx b/frontend/components/navbar.tsx index 175d6fb..51a0ffe 100644 --- a/frontend/components/navbar.tsx +++ b/frontend/components/navbar.tsx @@ -6,24 +6,20 @@ import { NavbarBrand, NavbarItem, NavbarMenuItem, -} from "@nextui-org/navbar"; -import { Kbd } from "@nextui-org/kbd"; -import { Link } from "@nextui-org/link"; -import { Input } from "@nextui-org/input"; - -import { link as linkStyles } from "@nextui-org/theme"; + Kbd, + Link, + Input, + link as linkStyles +} from "@nextui-org/react"; import { siteConfig } from "@/config/site"; import NextLink from "next/link"; import clsx from "clsx"; import { ThemeSwitch } from "@/components/theme-switch"; -import { - GithubIcon, - SearchIcon, -} from "@/components/icons"; +import { GithubIcon, SearchIcon } from "@/components/icons"; -import { Logo } from "@/components/icons"; +import Image from "next/image"; export const Navbar = () => { const searchInput = ( @@ -52,8 +48,13 @@ export const Navbar = () => { - -

TCM

+ Logo +

Test Case Manager