From b5175c77022764e14e7a7a93aad9bcd0acc74254 Mon Sep 17 00:00:00 2001
From: "Aman Kumar [SSW]" <71385247+amankumarrr@users.noreply.github.com>
Date: Mon, 21 Oct 2024 16:08:05 +1100
Subject: [PATCH 1/3] App Routing - Migrating Company Index
Fixed #3238
Affected Route: `/company`
---
app/company/index.tsx | 69 +++++++++++++++++++++++++
app/company/page.tsx | 57 ++++++++++++++++++++
app/consulting/page.tsx | 2 +-
pages/company/index.tsx | 112 ----------------------------------------
tina/tina-lock.json | 2 +-
5 files changed, 128 insertions(+), 114 deletions(-)
create mode 100644 app/company/index.tsx
create mode 100644 app/company/page.tsx
delete mode 100644 pages/company/index.tsx
diff --git a/app/company/index.tsx b/app/company/index.tsx
new file mode 100644
index 000000000..4753ce2eb
--- /dev/null
+++ b/app/company/index.tsx
@@ -0,0 +1,69 @@
+import { BuiltOnAzure } from "@/components/blocks";
+import { componentRenderer } from "@/components/blocks/mdxComponentRenderer";
+import CompanyHeader from "@/components/company/companyHeader";
+import CompanyPages from "@/components/company/companyPages";
+import { Section } from "@/components/util/section";
+import { removeExtension } from "@/services/client/utils.service";
+import { Breadcrumbs } from "app/components/breadcrumb";
+import { tinaField } from "tinacms/dist/react";
+import { TinaMarkdown } from "tinacms/dist/rich-text";
+
+export default function CompanyIndexPage({ props, tinaProps }) {
+ const { data } = tinaProps;
+ const { companyPageProps } = props;
+
+ return (
+ <>
+ {data.companyIndex.headerImage?.heroBackground && (
+
+ )}
+ {data.companyIndex.seo?.showBreadcrumb === null ||
+ (data.companyIndex.seo?.showBreadcrumb && (
+
+ ))}
+
+
+ {data.companyIndex.title}
+
+
+ {data.companyIndex._body.children.length > 0 && (
+
+ )}
+ {data.companyIndex.companyPages?.length > 0 ? (
+
+ ) : (
+ <>
+ )}
+
+
+ );
+}
diff --git a/app/company/page.tsx b/app/company/page.tsx
new file mode 100644
index 000000000..fa3fc8071
--- /dev/null
+++ b/app/company/page.tsx
@@ -0,0 +1,57 @@
+import client from "@/tina/client";
+import { TinaClient } from "app/tina-client";
+
+import { CompanyIndexProps } from "@/components/company/companyPageCard";
+import { TODAY } from "hooks/useFetchEvents";
+import { useSEO } from "hooks/useSeo";
+import { Metadata } from "next";
+import CompanyIndex from "./index";
+
+export async function generateMetadata(): Promise {
+ const tinaProps = await getData();
+
+ const seo = tinaProps.props.seo;
+ if (seo && !seo.canonical) {
+ seo.canonical = `${tinaProps.props.header.url}/company`;
+ }
+
+ // eslint-disable-next-line react-hooks/rules-of-hooks
+ const { seoProps } = useSEO(seo);
+
+ return { ...seoProps };
+}
+
+const getData = async () => {
+ const tinaProps = await client.queries.companyIndexContentQuery({
+ relativePath: "index.mdx",
+ date: TODAY.toISOString(),
+ });
+
+ const seo = tinaProps.data.companyIndex.seo;
+
+ const companyPageProps =
+ tinaProps.data.companyIndex?.companyPages?.map((m) => ({
+ title: m.title,
+ body: m.body,
+ pageURL: m.pageURL,
+ isExternal: m.isExternal,
+ })) || [];
+
+ return {
+ props: {
+ data: tinaProps.data,
+ query: tinaProps.query,
+ header: {
+ url: tinaProps.data.global.header.url,
+ },
+ variables: tinaProps.variables,
+ seo,
+ companyPageProps,
+ },
+ };
+};
+
+export default async function Index() {
+ const { props } = await getData();
+ return ;
+}
diff --git a/app/consulting/page.tsx b/app/consulting/page.tsx
index fee229007..5addb5089 100644
--- a/app/consulting/page.tsx
+++ b/app/consulting/page.tsx
@@ -11,7 +11,7 @@ export async function generateMetadata(): Promise {
const seo = tinaProps.props.seo;
if (seo && !seo.canonical) {
- seo.canonical = `${tinaProps.props.header.url}/consulting`;
+ seo.canonical = `${tinaProps.props.header.url}consulting`;
}
// eslint-disable-next-line react-hooks/rules-of-hooks
diff --git a/pages/company/index.tsx b/pages/company/index.tsx
deleted file mode 100644
index 258b6edb7..000000000
--- a/pages/company/index.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import client from "@/tina/client";
-import { TODAY } from "hooks/useFetchEvents";
-import { InferGetStaticPropsType } from "next";
-import { tinaField, useTina } from "tinacms/dist/react";
-import { TinaMarkdown } from "tinacms/dist/rich-text";
-import { BuiltOnAzure } from "../../components/blocks";
-import { Breadcrumbs } from "../../components/blocks/breadcrumbs";
-import { componentRenderer } from "../../components/blocks/mdxComponentRenderer";
-import CompanyHeader from "../../components/company/companyHeader";
-import { CompanyIndexProps } from "../../components/company/companyPageCard";
-import CompanyPages from "../../components/company/companyPages";
-import { Layout } from "../../components/layout";
-import { Section } from "../../components/util/section";
-import { SEO } from "../../components/util/seo";
-import { removeExtension } from "../../services/client/utils.service";
-
-export default function CompanyIndexPage(
- props: InferGetStaticPropsType
-) {
- const { data } = useTina({
- data: props.data,
- query: props.query,
- variables: props.variables,
- });
-
- const companyPageProps =
- data.companyIndex?.companyPages?.map((m) => ({
- title: m.title,
- body: m.body,
- pageURL: m.pageURL,
- isExternal: m.isExternal,
- })) || [];
-
- return (
-
-
-
- {data.companyIndex.headerImage?.heroBackground && (
-
- )}
- {data.companyIndex.seo?.showBreadcrumb === null ||
- (data.companyIndex.seo?.showBreadcrumb && (
-
- ))}
-
-
- {data.companyIndex.title}
-
-
- {data.companyIndex._body.children.length > 0 && (
-
- )}
- {data.companyIndex.companyPages?.length > 0 ? (
-
- ) : (
- <>
- )}
-
-
-