Merge branch 'main' into dependabot/npm_and_yarn/types/react-18.2.55

project-words.txt

@@ -7,4 +7,6 @@ Skauna
 hookform
 sonner
 Bootcamp
-Udemy
+Udemy
+Csvg
+Cpath

src/app/[slug]/page.tsx

@@ -1,21 +1,41 @@
 import ProjectPageChips from '@/components/project-page-chips'
 import Card from '@/components/ui/card'
-import Chips from '@/components/ui/chips/chips'
-import ChipsItem from '@/components/ui/chips/chips-item'
 import Content from '@/components/ui/content'
 import Heading from '@/components/ui/heading'
 import IconsList from '@/components/ui/icons-list/icons-list'
 import IconsListItem from '@/components/ui/icons-list/icons-list-item'
 import ImagePlaceholder from '@/components/ui/image-placeholder'
+import { LINK } from '@/types/enums/Link'
+import { SITE_URL } from '@/utils'
 import { getProject, getSlugs } from '@/utils/projects'
 import Image from 'next/image'
+import Link from 'next/link'
+import { BiArrowBack } from 'react-icons/bi'
 import { FaGithub } from 'react-icons/fa'
 import { TfiWorld } from 'react-icons/tfi'
 
 type ProjectPageProps = {
   params: { slug: string }
 }
 
+export async function generateMetadata({ params: { slug } }: ProjectPageProps) {
+  const { body, title } = await getProject(slug)
+
+  return {
+    description: body,
+    openGraph: {
+      images: {
+        alt: `${title || slug}`,
+        height: 630,
+        type: 'image/png',
+        url: `${SITE_URL}/api/og?title=${title || slug}${body && `&description=${body}`}`,
+        width: 1200,
+      },
+    },
+    title,
+  }
+}
+
 export async function generateStaticParams() {
   const slugs = await getSlugs()
   return slugs.map((slug) => ({ slug }))
@@ -28,7 +48,14 @@ export default async function Project({ params: { slug } }: ProjectPageProps) {
   return (
     <section className="pt-header">
       <Content className="pb-16 pt-12 md:pb-24 md:pt-20" size="tight">
-        <article className="flex flex-col gap-5 md:gap-7">
+        <Link
+          className="group flex items-center gap-2 text-accent transition-colors hover:text-accent-light md:text-lg"
+          href={LINK.projects}
+        >
+          <BiArrowBack className="h-5 w-5 transition-transform group-hover:-translate-x-1" />{' '}
+          Go Back to Projects
+        </Link>
+        <article className="mt-3 flex flex-col gap-5 md:mt-5 md:gap-7">
           <header>
             {website || github ? (
               <div className="flex items-center justify-between">
@@ -55,7 +82,7 @@ export default async function Project({ params: { slug } }: ProjectPageProps) {
             )}
             {body && (
               <p
-                className="mt-7 md:text-lg"
+                className="mt-5 md:mt-7 md:text-lg"
                 dangerouslySetInnerHTML={{ __html: body }}
               />
             )}

src/app/layout.tsx

@@ -1,19 +1,30 @@
-// TODO: Adjust site metadata
-// TODO: Add 404 page
-
 import type { Metadata } from 'next'
 
 import Footer from '@/components/footer'
 import Header from '@/components/header/header'
 import Providers from '@/store/providers'
-import { cn } from '@/utils'
+import { SITE_URL, cn } from '@/utils'
 
 import { raleway } from './fonts'
 import './globals.css'
 
 export const metadata: Metadata = {
-  description: 'Generated by create next app',
-  title: 'Create Next App',
+  description:
+    "Hi, my name is Anton Bochkovskyi and I'm a Front-End Developer specializing in React, Next.js, and Tailwind CSS, with a keen focus on crafting responsive and visually stunning web applications.",
+  metadataBase: new URL(SITE_URL),
+  openGraph: {
+    images: {
+      alt: 'Anton Bochkovskyi - Front-End Developer',
+      height: 630,
+      type: 'image/png',
+      url: `${SITE_URL}/api/og?title=Anton%20Bochkovskyi%20-%20Front-End%20Developer`,
+      width: 1200,
+    },
+  },
+  title: {
+    default: 'Anton Bochkovskyi - Front-End Developer',
+    template: '%s | Anton Bochkovskyi - Front-End Developer',
+  },
 }
 
 export default function RootLayout({

src/app/not-found.tsx

@@ -0,0 +1,30 @@
+import { buttonVariants } from '@/components/ui/button'
+import Content from '@/components/ui/content'
+import Heading from '@/components/ui/heading'
+import { LINK } from '@/types/enums/Link'
+import { cn } from '@/utils'
+import Image from 'next/image'
+import Link from 'next/link'
+
+export default function NotFound() {
+  return (
+    <div className="relative h-full bg-ghost pt-header dark:bg-dark">
+      <Image
+        alt="Background"
+        className="-z-5 object-cover object-center"
+        fill
+        sizes="100vw"
+        src="/hero-bg.svg"
+      />
+      <Content className="relative flex h-full flex-col items-center justify-center gap-3 text-center md:gap-5">
+        <Heading>Page Not Found</Heading>
+        <p className="text-lg md:text-xl">
+          The page you were looking for does not exists.
+        </p>
+        <Link className={cn(buttonVariants())} href={LINK.index}>
+          Return Home
+        </Link>
+      </Content>
+    </div>
+  )
+}

src/app/robots.ts

@@ -0,0 +1,12 @@
+import { SITE_URL } from '@/utils'
+import { MetadataRoute } from 'next'
+
+export default function robots(): MetadataRoute.Robots {
+  return {
+    rules: {
+      allow: '/',
+      userAgent: '*',
+    },
+    sitemap: `${SITE_URL}/sitemap.xml`,
+  }
+}

src/app/sitemap.ts

@@ -0,0 +1,27 @@
+import { SITE_URL } from '@/utils'
+import { getProjectsMetadata } from '@/utils/projects'
+import { MetadataRoute } from 'next'
+
+export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
+  const projectsMetadata = await getProjectsMetadata()
+
+  const sitemapData: MetadataRoute.Sitemap = [
+    {
+      changeFrequency: 'monthly',
+      lastModified: new Date(),
+      priority: 1,
+      url: SITE_URL,
+    },
+  ]
+
+  for (const project of projectsMetadata) {
+    sitemapData.push({
+      changeFrequency: 'weekly',
+      lastModified: project.lastModified,
+      priority: 0.8,
+      url: `${SITE_URL}/${project.slug}`,
+    })
+  }
+
+  return sitemapData
+}

src/components/header/header-navbar.tsx

@@ -5,6 +5,7 @@ import MenuItem from '@/components/header/menu/menu-item'
 import Socials from '@/components/ui/socials'
 import useMediaQuery from '@/hooks/use-media-query'
 import HeaderContext from '@/store/header-context'
+import { LINK } from '@/types/enums/Link'
 import { MOBILE_BREAKPOINT, cn } from '@/utils'
 import { FC, HTMLAttributes, useContext } from 'react'
 
@@ -17,8 +18,8 @@ const HeaderNavbar: FC<HeaderNavbarProps> = ({ className, ...props }) => {
   return (
     <nav
       className={cn(
-        'fixed left-0 right-0 top-0 -translate-y-full border-b border-accent bg-light pb-10 pt-20 transition-transform duration-500 dark:bg-dark md:static md:translate-y-0 md:border-none md:bg-transparent md:p-0 md:dark:bg-transparent',
-        isMenuOpened && 'translate-y-0',
+        'fixed left-0 right-0 top-0 -translate-y-full border-b border-accent bg-light pb-10 pt-20 transition-transform duration-500 *:opacity-0 *:transition-opacity dark:bg-dark md:static md:translate-y-0 md:border-none md:bg-transparent md:p-0 md:*:opacity-100 md:dark:bg-transparent',
+        isMenuOpened && 'translate-y-0 *:opacity-100',
         className
       )}
       {...props}
@@ -27,9 +28,9 @@ const HeaderNavbar: FC<HeaderNavbarProps> = ({ className, ...props }) => {
         className="mx-auto uppercase"
         orientation={isMobile ? 'vertical' : 'horizontal'}
       >
-        <MenuItem href="/#about-me">About Me</MenuItem>
-        <MenuItem href="/#my-projects">My Projects</MenuItem>
-        <MenuItem href="/#contact-me">Contact Me</MenuItem>
+        <MenuItem href={LINK.about}>About Me</MenuItem>
+        <MenuItem href={LINK.projects}>My Projects</MenuItem>
+        <MenuItem href={LINK.contact}>Contact Me</MenuItem>
       </Menu>
       <Socials className="mt-6 justify-center md:hidden" />
     </nav>

src/components/sections/hero/hero.tsx

@@ -2,7 +2,9 @@ import { buttonVariants } from '@/components/ui/button'
 import Content from '@/components/ui/content'
 import Heading from '@/components/ui/heading'
 import Socials from '@/components/ui/socials'
+import { LINK } from '@/types/enums/Link'
 import { cn } from '@/utils'
+import Image from 'next/image'
 import Link from 'next/link'
 import { FC, HTMLAttributes } from 'react'
 
@@ -17,8 +19,15 @@ const Hero: FC<HeroProps> = ({ className, ...props }) => {
       )}
       {...props}
     >
+      <Image
+        alt="Background"
+        className="-z-5 object-cover object-center"
+        fill
+        sizes="100vw"
+        src="/hero-bg.svg"
+      />
       <Content
-        className="flex flex-col items-center justify-center text-center"
+        className="relative flex flex-col items-center justify-center text-center"
         size="tight"
       >
         <article>
@@ -32,7 +41,7 @@ const Hero: FC<HeroProps> = ({ className, ...props }) => {
         </article>
         <Link
           className={cn('mt-5', buttonVariants({ variant: 'outline' }))}
-          href="/#my-projects"
+          href={LINK.projects}
         >
           My Projects
         </Link>

src/components/ui/logo.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import HeaderContext from '@/store/header-context'
+import { LINK } from '@/types/enums/Link'
 import { cn } from '@/utils'
 import Link from 'next/link'
 import { AnchorHTMLAttributes, FC, useContext } from 'react'
@@ -13,7 +14,7 @@ const Logo: FC<LogoProps> = ({ className, ...props }) => {
   return (
     <Link
       className={cn('text-3xl font-bold text-accent', className)}
-      href="/"
+      href={LINK.index}
       onClick={closeMenu}
       {...props}
     >

src/types/ProjectMetadata.ts

@@ -0,0 +1,6 @@
+type ProjectMetadata = {
+  lastModified: Date
+  slug: string
+}
+
+export default ProjectMetadata

src/types/enums/Link.ts

@@ -0,0 +1,10 @@
+export const LINK = {
+  about: '/#about-me',
+  contact: '/#contact-me',
+  index: '/',
+  projects: '/#my-projects',
+} as const
+
+type Link = keyof typeof LINK
+
+export default Link

src/utils/constants.ts

@@ -1 +1,2 @@
 export const MOBILE_BREAKPOINT = 767.98
+export const SITE_URL = process.env.SITE_URL || 'http://localhost:3000'

src/utils/projects.ts

@@ -1,4 +1,6 @@
 import Project from '@/types/Project'
+import ProjectMetadata from '@/types/ProjectMetadata'
+import fs from 'fs'
 import { readFile, readdir } from 'fs/promises'
 import matter from 'gray-matter'
 import { marked } from 'marked'
@@ -8,16 +10,6 @@ const PROJECTS_PATH = './content/projects'
 const FILE_EXTENSION = '.md'
 const DIR_PATH = path.join(process.cwd(), PROJECTS_PATH)
 
-export const getSlugs = async (): Promise<string[]> => {
-  const files = await readdir(DIR_PATH)
-
-  const slugs = files
-    .filter((file) => file.endsWith(FILE_EXTENSION))
-    .map((file) => file.replace(FILE_EXTENSION, ''))
-
-  return slugs
-}
-
 export const getProjects = async (): Promise<Project[]> => {
   const slugs = await getSlugs()
 
@@ -40,11 +32,7 @@ export const getProjects = async (): Promise<Project[]> => {
 }
 
 export const getProject = async (slug: string): Promise<Project> => {
-  const filePath = path.join(
-    process.cwd(),
-    PROJECTS_PATH,
-    `${slug}${FILE_EXTENSION}`
-  )
+  const filePath = getProjectFilePath(slug)
 
   const text = await readFile(filePath, 'utf-8')
   if (!text.trim()) throw new Error('Markdown file is empty!')
@@ -62,3 +50,36 @@ export const getProject = async (slug: string): Promise<Project> => {
 
   return { body, features, github, image, slug, technologies, title, website }
 }
+
+export const getProjectsMetadata = async (): Promise<ProjectMetadata[]> => {
+  const slugs = await getSlugs()
+
+  let projectsMetadata: ProjectMetadata[] = []
+
+  if (!slugs.length) return projectsMetadata
+
+  for (const slug of slugs) {
+    const projectModifiedDate = getProjectModifiedDate(slug)
+    projectsMetadata.push({ lastModified: projectModifiedDate, slug })
+  }
+
+  return projectsMetadata
+}
+
+export const getSlugs = async (): Promise<string[]> => {
+  const files = await readdir(DIR_PATH)
+  const slugs = files
+    .filter((file) => file.endsWith(FILE_EXTENSION))
+    .map((file) => file.replace(FILE_EXTENSION, ''))
+  return slugs
+}
+
+export const getProjectFilePath = (slug: string): string => {
+  return path.join(process.cwd(), PROJECTS_PATH, `${slug}${FILE_EXTENSION}`)
+}
+
+export const getProjectModifiedDate = (slug: string): Date => {
+  const filePath = getProjectFilePath(slug)
+  const fileStats = fs.statSync(filePath)
+  return new Date(fileStats.mtime.toISOString())
+}