Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#24 #28

Merged
merged 3 commits into from
Feb 18, 2024
Merged

#24 #28

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion next/src/app/about/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
}

.mainContent {
margin-top: 3rem;
margin-top: 2rem;
}
}
9 changes: 2 additions & 7 deletions next/src/app/blog/[slug]/(blog-header)/BlogHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { FunctionComponent } from 'react';
import gStyles from '@/styles/global.module.scss';
import styles from './styles.module.scss';
import { Post } from '@/components/blog-post-item/types';
import Categories from '@/components/categories/Categories';

interface Props {
post: Post;
Expand All @@ -13,13 +14,7 @@ const BlogHeader: FunctionComponent<Props> = ({ post }) => {
return (
<header>
<h1 className={`${gStyles.pageHeading} ${styles.heading}`}>{post.attributes.title}</h1>
{Boolean(categories?.length) && categories && (
<ul className={`${gStyles.categories} ${styles.categories}`}>
{categories.map((category) => (
<li key={category.id}>#{category.attributes.name}</li>
))}
</ul>
)}
<Categories categories={categories} />
</header>
);
};
Expand Down
4 changes: 0 additions & 4 deletions next/src/app/blog/[slug]/(blog-header)/styles.module.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.heading {
text-transform: initial;
}

.categories {
margin-bottom: 2rem;
}
17 changes: 10 additions & 7 deletions next/src/app/blog/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,23 @@ import styles from './styles.module.scss';
import BlogPostItem from '@/components/blog-post-item/BlogPostItem';
import React from 'react';
import { db } from '@/scripts/fetch';
import Categories from '@/components/categories/Categories';

const Page: NextPage = async () => {
const posts = await db.getPosts();
interface Props {
searchParams: {
category?: string;
};
}

const Page: NextPage<Props> = async ({ searchParams: { category } }) => {
const posts = category ? await db.getPostsByCategory(category) : await db.getPosts();
const categories = await db.getCategories();

return (
<main>
<section className={`${gStyles.section} ${gStyles.paddingInline}`}>
<h1 className={gStyles.pageHeading}>Blog</h1>
<ul className={gStyles.categories}>
{categories.data.map((category) => (
<li key={category.id}>#{category.attributes.name}</li>
))}
</ul>
<Categories categories={categories.data} activeCategory={category} />
<div className={`${gStyles.blogs} ${styles.blogs}`}>
{posts.data.map((post) => <BlogPostItem post={post} key={post.id} />)}
</div>
Expand Down
1 change: 0 additions & 1 deletion next/src/app/blog/styles.module.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import '@/styles/vars';

.blogs {
margin-top: 3rem;
gap: 3rem;
}
24 changes: 1 addition & 23 deletions next/src/components/blog-post-item/types.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
interface Category {
id: number;
attributes: {
name: string;
color: string;
background: string;
createdAt: string,
updatedAt: string,
publishedAt: string,
};
}
import { Category } from '@/components/categories/types';

export interface Post {
id: number,
Expand All @@ -35,16 +25,4 @@ export interface PostsFetchResponse {
total: number
}
}
}

export interface CategoriesFetchResponse {
data: Category[],
meta: {
pagination: {
page: number,
pageSize: number,
pageCount: number,
total: number
}
}
}
27 changes: 27 additions & 0 deletions next/src/components/categories/Categories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React, { FunctionComponent } from 'react';
import styles from './styles.module.scss';
import { Category } from '@/components/categories/types';
import CategoryLink from './category-link/CategoryLink';

interface Props {
categories: Category[] | undefined;
activeCategory?: Category['attributes']['name'];
}

const Categories: FunctionComponent<Props> = ({ categories, activeCategory }) => {
if (!categories || !categories.length) {
return null;
}

return (
<ul className={`${styles.categories}`}>
{categories.map((category) => (
<li key={category.id}>
<CategoryLink activeCategory={activeCategory} name={category.attributes.name} />
</li>
))}
</ul>
);
};

export default Categories;
22 changes: 22 additions & 0 deletions next/src/components/categories/category-link/CategoryLink.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import Link from 'next/link';
import React, { FunctionComponent } from 'react';
import styles from './styles.module.scss';
import { Category } from '@/components/categories/types';

interface Props {
name: string;
activeCategory?: Category['attributes']['name'];
}

const CategoryLink: FunctionComponent<Props> = ({ activeCategory, name }) => {
const isActiveCategory = name === activeCategory;

const setActiveCategory = isActiveCategory ? styles.active : '';
const setHref = isActiveCategory ? '/blog' : `/blog?category=${name}`;

return (
<Link className={`${styles.link} ${setActiveCategory}`} href={setHref}>#{name}</Link>
);
};

export default CategoryLink;
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import '@/styles/vars';

.link {
color: darken($color-text, 40%);

&.active {
color: $color-accent;
}
}
8 changes: 8 additions & 0 deletions next/src/components/categories/styles.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@import '@/styles/vars';

.categories {
margin-bottom: 3rem;
justify-content: flex-start;
display: flex;
gap: .5rem;
}
22 changes: 22 additions & 0 deletions next/src/components/categories/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
export interface Category {
id: number;
attributes: {
name: string;
color: string;
background: string;
createdAt: string,
updatedAt: string,
publishedAt: string,
};
}
export interface CategoriesFetchResponse {
data: Category[],
meta: {
pagination: {
page: number,
pageSize: number,
pageCount: number,
total: number
}
}
}
22 changes: 21 additions & 1 deletion next/src/scripts/fetch.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { CategoriesFetchResponse, PostsFetchResponse } from '@/components/blog-post-item/types';
import qs from 'qs';
import type { PostsFetchResponse } from '@/components/blog-post-item/types';
import { CategoriesFetchResponse } from '@/components/categories/types';

export const fetchWrapper = async <T>(url: string | URL) => {
try {
Expand Down Expand Up @@ -35,6 +36,25 @@ export const db = {
const queryString = qs.stringify(queryParams);
return await fetchWrapper<PostsFetchResponse>(`/posts?${queryString}`);
},
getPostsByCategory: async (category: string) => {
const queryParams = {
sort: ['publishedAt:desc'],
filters: {
categories: {
name: {
$eq: category
}
}
},
pagination: {
pageSize: 10,
page: 1
}
};

const queryString = qs.stringify(queryParams);
return await fetchWrapper<PostsFetchResponse>(`/posts?${queryString}`);
},
getPostBySlug: async (slug: string) => {
const queryParams = {
filters: {
Expand Down
10 changes: 0 additions & 10 deletions next/src/styles/global.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,4 @@
.tagsMini {
@extend .tags;
font-size: clamp(1rem, 1.1vw, 1.4rem);
}

.categories {
justify-content: flex-start;
display: flex;
gap: .5rem;

li {
color: darken($color-text, 40%);
}
}
Loading