+
diff --git a/src/constants.ts b/src/constants.ts
index 1cf32ee..4385d92 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,13 +1,10 @@
+import siteconfig from "../siteconfig.json";
+
export const DEFAULT_LANGUAGE: LanguageKeys = "ru";
-
-/* Show banner about website development */
-export const IS_SITE_UNDER_CONSTRUCTION =
- import.meta.env.IS_SITE_UNDER_CONSTRUCTION === "true" ? true : false;
-
+export const IS_SITE_UNDER_CONSTRUCTION = siteconfig.isSiteUnderConstruction;
export const SUPPORTED_LANGUAGES: SupportedLanguages = ["ru", "en"];
-
export const SITE_METADATA: SiteMetadataType = {
- title: "Sergey Yarkov",
+ title: siteconfig.globalTitle,
name: "yarkov.tech",
author: "Sergey Yarkov",
themeColor: "#1e2327",
diff --git a/src/content/authors/en/сергей-ярков.md b/src/content/authors/en/сергей-ярков.md
new file mode 100644
index 0000000..ecc73c2
--- /dev/null
+++ b/src/content/authors/en/сергей-ярков.md
@@ -0,0 +1,24 @@
+---
+firstName: Sergey
+lastName: Yarkov
+---
+My name is Sergey and I am a web developer. My main activity is creating web sites. I am interested in areas such as programming, embedded systems, and electronics.
+I started making web sites in 2017, starting with simple HTML pages, and in 2019 I started learning programming. At present, I have experience in **full-stack** web development of client-server applications that solve a wide range of tasks.
+Some of my personal [projects](/projects/) I put in public access on [Github](https://github.com/sergeyyarkov).
+
+## Purpose of this site
+
+I originally created this website for myself, to consolidate my knowledge by writing articles.
+Since 2022, I have been posting materials on this website, and now at any time I can return to any topic and learn it again.
+My articles can also help someone with mastering a particular topic. The main direction of this site is IT,
+and [here](/articles/) I publish materials on topics that interest me, as well as talk about my [projects](/projects/).
+I am absolutely calm about any criticism and I do not claim to be the best programmer in the world,
+so do not judge the materials of this resource harshly.
+
+## Skills
+
+This list shows the skills and technologies that I have used/use in my projects.
+For creating web projects, I use **Node.js** and the **Adonis.js** framework for the server-side.
+For the client-side, I develop using **React.js** or **Alpine.js**.
+
+this website is made using the [**Astro.js**](https://astro.build) framework and [**Solid.js**](https://www.solidjs.com/) library.
\ No newline at end of file
diff --git a/src/content/authors/ru/сергей-ярков.md b/src/content/authors/ru/сергей-ярков.md
new file mode 100644
index 0000000..960bb1a
--- /dev/null
+++ b/src/content/authors/ru/сергей-ярков.md
@@ -0,0 +1,28 @@
+---
+firstName: Сергей
+lastName: Ярков
+---
+Мое имя **Сергей** я являюсь веб-разработчиком. Основной деятельностью моей работы является создание веб-сайтов.
+Мне интересны такие сферы как программирование, встраиваемые системы и электроника.
+Веб-сайты я начал делать с 2017 года начиная с верстки простых HTML страничек и с 2019 года я начал
+обучаться программированием и на сегодняшний момент я имею опыт в **full-stack** веб-разработке клиент-серверных приложений,
+которые решают самые разные задачи.
+Некоторые из своих личных [проектов](/projects/) я выкладываю в общий доступ на [Github](https://github.com/sergeyyarkov).
+
+## Зачем этот сайт
+
+Первоначально я создал этот сайт для себя, чтобы закреплять свои знания путем написания статей. С 2022 года я начал
+выкладывать материалы на этот сайт и сейчас в любой момент я могу вернуться к какой-либо теме и еще раз её усвоить.
+Мои статьи также смогут кому-то помочь с освоением какой-либо темы.
+Главным направлением этого сайта является IT, и [здесь](/articles/) я публикую материалы на темы, которые меня интересуют,
+а также рассказываю о своих [проектах](/projects/).
+Я отношусь абсолютно спокойно к любой критике и я не претендую на звание лучшего программиста в мире, поэтому
+не судите строго материалы этого ресурса.
+
+## Навыки
+
+Этот список показывает имеющиеся у меня навыки и технологии которые я когда-либо использовал/использую в своих проектах.
+Для создания веб-проектов в качестве серверной части я использую **Node.js** и фреймворк **Adonis.js**.
+Клиентскую часть я разрабатываю на **React.js** или **Alpine.js**.
+
+этот веб-сайт сделан с помощью фреймворка **[Astro.js](https://astro.build)** и библиотеки **[Solid.js](https://www.solidjs.com/)**
\ No newline at end of file
diff --git a/src/content/authors/sergey-yarkov.md b/src/content/authors/sergey-yarkov.md
deleted file mode 100644
index 2c2d9bb..0000000
--- a/src/content/authors/sergey-yarkov.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-firstName: Sergey
-lastName: Yarkov
----
diff --git a/src/content/blog/en/использование-webserial-api-для-общения-с-микроконтроллером.md b/src/content/blog/en/использование-webserial-api-для-общения-с-микроконтроллером.md
new file mode 100644
index 0000000..b0b6dee
--- /dev/null
+++ b/src/content/blog/en/использование-webserial-api-для-общения-с-микроконтроллером.md
@@ -0,0 +1,17 @@
+---
+coverImage: /media/serial-port.jpg
+draft: false
+author: Sergey Yarkov
+title: Using the WebSerial API to communicate with the microcontroller
+description: We will talk about what is WebSerial API, how it can be used in a
+ browser to read and write data to a serial device and where it can be applied.
+tags:
+ - JavaScript
+ - AVR
+ - WebSerial API
+ - Tutorial
+pubDate: 2022-11-04T21:00:00.000Z
+updatedDate: 2023-02-13T16:34:23.326Z
+---
+
+# ...
diff --git a/src/content/blog/en/управление-и-подключение-сдвигового-регистра-74hc595-к-микрокотнороллеру.md b/src/content/blog/en/управление-и-подключение-сдвигового-регистра-74hc595-к-микрокотнороллеру.md
new file mode 100644
index 0000000..25f1aaa
--- /dev/null
+++ b/src/content/blog/en/управление-и-подключение-сдвигового-регистра-74hc595-к-микрокотнороллеру.md
@@ -0,0 +1,16 @@
+---
+coverImage: null
+draft: false
+author: Sergey Yarkov
+title: 74HC595 shift register control by microcontroller
+description: This tutorial shows how to control the shift register of the
+ 74HC595 in conjunction with the AVR microcontroller.
+tags:
+ - AVR
+ - Digital Electronics
+ - Tutorial
+pubDate: 2023-02-14T19:23:55.622Z
+updatedDate: 2023-02-14T19:23:55.646Z
+---
+
+...
diff --git a/src/content/blog/ispolzovanie-webserial-api-dlya-obshcheniya-s-mikrokontrollerom.md b/src/content/blog/ru/использование-webserial-api-для-общения-с-микроконтроллером.md
similarity index 100%
rename from src/content/blog/ispolzovanie-webserial-api-dlya-obshcheniya-s-mikrokontrollerom.md
rename to src/content/blog/ru/использование-webserial-api-для-общения-с-микроконтроллером.md
diff --git a/src/content/blog/ru/управление-и-подключение-сдвигового-регистра-74hc595-к-микрокотнороллеру.md b/src/content/blog/ru/управление-и-подключение-сдвигового-регистра-74hc595-к-микрокотнороллеру.md
new file mode 100644
index 0000000..c4cd23a
--- /dev/null
+++ b/src/content/blog/ru/управление-и-подключение-сдвигового-регистра-74hc595-к-микрокотнороллеру.md
@@ -0,0 +1,15 @@
+---
+draft: false
+author: Sergey Yarkov
+title: Управление сдвиговым регистром 74HC595 микрокотнороллером
+description: В этом туториале рассматривается то, как управлять сдвиговым
+ регистром 74HC595 в связке с микроконтроллером AVR.
+tags:
+ - AVR
+ - Digital Electronics
+ - Tutorial
+pubDate: 2023-02-14T19:23:55.622Z
+updatedDate: 2023-02-14T19:23:55.646Z
+---
+
+...
diff --git a/src/content/config.ts b/src/content/config.ts
index c247b89..bee3486 100644
--- a/src/content/config.ts
+++ b/src/content/config.ts
@@ -3,7 +3,8 @@ import { defineCollection, z } from "astro:content";
const blog = defineCollection({
schema: z.object({
title: z.string(),
- coverImage: z.string().optional(),
+ draft: z.boolean().optional(),
+ coverImage: z.string().nullable().optional(),
author: z.string(),
tags: z.string().array().optional(),
description: z.string(),
@@ -16,7 +17,6 @@ const blog = defineCollection({
.or(z.date())
.optional()
.transform((str) => (str ? new Date(str) : undefined)),
- draft: z.boolean(),
}),
});
@@ -42,7 +42,6 @@ const projects = defineCollection({
sourceUrl: z.string(),
demoUrl: z.string().nullable().optional(),
articleUrl: z.string().nullable().optional(),
- draft: z.boolean(),
}),
});
diff --git a/src/content/projects/en/devthread.md b/src/content/projects/en/devthread.md
index cfcc406..f383179 100644
--- a/src/content/projects/en/devthread.md
+++ b/src/content/projects/en/devthread.md
@@ -1,6 +1,5 @@
---
icon: triangle_filled
-draft: false
title: devthread
year: 2021
description: Static website for publishing various articles, developed with
diff --git a/src/content/projects/en/digital-store.md b/src/content/projects/en/digital-store.md
index 5c927d3..7a2c8dd 100644
--- a/src/content/projects/en/digital-store.md
+++ b/src/content/projects/en/digital-store.md
@@ -1,6 +1,5 @@
---
icon: round-shop-two
-draft: false
title: digital-store
year: 2019
description: Customizable online store with control panel for selling digital goods
diff --git a/src/content/projects/en/educt.md b/src/content/projects/en/educt.md
index 5091d5c..c2aacce 100644
--- a/src/content/projects/en/educt.md
+++ b/src/content/projects/en/educt.md
@@ -1,6 +1,5 @@
---
icon: round-school
-draft: false
title: educt
year: 2022
description: Learning Management System (LMS) to publish your courses, lectures, lessons
diff --git a/src/content/projects/en/memory-led-game.md b/src/content/projects/en/memory-led-game.md
index fe9098c..04fef72 100644
--- a/src/content/projects/en/memory-led-game.md
+++ b/src/content/projects/en/memory-led-game.md
@@ -1,6 +1,5 @@
---
icon: chip
-draft: false
title: memory-led-game
year: 2022
description: Analogue of the popular game "Simon says" on the AVR microcontroller
diff --git a/src/content/projects/en/node-docker-example.md b/src/content/projects/en/node-docker-example.md
index a7e54cf..913f34e 100644
--- a/src/content/projects/en/node-docker-example.md
+++ b/src/content/projects/en/node-docker-example.md
@@ -1,6 +1,5 @@
---
icon: nodejs
-draft: false
title: node-docker-example
year: 2022
description: An example of using Docker to deploy a Node.js application
diff --git a/src/content/projects/en/react-chat-app.md b/src/content/projects/en/react-chat-app.md
index 97527b8..60dce0e 100644
--- a/src/content/projects/en/react-chat-app.md
+++ b/src/content/projects/en/react-chat-app.md
@@ -1,6 +1,5 @@
---
icon: chat
-draft: false
title: react-chat-app
year: 2021
description: Client-server web chat application developed with Node.js and Socket.io
diff --git a/src/content/projects/en/web-serial-example.md b/src/content/projects/en/web-serial-example.md
index 1c9a973..09fe2d1 100644
--- a/src/content/projects/en/web-serial-example.md
+++ b/src/content/projects/en/web-serial-example.md
@@ -1,6 +1,5 @@
---
icon: serial
-draft: false
title: web-serial-example
year: 2022
description: An example of using the Web Serial API to interact with the
diff --git a/src/content/projects/en/yarkov-tech.md b/src/content/projects/en/yarkov-tech.md
index 5f9ab7c..ca9cdcf 100644
--- a/src/content/projects/en/yarkov-tech.md
+++ b/src/content/projects/en/yarkov-tech.md
@@ -1,6 +1,5 @@
---
icon: book
-draft: false
title: yarkov.tech
year: 2023
description: My personal website where you can find information about me and a
diff --git a/src/content/projects/ru/devthread.md b/src/content/projects/ru/devthread.md
index 4874eec..0b1c5dd 100644
--- a/src/content/projects/ru/devthread.md
+++ b/src/content/projects/ru/devthread.md
@@ -1,6 +1,5 @@
---
icon: triangle_filled
-draft: false
title: devthread
year: 2021
description: Статический веб-сайт для публикации различных статей, разработанный
diff --git a/src/content/projects/ru/digital-store.md b/src/content/projects/ru/digital-store.md
index 3b9f2a2..5313886 100644
--- a/src/content/projects/ru/digital-store.md
+++ b/src/content/projects/ru/digital-store.md
@@ -1,6 +1,5 @@
---
icon: round-shop-two
-draft: false
title: digital-store
year: 2019
description: Настраиваемый интернет-магазин с панелью управления для продажи
diff --git a/src/content/projects/ru/educt.md b/src/content/projects/ru/educt.md
index f2e3562..2681565 100644
--- a/src/content/projects/ru/educt.md
+++ b/src/content/projects/ru/educt.md
@@ -1,6 +1,5 @@
---
icon: round-school
-draft: false
title: educt
year: 2022
description: Система управления обучением (LMS) для публикации ваших курсов, лекций, уроков
diff --git a/src/content/projects/ru/memory-led-game.md b/src/content/projects/ru/memory-led-game.md
index 6ef27af..2a47d08 100644
--- a/src/content/projects/ru/memory-led-game.md
+++ b/src/content/projects/ru/memory-led-game.md
@@ -1,6 +1,5 @@
---
icon: chip
-draft: false
title: memory-led-game
year: 2022
description: Аналог популярной игры "Саймон говорит" на AVR микроконтроллере
diff --git a/src/content/projects/ru/node-docker-example.md b/src/content/projects/ru/node-docker-example.md
index 1a1e68e..50ac0b0 100644
--- a/src/content/projects/ru/node-docker-example.md
+++ b/src/content/projects/ru/node-docker-example.md
@@ -1,6 +1,5 @@
---
icon: nodejs
-draft: false
title: node-docker-example
year: 2022
description: Пример использования Docker для развертывания Node.js приложения
diff --git a/src/content/projects/ru/react-chat-app.md b/src/content/projects/ru/react-chat-app.md
index be4524f..e2e7244 100644
--- a/src/content/projects/ru/react-chat-app.md
+++ b/src/content/projects/ru/react-chat-app.md
@@ -1,6 +1,5 @@
---
icon: chat
-draft: false
title: react-chat-app
year: 2021
description: Клиент-серверное веб приложение чата разработанное при помощи
diff --git a/src/content/projects/ru/web-serial-example.md b/src/content/projects/ru/web-serial-example.md
index 04e68d3..fcd5aa3 100644
--- a/src/content/projects/ru/web-serial-example.md
+++ b/src/content/projects/ru/web-serial-example.md
@@ -1,6 +1,5 @@
---
icon: serial
-draft: false
title: web-serial-example
year: 2022
description: Пример использования Web Serial API для взаимодействия с
diff --git a/src/content/projects/ru/yarkov-tech.md b/src/content/projects/ru/yarkov-tech.md
index 6b36f25..ff9f147 100644
--- a/src/content/projects/ru/yarkov-tech.md
+++ b/src/content/projects/ru/yarkov-tech.md
@@ -1,6 +1,5 @@
---
icon: book
-draft: false
title: yarkov.tech
year: 2023
description: Мой персональный веб-сайт где находятся информация обо мне и список
diff --git a/src/content/site-settings.md b/src/content/site-settings.md
deleted file mode 100644
index 500621c..0000000
--- a/src/content/site-settings.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-globalTitle: yarkov.tech
-articles:
- recentLimit: 5
----
diff --git a/src/layouts/article.astro b/src/layouts/article.astro
index 67d5fd5..2cf041a 100644
--- a/src/layouts/article.astro
+++ b/src/layouts/article.astro
@@ -3,8 +3,8 @@ import type { CollectionEntry } from "astro:content";
import { DEFAULT_LANGUAGE, SITE_METADATA } from "@root/constants";
import BaseHead from "@components/BaseHead.astro";
import BaseLayout from "@components/BaseLayout.astro";
-import ArticleContent from "@components/ArticleContent/ArticleContent.astro";
-import ArticlePost from "@components/ArticlePost/ArticlePost.astro";
+import ArticleContent from "@components/ArticleContent.astro";
+import ArticlePost from "@components/ArticlePost.astro";
import OpenGraph from "@components/OpenGraph.astro";
export interface Props {
diff --git a/src/pages/[...blog].astro b/src/pages/[...blog].astro
new file mode 100644
index 0000000..2e820f1
--- /dev/null
+++ b/src/pages/[...blog].astro
@@ -0,0 +1,36 @@
+---
+import { CollectionEntry, getCollection } from "astro:content";
+import ArticleLayout from "@root/layouts/article.astro";
+import { DEFAULT_LANGUAGE } from "@root/constants";
+import slugify from "@sindresorhus/slugify";
+
+export const URL_BLOG_PREFIX = "blog";
+
+/**
+ * Generate articles pages from `blog` collection.
+ * The final url will be `http://website.com/blog/2023-01-01/my-article` with default language
+ * and `http://website.com/{language-code}/blog/2023-01-01/my-article` with other languages.
+ */
+export async function getStaticPaths() {
+ const collection = await getCollection("blog", (e) => !e.data.draft);
+ return collection.map((article) => {
+ const [languageCode] = article.slug.split("/");
+ const slug = slugify(article.data.title, { lowercase: true });
+ const pubDate = article.data.pubDate.toISOString().split("T")[0];
+ const url =
+ DEFAULT_LANGUAGE !== languageCode
+ ? `${languageCode}/${URL_BLOG_PREFIX}/${pubDate}/${slug}`
+ : `${URL_BLOG_PREFIX}/${pubDate}/${slug}`;
+
+ return { params: { blog: url }, props: { article } };
+ });
+}
+
+type Props = { article: CollectionEntry<"blog"> };
+
+const { Content } = await Astro.props.article.render();
+---
+
+
+
+
diff --git a/src/pages/[...slug].astro b/src/pages/[...slug].astro
deleted file mode 100644
index 62dec71..0000000
--- a/src/pages/[...slug].astro
+++ /dev/null
@@ -1,22 +0,0 @@
----
-import { CollectionEntry, getCollection } from "astro:content";
-import ArticleLayout from "@root/layouts/article.astro";
-
-export async function getStaticPaths() {
- const articles = await getCollection("blog");
- return articles
- .filter((a) => !a.data.draft)
- .map((article) => ({
- params: { slug: `articles/${article.slug}` },
- props: { article },
- }));
-}
-
-type Props = { article: CollectionEntry<"blog"> };
-
-const { Content } = await Astro.props.article.render();
----
-
-
-
-
diff --git a/src/pages/[lang]/about.astro b/src/pages/[lang]/about.astro
index ea752f0..f4624be 100644
--- a/src/pages/[lang]/about.astro
+++ b/src/pages/[lang]/about.astro
@@ -3,6 +3,7 @@ import { getLanguageKeys } from "@i18n/utils";
import { DEFAULT_LANGUAGE } from "@root/constants";
import About from "@templates/About.astro";
+// TODO: do not generate pages without required data
export function getStaticPaths() {
return getLanguageKeys()
.filter((lang) => lang !== DEFAULT_LANGUAGE)
diff --git a/src/templates/About.astro b/src/templates/About.astro
index 0573bc9..245312f 100644
--- a/src/templates/About.astro
+++ b/src/templates/About.astro
@@ -1,26 +1,28 @@
---
-import PageLayout from "@layouts/default.astro";
+import { getCollection, getEntryBySlug } from "astro:content";
import { getLanguageFromURL } from "@i18n/utils";
-// import { useTranslation } from "@i18n/utils";
-// import * as API from "@root/lib/api";
+import PageLayout from "@layouts/default.astro";
import PageHeading from "@components/PageHeading.astro";
-// import SkillsList from "@components/SkillsList";
-// import SkillsBlock from "@components/SkillsBlock";
-// import ArticleContent from "@components/ArticleContent";
-const lang = getLanguageFromURL(Astro.url.pathname);
+import SkillsList from "@components/SkillsList.astro";
+import SkillsBlock from "@components/SkillsBlock.astro";
+import ArticleContent from "@components/ArticleContent.astro";
+
+const pageLang = getLanguageFromURL(Astro.url.pathname);
+const skills = await getCollection("skills", (e) => e.id.startsWith(`${pageLang}/`));
+const about = await getEntryBySlug("authors", `${pageLang}/сергей-ярков`);
+const data = await about?.render();
+
// const t = useTranslation(Astro);
-// const data = await API.fetchAboutMe(Astro);
-// const { skills } = SITE_METADATA;
---
-
+
-
-
+
+
+ {skills.map((block) => )}
+
diff --git a/src/templates/Home.astro b/src/templates/Home.astro
index 053ed26..443bea2 100644
--- a/src/templates/Home.astro
+++ b/src/templates/Home.astro
@@ -1,15 +1,15 @@
---
+import { getCollection } from "astro:content";
import PageLayout from "@layouts/default.astro";
import Splash from "@components/Splash/Splash.astro";
import SplashHeading from "@root/components/Splash/SplashHeading.astro";
import SplashLinks from "@root/components/Splash/SplashLinks.astro";
import SplashLink from "@root/components/Splash/SplashLink.astro";
-import { getCollection } from "astro:content";
import RecentArticles from "@root/components/RecentArticles.astro";
-const articles = (await getCollection("blog"))
- .filter((p) => !p.data.draft)
- .sort((a, b) => a.data.pubDate.valueOf() - b.data.pubDate.valueOf());
+const articles = (await getCollection("blog", (e) => !e.data.draft)).sort(
+ (a, b) => a.data.pubDate.valueOf() - b.data.pubDate.valueOf()
+);
---
diff --git a/src/templates/NotFound.astro b/src/templates/NotFound.astro
index 31b8bd4..ec66ccd 100644
--- a/src/templates/NotFound.astro
+++ b/src/templates/NotFound.astro
@@ -8,6 +8,6 @@ const lang = getLanguageFromURL(Astro.url.pathname);
404
-
{"Страница не найдена"}
+
{"Страницу которую вы пытаетесь найти не существует."}