diff --git a/.gitignore b/.gitignore index 95251a5d..18d89205 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,7 @@ -# build output -dist/ - -# generated types -.astro/ - -# dependencies -node_modules/ - -# logs -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* - -# environment variables -.env -.env.production - -# macOS-specific files -.DS_Store - -.idea -.vscode +**/.idea +**/node_modules +**/dist +**/.astro packages/blog/src/content/.obsidian packages/blog/src/content/templates diff --git a/packages/blog/.prettierignore b/packages/blog/.prettierignore index 5c5861c3..be6bee64 100644 --- a/packages/blog/.prettierignore +++ b/packages/blog/.prettierignore @@ -1,24 +1,7 @@ # build output -dist/ - -# generated types -.astro/ - -# dependencies -node_modules/ - -# logs -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* - -# environment variables -.env -.env.production - -# macOS-specific files -.DS_Store +**/dist +**/node_modules +**/.astro src/content/.obsidian src/content/templates diff --git a/packages/blog/src/pages/about.astro b/packages/blog/src/pages/about.astro index d5102ef8..a65fca2d 100644 --- a/packages/blog/src/pages/about.astro +++ b/packages/blog/src/pages/about.astro @@ -22,7 +22,7 @@ const links = await getCollection('links'); - subscribe with RSS + subscribe with RSS

diff --git a/packages/blog/src/pages/index.astro b/packages/blog/src/pages/index.astro index 819e4abe..63b26d38 100644 --- a/packages/blog/src/pages/index.astro +++ b/packages/blog/src/pages/index.astro @@ -5,10 +5,9 @@ import { Post } from '../shared/post.js'; import { getCollection } from 'astro:content'; import _ from 'lodash'; import Layout from '../shared/components/templates/Layout.astro'; -import StandOut from '../shared/components/molecules/StandOut.astro'; -import Link from '../shared/components/atoms/Link.astro'; import Intro from '../shared/components/organisms/Intro.astro'; import PostList from '../shared/components/organisms/PostList.astro'; +import PinnedPosts from '../shared/components/organisms/PinnedPosts.astro'; const allEntries = Post.sortEntries(await getCollection('posts')); const [pinnedEntries, nonPinnedEntries] = _.partition( @@ -25,23 +24,7 @@ const nonPinnedPosts = await Promise.all( --- - { - pinnedPosts.map((post) => ( - - - - - - {post.title} - {post.publishedAt} - - - - - )) - } + diff --git a/packages/blog/src/pages/rss.xml.ts b/packages/blog/src/pages/rss.xml.ts index 4e9644b4..6e0bae73 100644 --- a/packages/blog/src/pages/rss.xml.ts +++ b/packages/blog/src/pages/rss.xml.ts @@ -24,7 +24,7 @@ export async function GET(context: APIContext) { pubDate: entry.data.publishedAt, link: post.fullPath, categories: entry.data.tags, - author: 'vorant94@gmail.com', + author: DATA.email, }; }), }); diff --git a/packages/blog/src/shared/components/atoms/Link.astro b/packages/blog/src/shared/components/atoms/Link.astro index 7804e894..a15fc594 100644 --- a/packages/blog/src/shared/components/atoms/Link.astro +++ b/packages/blog/src/shared/components/atoms/Link.astro @@ -1,16 +1,18 @@ --- import { type HTMLAttributes } from 'astro/types'; +import { removeTrailingSlash } from '../../utils/remove-trailing-slash'; interface Props extends HTMLAttributes<'a'> {} const { href, class: moreClasses, ...props } = Astro.props; -const currentPath = Astro.url.pathname.slice(0, -1); +const currentPath = removeTrailingSlash(Astro.url.pathname); --- , 'class'> { + post: Post; +} + +const { post, class: moreClasses } = Astro.props; +--- + + + + {post.title} + {post.publishedAt} + + diff --git a/packages/blog/src/shared/components/organisms/Footer.astro b/packages/blog/src/shared/components/organisms/Footer.astro index 9ca51761..673abedc 100644 --- a/packages/blog/src/shared/components/organisms/Footer.astro +++ b/packages/blog/src/shared/components/organisms/Footer.astro @@ -1,10 +1,11 @@ --- import '@fortawesome/fontawesome-free/css/fontawesome.css'; import '@fortawesome/fontawesome-free/css/solid.css'; +import { DATA } from '../../data'; ---