{title}
{description}
diff --git a/app/src/components/DirectusImage.tsx b/app/src/components/DirectusImage.tsx new file mode 100644 index 0000000..a736070 --- /dev/null +++ b/app/src/components/DirectusImage.tsx @@ -0,0 +1,36 @@ +import { components } from "@/types/schema"; +import Image, { ImageLoader } from "next/image"; + +const imageLoader: ImageLoader = ({ src, width, quality }) => { + return `${process.env.NEXT_PUBLIC_DIRECTUS_URL}/assets/${src}?width=${width}`; +}; + +/** + * Display an Image fetched from the Directus instance + * @param img unique public identifier of the image . + */ +export default function DirectusImage({ + img, + name, + className, +}: { + img?: string | components["schemas"]["Files"] | null; + name?: string; + className?: string; +}) { + if (img) { + return ( +ERROR
; + } +} diff --git a/app/src/components/NavigationBar.tsx b/app/src/components/NavigationBar.tsx index e49e16f..d98e073 100644 --- a/app/src/components/NavigationBar.tsx +++ b/app/src/components/NavigationBar.tsx @@ -17,7 +17,7 @@ function Entry({ title, href }: { title: string; href: string }) { ); } -/* TODO the socials should be dynamically loaded from Strapi. +/* TODO the socials should be dynamically loaded from Directus. This would probably require to migrate to an App Router to use server-side components. */ export default function NavigationBar() { diff --git a/app/src/components/NewsCard.tsx b/app/src/components/NewsCard.tsx index c5042f5..4c0d859 100644 --- a/app/src/components/NewsCard.tsx +++ b/app/src/components/NewsCard.tsx @@ -1,21 +1,28 @@ -import StrapiImage from "./StrapiImage"; +import DirectusImage from "./DirectusImage"; +import { getTranslation } from "@/locales"; import styles from "@/styles/NewsCard.module.scss"; -import { ApiNews } from "@/types/generated/contentTypes"; +import { News } from "@/types/aliases"; import Link from "next/link"; +import { useRouter } from "next/router"; -export default function NewsCard({ news }: { news: ApiNews }) { +export default function NewsCard({ news }: { news: News }) { + const router = useRouter(); + + const translation = getTranslation(news, router.locale); return ( - -{news.attributes.small_description}
-{new Date(news.attributes.createdAt).toUTCString()}
+{translation.description}
++ {news.date_created ? new Date(news.date_created).toUTCString() : ""} +
- {`${formatDate(props.news.attributes.createdAt, router.locale, { - capitalize: true, - })}`} -
-+ {`${formatDate(props.news.date_created, router.locale, { + capitalize: true, + })}`} +
+ ) : ( + <> + )} +{JSON.stringify(props.association, null, 2)}
; +} + +export const getServerSideProps: GetServerSideProps<{ + association: any; +}> = async (context) => { + const assoc = await directus.request( + readItem("news", 1, { + deep: { + translations: { + _filter: { + languages_code: { _eq: "fr-FR" }, + }, + }, + }, + fields: ["*", { translations: ["*"] }], + }) + ); + console.log(assoc); + return { props: { association: assoc } }; +}; diff --git a/app/src/strapi.ts b/app/src/strapi.ts deleted file mode 100644 index b32f06a..0000000 --- a/app/src/strapi.ts +++ /dev/null @@ -1,14 +0,0 @@ -import Strapi from "strapi-sdk-js"; - -export const STRAPI_URL = "http://clic-strapi:8001"; -export const CLIENT_STRAPI_URL = "http://localhost/strapi"; - -const strapi = new Strapi({ - url: STRAPI_URL, - axiosOptions: { - headers: { - Authorization: `bearer ${process.env.STRAPI_TOKEN}`, - }, - }, -}); -export default strapi; diff --git a/app/src/styles/Card.module.scss b/app/src/styles/Card.module.scss index ec5900d..d564148 100644 --- a/app/src/styles/Card.module.scss +++ b/app/src/styles/Card.module.scss @@ -28,6 +28,7 @@ max-width: 10rem; min-height: 10rem; max-height: 10rem; + overflow: hidden; } } @@ -49,6 +50,8 @@ max-width: 6rem; min-height: 6rem; max-height: 6rem; + + overflow: hidden; } .description { diff --git a/app/src/styles/globals.scss b/app/src/styles/globals.scss index 559aa1a..f6c0907 100644 --- a/app/src/styles/globals.scss +++ b/app/src/styles/globals.scss @@ -29,7 +29,8 @@ a { } .CLICLogo { - width: 50%; + width: 100%; + height: 30rem; fill: white; margin: auto; margin-top: 30vh; diff --git a/app/src/types/aliases.ts b/app/src/types/aliases.ts new file mode 100644 index 0000000..22802d4 --- /dev/null +++ b/app/src/types/aliases.ts @@ -0,0 +1,10 @@ +import { Schema } from "./schema"; + +export type Association = Schema["association"]; +export type AssociationMembership = Schema["association_memberships"][0]; +export type Commission = Schema["commissions"][0]; +export type CommissionMembership = Schema["commission_memberships"][0]; +export type Member = Schema["members"][0]; +export type News = Schema["news"][0]; +export type Partner = Schema["partners"][0]; +export type SocialLink = Schema["social_links"][0]; diff --git a/app/src/types/generated/components.d.ts b/app/src/types/generated/components.d.ts deleted file mode 100644 index 767e5fb..0000000 --- a/app/src/types/generated/components.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { Schema, Attribute } from "@strapi/strapi"; - -declare module "@strapi/strapi" { - export module Shared {} -} diff --git a/app/src/types/generated/contentTypes.d.ts b/app/src/types/generated/contentTypes.d.ts deleted file mode 100644 index c3d5ad8..0000000 --- a/app/src/types/generated/contentTypes.d.ts +++ /dev/null @@ -1,1276 +0,0 @@ -import type { Attribute, Schema } from "@strapi/strapi"; - -export interface AdminPermission extends Schema.CollectionType { - collectionName: "admin_permissions"; - info: { - name: "Permission"; - description: ""; - singularName: "permission"; - pluralName: "permissions"; - displayName: "Permission"; - }; - pluginOptions: { - "content-manager": { - visible: false; - }; - "content-type-builder": { - visible: false; - }; - }; - attributes: { - action: Attribute.String & - Attribute.Required & - Attribute.SetMinMaxLength<{ - minLength: 1; - }>; - subject: Attribute.String & - Attribute.SetMinMaxLength<{ - minLength: 1; - }>; - properties: Attribute.JSON & Attribute.DefaultTo<{}>; - conditions: Attribute.JSON & Attribute.DefaultTo<[]>; - role: Attribute.Relation<"admin::permission", "manyToOne", "admin::role">; - createdAt: Attribute.DateTime; - updatedAt: Attribute.DateTime; - createdBy: Attribute.Relation< - "admin::permission", - "oneToOne", - "admin::user" - > & - Attribute.Private; - updatedBy: Attribute.Relation< - "admin::permission", - "oneToOne", - "admin::user" - > & - Attribute.Private; - }; -} - -export interface AdminUser extends Schema.CollectionType { - collectionName: "admin_users"; - info: { - name: "User"; - description: ""; - singularName: "user"; - pluralName: "users"; - displayName: "User"; - }; - pluginOptions: { - "content-manager": { - visible: false; - }; - "content-type-builder": { - visible: false; - }; - }; - attributes: { - firstname: Attribute.String & - Attribute.SetMinMaxLength<{ - minLength: 1; - }>; - lastname: Attribute.String & - Attribute.SetMinMaxLength<{ - minLength: 1; - }>; - username: Attribute.String; - email: Attribute.Email & - Attribute.Required & - Attribute.Private & - Attribute.Unique & - Attribute.SetMinMaxLength<{ - minLength: 6; - }>; - password: Attribute.Password & - Attribute.Private & - Attribute.SetMinMaxLength<{ - minLength: 6; - }>; - resetPasswordToken: Attribute.String & Attribute.Private; - registrationToken: Attribute.String & Attribute.Private; - isActive: Attribute.Boolean & - Attribute.Private & - Attribute.DefaultTo