refactor: standardize code formatting across components and utilities
Some checks failed
Push to github container register / push-docker (push) Has been cancelled
Some checks failed
Push to github container register / push-docker (push) Has been cancelled
- Updated formatting in SiteFooter and SiteHeader components for consistency. - Refactored Badge, Button, Card, Separator components to improve readability. - Enhanced markdown parsing logic in announcements and markdown utility functions. - Adjusted ESLint configuration for better code quality checks. - Added biome.json for BiomeJS configuration. - Updated package.json and configuration files for improved dependency management.
This commit is contained in:
@@ -6,88 +6,95 @@ import { markdownToHtml } from "@/lib/markdown";
|
||||
const ANNOUNCEMENTS_DIR = path.join(process.cwd(), "content", "announcements");
|
||||
|
||||
type AnnouncementFrontmatter = {
|
||||
title?: string;
|
||||
date?: string;
|
||||
summary?: string;
|
||||
title?: string;
|
||||
date?: string;
|
||||
summary?: string;
|
||||
};
|
||||
|
||||
export type AnnouncementListItem = {
|
||||
slug: string;
|
||||
title: string;
|
||||
date: string;
|
||||
summary: string;
|
||||
slug: string;
|
||||
title: string;
|
||||
date: string;
|
||||
summary: string;
|
||||
};
|
||||
|
||||
export type AnnouncementDetail = AnnouncementListItem & {
|
||||
contentHtml: string;
|
||||
contentHtml: string;
|
||||
};
|
||||
|
||||
function parseFrontmatter(markdown: string): {
|
||||
frontmatter: AnnouncementFrontmatter;
|
||||
body: string;
|
||||
frontmatter: AnnouncementFrontmatter;
|
||||
body: string;
|
||||
} {
|
||||
if (!markdown.startsWith("---\n")) {
|
||||
return { frontmatter: {}, body: markdown };
|
||||
}
|
||||
if (!markdown.startsWith("---\n")) {
|
||||
return { frontmatter: {}, body: markdown };
|
||||
}
|
||||
|
||||
const end = markdown.indexOf("\n---\n", 4);
|
||||
if (end === -1) {
|
||||
return { frontmatter: {}, body: markdown };
|
||||
}
|
||||
const end = markdown.indexOf("\n---\n", 4);
|
||||
if (end === -1) {
|
||||
return { frontmatter: {}, body: markdown };
|
||||
}
|
||||
|
||||
const rawFrontmatter = markdown.slice(4, end);
|
||||
const body = markdown.slice(end + 5);
|
||||
const frontmatter: AnnouncementFrontmatter = {};
|
||||
const rawFrontmatter = markdown.slice(4, end);
|
||||
const body = markdown.slice(end + 5);
|
||||
const frontmatter: AnnouncementFrontmatter = {};
|
||||
|
||||
for (const line of rawFrontmatter.split("\n")) {
|
||||
const delimiterIndex = line.indexOf(":");
|
||||
if (delimiterIndex <= 0) {
|
||||
continue;
|
||||
}
|
||||
for (const line of rawFrontmatter.split("\n")) {
|
||||
const delimiterIndex = line.indexOf(":");
|
||||
if (delimiterIndex <= 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const key = line.slice(0, delimiterIndex).trim();
|
||||
const value = line.slice(delimiterIndex + 1).trim().replace(/^"|"$/g, "");
|
||||
const key = line.slice(0, delimiterIndex).trim();
|
||||
const value = line
|
||||
.slice(delimiterIndex + 1)
|
||||
.trim()
|
||||
.replace(/^"|"$/g, "");
|
||||
|
||||
if (key === "title" || key === "date" || key === "summary") {
|
||||
frontmatter[key] = value;
|
||||
}
|
||||
}
|
||||
if (key === "title" || key === "date" || key === "summary") {
|
||||
frontmatter[key] = value;
|
||||
}
|
||||
}
|
||||
|
||||
return { frontmatter, body: body.trim() };
|
||||
return { frontmatter, body: body.trim() };
|
||||
}
|
||||
|
||||
export async function getAnnouncementSlugs(): Promise<string[]> {
|
||||
const entries = await fs.readdir(ANNOUNCEMENTS_DIR, { withFileTypes: true });
|
||||
const entries = await fs.readdir(ANNOUNCEMENTS_DIR, { withFileTypes: true });
|
||||
|
||||
return entries
|
||||
.filter((entry) => entry.isFile() && entry.name.endsWith(".md"))
|
||||
.map((entry) => entry.name.replace(/\.md$/, ""));
|
||||
return entries
|
||||
.filter((entry) => entry.isFile() && entry.name.endsWith(".md"))
|
||||
.map((entry) => entry.name.replace(/\.md$/, ""));
|
||||
}
|
||||
|
||||
export async function getAnnouncementBySlug(slug: string): Promise<AnnouncementDetail> {
|
||||
const filePath = path.join(ANNOUNCEMENTS_DIR, `${slug}.md`);
|
||||
const markdown = await fs.readFile(filePath, "utf-8");
|
||||
const { frontmatter, body } = parseFrontmatter(markdown);
|
||||
export async function getAnnouncementBySlug(
|
||||
slug: string,
|
||||
): Promise<AnnouncementDetail> {
|
||||
const filePath = path.join(ANNOUNCEMENTS_DIR, `${slug}.md`);
|
||||
const markdown = await fs.readFile(filePath, "utf-8");
|
||||
const { frontmatter, body } = parseFrontmatter(markdown);
|
||||
|
||||
return {
|
||||
slug,
|
||||
title: frontmatter.title ?? slug,
|
||||
date: frontmatter.date ?? "日付未設定",
|
||||
summary: frontmatter.summary ?? "",
|
||||
contentHtml: markdownToHtml(body),
|
||||
};
|
||||
return {
|
||||
slug,
|
||||
title: frontmatter.title ?? slug,
|
||||
date: frontmatter.date ?? "日付未設定",
|
||||
summary: frontmatter.summary ?? "",
|
||||
contentHtml: markdownToHtml(body),
|
||||
};
|
||||
}
|
||||
|
||||
export async function getAllAnnouncements(): Promise<AnnouncementListItem[]> {
|
||||
const slugs = await getAnnouncementSlugs();
|
||||
const items = await Promise.all(slugs.map((slug) => getAnnouncementBySlug(slug)));
|
||||
const slugs = await getAnnouncementSlugs();
|
||||
const items = await Promise.all(
|
||||
slugs.map((slug) => getAnnouncementBySlug(slug)),
|
||||
);
|
||||
|
||||
return items
|
||||
.map((item) => ({
|
||||
slug: item.slug,
|
||||
title: item.title,
|
||||
date: item.date,
|
||||
summary: item.summary,
|
||||
}))
|
||||
.sort((a, b) => b.date.localeCompare(a.date));
|
||||
return items
|
||||
.map((item) => ({
|
||||
slug: item.slug,
|
||||
title: item.title,
|
||||
date: item.date,
|
||||
summary: item.summary,
|
||||
}))
|
||||
.sort((a, b) => b.date.localeCompare(a.date));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user