Merge pull request #157 from Saigon-Digital/seo-fix

minhtri0795 · web-flow · commit 9b699c89f128 · 2025-12-05T12:03:23.000+07:00
SEO fix
diff --git a/frontend/src/components/ImageContent/index.tsx b/frontend/src/components/ImageContent/index.tsx
@@ -17,7 +17,6 @@ const ImageContent = ({
   reverse,
   fullWidthLayout,
 }: ImageContentBlock) => {
-  console.log("content", content)
   const params = useRouter().asPath
   const ref = useRef<HTMLDivElement>(null)
   const scrollTo = (element: RefObject<HTMLDivElement>) => {
diff --git a/frontend/src/components/RichText/index.tsx b/frontend/src/components/RichText/index.tsx
@@ -3,8 +3,6 @@ import React from "react";
 import { twMerge } from "tailwind-merge";
 
 const RichText: React.FC<RichTextFragment> = (props) => {
-  console.log(props.richText);
-
   return (
     <section className="container-block pb-14 ">
       <div className="grid grid-cols-12 gap-y-10 px-5">
diff --git a/frontend/src/components/SEO/index.tsx b/frontend/src/components/SEO/index.tsx
@@ -10,8 +10,11 @@ export type TSEO = {
   defaultSEO?: SiteSettingFragment | null | undefined
   link?: string | null | undefined
   pageTitle?: string
+  slug: string
+  canonical: string
 }
 const SEO = (props: TSEO) => {
+    const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || ""
   const {seo: onPageSeo, link, defaultSEO, DEUri, ENUri} = props
   const favicon = defaultSEO?.favicon?.node?.sourceUrl
 
@@ -21,9 +24,10 @@ const SEO = (props: TSEO) => {
     image:
       onPageSeo?.socialGraphImage?.node?.sourceUrl ||
       defaultSEO?.openGraphImage?.node.sourceUrl,
-    seoCanonical: onPageSeo?.canonicalUrl || link?.replace("homepage/", ""),
-    url: link?.replace("homepage/", ""),
+    seoCanonical: props.canonical,
+    url: props.canonical,
   }
+  console.log('canonical', seo?.seoCanonical)
 
   return (
     <Head>
diff --git a/frontend/src/data/site_data.json b/frontend/src/data/site_data.json
diff --git a/frontend/src/data/site_map.json b/frontend/src/data/site_map.json
diff --git a/frontend/src/pages/[...wordpressNode].tsx b/frontend/src/pages/[...wordpressNode].tsx
@@ -7,10 +7,8 @@ export default function Page(props: WordPressTemplateProps) {
 }
 
 export const getStaticProps: GetStaticProps = async (ctx) => {
- 
   return getWordPressProps({
     ctx,
-   
   });
 };
 
diff --git a/frontend/src/pages/blog/[slug].tsx b/frontend/src/pages/blog/[slug].tsx
@@ -23,25 +23,30 @@ type Props = {
     siteSetting: SiteSettingFragment;
   };
   host?: string;
+  slug: string;
 };
-const index = ({blog, relatedBlog, locale, host, siteSettings}: Props) => {
+const index = ({blog, relatedBlog, locale, host, siteSettings, slug}: Props) => {
   const event = new Date(blog.dateGmt || new Date().getTime());
   const localeStr =
     locale?.toLocaleUpperCase() === LanguageCodeFilterEnum.En
       ? "en-EN"
       : "de-DE";
   let siteTitle = blog.title + " | Vulcanus Stahl";
   let link = host + `/${locale}` + "/blog" + blog.uri;
-  let DEUri = host + `/de` + "/blog" + blog.uri;
-  let ENUri = host + `/en` + "/blog" + blog.uri;
+
+    const enUrl = `${process.env.NEXT_PUBLIC_SITE_URL || ""}/en${slug}`
+    const deUrl = `${process.env.NEXT_PUBLIC_SITE_URL || ""}${slug}`
+
   return (
     <>
       <SEO
         link={link}
-        DEUri={DEUri}
-        ENUri={ENUri}
+        DEUri={deUrl}
+        ENUri={enUrl}
         defaultSEO={{...siteSettings.siteSetting, siteTitle: siteTitle}}
         seo={blog.pagesSetting}
+        slug={slug}
+        canonical={locale === "de" ? deUrl : enUrl}
       />
       <main className="  py-20 pb-10 lg:py-0 lg:pb-0">
         <div className="mx-auto mb-10 flex max-w-[912px] flex-col gap-6 px-5 lg:mb-20">
@@ -98,6 +103,7 @@ export const getServerSideProps = (async (context) => {
       host,
       siteSettings: siteSettings,
       hideLanguageToggle:true,
+      slug: `/blog/${slug}`,
     },
   };
 }) satisfies GetServerSideProps<{
diff --git a/frontend/src/wp-templates/page.tsx b/frontend/src/wp-templates/page.tsx
@@ -10,6 +10,7 @@ import SEO from "@/components/SEO"
 
 const Page: FaustTemplate<GetPageQuery> = (props) => {
   // Loading state for previews
+  const router = useRouter()
   if (props.loading) {
     return <>Loading...</>
   }
@@ -26,16 +27,22 @@ const Page: FaustTemplate<GetPageQuery> = (props) => {
   let socialLink =
     process.env.NEXT_PUBLIC_SITE_URL +
     (props?.data?.page?.translation?.uri ?? "")
-  // console.log(socialLink)
+
+const slug = router.asPath === "/" ? "" : router.asPath
+    const enUrl = `${process.env.NEXT_PUBLIC_SITE_URL || ""}/en${slug}`
+    const deUrl = `${process.env.NEXT_PUBLIC_SITE_URL || ""}${slug}`
+    const locale = router.locale
 
   return (
     <>
       <SEO
-        DEUri={props?.data?.page?.translation?.DELang?.link}
-        ENUri={props.data?.page?.translation?.ENLang?.link}
+        DEUri={deUrl}
+        ENUri={enUrl}
         seo={props?.data?.page?.translation?.pagesSetting}
         defaultSEO={{...siteSetting?.siteSetting, siteTitle: siteTitle}}
         link={socialLink}
+        slug={slug}
+        canonical={locale === "de" ? deUrl : enUrl}
       />
 
       <BlockViewer dynamicBlocks={dynamicBlocks} />

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,8 @@ export default function Page(props: WordPressTemplateProps) {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`export const getStaticProps: GetStaticProps = async (ctx) => {`
`10`		`-`
`11`	`10`	`return getWordPressProps({`
`12`	`11`	`ctx,`
`13`		`-`
`14`	`12`	`});`
`15`	`13`	`};`
`16`	`14`