diff --git a/.vscode/settings.json b/.vscode/settings.json index 175ae55..961e10d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,5 +14,5 @@ "i18n-ally.review.gutters": false, "i18n-ally.sortCompare": "locale", "i18n-ally.sortKeys": true, - "i18n-ally.sortLocale": "en" + "i18n-ally.sortLocale": "en", } diff --git a/scripts/generate-i18n-locale-types.ts b/scripts/generate-i18n-locale-types.ts index 10dc95c..e20e9f1 100644 --- a/scripts/generate-i18n-locale-types.ts +++ b/scripts/generate-i18n-locale-types.ts @@ -1,12 +1,11 @@ // npx ts-node --esm file.ts -import { quicktype, InputData, jsonInputForTargetLanguage, TypeScriptTargetLanguage } from "quicktype-core"; +import jsyaml from "js-yaml"; import fs from "node:fs"; import path from "node:path"; import { dirname } from "path"; +import { InputData, TypeScriptTargetLanguage, jsonInputForTargetLanguage, quicktype } from "quicktype-core"; import { fileURLToPath } from "url"; -import jsyaml from "js-yaml"; -import { Console } from "node:console"; const __dirname = dirname(fileURLToPath(import.meta.url)); diff --git a/scripts/yaml-convert.ts b/scripts/yaml-convert.ts index a4a5b00..13b2eea 100644 --- a/scripts/yaml-convert.ts +++ b/scripts/yaml-convert.ts @@ -1,10 +1,10 @@ // npx ts-node --esm file.ts +import yaml from "js-yaml"; import fs from "node:fs"; import path from "node:path"; import { dirname } from "path"; import { fileURLToPath } from "url"; -import yaml from "js-yaml"; const __dirname = dirname(fileURLToPath(import.meta.url)); const folderName = path.resolve(__dirname, "./src/content/categories/"); diff --git a/src/components/astro/blog/AllPostsUrl.astro b/src/components/astro/blog/AllPostsUrl.astro index f420b94..5a63901 100644 --- a/src/components/astro/blog/AllPostsUrl.astro +++ b/src/components/astro/blog/AllPostsUrl.astro @@ -1,17 +1,7 @@ --- -import { getCollection, type CollectionEntry } from "astro:content"; -import { getRoutingLocale, getLocale } from "@i18n/utils"; -import PageLayout from "@layouts/PageLayout.astro"; -import { loadNamespaces, t } from "@i18n/i18n"; -import Section from "@components/astro/global/Section.astro"; -import SmallBlogPostPreview from "@components/astro/blog/SmallBlogPostPreview.astro"; -import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; -import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; -import { getRelativeLocaleUrl } from "astro:i18n"; -import { getTagByLocale } from "@utils/getTagByLocale"; -import { locales } from "@config/i18n"; -import type { Page } from "astro"; +import { getLocale } from "@i18n/utils"; import { Icon } from "astro-icon/components"; +import { getRelativeLocaleUrl } from "astro:i18n"; interface Props { url: string; @@ -22,7 +12,6 @@ const { url, urlDescription } = Astro.props; // i18next const locale = getLocale(Astro.url); - ---
diff --git a/src/components/astro/blog/BlogPostPreview.astro b/src/components/astro/blog/BlogPostPreview.astro index bbc3bef..bb3d899 100644 --- a/src/components/astro/blog/BlogPostPreview.astro +++ b/src/components/astro/blog/BlogPostPreview.astro @@ -1,14 +1,13 @@ --- -import type { CollectionEntry } from "astro:content"; import FormattedDate from "@components/astro/blog/FormattedDate.astro"; +import { loadNamespaces, t } from "@i18n/i18n"; import { getLocale } from "@i18n/utils"; -import TagList from "./TagList.astro"; -import { getOgImageUrl } from "@utils/getOgImageUrl"; import { getBlogPostUrl } from "@utils/getBlogPostUrl"; -import { getPostImgTransitionName } from "@utils/getPostImgTransitionName"; import { getCategoryTitleByLocale } from "@utils/getCategoryByLocale"; +import { getOgImageUrl } from "@utils/getOgImageUrl"; +import type { CollectionEntry } from "astro:content"; import { getRelativeLocaleUrl } from "astro:i18n"; -import { loadNamespaces, t } from "@i18n/i18n"; +import TagList from "./TagList.astro"; interface Props { post: CollectionEntry<"posts">; diff --git a/src/components/astro/blog/Category.astro b/src/components/astro/blog/Category.astro index b4e25be..fcf6c3e 100644 --- a/src/components/astro/blog/Category.astro +++ b/src/components/astro/blog/Category.astro @@ -1,13 +1,11 @@ --- -import { getCollection, type CollectionEntry } from "astro:content"; +import { loadNamespaces, t } from "@i18n/i18n"; import { getLocale } from "@i18n/utils"; -import { getRelativeLocaleUrl } from "astro:i18n"; import { getCategoryDescriptionByLocale, getCategoryTitleByLocale } from "@utils/getCategoryByLocale"; import { Icon } from "astro-icon/components"; -import SmallBlogPostPreview from "./SmallBlogPostPreview.astro"; -import { loadNamespaces, t } from "@i18n/i18n"; +import { getCollection, type CollectionEntry } from "astro:content"; +import { getRelativeLocaleUrl } from "astro:i18n"; import PostsList from "./PostsList.astro"; -import { getLocaleRelativeUrl } from "astro/virtual-modules/i18n.js"; interface Props { category: CollectionEntry<"categories">; diff --git a/src/components/astro/blog/FeaturedPosts.astro b/src/components/astro/blog/FeaturedPosts.astro index f6bf260..3c99dd1 100644 --- a/src/components/astro/blog/FeaturedPosts.astro +++ b/src/components/astro/blog/FeaturedPosts.astro @@ -1,11 +1,8 @@ --- -import { getLocale } from "@i18n/utils"; -import { getCollection } from "astro:content"; -import BlogPostPreview from "@components/astro/blog/BlogPostPreview.astro"; import { BLOG } from "@config/blog"; -import { getRelativeLocaleUrl } from "astro:i18n"; import { loadNamespaces, t } from "@i18n/i18n"; -import { Icon } from "astro-icon/components"; +import { getLocale } from "@i18n/utils"; +import { getCollection } from "astro:content"; import Section from "../global/Section.astro"; import PostsGrid from "./PostsGrid.astro"; diff --git a/src/components/astro/blog/PostsGrid.astro b/src/components/astro/blog/PostsGrid.astro index e001157..c68c44a 100644 --- a/src/components/astro/blog/PostsGrid.astro +++ b/src/components/astro/blog/PostsGrid.astro @@ -1,11 +1,8 @@ --- -import { getLocale } from "@i18n/utils"; -import { getCollection, type CollectionEntry } from "astro:content"; import BlogPostPreview from "@components/astro/blog/BlogPostPreview.astro"; -import { getRelativeLocaleUrl } from "astro:i18n"; -import { loadNamespaces, t } from "@i18n/i18n"; -import { Icon } from "astro-icon/components"; +import { getLocale } from "@i18n/utils"; import type { Page } from "astro"; +import { type CollectionEntry } from "astro:content"; import AllPostsUrl from "./AllPostsUrl.astro"; interface Props { @@ -61,21 +58,4 @@ function isPage(value: any): value is Page { grid-template-columns: repeat(1, minmax(0, 1fr)); } } - - .arrow-link { - font-size: 1.1rem; - text-align: center; - - a { - display: inline-flex; - gap: 0.5rem; - } - - svg { - margin-top: 0.15rem; - width: 1rem; - height: 1rem; - color: var(--body-color); - } - } diff --git a/src/components/astro/blog/PostsList.astro b/src/components/astro/blog/PostsList.astro index b515d94..2db4dfc 100644 --- a/src/components/astro/blog/PostsList.astro +++ b/src/components/astro/blog/PostsList.astro @@ -1,17 +1,8 @@ --- -import { getCollection, type CollectionEntry } from "astro:content"; -import { getRoutingLocale, getLocale } from "@i18n/utils"; -import PageLayout from "@layouts/PageLayout.astro"; -import { loadNamespaces, t } from "@i18n/i18n"; -import Section from "@components/astro/global/Section.astro"; import SmallBlogPostPreview from "@components/astro/blog/SmallBlogPostPreview.astro"; -import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; -import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; -import { getRelativeLocaleUrl } from "astro:i18n"; -import { getTagByLocale } from "@utils/getTagByLocale"; -import { locales } from "@config/i18n"; +import { getLocale } from "@i18n/utils"; import type { Page } from "astro"; -import { Icon } from "astro-icon/components"; +import { type CollectionEntry } from "astro:content"; import AllPostsUrl from "./AllPostsUrl.astro"; interface Props { @@ -62,21 +53,4 @@ function isPage(value: any): value is Page { grid-template-columns: 1fr; } } - - .arrow-link { - font-size: 1.1rem; - text-align: center; - - a { - display: inline-flex; - gap: 0.5rem; - } - - svg { - margin-top: 0.15rem; - width: 1rem; - height: 1rem; - color: var(--body-color); - } - } diff --git a/src/components/astro/blog/RecentPosts.astro b/src/components/astro/blog/RecentPosts.astro index 6524dfd..59f985d 100644 --- a/src/components/astro/blog/RecentPosts.astro +++ b/src/components/astro/blog/RecentPosts.astro @@ -1,11 +1,8 @@ --- +import { loadNamespaces, t } from "@i18n/i18n"; import { getLocale } from "@i18n/utils"; import { getCollection } from "astro:content"; -import BlogPostPreview from "@components/astro/blog/BlogPostPreview.astro"; import { BLOG } from "src/config/blog"; -import { getRelativeLocaleUrl } from "astro:i18n"; -import { loadNamespaces, t } from "@i18n/i18n"; -import { Icon } from "astro-icon/components"; import Section from "../global/Section.astro"; import PostsGrid from "./PostsGrid.astro"; diff --git a/src/components/astro/blog/SmallBlogPostPreview.astro b/src/components/astro/blog/SmallBlogPostPreview.astro index 8376d14..ae17629 100644 --- a/src/components/astro/blog/SmallBlogPostPreview.astro +++ b/src/components/astro/blog/SmallBlogPostPreview.astro @@ -1,13 +1,12 @@ --- -import type { CollectionEntry } from "astro:content"; import FormattedDate from "@components/astro/blog/FormattedDate.astro"; +import { loadNamespaces, t } from "@i18n/i18n"; import { getLocale } from "@i18n/utils"; -import { getOgImageUrl } from "@utils/getOgImageUrl"; import { getBlogPostUrl } from "@utils/getBlogPostUrl"; -import { getPostImgTransitionName } from "@utils/getPostImgTransitionName"; -import { getRelativeLocaleUrl } from "astro:i18n"; import { getCategoryTitleByLocale } from "@utils/getCategoryByLocale"; -import { loadNamespaces, t } from "@i18n/i18n"; +import { getOgImageUrl } from "@utils/getOgImageUrl"; +import type { CollectionEntry } from "astro:content"; +import { getRelativeLocaleUrl } from "astro:i18n"; interface Props { post: CollectionEntry<"posts">; @@ -23,7 +22,7 @@ await loadNamespaces(locale, ["blog"]); ---
- {post.data.title}/ + {post.data.title}
{post.data.title} { diff --git a/src/components/astro/blog/Tag.astro b/src/components/astro/blog/Tag.astro index b2bd4d7..a496598 100644 --- a/src/components/astro/blog/Tag.astro +++ b/src/components/astro/blog/Tag.astro @@ -1,12 +1,10 @@ --- -import { getCollection, type CollectionEntry } from "astro:content"; +import { t } from "@i18n/i18n"; import { getLocale } from "@i18n/utils"; -import { getRelativeLocaleUrl } from "astro:i18n"; -import { getCategoryDescriptionByLocale, getCategoryTitleByLocale } from "@utils/getCategoryByLocale"; -import { Icon } from "astro-icon/components"; -import SmallBlogPostPreview from "./SmallBlogPostPreview.astro"; import { getTagByLocale } from "@utils/getTagByLocale"; -import { t } from "@i18n/i18n"; +import { Icon } from "astro-icon/components"; +import { getCollection, type CollectionEntry } from "astro:content"; +import { getRelativeLocaleUrl } from "astro:i18n"; import PostsList from "./PostsList.astro"; interface Props { @@ -43,8 +41,21 @@ const filteredPosts = {title} - {!filteredPosts &&

{t("blog.no_tagged_posts")} {title}

} - {filteredPosts && filteredPosts.length === 0 &&

{t("blog.no_tagged_posts")}{title}

} + { + !filteredPosts && ( +

+ {t("blog.no_tagged_posts")} {title} +

+ ) + } + { + filteredPosts && filteredPosts.length === 0 && ( +

+ {t("blog.no_tagged_posts")} + {title} +

+ ) + } { filteredPosts && filteredPosts.length !== 0 && ( <> diff --git a/src/components/astro/blog/TagList.astro b/src/components/astro/blog/TagList.astro index 345cf21..3bd3496 100644 --- a/src/components/astro/blog/TagList.astro +++ b/src/components/astro/blog/TagList.astro @@ -1,8 +1,8 @@ --- -import { getEntry, type CollectionEntry } from "astro:content"; import { getLocale } from "@i18n/utils"; -import { getRelativeLocaleUrl } from "astro:i18n"; import { getTagByLocale } from "@utils/getTagByLocale"; +import { type CollectionEntry } from "astro:content"; +import { getRelativeLocaleUrl } from "astro:i18n"; interface Props { post?: CollectionEntry<"posts">; diff --git a/src/components/astro/global/Contact.astro b/src/components/astro/global/Contact.astro index 7abea09..ce547bf 100644 --- a/src/components/astro/global/Contact.astro +++ b/src/components/astro/global/Contact.astro @@ -1,8 +1,8 @@ --- +import ContactForm from "@components/react/ContactForm/ContactForm"; import i18n, { loadNamespaces } from "@i18n/i18n"; -import type { ContactRes, CommonRes } from "@i18n/locales/types"; +import type { CommonRes, ContactRes } from "@i18n/locales/types"; import { getLocale } from "@i18n/utils"; -import ContactForm from "@components/react/ContactForm/ContactForm"; // i18next const locale = getLocale(Astro.url); diff --git a/src/components/astro/global/Footer.astro b/src/components/astro/global/Footer.astro index 4d18039..4032153 100644 --- a/src/components/astro/global/Footer.astro +++ b/src/components/astro/global/Footer.astro @@ -1,10 +1,8 @@ --- -import { Image } from "astro:assets"; import { getLocale } from "@i18n/utils"; import { loadNamespaces, t } from "@i18n/i18n"; // Images -import astroSvg from "@assets/img/astro/simple-full-logo-light.svg"; import { Icon } from "astro-icon/components"; // i18next diff --git a/src/components/astro/global/HeadHrefLangs.astro b/src/components/astro/global/HeadHrefLangs.astro index 13a26fd..0cfcec7 100644 --- a/src/components/astro/global/HeadHrefLangs.astro +++ b/src/components/astro/global/HeadHrefLangs.astro @@ -1,8 +1,8 @@ --- import { defaultLocale, locales } from "@config/i18n"; import { getPathFromUrl } from "@i18n/utils"; -import { getBlogPostByIdAndLocale } from "@utils/getBlogPostByIdAndLocale"; import { getAbsoluteBlogPostUrl } from "@utils/getAbsoluteBlogPostUrl"; +import { getBlogPostByIdAndLocale } from "@utils/getBlogPostByIdAndLocale"; import type { CollectionEntry } from "astro:content"; import { getAbsoluteLocaleUrl } from "astro:i18n"; diff --git a/src/components/astro/global/LanguageSelector.astro b/src/components/astro/global/LanguageSelector.astro index 1369284..fb136fc 100644 --- a/src/components/astro/global/LanguageSelector.astro +++ b/src/components/astro/global/LanguageSelector.astro @@ -2,15 +2,15 @@ // Credits: https://github.com/yassinedoghri/astro-i18next/blob/beta/src/components/LanguageSelector.astro // Edited for this project needs. -import { getLocale, getPathFromUrl } from "@i18n/utils"; -import ISO6991 from "iso-639-1"; import { locales } from "@config/i18n"; -import { getRelativeLocaleUrl } from "astro:i18n"; -import type { CollectionEntry } from "astro:content"; +import { loadNamespaces } from "@i18n/i18n"; +import { getLocale, getPathFromUrl } from "@i18n/utils"; import { getBlogPostByIdAndLocale } from "@utils/getBlogPostByIdAndLocale"; import { getBlogPostUrl } from "@utils/getBlogPostUrl"; -import { loadNamespaces, t } from "@i18n/i18n"; import { Icon } from "astro-icon/components"; +import type { CollectionEntry } from "astro:content"; +import { getRelativeLocaleUrl } from "astro:i18n"; +import ISO6991 from "iso-639-1"; interface Props { post?: CollectionEntry<"posts">; diff --git a/src/components/astro/global/Navigation.astro b/src/components/astro/global/Navigation.astro index bd50b3d..042393d 100644 --- a/src/components/astro/global/Navigation.astro +++ b/src/components/astro/global/Navigation.astro @@ -1,11 +1,11 @@ --- -import { getLocale } from "@i18n/utils"; import { loadNamespaces, t } from "@i18n/i18n"; -import LanguageSelector from "./LanguageSelector.astro"; -import { getRelativeLocaleUrl } from "astro:i18n"; +import { getLocale } from "@i18n/utils"; +import { Icon } from "astro-icon/components"; import type { CollectionEntry } from "astro:content"; +import { getRelativeLocaleUrl } from "astro:i18n"; +import LanguageSelector from "./LanguageSelector.astro"; import Search from "./Search.astro"; -import { Icon } from "astro-icon/components"; import ThemeSelect from "./ThemeSelect.astro"; interface Props { diff --git a/src/components/astro/global/Search.astro b/src/components/astro/global/Search.astro index 151f7ae..a4b9074 100644 --- a/src/components/astro/global/Search.astro +++ b/src/components/astro/global/Search.astro @@ -32,8 +32,8 @@ if (locale === "cs") { diff --git a/src/components/astro/home/Intro.astro b/src/components/astro/home/Intro.astro index 1129e53..834796e 100644 --- a/src/components/astro/home/Intro.astro +++ b/src/components/astro/home/Intro.astro @@ -1,8 +1,8 @@ --- -import { getLocale } from "@i18n/utils"; +import avatar from "@assets/img/profile/avatar-casual.svg"; import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale } from "@i18n/utils"; import { Icon } from "astro-icon/components"; -import avatar from "@assets/img/profile/avatar-casual.svg"; import { Image } from "astro:assets"; // i18next @@ -62,7 +62,6 @@ await loadNamespaces(locale, ["common", "landing"]); img { max-height: 240px; } - } .shake { diff --git a/src/components/astro/projects/ProjectCard.astro b/src/components/astro/projects/ProjectCard.astro index aa41be7..64f05aa 100644 --- a/src/components/astro/projects/ProjectCard.astro +++ b/src/components/astro/projects/ProjectCard.astro @@ -1,9 +1,9 @@ --- +import { extractFileNameAndExtension } from "@utils/extractFilenameAndExtension"; +import type { ImageMetadata } from "astro"; import { Image } from "astro:assets"; import type { CollectionEntry } from "astro:content"; import { getEntry } from "astro:content"; -import type { ImageMetadata } from "astro"; -import { extractFileNameAndExtension } from "@utils/extractFilenameAndExtension"; interface Props { project: CollectionEntry<"projects">; @@ -40,7 +40,7 @@ function getImage(name: string, ext: string): ImageMetadata { throw new Error(`${filepath} not found`); } - return files[filepath]; + return files[filepath]; } --- diff --git a/src/components/astro/projects/ProjectCardList.astro b/src/components/astro/projects/ProjectCardList.astro index c20d27b..e1d57b7 100644 --- a/src/components/astro/projects/ProjectCardList.astro +++ b/src/components/astro/projects/ProjectCardList.astro @@ -1,9 +1,9 @@ --- -import { getCollection, type CollectionEntry } from "astro:content"; -import ProjectCard from "./ProjectCard.astro"; -import { getLocale } from "@i18n/utils"; -import { loadNamespaces } from "@i18n/i18n"; import { PROJECTS } from "@config/blog"; +import { loadNamespaces } from "@i18n/i18n"; +import { getLocale } from "@i18n/utils"; +import { getCollection } from "astro:content"; +import ProjectCard from "./ProjectCard.astro"; interface Props { listSize?: number; diff --git a/src/components/astro/projects/RecentProjects.astro b/src/components/astro/projects/RecentProjects.astro index 6e8786b..aab71d6 100644 --- a/src/components/astro/projects/RecentProjects.astro +++ b/src/components/astro/projects/RecentProjects.astro @@ -1,11 +1,10 @@ --- -import { Image } from "astro:assets"; import { loadNamespaces, t } from "@i18n/i18n"; import { getLocale } from "@i18n/utils"; -import ProjectCard from "./ProjectCard.astro"; import { Icon } from "astro-icon/components"; import { getCollection } from "astro:content"; import { getRelativeLocaleUrl } from "astro:i18n"; +import ProjectCard from "./ProjectCard.astro"; // i18next const locale = getLocale(Astro.url); @@ -15,9 +14,11 @@ const projects = await getCollection("projects", ({ data }) => { return data.language === locale; }); -const sortedProjects = projects.sort((a, b) => { - return new Date(b.data.projectStartDate).valueOf() - new Date(a.data.projectStartDate).valueOf(); -}).slice(0, 3); +const sortedProjects = projects + .sort((a, b) => { + return new Date(b.data.projectStartDate).valueOf() - new Date(a.data.projectStartDate).valueOf(); + }) + .slice(0, 3); ---
diff --git a/src/components/react/CmsAdmin/CmsAdmin.tsx b/src/components/react/CmsAdmin/CmsAdmin.tsx index 01fa2ed..edce9c8 100644 --- a/src/components/react/CmsAdmin/CmsAdmin.tsx +++ b/src/components/react/CmsAdmin/CmsAdmin.tsx @@ -1,7 +1,7 @@ +import { createCmsConfig } from "@config/cms"; import CMS, { type FieldPreviewProps, type TemplatePreviewCardProps } from "@staticcms/core"; -import { useEffect } from "react"; import "@staticcms/core/dist/main.css"; -import { createCmsConfig } from "@config/cms"; +import { useEffect } from "react"; const PostHiddenFieldPreview = ({ value }: FieldPreviewProps) => { return ( diff --git a/src/components/react/ContactForm/ContactForm.tsx b/src/components/react/ContactForm/ContactForm.tsx index 0a0eee1..66bb910 100644 --- a/src/components/react/ContactForm/ContactForm.tsx +++ b/src/components/react/ContactForm/ContactForm.tsx @@ -1,10 +1,10 @@ -import { useState, useEffect, useRef } from "react"; -import { useForm, useWatch, type FieldValues, type Field } from "react-hook-form"; -import styles from "./ContactForm.module.css"; -import type { ContactRes, CommonRes } from "@i18n/locales/types"; import { useAutoAnimate } from "@formkit/auto-animate/react"; import HCaptcha from "@hcaptcha/react-hcaptcha"; import { interpolate } from "@i18n/i18n"; +import type { CommonRes, ContactRes } from "@i18n/locales/types"; +import { useEffect, useRef, useState } from "react"; +import { useForm, useWatch, type FieldValues } from "react-hook-form"; +import styles from "./ContactForm.module.css"; interface ContactFormProps { resources: ContactRes; diff --git a/src/config/blog.ts b/src/config/blog.ts index e2373aa..509dac7 100644 --- a/src/config/blog.ts +++ b/src/config/blog.ts @@ -6,5 +6,5 @@ export const BLOG = { }; export const PROJECTS = { - recentProjectsSize: 3 -} + recentProjectsSize: 3, +}; diff --git a/src/config/cms.ts b/src/config/cms.ts index d3950e5..5156eb1 100644 --- a/src/config/cms.ts +++ b/src/config/cms.ts @@ -1,5 +1,5 @@ import { localeSettings, locales } from "@config/i18n"; -import type { Config, Field, ObjectField, UnknownField } from "@staticcms/core"; +import type { Config, Field, UnknownField } from "@staticcms/core"; /** * Builds a CMS config out of other configurations. @@ -474,7 +474,6 @@ export function createCmsConfig(): Config { ], }, }, - ], }, { diff --git a/src/content/config.ts b/src/content/config.ts index a385080..e274706 100644 --- a/src/content/config.ts +++ b/src/content/config.ts @@ -1,5 +1,5 @@ -import { z, defineCollection, reference } from "astro:content"; import { locales } from "@config/i18n"; +import { defineCollection, reference, z } from "astro:content"; // Define a `type` and `schema` for each collection const postsCollection = defineCollection({ @@ -87,5 +87,5 @@ export const collections = { tags: tagsCollection, categories: categoryCollection, projects: projectsCollection, - "project-tags": projectTagsCollection + "project-tags": projectTagsCollection, }; diff --git a/src/content/project-tags/astrojs.json b/src/content/project-tags/astrojs.json index eb9285b..d9cc257 100644 --- a/src/content/project-tags/astrojs.json +++ b/src/content/project-tags/astrojs.json @@ -2,4 +2,4 @@ "id": "astrojs", "title": "Astro.js", "bgColor": "rgb(232,121,249)" -} \ No newline at end of file +} diff --git a/src/content/project-tags/javascript.json b/src/content/project-tags/javascript.json index 90f3b80..496a7d5 100644 --- a/src/content/project-tags/javascript.json +++ b/src/content/project-tags/javascript.json @@ -2,4 +2,4 @@ "id": "javascript", "title": "JavaScript", "bgColor": "rgb(250,204,21)" -} \ No newline at end of file +} diff --git a/src/content/project-tags/kmp.json b/src/content/project-tags/kmp.json index 42aa736..a58a460 100644 --- a/src/content/project-tags/kmp.json +++ b/src/content/project-tags/kmp.json @@ -2,4 +2,4 @@ "id": "kmp", "title": "Kotlin Multiplatform", "bgColor": "linear-gradient(to right,#ef4857 0,#de4970 20%,#b44db0 50%,#7f52ff 100%)" -} \ No newline at end of file +} diff --git a/src/content/project-tags/react.json b/src/content/project-tags/react.json index 6a5e63d..4bb1292 100644 --- a/src/content/project-tags/react.json +++ b/src/content/project-tags/react.json @@ -2,4 +2,4 @@ "id": "react", "title": "React", "bgColor": "rgb(20,158,202)" -} \ No newline at end of file +} diff --git a/src/content/project-tags/typescript.json b/src/content/project-tags/typescript.json index cd762d1..2cdc74a 100644 --- a/src/content/project-tags/typescript.json +++ b/src/content/project-tags/typescript.json @@ -2,4 +2,4 @@ "id": "typescript", "title": "TypeScript", "bgColor": "rgb(251,113,133)" -} \ No newline at end of file +} diff --git a/src/content/project-tags/web.json b/src/content/project-tags/web.json index a4d6ff7..88093c3 100644 --- a/src/content/project-tags/web.json +++ b/src/content/project-tags/web.json @@ -2,4 +2,4 @@ "id": "web", "title": "Web", "bgColor": "rgb(163,230,53)" -} \ No newline at end of file +} diff --git a/src/content/projects/cs/github-oauth-provider-for-static-cms.md b/src/content/projects/cs/github-oauth-provider-for-static-cms.md index caf5fc3..d43f4f1 100644 --- a/src/content/projects/cs/github-oauth-provider-for-static-cms.md +++ b/src/content/projects/cs/github-oauth-provider-for-static-cms.md @@ -2,11 +2,12 @@ title: Zprostředkovatel GitHub OAuth pro Static CMS href: https://github.com/dallyh/static-cms-gh-oauth-provider projectTags: - - astrojs - - typescript - - web + - astrojs + - typescript + - web language: cs image: /assets/uploads/img/projects/gh-oauth.svg projectStartDate: 2024-01-01 --- -Rozhraní API, které poskytuje autentizaci pro systém Static CMS prostřednictvím služby GitHub OAuth. \ No newline at end of file + +Rozhraní API, které poskytuje autentizaci pro systém Static CMS prostřednictvím služby GitHub OAuth. diff --git a/src/content/projects/cs/lemmy-kotlin-client.md b/src/content/projects/cs/lemmy-kotlin-client.md index f7940b7..278fed7 100644 --- a/src/content/projects/cs/lemmy-kotlin-client.md +++ b/src/content/projects/cs/lemmy-kotlin-client.md @@ -2,9 +2,10 @@ title: Lemmy Kotlin Client href: https://github.com/dallyh/lemmy-kt-client projectTags: - - kmp + - kmp language: cs image: /assets/uploads/img/projects/lemmy-logo.svg projectStartDate: 2023-08-20 --- -Multiplatformní klient postavený na platofrmě Kotlin Multiplatform pro platformu [Lemmy](https://join-lemmy.org/). \ No newline at end of file + +Multiplatformní klient postavený na platofrmě Kotlin Multiplatform pro platformu [Lemmy](https://join-lemmy.org/). diff --git a/src/content/projects/cs/this-web.md b/src/content/projects/cs/this-web.md index d28f59c..abf9beb 100644 --- a/src/content/projects/cs/this-web.md +++ b/src/content/projects/cs/this-web.md @@ -2,13 +2,14 @@ title: Tento web href: https://github.com/dallyh/daliborhon.dev projectTags: - - astrojs - - typescript - - javascript - - react - - web + - astrojs + - typescript + - javascript + - react + - web language: cs image: /assets/uploads/img/projects/this-web.svg projectStartDate: 2099-12-31 --- -Zdrojový kód této webové stránky \ No newline at end of file + +Zdrojový kód této webové stránky diff --git a/src/content/projects/en/github-oauth-provider-for-static-cms.md b/src/content/projects/en/github-oauth-provider-for-static-cms.md index e119e1b..1e331d6 100644 --- a/src/content/projects/en/github-oauth-provider-for-static-cms.md +++ b/src/content/projects/en/github-oauth-provider-for-static-cms.md @@ -2,11 +2,12 @@ title: GitHub OAuth provider for Static CMS href: https://github.com/dallyh/static-cms-gh-oauth-provider projectTags: - - astrojs - - typescript - - web + - astrojs + - typescript + - web language: en image: /assets/uploads/img/projects/gh-oauth.svg projectStartDate: 2024-01-01 --- -An API that provides authentification for Static CMS through GitHub's OAuth. \ No newline at end of file + +An API that provides authentification for Static CMS through GitHub's OAuth. diff --git a/src/content/projects/en/lemmy-kotlin-client.md b/src/content/projects/en/lemmy-kotlin-client.md index 824177e..fda160f 100644 --- a/src/content/projects/en/lemmy-kotlin-client.md +++ b/src/content/projects/en/lemmy-kotlin-client.md @@ -2,9 +2,10 @@ title: Lemmy Kotlin Client href: https://github.com/dallyh/lemmy-kt-client projectTags: - - kmp + - kmp language: en image: /assets/uploads/img/projects/lemmy-logo.svg projectStartDate: 2023-08-20 --- -A Kotlin Multiplatform client for [Lemmy](https://join-lemmy.org/). \ No newline at end of file + +A Kotlin Multiplatform client for [Lemmy](https://join-lemmy.org/). diff --git a/src/content/projects/en/this-web.md b/src/content/projects/en/this-web.md index ea130d0..23a0013 100644 --- a/src/content/projects/en/this-web.md +++ b/src/content/projects/en/this-web.md @@ -2,13 +2,14 @@ title: This web href: https://github.com/dallyh/daliborhon.dev projectTags: - - astrojs - - typescript - - javascript - - react - - web + - astrojs + - typescript + - javascript + - react + - web language: en image: /assets/uploads/img/projects/this-web.svg projectStartDate: 2099-12-31 --- + Source code for this website diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts index 2ba42fe..54ec7b7 100644 --- a/src/i18n/i18n.ts +++ b/src/i18n/i18n.ts @@ -1,9 +1,9 @@ +import { defaultLocale, locales } from "@config/i18n"; import i18next, { type InitOptions } from "i18next"; import fsBackend from "i18next-fs-backend"; -import { defaultLocale, locales } from "@config/i18n"; const i18nConfig: InitOptions = { - debug: import.meta.env.DEV, + debug: false, ns: [], defaultNS: "common", nsSeparator: ".", diff --git a/src/i18n/locales/cs/contact.yaml b/src/i18n/locales/cs/contact.yaml index 8cd8a6b..5089950 100644 --- a/src/i18n/locales/cs/contact.yaml +++ b/src/i18n/locales/cs/contact.yaml @@ -24,7 +24,7 @@ profile: profilu subject_default: Nová zpráva z webu subject_title: Předmět submit_error: Při odeslání formuláře nastala chyba. -submit_error_formatted: 'Při odeslání formuláře nastala chyba: {{message}}.' +submit_error_formatted: "Při odeslání formuláře nastala chyba: {{message}}." submit_error_try_again: Zkuste to prosím později, nebo použijte jinou formu kontaktu. submit_success: Děkuji za Vaši zprávu! Ozvu se hned, jakmile to bude možné. success: Úspěch! diff --git a/src/i18n/locales/en/contact.yaml b/src/i18n/locales/en/contact.yaml index 03ba486..2da545b 100644 --- a/src/i18n/locales/en/contact.yaml +++ b/src/i18n/locales/en/contact.yaml @@ -24,7 +24,7 @@ profile: profile subject_default: New submission from the web subject_title: Subject submit_error: An error occured while submitting the form. -submit_error_formatted: 'An error occured while sending the form: {{message}}.' +submit_error_formatted: "An error occured while sending the form: {{message}}." submit_error_try_again: Please try again later, or use other means of contact. submit_success: Thanks for you message! I will get back to you as soon as possible. success: Success! diff --git a/src/i18n/locales/types.ts b/src/i18n/locales/types.ts index 7bcff51..a20d3d0 100644 --- a/src/i18n/locales/types.ts +++ b/src/i18n/locales/types.ts @@ -1,169 +1,168 @@ export type BlogRes = { - all_posts_title: string; - blog_description: string; - blog_site_description: string; - browse_posts: string; - categories: string; - categories_description: string; - category: string; - explore_posts: string; - featured: string; + all_posts_title: string; + blog_description: string; + blog_site_description: string; + browse_posts: string; + categories: string; + categories_description: string; + category: string; + explore_posts: string; + featured: string; featured_posts_description: string; - featured_posts_title: string; - next_page: string; - no_categories: string; - no_category_posts: string; - no_featured_posts: string; - no_posts: string; - no_tagged_posts: string; - no_tags: string; - open_toc: string; - page_count_title: string; - post: string; - posted_category: string; - posts: string; - posts_tagged: string; - posts_with_category: string; - prev_page: string; - published_date_title: string; - recent_posts_description: string; - recent_posts_title: string; - see_all_featured: string; - see_all_posts: string; - tag: string; - tags: string; - tags_desctiption: string; - toc: string; - updated_date_title: string; - written_by: string; -} + featured_posts_title: string; + next_page: string; + no_categories: string; + no_category_posts: string; + no_featured_posts: string; + no_posts: string; + no_tagged_posts: string; + no_tags: string; + open_toc: string; + page_count_title: string; + post: string; + posted_category: string; + posts: string; + posts_tagged: string; + posts_with_category: string; + prev_page: string; + published_date_title: string; + recent_posts_description: string; + recent_posts_title: string; + see_all_featured: string; + see_all_posts: string; + tag: string; + tags: string; + tags_desctiption: string; + toc: string; + updated_date_title: string; + written_by: string; +}; export type CommonRes = { - about: string; - back_btn: string; - blog: string; - blog_submenu_a_label: string; - browser_warning_text: string; - close_btn: string; - contact: string; - country_czech_republic: string; - cz_ms_region: string; - from_czech_republic: string; - home: string; - home_page: string; - language: string; + about: string; + back_btn: string; + blog: string; + blog_submenu_a_label: string; + browser_warning_text: string; + close_btn: string; + contact: string; + country_czech_republic: string; + cz_ms_region: string; + from_czech_republic: string; + home: string; + home_page: string; + language: string; language_submenu_a_label: string; - loading: string; - location_title: string; - my_name: string; - my_name_possesive: string; - my_name_surname: string; - my_surname: string; - resume: string; - search: string; - site_description: string; - social_links_title: string; - submit_btn: string; - word_from: string; -} + loading: string; + location_title: string; + my_name: string; + my_name_possesive: string; + my_name_surname: string; + my_surname: string; + resume: string; + search: string; + site_description: string; + social_links_title: string; + submit_btn: string; + word_from: string; +}; export type ContactRes = { - contact_description: string; - contact_info: string; - contact_me_at: string; - contact_me_form: string; - email_placeholder: string; - email_title: string; - error: string; - error_correct_fields: string; - error_empty_field: string; - error_format_email: string; - full_name_placeholder: string; - full_name_title: string; - go_back: string; - leave_message_title: string; - msg_placeholder: string; - msg_title: string; - profile: string; - subject_default: string; - subject_title: string; - submit_error: string; + contact_description: string; + contact_info: string; + contact_me_at: string; + contact_me_form: string; + email_placeholder: string; + email_title: string; + error: string; + error_correct_fields: string; + error_empty_field: string; + error_format_email: string; + full_name_placeholder: string; + full_name_title: string; + go_back: string; + leave_message_title: string; + msg_placeholder: string; + msg_title: string; + profile: string; + subject_default: string; + subject_title: string; + submit_error: string; submit_error_formatted: string; submit_error_try_again: string; - submit_success: string; - success: string; - try_again: string; -} + submit_success: string; + success: string; + try_again: string; +}; export type FooterRes = { - astro_a_label: string; - created_with: string; - github_a_label: string; - github_name: string; - hosted_by: string; - page_created_by: string; + astro_a_label: string; + created_with: string; + github_a_label: string; + github_name: string; + hosted_by: string; + page_created_by: string; site_admin_a_label: string; -} +}; export type LandingRes = { hi_there: string; -} +}; export type ProjectsRes = { - cms_oauth_description: string; - cms_oauth_title: string; - description: string; + cms_oauth_description: string; + cms_oauth_title: string; + description: string; lemmy_kt_client_description: string; - lemmy_kt_client_title: string; - projects: string; - projects_title: string; - see_all: string; - this_website_description: string; - this_website_title: string; -} + lemmy_kt_client_title: string; + projects: string; + projects_title: string; + see_all: string; + this_website_description: string; + this_website_title: string; +}; export type ResumeRes = { - asus_tech_description: string; - asus_technician_date: string; - card_ba_detail: string; - card_ba_title: string; - card_dev_detail: string; - card_dev_title: string; - card_implementation_detail: string; - card_implementation_title: string; - card_project_detail: string; - card_project_title: string; - high_school_description: string; - high_school_name: string; - hover_icons_tooltip: string; - km_ecm_date: string; - km_ecm_description: string; - linkedin_certs: string; - maturity_diploma: string; - moneta_analyst_date: string; - moneta_analyst_description: string; - moneta_end_user_date: string; - moneta_end_user_description: string; - resume_page_description: string; - scroll_next: string; - section_cert_title: string; - section_edu_title: string; - section_exp_title: string; - section_intro_title: string; - section_skills_title: string; - section_timeline_title: string; - skills_ba_description: string; - skills_ba_title: string; - skills_db_description: string; - skills_db_title: string; - skills_introduction: string; - skills_oop_description: string; - skills_oop_title: string; - skills_prg_title: string; - skills_sw_description: string; - skills_sw_title: string; + asus_tech_description: string; + asus_technician_date: string; + card_ba_detail: string; + card_ba_title: string; + card_dev_detail: string; + card_dev_title: string; + card_implementation_detail: string; + card_implementation_title: string; + card_project_detail: string; + card_project_title: string; + high_school_description: string; + high_school_name: string; + hover_icons_tooltip: string; + km_ecm_date: string; + km_ecm_description: string; + linkedin_certs: string; + maturity_diploma: string; + moneta_analyst_date: string; + moneta_analyst_description: string; + moneta_end_user_date: string; + moneta_end_user_description: string; + resume_page_description: string; + scroll_next: string; + section_cert_title: string; + section_edu_title: string; + section_exp_title: string; + section_intro_title: string; + section_skills_title: string; + section_timeline_title: string; + skills_ba_description: string; + skills_ba_title: string; + skills_db_description: string; + skills_db_title: string; + skills_introduction: string; + skills_oop_description: string; + skills_oop_title: string; + skills_prg_title: string; + skills_sw_description: string; + skills_sw_title: string; skills_windows_servers_description: string; - skills_windows_servers_title: string; - years: string; -} - + skills_windows_servers_title: string; + years: string; +}; diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts index 0c0738d..6daf8e1 100644 --- a/src/i18n/utils.ts +++ b/src/i18n/utils.ts @@ -1,6 +1,5 @@ +import { defaultLocale, locales, type AllowedLocales } from "@config/i18n"; import { removeTrailingSlash } from "@utils/removeTrailingSlash"; -import { locales, defaultLocale } from "@config/i18n"; -import { type AllowedLocales } from "@config/i18n"; export function getLocale(url: URL): AllowedLocales { const pathSegments = url.pathname.split("/"); diff --git a/src/layouts/MainLayout.astro b/src/layouts/MainLayout.astro index 335372c..0a33c00 100644 --- a/src/layouts/MainLayout.astro +++ b/src/layouts/MainLayout.astro @@ -4,13 +4,14 @@ import { getLocale } from "@i18n/utils"; import { t, loadNamespaces } from "@i18n/i18n"; import BrowserWarning from "@components/astro/global/BrowserWarning.astro"; import ThemeProvider from "@components/astro/global/ThemeProvider.astro"; +import { getAbsoluteLocaleUrl } from "astro:i18n"; // Global CSS import "../styles/reset.css"; import "../styles/variables.css"; import "../styles/global.css"; import "../styles/keyframes.css"; -import { getAbsoluteLocaleUrl, getRelativeLocaleUrl } from "astro:i18n"; + export interface Props { title?: string; @@ -30,7 +31,7 @@ const { title, author = "Dalibor Hon", description = t("common.site_description"), - ogImage = "og.png", + ogImage = getAbsoluteLocaleUrl(locale, "og.png"), canonicalURL = new URL(Astro.url.pathname, Astro.site), pubDatetime, modDatetime, @@ -38,7 +39,6 @@ const { } = Astro.props; const siteTitle = title == undefined ? "Dalibor Hon" : `${title} - Dalibor Hon`; -const socialImageURL = getAbsoluteLocaleUrl(locale, "og.png"); const basePath = import.meta.env.BASE_URL; --- @@ -68,7 +68,7 @@ const basePath = import.meta.env.BASE_URL; - + {pubDatetime && } @@ -79,7 +79,7 @@ const basePath = import.meta.env.BASE_URL; - + diff --git a/src/layouts/PageLayout.astro b/src/layouts/PageLayout.astro index c3be040..041eca5 100644 --- a/src/layouts/PageLayout.astro +++ b/src/layouts/PageLayout.astro @@ -1,7 +1,7 @@ --- +import Footer from "@components/astro/global/Footer.astro"; import HeadHrefLangs from "@components/astro/global/HeadHrefLangs.astro"; import Navigation from "@components/astro/global/Navigation.astro"; -import Footer from "@components/astro/global/Footer.astro"; import MainLayout from "./MainLayout.astro"; interface Props { diff --git a/src/layouts/PostsLayout.astro b/src/layouts/PostsLayout.astro index 67fed25..757843c 100644 --- a/src/layouts/PostsLayout.astro +++ b/src/layouts/PostsLayout.astro @@ -1,19 +1,18 @@ --- -import MainLayout from "@layouts/MainLayout.astro"; -import { loadNamespaces, t } from "@i18n/i18n"; -import { getLocale } from "@i18n/utils"; -import { type CollectionEntry } from "astro:content"; -import type { Page } from "astro"; -import BlogPostPreview from "@components/astro/blog/BlogPostPreview.astro"; +import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; +import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; +import PostsGrid from "@components/astro/blog/PostsGrid.astro"; +import Footer from "@components/astro/global/Footer.astro"; import HeadHrefLangs from "@components/astro/global/HeadHrefLangs.astro"; import Navigation from "@components/astro/global/Navigation.astro"; -import Footer from "@components/astro/global/Footer.astro"; import Section from "@components/astro/global/Section.astro"; -import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; -import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; -import { getRelativeLocaleUrl } from "astro:i18n"; +import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale } from "@i18n/utils"; +import MainLayout from "@layouts/MainLayout.astro"; +import type { Page } from "astro"; import { Icon } from "astro-icon/components"; -import PostsGrid from "@components/astro/blog/PostsGrid.astro"; +import { type CollectionEntry } from "astro:content"; +import { getRelativeLocaleUrl } from "astro:i18n"; interface Props { page: Page>; diff --git a/src/pages/[...lang]/blog/categories/[...category].astro b/src/pages/[...lang]/blog/categories/[...category].astro index 062c55e..d032629 100644 --- a/src/pages/[...lang]/blog/categories/[...category].astro +++ b/src/pages/[...lang]/blog/categories/[...category].astro @@ -1,16 +1,15 @@ --- -import { getCollection } from "astro:content"; -import { getRoutingLocale, getLocale } from "@i18n/utils"; -import PageLayout from "@layouts/PageLayout.astro"; -import { loadNamespaces, t } from "@i18n/i18n"; -import Section from "@components/astro/global/Section.astro"; -import SmallBlogPostPreview from "@components/astro/blog/SmallBlogPostPreview.astro"; import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; -import { getRelativeLocaleUrl } from "astro:i18n"; -import { getCategoryTitleByLocale } from "@utils/getCategoryByLocale"; -import { locales } from "@config/i18n"; import PostsList from "@components/astro/blog/PostsList.astro"; +import Section from "@components/astro/global/Section.astro"; +import { locales } from "@config/i18n"; +import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale, getRoutingLocale } from "@i18n/utils"; +import PageLayout from "@layouts/PageLayout.astro"; +import { getCategoryTitleByLocale } from "@utils/getCategoryByLocale"; +import { getCollection } from "astro:content"; +import { getRelativeLocaleUrl } from "astro:i18n"; // This is kinda complicated export async function getStaticPaths() { diff --git a/src/pages/[...lang]/blog/categories/index.astro b/src/pages/[...lang]/blog/categories/index.astro index 2e8dd29..55446c4 100644 --- a/src/pages/[...lang]/blog/categories/index.astro +++ b/src/pages/[...lang]/blog/categories/index.astro @@ -1,17 +1,16 @@ --- -import MainLayout from "@layouts/MainLayout.astro"; -import { loadNamespaces, t } from "@i18n/i18n"; -import { getLocale } from "@i18n/utils"; -import { getCollection } from "astro:content"; +import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; +import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; +import Category from "@components/astro/blog/Category.astro"; +import Footer from "@components/astro/global/Footer.astro"; import HeadHrefLangs from "@components/astro/global/HeadHrefLangs.astro"; import Navigation from "@components/astro/global/Navigation.astro"; -import Footer from "@components/astro/global/Footer.astro"; import Section from "@components/astro/global/Section.astro"; -import { getStaticPaths } from "@i18n/utils"; +import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale, getStaticPaths } from "@i18n/utils"; +import MainLayout from "@layouts/MainLayout.astro"; +import { getCollection } from "astro:content"; import { getRelativeLocaleUrl } from "astro:i18n"; -import Category from "@components/astro/blog/Category.astro"; -import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; -import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; export { getStaticPaths }; // i18n diff --git a/src/pages/[...lang]/blog/index.astro b/src/pages/[...lang]/blog/index.astro index d6422c9..02d3689 100644 --- a/src/pages/[...lang]/blog/index.astro +++ b/src/pages/[...lang]/blog/index.astro @@ -1,26 +1,16 @@ --- -import MainLayout from "@layouts/MainLayout.astro"; -import { loadNamespaces, t } from "@i18n/i18n"; -import { getLocale } from "@i18n/utils"; -import { getCollection } from "astro:content"; -import BlogPostPreview from "@components/astro/blog/BlogPostPreview.astro"; -import TagList from "@components/astro/blog/TagList.astro"; +import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; +import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; +import FeaturedPosts from "@components/astro/blog/FeaturedPosts.astro"; +import RecentPosts from "@components/astro/blog/RecentPosts.astro"; +import Footer from "@components/astro/global/Footer.astro"; import HeadHrefLangs from "@components/astro/global/HeadHrefLangs.astro"; import Navigation from "@components/astro/global/Navigation.astro"; -import Footer from "@components/astro/global/Footer.astro"; import Section from "@components/astro/global/Section.astro"; -import { BLOG } from "@config/blog"; -import { getStaticPaths } from "@i18n/utils"; -import CategoryList from "@components/astro/blog/Category.astro"; -import { getCategoryTitleByLocale } from "@utils/getCategoryByLocale"; -import { getTagByLocale } from "@utils/getTagByLocale"; +import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale, getStaticPaths } from "@i18n/utils"; +import MainLayout from "@layouts/MainLayout.astro"; import { getRelativeLocaleUrl } from "astro:i18n"; -import Category from "@components/astro/blog/Category.astro"; -import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; -import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; -import RecentPosts from "@components/astro/blog/RecentPosts.astro"; -import FeaturedPosts from "@components/astro/blog/FeaturedPosts.astro"; -import { Icon } from "astro-icon/components"; export { getStaticPaths }; diff --git a/src/pages/[...lang]/blog/posts/[...page].astro b/src/pages/[...lang]/blog/posts/[...page].astro index 294e396..c5befa8 100644 --- a/src/pages/[...lang]/blog/posts/[...page].astro +++ b/src/pages/[...lang]/blog/posts/[...page].astro @@ -1,10 +1,10 @@ --- -import { getCollection } from "astro:content"; -import type { GetStaticPathsOptions } from "astro"; -import { defaultLocale, locales } from "@config/i18n"; +import { locales } from "@config/i18n"; +import { getRoutingLocale } from "@i18n/utils"; import PostsLayout from "@layouts/PostsLayout.astro"; +import type { GetStaticPathsOptions } from "astro"; +import { getCollection } from "astro:content"; import { BLOG } from "src/config/blog"; -import { getRoutingLocale } from "@i18n/utils"; export async function getStaticPaths({ paginate }: GetStaticPathsOptions) { const posts = await getCollection("posts", ({ data }) => { diff --git a/src/pages/[...lang]/blog/posts/[...slug]/index.astro b/src/pages/[...lang]/blog/posts/[...slug]/index.astro index d63734a..a1652bb 100644 --- a/src/pages/[...lang]/blog/posts/[...slug]/index.astro +++ b/src/pages/[...lang]/blog/posts/[...slug]/index.astro @@ -1,8 +1,8 @@ --- -import { getCollection } from "astro:content"; -import BlogPostLayout from "@layouts/BlogPostLayout.astro"; import { getRoutingLocale } from "@i18n/utils"; +import BlogPostLayout from "@layouts/BlogPostLayout.astro"; import { getBlogPostSlug } from "@utils/getBlogPostSlug"; +import { getCollection } from "astro:content"; export async function getStaticPaths() { const allPosts = await getCollection("posts", ({ data }) => { diff --git a/src/pages/[...lang]/blog/posts/[...slug]/index.png.ts b/src/pages/[...lang]/blog/posts/[...slug]/index.png.ts index 2ec94e9..57631f5 100644 --- a/src/pages/[...lang]/blog/posts/[...slug]/index.png.ts +++ b/src/pages/[...lang]/blog/posts/[...slug]/index.png.ts @@ -1,9 +1,9 @@ -import type { APIContext } from "astro"; -import { getCollection, type CollectionEntry } from "astro:content"; -import { generateOgImageForPost } from "@utils/generateOgImage"; import { defaultLocale } from "@config/i18n"; import { getRoutingLocale } from "@i18n/utils"; +import { generateOgImageForPost } from "@utils/generateOgImage"; import { getBlogPostSlug } from "@utils/getBlogPostSlug"; +import type { APIContext } from "astro"; +import { getCollection, type CollectionEntry } from "astro:content"; export async function getStaticPaths() { const allPosts = await getCollection("posts", ({ data }) => { diff --git a/src/pages/[...lang]/blog/posts/featured/index.astro b/src/pages/[...lang]/blog/posts/featured/index.astro index 55e4b06..9b6310d 100644 --- a/src/pages/[...lang]/blog/posts/featured/index.astro +++ b/src/pages/[...lang]/blog/posts/featured/index.astro @@ -1,14 +1,11 @@ --- -import { loadNamespaces, t } from "@i18n/i18n"; -import { getLocale } from "@i18n/utils"; -import { getCollection } from "astro:content"; -import Section from "@components/astro/global/Section.astro"; import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; -import { getRelativeLocaleUrl } from "astro:i18n"; -import { getStaticPaths } from "@i18n/utils"; -import PageLayout from "@layouts/PageLayout.astro"; import FeaturedPosts from "@components/astro/blog/FeaturedPosts.astro"; +import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale, getStaticPaths } from "@i18n/utils"; +import PageLayout from "@layouts/PageLayout.astro"; +import { getRelativeLocaleUrl } from "astro:i18n"; export { getStaticPaths }; diff --git a/src/pages/[...lang]/blog/tags/[...tag].astro b/src/pages/[...lang]/blog/tags/[...tag].astro index d610219..52fe30d 100644 --- a/src/pages/[...lang]/blog/tags/[...tag].astro +++ b/src/pages/[...lang]/blog/tags/[...tag].astro @@ -1,16 +1,15 @@ --- -import { getCollection } from "astro:content"; -import { getRoutingLocale, getLocale } from "@i18n/utils"; -import PageLayout from "@layouts/PageLayout.astro"; -import { loadNamespaces, t } from "@i18n/i18n"; -import Section from "@components/astro/global/Section.astro"; -import SmallBlogPostPreview from "@components/astro/blog/SmallBlogPostPreview.astro"; import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; -import { getRelativeLocaleUrl } from "astro:i18n"; -import { getTagByLocale } from "@utils/getTagByLocale"; -import { locales } from "@config/i18n"; import PostsList from "@components/astro/blog/PostsList.astro"; +import Section from "@components/astro/global/Section.astro"; +import { locales } from "@config/i18n"; +import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale, getRoutingLocale } from "@i18n/utils"; +import PageLayout from "@layouts/PageLayout.astro"; +import { getTagByLocale } from "@utils/getTagByLocale"; +import { getCollection } from "astro:content"; +import { getRelativeLocaleUrl } from "astro:i18n"; // This is kinda complicated export async function getStaticPaths() { diff --git a/src/pages/[...lang]/blog/tags/index.astro b/src/pages/[...lang]/blog/tags/index.astro index 33b0096..860b291 100644 --- a/src/pages/[...lang]/blog/tags/index.astro +++ b/src/pages/[...lang]/blog/tags/index.astro @@ -1,17 +1,16 @@ --- -import MainLayout from "@layouts/MainLayout.astro"; -import { loadNamespaces, t } from "@i18n/i18n"; -import { getLocale } from "@i18n/utils"; -import { getCollection } from "astro:content"; +import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; +import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; +import Tag from "@components/astro/blog/Tag.astro"; +import Footer from "@components/astro/global/Footer.astro"; import HeadHrefLangs from "@components/astro/global/HeadHrefLangs.astro"; import Navigation from "@components/astro/global/Navigation.astro"; -import Footer from "@components/astro/global/Footer.astro"; import Section from "@components/astro/global/Section.astro"; -import { getStaticPaths } from "@i18n/utils"; +import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale, getStaticPaths } from "@i18n/utils"; +import MainLayout from "@layouts/MainLayout.astro"; +import { getCollection } from "astro:content"; import { getRelativeLocaleUrl } from "astro:i18n"; -import BreadCrumbs from "@components/astro/blog/BreadCrumbs.astro"; -import BreadCrumbsItem from "@components/astro/blog/BreadCrumbsItem.astro"; -import Tag from "@components/astro/blog/Tag.astro"; export { getStaticPaths }; // i18n diff --git a/src/pages/[...lang]/contact/index.astro b/src/pages/[...lang]/contact/index.astro index d4bcd69..d43f837 100644 --- a/src/pages/[...lang]/contact/index.astro +++ b/src/pages/[...lang]/contact/index.astro @@ -1,10 +1,9 @@ --- -import { loadNamespaces, t } from "@i18n/i18n"; -import { getLocale } from "@i18n/utils"; import Contact from "@components/astro/global/Contact.astro"; -import { getStaticPaths } from "@i18n/utils"; -import PageLayout from "@layouts/PageLayout.astro"; import Section from "@components/astro/global/Section.astro"; +import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale, getStaticPaths } from "@i18n/utils"; +import PageLayout from "@layouts/PageLayout.astro"; import { Icon } from "astro-icon/components"; export { getStaticPaths }; diff --git a/src/pages/[...lang]/home/index.astro b/src/pages/[...lang]/home/index.astro index c2b64b4..6565107 100644 --- a/src/pages/[...lang]/home/index.astro +++ b/src/pages/[...lang]/home/index.astro @@ -1,15 +1,12 @@ --- -import { loadNamespaces, t } from "@i18n/i18n"; -import { getLocale } from "@i18n/utils"; -import Intro from "@components/astro/home/Intro.astro"; -import Projects from "@components/astro/projects/RecentProjects.astro"; -import Contact from "@components/astro/global/Contact.astro"; -import { getStaticPaths } from "@i18n/utils"; +import FeaturedPosts from "@components/astro/blog/FeaturedPosts.astro"; import RecentPosts from "@components/astro/blog/RecentPosts.astro"; -import PageLayout from "@layouts/PageLayout.astro"; import Section from "@components/astro/global/Section.astro"; -import FeaturedPosts from "@components/astro/blog/FeaturedPosts.astro"; +import Intro from "@components/astro/home/Intro.astro"; import ProjectCardList from "@components/astro/projects/ProjectCardList.astro"; +import { loadNamespaces, t } from "@i18n/i18n"; +import { getLocale, getStaticPaths } from "@i18n/utils"; +import PageLayout from "@layouts/PageLayout.astro"; export { getStaticPaths }; diff --git a/src/pages/[...lang]/index.astro b/src/pages/[...lang]/index.astro index 946f472..a3adffc 100644 --- a/src/pages/[...lang]/index.astro +++ b/src/pages/[...lang]/index.astro @@ -57,7 +57,7 @@ const layoutProps = {