Skip to content

Commit 5bf969a

Browse files
Merge pull request #249 from Web-Dev-Path/refactor/to-scss-BlogPostsContainer
Refactor/to scss blog posts container
2 parents 99be5bd + 9b4ec7d commit 5bf969a

4 files changed

Lines changed: 82 additions & 112 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
163163
- ButtonLink
164164
- SubmitButton
165165
- AuthorBio
166-
166+
- BlogPostsContainer
167167
- Updated ContactUsForm's checkbox wrapper from div to label to enhance its accessibility
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
@use '@/styles/mixins' as *;
2+
@use '@/styles/variables' as *;
3+
4+
.blogContainer {
5+
display: flex;
6+
flex-direction: column;
7+
margin: 3rem 0;
8+
}
9+
10+
.postContainer {
11+
display: flex;
12+
flex-wrap: wrap;
13+
justify-content: center;
14+
margin-bottom: 3rem;
15+
16+
@include tablet {
17+
justify-content: flex-start;
18+
}
19+
20+
& > div {
21+
@include desktop {
22+
flex-basis: 48%;
23+
}
24+
}
25+
26+
@include large-desktop {
27+
flex-basis: 32%;
28+
}
29+
}
30+
31+
.bottomLink {
32+
font-size: 1.5rem;
33+
font-weight: bold;
34+
position: relative;
35+
display: block;
36+
text-align: center;
37+
}
38+
39+
.viewAllBottomLink {
40+
@extend .bottomLink;
41+
top: -3rem;
42+
43+
@include desktop {
44+
float: right;
45+
top: -5rem;
46+
}
47+
}
48+
49+
.backBottomLink {
50+
@extend .bottomLink;
51+
top: -2rem;
52+
53+
@include desktop {
54+
float: left;
55+
top: -1rem;
56+
}
57+
}

components/blog/BlogPostsContainer/index.js

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import Link from 'next/link';
12
import { BlogCardsColumns } from '@/components/containers/CardColumns/BlogCardsColumns';
23
import { BlogCard } from '@/components/containers/Card/BlogCard';
34
import Title from '@/components/snippets/Title';
45
import RevealContentContainer from '@/components/containers/RevealContentContainer';
5-
import S from './styles';
66
import { tagToHeading } from '@/utils/blogCategories';
77
import Container from '@/components/containers/Container';
8+
import styles from './BlogPostsContainer.module.scss';
89

910
const BlogPostsContainer = ({
1011
posts,
@@ -24,7 +25,7 @@ const BlogPostsContainer = ({
2425

2526
return (
2627
<RevealContentContainer>
27-
<S.BlogContainer>
28+
<section className={styles.blogContainer}>
2829
{heading ? (
2930
<Container>
3031
<Title title={heading} />
@@ -34,40 +35,41 @@ const BlogPostsContainer = ({
3435
<Title title={tagToHeading[tag]} />
3536
</Container>
3637
) : null}
37-
{
38-
swipe ? (
39-
<>
40-
{[posts.slice(0,6)].map((p, index) => (
41-
<BlogCardsColumns key={index} cards={p} />
38+
{swipe ? (
39+
<>
40+
{[posts.slice(0, 6)].map((p, index) => (
41+
<BlogCardsColumns key={index} cards={p} />
42+
))}
43+
</>
44+
) : (
45+
<Container>
46+
<div className={styles.postContainer}>
47+
{posts?.map((p, index) => (
48+
<BlogCard $cardType='blog' key={index} card={p} />
4249
))}
43-
</>
44-
) : (
45-
<Container>
46-
<S.PostContainer>
47-
{posts?.map((p, index) => (
48-
<BlogCard $cardType='blog' key={index} card={p} />
49-
))}
50-
</S.PostContainer>
51-
</Container>
52-
)
53-
}
50+
</div>
51+
</Container>
52+
)}
5453

5554
{viewall && posts.length >= 3 ? (
5655
<Container>
57-
<S.ViewAllBottomLink
56+
<Link
5857
href={tag ? `/blog/category/${tag}` : '/blog/category/all'}
58+
className={styles.viewAllBottomLink}
5959
>
6060
view all
61-
</S.ViewAllBottomLink>
61+
</Link>
6262
</Container>
6363
) : null}
6464

6565
{back ? (
6666
<Container>
67-
<S.BackBottomLink href={`/blog`}>&#60; back</S.BackBottomLink>
67+
<Link href={`/blog`} className={styles.backBottomLink}>
68+
&#60; back
69+
</Link>
6870
</Container>
6971
) : null}
70-
</S.BlogContainer>
72+
</section>
7173
</RevealContentContainer>
7274
);
7375
};

components/blog/BlogPostsContainer/styles.js

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)