404
{t("404.description")}
diff --git a/src/templates/Projects.astro b/src/templates/Projects.astro
index 0e418bb..cb07e96 100644
--- a/src/templates/Projects.astro
+++ b/src/templates/Projects.astro
@@ -3,6 +3,7 @@ import { SITE_METADATA } from "@root/config";
import PageLayout from "@layouts/default.astro";
import ProjectsList from "@components/ProjectsList";
import ProjectItem from "@components/ProjectItem";
+import PageHeading from "@components/PageHeading";
import { getLanguageFromURL } from "@root/utils";
import { useTranslation } from "@i18n/utils";
@@ -12,6 +13,7 @@ const { projects } = SITE_METADATA;
---
+
{projects.map((project) => )}
diff --git a/src/types/main.d.ts b/src/types/main.d.ts
index 42a9eec..a0fcc75 100644
--- a/src/types/main.d.ts
+++ b/src/types/main.d.ts
@@ -15,13 +15,6 @@ declare global {
type LanguageKeys = keyof typeof languages;
type UIDictionaryKeys = keyof typeof uiKeys;
- type UtterancesConfigType = {
- repo: string;
- label?: string;
- issueTerm: string;
- theme: string;
- };
-
type SiteMetadataType = {
title: string;
name: string;
@@ -46,6 +39,7 @@ declare global {
tags: Array;
published_at: string;
lang?: string;
+ draft?: boolean;
};
type ProjectType = {
diff --git a/src/utils/history.ts b/src/utils/history.ts
index 7087c57..07b8142 100644
--- a/src/utils/history.ts
+++ b/src/utils/history.ts
@@ -1,10 +1,3 @@
-export const extendHistoryState = (state: object, url?: URL | string | undefined): void => {
- const { history } = window;
- const updated = Object.assign({}, history.state, state);
-
- history.replaceState(updated, "", url);
-};
-
export const deleteParamFromUrl = (param: string): string => {
const params = new URLSearchParams(window.location.search);
params.delete(param);
diff --git a/src/utils/string.ts b/src/utils/string.ts
index a56609f..085aa38 100644
--- a/src/utils/string.ts
+++ b/src/utils/string.ts
@@ -9,9 +9,3 @@ export function isEmail(email: string): boolean {
export function isURL(url: string): boolean {
return new RegExp(/(http|ftp|https):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:\\/~+#-]*[\w@?^=%&\\/~+#-])/).test(url);
}
-
-export function normalizeLangTag(tag: string) {
- if (!tag.includes("-")) return tag.toLowerCase();
- const [lang, region] = tag.split("-");
- return lang.toLowerCase() + "-" + region.toUpperCase();
-}
diff --git a/src/utils/url.ts b/src/utils/url.ts
index f294648..6957833 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -1,4 +1,5 @@
import { DEFAULT_LANGUAGE } from "@root/config";
+import languages from "@i18n/languages";
export const encode = (data: object) => {
return Object.keys(data)
@@ -6,7 +7,8 @@ export const encode = (data: object) => {
.join("&");
};
-export const getLanguageFromURL = (pathname: string) => {
- const langCodeMatch = pathname.match(/\/([a-z]{1}-?[a-z]{1})\//);
- return langCodeMatch ? langCodeMatch[1] : DEFAULT_LANGUAGE;
+export const getLanguageFromURL = (pathname: string): LanguageKeys => {
+ const lang = pathname.split("/")[1] as LanguageKeys;
+ if (Object.hasOwn(languages, lang)) return lang;
+ return DEFAULT_LANGUAGE;
};
diff --git a/tsconfig.json b/tsconfig.json
index 9127811..237b3e9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,7 +19,8 @@
"@stores/*": ["./src/stores/*"],
"@hooks/*": ["./src/hooks/*"],
"@i18n/*": ["./src/i18n/*"],
- "@images/*": ["./src/images/*"]
+ "@images/*": ["./src/images/*"],
+ "@services/*": ["./src/services/*"]
},
"outDir": "./dist",
"typeRoots": ["./node_modules/@types", "./src/types"]