fix: landing page meta

City-of-Helsinki · Dec 16, 2024 · cf56952 · cf56952
1 parent 4b25edb
commit cf56952
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 12 deletions.
diff --git a/apps/events-helsinki/src/pages/index.tsx b/apps/events-helsinki/src/pages/index.tsx
@@ -10,6 +10,7 @@ import {
   RouteMeta,
   useResilientTranslation,
   PreviewNotification,
+  PageMeta,
 } from '@events-helsinki/components';
 import { logger } from '@events-helsinki/components/loggers/logger';
 import type {
@@ -63,6 +64,10 @@ const HomePage: NextPage<{
         <>
           <PreviewNotification token={previewToken} />
           <RouteMeta origin={AppConfig.origin} />
+          <PageMeta
+            {...page?.seo}
+            image={page?.featuredImage?.node?.mediaItemUrl || ''}
+          />
           <RHHCPageContentNoSSR
             page={page}
             PageContentLayoutComponent={LandingPageContentLayout}

diff --git a/apps/hobbies-helsinki/src/pages/articles/[...slug].tsx b/apps/hobbies-helsinki/src/pages/articles/[...slug].tsx
@@ -74,13 +74,12 @@ const NextCmsArticle: NextPage<{
   const { resilientT } = useResilientTranslation();
   const { footerMenu } = useContext(NavigationContext);
 
-  const { data: categoriesData, loading: loadingCategories } =
-    useCategoriesQuery({
-      variables: {
-        first: CATEGORIES_AMOUNT,
-        language: getLanguageCodeFilter(currentLanguageCode),
-      },
-    });
+  const { data: categoriesData } = useCategoriesQuery({
+    variables: {
+      first: CATEGORIES_AMOUNT,
+      language: getLanguageCodeFilter(currentLanguageCode),
+    },
+  });
 
   const categories = categoriesData?.categories?.nodes ?? [];
 

diff --git a/apps/hobbies-helsinki/src/pages/index.tsx b/apps/hobbies-helsinki/src/pages/index.tsx
@@ -9,6 +9,7 @@ import {
   RouteMeta,
   useResilientTranslation,
   PreviewNotification,
+  PageMeta,
 } from '@events-helsinki/components';
 import { logger } from '@events-helsinki/components/loggers/logger';
 import type { GetStaticPropsContext, NextPage } from 'next';
@@ -57,6 +58,10 @@ const HomePage: NextPage<{
         <>
           <PreviewNotification token={previewToken} />
           <RouteMeta origin={AppConfig.origin} />
+          <PageMeta
+            {...page?.seo}
+            image={page?.featuredImage?.node?.mediaItemUrl || ''}
+          />
           <RHHCPageContentNoSSR
             page={page}
             PageContentLayoutComponent={LandingPageContentLayout}

diff --git a/apps/sports-helsinki/src/pages/index.tsx b/apps/sports-helsinki/src/pages/index.tsx
@@ -9,6 +9,7 @@ import {
   getLanguageOrDefault,
   RouteMeta,
   PreviewNotification,
+  PageMeta,
 } from '@events-helsinki/components';
 import { logger } from '@events-helsinki/components/loggers/logger';
 import type { GetStaticPropsContext, NextPage } from 'next';
@@ -58,6 +59,10 @@ const HomePage: NextPage<{
         <>
           <PreviewNotification token={previewToken} />
           <RouteMeta origin={AppConfig.origin} />
+          <PageMeta
+            {...page?.seo}
+            image={page?.featuredImage?.node?.mediaItemUrl || ''}
+          />
           <RHHCPageContentNoSSR
             page={page}
             PageContentLayoutComponent={LandingPageContentLayout}

diff --git a/packages/components/src/components/domain/seo/meta/PageMeta.tsx b/packages/components/src/components/domain/seo/meta/PageMeta.tsx
@@ -44,7 +44,9 @@ function PageMeta({
     <>
       <Head>
         {title && <title>{unescapeDash(title)}</title>}
-        {description && <meta name="description" content={description} />}
+        {description && (
+          <meta name="description" content={unescapeDash(description)} />
+        )}
         <meta property="og:title" content={openGraphTitle || ''} />
         <meta name="twitter:card" content="summary_large_image" />
         {description && (

diff --git a/packages/components/src/components/eventList/eventList.module.scss b/packages/components/src/components/eventList/eventList.module.scss
@@ -14,7 +14,7 @@
   .loadMoreWrapper {
     display: flex;
     justify-content: center;
-    
+
     &.buttonCentered {
       text-align: center;
     }

diff --git a/packages/components/src/components/footer/Footer.tsx b/packages/components/src/components/footer/Footer.tsx
@@ -46,8 +46,7 @@ const FooterSection: FunctionComponent<FooterSectionProps> = ({
   };
 
   const UserTrackingFeatures = dynamic(
-    () =>
-      import('../widgets/UserTrackingFeatures').then((mod) => mod),
+    () => import('../widgets/UserTrackingFeatures').then((mod) => mod),
     {
       ssr: false,
     }

diff --git a/packages/components/src/components/widgets/UserTrackingFeatures.tsx b/packages/components/src/components/widgets/UserTrackingFeatures.tsx
@@ -1,8 +1,8 @@
 import { useRouter } from 'next/router';
+import { useCookieConfigurationContext } from '../../cookieConfigurationProvider';
 import { AskemFeedbackContainer, AskemProvider } from '../askem';
 import useAskemContext from '../askem/useAskemContext';
 import EventsCookieConsent from '../eventsCookieConsent/EventsCookieConsent';
-import { useCookieConfigurationContext } from '../../cookieConfigurationProvider';
 
 type UserTrackingFeaturesProps = {
   appName: string;