From fbf6efab6f5181cac74d617396514349ef124ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Souchet=20C=C3=A9line?= Date: Wed, 17 Nov 2021 11:42:12 +0100 Subject: [PATCH 01/27] Merge Post & PostContainer classes --- src/theme/components/Post.tsx | 48 ++++++++++++----------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/src/theme/components/Post.tsx b/src/theme/components/Post.tsx index bf2a1f687..2bc67d4ed 100644 --- a/src/theme/components/Post.tsx +++ b/src/theme/components/Post.tsx @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import React, { ReactNode } from 'react'; +import React from 'react'; import { Heading, Text } from 'rebass/styled-components'; import styled from 'styled-components'; import { PostDescription } from '../types'; @@ -30,36 +30,6 @@ export const Post = ({ date, time, }: PostProps): JSX.Element => ( - - - {title} - - {cover && } - - {text} - - - {`${date} - `} - {`${Math.ceil(time)} min read`} - - -); - -const TimeReadSpan = styled.span` - text-transform: none; -`; - -type PostContainerProps = { - url: string; - title: string; - children: ReactNode; -}; - -const PostContainer = ({ - url, - title, - children, -}: PostContainerProps): JSX.Element => ( - {children} + + {title} + + {cover && } + + {text} + + + {`${date} - `} + {`${Math.ceil(time)} min read`} + ); +const TimeReadSpan = styled.span` + text-transform: none; +`; + const CoverImage = styled.img` width: 100%; height: 200px; From d7139fba64197c664e470d1549f1364ea8c0c1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Souchet=20C=C3=A9line?= Date: Wed, 17 Nov 2021 11:43:56 +0100 Subject: [PATCH 02/27] Move PostContainer from Blog to Post --- src/pages/blog.tsx | 5 +++-- src/theme/components/Post.tsx | 20 +++++++++++++++++++- src/theme/sections/Blog.tsx | 21 +++------------------ src/theme/sections/News.tsx | 13 ++----------- 4 files changed, 27 insertions(+), 32 deletions(-) diff --git a/src/pages/blog.tsx b/src/pages/blog.tsx index fae6329a4..98ca9dedc 100644 --- a/src/pages/blog.tsx +++ b/src/pages/blog.tsx @@ -21,7 +21,8 @@ import Section from '../theme/components/Section'; import { PAGE, SECTION } from '../theme/utils/constants'; import { Heading } from 'rebass/styled-components'; import Triangle from '../theme/components/Triangle'; -import { PostContainer } from '../theme/sections/Blog'; +import { PostContainer } from '../theme/components/Post'; +import { postsContent } from '../content/PostsContent'; const BlogPage = (): JSX.Element => ( @@ -37,7 +38,7 @@ const BlogPage = (): JSX.Element => ( > {SECTION.blog} - +