9 changed files with 18 additions and 185 deletions
--- a/public/assets/images/logo-dark.webp
+++ b/public/assets/images/logo-dark.webp
--- a/src/app/(main)/[slug]/page.tsx
+++ b/src/app/(main)/[slug]/page.tsx
@ -28,9 +28,6 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
    imgUrl = blog.imgUrl;
    publishedAt = blog.data.createdAt;
    updatedAt = blog.data.updatedAt;
-    if (!!blog.data?.meta?.canonical_url) {
-      canonicalUrl = blog.data.meta.canonical_url;
-    }
    if (!!blog?.data?.createdBy && typeof blog.data.createdBy !== "number") {
      createdByName = blog.data.createdBy?.name ?? "";
    }
@ -43,9 +40,10 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
      imgUrl = page.heroImg?.url;
      publishedAt = page.createdAt;
      updatedAt = page.updatedAt;
-      if (!!page.meta?.canonical_url) {
-        canonicalUrl = page.meta.canonical_url;
+      if (!!page.meta?.cannonical_url) {
+        canonicalUrl = page.meta.cannonical_url;
      }
+
      if (!!page?.createdBy && typeof page.createdBy !== "number") {
        createdByName = page?.createdBy?.name ?? "";
      }
--- a/src/app/(main)/page.tsx
+++ b/src/app/(main)/page.tsx
@ -8,6 +8,8 @@ import { headers } from "next/headers";
 export async function generateMetadata(): Promise<Metadata> {
  const defaultMetadata = await getDefaultMetadata();
  defaultMetadata.title = `Homepage - ${defaultMetadata.openGraph?.siteName}`;
+  defaultMetadata.description =
+    "Get compassionate care and excellent medical services from COCHISE ONCOLOGY in Sierra Vista, Arizona. We are the largest full-service cancer treatment center between Albuquerque, New Mexico and Tucson, Arizona.";
  defaultMetadata.keywords = "Cochise Oncology, Oncology, Healthcare, Medical Services, Cancer Treatment";

  if (!!defaultMetadata?.openGraph) {
@ -26,7 +28,6 @@ export default async function Home() {
  const headersList = await headers();
  const fullUrl = headersList.get("x-full-url");
  const siteName = headersList.get("x-site-name");
-  const metaDesc = headersList.get("x-meta-desc");

  const jsonLd = {
    "@context": "https://schema.org",
@ -51,7 +52,8 @@ export default async function Home() {
        thumbnailUrl: [`${fullUrl}assets/images/cochise-welcome.png`],
        datePublished: "2024-07-18T16:29:29+00:00",
        dateModified: "2025-02-24T21:01:50+00:00",
-        description: metaDesc,
+        description:
+          "Get compassionate care and excellent medical services from COCHISE ONCOLOGY in Sierra Vista, Arizona. We are the largest full-service cancer treatment center between Albuquerque, New Mexico and Tucson, Arizona.",
        breadcrumb: {
          "@id": `${fullUrl}#breadcrumb`,
        },
--- a/src/app/(main)/staff_member/[slug]/page.tsx
+++ b/src/app/(main)/staff_member/[slug]/page.tsx
@ -3,9 +3,7 @@ import HeroOther from "@/components/HeroOther";
 import { fetchTeamDetail } from "@/services/payload/team";
 import { getDefaultMetadata } from "@/utils/metadata";
 import { RichText } from "@payloadcms/richtext-lexical/react";
-import { headers } from "next/headers";
 import Image from "next/image";
-import { notFound } from "next/navigation";
 import { Metadata } from "next/types";
 import { Suspense } from "react";

@ -47,94 +45,17 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
 export default async function BiographySinglePage({ params }: { params: Promise<{ slug: string }> }) {
  const slug = (await params).slug;
  const data = await fetchTeamDetail(decodeURIComponent(slug));
-  if (!data?.data) {
-    notFound();
-  }
-
-  const headersList = await headers();
-  const mainUrl = headersList.get("x-main-url");
-  const fullUrl = headersList.get("x-full-url");
-  const siteName = headersList.get("x-site-name");
-  const metaDesc = headersList.get("x-meta-desc");
-
-  const jsonLd = {
-    "@context": "https://schema.org",
-    "@graph": [
-      {
-        "@type": "WebPage",
-        "@id": fullUrl,
-        url: fullUrl,
-        name: `${data?.data?.name ?? ""} - ${siteName}`,
-        isPartOf: {
-          "@id": `${mainUrl}/#website`,
-        },
-        datePublished: data?.data?.createdAt,
-        dateModified: data?.data?.updatedAt,
-        description: metaDesc,
-        breadcrumb: {
-          "@id": `${fullUrl}#breadcrumb`,
-        },
-        inLanguage: "en-US",
-        potentialAction: [
-          {
-            "@type": "ReadAction",
-            target: [fullUrl],
-          },
-        ],
-      },
-      {
-        "@type": "WebSite",
-        "@id": `${mainUrl}/#website`,
-        url: `${mainUrl}/`,
-        name: siteName,
-        description: "",
-        publisher: {
-          "@id": `${mainUrl}/#organization`,
-        },
-        potentialAction: [
-          {
-            "@type": "SearchAction",
-            target: {
-              "@type": "EntryPoint",
-              urlTemplate: `${mainUrl}/?s={search_term_string}`,
-            },
-            "query-input": {
-              "@type": "PropertyValueSpecification",
-              valueRequired: true,
-              valueName: "search_term_string",
-            },
-          },
-        ],
-        inLanguage: "en-US",
-      },
-      {
-        "@type": "Organization",
-        "@id": `${mainUrl}/#organization`,
-        name: siteName,
-        url: `${mainUrl}/`,
-        logo: {
-          "@type": "ImageObject",
-          thumbnailUrl: data.imgUrl,
-          inLanguage: "en-US",
-          "@id": `${mainUrl}/#primaryimage`,
-          url: data.imgUrl,
-          contentUrl: data.imgUrl,
-          width: 500,
-          height: 195,
-          caption: siteName,
-        },
-        image: {
-          "@id": `${mainUrl}/#primaryimage`,
-        },
-      },
-    ],
-  };
+  if (!data?.data)
+    return (
+      <>
+        <BeforeFooterBlock />
+      </>
+    );

  return (
    <>
      <Suspense fallback={<Loading />}>
        <>
-          <script type="application/ld+json" dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }} />
          <HeroOther
            img={"/assets/images/full-width-images/section-bg-13.jpeg"}
            title={data.data.name}
--- a/src/collections/Pages.ts
+++ b/src/collections/Pages.ts
@ -72,8 +72,8 @@ export const Pages: CollectionConfig = {
          type: "textarea",
        },
        {
-          name: "canonical_url",
-          label: "Canonical Url",
+          name: "cannonical_url",
+          label: "Cannonical Url",
          type: "text",
        },
      ],
--- a/src/components/Pages/Page.tsx
+++ b/src/components/Pages/Page.tsx
@ -3,7 +3,6 @@ import { RenderBlocks } from "@/components/Blocks/RenderBlocks";
 import BlogDetail from "@/components/Blogs/BlogDetail";
 import { fetchPageBySlug } from "@/services/payload/page";
 import HeroOther from "@/components/HeroOther";
-import { headers } from "next/headers";

 export interface PageProps {
  slug: string | undefined;
@ -12,7 +11,6 @@ export interface PageProps {
 export default async function Page({ slug }: PageProps) {
  const page = await fetchPageBySlug({ slug });

-  // if page is a blog post
  if (!page) {
    return (
      <>
@ -22,88 +20,8 @@ export default async function Page({ slug }: PageProps) {
    );
  }

-  // if page is not a blog post
-  const headersList = await headers();
-  const mainUrl = headersList.get("x-main-url");
-  const fullUrl = headersList.get("x-full-url");
-  const siteName = headersList.get("x-site-name");
-  const metaDesc = !!page?.meta?.description ? page.meta?.description : headersList.get("x-meta-desc");
-
-  const jsonLd = {
-    "@context": "https://schema.org",
-    "@graph": [
-      {
-        "@type": "WebPage",
-        "@id": fullUrl,
-        url: fullUrl,
-        name: `${page.meta?.title ?? ""} - ${siteName}`,
-        isPartOf: {
-          "@id": `${mainUrl}/#website`,
-        },
-        datePublished: page?.createdAt,
-        dateModified: page?.updatedAt,
-        description: metaDesc,
-        breadcrumb: {
-          "@id": `${fullUrl}#breadcrumb`,
-        },
-        inLanguage: "en-US",
-        potentialAction: [
-          {
-            "@type": "ReadAction",
-            target: [fullUrl],
-          },
-        ],
-      },
-      {
-        "@type": "WebSite",
-        "@id": `${mainUrl}/#website`,
-        url: `${mainUrl}/`,
-        name: siteName,
-        description: "",
-        publisher: {
-          "@id": `${mainUrl}/#organization`,
-        },
-        potentialAction: [
-          {
-            "@type": "SearchAction",
-            target: {
-              "@type": "EntryPoint",
-              urlTemplate: `${mainUrl}/?s={search_term_string}`,
-            },
-            "query-input": {
-              "@type": "PropertyValueSpecification",
-              valueRequired: true,
-              valueName: "search_term_string",
-            },
-          },
-        ],
-        inLanguage: "en-US",
-      },
-      {
-        "@type": "Organization",
-        "@id": `${mainUrl}/#organization`,
-        name: siteName,
-        url: `${mainUrl}/`,
-        logo: {
-          "@type": "ImageObject",
-          inLanguage: "en-US",
-          "@id": `${mainUrl}/#/schema/logo/image/`,
-          url: `${mainUrl}/assets/images/logo-dark.webp`,
-          contentUrl: `${mainUrl}/assets/images/logo-dark.webp`,
-          width: 500,
-          height: 195,
-          caption: siteName,
-        },
-        image: {
-          "@id": `${mainUrl}/#/schema/logo/image/`,
-        },
-      },
-    ],
-  };
-
  return (
    <>
-      <script type="application/ld+json" dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }} />
      <HeroOther title={page.title} img={page?.heroImg?.url ?? ""} />
      <RenderBlocks blocks={page.layout} />
    </>
--- a/src/middleware.ts
+++ b/src/middleware.ts
@ -8,8 +8,6 @@ export function middleware(request: NextRequest) {
  const host = request.headers.get("x-forwarded-host") || request.nextUrl.hostname;
  const path = request.nextUrl.pathname + request.nextUrl.search;
  const siteName = "Cochise Oncology";
-  const metaDesc =
-    "Get compassionate care and excellent medical services from COCHISE ONCOLOGY in Sierra Vista, Arizona. We are the largest full-service cancer treatment center between Albuquerque, New Mexico and Tucson, Arizona.";

  // Construct the full URL
  const mainUrl = `${protocol}://${host}`;
@ -17,7 +15,6 @@ export function middleware(request: NextRequest) {
  request.headers.set("x-main-url", mainUrl);
  request.headers.set("x-full-url", fullUrl);
  request.headers.set("x-site-name", siteName);
-  request.headers.set("x-meta-desc", metaDesc);

  return NextResponse.next({
    request: {
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@ -304,7 +304,7 @@ export interface Page {
  meta?: {
    title?: string | null;
    description?: string | null;
-    canonical_url?: string | null;
+    cannonical_url?: string | null;
  };
  createdBy?: (number | null) | User;
  updatedBy?: (number | null) | User;
@ -749,7 +749,7 @@ export interface PagesSelect<T extends boolean = true> {
    | {
        title?: T;
        description?: T;
-        canonical_url?: T;
+        cannonical_url?: T;
      };
  createdBy?: T;
  updatedBy?: T;
--- a/src/utils/metadata.ts
+++ b/src/utils/metadata.ts
@ -6,12 +6,10 @@ export async function getDefaultMetadata(): Promise<Metadata> {
  const mainUrl = headersList.get("x-main-url") ?? "";
  const fullUrl = headersList.get("x-full-url") ?? "";
  const siteName = headersList.get("x-site-name") ?? "";
-  const metaDesc = headersList.get("x-meta-desc") ?? "";

  return {
    metadataBase: new URL(mainUrl),
    title: siteName,
-    description: metaDesc,
    robots: {
      index: true,
      follow: true,
@ -20,9 +18,8 @@ export async function getDefaultMetadata(): Promise<Metadata> {
      "max-video-preview": -1,
    },
    openGraph: {
-      siteName,
      title: siteName,
-      description: metaDesc,
+      siteName,
      type: "website",
      locale: "en_US",
      url: fullUrl,