Merge pull request #28 from krckyboy/#24

#24

next/src/app/about/styles.module.scss

@@ -20,6 +20,6 @@
   }
 
   .mainContent {
-    margin-top: 3rem;
+    margin-top: 2rem;
   }
 }

next/src/app/blog/[slug]/(blog-header)/BlogHeader.tsx

@@ -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;
@@ -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>
   );
 };

next/src/app/blog/[slug]/(blog-header)/styles.module.scss

@@ -1,7 +1,3 @@
 .heading {
   text-transform: initial;
-}
-
-.categories {
-  margin-bottom: 2rem;
 }

next/src/app/blog/page.tsx

@@ -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>

next/src/app/blog/styles.module.scss

@@ -1,6 +1,5 @@
 @import '@/styles/vars';
 
 .blogs {
-  margin-top: 3rem;
   gap: 3rem;
 }

next/src/components/blog-post-item/types.ts

@@ -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,
@@ -35,16 +25,4 @@ export interface PostsFetchResponse {
       total: number
     }
   }
-}
-
-export interface CategoriesFetchResponse {
-  data: Category[],
-  meta: {
-    pagination: {
-      page: number,
-      pageSize: number,
-      pageCount: number,
-      total: number
-    }
-  }
 }

next/src/components/categories/Categories.tsx

@@ -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;

next/src/components/categories/category-link/CategoryLink.tsx

@@ -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;

next/src/components/categories/category-link/styles.module.scss

@@ -0,0 +1,9 @@
+@import '@/styles/vars';
+
+.link {
+  color: darken($color-text, 40%);
+
+  &.active {
+    color: $color-accent;
+  }
+}

next/src/components/categories/styles.module.scss

@@ -0,0 +1,8 @@
+@import '@/styles/vars';
+
+.categories {
+  margin-bottom: 3rem;
+  justify-content: flex-start;
+  display: flex;
+  gap: .5rem;
+}

next/src/components/categories/types.ts

@@ -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
+    }
+  }
+}

next/src/scripts/fetch.ts

@@ -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 {
@@ -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: {

next/src/styles/global.module.scss

@@ -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%);
-  }
 }