diff --git a/app/layout.tsx b/app/layout.tsx index b259189..c0945a8 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,6 +1,8 @@ import type { Metadata } from "next"; import "./globals.css"; +import MainHeader from "@/components/header/main"; +import MainFooter from "@/components/footer/main"; export const metadata: Metadata = { title: 'AderKI Blog', @@ -32,7 +34,12 @@ export default function RootLayout({ children }: { children: React.ReactNode }) - {children} + +
+ + {children} + +
); diff --git a/app/page.tsx b/app/page.tsx index c034f6f..fd11444 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,17 +1,6 @@ -import mastodonPic from '../public/mastodon.svg'; -import githubPic from '../public/github.svg'; -import instagramPic from '../public/instagram.svg'; -import steamPic from '../public/steam.svg'; -import gamePic from '../public/gamepad.svg'; -import projectPic from '../public/project.svg'; - -import Image from "next/image"; -import Link from "next/link"; -import AnimatedLink from '../components/animatedLink'; import BlogArea from "../components/blogpost"; -import MainHeader from "@/components/header/main"; // Mock data for blog posts const blogposts = [ @@ -47,77 +36,8 @@ const blogposts = [ export default function Home() { return ( -
- - -
- -
- - -
+
+ +
); } diff --git a/components/blogpost.tsx b/components/blogpost.tsx index 281f5dd..47b5e1d 100644 --- a/components/blogpost.tsx +++ b/components/blogpost.tsx @@ -3,6 +3,7 @@ import tagsPic from '../public/tags.svg'; import calendarPic from '../public/calendar.svg' +import Link from 'next/link'; import AnimatedLink from '../components/animatedLink'; import Image from 'next/image'; @@ -11,7 +12,7 @@ interface BlogPost { body: string; publish: string; get_absolute_url: string; - tags: string[]; + tags: string[]; } interface BlogAreaProps { @@ -46,7 +47,7 @@ export default function BlogArea({ blogposts }: BlogAreaProps) {
@@ -54,7 +55,7 @@ export default function BlogArea({ blogposts }: BlogAreaProps) {
diff --git a/components/footer/main.tsx b/components/footer/main.tsx new file mode 100644 index 0000000..8201046 --- /dev/null +++ b/components/footer/main.tsx @@ -0,0 +1,81 @@ + +import mastodonPic from '@/public/mastodon.svg'; +import githubPic from '@/public/github.svg'; +import instagramPic from '@/public/instagram.svg'; +import steamPic from '@/public/steam.svg'; + +import gamePic from '@/public/gamepad.svg'; +import projectPic from '@/public/project.svg'; + +import Image from "next/image"; +import Link from "next/link"; +import AnimatedLink from '@/components/animatedLink'; + +export default function MainFooter() { + return ( + + ); +} \ No newline at end of file