update

yoshinorin · Jan 4, 2024 · 72aa7f0 · 72aa7f0
1 parent e0ed94c
commit 72aa7f0
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git a/src/app/[...slug]/page.tsx b/src/app/[...slug]/page.tsx
@@ -5,6 +5,7 @@ import { permanentRedirect } from "next/navigation";
 import { ContentResponse, Content } from '../../models/models';
 import { findByPath } from '../../api/content';
 import { asInsight } from '../../utils/converters';
+import { sluggize } from "../../utils/slug";
 import { Renderer } from './renderer';
 import { runOrHandleErrorIf, throwIfError } from "../handler";
 
@@ -47,7 +48,7 @@ async function get(req: any) {
 
   return {
     props: {
-      slug: req.params.slug.join('/'),
+      slug: sluggize(req.params.slug),
       content: content,
       insight: asInsight(response)
     }

diff --git a/src/app/articles/[...slug]/page.tsx b/src/app/articles/[...slug]/page.tsx
@@ -4,6 +4,7 @@ import { ContentResponse, Content } from '../../../models/models';
 import { isIgnoreRequest } from '../../../utils/filterRequests';
 import { findByPath } from '../../../api/content';
 import { asInsight } from '../../../utils/converters';
+import { sluggize } from "../../../utils/slug";
 import { Renderer } from './renderer';
 import { runOrHandleErrorIf, throwIfError } from "../../handler";
 
@@ -45,7 +46,7 @@ async function get(req: any) {
 
   return {
     props: {
-      slug: 'articles/' + req.params.slug.join('/'),
+      slug: sluggize(req.params.slug, 'articles'),
       content: content,
       insight: asInsight(response)
     }

diff --git a/src/app/articles/[number]/page.tsx b/src/app/articles/[number]/page.tsx
@@ -3,6 +3,7 @@
 import { getArticles } from '../../../api/articles';
 import { Article, ArticleResponseWithCount } from '../../../models/models';
 import { getRequestContext } from '../../../utils/requestContext';
+import { sluggize } from "../../../utils/slug";
 import { Renderer } from './renderer';
 import { runOrHandleErrorIf, throwIfError } from "../../handler";
 
@@ -36,7 +37,7 @@ async function get(req: any) {
 
   return {
     props: {
-      slug: req.params.slug.join('/'),
+      slug: sluggize(req.params.slug),
       current: req.params.number,
       count: articlesResponseWithCount.count,
       articles: articles

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -11,7 +11,6 @@ export default function RootLayout({
   const theme = getThemeSetting();
   return (
     <html lang={lang}>
-      <head />
       <body data-theme={`${theme}`}>
         <ClientLayout>
           { children }

diff --git a/src/app/series/[slug]/page.tsx b/src/app/series/[slug]/page.tsx
@@ -7,6 +7,7 @@ import {
   SeriresWithArticles
 } from '../../../models/models';
 import { getRequestContext } from '../../../utils/requestContext';
+import { sluggize } from "../../../utils/slug";
 import { Renderer } from './renderer';
 import { runOrHandleErrorIf, throwIfError } from "../../handler";
 
@@ -42,7 +43,7 @@ async function get(req: any) {
 
   return {
     props: {
-      slug: req.params.slug.join('/'),
+      slug: sluggize(req.params.slug),
       seriresWithArticles: seriresWithArticles
     }
   }

diff --git a/src/app/series/page.tsx b/src/app/series/page.tsx
@@ -3,6 +3,7 @@
 import { getSeries } from '../../api/series';
 import { Series, SeriesResponse } from '../../models/models';
 import { getRequestContext } from '../../utils/requestContext';
+import { sluggize } from "../../utils/slug";
 import { Renderer } from './renderer';
 import { runOrHandleErrorIf, throwIfError } from "../handler";
 
@@ -32,7 +33,7 @@ async function get(req: any) {
 
   return {
     props: {
-      slug: req.params.slug.join('/'),
+      slug: sluggize(req.params.slug),
       series: series
     }
   }

diff --git a/src/app/status/page.tsx b/src/app/status/page.tsx
@@ -2,6 +2,7 @@
 
 import { getStatus } from '../../api/status';
 import { getRequestContext } from '../../utils/requestContext';
+import { sluggize } from "../../utils/slug";
 import { Renderer } from './renderer';
 
 export default async function Page(req: any) {
@@ -14,7 +15,7 @@ async function get(req: any) {
 
   return {
     props: {
-      slug: req.params.slug.join('/'),
+      slug: sluggize(req.params.slug),
       statusCode: response.status
     }
   }

diff --git a/src/app/tags/[...slug]/page.tsx b/src/app/tags/[...slug]/page.tsx
@@ -3,6 +3,7 @@
 import { getArticlesByTagName } from '../../../api/articles';
 import { Article, ArticleResponseWithCount } from '../../../models/models';
 import { getRequestContext } from '../../../utils/requestContext';
+import { sluggize } from "../../../utils/slug";
 import { Renderer } from './renderer';
 import { runOrHandleErrorIf, throwIfError } from "../../handler";
 
@@ -38,7 +39,7 @@ async function get(req: any) {
 
   return {
     props: {
-      slug: req.params.slug.join('/'),
+      slug: sluggize(req.params.slug),
       tagName: tagName,
       currentPage: currentPage,
       count: articlesResponseWithCount.count,

diff --git a/src/app/tags/page.tsx b/src/app/tags/page.tsx
@@ -3,6 +3,7 @@
 import { Tag } from '../../models/models';
 import { getTags } from '../../api/tags';
 import { getRequestContext } from '../../utils/requestContext';
+import { sluggize } from "../../utils/slug";
 import { Renderer } from './renderer';
 import { runOrHandleErrorIf, throwIfError } from "../handler";
 
@@ -21,7 +22,7 @@ async function get(req: any) {
 
   return {
     props: {
-      slug: req.params.slug.join('/'),
+      slug: sluggize(req.params.slug),
       tags: await response.json() as Array<Tag>
     }
   }

diff --git a/src/utils/slug.ts b/src/utils/slug.ts
@@ -4,7 +4,6 @@ export function sluggize(
     fallback: string | undefined = undefined
   ) {
     try {
-      console.log()
       if (slug instanceof Array) {
         const p = prefix === undefined ? undefined : '/' + prefix;
         const s = slug as Array<string>;