- {title}
+ {title}
-
- {index > 0 && /}
+ {index > 0 && /}
{index !== parts.length - 1 ? (
{label}
diff --git a/src/layouts/components/Logo.astro b/src/layouts/components/Logo.astro
index 730d0c7..8b7ba5c 100644
--- a/src/layouts/components/Logo.astro
+++ b/src/layouts/components/Logo.astro
@@ -1,7 +1,6 @@
---
import config from "@/config/config.json";
import ImageMod from "./ImageMod.astro";
-import { getLangFromUrl, slugSelector } from "@/lib/utils/languageParser";
const { src, srcDarkmode }: { src?: string; srcDarkmode?: string } =
Astro.props;
@@ -22,17 +21,9 @@ const {
} = config.site;
const { theme_switcher }: { theme_switcher: boolean } = config.settings;
-const { default_language } = config.settings;
-
-let lang = getLangFromUrl(Astro.url);
-
-const disabledLanguages = config.settings.disable_languages as string[];
-if (disabledLanguages.includes(lang)) {
- lang = default_language;
-}
---
-
+
{
src || srcDarkmode || logo || logo_darkmode ? (
<>
diff --git a/src/layouts/components/Pagination.astro b/src/layouts/components/Pagination.astro
index 8bf80f8..3e42979 100644
--- a/src/layouts/components/Pagination.astro
+++ b/src/layouts/components/Pagination.astro
@@ -1,8 +1,4 @@
---
-import { getLangFromUrl, slugSelector } from "@/lib/utils/languageParser";
-
-const lang = getLangFromUrl(Astro.url);
-
type Pagination = {
section?: string;
currentPage?: number;
@@ -31,11 +27,8 @@ for (let i = 1; i <= totalPages; i++) {
@@ -84,12 +77,11 @@ for (let i = 1; i <= totalPages; i++) {
) : (
@@ -101,10 +93,7 @@ for (let i = 1; i <= totalPages; i++) {
{/* next page */}
{hasNextPage ? (
Next
diff --git a/src/layouts/components/ThemeSwitcher.astro b/src/layouts/components/ThemeSwitcher.astro
index 27c08ee..2f10b2c 100755
--- a/src/layouts/components/ThemeSwitcher.astro
+++ b/src/layouts/components/ThemeSwitcher.astro
@@ -1,8 +1,10 @@
---
import config from "@/config/config.json";
-const { theme_switcher }: { theme_switcher: boolean; default_theme: string } =
- config.settings;
+const {
+ theme_switcher,
+ default_theme,
+}: { theme_switcher: boolean; default_theme: string } = config.settings;
const { className }: { className?: string } = Astro.props;
---
@@ -47,7 +49,7 @@ const { className }: { className?: string } = Astro.props;
const matchMedia = window.matchMedia("(prefers-color-scheme: dark)");
matchMedia.addEventListener("change", () =>
- toggleTheme(document.querySelectorAll("[data-theme-switcher]")),
+ toggleTheme(document.querySelectorAll("[data-theme-switcher]"))
);
function toggleTheme(themeSwitch: NodeListOf
) {
diff --git a/src/layouts/helpers/LanguageSwitcher.tsx b/src/layouts/helpers/LanguageSwitcher.tsx
deleted file mode 100644
index e268ab9..0000000
--- a/src/layouts/helpers/LanguageSwitcher.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import config from "@/config/config.json";
-import languages from "@/config/language.json";
-import React from "react";
-
-const LanguageSwitcher = ({
- lang,
- pathname,
-}: {
- lang: string;
- pathname: string;
-}) => {
- const { default_language, default_language_in_subdir } = config.settings;
-
- // Function to remove trailing slash if necessary
- const removeTrailingSlash = (path: string) => {
- if (!config.site.trailing_slash) {
- return path.replace(/\/$/, "");
- }
- return path;
- };
-
- // Sort languages by weight and filter out disabled languages
- const sortedLanguages = languages
- // @ts-ignore
- .filter(language => !config.settings.disable_languages.includes(language.languageCode))
- .sort((a, b) => a.weight - b.weight);
-
- return (
-
- {plainify(data.body?.slice(0, 100))} diff --git a/src/layouts/components/BlogCard.astro b/src/layouts/components/BlogCard.astro index eb15361..268a532 100644 --- a/src/layouts/components/BlogCard.astro +++ b/src/layouts/components/BlogCard.astro @@ -1,28 +1,16 @@ --- import config from "@/config/config.json"; import dateFormat from "@/lib/utils/dateFormat"; -import { - getLangFromUrl, - getTranslations, - slugSelector, -} from "@/lib/utils/languageParser"; import { humanize, plainify, slugify } from "@/lib/utils/textConverter"; -import type { ContentEntryMap } from "astro:content"; import { FaRegFolder, FaRegUserCircle } from "react-icons/fa"; import ImageMod from "./ImageMod.astro"; -const { summary_length }: { summary_length: number; blog_folder: string } = - config.settings; +const { + summary_length, + blog_folder, +}: { summary_length: number; blog_folder: string } = config.settings; const { data } = Astro.props; const { title, image, date, author, categories } = data.data; - -const lang = getLangFromUrl(Astro.url); -const { read_more } = await getTranslations(lang as keyof ContentEntryMap); - -const slugParts = data.slug.split("/"); -slugParts[0] = "blog"; -const modifiedSlug = slugParts.join("/"); -data.slug = modifiedSlug; ---
@@ -39,23 +27,22 @@ data.slug = modifiedSlug;
)
}
diff --git a/src/layouts/components/Breadcrumbs.astro b/src/layouts/components/Breadcrumbs.astro
index 29e0448..ed67ed1 100644
--- a/src/layouts/components/Breadcrumbs.astro
+++ b/src/layouts/components/Breadcrumbs.astro
@@ -1,30 +1,19 @@
---
-import { supportedLang } from "@/lib/utils/languageParser";
import { humanize } from "@/lib/utils/textConverter";
const { className }: { className?: string } = Astro.props;
const paths = Astro.url.pathname.split("/").filter((x) => x);
-
-let lang = "";
-if (supportedLang.includes(paths[0])) {
- lang = paths.shift()!;
-}
-
-let baseHref = lang ? `/${lang}` : "/";
let parts = [
{
label: "Home",
- href: baseHref,
- "aria-label":
- Astro.url.pathname === baseHref || Astro.url.pathname === `${baseHref}/`
- ? "page"
- : undefined,
+ href: "/",
+ "aria-label": Astro.url.pathname === "/" ? "page" : undefined,
},
];
paths.forEach((label: string, i: number) => {
- const href = `${baseHref}${paths.slice(0, i + 1).join("/")}`;
+ const href = `/${paths.slice(0, i + 1).join("/")}`;
label !== "page" &&
parts.push({
label: humanize(label.replace(".html", "").replace(/[-_]/g, " ")) || "",
@@ -39,7 +28,7 @@ paths.forEach((label: string, i: number) => {
{
parts.map(({ label, ...attrs }, index) => (
- + {title}
-
-
+
{humanize(author)}
-
-
{ categories.map((category: string, index: number) => ( - + {humanize(category)} {index !== categories.length - 1 && ","} @@ -67,8 +54,8 @@ data.slug = modifiedSlug; {plainify(data.body?.slice(0, Number(summary_length)))}
- {read_more} + read more
1 ? "block" : "hidden"}`}>
-
-
- );
-};
-
-export default LanguageSwitcher;
diff --git a/src/layouts/helpers/SearchModal.tsx b/src/layouts/helpers/SearchModal.tsx
index f095d7f..6d29287 100644
--- a/src/layouts/helpers/SearchModal.tsx
+++ b/src/layouts/helpers/SearchModal.tsx
@@ -1,11 +1,8 @@
import searchData from ".json/search.json";
import React, { useEffect, useState } from "react";
import SearchResult, { type ISearchItem } from "./SearchResult";
-import config from "@/config/config.json";
-const { default_language } = config.settings;
-const SearchModal = ({ lang }: { lang: string | undefined }) => {
- lang = lang || default_language;
+const SearchModal = () => {
const [searchString, setSearchString] = useState("");
// handle input change
@@ -42,13 +39,9 @@ const SearchModal = ({ lang }: { lang: string | undefined }) => {
}
};
- // filter language specific search data
- const filterSearchData = searchData.filter((item) => item.lang === lang);
-
-
// get search result
const startTime = performance.now();
- const searchResult = doSearch(filterSearchData);
+ const searchResult = doSearch(searchData);
const endTime = performance.now();
const totalTime = ((endTime - startTime) / 1000).toFixed(3);
@@ -176,15 +169,10 @@ const SearchModal = ({ lang }: { lang: string | undefined }) => {
name="search"
value={searchString}
onChange={handleSearch}
- autoFocus
autoComplete="off"
/>
diff --git a/src/layouts/helpers/SearchResult.tsx b/src/layouts/helpers/SearchResult.tsx
index 810cc3c..6c0efae 100755
--- a/src/layouts/helpers/SearchResult.tsx
+++ b/src/layouts/helpers/SearchResult.tsx
@@ -1,9 +1,7 @@
-import { slugSelector } from "@/lib/utils/languageParser";
import { plainify, titleify } from "@/lib/utils/textConverter";
import React from "react";
export interface ISearchItem {
- lang: string;
group: string;
slug: string;
frontmatter: {
@@ -35,13 +33,10 @@ export interface ISearchGroup {
const SearchResult = ({
searchResult,
searchString,
- lang
}: {
searchResult: ISearchItem[];
searchString: string;
- lang: string;
}) => {
-
// generate search result group
const generateSearchGroup = (searchResult: ISearchItem[]) => {
const joinDataByGroup: ISearchGroup[] = searchResult.reduce(
@@ -88,7 +83,6 @@ const SearchResult = ({
);
};
-
// match underline
const matchUnderline = (text: string, substring: string) => {
const parts = text?.split(new RegExp(`(${substring})`, "gi"));
@@ -154,14 +148,12 @@ const SearchResult = ({
)}
diff --git a/src/layouts/partials/Footer.astro b/src/layouts/partials/Footer.astro
index 09d6912..cd1b641 100755
--- a/src/layouts/partials/Footer.astro
+++ b/src/layouts/partials/Footer.astro
@@ -2,21 +2,11 @@
import Logo from "@/components/Logo.astro";
import Social from "@/components/Social.astro";
import config from "@/config/config.json";
+import menu from "@/config/menu.json";
import social from "@/config/social.json";
-import {
- getLangFromUrl,
- getTranslations,
- slugSelector,
-} from "@/lib/utils/languageParser";
import { markdownify } from "@/lib/utils/textConverter";
-import type { ContentEntryMap } from "astro:content";
-const lang = getLangFromUrl(Astro.url);
-const menu = await getTranslations(lang as keyof ContentEntryMap);
-let footer: any = [];
-if (menu) {
- footer = menu.footer;
-}
+const { footer }: { footer: { name: string; url: string }[] } = menu;
---