mikeconrad/blog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate to limax for slugify (CKJ languages bug)

Browse Source
This commit is contained in:
prototypa
2022-08-31 14:02:57 -04:00
parent 7deb304087
commit 3012b47991
7 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/widgets/BlogList.astro
View File

@ -1,12 +1,12 @@
---
import BlogListItem from "~/components/widgets/BlogListItem.astro";
const { page } = Astro.props;
const { posts } = Astro.props;
---
<ul>
{
page.data.map((post) => (
posts.map((post) => (
<li class="mb-10 md:mb-16">
<BlogListItem post={post} />
</li>

4
src/pages/[...blog]/[...page].astro
View File

@ -31,9 +31,9 @@ const meta = {
<Layout meta={meta}>
<Fragment slot="title">
News and step-by-step guides about
<span class="bg-clip-text text-transparent bg-gradient-to-r from-blue-500 to-pink-500">AstroWind
<span class="bg-clip-text text-transparent bg-gradient-to-r from-primary-500 to-secondary-500">AstroWind
</span>
</Fragment>
<BlogList page={page} />
<BlogList posts={page.data} />
<Pagination prevUrl={page.url.prev} nextUrl={page.url.next} />
</Layout>

4
src/pages/[...blog]/[slug].astro
View File

@ -1,6 +1,6 @@
---
import { SITE, BLOG } from "~/config.mjs";
import { getCanonical, getPermalink } from "~/utils/permalinks";
import { getCanonical, getPermalink, cleanSlug, BLOG_BASE } from "~/utils/permalinks";
import { fetchPosts } from "~/utils/fetchPosts";
import { findImage } from "~/utils/findImage";
import Layout from "~/layouts/PageLayout.astro";
@ -13,7 +13,7 @@ export async function getStaticPaths() {
const posts = await fetchPosts();
return posts.map((post) => ({
params: { slug: post.slug, blog: BLOG.postsWithoutBlogSlug ? undefined : BLOG?.slug || undefined },
params: { slug: cleanSlug(post.slug), blog: BLOG.postsWithoutBlogSlug ? undefined : BLOG_BASE || undefined },
props: { post },
}));
}

6
src/pages/[...categories]/[category]/[...page].astro
View File

@ -5,7 +5,7 @@ import { fetchPosts } from "~/utils/fetchPosts";
import Layout from "~/layouts/BlogLayout.astro";
import BlogList from "~/components/widgets/BlogList.astro";
import Pagination from "~/components/widgets/Pagination.astro";
import { getCanonical, getPermalink, getSlug, CATEGORY_BASE } from "~/utils/permalinks";
import { getCanonical, getPermalink, cleanSlug, CATEGORY_BASE } from "~/utils/permalinks";
export async function getStaticPaths({ paginate }) {
@ -20,7 +20,7 @@ export async function getStaticPaths({ paginate }) {
return Array.from(categories).map((category) => (
paginate(posts.filter((post) => typeof post.category === "string" && category === post.category.toLowerCase()), {
params: { category: getSlug(category), categories: CATEGORY_BASE || undefined },
params: { category: cleanSlug(category), categories: CATEGORY_BASE || undefined },
pageSize: BLOG.postsPerPage,
props: { category }
})
@ -42,6 +42,6 @@ const meta = {
<Fragment slot="title">
Category: {category}
</Fragment>
<BlogList page={page} />
<BlogList posts={page.data} />
<Pagination prevUrl={page.url.prev} nextUrl={page.url.next} />
</Layout>

6
src/pages/[...tags]/[tag]/[...page].astro
View File

@ -4,7 +4,7 @@ import { fetchPosts } from "~/utils/fetchPosts";
import Layout from "~/layouts/BlogLayout.astro";
import BlogList from "~/components/widgets/BlogList.astro";
import Pagination from "~/components/widgets/Pagination.astro";
import { getCanonical, getPermalink, getSlug, TAG_BASE } from "~/utils/permalinks";
import { getCanonical, getPermalink, cleanSlug, TAG_BASE } from "~/utils/permalinks";
export async function getStaticPaths({ paginate }) {
@ -19,7 +19,7 @@ export async function getStaticPaths({ paginate }) {
return Array.from(tags).map((tag) => (
paginate(posts.filter((post) => Array.isArray(post.tags) && post.tags.includes(tag)), {
params: { tag: getSlug(tag), tags: TAG_BASE || undefined },
params: { tag: cleanSlug(tag), tags: TAG_BASE || undefined },
pageSize: BLOG.postsPerPage,
props: { tag },
})
@ -41,6 +41,6 @@ const meta = {
<Fragment slot="title">
Tag: {tag}
</Fragment>
<BlogList page={page} />
<BlogList posts={page.data} />
<Pagination prevUrl={page.url.prev} nextUrl={page.url.next} />
</Layout>

16
src/utils/permalinks.js
View File

@ -1,4 +1,4 @@
import slugify from 'slugify'
import slugify from 'limax';
import { SITE, BLOG } from "~/config.mjs";
const trim = (str, ch) => {
@ -10,16 +10,16 @@ const trim = (str, ch) => {
return (start > 0 || end < str.length) ? str.substring(start, end) : str;
}
const trimSlash = (s) => trim(s, "/");
const trimSlash = (s) => trim(trim(s, "/"));
const createPath = (...params) => "/" + params.filter((el) => !!el).join("/")
const baseUrl = trimSlash(SITE.baseUrl);
export const BLOG_BASE = slugify(trimSlash(BLOG.slug), { lower: true });
export const CATEGORY_BASE = slugify(trim(BLOG?.category?.slug), { lower: true });
export const TAG_BASE = slugify(trim(BLOG?.tag?.slug), { lower: true });
export const cleanSlug = (text) => slugify(trimSlash(text));
const cleanSlug = (slug) => trimSlash(slug);
export const BLOG_BASE = cleanSlug(BLOG.slug);
export const CATEGORY_BASE = cleanSlug(BLOG?.category?.slug);
export const TAG_BASE = cleanSlug(BLOG?.tag?.slug);
export const getCanonical = (path = "") => new URL(path, SITE.domain);
@ -46,6 +46,4 @@ export const getBlogPermalink = () => getPermalink(BLOG_BASE);
export const getHomePermalink = () => {
const permalink = getPermalink();
return permalink !== "/" ? permalink + "/" : permalink;
}
export const getSlug = (text) => slugify(text);
}