Merge branch 'dev'

next-sitemap.config.js

@@ -0,0 +1,23 @@
+const siteURL = 'https://dulapahv.dev';
+
+module.exports = {
+  siteUrl: siteURL,
+  generateRobotsTxt: true,
+  exclude: ['/server-sitemap.xml'],
+  robotsTxtOptions: {
+    policies: [
+      {
+        userAgent: '*',
+        allow: '/',
+        disallow: [
+          '/_next',
+          '/server-sitemap.xml',
+          '/404',
+          '/500',
+          '/_offline',
+        ],
+      },
+    ],
+    additionalSitemaps: [`${siteURL}/server-sitemap.xml`],
+  },
+};

next.config.js

@@ -22,6 +22,21 @@ const nextConfig = withPWA({
         destination: 'https://dulapahv.notion.site/:slug*',
         permanent: true,
       },
+      {
+        source: '/404',
+        destination: '/',
+        permanent: true,
+      },
+      {
+        source: '/500',
+        destination: '/',
+        permanent: true,
+      },
+      {
+        source: '/_offline',
+        destination: '/',
+        permanent: true,
+      },
     ];
   },
   images: {

package.json

@@ -7,25 +7,27 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
-    "lint": "next lint"
+    "lint": "next lint",
+    "postbuild": "next-sitemap"
   },
   "dependencies": {
     "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.0",
-    "@marsidev/react-turnstile": "^0.5.3",
+    "@emotion/styled": "^11.11.5",
+    "@marsidev/react-turnstile": "^0.5.4",
     "@nextui-org/react": "^2.2.10",
-    "@sentry/nextjs": "^7.108.0",
-    "@types/node": "^20.11.30",
-    "@types/react": "^18.2.73",
-    "@types/react-dom": "^18.2.23",
+    "@sentry/nextjs": "^7.109.0",
+    "@types/node": "^20.12.7",
+    "@types/react": "^18.2.75",
+    "@types/react-dom": "^18.2.24",
     "@vercel/speed-insights": "^1.0.10",
     "autoprefixer": "^10.4.19",
-    "daisyui": "^4.9.0",
-    "eslint": "^8.57.0",
+    "daisyui": "^4.10.1",
+    "eslint": "^9.0.0",
     "eslint-config-next": "^14.1.4",
-    "framer-motion": "^11.0.23",
+    "framer-motion": "^11.0.27",
     "next": "^14.1.4",
     "next-pwa": "^5.6.0",
+    "next-sitemap": "^4.2.3",
     "next-themes": "^0.3.0",
     "no-darkreader": "^1.0.3",
     "postcss": "^8.4.38",
@@ -36,7 +38,7 @@
     "react-icons": "^5.0.1",
     "tailwindcss": "^3.4.3",
     "tailwindcss-animation-delay": "^1.2.0",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.5"
   },
   "packageManager": "yarn@4.1.1"
 }

public/robots.txt

@@ -1,2 +1,15 @@
+# *
 User-agent: *
-Disallow:
+Allow: /
+Disallow: /_next
+Disallow: /server-sitemap.xml
+Disallow: /404
+Disallow: /500
+Disallow: /_offline
+
+# Host
+Host: https://dulapahv.dev
+
+# Sitemaps
+Sitemap: https://dulapahv.dev/sitemap.xml
+Sitemap: https://dulapahv.dev/server-sitemap.xml

public/sitemap-0.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
+<url><loc>https://dulapahv.dev</loc><lastmod>2024-04-11T00:23:26.208Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
+</urlset>

public/sitemap.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+<sitemap><loc>https://dulapahv.dev/sitemap-0.xml</loc></sitemap>
+<sitemap><loc>https://dulapahv.dev/server-sitemap.xml</loc></sitemap>
+</sitemapindex>

src/components/aboutme/AboutMe.tsx

@@ -20,7 +20,7 @@ const AboutMe = forwardRef((props, ref) => {
     <section
       className="flex flex-col overflow-hidden"
       ref={aboutmeRef}
-      id="aboutme"
+      id="about"
     >
       <Floaties />
       <div className="relative">

src/pages/404.tsx

@@ -1,19 +1,8 @@
-import { useEffect } from 'react';
-
 import { Button, Link } from '@nextui-org/react';
-import { useRouter } from 'next/router';
 import { LuUnlink } from 'react-icons/lu';
 import { TiHome } from 'react-icons/ti';
 
 const Error404 = () => {
-  const router = useRouter();
-
-  useEffect(() => {
-    if (typeof window !== 'undefined' && window.location.pathname === '/404') {
-      router.replace('/');
-    }
-  }, [router]);
-
   return (
     <div className="flex h-screen flex-col items-center justify-center gap-y-8 p-4 sm:p-12">
       <LuUnlink className="size-24 sm:size-32" />

src/pages/500.tsx

@@ -1,5 +1,3 @@
-import { useEffect } from 'react';
-
 import { Button } from '@nextui-org/react';
 import { useRouter } from 'next/router';
 import { LuServerOff } from 'react-icons/lu';
@@ -8,12 +6,6 @@ import { TbReload } from 'react-icons/tb';
 const Error500 = () => {
   const router = useRouter();
 
-  useEffect(() => {
-    if (typeof window !== 'undefined' && window.location.pathname === '/500') {
-      router.replace('/');
-    }
-  }, [router]);
-
   return (
     <div className="flex h-screen flex-col items-center justify-center gap-y-8 p-4 sm:p-12">
       <LuServerOff className="size-24 sm:size-32" />

src/pages/_offline.tsx

@@ -1,5 +1,3 @@
-import { useEffect } from 'react';
-
 import { Button } from '@nextui-org/react';
 import { useRouter } from 'next/router';
 import { IoCloudOfflineOutline } from 'react-icons/io5';
@@ -8,15 +6,6 @@ import { TbReload } from 'react-icons/tb';
 const ErrorOffline = () => {
   const router = useRouter();
 
-  useEffect(() => {
-    if (
-      typeof window !== 'undefined' &&
-      window.location.pathname === '/_offline'
-    ) {
-      router.replace('/');
-    }
-  }, [router]);
-
   return (
     <div className="flex h-screen flex-col items-center justify-center gap-y-8 p-4 sm:p-12">
       <IoCloudOfflineOutline className="size-24 sm:size-32" />

src/pages/server-sitemap.xml/index.tsx

@@ -0,0 +1,43 @@
+import { GetServerSideProps } from 'next';
+import { getServerSideSitemapLegacy, ISitemapField } from 'next-sitemap';
+
+export const getServerSideProps: GetServerSideProps = async (ctx) => {
+  const fields: ISitemapField[] = [
+    {
+      loc: 'https://dulapahv.dev',
+      lastmod: new Date().toISOString(),
+    },
+    {
+      loc: 'https://dulapahv.dev/gistda',
+      lastmod: new Date().toISOString(),
+    },
+    {
+      loc: 'https://dulapahv.dev/notion',
+      lastmod: new Date().toISOString(),
+    },
+    {
+      loc: 'https://dulapahv.dev/#about',
+      lastmod: new Date().toISOString(),
+    },
+    {
+      loc: 'https://dulapahv.dev/#education',
+      lastmod: new Date().toISOString(),
+    },
+    {
+      loc: 'https://dulapahv.dev/#experience',
+      lastmod: new Date().toISOString(),
+    },
+    {
+      loc: 'https://dulapahv.dev/#skill',
+      lastmod: new Date().toISOString(),
+    },
+    {
+      loc: 'https://dulapahv.dev/#project',
+      lastmod: new Date().toISOString(),
+    },
+  ];
+
+  return getServerSideSitemapLegacy(ctx, fields);
+};
+
+export default function ServerSitemap() {}