Merge pull request #11 from kmiguel10/development

Added metadata on pages
kmiguel10 · Oct 12, 2023 · 91ff2fe · 91ff2fe
2 parents 6110ecf + 1ff6f8e
commit 91ff2fe
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 45 deletions.
diff --git a/app/about/page.tsx b/app/about/page.tsx
@@ -4,9 +4,13 @@ import ContainerLayout from "@components/layouts/container";
 import InProgressImage from "../../public/aboutme-option12.webp";
 import Image from "next/image";
 
+export const metadata = {
+  title: "About Me",
+};
+
 const page = () => {
   return (
-    <Base subtitle="About Me" pageSlug="/about">
+    <Base pageSlug="/about">
       <ContainerLayout className="flex flex-col space-y-4">
         <h1 className="text-3xl font-semibold tracking-tight text-gray-12 md:text-4xl">
           About Me

diff --git a/app/components/layouts/base.tsx b/app/components/layouts/base.tsx
@@ -1,16 +1,9 @@
 import React, { ReactNode } from "react";
-import SeoBase from "@components/layouts/seo-base";
 import NavBar from "@components/ui/nav-bar/nav-bar";
 
-export default function Base({
-  title,
-  subtitle,
-  pageSlug,
-  children,
-}: BaseLayoutProps) {
+export default function Base({ pageSlug, children }: BaseLayoutProps) {
   return (
     <>
-      <SeoBase title={title} subtitle={subtitle} />
       <NavBar selected={pageSlug} />
       <main className="relative flex grow flex-col">{children}</main>
     </>

diff --git a/app/components/layouts/seo-base.tsx b/app/components/layouts/seo-base.tsx
diff --git a/app/global.d.ts b/app/global.d.ts
@@ -38,12 +38,7 @@ declare global {
     selected?: PageSlug;
   };
 
-  export type SeoBaseProps = {
-    title?: string;
-    subtitle?: string;
-  };
-
-  type BaseLayoutProps = SeoBaseProps & {
+  type BaseLayoutProps = {
     pageSlug?: PageSlug;
     children?: ReactNode;
   };

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -6,7 +6,10 @@ import { Analytics } from "@vercel/analytics/react";
 const inter = Inter({ variable: "--inter-font", subsets: ["latin"] });
 
 export const metadata: Metadata = {
-  title: "Kent Miguel",
+  title: {
+    default: "Kent Miguel | Home",
+    template: "Kent Miguel | %s",
+  },
   description: "Kent Miguel Personal Website",
 };
 

diff --git a/app/page.tsx b/app/page.tsx
@@ -9,7 +9,7 @@ export const dynamic = "force-dynamic";
 export default async function Home() {
   return (
     <>
-      <Base subtitle="Home" pageSlug="/">
+      <Base pageSlug="/">
         <ContainerLayout className="flex flex-col space-y-4">
           <ProfileHeader />
           <Contents />

diff --git a/app/projects/page.tsx b/app/projects/page.tsx
@@ -5,9 +5,13 @@ import ContainerLayout from "@components/layouts/container";
 import InProgressImage from "../../public/aboutme-option3.webp";
 import Image from "next/image";
 
+export const metadata = {
+  title: "Projects",
+};
+
 export default function AboutMe() {
   return (
-    <Base subtitle="Projects" pageSlug="/projects">
+    <Base pageSlug="/projects">
       <ContainerLayout className="flex flex-col space-y-4">
         <h1 className="text-3xl font-semibold tracking-tight text-gray-12 md:text-4xl">
           Projects

diff --git a/app/resume/page.tsx b/app/resume/page.tsx
@@ -5,9 +5,13 @@ import ContainerLayout from "@components/layouts/container";
 import ResumeContent from "./components/resume-content";
 import Skills from "./components/skills";
 
+export const metadata = {
+  title: "Resume",
+};
+
 const page = () => {
   return (
-    <Base subtitle="Resume" pageSlug="/resume">
+    <Base pageSlug="/resume">
       <ContainerLayout className="flex flex-col space-y-4">
         <ProfileHeader />
         <Skills />