From 4b8ae1540c6de1d8946b42c57642c2e2e61ef99b Mon Sep 17 00:00:00 2001 From: prototypa Date: Tue, 24 Jan 2023 01:52:51 -0500 Subject: [PATCH 1/3] Move Pagination component --- src/components/{common => blog}/Pagination.astro | 4 ++-- src/components/blog/SinglePost.astro | 2 +- src/pages/[...blog]/[...page].astro | 2 +- src/pages/[...blog]/[category]/[...page].astro | 2 +- src/pages/[...blog]/[tag]/[...page].astro | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/components/{common => blog}/Pagination.astro (79%) diff --git a/src/components/common/Pagination.astro b/src/components/blog/Pagination.astro similarity index 79% rename from src/components/common/Pagination.astro rename to src/components/blog/Pagination.astro index cdb3d5c..fbad4e3 100644 --- a/src/components/common/Pagination.astro +++ b/src/components/blog/Pagination.astro @@ -16,13 +16,13 @@ const { prevUrl, nextUrl, prevText = 'Newer posts', nextText = 'Older posts' } = (prevUrl || nextUrl) && (
- +

{prevText}

- +
{nextText} diff --git a/src/components/blog/SinglePost.astro b/src/components/blog/SinglePost.astro index 577c21f..045fb96 100644 --- a/src/components/blog/SinglePost.astro +++ b/src/components/blog/SinglePost.astro @@ -30,7 +30,7 @@ const { post, url } = Astro.props; <> {' '} ยท - + {post.category.replaceAll('-', ' ')} diff --git a/src/pages/[...blog]/[...page].astro b/src/pages/[...blog]/[...page].astro index c183f75..25e057d 100644 --- a/src/pages/[...blog]/[...page].astro +++ b/src/pages/[...blog]/[...page].astro @@ -4,7 +4,7 @@ import { SITE, BLOG } from '~/config.mjs'; import Layout from '~/layouts/PageLayout.astro'; import BlogList from '~/components/blog/List.astro'; import Headline from '~/components/blog/Headline.astro'; -import Pagination from '~/components/common/Pagination.astro'; +import Pagination from '~/components/blog/Pagination.astro'; import { fetchPosts } from '~/utils/blog'; import { BLOG_BASE } from '~/utils/permalinks'; diff --git a/src/pages/[...blog]/[category]/[...page].astro b/src/pages/[...blog]/[category]/[...page].astro index 48d2ac6..eb7ea8d 100644 --- a/src/pages/[...blog]/[category]/[...page].astro +++ b/src/pages/[...blog]/[category]/[...page].astro @@ -4,7 +4,7 @@ import { SITE, BLOG } from '~/config.mjs'; import Layout from '~/layouts/PageLayout.astro'; import BlogList from '~/components/blog/List.astro'; import Headline from '~/components/blog/Headline.astro'; -import Pagination from '~/components/common/Pagination.astro'; +import Pagination from '~/components/blog/Pagination.astro'; import { fetchPosts } from '~/utils/blog'; import { CATEGORY_BASE } from '~/utils/permalinks'; diff --git a/src/pages/[...blog]/[tag]/[...page].astro b/src/pages/[...blog]/[tag]/[...page].astro index df5a6ba..4bfa79e 100644 --- a/src/pages/[...blog]/[tag]/[...page].astro +++ b/src/pages/[...blog]/[tag]/[...page].astro @@ -3,7 +3,7 @@ import { SITE, BLOG } from '~/config.mjs'; import Layout from '~/layouts/PageLayout.astro'; import BlogList from '~/components/blog/List.astro'; -import Pagination from '~/components/common/Pagination.astro'; +import Pagination from '~/components/blog/Pagination.astro'; import { fetchPosts } from '~/utils/blog'; import { TAG_BASE } from '~/utils/permalinks'; From 4178d198097ac2f6960c15aa0fcab21feffc29d7 Mon Sep 17 00:00:00 2001 From: prototypa Date: Tue, 24 Jan 2023 12:05:20 -0500 Subject: [PATCH 2/3] Update node to 16 --- sandbox.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sandbox.config.json b/sandbox.config.json index 9178af7..b12019e 100644 --- a/sandbox.config.json +++ b/sandbox.config.json @@ -6,6 +6,6 @@ "container": { "port": 3000, "startScript": "start", - "node": "14" + "node": "16" } } From 72f3f847b3b83ad81489f0dd3b890a00c38a88dd Mon Sep 17 00:00:00 2001 From: prototypa Date: Tue, 24 Jan 2023 12:06:13 -0500 Subject: [PATCH 3/3] Update astro to v2 --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9978b41..ebb64cc 100644 --- a/package.json +++ b/package.json @@ -14,19 +14,19 @@ "subfont": "subfont -ir --no-fallbacks --silent --root dist" }, "devDependencies": { - "@astrojs/image": "^1.0.0-beta.2", - "@astrojs/mdx": "^1.0.0-beta.2", - "@astrojs/partytown": "^1.0.3-beta.1", - "@astrojs/rss": "^2.0.0", + "@astrojs/image": "^0.13.0", + "@astrojs/mdx": "^0.15.0", + "@astrojs/partytown": "^1.0.3", + "@astrojs/rss": "^2.1.0", "@astrojs/sitemap": "^1.0.0", - "@astrojs/tailwind": "^3.0.0-beta.2", + "@astrojs/tailwind": "^3.0.0", "@astrolib/analytics": "^0.3.0", "@astrolib/seo": "^0.3.0", "@fontsource/inter": "^4.5.15", "@tailwindcss/typography": "^0.5.9", "@typescript-eslint/eslint-plugin": "^5.48.2", "@typescript-eslint/parser": "^5.48.2", - "astro": "^2.0.0-beta.4", + "astro": "^2.0.0", "astro-compress": "1.1.28", "astro-icon": "^0.8.0", "eslint": "^8.32.0",