Skip to content

Commit a60e0ad

Browse files
Thechi2000Thechi2000
authored
fix: og properties (#57)
1 parent 6026449 commit a60e0ad

File tree

7 files changed

+1188
-805
lines changed

7 files changed

+1188
-805
lines changed

‎app/src/components/TabTitle.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export default function TabTitle(props: {
1010
return (
1111
<Head>
1212
<title>{`CLIC | ${props.title}`}</title>
13+
<meta property="og:site_name" content="CLIC" />
1314
<meta property="og:title" content={props.ogTitle || props.title} />
1415
<meta property="og:type" content={props.type || "website"} />
1516
{typeof props.image === "string" ? (

‎app/src/pages/association.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ export default function AssociationPage(
5252
title={capitalize(tt["association"])}
5353
ogTitle={props.association.name || undefined}
5454
description={tt["slogan"]}
55-
image={getDirectusImageUrl(
56-
getTranslation(props.association, router.locale).banner
57-
)}
55+
image={getDirectusImageUrl(props.association.preview_image)}
5856
/>
5957

6058
<div className={styles.center}>

‎app/src/pages/commissions.tsx

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import Background from "@/assets/background.svg";
22
import Icon from "@/assets/icons/family.svg";
33
import CommissionCard from "@/components/CommissionCard";
44
import TabTitle from "@/components/TabTitle";
5-
import { directus, populateLayoutProps } from "@/directus";
5+
import { directus, getDirectusImageUrl, populateLayoutProps } from "@/directus";
66
import { capitalize, useTranslationTable } from "@/locales";
77
import commissionsStyle from "@/styles/CommissionsPage.module.scss";
88
import listPageStyle from "@/styles/ListPage.module.scss";
9-
import { Commission } from "@/types/aliases";
10-
import { readItems } from "@directus/sdk";
9+
import { Association, Commission } from "@/types/aliases";
10+
import { readItems, readSingleton } from "@directus/sdk";
1111
import { GetServerSideProps, InferGetServerSidePropsType } from "next";
1212

1313
export default function Commissions(
@@ -17,7 +17,10 @@ export default function Commissions(
1717

1818
return (
1919
<>
20-
<TabTitle title={capitalize(tt["commissions"])} />
20+
<TabTitle
21+
title={capitalize(tt["commissions"])}
22+
image={getDirectusImageUrl(props.association.preview_image)}
23+
/>
2124

2225
<Background className={listPageStyle.background} name="background" />
2326
<div className={listPageStyle.page}>
@@ -41,9 +44,13 @@ export default function Commissions(
4144

4245
export const getServerSideProps: GetServerSideProps<{
4346
commissions: Commission[];
47+
association: Association;
4448
}> = populateLayoutProps(async (_) => {
4549
return {
4650
props: {
51+
association: await directus().request(
52+
readSingleton("association", { fields: ["preview_image"] })
53+
),
4754
commissions: await directus().request(
4855
readItems("commissions", {
4956
fields: [

‎app/src/pages/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export default function Home(
6464
title={tt["slogan"]}
6565
ogTitle={props.association.name || undefined}
6666
description={tt["slogan"]}
67-
image={getDirectusImageUrl(translation.banner)}
67+
image={getDirectusImageUrl(props.association.preview_image)}
6868
/>
6969
<Background className={styles.background} name="background" />
7070
<div className={styles.divLogo}>

‎app/src/pages/news.tsx

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import Background from "@/assets/background.svg";
22
import Icon from "@/assets/icons/news.svg";
33
import NewsCard from "@/components/NewsCard";
44
import TabTitle from "@/components/TabTitle";
5-
import { directus, populateLayoutProps } from "@/directus";
5+
import { directus, getDirectusImageUrl, populateLayoutProps } from "@/directus";
66
import { capitalize, useTranslationTable } from "@/locales";
77
import listPageStyle from "@/styles/ListPage.module.scss";
88
import newsStyle from "@/styles/NewsPage.module.scss";
9-
import { News } from "@/types/aliases";
10-
import { readItems } from "@directus/sdk";
9+
import { Association, News } from "@/types/aliases";
10+
import { readItems, readSingleton } from "@directus/sdk";
1111
import { GetServerSideProps, InferGetServerSidePropsType } from "next";
1212

1313
export default function NewsComponent(
@@ -17,7 +17,10 @@ export default function NewsComponent(
1717

1818
return (
1919
<>
20-
<TabTitle title={capitalize(tt["news"])} />
20+
<TabTitle
21+
title={capitalize(tt["news"])}
22+
image={getDirectusImageUrl(props.association.preview_image)}
23+
/>
2124

2225
<Background className={listPageStyle.background} name="background" />
2326
<div className={listPageStyle.page}>
@@ -37,9 +40,13 @@ export default function NewsComponent(
3740

3841
export const getServerSideProps: GetServerSideProps<{
3942
news: News[];
43+
association: Association;
4044
}> = populateLayoutProps(async (_) => {
4145
return {
4246
props: {
47+
association: await directus().request(
48+
readSingleton("association", { fields: ["preview_image"] })
49+
),
4350
news: await directus().request(
4451
readItems("news", {
4552
sort: "-date_created",

0 commit comments

Comments
 (0)