From 666e9aa72429e2fbbf5a3e208ddfddf6b8faa060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A4ser?= Date: Mon, 13 Feb 2023 11:08:43 +0100 Subject: [PATCH] fix: Ajuste some CSS rules and next config for images --- .../components/blog-search/blog-search.tsx | 2 +- .../card-blog-details/card-blog-details.tsx | 11 ++- .../components/card-blog/card-blog.tsx | 6 +- .../components/categories/categories.tsx | 2 +- apps/website/components/footer/footer.tsx | 2 +- .../home-section-blog-une.module.scss | 7 ++ .../home-section-blog-une.spec.tsx | 10 +++ .../home-section-blog-une.tsx | 75 +++++++++++++++++++ .../home-section-blog/home-section-blog.tsx | 64 +--------------- .../home-section-cards-header.tsx | 2 +- .../home-section-video/home-section-video.tsx | 2 +- .../last-articles/last-articles.tsx | 10 +-- apps/website/libs/utils.ts | 5 +- apps/website/next.config.js | 4 +- .../blog/[category_slug]/[post_slug].tsx | 8 +- .../pages/blog/[category_slug]/index.tsx | 8 +- apps/website/pages/blog/index.tsx | 8 +- 17 files changed, 131 insertions(+), 95 deletions(-) create mode 100644 apps/website/components/home-section-blog-une/home-section-blog-une.module.scss create mode 100644 apps/website/components/home-section-blog-une/home-section-blog-une.spec.tsx create mode 100644 apps/website/components/home-section-blog-une/home-section-blog-une.tsx diff --git a/apps/website/components/blog-search/blog-search.tsx b/apps/website/components/blog-search/blog-search.tsx index 4d248bc..9737e04 100644 --- a/apps/website/components/blog-search/blog-search.tsx +++ b/apps/website/components/blog-search/blog-search.tsx @@ -55,7 +55,7 @@ export function BlogSearch(props: BlogSearchProps) { const onSearchChange = (e) => subject.next(e.target.value); return ( -
diff --git a/apps/website/components/card-blog-details/card-blog-details.tsx b/apps/website/components/card-blog-details/card-blog-details.tsx index ccb92e6..ca4604d 100644 --- a/apps/website/components/card-blog-details/card-blog-details.tsx +++ b/apps/website/components/card-blog-details/card-blog-details.tsx @@ -14,7 +14,7 @@ import { } from "react-share"; import styles from './card-blog-details.module.scss'; -import {getCategoryUrl, getPostUrl, getStrapiImage} from "../../libs/utils"; +import {contentfulImageLoader, getCategoryUrl, getPostUrl, getStrapiImage} from "../../libs/utils"; /* eslint-disable-next-line */ export interface CardBlogDetailsProps { @@ -26,7 +26,7 @@ export function CardBlogDetails({item = {}}: CardBlogDetailsProps) { const {title} = item; const shareUrl = getPostUrl(item); return ( -
@@ -59,14 +59,13 @@ export function CardBlogDetails({item = {}}: CardBlogDetailsProps) { text-gray-600 dark:text-gray-300" dangerouslySetInnerHTML={{__html: delve(item, 'description', 'N/A')}} /> - + alt={delve(item, 'title', 'N/A')} />}
diff --git a/apps/website/components/card-blog/card-blog.tsx b/apps/website/components/card-blog/card-blog.tsx index 14c4fb6..cc43aaa 100644 --- a/apps/website/components/card-blog/card-blog.tsx +++ b/apps/website/components/card-blog/card-blog.tsx @@ -11,16 +11,16 @@ export interface CardBlogProps { export function CardBlog({item}: CardBlogProps) { return ( -
- Modern building architecture
-
+
diff --git a/apps/website/components/footer/footer.tsx b/apps/website/components/footer/footer.tsx index 4bb00e7..608d02d 100644 --- a/apps/website/components/footer/footer.tsx +++ b/apps/website/components/footer/footer.tsx @@ -6,7 +6,7 @@ export function Footer({items = []}) { const value = delve(item, 'attributes', {}); return ( -
  • +
  • {value.title} diff --git a/apps/website/components/home-section-blog-une/home-section-blog-une.module.scss b/apps/website/components/home-section-blog-une/home-section-blog-une.module.scss new file mode 100644 index 0000000..45c2aa4 --- /dev/null +++ b/apps/website/components/home-section-blog-une/home-section-blog-une.module.scss @@ -0,0 +1,7 @@ +/* + * Replace this with your own classes + * + * e.g. + * .container { + * } +*/ diff --git a/apps/website/components/home-section-blog-une/home-section-blog-une.spec.tsx b/apps/website/components/home-section-blog-une/home-section-blog-une.spec.tsx new file mode 100644 index 0000000..0fe237a --- /dev/null +++ b/apps/website/components/home-section-blog-une/home-section-blog-une.spec.tsx @@ -0,0 +1,10 @@ +import { render } from '@testing-library/react'; + +import HomeSectionBlogUne from './home-section-blog-une'; + +describe('HomeSectionBlogUne', () => { + it('should render successfully', () => { + const { baseElement } = render(); + expect(baseElement).toBeTruthy(); + }); +}); diff --git a/apps/website/components/home-section-blog-une/home-section-blog-une.tsx b/apps/website/components/home-section-blog-une/home-section-blog-une.tsx new file mode 100644 index 0000000..8c42888 --- /dev/null +++ b/apps/website/components/home-section-blog-une/home-section-blog-une.tsx @@ -0,0 +1,75 @@ +import {format} from "date-fns"; +import NextImage from "next/image"; +import delve from 'dlv'; + +import {contentfulImageLoader, getCategoryUrl, getPostUrl, getStrapiImage, getStrapiImageSize} from "../../libs/utils"; + +/* eslint-disable-next-line */ +export interface HomeSectionBlogUneProps { + item: object; +} + +export function HomeSectionBlogUne({item}: HomeSectionBlogUneProps) { + const [width, height] = getStrapiImageSize(item); + + return ( + <> +
    +
    + {format(new Date(delve(item, 'attributes.publishedAt', 'Jun 1, 2020')), 'dd/MM/yyyy')} +
    + + + {} + +
    +
    + + {delve(item, 'attributes.title', 'N/A')} + +

    {delve(item, 'attributes.description', 'N/A')}

    +
    + + +
    +
    + + ); +} + +export default HomeSectionBlogUne; diff --git a/apps/website/components/home-section-blog/home-section-blog.tsx b/apps/website/components/home-section-blog/home-section-blog.tsx index 58ef6c9..564f0a9 100644 --- a/apps/website/components/home-section-blog/home-section-blog.tsx +++ b/apps/website/components/home-section-blog/home-section-blog.tsx @@ -1,10 +1,7 @@ /* eslint-disable-next-line */ -import NextImage from "next/image"; -import delve from 'dlv'; - -import {getCategoryUrl, getPostUrl, getStrapiImage, getStrapiImageSize} from "../../libs/utils"; +import {getStrapiImageSize} from "../../libs/utils"; import CardBlog from "../card-blog/card-blog"; -import {format} from "date-fns"; +import HomeSectionBlogUne from "../home-section-blog-une/home-section-blog-une"; export interface HomeSectionBlogProps { posts: object[]; @@ -13,66 +10,11 @@ export interface HomeSectionBlogProps { export function HomeSectionBlog({posts = []}: HomeSectionBlogProps) { const firstArticle = posts.length > 0 ? posts.slice(0, 1) : []; const otherArticles = posts.length > 0 ? posts.slice(1, posts.length) : []; - const [width, height] = getStrapiImageSize(firstArticle[0]); return ( <>
    -
    -
    - {format(new Date(delve(firstArticle[0], 'attributes.publishedAt', 'Jun 1, 2020')), 'dd/MM/yyyy')} -
    - - - - -
    -
    - - {delve(firstArticle[0], 'attributes.title', 'N/A')} - -

    {delve(firstArticle[0], 'attributes.description', 'N/A')}

    -
    - - -
    -
    +
    {otherArticles.map((item: object, index: number) => (
    -

    MeCP fournit tout les outils nécessaire pour un apprentissage de qualité

    +

    MeCP fournit tout les outils nécessaire pour un apprentissage de qualité

    Démonstration en vidéo -

    Rien ne vaut une démonstration pour convaincre !

    +

    Rien ne vaut une démonstration pour convaincre !