From 80840260e26d4f4176e61b65513a6e229317dbb0 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Fri, 8 Jul 2022 19:45:40 +0300 Subject: [PATCH 01/70] feat: index page layout --- README.md | 3 + astro.config.mjs | 4 +- public/assets/icons/social/email.svg | 3 - public/assets/icons/social/github.svg | 3 - public/assets/icons/social/telegram.svg | 3 - src/components/Footer/Footer.astro | 24 ++++ src/components/Footer/Footer.scss | 33 ++++++ src/components/Footer/index.ts | 1 + src/components/Header/Header.astro | 34 ++++++ src/components/Header/Header.scss | 51 +++++++++ src/components/Header/index.ts | 1 + .../RecentArticles/RecentArticles.astro | 32 ++++++ .../RecentArticles/RecentArticles.scss | 47 ++++++++ .../Sections/RecentArticles/index.ts | 1 + src/components/Sections/Welcome/Welcome.astro | 44 +++++++ src/components/Sections/Welcome/Welcome.scss | 45 ++++++++ src/components/Sections/Welcome/index.ts | 1 + src/components/Sections/index.ts | 2 + .../ThemeSwticher/ThemeSwitcher.astro | 8 ++ .../ThemeSwticher/ThemeSwitcher.scss | 9 ++ src/components/ThemeSwticher/index.ts | 1 + src/components/icons/AstroIcon.astro | 16 +++ src/components/icons/EmailIcon.astro | 21 ++++ src/components/icons/GithubIcon.astro | 13 +++ src/components/icons/MoonIcon.astro | 14 +++ src/components/icons/NetlifyIcon.astro | 27 +++++ src/components/icons/RssIcon.astro | 14 +++ src/components/icons/TelegramIcon.astro | 13 +++ src/components/icons/index.ts | 17 +++ src/config.ts | 9 ++ src/layouts/Page.astro | 26 +++++ src/pages/articles.astro | 13 +++ src/pages/index.astro | 70 ++---------- src/styles/global.scss | 107 +++++++++++++++++- tsconfig.json | 18 +-- 35 files changed, 645 insertions(+), 83 deletions(-) delete mode 100644 public/assets/icons/social/email.svg delete mode 100644 public/assets/icons/social/github.svg delete mode 100644 public/assets/icons/social/telegram.svg create mode 100644 src/components/Footer/Footer.astro create mode 100644 src/components/Footer/Footer.scss create mode 100644 src/components/Footer/index.ts create mode 100644 src/components/Header/Header.astro create mode 100644 src/components/Header/Header.scss create mode 100644 src/components/Header/index.ts create mode 100644 src/components/Sections/RecentArticles/RecentArticles.astro create mode 100644 src/components/Sections/RecentArticles/RecentArticles.scss create mode 100644 src/components/Sections/RecentArticles/index.ts create mode 100644 src/components/Sections/Welcome/Welcome.astro create mode 100644 src/components/Sections/Welcome/Welcome.scss create mode 100644 src/components/Sections/Welcome/index.ts create mode 100644 src/components/Sections/index.ts create mode 100644 src/components/ThemeSwticher/ThemeSwitcher.astro create mode 100644 src/components/ThemeSwticher/ThemeSwitcher.scss create mode 100644 src/components/ThemeSwticher/index.ts create mode 100644 src/components/icons/AstroIcon.astro create mode 100644 src/components/icons/EmailIcon.astro create mode 100644 src/components/icons/GithubIcon.astro create mode 100644 src/components/icons/MoonIcon.astro create mode 100644 src/components/icons/NetlifyIcon.astro create mode 100644 src/components/icons/RssIcon.astro create mode 100644 src/components/icons/TelegramIcon.astro create mode 100644 src/components/icons/index.ts create mode 100644 src/config.ts create mode 100644 src/layouts/Page.astro create mode 100644 src/pages/articles.astro diff --git a/README.md b/README.md index 4739a75..b979e35 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # yarkov.tech +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) +[![Netlify Status](https://api.netlify.com/api/v1/badges/ccd0460a-9725-4e35-8263-1608c4186d9c/deploy-status)](https://app.netlify.com/sites/jade-froyo-876dfe/deploys) + Personal website created with Astro. ## License diff --git a/astro.config.mjs b/astro.config.mjs index 882e651..3ac6c0c 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -1,4 +1,6 @@ import { defineConfig } from 'astro/config'; // https://astro.build/config -export default defineConfig({}); +export default defineConfig({ + site: 'https://yarkov.tech', +}); diff --git a/public/assets/icons/social/email.svg b/public/assets/icons/social/email.svg deleted file mode 100644 index 289f965..0000000 --- a/public/assets/icons/social/email.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/assets/icons/social/github.svg b/public/assets/icons/social/github.svg deleted file mode 100644 index 78fae17..0000000 --- a/public/assets/icons/social/github.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/assets/icons/social/telegram.svg b/public/assets/icons/social/telegram.svg deleted file mode 100644 index d89fbe7..0000000 --- a/public/assets/icons/social/telegram.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/components/Footer/Footer.astro b/src/components/Footer/Footer.astro new file mode 100644 index 0000000..4f46d12 --- /dev/null +++ b/src/components/Footer/Footer.astro @@ -0,0 +1,24 @@ +--- +import './Footer.scss'; +import { AstroIcon, NetlifyIcon, RssIcon } from '@components/icons'; +--- + + diff --git a/src/components/Footer/Footer.scss b/src/components/Footer/Footer.scss new file mode 100644 index 0000000..70d7936 --- /dev/null +++ b/src/components/Footer/Footer.scss @@ -0,0 +1,33 @@ +.footer { + & .container { + margin-top: 5rem; + padding: 25px 0 10px 0; + font-weight: 500; + border-top: 1px solid var(--border-color); + display: flex; + flex-direction: column; + align-items: center; + row-gap: 15px; + } + &__links { + display: flex; + align-items: center; + column-gap: 25px; + list-style: none; + margin: 0; + padding: 0; + & li { + display: flex; + align-items: center; + column-gap: 7px; + & a { + color: var(--font-color); + font-size: var(--font-size-sm); + } + } + } + &__copy { + text-align: center; + font-size: var(--font-size-xs); + } +} diff --git a/src/components/Footer/index.ts b/src/components/Footer/index.ts new file mode 100644 index 0000000..aab1df4 --- /dev/null +++ b/src/components/Footer/index.ts @@ -0,0 +1 @@ +export { default } from './Footer.astro'; diff --git a/src/components/Header/Header.astro b/src/components/Header/Header.astro new file mode 100644 index 0000000..56b1e1a --- /dev/null +++ b/src/components/Header/Header.astro @@ -0,0 +1,34 @@ +--- +import './Header.scss'; +import { SITE_METADATA } from '@root/config'; +import { EmailIcon, GithubIcon, TelegramIcon } from '@components/icons'; +import ThemeSwitcher from '@components/ThemeSwticher'; +--- + +
+
+ + +
+
diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss new file mode 100644 index 0000000..da4ce61 --- /dev/null +++ b/src/components/Header/Header.scss @@ -0,0 +1,51 @@ +.header { + position: sticky; + top: 0; + border-bottom: 1px solid var(--border-color); + background-color: var(--background-header-color); + padding-top: 15px; + padding-bottom: 15px; + + & .container { + display: flex; + align-items: center; + justify-content: space-between; + } + + &__logo a { + text-decoration: none; + font-weight: 600; + font-size: var(--font-size-lg); + color: var(--font-color); + } + &__nav { + display: flex; + align-items: center; + & ul { + display: flex; + list-style: none; + column-gap: 20px; + margin: 0; + padding: 0; + margin-right: 35px; + & li a { + display: inline-block; + font-weight: 500; + color: var(--font-color); + &:hover { + color: var(--color-blue-500); + } + } + } + &-contacts { + display: flex; + align-items: center; + column-gap: 10px; + margin-right: 40px; + & a { + text-decoration: none; + font-size: 0; + } + } + } +} diff --git a/src/components/Header/index.ts b/src/components/Header/index.ts new file mode 100644 index 0000000..3e3fbb4 --- /dev/null +++ b/src/components/Header/index.ts @@ -0,0 +1 @@ +export { default } from './Header.astro'; diff --git a/src/components/Sections/RecentArticles/RecentArticles.astro b/src/components/Sections/RecentArticles/RecentArticles.astro new file mode 100644 index 0000000..eb7e990 --- /dev/null +++ b/src/components/Sections/RecentArticles/RecentArticles.astro @@ -0,0 +1,32 @@ +--- +import './RecentArticles.scss'; +--- + +
+
+
+

недавние публикации

+ смотреть все +
+
+
+ + +
+
diff --git a/src/components/Sections/RecentArticles/RecentArticles.scss b/src/components/Sections/RecentArticles/RecentArticles.scss new file mode 100644 index 0000000..5972a04 --- /dev/null +++ b/src/components/Sections/RecentArticles/RecentArticles.scss @@ -0,0 +1,47 @@ +.publications { + &-heading { + display: flex; + align-items: center; + column-gap: 15px; + row-gap: 5px; + flex-wrap: wrap; + justify-content: space-between; + border-bottom: 1px solid var(--border-color); + padding-bottom: 10px; + & h2 { + margin: 0; + } + } + &-list { + margin-top: 10px; + max-width: calc(var(--content-width) + (var(--content-padding) * 2)); + & article { + border-radius: var(--border-radius-md); + & a { + display: flex; + justify-content: space-between; + align-items: center; + column-gap: 10px; + color: var(--font-color); + padding: 8px 15px; + text-decoration: none; + & h3 { + font-size: var(--font-size-md); + font-weight: normal; + margin: 0; + } + & p { + font-size: var(--font-size-xs); + font-family: monospace; + color: var(--font-color-gray); + text-transform: uppercase; + margin: 0; + text-align: right; + } + } + &:hover { + background-color: var(--background-color-hover); + } + } + } +} diff --git a/src/components/Sections/RecentArticles/index.ts b/src/components/Sections/RecentArticles/index.ts new file mode 100644 index 0000000..d99a12b --- /dev/null +++ b/src/components/Sections/RecentArticles/index.ts @@ -0,0 +1 @@ +export { default as RecentArticlesSection } from './RecentArticles.astro'; diff --git a/src/components/Sections/Welcome/Welcome.astro b/src/components/Sections/Welcome/Welcome.astro new file mode 100644 index 0000000..2e3ee4c --- /dev/null +++ b/src/components/Sections/Welcome/Welcome.astro @@ -0,0 +1,44 @@ +--- +import './Welcome.scss'; +--- + +
+
+
+

Hello, I'am Sergey

+

Fullstack web-developer and freelancer

+
+

+ Я занимаюсь разработкой веб-сайтов и веб-приложений разной сложности, а + также публикую различные статьи и туториалы на разные IT темы. +

+
+ +
diff --git a/src/components/Sections/Welcome/Welcome.scss b/src/components/Sections/Welcome/Welcome.scss new file mode 100644 index 0000000..cdfd327 --- /dev/null +++ b/src/components/Sections/Welcome/Welcome.scss @@ -0,0 +1,45 @@ +.welcome { + margin-top: 80px; + margin-bottom: 150px; + &-heading { + &__title { + & h1 { + font-size: var(--font-size-5xl); + font-weight: bold; + margin-bottom: 0.5rem; + } + & h2 { + font-size: var(--font-size-xl); + margin-bottom: 1.25rem; + font-weight: normal; + } + } + &__description { + font-size: var(--font-size-lg); + max-width: 570px; + line-height: 1.5; + } + } + &-links { + display: flex; + align-items: center; + column-gap: 20px; + &__link { + display: flex; + align-items: center; + column-gap: 5px; + & a { + color: var(--font-color-gray); + } + & svg { + fill: var(--font-color-gray); + } + } + } +} + +// @media screen and (max-width: 700px) { +// .welcome { + +// } +// } diff --git a/src/components/Sections/Welcome/index.ts b/src/components/Sections/Welcome/index.ts new file mode 100644 index 0000000..b9d7b30 --- /dev/null +++ b/src/components/Sections/Welcome/index.ts @@ -0,0 +1 @@ +export { default as WelcomeSection } from './Welcome.astro'; diff --git a/src/components/Sections/index.ts b/src/components/Sections/index.ts new file mode 100644 index 0000000..8348313 --- /dev/null +++ b/src/components/Sections/index.ts @@ -0,0 +1,2 @@ +export * from './Welcome'; +export * from './RecentArticles'; diff --git a/src/components/ThemeSwticher/ThemeSwitcher.astro b/src/components/ThemeSwticher/ThemeSwitcher.astro new file mode 100644 index 0000000..7ef389c --- /dev/null +++ b/src/components/ThemeSwticher/ThemeSwitcher.astro @@ -0,0 +1,8 @@ +--- +import './ThemeSwitcher.scss'; +import { MoonIcon } from '@components/icons'; +--- + + diff --git a/src/components/ThemeSwticher/ThemeSwitcher.scss b/src/components/ThemeSwticher/ThemeSwitcher.scss new file mode 100644 index 0000000..f74bb2b --- /dev/null +++ b/src/components/ThemeSwticher/ThemeSwitcher.scss @@ -0,0 +1,9 @@ +.theme-switcher { + background: none; + border: none; + display: flex; + align-items: center; + cursor: pointer; + padding: 0; + margin: 0; +} diff --git a/src/components/ThemeSwticher/index.ts b/src/components/ThemeSwticher/index.ts new file mode 100644 index 0000000..50e6b3d --- /dev/null +++ b/src/components/ThemeSwticher/index.ts @@ -0,0 +1 @@ +export { default } from './ThemeSwitcher.astro'; diff --git a/src/components/icons/AstroIcon.astro b/src/components/icons/AstroIcon.astro new file mode 100644 index 0000000..3774491 --- /dev/null +++ b/src/components/icons/AstroIcon.astro @@ -0,0 +1,16 @@ +--- +--- + + + + diff --git a/src/components/icons/EmailIcon.astro b/src/components/icons/EmailIcon.astro new file mode 100644 index 0000000..76a8302 --- /dev/null +++ b/src/components/icons/EmailIcon.astro @@ -0,0 +1,21 @@ +--- +--- + + + + + + + + + + + diff --git a/src/components/icons/GithubIcon.astro b/src/components/icons/GithubIcon.astro new file mode 100644 index 0000000..222144d --- /dev/null +++ b/src/components/icons/GithubIcon.astro @@ -0,0 +1,13 @@ +--- +--- + + + + diff --git a/src/components/icons/MoonIcon.astro b/src/components/icons/MoonIcon.astro new file mode 100644 index 0000000..d08427a --- /dev/null +++ b/src/components/icons/MoonIcon.astro @@ -0,0 +1,14 @@ +--- +--- + + + + diff --git a/src/components/icons/NetlifyIcon.astro b/src/components/icons/NetlifyIcon.astro new file mode 100644 index 0000000..d597bb2 --- /dev/null +++ b/src/components/icons/NetlifyIcon.astro @@ -0,0 +1,27 @@ +--- +--- + + + + + + + + + + diff --git a/src/components/icons/RssIcon.astro b/src/components/icons/RssIcon.astro new file mode 100644 index 0000000..47f8332 --- /dev/null +++ b/src/components/icons/RssIcon.astro @@ -0,0 +1,14 @@ +--- +--- + + + + diff --git a/src/components/icons/TelegramIcon.astro b/src/components/icons/TelegramIcon.astro new file mode 100644 index 0000000..b4affa2 --- /dev/null +++ b/src/components/icons/TelegramIcon.astro @@ -0,0 +1,13 @@ +--- +--- + + + + diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts new file mode 100644 index 0000000..bf3a4ff --- /dev/null +++ b/src/components/icons/index.ts @@ -0,0 +1,17 @@ +import EmailIcon from './EmailIcon.astro'; +import GithubIcon from './GithubIcon.astro'; +import TelegramIcon from './TelegramIcon.astro'; +import MoonIcon from './MoonIcon.astro'; +import AstroIcon from './AstroIcon.astro'; +import NetlifyIcon from './NetlifyIcon.astro'; +import RssIcon from './RssIcon.astro'; + +export { + EmailIcon, + GithubIcon, + TelegramIcon, + MoonIcon, + AstroIcon, + NetlifyIcon, + RssIcon, +}; diff --git a/src/config.ts b/src/config.ts new file mode 100644 index 0000000..b385b35 --- /dev/null +++ b/src/config.ts @@ -0,0 +1,9 @@ +export const SITE_METADATA = { + name: 'yarkov.tech', + author: 'Sergey Yarkov', + contacts: { + email: 'serzh.yarkov@gmail.com', + githubUrl: 'https://github.com/sergeyyarkov', + telegramUrl: 'https://t.me/sergeyyarkov', + }, +}; diff --git a/src/layouts/Page.astro b/src/layouts/Page.astro new file mode 100644 index 0000000..2590927 --- /dev/null +++ b/src/layouts/Page.astro @@ -0,0 +1,26 @@ +--- +import '@styles/global.scss'; +import Header from '@components/Header'; +import Footer from '@components/Footer'; + +export interface Props { + title?: string | undefined; +} + +const { title = 'Sergey Yarkov' } = Astro.props as Props; +--- + + + + + + {title} + + +
+
+ +
+
@@ -96,9 +79,7 @@ const recent = utils.sortArtcilesByDate(utils.transformArticles(data)); & a { color: var(--font-color-gray); } - & svg { - fill: var(--font-color-gray); - } + } } } @@ -122,5 +103,13 @@ const recent = utils.sortArtcilesByDate(utils.transformArticles(data)); max-width: calc(var(--content-width) + (var(--content-padding) * 2)); } } + + [astro-icon="information"] { + fill: var(--color-gray-600) + } + + [astro-icon="email_filled"] { + fill: var(--color-gray-600) + } diff --git a/src/pages/projects.astro b/src/pages/projects.astro index e69de29..e0c79d1 100644 --- a/src/pages/projects.astro +++ b/src/pages/projects.astro @@ -0,0 +1,153 @@ +--- +import Page from '@layouts/Page.astro'; +import { PageHeading } from '@root/components/PageHeading'; +import { SITE_METADATA } from '@root/config'; +--- + + +
+ +
+ смотреть все + +
+
+
+
+

+ + + + + yarkov.tech +

+ 2022 +
+
+

+ Мой персональный веб-сайт где находятся информация обо мне и список + различных статей, туториалов... +

+
+
+ Исходник + + + +
+
+
+
+

+ + + + devthread +

+ 2021 +
+
+

+ Статический веб-сайт для публикации различных статей, разработанный + при помощи Gatsby.js и NetlifyCMS +

+
+
+ Статья + Исходник + + + +
+
+
+
+ + diff --git a/src/styles/global.scss b/src/styles/global.scss index d58579f..759fad2 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -76,6 +76,7 @@ --border-color: var(--color-gray-100); --border-color-hover: var(--color-gray-400); --border-radius-md: 3px; + --border-radius-lg: 5px; /* Sizes */ --content-width: 760px; @@ -84,20 +85,44 @@ /* Elements */ --background-body-color: var(--color-white); --background-header-color: var(--color-white); + --background-scrollbar-track-color: #EFF1F5; + --background-scrollbar-thumb-color: var(--color-gray-100); } +/* Text selection */ ::selection { background: var(--color-yellow-100); color: var(--color-black); } + +/* Scrollbar */ +::-webkit-scrollbar { + width: 10px; + height: 10px; +} + +::-webkit-scrollbar-track { + background: var(--background-scrollbar-track-color); +} + +::-webkit-scrollbar-thumb { + background: var(--background-scrollbar-thumb-color) +} + + html, body { + box-sizing: border-box; display: flex; flex-direction: column; height: 100%; } +*, *:before, *:after { + box-sizing: inherit; +} + html { font-size: 16px; font-weight: normal; @@ -112,6 +137,7 @@ body { background-color: var(--background-body-color); } + .site-content { flex: 1 0 auto; width: 100%; @@ -124,6 +150,63 @@ body { padding: 0 var(--content-padding); } +/* Buttons */ +.btn-link { + cursor: pointer; + display: inline-flex; + align-items: center; + column-gap: 5px; + padding: 3px 10px; + border-radius: var(--border-radius-md); + border: 1px solid var(--border-color); + text-decoration: none; + color: var(--font-color); + font-size: var(--font-size-sm); + font-weight: 400; + &:hover { + text-decoration: none; + color: inherit; + border-color: var(--border-color-hover); + } +} + +.article-content { + & p, + em, + q { + line-height: 1.5; + font-size: var(--font-size-lg); + } + + q { + font-style: italic; + quotes: "«" "»"; + } + + h1, + h2, + h3, + h4 { + margin: 3rem 0 1rem 0; + padding-bottom: 0.35rem; + } + + h1:not(:first-child), + h2:not(:first-child), + h3:not(:first-child), + h4:not(:first-child) { + margin-top: 3rem; + } + + & h2 { + border-bottom: 1px solid var(--border-color); + } + + & a { + font-weight: 600; + } +} + a { color: var(--color-blue-500); font-weight: 500; @@ -139,6 +222,13 @@ p { margin-bottom: 1.5rem; } +hr { + background-color: var(--border-color); + margin: 40px 0; + border: none; + height: 1px; +} + h1, h2, h3, @@ -148,21 +238,32 @@ h5 { margin-bottom: 1.5rem; } -input { +input, textarea { + font-family: var(--font-family-base); padding: 8px 15px; border: 1px solid var(--border-color); border-radius: var(--border-radius-md); font-size: var(--font-size-sm); width: 100%; outline-color: var(--color-blue-500); + resize: vertical; } -svg { - fill: var(--color-black); -} - -@media screen and (max-width: 700px) { - .site-content { - margin-top: 1.5rem; +button { + cursor: pointer; + font-family: var(--font-family-base); + font-weight: 500; + font-size: var(--font-size-sm); + padding: 4px 15px; + border: 1px solid var(--border-color); + border-radius: var(--border-radius-md); + background: none; + &:hover { + border: 1px solid var(--border-color-hover); } } + +textarea { + max-height: 500px; + min-height: 200px; +} From 099f580a6f5cbd006466ff1ddd18514bed89e08e Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Fri, 15 Jul 2022 23:56:29 +0300 Subject: [PATCH 07/70] feat: html layout pages --- .gitignore | 2 + .idea/.gitignore | 5 + .idea/codeStyles/Project.xml | 58 ++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/yarkov.tech.iml | 12 ++ README.md | 2 +- src/components/ArticleItem/ArticleItem.tsx | 2 +- src/components/ArticlesList/ArticlesList.scss | 9 -- src/components/ArticlesList/ArticlesList.tsx | 53 ++++--- src/pages/[article].astro | 140 ++++++++++++++++++ src/styles/global.scss | 46 +++++- src/utils/articles.ts | 10 +- tsconfig.json | 1 + 15 files changed, 313 insertions(+), 46 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/yarkov.tech.iml create mode 100644 src/pages/[article].astro diff --git a/.gitignore b/.gitignore index c31d27d..6ef6414 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ yarn-debug.log* yarn-error.log* pnpm-debug.log* +.idea + # environment variables .env diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..b58b603 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..f986f2f --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..161a707 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/yarkov.tech.iml b/.idea/yarkov.tech.iml new file mode 100644 index 0000000..0c8867d --- /dev/null +++ b/.idea/yarkov.tech.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 08731e9..71378f6 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Personal website created with Astro. ### Todo -- [ ] HTML layout +- [x] HTML layout - [ ] Adaptive & Responsive layout - [ ] Dark/Light Theme - [ ] Multilang web-site diff --git a/src/components/ArticleItem/ArticleItem.tsx b/src/components/ArticleItem/ArticleItem.tsx index 5e62eff..99c3be3 100644 --- a/src/components/ArticleItem/ArticleItem.tsx +++ b/src/components/ArticleItem/ArticleItem.tsx @@ -1,6 +1,6 @@ import './ArticleItem.scss'; import { Component } from 'solid-js'; -import { IArticle } from '@root/interfaces'; +import type { IArticle } from '@root/interfaces'; import { DateFormatter } from '@utils/date'; export type ArticleItemProps = { diff --git a/src/components/ArticlesList/ArticlesList.scss b/src/components/ArticlesList/ArticlesList.scss index 8629351..f388180 100644 --- a/src/components/ArticlesList/ArticlesList.scss +++ b/src/components/ArticlesList/ArticlesList.scss @@ -24,15 +24,6 @@ } &-tags { margin-bottom: 45px; - & nav ul { - display: flex; - flex-wrap: wrap; - column-gap: 5px; - row-gap: 10px; - list-style: none; - margin: 0; - padding: 0; - } } &-list { &__wrapper { diff --git a/src/components/ArticlesList/ArticlesList.tsx b/src/components/ArticlesList/ArticlesList.tsx index 02cbfca..3d69f3a 100644 --- a/src/components/ArticlesList/ArticlesList.tsx +++ b/src/components/ArticlesList/ArticlesList.tsx @@ -1,9 +1,9 @@ -import './ArticlesList.scss'; -import { Component, createSignal, Show } from 'solid-js'; -import { PageHeading } from '@components/PageHeading'; -import { IArticle } from '@root/interfaces'; -import * as utils from '@root/utils/articles'; -import { ArticleItem } from '../ArticleItem'; +import "./ArticlesList.scss"; +import { Component, createSignal, Show } from "solid-js"; +import { PageHeading } from "@components/PageHeading"; +import type { IArticle } from "@root/interfaces"; +import * as utils from "@root/utils/articles"; +import { ArticleItem } from "../ArticleItem"; export type ArticlesListProps = { data: IArticle[]; @@ -11,42 +11,39 @@ export type ArticlesListProps = { }; export const ArticlesList: Component = ({ data, tags }) => { - const [articles, setArticles] = createSignal( - utils.filterArticlesByYear(data) - ); - + const [articles, setArticles] = createSignal(utils.filterArticlesByYear(data)); const [selectedTags, setSelectedTags] = createSignal([]); - const [filteredArticles, setFilteredArticles] = createSignal([]); return ( -
+
-
+
- + width="25" + height="24" + viewBox="0 0 25 24" + xmlns="http://www.w3.org/2000/svg"> + - + {data.length}
-
+
-
+
{Object.keys(articles()) .map(Number) .sort((a, b) => b - a) .map((year) => ( -
+

{year}

{utils.sortArtcilesByDate(articles()[year]).map((article) => ( diff --git a/src/pages/[article].astro b/src/pages/[article].astro new file mode 100644 index 0000000..9f162dd --- /dev/null +++ b/src/pages/[article].astro @@ -0,0 +1,140 @@ +--- + import Page from "@root/layouts/Page.astro"; + import { Markdown } from "astro/components"; + + export function getStaticPaths() { + return [ + { params: { article: 'article' } }, + ] + } +--- + + +
+
+
+ +
+ + Опубликовал Sergey Yarkov +
+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit.

+
+
+
+ Article Image +
+
+
+
+ + ## Introduction + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. + Maecenas eget condimentum velit, sit amet feugiat lectus. Class aptent taciti sociosqu ad litora torquent per + conubia nostra, per inceptos himenaeos. Praesent auctor purus luctus enim egestas, ac scelerisque ante pulvinar. + Donec ut rhoncus ex. Suspendisse ac rhoncus nisl, eu tempor urna. Curabitur vel bibendum lorem. Morbi convallis + convallis diam sit amet lacinia. Aliquam in elementum + + Curabitur tempor quis eros tempus lacinia. Nam bibendum pellentesque quam a convallis. Sed ut vulputate nisi. + Integer in felis sed leo vestibulum venenatis. Suspendisse quis arcu sem. Aenean feugiat ex eu vestibulum + vestibulum. Morbi a eleifend magna. Nam metus lacus, porttitor eu mauris a, blandit ultrices nibh. Mauris sit + amet magna non ligula vestibulum eleifend. Nulla varius volutpat turpis sed lacinia. Nam eget mi in purus + lobortis eleifend. Sed nec ante dictum sem condimentum ullamcorper quis venenatis nisi. Proin vitae facilisis + nisi, ac posuere leo. + + ### Another Heading + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. + + - `Nam metus lacus`: porttitor eu mauris a, blandit ultrices nibh. + - `Class aptent`: taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. + - `Sed nec ante`: dictum sem condimentum ullamcorper quis venenatis nisi. + +
+
+

Comments

+
+
+ + \ No newline at end of file diff --git a/src/styles/global.scss b/src/styles/global.scss index 759fad2..d4a38de 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -22,6 +22,14 @@ --font-size-8xl: 6rem; --font-size-9xl: 8rem; + /* Line heights */ + --line-height-normal: 'normal'; + --line-height-none: 1; + --line-height-shorter: 1.25; + --line-height-short: 1.375; + --line-height-base: 1.5; + --line-height-tall: 1.625; + /* Colors */ --color-white: #ffffff; --color-black: #010409; @@ -150,6 +158,15 @@ body { padding: 0 var(--content-padding); } +.list-links { + display: flex; + flex-wrap: wrap; + gap: 5px; + margin: 0; + padding: 0; + list-style: none; +} + /* Buttons */ .btn-link { cursor: pointer; @@ -174,10 +191,23 @@ body { & p, em, q { - line-height: 1.5; + line-height: var(--line-height-base); font-size: var(--font-size-lg); } + & ul { + padding-left: 1.5rem; + line-height: var(--line-height-base); + margin-bottom: 1.5rem; + margin-top: 0; + & li { + font-size: var(--font-size-lg); + line-height: var(--line-height-base); + margin-bottom: 0.5rem; + padding-left: 0.25rem; + } + } + q { font-style: italic; quotes: "«" "»"; @@ -187,7 +217,8 @@ body { h2, h3, h4 { - margin: 3rem 0 1rem 0; + margin-top: 3rem; + margin-bottom: 1rem; padding-bottom: 0.35rem; } @@ -199,14 +230,25 @@ body { } & h2 { + font-size: var(--font-size-3xl); border-bottom: 1px solid var(--border-color); } + & h3 { + font-size: var(--font-size-2xl); + } + & a { font-weight: 600; } } +li::marker { + color: var(--color-blue-500); + font-size: 1.3rem; + line-height: var(--line-height-none); +} + a { color: var(--color-blue-500); font-weight: 500; diff --git a/src/utils/articles.ts b/src/utils/articles.ts index ba78f60..13ae561 100644 --- a/src/utils/articles.ts +++ b/src/utils/articles.ts @@ -1,16 +1,16 @@ -import { IArticle } from '@root/interfaces'; +import type { IArticle } from '@root/interfaces'; import { MarkdownInstance } from 'astro'; export const transformArticles = ( articles: MarkdownInstance[] -): IArticle[] => { - return articles.map((article) => ({ +): IArticle[] => articles.map((article) => ({ title: article.frontmatter.title, description: article.frontmatter.description, + author: article.frontmatter.author, tags: article.frontmatter.tags, published_at: article.frontmatter.published_at, - })); -}; + })) +; export const sortArtcilesByDate = (articles: IArticle[]): IArticle[] => { return articles.sort( diff --git a/tsconfig.json b/tsconfig.json index ab90f2e..cf2a11c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,7 @@ "types": ["vite/client"], "sourceMap": true, "baseUrl": ".", + "jsx": "preserve", "paths": { "@root/*": ["./src/*"], "@styles/*": ["./src/styles/*"], From eef32f0fbcd66d8c86668b23bb6c4c770dc5500b Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Fri, 15 Jul 2022 23:59:32 +0300 Subject: [PATCH 08/70] rm ide folders --- .gitignore | 1 + .idea/.gitignore | 5 --- .idea/codeStyles/Project.xml | 58 ---------------------------- .idea/codeStyles/codeStyleConfig.xml | 5 --- .idea/modules.xml | 8 ---- .idea/vcs.xml | 6 --- .idea/yarkov.tech.iml | 12 ------ .vscode/extensions.json | 4 -- .vscode/launch.json | 11 ------ 9 files changed, 1 insertion(+), 109 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/yarkov.tech.iml delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/launch.json diff --git a/.gitignore b/.gitignore index 6ef6414..81f094d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ yarn-error.log* pnpm-debug.log* .idea +.vscode # environment variables diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index b58b603..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index f986f2f..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 161a707..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/yarkov.tech.iml b/.idea/yarkov.tech.iml deleted file mode 100644 index 0c8867d..0000000 --- a/.idea/yarkov.tech.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 22a1505..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] -} diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index d642209..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] -} From fbda49ce93cfced9cec2f51e26afe558c1c9f779 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Sat, 16 Jul 2022 01:35:55 +0300 Subject: [PATCH 09/70] feat: added some styles to article content --- package-lock.json | 37 +- public/styles/prism/prism-one-dark.css | 440 ++++++++++++++++++++++++ public/styles/prism/prism-one-light.css | 428 +++++++++++++++++++++++ src/components/Header/Header.scss | 6 +- src/layouts/Page.astro | 44 +-- src/pages/[article].astro | 41 ++- src/styles/global.scss | 112 ++++-- 7 files changed, 1051 insertions(+), 57 deletions(-) create mode 100644 public/styles/prism/prism-one-dark.css create mode 100644 public/styles/prism/prism-one-light.css diff --git a/package-lock.json b/package-lock.json index 4b7e295..86e4a5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,18 +61,18 @@ } }, "node_modules/@astrojs/markdown-remark": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-0.11.3.tgz", - "integrity": "sha512-9sgnXbweVG3+QIYjCCxUBZ/Fs0i+ZclQ9mr5z/3sWgHoQq6DydhBs3L8hBW0/0cr0wOnwHmr+CsLyKvaK6FxNg==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-0.11.7.tgz", + "integrity": "sha512-kiGQzE0X7NJOZhluyCvOKWaZomB+efx7MhESf5cLJsuTI4dvGxEZmL7kZVnuDO5d2gvyeIBkZiD64bndKyxSkw==", "dev": true, "dependencies": { "@astrojs/micromark-extension-mdx-jsx": "^1.0.3", - "@astrojs/prism": "^0.4.1", + "@astrojs/prism": "^0.6.0", "acorn": "^8.7.1", "acorn-jsx": "^5.3.2", "assert": "^2.0.0", "github-slugger": "^1.4.0", - "mdast-util-mdx-expression": "^1.2.0", + "mdast-util-mdx-expression": "^1.2.1", "mdast-util-mdx-jsx": "^1.2.0", "mdast-util-to-string": "^3.1.0", "micromark-extension-mdx-expression": "^1.0.3", @@ -92,6 +92,15 @@ "vfile": "^5.3.2" } }, + "node_modules/@astrojs/markdown-remark/node_modules/@astrojs/prism": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@astrojs/prism/-/prism-0.6.0.tgz", + "integrity": "sha512-aHho3xNaJbys8KzkoyWOiwXwYwTBSe/RBflUolxEtHdNi8ibM0K3U20M6/SnamHnk6m78aEHQ4oHWFHI1wYUhw==", + "dev": true, + "engines": { + "node": "^14.20.0 || >=16.14.0" + } + }, "node_modules/@astrojs/micromark-extension-mdx-jsx": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@astrojs/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-1.0.3.tgz", @@ -7060,18 +7069,18 @@ } }, "@astrojs/markdown-remark": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-0.11.3.tgz", - "integrity": "sha512-9sgnXbweVG3+QIYjCCxUBZ/Fs0i+ZclQ9mr5z/3sWgHoQq6DydhBs3L8hBW0/0cr0wOnwHmr+CsLyKvaK6FxNg==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-0.11.7.tgz", + "integrity": "sha512-kiGQzE0X7NJOZhluyCvOKWaZomB+efx7MhESf5cLJsuTI4dvGxEZmL7kZVnuDO5d2gvyeIBkZiD64bndKyxSkw==", "dev": true, "requires": { "@astrojs/micromark-extension-mdx-jsx": "^1.0.3", - "@astrojs/prism": "^0.4.1", + "@astrojs/prism": "^0.6.0", "acorn": "^8.7.1", "acorn-jsx": "^5.3.2", "assert": "^2.0.0", "github-slugger": "^1.4.0", - "mdast-util-mdx-expression": "^1.2.0", + "mdast-util-mdx-expression": "^1.2.1", "mdast-util-mdx-jsx": "^1.2.0", "mdast-util-to-string": "^3.1.0", "micromark-extension-mdx-expression": "^1.0.3", @@ -7089,6 +7098,14 @@ "unist-util-map": "^3.1.1", "unist-util-visit": "^4.1.0", "vfile": "^5.3.2" + }, + "dependencies": { + "@astrojs/prism": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@astrojs/prism/-/prism-0.6.0.tgz", + "integrity": "sha512-aHho3xNaJbys8KzkoyWOiwXwYwTBSe/RBflUolxEtHdNi8ibM0K3U20M6/SnamHnk6m78aEHQ4oHWFHI1wYUhw==", + "dev": true + } } }, "@astrojs/micromark-extension-mdx-jsx": { diff --git a/public/styles/prism/prism-one-dark.css b/public/styles/prism/prism-one-dark.css new file mode 100644 index 0000000..94f23e3 --- /dev/null +++ b/public/styles/prism/prism-one-dark.css @@ -0,0 +1,440 @@ +/** + * One Dark theme for prism.js + * Based on Atom's One Dark theme: https://github.com/atom/atom/tree/master/packages/one-dark-syntax + */ + +/** + * One Dark colours (accurate as of commit 8ae45ca on 6 Sep 2018) + * From colors.less + * --mono-1: hsl(220, 14%, 71%); + * --mono-2: hsl(220, 9%, 55%); + * --mono-3: hsl(220, 10%, 40%); + * --hue-1: hsl(187, 47%, 55%); + * --hue-2: hsl(207, 82%, 66%); + * --hue-3: hsl(286, 60%, 67%); + * --hue-4: hsl(95, 38%, 62%); + * --hue-5: hsl(355, 65%, 65%); + * --hue-5-2: hsl(5, 48%, 51%); + * --hue-6: hsl(29, 54%, 61%); + * --hue-6-2: hsl(39, 67%, 69%); + * --syntax-fg: hsl(220, 14%, 71%); + * --syntax-bg: hsl(220, 13%, 18%); + * --syntax-gutter: hsl(220, 14%, 45%); + * --syntax-guide: hsla(220, 14%, 71%, 0.15); + * --syntax-accent: hsl(220, 100%, 66%); + * From syntax-variables.less + * --syntax-selection-color: hsl(220, 13%, 28%); + * --syntax-gutter-background-color-selected: hsl(220, 13%, 26%); + * --syntax-cursor-line: hsla(220, 100%, 80%, 0.04); + */ + + code[class*="language-"], + pre[class*="language-"] { + background: hsl(220, 13%, 18%); + color: hsl(220, 14%, 71%); + text-shadow: 0 1px rgba(0, 0, 0, 0.3); + font-family: "Fira Code", "Fira Mono", Menlo, Consolas, "DejaVu Sans Mono", monospace; + direction: ltr; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + line-height: 1.5; + -moz-tab-size: 2; + -o-tab-size: 2; + tab-size: 2; + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; + } + + /* Selection */ + code[class*="language-"]::-moz-selection, + code[class*="language-"] *::-moz-selection, + pre[class*="language-"] *::-moz-selection { + background: hsl(220, 13%, 28%); + color: inherit; + text-shadow: none; + } + + code[class*="language-"]::selection, + code[class*="language-"] *::selection, + pre[class*="language-"] *::selection { + background: hsl(220, 13%, 28%); + color: inherit; + text-shadow: none; + } + + /* Code blocks */ + pre[class*="language-"] { + padding: 1em; + margin: 0.5em 0; + overflow: auto; + border-radius: 0.3em; + } + + /* Inline code */ + :not(pre) > code[class*="language-"] { + padding: 0.2em 0.3em; + border-radius: 0.3em; + white-space: normal; + } + + /* Print */ + @media print { + code[class*="language-"], + pre[class*="language-"] { + text-shadow: none; + } + } + + .token.comment, + .token.prolog, + .token.cdata { + color: hsl(220, 10%, 40%); + } + + .token.doctype, + .token.punctuation, + .token.entity { + color: hsl(220, 14%, 71%); + } + + .token.attr-name, + .token.class-name, + .token.boolean, + .token.constant, + .token.number, + .token.atrule { + color: hsl(29, 54%, 61%); + } + + .token.keyword { + color: hsl(286, 60%, 67%); + } + + .token.property, + .token.tag, + .token.symbol, + .token.deleted, + .token.important { + color: hsl(355, 65%, 65%); + } + + .token.selector, + .token.string, + .token.char, + .token.builtin, + .token.inserted, + .token.regex, + .token.attr-value, + .token.attr-value > .token.punctuation { + color: hsl(95, 38%, 62%); + } + + .token.variable, + .token.operator, + .token.function { + color: hsl(207, 82%, 66%); + } + + .token.url { + color: hsl(187, 47%, 55%); + } + + /* HTML overrides */ + .token.attr-value > .token.punctuation.attr-equals, + .token.special-attr > .token.attr-value > .token.value.css { + color: hsl(220, 14%, 71%); + } + + /* CSS overrides */ + .language-css .token.selector { + color: hsl(355, 65%, 65%); + } + + .language-css .token.property { + color: hsl(220, 14%, 71%); + } + + .language-css .token.function, + .language-css .token.url > .token.function { + color: hsl(187, 47%, 55%); + } + + .language-css .token.url > .token.string.url { + color: hsl(95, 38%, 62%); + } + + .language-css .token.important, + .language-css .token.atrule .token.rule { + color: hsl(286, 60%, 67%); + } + + /* JS overrides */ + .language-javascript .token.operator { + color: hsl(286, 60%, 67%); + } + + .language-javascript .token.template-string > .token.interpolation > .token.interpolation-punctuation.punctuation { + color: hsl(5, 48%, 51%); + } + + /* JSON overrides */ + .language-json .token.operator { + color: hsl(220, 14%, 71%); + } + + .language-json .token.null.keyword { + color: hsl(29, 54%, 61%); + } + + /* MD overrides */ + .language-markdown .token.url, + .language-markdown .token.url > .token.operator, + .language-markdown .token.url-reference.url > .token.string { + color: hsl(220, 14%, 71%); + } + + .language-markdown .token.url > .token.content { + color: hsl(207, 82%, 66%); + } + + .language-markdown .token.url > .token.url, + .language-markdown .token.url-reference.url { + color: hsl(187, 47%, 55%); + } + + .language-markdown .token.blockquote.punctuation, + .language-markdown .token.hr.punctuation { + color: hsl(220, 10%, 40%); + font-style: italic; + } + + .language-markdown .token.code-snippet { + color: hsl(95, 38%, 62%); + } + + .language-markdown .token.bold .token.content { + color: hsl(29, 54%, 61%); + } + + .language-markdown .token.italic .token.content { + color: hsl(286, 60%, 67%); + } + + .language-markdown .token.strike .token.content, + .language-markdown .token.strike .token.punctuation, + .language-markdown .token.list.punctuation, + .language-markdown .token.title.important > .token.punctuation { + color: hsl(355, 65%, 65%); + } + + /* General */ + .token.bold { + font-weight: bold; + } + + .token.comment, + .token.italic { + font-style: italic; + } + + .token.entity { + cursor: help; + } + + .token.namespace { + opacity: 0.8; + } + + /* Plugin overrides */ + /* Selectors should have higher specificity than those in the plugins' default stylesheets */ + + /* Show Invisibles plugin overrides */ + .token.token.tab:not(:empty):before, + .token.token.cr:before, + .token.token.lf:before, + .token.token.space:before { + color: hsla(220, 14%, 71%, 0.15); + text-shadow: none; + } + + /* Toolbar plugin overrides */ + /* Space out all buttons and move them away from the right edge of the code block */ + div.code-toolbar > .toolbar.toolbar > .toolbar-item { + margin-right: 0.4em; + } + + /* Styling the buttons */ + div.code-toolbar > .toolbar.toolbar > .toolbar-item > button, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > a, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > span { + background: hsl(220, 13%, 26%); + color: hsl(220, 9%, 55%); + padding: 0.1em 0.4em; + border-radius: 0.3em; + } + + div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:hover, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:focus, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:hover, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:focus, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:hover, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:focus { + background: hsl(220, 13%, 28%); + color: hsl(220, 14%, 71%); + } + + /* Line Highlight plugin overrides */ + /* The highlighted line itself */ + .line-highlight.line-highlight { + background: hsla(220, 100%, 80%, 0.04); + } + + /* Default line numbers in Line Highlight plugin */ + .line-highlight.line-highlight:before, + .line-highlight.line-highlight[data-end]:after { + background: hsl(220, 13%, 26%); + color: hsl(220, 14%, 71%); + padding: 0.1em 0.6em; + border-radius: 0.3em; + box-shadow: 0 2px 0 0 rgba(0, 0, 0, 0.2); /* same as Toolbar plugin default */ + } + + /* Hovering over a linkable line number (in the gutter area) */ + /* Requires Line Numbers plugin as well */ + pre[id].linkable-line-numbers.linkable-line-numbers span.line-numbers-rows > span:hover:before { + background-color: hsla(220, 100%, 80%, 0.04); + } + + /* Line Numbers and Command Line plugins overrides */ + /* Line separating gutter from coding area */ + .line-numbers.line-numbers .line-numbers-rows, + .command-line .command-line-prompt { + border-right-color: hsla(220, 14%, 71%, 0.15); + } + + /* Stuff in the gutter */ + .line-numbers .line-numbers-rows > span:before, + .command-line .command-line-prompt > span:before { + color: hsl(220, 14%, 45%); + } + + /* Match Braces plugin overrides */ + /* Note: Outline colour is inherited from the braces */ + .rainbow-braces .token.token.punctuation.brace-level-1, + .rainbow-braces .token.token.punctuation.brace-level-5, + .rainbow-braces .token.token.punctuation.brace-level-9 { + color: hsl(355, 65%, 65%); + } + + .rainbow-braces .token.token.punctuation.brace-level-2, + .rainbow-braces .token.token.punctuation.brace-level-6, + .rainbow-braces .token.token.punctuation.brace-level-10 { + color: hsl(95, 38%, 62%); + } + + .rainbow-braces .token.token.punctuation.brace-level-3, + .rainbow-braces .token.token.punctuation.brace-level-7, + .rainbow-braces .token.token.punctuation.brace-level-11 { + color: hsl(207, 82%, 66%); + } + + .rainbow-braces .token.token.punctuation.brace-level-4, + .rainbow-braces .token.token.punctuation.brace-level-8, + .rainbow-braces .token.token.punctuation.brace-level-12 { + color: hsl(286, 60%, 67%); + } + + /* Diff Highlight plugin overrides */ + /* Taken from https://github.com/atom/github/blob/master/styles/variables.less */ + pre.diff-highlight > code .token.token.deleted:not(.prefix), + pre > code.diff-highlight .token.token.deleted:not(.prefix) { + background-color: hsla(353, 100%, 66%, 0.15); + } + + pre.diff-highlight > code .token.token.deleted:not(.prefix)::-moz-selection, + pre.diff-highlight > code .token.token.deleted:not(.prefix) *::-moz-selection, + pre > code.diff-highlight .token.token.deleted:not(.prefix)::-moz-selection, + pre > code.diff-highlight .token.token.deleted:not(.prefix) *::-moz-selection { + background-color: hsla(353, 95%, 66%, 0.25); + } + + pre.diff-highlight > code .token.token.deleted:not(.prefix)::selection, + pre.diff-highlight > code .token.token.deleted:not(.prefix) *::selection, + pre > code.diff-highlight .token.token.deleted:not(.prefix)::selection, + pre > code.diff-highlight .token.token.deleted:not(.prefix) *::selection { + background-color: hsla(353, 95%, 66%, 0.25); + } + + pre.diff-highlight > code .token.token.inserted:not(.prefix), + pre > code.diff-highlight .token.token.inserted:not(.prefix) { + background-color: hsla(137, 100%, 55%, 0.15); + } + + pre.diff-highlight > code .token.token.inserted:not(.prefix)::-moz-selection, + pre.diff-highlight > code .token.token.inserted:not(.prefix) *::-moz-selection, + pre > code.diff-highlight .token.token.inserted:not(.prefix)::-moz-selection, + pre > code.diff-highlight .token.token.inserted:not(.prefix) *::-moz-selection { + background-color: hsla(135, 73%, 55%, 0.25); + } + + pre.diff-highlight > code .token.token.inserted:not(.prefix)::selection, + pre.diff-highlight > code .token.token.inserted:not(.prefix) *::selection, + pre > code.diff-highlight .token.token.inserted:not(.prefix)::selection, + pre > code.diff-highlight .token.token.inserted:not(.prefix) *::selection { + background-color: hsla(135, 73%, 55%, 0.25); + } + + /* Previewers plugin overrides */ + /* Based on https://github.com/atom-community/atom-ide-datatip/blob/master/styles/atom-ide-datatips.less and https://github.com/atom/atom/blob/master/packages/one-dark-ui */ + /* Border around popup */ + .prism-previewer.prism-previewer:before, + .prism-previewer-gradient.prism-previewer-gradient div { + border-color: hsl(224, 13%, 17%); + } + + /* Angle and time should remain as circles and are hence not included */ + .prism-previewer-color.prism-previewer-color:before, + .prism-previewer-gradient.prism-previewer-gradient div, + .prism-previewer-easing.prism-previewer-easing:before { + border-radius: 0.3em; + } + + /* Triangles pointing to the code */ + .prism-previewer.prism-previewer:after { + border-top-color: hsl(224, 13%, 17%); + } + + .prism-previewer-flipped.prism-previewer-flipped.after { + border-bottom-color: hsl(224, 13%, 17%); + } + + /* Background colour within the popup */ + .prism-previewer-angle.prism-previewer-angle:before, + .prism-previewer-time.prism-previewer-time:before, + .prism-previewer-easing.prism-previewer-easing { + background: hsl(219, 13%, 22%); + } + + /* For angle, this is the positive area (eg. 90deg will display one quadrant in this colour) */ + /* For time, this is the alternate colour */ + .prism-previewer-angle.prism-previewer-angle circle, + .prism-previewer-time.prism-previewer-time circle { + stroke: hsl(220, 14%, 71%); + stroke-opacity: 1; + } + + /* Stroke colours of the handle, direction point, and vector itself */ + .prism-previewer-easing.prism-previewer-easing circle, + .prism-previewer-easing.prism-previewer-easing path, + .prism-previewer-easing.prism-previewer-easing line { + stroke: hsl(220, 14%, 71%); + } + + /* Fill colour of the handle */ + .prism-previewer-easing.prism-previewer-easing circle { + fill: transparent; + } \ No newline at end of file diff --git a/public/styles/prism/prism-one-light.css b/public/styles/prism/prism-one-light.css new file mode 100644 index 0000000..58f651d --- /dev/null +++ b/public/styles/prism/prism-one-light.css @@ -0,0 +1,428 @@ +/** + * One Light theme for prism.js + * Based on Atom's One Light theme: https://github.com/atom/atom/tree/master/packages/one-light-syntax + */ + +/** + * One Light colours (accurate as of commit eb064bf on 19 Feb 2021) + * From colors.less + * --mono-1: hsl(230, 8%, 24%); + * --mono-2: hsl(230, 6%, 44%); + * --mono-3: hsl(230, 4%, 64%) + * --hue-1: hsl(198, 99%, 37%); + * --hue-2: hsl(221, 87%, 60%); + * --hue-3: hsl(301, 63%, 40%); + * --hue-4: hsl(119, 34%, 47%); + * --hue-5: hsl(5, 74%, 59%); + * --hue-5-2: hsl(344, 84%, 43%); + * --hue-6: hsl(35, 99%, 36%); + * --hue-6-2: hsl(35, 99%, 40%); + * --syntax-fg: hsl(230, 8%, 24%); + * --syntax-bg: hsl(230, 1%, 98%); + * --syntax-gutter: hsl(230, 1%, 62%); + * --syntax-guide: hsla(230, 8%, 24%, 0.2); + * --syntax-accent: hsl(230, 100%, 66%); + * From syntax-variables.less + * --syntax-selection-color: hsl(230, 1%, 90%); + * --syntax-gutter-background-color-selected: hsl(230, 1%, 90%); + * --syntax-cursor-line: hsla(230, 8%, 24%, 0.05); + */ + + code[class*="language-"], + pre[class*="language-"] { + background: hsl(230, 1%, 98%); + color: hsl(230, 8%, 24%); + font-family: "Fira Code", "Fira Mono", Menlo, Consolas, "DejaVu Sans Mono", monospace; + direction: ltr; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + line-height: 1.5; + -moz-tab-size: 2; + -o-tab-size: 2; + tab-size: 2; + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; + } + + /* Selection */ + code[class*="language-"]::-moz-selection, + code[class*="language-"] *::-moz-selection, + pre[class*="language-"] *::-moz-selection { + background: hsl(230, 1%, 90%); + color: inherit; + } + + code[class*="language-"]::selection, + code[class*="language-"] *::selection, + pre[class*="language-"] *::selection { + background: hsl(230, 1%, 90%); + color: inherit; + } + + /* Code blocks */ + pre[class*="language-"] { + padding: 1em; + margin: 0.5em 0; + overflow: auto; + border-radius: 0.3em; + } + + /* Inline code */ + :not(pre) > code[class*="language-"] { + padding: 0.2em 0.3em; + border-radius: 0.3em; + white-space: normal; + } + + .token.comment, + .token.prolog, + .token.cdata { + color: hsl(230, 4%, 64%); + } + + .token.doctype, + .token.punctuation, + .token.entity { + color: hsl(230, 8%, 24%); + } + + .token.attr-name, + .token.class-name, + .token.boolean, + .token.constant, + .token.number, + .token.atrule { + color: hsl(35, 99%, 36%); + } + + .token.keyword { + color: hsl(301, 63%, 40%); + } + + .token.property, + .token.tag, + .token.symbol, + .token.deleted, + .token.important { + color: hsl(5, 74%, 59%); + } + + .token.selector, + .token.string, + .token.char, + .token.builtin, + .token.inserted, + .token.regex, + .token.attr-value, + .token.attr-value > .token.punctuation { + color: hsl(119, 34%, 47%); + } + + .token.variable, + .token.operator, + .token.function { + color: hsl(221, 87%, 60%); + } + + .token.url { + color: hsl(198, 99%, 37%); + } + + /* HTML overrides */ + .token.attr-value > .token.punctuation.attr-equals, + .token.special-attr > .token.attr-value > .token.value.css { + color: hsl(230, 8%, 24%); + } + + /* CSS overrides */ + .language-css .token.selector { + color: hsl(5, 74%, 59%); + } + + .language-css .token.property { + color: hsl(230, 8%, 24%); + } + + .language-css .token.function, + .language-css .token.url > .token.function { + color: hsl(198, 99%, 37%); + } + + .language-css .token.url > .token.string.url { + color: hsl(119, 34%, 47%); + } + + .language-css .token.important, + .language-css .token.atrule .token.rule { + color: hsl(301, 63%, 40%); + } + + /* JS overrides */ + .language-javascript .token.operator { + color: hsl(301, 63%, 40%); + } + + .language-javascript .token.template-string > .token.interpolation > .token.interpolation-punctuation.punctuation { + color: hsl(344, 84%, 43%); + } + + /* JSON overrides */ + .language-json .token.operator { + color: hsl(230, 8%, 24%); + } + + .language-json .token.null.keyword { + color: hsl(35, 99%, 36%); + } + + /* MD overrides */ + .language-markdown .token.url, + .language-markdown .token.url > .token.operator, + .language-markdown .token.url-reference.url > .token.string { + color: hsl(230, 8%, 24%); + } + + .language-markdown .token.url > .token.content { + color: hsl(221, 87%, 60%); + } + + .language-markdown .token.url > .token.url, + .language-markdown .token.url-reference.url { + color: hsl(198, 99%, 37%); + } + + .language-markdown .token.blockquote.punctuation, + .language-markdown .token.hr.punctuation { + color: hsl(230, 4%, 64%); + font-style: italic; + } + + .language-markdown .token.code-snippet { + color: hsl(119, 34%, 47%); + } + + .language-markdown .token.bold .token.content { + color: hsl(35, 99%, 36%); + } + + .language-markdown .token.italic .token.content { + color: hsl(301, 63%, 40%); + } + + .language-markdown .token.strike .token.content, + .language-markdown .token.strike .token.punctuation, + .language-markdown .token.list.punctuation, + .language-markdown .token.title.important > .token.punctuation { + color: hsl(5, 74%, 59%); + } + + /* General */ + .token.bold { + font-weight: bold; + } + + .token.comment, + .token.italic { + font-style: italic; + } + + .token.entity { + cursor: help; + } + + .token.namespace { + opacity: 0.8; + } + + /* Plugin overrides */ + /* Selectors should have higher specificity than those in the plugins' default stylesheets */ + + /* Show Invisibles plugin overrides */ + .token.token.tab:not(:empty):before, + .token.token.cr:before, + .token.token.lf:before, + .token.token.space:before { + color: hsla(230, 8%, 24%, 0.2); + } + + /* Toolbar plugin overrides */ + /* Space out all buttons and move them away from the right edge of the code block */ + div.code-toolbar > .toolbar.toolbar > .toolbar-item { + margin-right: 0.4em; + } + + /* Styling the buttons */ + div.code-toolbar > .toolbar.toolbar > .toolbar-item > button, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > a, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > span { + background: hsl(230, 1%, 90%); + color: hsl(230, 6%, 44%); + padding: 0.1em 0.4em; + border-radius: 0.3em; + } + + div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:hover, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:focus, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:hover, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:focus, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:hover, + div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:focus { + background: hsl(230, 1%, 78%); /* custom: darken(--syntax-bg, 20%) */ + color: hsl(230, 8%, 24%); + } + + /* Line Highlight plugin overrides */ + /* The highlighted line itself */ + .line-highlight.line-highlight { + background: hsla(230, 8%, 24%, 0.05); + } + + /* Default line numbers in Line Highlight plugin */ + .line-highlight.line-highlight:before, + .line-highlight.line-highlight[data-end]:after { + background: hsl(230, 1%, 90%); + color: hsl(230, 8%, 24%); + padding: 0.1em 0.6em; + border-radius: 0.3em; + box-shadow: 0 2px 0 0 rgba(0, 0, 0, 0.2); /* same as Toolbar plugin default */ + } + + /* Hovering over a linkable line number (in the gutter area) */ + /* Requires Line Numbers plugin as well */ + pre[id].linkable-line-numbers.linkable-line-numbers span.line-numbers-rows > span:hover:before { + background-color: hsla(230, 8%, 24%, 0.05); + } + + /* Line Numbers and Command Line plugins overrides */ + /* Line separating gutter from coding area */ + .line-numbers.line-numbers .line-numbers-rows, + .command-line .command-line-prompt { + border-right-color: hsla(230, 8%, 24%, 0.2); + } + + /* Stuff in the gutter */ + .line-numbers .line-numbers-rows > span:before, + .command-line .command-line-prompt > span:before { + color: hsl(230, 1%, 62%); + } + + /* Match Braces plugin overrides */ + /* Note: Outline colour is inherited from the braces */ + .rainbow-braces .token.token.punctuation.brace-level-1, + .rainbow-braces .token.token.punctuation.brace-level-5, + .rainbow-braces .token.token.punctuation.brace-level-9 { + color: hsl(5, 74%, 59%); + } + + .rainbow-braces .token.token.punctuation.brace-level-2, + .rainbow-braces .token.token.punctuation.brace-level-6, + .rainbow-braces .token.token.punctuation.brace-level-10 { + color: hsl(119, 34%, 47%); + } + + .rainbow-braces .token.token.punctuation.brace-level-3, + .rainbow-braces .token.token.punctuation.brace-level-7, + .rainbow-braces .token.token.punctuation.brace-level-11 { + color: hsl(221, 87%, 60%); + } + + .rainbow-braces .token.token.punctuation.brace-level-4, + .rainbow-braces .token.token.punctuation.brace-level-8, + .rainbow-braces .token.token.punctuation.brace-level-12 { + color: hsl(301, 63%, 40%); + } + + /* Diff Highlight plugin overrides */ + /* Taken from https://github.com/atom/github/blob/master/styles/variables.less */ + pre.diff-highlight > code .token.token.deleted:not(.prefix), + pre > code.diff-highlight .token.token.deleted:not(.prefix) { + background-color: hsla(353, 100%, 66%, 0.15); + } + + pre.diff-highlight > code .token.token.deleted:not(.prefix)::-moz-selection, + pre.diff-highlight > code .token.token.deleted:not(.prefix) *::-moz-selection, + pre > code.diff-highlight .token.token.deleted:not(.prefix)::-moz-selection, + pre > code.diff-highlight .token.token.deleted:not(.prefix) *::-moz-selection { + background-color: hsla(353, 95%, 66%, 0.25); + } + + pre.diff-highlight > code .token.token.deleted:not(.prefix)::selection, + pre.diff-highlight > code .token.token.deleted:not(.prefix) *::selection, + pre > code.diff-highlight .token.token.deleted:not(.prefix)::selection, + pre > code.diff-highlight .token.token.deleted:not(.prefix) *::selection { + background-color: hsla(353, 95%, 66%, 0.25); + } + + pre.diff-highlight > code .token.token.inserted:not(.prefix), + pre > code.diff-highlight .token.token.inserted:not(.prefix) { + background-color: hsla(137, 100%, 55%, 0.15); + } + + pre.diff-highlight > code .token.token.inserted:not(.prefix)::-moz-selection, + pre.diff-highlight > code .token.token.inserted:not(.prefix) *::-moz-selection, + pre > code.diff-highlight .token.token.inserted:not(.prefix)::-moz-selection, + pre > code.diff-highlight .token.token.inserted:not(.prefix) *::-moz-selection { + background-color: hsla(135, 73%, 55%, 0.25); + } + + pre.diff-highlight > code .token.token.inserted:not(.prefix)::selection, + pre.diff-highlight > code .token.token.inserted:not(.prefix) *::selection, + pre > code.diff-highlight .token.token.inserted:not(.prefix)::selection, + pre > code.diff-highlight .token.token.inserted:not(.prefix) *::selection { + background-color: hsla(135, 73%, 55%, 0.25); + } + + /* Previewers plugin overrides */ + /* Based on https://github.com/atom-community/atom-ide-datatip/blob/master/styles/atom-ide-datatips.less and https://github.com/atom/atom/blob/master/packages/one-light-ui */ + /* Border around popup */ + .prism-previewer.prism-previewer:before, + .prism-previewer-gradient.prism-previewer-gradient div { + border-color: hsl(0, 0, 95%); + } + + /* Angle and time should remain as circles and are hence not included */ + .prism-previewer-color.prism-previewer-color:before, + .prism-previewer-gradient.prism-previewer-gradient div, + .prism-previewer-easing.prism-previewer-easing:before { + border-radius: 0.3em; + } + + /* Triangles pointing to the code */ + .prism-previewer.prism-previewer:after { + border-top-color: hsl(0, 0, 95%); + } + + .prism-previewer-flipped.prism-previewer-flipped.after { + border-bottom-color: hsl(0, 0, 95%); + } + + /* Background colour within the popup */ + .prism-previewer-angle.prism-previewer-angle:before, + .prism-previewer-time.prism-previewer-time:before, + .prism-previewer-easing.prism-previewer-easing { + background: hsl(0, 0%, 100%); + } + + /* For angle, this is the positive area (eg. 90deg will display one quadrant in this colour) */ + /* For time, this is the alternate colour */ + .prism-previewer-angle.prism-previewer-angle circle, + .prism-previewer-time.prism-previewer-time circle { + stroke: hsl(230, 8%, 24%); + stroke-opacity: 1; + } + + /* Stroke colours of the handle, direction point, and vector itself */ + .prism-previewer-easing.prism-previewer-easing circle, + .prism-previewer-easing.prism-previewer-easing path, + .prism-previewer-easing.prism-previewer-easing line { + stroke: hsl(230, 8%, 24%); + } + + /* Fill colour of the handle */ + .prism-previewer-easing.prism-previewer-easing circle { + fill: transparent; + } \ No newline at end of file diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss index b5bfc9a..8c96464 100644 --- a/src/components/Header/Header.scss +++ b/src/components/Header/Header.scss @@ -19,7 +19,9 @@ font-size: var(--font-size-lg); color: var(--font-color); &:hover { - border-bottom: 2px solid var(--color-blue-500); + text-decoration: underline; + text-decoration-thickness: 2px; + text-underline-offset: 5px; } } &__nav { @@ -36,8 +38,10 @@ display: inline-block; font-weight: 500; color: var(--font-color); + text-decoration: none; &:hover { color: var(--color-blue-500); + text-decoration: underline; } } } diff --git a/src/layouts/Page.astro b/src/layouts/Page.astro index 2590927..1a383c0 100644 --- a/src/layouts/Page.astro +++ b/src/layouts/Page.astro @@ -1,26 +1,30 @@ --- -import '@styles/global.scss'; -import Header from '@components/Header'; -import Footer from '@components/Footer'; + import '@styles/global.scss'; + import Header from '@components/Header'; + import Footer from '@components/Footer'; -export interface Props { - title?: string | undefined; -} + export interface Props { + title?: string | undefined; + } -const { title = 'Sergey Yarkov' } = Astro.props as Props; + const { title = 'Sergey Yarkov' } = Astro.props as Props; --- - - - - {title} - - -
-
- -
-
- - + + + + + {title} + + + + +
+
+ +
+
+ + + \ No newline at end of file diff --git a/src/pages/[article].astro b/src/pages/[article].astro index 9f162dd..4f7b513 100644 --- a/src/pages/[article].astro +++ b/src/pages/[article].astro @@ -46,9 +46,9 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. Maecenas eget condimentum velit, sit amet feugiat lectus. Class aptent taciti sociosqu ad litora torquent per - conubia nostra, per inceptos himenaeos. Praesent auctor purus luctus enim egestas, ac scelerisque ante pulvinar. + conubia nostra, per inceptos himenaeos. [Praesent auctor](#) purus luctus enim egestas, ac scelerisque ante pulvinar. Donec ut rhoncus ex. Suspendisse ac rhoncus nisl, eu tempor urna. Curabitur vel bibendum lorem. Morbi convallis - convallis diam sit amet lacinia. Aliquam in elementum + convallis diam sit amet [lacinia](#). Aliquam in elementum Curabitur tempor quis eros tempus lacinia. Nam bibendum pellentesque quam a convallis. Sed ut vulputate nisi. Integer in felis sed leo vestibulum venenatis. Suspendisse quis arcu sem. Aenean feugiat ex eu vestibulum @@ -62,9 +62,42 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. - - `Nam metus lacus`: porttitor eu mauris a, blandit ultrices nibh. + - `Nam metus lacus`: porttitor eu mauris a, [blandit ultrices](#) nibh. - `Class aptent`: taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. - - `Sed nec ante`: dictum sem condimentum ullamcorper quis venenatis nisi. + - `Sed nec ante`: dictum sem condimentum [ullamcorper quis](#) venenatis nisi. + + ```typescript + import type { APIContext } from 'astro'; + + export async function get({ params, request }: APIContext) { + return { + body: JSON.stringify({ + path: new URL(request.url).pathname + }) + }; + } + ``` + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim. + +
+ test +
This is a test image!
+
+ +
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. +

+

— Metus Nec

+
+ + + ## Conclusion + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. +
diff --git a/src/styles/global.scss b/src/styles/global.scss index d4a38de..3dec2f3 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -95,6 +95,7 @@ --background-header-color: var(--color-white); --background-scrollbar-track-color: #EFF1F5; --background-scrollbar-thumb-color: var(--color-gray-100); + --background-inline-code: rgba(0,0,0,0.05); } /* Text selection */ @@ -189,8 +190,8 @@ body { .article-content { & p, - em, - q { + & em, + & q { line-height: var(--line-height-base); font-size: var(--font-size-lg); } @@ -208,24 +209,24 @@ body { } } - q { + & q { font-style: italic; quotes: "«" "»"; } - h1, - h2, - h3, - h4 { + & h1, + & h2, + & h3, + & h4 { margin-top: 3rem; margin-bottom: 1rem; padding-bottom: 0.35rem; } - h1:not(:first-child), - h2:not(:first-child), - h3:not(:first-child), - h4:not(:first-child) { + & h1:not(:first-child), + & h2:not(:first-child), + & h3:not(:first-child), + & h4:not(:first-child) { margin-top: 3rem; } @@ -239,7 +240,31 @@ body { } & a { - font-weight: 600; + color: var(--color-blue-500); + text-underline-offset: 2.5px; + text-decoration-color: var(--color-blue-500); + font-weight: 500; + &:hover { + color: var(--color-blue-500); + text-decoration-thickness: 2px; + } + } + + & figure { + margin: 0 0 1em; + } + + & figcaption { + font-size: 1em; + text-align: center; + margin: 0.7rem 0; + } + + & img { + display: block; + border-radius: var(--border-radius-md); + max-width: 100%; + margin: 0 auto; } } @@ -249,16 +274,6 @@ li::marker { line-height: var(--line-height-none); } -a { - color: var(--color-blue-500); - font-weight: 500; - text-decoration: none; - &:hover { - text-decoration: underline; - color: var(--color-blue-500); - } -} - p { margin-top: 0; margin-bottom: 1.5rem; @@ -309,3 +324,56 @@ textarea { max-height: 500px; min-height: 200px; } + +blockquote { + margin: 1.5rem 0; + font-style: italic; + border-left: 0.25rem solid var(--border-color); + padding-left: 1rem; +} + +:not(pre)>code { + -webkit-font-smoothing: subpixel-antialiased; + background: var(--background-inline-code); + border-radius: var(--border-radius-lg); + font-size: 1rem; + font-weight: 500; + padding: 0.2rem 0.3rem; +} + +pre { + font-size: var(--font-size-sm); + border-radius: var(--border-radius-md); +} + +a { + color: var(--color-blue-500); + font-weight: 500; + text-decoration: none; + &:hover { + text-decoration: underline; + color: var(--color-blue-500); + } +} + +// pre[class*=language-]:before { +// color: #232129; +// font-size: .75rem; +// font-family: SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace; +// letter-spacing: .075em; +// line-height: 1; +// position: absolute; +// left: 1.5rem; +// text-align: right; +// text-transform: uppercase; +// top: 0; +// border-radius: 0 0 4px 4px; +// padding: 0.25rem 0.5rem; +// } + + +// pre[class*=language-typescript]:before { +// content: "ts"; +// background: #007acc; +// color: #eee; +// } \ No newline at end of file From d0e299e19405e5837a6739d7c9af911fb44d0c4c Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Sun, 17 Jul 2022 23:38:54 +0300 Subject: [PATCH 10/70] feat: added mobile header --- .eslintrc.json | 22 + .prettierrc.json | 8 + package-lock.json | 2059 ++++++++++++++++- package.json | 4 + src/components/ArticleItem/ArticleItem.scss | 69 +- src/components/ArticleItem/ArticleItem.tsx | 29 +- src/components/ArticlesList/ArticlesList.tsx | 66 +- src/components/BaseHead.astro | 22 + src/components/BaseLayout/BaseLayout.astro | 13 + src/components/BaseLayout/BaseLayout.scss | 5 + src/components/BaseLayout/index.ts | 1 + src/components/Header/Header.astro | 66 +- src/components/Header/Header.scss | 226 +- .../Header/NavToggle/NavToggle.scss | 5 + src/components/Header/NavToggle/NavToggle.tsx | 27 + src/components/PageContent/Heading.tsx | 0 src/components/PageContent/PageContent.tsx | 10 - src/components/PageHeading/PageHeading.tsx | 11 +- .../RecentArticles/RecentArticles.astro | 35 + .../RecentArticles/RecentArticles.scss | 21 + src/components/RecentArticles/index.ts | 1 + .../ThemeSwticher/ThemeSwitcher.astro | 4 +- .../ThemeSwticher/ThemeSwitcher.scss | 18 +- src/config.ts | 25 +- src/icons/chat.svg | 4 + src/icons/chip.svg | 4 + src/icons/link-out.svg | 3 + src/icons/moon.svg | 3 + src/icons/round-school.svg | 3 + src/icons/round-shop-two.svg | 3 + src/icons/search.svg | 3 + src/icons/sun.svg | 3 + src/icons/triangle_filled.svg | 3 + src/interfaces/index.ts | 9 +- src/layouts/Page.astro | 30 - src/layouts/default.astro | 24 + src/pages/[article].astro | 298 +-- src/pages/about.astro | 22 +- src/pages/articles.astro | 26 +- src/pages/contacts.astro | 128 +- src/pages/index.astro | 181 +- src/pages/projects.astro | 93 +- src/styles/global.scss | 527 ++--- .../prism => src/styles}/prism-one-dark.css | 0 .../prism => src/styles}/prism-one-light.css | 0 src/utils/articles.ts | 41 +- src/utils/date.ts | 8 +- 47 files changed, 3245 insertions(+), 918 deletions(-) create mode 100644 .eslintrc.json create mode 100644 .prettierrc.json create mode 100644 src/components/BaseHead.astro create mode 100644 src/components/BaseLayout/BaseLayout.astro create mode 100644 src/components/BaseLayout/BaseLayout.scss create mode 100644 src/components/BaseLayout/index.ts create mode 100644 src/components/Header/NavToggle/NavToggle.scss create mode 100644 src/components/Header/NavToggle/NavToggle.tsx delete mode 100644 src/components/PageContent/Heading.tsx delete mode 100644 src/components/PageContent/PageContent.tsx create mode 100644 src/components/RecentArticles/RecentArticles.astro create mode 100644 src/components/RecentArticles/RecentArticles.scss create mode 100644 src/components/RecentArticles/index.ts create mode 100644 src/icons/chat.svg create mode 100644 src/icons/chip.svg create mode 100644 src/icons/link-out.svg create mode 100644 src/icons/moon.svg create mode 100644 src/icons/round-school.svg create mode 100644 src/icons/round-shop-two.svg create mode 100644 src/icons/search.svg create mode 100644 src/icons/sun.svg create mode 100644 src/icons/triangle_filled.svg delete mode 100644 src/layouts/Page.astro create mode 100644 src/layouts/default.astro rename {public/styles/prism => src/styles}/prism-one-dark.css (100%) rename {public/styles/prism => src/styles}/prism-one-light.css (100%) diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..f23efa8 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,22 @@ +{ + "env": { + "browser": true, + "es2021": true + }, + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/recommended", + "plugin:solid/typescript" + ], + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaVersion": "latest", + "sourceType": "module" + }, + "plugins": [ + "@typescript-eslint", + "solid" + ], + "rules": { + } +} diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000..580d103 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,8 @@ +{ + "printWidth": 150, + "semi": true, + "singleQuote": true, + "tabWidth": 2, + "trailingComma": "es5", + "useTabs": true +} diff --git a/package-lock.json b/package-lock.json index 86e4a5d..020173c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,12 @@ "license": "MIT", "devDependencies": { "@astrojs/solid-js": "^0.2.1", + "@typescript-eslint/eslint-plugin": "^5.30.6", + "@typescript-eslint/parser": "^5.30.6", "astro": "^1.0.0-beta.63", "astro-icon": "^0.7.1", + "eslint": "^8.19.0", + "eslint-plugin-solid": "^0.7.1", "prettier": "^2.7.1", "prettier-plugin-astro": "^0.1.1", "sass": "^1.53.0", @@ -570,6 +574,91 @@ "integrity": "sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==", "dev": true }, + "node_modules/@eslint/eslintrc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz", + "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.3.2", + "globals": "^13.15.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.16.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz", + "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", + "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", @@ -757,6 +846,12 @@ "@types/unist": "*" } }, + "node_modules/@types/json-schema": { + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true + }, "node_modules/@types/json5": { "version": "0.0.30", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.30.tgz", @@ -811,6 +906,212 @@ "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==", "dev": true }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.6.tgz", + "integrity": "sha512-J4zYMIhgrx4MgnZrSDD7sEnQp7FmhKNOaqaOpaoQ/SfdMfRB/0yvK74hTnvH+VQxndZynqs5/Hn4t+2/j9bADg==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "5.30.6", + "@typescript-eslint/type-utils": "5.30.6", + "@typescript-eslint/utils": "5.30.6", + "debug": "^4.3.4", + "functional-red-black-tree": "^1.0.1", + "ignore": "^5.2.0", + "regexpp": "^3.2.0", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.6.tgz", + "integrity": "sha512-gfF9lZjT0p2ZSdxO70Xbw8w9sPPJGfAdjK7WikEjB3fcUI/yr9maUVEdqigBjKincUYNKOmf7QBMiTf719kbrA==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "5.30.6", + "@typescript-eslint/types": "5.30.6", + "@typescript-eslint/typescript-estree": "5.30.6", + "debug": "^4.3.4" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.30.6.tgz", + "integrity": "sha512-Hkq5PhLgtVoW1obkqYH0i4iELctEKixkhWLPTYs55doGUKCASvkjOXOd/pisVeLdO24ZX9D6yymJ/twqpJiG3g==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.30.6", + "@typescript-eslint/visitor-keys": "5.30.6" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.30.6.tgz", + "integrity": "sha512-GFVVzs2j0QPpM+NTDMXtNmJKlF842lkZKDSanIxf+ArJsGeZUIaeT4jGg+gAgHt7AcQSFwW7htzF/rbAh2jaVA==", + "dev": true, + "dependencies": { + "@typescript-eslint/utils": "5.30.6", + "debug": "^4.3.4", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.30.6.tgz", + "integrity": "sha512-HdnP8HioL1F7CwVmT4RaaMX57RrfqsOMclZc08wGMiDYJBsLGBM7JwXM4cZJmbWLzIR/pXg1kkrBBVpxTOwfUg==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.6.tgz", + "integrity": "sha512-Z7TgPoeYUm06smfEfYF0RBkpF8csMyVnqQbLYiGgmUSTaSXTP57bt8f0UFXstbGxKIreTwQCujtaH0LY9w9B+A==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.30.6", + "@typescript-eslint/visitor-keys": "5.30.6", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.30.6.tgz", + "integrity": "sha512-xFBLc/esUbLOJLk9jKv0E9gD/OH966M40aY9jJ8GiqpSkP2xOV908cokJqqhVd85WoIvHVHYXxSFE4cCSDzVvA==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.30.6", + "@typescript-eslint/types": "5.30.6", + "@typescript-eslint/typescript-estree": "5.30.6", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.6.tgz", + "integrity": "sha512-41OiCjdL2mCaSDi2SvYbzFLlqqlm5v1ZW9Ym55wXKL/Rx6OOB1IbuFGo71Fj6Xy90gJDFTlgOS+vbmtGHPTQQA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.30.6", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@vscode/emmet-helper": { "version": "2.8.4", "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz", @@ -852,6 +1153,22 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, "node_modules/ansi-align": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", @@ -948,6 +1265,25 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/array-includes": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz", + "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5", + "get-intrinsic": "^1.1.1", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array-iterate": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.4.tgz", @@ -958,6 +1294,15 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/assert": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz", @@ -1130,6 +1475,12 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -1268,6 +1619,16 @@ "node": ">=8" } }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", @@ -1345,6 +1706,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -1558,6 +1928,12 @@ "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==", "dev": true }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, "node_modules/convert-source-map": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", @@ -1697,6 +2073,12 @@ "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==", "dev": true }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, "node_modules/deepmerge": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", @@ -1758,12 +2140,36 @@ "node": ">=0.3.1" } }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/dlv": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", "dev": true }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/dom-serializer": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", @@ -2310,6 +2716,301 @@ "node": ">=0.8.0" } }, + "node_modules/eslint": { + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz", + "integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==", + "dev": true, + "dependencies": { + "@eslint/eslintrc": "^1.3.0", + "@humanwhocodes/config-array": "^0.9.2", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.1.1", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.2", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^6.0.1", + "globals": "^13.15.0", + "ignore": "^5.2.0", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "regexpp": "^3.2.0", + "strip-ansi": "^6.0.1", + "strip-json-comments": "^3.1.0", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-plugin-solid": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-solid/-/eslint-plugin-solid-0.7.1.tgz", + "integrity": "sha512-DNxpdvbUcxOhSEGtT1szPQyaPCDL9aZDxBaV9ljccSis0Z2vLgl+KF2KTZZqjyQlyw+6pqe3Yu4e1fezjWV72w==", + "dev": true, + "dependencies": { + "@typescript-eslint/utils": "^5.10.0", + "is-html": "^2.0.0", + "jsx-ast-utils": "^3.2.0", + "kebab-case": "^1.0.1", + "known-css-properties": "^0.24.0", + "style-to-object": "^0.3.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/eslint-scope": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", + "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/eslint/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/eslint/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/globals": { + "version": "13.16.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz", + "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/eslint/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/espree": { + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", + "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", + "dev": true, + "dependencies": { + "acorn": "^8.7.1", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -2323,6 +3024,39 @@ "node": ">=4" } }, + "node_modules/esquery": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, "node_modules/estree-util-is-identifier-name": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.0.1.tgz", @@ -2353,6 +3087,15 @@ "integrity": "sha512-woY0RUD87WzMBUiZLx8NsYr23N5BKsOMZHhu2hoNRVh6NXGfoiT1KOL8G3UHlJAnEDGmfa5ubNA/AacfG+Kb0g==", "dev": true }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/execa": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", @@ -2394,6 +3137,12 @@ "node": ">=0.10.0" } }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, "node_modules/fast-glob": { "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", @@ -2410,6 +3159,18 @@ "node": ">=8.6.0" } }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, "node_modules/fastq": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", @@ -2442,6 +3203,18 @@ "node": "^12.20 || >= 14.13" } }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -2489,6 +3262,25 @@ "pkg-dir": "^4.2.0" } }, + "node_modules/flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, + "dependencies": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", + "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", + "dev": true + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -2510,6 +3302,12 @@ "node": ">=12.20.0" } }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -2548,6 +3346,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", + "dev": true + }, "node_modules/functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", @@ -2624,6 +3428,26 @@ "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==", "dev": true }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", @@ -2651,6 +3475,35 @@ "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", "dev": true }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/globrex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", @@ -2927,6 +3780,18 @@ "integrity": "sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==", "dev": true }, + "node_modules/html-tags": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz", + "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/html-void-elements": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz", @@ -2966,12 +3831,65 @@ } ] }, + "node_modules/ignore": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, "node_modules/immutable": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", "dev": true }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -3229,6 +4147,18 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/is-html": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-html/-/is-html-2.0.0.tgz", + "integrity": "sha512-S+OpgB5i7wzIue/YSE5hg0e5ZYfG3hhpNh9KGl6ayJ38p7ED6wxQLd1TV91xHpcTvw90KMJ9EwN3F/iNflHBVg==", + "dev": true, + "dependencies": { + "html-tags": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/is-interactive": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", @@ -3491,6 +4421,18 @@ "node": ">=4" } }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, "node_modules/json5": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", @@ -3509,6 +4451,25 @@ "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==", "dev": true }, + "node_modules/jsx-ast-utils": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.2.tgz", + "integrity": "sha512-4ZCADZHRkno244xlNnn4AOG6sRQ7iBZ5BbgZ4vW4y5IZw7cVUD1PPeblm1xx/nfmMxPdt/LHsXZW8z/j58+l9Q==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.5", + "object.assign": "^4.1.2" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/kebab-case": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/kebab-case/-/kebab-case-1.0.1.tgz", + "integrity": "sha512-txPHx6nVLhv8PHGXIlAk0nYoh894SpAqGPXNvbg2hh8spvHXIah3+vT87DLoa59nKgC6scD3u3xAuRIgiMqbfQ==", + "dev": true + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -3527,6 +4488,25 @@ "node": ">=6" } }, + "node_modules/known-css-properties": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz", + "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==", + "dev": true + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/lilconfig": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", @@ -3581,6 +4561,12 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "node_modules/log-symbols": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", @@ -4637,6 +5623,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/mri": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", @@ -4673,6 +5671,12 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, "node_modules/nlcst-to-string": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.4.tgz", @@ -4848,6 +5852,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, "node_modules/onetime": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", @@ -4895,6 +5908,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/ora": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/ora/-/ora-6.1.2.tgz", @@ -4969,6 +5999,18 @@ "node": ">=6" } }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/parse-entities": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.0.tgz", @@ -5071,6 +6113,15 @@ "node": ">=8" } }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -5092,6 +6143,15 @@ "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==", "dev": true }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -5251,6 +6311,15 @@ "node": ">=10" } }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/prettier": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", @@ -5339,6 +6408,15 @@ "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==", "dev": true }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -5459,6 +6537,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, "node_modules/rehype-raw": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-6.1.1.tgz", @@ -5727,6 +6817,21 @@ "node": ">=0.10.0" } }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/rollup": { "version": "2.75.7", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz", @@ -6137,6 +7242,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/style-to-object": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", @@ -6233,12 +7350,12 @@ } }, "node_modules/synckit": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.7.2.tgz", - "integrity": "sha512-CSZRtSRZ8RhJGMtWyLRqlarmWPPlsgZJHtV6cz0VTHNOg+R7UBoE2eNPQmB5Qrhtk3RX2AAcJmVwMXFULVQSwg==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.7.3.tgz", + "integrity": "sha512-jNroMv7Juy+mJ/CHW5H6TzsLWpa1qck6sCHbkv8YTur+irSq2PjbvmGnm2gy14BUQ6jF33vyR4DPssHqmqsDQw==", "dev": true, "dependencies": { - "@pkgr/utils": "^2.2.0", + "@pkgr/utils": "^2.3.0", "tslib": "^2.4.0" }, "engines": { @@ -6248,6 +7365,12 @@ "url": "https://opencollective.com/unts" } }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, "node_modules/tiny-glob": { "version": "0.2.9", "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", @@ -6358,6 +7481,39 @@ "node": ">=12" } }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/type-fest": { "version": "2.16.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.16.0.tgz", @@ -6604,6 +7760,15 @@ "browserslist": ">= 4.21.0" } }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, "node_modules/util": { "version": "0.12.4", "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", @@ -6642,6 +7807,12 @@ "node": ">=8" } }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true + }, "node_modules/vfile": { "version": "5.3.4", "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.4.tgz", @@ -6946,6 +8117,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/wrap-ansi": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", @@ -6975,6 +8155,12 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -7474,6 +8660,72 @@ "integrity": "sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==", "dev": true }, + "@eslint/eslintrc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz", + "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.3.2", + "globals": "^13.15.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "globals": { + "version": "13.16.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz", + "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + } + } + }, + "@humanwhocodes/config-array": { + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", + "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + } + }, + "@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true + }, "@jridgewell/gen-mapping": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", @@ -7631,6 +8883,12 @@ "@types/unist": "*" } }, + "@types/json-schema": { + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true + }, "@types/json5": { "version": "0.0.30", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.30.tgz", @@ -7685,6 +8943,119 @@ "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==", "dev": true }, + "@typescript-eslint/eslint-plugin": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.6.tgz", + "integrity": "sha512-J4zYMIhgrx4MgnZrSDD7sEnQp7FmhKNOaqaOpaoQ/SfdMfRB/0yvK74hTnvH+VQxndZynqs5/Hn4t+2/j9bADg==", + "dev": true, + "requires": { + "@typescript-eslint/scope-manager": "5.30.6", + "@typescript-eslint/type-utils": "5.30.6", + "@typescript-eslint/utils": "5.30.6", + "debug": "^4.3.4", + "functional-red-black-tree": "^1.0.1", + "ignore": "^5.2.0", + "regexpp": "^3.2.0", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + } + }, + "@typescript-eslint/parser": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.6.tgz", + "integrity": "sha512-gfF9lZjT0p2ZSdxO70Xbw8w9sPPJGfAdjK7WikEjB3fcUI/yr9maUVEdqigBjKincUYNKOmf7QBMiTf719kbrA==", + "dev": true, + "requires": { + "@typescript-eslint/scope-manager": "5.30.6", + "@typescript-eslint/types": "5.30.6", + "@typescript-eslint/typescript-estree": "5.30.6", + "debug": "^4.3.4" + } + }, + "@typescript-eslint/scope-manager": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.30.6.tgz", + "integrity": "sha512-Hkq5PhLgtVoW1obkqYH0i4iELctEKixkhWLPTYs55doGUKCASvkjOXOd/pisVeLdO24ZX9D6yymJ/twqpJiG3g==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.30.6", + "@typescript-eslint/visitor-keys": "5.30.6" + } + }, + "@typescript-eslint/type-utils": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.30.6.tgz", + "integrity": "sha512-GFVVzs2j0QPpM+NTDMXtNmJKlF842lkZKDSanIxf+ArJsGeZUIaeT4jGg+gAgHt7AcQSFwW7htzF/rbAh2jaVA==", + "dev": true, + "requires": { + "@typescript-eslint/utils": "5.30.6", + "debug": "^4.3.4", + "tsutils": "^3.21.0" + } + }, + "@typescript-eslint/types": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.30.6.tgz", + "integrity": "sha512-HdnP8HioL1F7CwVmT4RaaMX57RrfqsOMclZc08wGMiDYJBsLGBM7JwXM4cZJmbWLzIR/pXg1kkrBBVpxTOwfUg==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.6.tgz", + "integrity": "sha512-Z7TgPoeYUm06smfEfYF0RBkpF8csMyVnqQbLYiGgmUSTaSXTP57bt8f0UFXstbGxKIreTwQCujtaH0LY9w9B+A==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.30.6", + "@typescript-eslint/visitor-keys": "5.30.6", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + } + }, + "@typescript-eslint/utils": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.30.6.tgz", + "integrity": "sha512-xFBLc/esUbLOJLk9jKv0E9gD/OH966M40aY9jJ8GiqpSkP2xOV908cokJqqhVd85WoIvHVHYXxSFE4cCSDzVvA==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.30.6", + "@typescript-eslint/types": "5.30.6", + "@typescript-eslint/typescript-estree": "5.30.6", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, + "dependencies": { + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true + } + } + }, + "@typescript-eslint/visitor-keys": { + "version": "5.30.6", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.6.tgz", + "integrity": "sha512-41OiCjdL2mCaSDi2SvYbzFLlqqlm5v1ZW9Ym55wXKL/Rx6OOB1IbuFGo71Fj6Xy90gJDFTlgOS+vbmtGHPTQQA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.30.6", + "eslint-visitor-keys": "^3.3.0" + } + }, "@vscode/emmet-helper": { "version": "2.8.4", "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz", @@ -7720,6 +9091,18 @@ "dev": true, "requires": {} }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "ansi-align": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", @@ -7797,12 +9180,31 @@ "sprintf-js": "~1.0.2" } }, + "array-includes": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz", + "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5", + "get-intrinsic": "^1.1.1", + "is-string": "^1.0.7" + } + }, "array-iterate": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.4.tgz", "integrity": "sha512-sNRaPGh9nnmdC8Zf+pT3UqP8rnWj5Hf9wiFGsX3wUQ2yVSIhO2ShFwCoceIPpB41QF6i2OEmrHmCo36xronCVA==", "dev": true }, + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true + }, "assert": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz", @@ -7948,6 +9350,12 @@ "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==", "dev": true }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -8044,6 +9452,16 @@ } } }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", @@ -8085,6 +9503,12 @@ "get-intrinsic": "^1.0.2" } }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, "camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -8220,6 +9644,12 @@ "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==", "dev": true }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, "convert-source-map": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", @@ -8322,6 +9752,12 @@ "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==", "dev": true }, + "deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, "deepmerge": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", @@ -8365,12 +9801,30 @@ "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", "dev": true }, + "dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "requires": { + "path-type": "^4.0.0" + } + }, "dlv": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", "dev": true }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, "dom-serializer": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", @@ -8688,12 +10142,248 @@ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true }, + "eslint": { + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz", + "integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==", + "dev": true, + "requires": { + "@eslint/eslintrc": "^1.3.0", + "@humanwhocodes/config-array": "^0.9.2", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.1.1", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.2", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^6.0.1", + "globals": "^13.15.0", + "ignore": "^5.2.0", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "regexpp": "^3.2.0", + "strip-ansi": "^6.0.1", + "strip-json-comments": "^3.1.0", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true + }, + "glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "requires": { + "is-glob": "^4.0.3" + } + }, + "globals": { + "version": "13.16.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz", + "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + } + } + }, + "eslint-plugin-solid": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-solid/-/eslint-plugin-solid-0.7.1.tgz", + "integrity": "sha512-DNxpdvbUcxOhSEGtT1szPQyaPCDL9aZDxBaV9ljccSis0Z2vLgl+KF2KTZZqjyQlyw+6pqe3Yu4e1fezjWV72w==", + "dev": true, + "requires": { + "@typescript-eslint/utils": "^5.10.0", + "is-html": "^2.0.0", + "jsx-ast-utils": "^3.2.0", + "kebab-case": "^1.0.1", + "known-css-properties": "^0.24.0", + "style-to-object": "^0.3.0" + } + }, + "eslint-scope": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", + "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + } + }, + "eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^2.0.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + } + } + }, + "eslint-visitor-keys": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "dev": true + }, + "espree": { + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", + "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", + "dev": true, + "requires": { + "acorn": "^8.7.1", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.3.0" + } + }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, + "esquery": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "dev": true, + "requires": { + "estraverse": "^5.1.0" + } + }, + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "requires": { + "estraverse": "^5.2.0" + } + }, + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + }, "estree-util-is-identifier-name": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.0.1.tgz", @@ -8716,6 +10406,12 @@ "integrity": "sha512-woY0RUD87WzMBUiZLx8NsYr23N5BKsOMZHhu2hoNRVh6NXGfoiT1KOL8G3UHlJAnEDGmfa5ubNA/AacfG+Kb0g==", "dev": true }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true + }, "execa": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", @@ -8748,6 +10444,12 @@ "is-extendable": "^0.1.0" } }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, "fast-glob": { "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", @@ -8761,6 +10463,18 @@ "micromatch": "^4.0.4" } }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, "fastq": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", @@ -8780,6 +10494,15 @@ "web-streams-polyfill": "^3.0.3" } }, + "file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "requires": { + "flat-cache": "^3.0.4" + } + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -8815,6 +10538,22 @@ "pkg-dir": "^4.2.0" } }, + "flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, + "requires": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + } + }, + "flatted": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", + "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", + "dev": true + }, "for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -8833,6 +10572,12 @@ "fetch-blob": "^3.1.2" } }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, "fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -8858,6 +10603,12 @@ "functions-have-names": "^1.2.2" } }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", + "dev": true + }, "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", @@ -8913,6 +10664,20 @@ "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==", "dev": true }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, "glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", @@ -8934,6 +10699,28 @@ "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", "dev": true }, + "globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "dependencies": { + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + } + } + }, "globrex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", @@ -9144,6 +10931,12 @@ "integrity": "sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==", "dev": true }, + "html-tags": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz", + "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==", + "dev": true + }, "html-void-elements": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz", @@ -9162,12 +10955,52 @@ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true }, + "ignore": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "dev": true + }, "immutable": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", "dev": true }, + "import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + } + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -9329,6 +11162,15 @@ "integrity": "sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==", "dev": true }, + "is-html": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-html/-/is-html-2.0.0.tgz", + "integrity": "sha512-S+OpgB5i7wzIue/YSE5hg0e5ZYfG3hhpNh9KGl6ayJ38p7ED6wxQLd1TV91xHpcTvw90KMJ9EwN3F/iNflHBVg==", + "dev": true, + "requires": { + "html-tags": "^3.0.0" + } + }, "is-interactive": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", @@ -9497,6 +11339,18 @@ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, "json5": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", @@ -9509,6 +11363,22 @@ "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==", "dev": true }, + "jsx-ast-utils": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.2.tgz", + "integrity": "sha512-4ZCADZHRkno244xlNnn4AOG6sRQ7iBZ5BbgZ4vW4y5IZw7cVUD1PPeblm1xx/nfmMxPdt/LHsXZW8z/j58+l9Q==", + "dev": true, + "requires": { + "array-includes": "^3.1.5", + "object.assign": "^4.1.2" + } + }, + "kebab-case": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/kebab-case/-/kebab-case-1.0.1.tgz", + "integrity": "sha512-txPHx6nVLhv8PHGXIlAk0nYoh894SpAqGPXNvbg2hh8spvHXIah3+vT87DLoa59nKgC6scD3u3xAuRIgiMqbfQ==", + "dev": true + }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -9521,6 +11391,22 @@ "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", "dev": true }, + "known-css-properties": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz", + "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==", + "dev": true + }, + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + } + }, "lilconfig": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", @@ -9562,6 +11448,12 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "log-symbols": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", @@ -10249,6 +12141,15 @@ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, "mri": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", @@ -10273,6 +12174,12 @@ "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, "nlcst-to-string": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.4.tgz", @@ -10384,6 +12291,15 @@ "object-keys": "^1.1.1" } }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "requires": { + "wrappy": "1" + } + }, "onetime": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", @@ -10412,6 +12328,20 @@ } } }, + "optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, + "requires": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + } + }, "ora": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/ora/-/ora-6.1.2.tgz", @@ -10461,6 +12391,15 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, "parse-entities": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.0.tgz", @@ -10556,6 +12495,12 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true + }, "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -10574,6 +12519,12 @@ "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==", "dev": true }, + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true + }, "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -10673,6 +12624,12 @@ "which-pm": "2.0.0" } }, + "prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true + }, "prettier": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", @@ -10739,6 +12696,12 @@ "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==", "dev": true }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + }, "qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -10817,6 +12780,12 @@ "functions-have-names": "^1.2.2" } }, + "regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true + }, "rehype-raw": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-6.1.1.tgz", @@ -11013,6 +12982,15 @@ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, "rollup": { "version": "2.75.7", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz", @@ -11306,6 +13284,12 @@ "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, "style-to-object": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", @@ -11380,15 +13364,21 @@ } }, "synckit": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.7.2.tgz", - "integrity": "sha512-CSZRtSRZ8RhJGMtWyLRqlarmWPPlsgZJHtV6cz0VTHNOg+R7UBoE2eNPQmB5Qrhtk3RX2AAcJmVwMXFULVQSwg==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.7.3.tgz", + "integrity": "sha512-jNroMv7Juy+mJ/CHW5H6TzsLWpa1qck6sCHbkv8YTur+irSq2PjbvmGnm2gy14BUQ6jF33vyR4DPssHqmqsDQw==", "dev": true, "requires": { - "@pkgr/utils": "^2.2.0", + "@pkgr/utils": "^2.3.0", "tslib": "^2.4.0" } }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, "tiny-glob": { "version": "0.2.9", "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", @@ -11469,6 +13459,32 @@ "esbuild": "^0.14.0" } }, + "tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, + "type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1" + } + }, "type-fest": { "version": "2.16.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.16.0.tgz", @@ -11627,6 +13643,15 @@ "picocolors": "^1.0.0" } }, + "uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, "util": { "version": "0.12.4", "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", @@ -11659,6 +13684,12 @@ "sade": "^1.7.3" } }, + "v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true + }, "vfile": { "version": "5.3.4", "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.4.tgz", @@ -11889,6 +13920,12 @@ "string-width": "^5.0.1" } }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, "wrap-ansi": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", @@ -11908,6 +13945,12 @@ } } }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", diff --git a/package.json b/package.json index 3a75cd4..7cff3d7 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,12 @@ }, "devDependencies": { "@astrojs/solid-js": "^0.2.1", + "@typescript-eslint/eslint-plugin": "^5.30.6", + "@typescript-eslint/parser": "^5.30.6", "astro": "^1.0.0-beta.63", "astro-icon": "^0.7.1", + "eslint": "^8.19.0", + "eslint-plugin-solid": "^0.7.1", "prettier": "^2.7.1", "prettier-plugin-astro": "^0.1.1", "sass": "^1.53.0", diff --git a/src/components/ArticleItem/ArticleItem.scss b/src/components/ArticleItem/ArticleItem.scss index 5377b6c..45914d4 100644 --- a/src/components/ArticleItem/ArticleItem.scss +++ b/src/components/ArticleItem/ArticleItem.scss @@ -1,31 +1,42 @@ .article-item { - border-radius: var(--border-radius-md); - text-decoration: none; - & a { - display: flex; - justify-content: space-between; - align-items: center; - column-gap: 10px; - color: var(--font-color); - padding: 8px 15px; - & h3 { - font-size: var(--font-size-md); - font-weight: normal; - margin: 0; - } - & p { - font-size: var(--font-size-xs); - font-family: monospace; - color: var(--font-color-gray); - text-transform: uppercase; - margin: 0; - text-align: right; - } - &:hover { - text-decoration: none; - } - } - &:hover { - background-color: var(--background-color-hover); - } + border-radius: var(--border-radius-md); + text-decoration: none; + & a { + display: flex; + justify-content: space-between; + align-items: center; + column-gap: 10px; + row-gap: 5px; + color: var(--font-color); + padding: 8px 15px; + & h3 { + font-size: var(--font-size-md); + font-weight: normal; + margin: 0; + } + & p { + font-size: var(--font-size-xs); + font-family: monospace; + color: var(--font-color-gray); + text-transform: uppercase; + margin: 0; + text-align: right; + white-space: nowrap; + } + &:hover { + text-decoration: none; + } + } + &:hover { + background-color: var(--background-color-hover); + } +} + +@media screen and (max-width: 560px) { + .article-item { + & a { + flex-direction: column-reverse; + align-items: flex-start; + } + } } diff --git a/src/components/ArticleItem/ArticleItem.tsx b/src/components/ArticleItem/ArticleItem.tsx index 99c3be3..0f29193 100644 --- a/src/components/ArticleItem/ArticleItem.tsx +++ b/src/components/ArticleItem/ArticleItem.tsx @@ -1,21 +1,22 @@ +import type { IArticle } from '@root/interfaces'; + import './ArticleItem.scss'; import { Component } from 'solid-js'; -import type { IArticle } from '@root/interfaces'; import { DateFormatter } from '@utils/date'; export type ArticleItemProps = { - data: IArticle; + data: IArticle; }; -export const ArticleItem: Component = ({ data }) => ( - -); +export const ArticleItem: Component = (props) => { + return ( + + ); +}; diff --git a/src/components/ArticlesList/ArticlesList.tsx b/src/components/ArticlesList/ArticlesList.tsx index 3d69f3a..ec11219 100644 --- a/src/components/ArticlesList/ArticlesList.tsx +++ b/src/components/ArticlesList/ArticlesList.tsx @@ -1,5 +1,5 @@ import "./ArticlesList.scss"; -import { Component, createSignal, Show } from "solid-js"; +import { Component, createSignal, Show, For } from "solid-js"; import { PageHeading } from "@components/PageHeading"; import type { IArticle } from "@root/interfaces"; import * as utils from "@root/utils/articles"; @@ -10,8 +10,8 @@ export type ArticlesListProps = { tags: string[]; }; -export const ArticlesList: Component = ({ data, tags }) => { - const [articles, setArticles] = createSignal(utils.filterArticlesByYear(data)); +export const ArticlesList: Component = (props) => { + const [articles, setArticles] = createSignal(utils.filterArticlesByYear(props.data)); const [selectedTags, setSelectedTags] = createSignal([]); const [filteredArticles, setFilteredArticles] = createSignal([]); @@ -32,41 +32,43 @@ export const ArticlesList: Component = ({ data, tags }) => { d="M10.6026 3.60001C11.8798 3.59993 13.1316 3.94283 14.2172 4.5901C15.3028 5.23736 16.179 6.16331 16.7472 7.26368C17.3154 8.36405 17.5531 9.59517 17.4334 10.8184C17.3137 12.0417 16.8415 13.2085 16.0699 14.1876L21.2427 19.164C21.4085 19.3248 21.5053 19.5399 21.5135 19.7662C21.5218 19.9926 21.4411 20.2137 21.2874 20.3853C21.1337 20.5569 20.9184 20.6665 20.6845 20.6921C20.4505 20.7178 20.2151 20.6576 20.0253 20.5236L19.9205 20.436L14.7476 15.4596C13.8802 16.0922 12.8687 16.5172 11.7968 16.6994C10.7248 16.8815 9.62324 16.8157 8.58298 16.5074C7.54272 16.199 6.59366 15.6569 5.81422 14.9259C5.03478 14.1949 4.44733 13.296 4.10042 12.3034C3.7535 11.3108 3.65708 10.2531 3.81911 9.21757C3.98114 8.18204 4.39698 7.19847 5.03226 6.34812C5.66755 5.49778 6.50404 4.80506 7.47263 4.32721C8.44122 3.84936 9.51411 3.60009 10.6026 3.60001V3.60001ZM10.6026 5.40001C9.27934 5.40001 8.01025 5.90572 7.07454 6.80589C6.13884 7.70607 5.61316 8.92697 5.61316 10.2C5.61316 11.473 6.13884 12.6939 7.07454 13.5941C8.01025 14.4943 9.27934 15 10.6026 15C11.9259 15 13.195 14.4943 14.1307 13.5941C15.0664 12.6939 15.5921 11.473 15.5921 10.2C15.5921 8.92697 15.0664 7.70607 14.1307 6.80589C13.195 5.90572 11.9259 5.40001 10.6026 5.40001Z"> - {data.length} + {props.data.length}
diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro new file mode 100644 index 0000000..4f1ba5b --- /dev/null +++ b/src/components/BaseHead.astro @@ -0,0 +1,22 @@ +--- +import { SITE_METADATA } from '@root/config'; + +export interface Props { + title?: string | undefined; + description?: string | undefined; +} + +const { title = SITE_METADATA.title, description } = Astro.props as Props; +--- + + + + + + + + + {title} + + +{description && } diff --git a/src/components/BaseLayout/BaseLayout.astro b/src/components/BaseLayout/BaseLayout.astro new file mode 100644 index 0000000..9b1a900 --- /dev/null +++ b/src/components/BaseLayout/BaseLayout.astro @@ -0,0 +1,13 @@ +--- + import './BaseLayout.scss' + import Header from '@components/Header' + import Footer from '@components/Footer' +--- + + +
+
+ +
+
+ \ No newline at end of file diff --git a/src/components/BaseLayout/BaseLayout.scss b/src/components/BaseLayout/BaseLayout.scss new file mode 100644 index 0000000..29682b5 --- /dev/null +++ b/src/components/BaseLayout/BaseLayout.scss @@ -0,0 +1,5 @@ +.site-content { + flex: 1 0 auto; + width: 100%; + margin-top: 5rem; +} diff --git a/src/components/BaseLayout/index.ts b/src/components/BaseLayout/index.ts new file mode 100644 index 0000000..1f106c6 --- /dev/null +++ b/src/components/BaseLayout/index.ts @@ -0,0 +1 @@ +export { default } from './BaseLayout.astro'; diff --git a/src/components/Header/Header.astro b/src/components/Header/Header.astro index e61fa6d..8c67fcd 100644 --- a/src/components/Header/Header.astro +++ b/src/components/Header/Header.astro @@ -2,36 +2,44 @@ import './Header.scss'; import { SITE_METADATA } from '@root/config'; import ThemeSwitcher from '@components/ThemeSwticher'; -import {Icon} from 'astro-icon' +import { Icon } from 'astro-icon'; +import { NavToggle } from './NavToggle/NavToggle.tsx'; + +const { name, nav, contacts } = SITE_METADATA; +const { pathname } = Astro.canonicalURL; ---
-
- - -
+
+ + + +
diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss index 8c96464..cdef1c1 100644 --- a/src/components/Header/Header.scss +++ b/src/components/Header/Header.scss @@ -1,59 +1,175 @@ .header { - position: sticky; - top: 0; - border-bottom: 1px solid var(--border-color); - background-color: var(--background-header-color); - padding-top: 15px; - padding-bottom: 15px; - user-select: none; + position: sticky; + top: 0; + border-bottom: 1px solid var(--border-color); + background-color: var(--background-header-color); + padding-top: 15px; + padding-bottom: 15px; + user-select: none; - & .container { - display: flex; - align-items: center; - justify-content: space-between; - } + & .container { + display: flex; + align-items: center; + justify-content: space-between; + } - &__logo a { - text-decoration: none; - font-weight: 600; - font-size: var(--font-size-lg); - color: var(--font-color); - &:hover { - text-decoration: underline; - text-decoration-thickness: 2px; - text-underline-offset: 5px; - } - } - &__nav { - display: flex; - align-items: center; - & ul { - display: flex; - list-style: none; - column-gap: 20px; - margin: 0; - padding: 0; - margin-right: 35px; - & li a { - display: inline-block; - font-weight: 500; - color: var(--font-color); - text-decoration: none; - &:hover { - color: var(--color-blue-500); - text-decoration: underline; - } - } - } - &-contacts { - display: flex; - align-items: center; - column-gap: 10px; - margin-right: 40px; - & a { - text-decoration: none; - font-size: 0; - } - } - } + &__logo a { + text-decoration: none; + font-weight: 600; + font-size: var(--font-size-lg); + color: var(--font-color); + &:hover { + text-decoration: underline; + text-decoration-thickness: 2px; + text-underline-offset: 5px; + } + } + &__nav { + display: flex; + align-items: center; + & ul { + display: flex; + list-style: none; + column-gap: 20px; + margin: 0; + padding: 0; + margin-right: 35px; + & li a { + display: inline-block; + font-weight: 500; + color: var(--font-color); + text-decoration: none; + text-transform: lowercase; + &:hover, + &.active { + color: var(--color-blue-500); + text-decoration: underline; + text-decoration-thickness: 2px; + text-underline-offset: 4px; + } + } + } + &-contacts { + display: flex; + align-items: center; + column-gap: 10px; + margin-right: 40px; + & a { + text-decoration: none; + font-size: 0; + &:hover { + opacity: var(--opacity-hover); + } + } + } + } + &__button { + cursor: pointer; + width: 30px; + height: 21px; + position: relative; + transform: rotate(0deg); + background: none; + border: none; + &:hover { + border: none; + opacity: var(--opacity-hover); + } + & span { + pointer-events: none; + display: block; + position: absolute; + height: 3px; + width: 100%; + background: var(--color-black); + border-radius: 7px; + opacity: 1; + left: 0; + } + & span:nth-child(1) { + top: 2px; + transform-origin: left center; + } + & span:nth-child(2) { + top: 9px; + transform-origin: left center; + } + & span:nth-child(3) { + top: 16px; + transform-origin: left center; + } + &[aria-pressed='true'] { + & span:nth-child(1) { + transform: rotate(45deg); + top: -1px; + left: 5px; + } + & span:nth-child(2) { + display: none; + } + & span:nth-child(3) { + transform: rotate(-45deg); + top: 20px; + left: 5px; + } + } + } +} + +@media screen and (max-width: 768px) { + .header { + &__nav { + display: none; + } + } + + body[data-is-mobile-open='true'] { + & .header { + background-color: var(--color-white); + position: fixed; + right: 0; + left: 0; + top: 0; + bottom: 0; + height: 100%; + z-index: 9999; + & .container { + flex-direction: column; + row-gap: 2.5rem; + } + &__nav { + display: block; + &-links { + display: block; + text-align: center; + margin: 0; + & li { + margin-bottom: 1.2rem; + & a { + font-size: var(--font-size-lg); + } + } + } + &-contacts { + margin-right: 0; + margin-top: 2rem; + justify-content: center; + } + } + &__button { + position: absolute; + right: var(--content-padding); + } + & .theme-switcher { + display: block; + position: absolute; + bottom: 45px; + right: var(--content-padding); + & svg { + width: 36px; + height: 36px; + } + } + } + } } diff --git a/src/components/Header/NavToggle/NavToggle.scss b/src/components/Header/NavToggle/NavToggle.scss new file mode 100644 index 0000000..a708442 --- /dev/null +++ b/src/components/Header/NavToggle/NavToggle.scss @@ -0,0 +1,5 @@ +@media screen and (min-width: 769px) { + #nav-toggle { + display: none; + } +} diff --git a/src/components/Header/NavToggle/NavToggle.tsx b/src/components/Header/NavToggle/NavToggle.tsx new file mode 100644 index 0000000..500d44c --- /dev/null +++ b/src/components/Header/NavToggle/NavToggle.tsx @@ -0,0 +1,27 @@ +import './NavToggle.scss'; +import { Component, createSignal, createEffect } from 'solid-js'; + +export const NavToggle: Component = () => { + const [isNavShown, setIsNavShown] = createSignal(false); + + const toggleNav = () => setIsNavShown(!isNavShown()); + + createEffect(() => { + const body = document.body; + + if (isNavShown()) { + body.setAttribute('data-is-mobile-open', 'true'); + return; + } + + body.removeAttribute('data-is-mobile-open'); + }); + + return ( + + ); +}; diff --git a/src/components/PageContent/Heading.tsx b/src/components/PageContent/Heading.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/PageContent/PageContent.tsx b/src/components/PageContent/PageContent.tsx deleted file mode 100644 index 740a34f..0000000 --- a/src/components/PageContent/PageContent.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { Component, JSX } from 'solid-js'; - -export type PageContentComposition = { - Heading?: Component; -}; - -export const PageContent: Component<{ children: JSX.Element }> & - PageContentComposition = (props) => { - return
{props.children}
; -}; diff --git a/src/components/PageHeading/PageHeading.tsx b/src/components/PageHeading/PageHeading.tsx index 0eff5ea..817a672 100644 --- a/src/components/PageHeading/PageHeading.tsx +++ b/src/components/PageHeading/PageHeading.tsx @@ -6,18 +6,15 @@ export type PageHeadingProps = { description?: string | undefined; }; -export const PageHeading: Component = ({ - heading, - description, -}) => { +export const PageHeading: Component = (props) => { return (

- {heading} + style={!props.description && 'margin-bottom: 2.5rem;'}> + {props.heading}

- {description &&

{description}

} + {props.description &&

{props.description}

}
); }; diff --git a/src/components/RecentArticles/RecentArticles.astro b/src/components/RecentArticles/RecentArticles.astro new file mode 100644 index 0000000..b7a3e57 --- /dev/null +++ b/src/components/RecentArticles/RecentArticles.astro @@ -0,0 +1,35 @@ +--- +import type { IArticle } from '@root/interfaces'; + +import './RecentArticles.scss'; +import { ArticleItem } from '@components/ArticleItem'; +import { sortArtcilesByDate } from '@utils/articles'; + +export interface Props { + articles: IArticle[]; + length?: number | undefined; +} + +const { articles, length = 5 } = Astro.props as Props; + +const recent = sortArtcilesByDate(articles); +--- + +
+
+
+

недавние публикации

+ смотреть все +
+
+ +
+ {recent.length !== 0 ? ( + recent.slice(0, length).map((article) => ) + ) : ( +
+

Пока что здесь ничего нет...

+
+ )} +
+
diff --git a/src/components/RecentArticles/RecentArticles.scss b/src/components/RecentArticles/RecentArticles.scss new file mode 100644 index 0000000..67b2079 --- /dev/null +++ b/src/components/RecentArticles/RecentArticles.scss @@ -0,0 +1,21 @@ +.recent { + &-heading { + display: flex; + align-items: center; + column-gap: 15px; + row-gap: 5px; + flex-wrap: wrap; + justify-content: space-between; + border-bottom: 1px solid var(--border-color); + padding-bottom: 10px; + + & h2 { + margin: 0; + } + } + + &-list { + margin-top: 10px; + max-width: calc(var(--content-width) + (var(--content-padding) * 2)); + } +} diff --git a/src/components/RecentArticles/index.ts b/src/components/RecentArticles/index.ts new file mode 100644 index 0000000..cc82098 --- /dev/null +++ b/src/components/RecentArticles/index.ts @@ -0,0 +1 @@ +export { default } from './RecentArticles.astro'; diff --git a/src/components/ThemeSwticher/ThemeSwitcher.astro b/src/components/ThemeSwticher/ThemeSwitcher.astro index 50b30c6..360fe7f 100644 --- a/src/components/ThemeSwticher/ThemeSwitcher.astro +++ b/src/components/ThemeSwticher/ThemeSwitcher.astro @@ -1,8 +1,8 @@ --- import './ThemeSwitcher.scss'; -// import { MoonIcon } from '@components/icons'; +import { Icon } from 'astro-icon' --- diff --git a/src/components/ThemeSwticher/ThemeSwitcher.scss b/src/components/ThemeSwticher/ThemeSwitcher.scss index f74bb2b..2838418 100644 --- a/src/components/ThemeSwticher/ThemeSwitcher.scss +++ b/src/components/ThemeSwticher/ThemeSwitcher.scss @@ -1,9 +1,13 @@ .theme-switcher { - background: none; - border: none; - display: flex; - align-items: center; - cursor: pointer; - padding: 0; - margin: 0; + background: none; + border: none; + display: flex; + align-items: center; + cursor: pointer; + padding: 0; + margin: 0; + &:hover { + opacity: var(--opacity-hover); + border: none; + } } diff --git a/src/config.ts b/src/config.ts index 8b8b670..4155733 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,11 +1,18 @@ export const SITE_METADATA = { - name: 'yarkov.tech', - author: 'Sergey Yarkov', - contacts: { - email: 'serzh.yarkov@gmail.com', - githubUrl: 'https://github.com/sergeyyarkov', - telegramUrl: 'https://t.me/sergeyyarkov', - }, - projects: [], - skills: [] + title: 'Sergey Yarkov', + name: 'yarkov.tech', + author: 'Sergey Yarkov', + contacts: { + email: 'serzh.yarkov@gmail.com', + githubUrl: 'https://github.com/sergeyyarkov', + telegramUrl: 'https://t.me/sergeyyarkov', + }, + nav: [ + { name: 'Статьи', url: '/articles' }, + { name: 'Проекты', url: '/projects' }, + { name: 'Обо мне', url: '/about' }, + { name: 'Контакты', url: '/contacts' }, + ], + projects: [], + skills: [], }; diff --git a/src/icons/chat.svg b/src/icons/chat.svg new file mode 100644 index 0000000..686b225 --- /dev/null +++ b/src/icons/chat.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/icons/chip.svg b/src/icons/chip.svg new file mode 100644 index 0000000..b237752 --- /dev/null +++ b/src/icons/chip.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/icons/link-out.svg b/src/icons/link-out.svg new file mode 100644 index 0000000..161f924 --- /dev/null +++ b/src/icons/link-out.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/moon.svg b/src/icons/moon.svg new file mode 100644 index 0000000..7caddb7 --- /dev/null +++ b/src/icons/moon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/round-school.svg b/src/icons/round-school.svg new file mode 100644 index 0000000..aee61f2 --- /dev/null +++ b/src/icons/round-school.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/round-shop-two.svg b/src/icons/round-shop-two.svg new file mode 100644 index 0000000..822c5df --- /dev/null +++ b/src/icons/round-shop-two.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/search.svg b/src/icons/search.svg new file mode 100644 index 0000000..14bd8e7 --- /dev/null +++ b/src/icons/search.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/sun.svg b/src/icons/sun.svg new file mode 100644 index 0000000..d5e5e9f --- /dev/null +++ b/src/icons/sun.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/triangle_filled.svg b/src/icons/triangle_filled.svg new file mode 100644 index 0000000..887be56 --- /dev/null +++ b/src/icons/triangle_filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts index e512b14..1367462 100644 --- a/src/interfaces/index.ts +++ b/src/interfaces/index.ts @@ -1,7 +1,6 @@ export interface IArticle { - title: string; - description: string; - author: string; - tags: Array; - published_at: number; + title: string; + author: string; + tags: Array; + published_at: number; } diff --git a/src/layouts/Page.astro b/src/layouts/Page.astro deleted file mode 100644 index 1a383c0..0000000 --- a/src/layouts/Page.astro +++ /dev/null @@ -1,30 +0,0 @@ ---- - import '@styles/global.scss'; - import Header from '@components/Header'; - import Footer from '@components/Footer'; - - export interface Props { - title?: string | undefined; - } - - const { title = 'Sergey Yarkov' } = Astro.props as Props; ---- - - - - - - - {title} - - - - -
-
- -
-
- - - \ No newline at end of file diff --git a/src/layouts/default.astro b/src/layouts/default.astro new file mode 100644 index 0000000..c70ef69 --- /dev/null +++ b/src/layouts/default.astro @@ -0,0 +1,24 @@ +--- +import type { Props as BaseHeadProps } from '@root/components/BaseHead.astro'; + +import '@styles/global.scss'; +import BaseHead from '@root/components/BaseHead.astro'; +import BaseLayout from '@components/BaseLayout'; +import { SITE_METADATA } from '@root/config'; + +export interface Props extends BaseHeadProps { + lang?: string | undefined; +} + +const { title = SITE_METADATA.title, description, lang = 'ru' } = Astro.props as Props; +--- + + + + + + + + + + diff --git a/src/pages/[article].astro b/src/pages/[article].astro index 4f7b513..f5e1639 100644 --- a/src/pages/[article].astro +++ b/src/pages/[article].astro @@ -1,173 +1,181 @@ --- - import Page from "@root/layouts/Page.astro"; - import { Markdown } from "astro/components"; +import '../styles/prism-one-light.css'; +import PageLayout from '@root/layouts/default.astro'; +import { Markdown } from 'astro/components'; - export function getStaticPaths() { - return [ - { params: { article: 'article' } }, - ] - } +export function getStaticPaths() { + return [{ params: { article: 'article' } }]; +} --- - -
-
-
- -
- - Опубликовал Sergey Yarkov -
-
-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit.

-
-
-
- Article Image -
-
-
-
- - ## Introduction + +
+
+
+ +
+ + Опубликовал Sergey Yarkov +
+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit.

+
+
+
+ Article Image +
+
+
+
+ + ## Introduction - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. - Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. - Maecenas eget condimentum velit, sit amet feugiat lectus. Class aptent taciti sociosqu ad litora torquent per - conubia nostra, per inceptos himenaeos. [Praesent auctor](#) purus luctus enim egestas, ac scelerisque ante pulvinar. - Donec ut rhoncus ex. Suspendisse ac rhoncus nisl, eu tempor urna. Curabitur vel bibendum lorem. Morbi convallis - convallis diam sit amet [lacinia](#). Aliquam in elementum + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. + Maecenas eget condimentum velit, sit amet feugiat lectus. Class aptent taciti sociosqu ad litora torquent per + conubia nostra, per inceptos himenaeos. [Praesent auctor](#) purus luctus enim egestas, ac scelerisque ante + pulvinar. + Donec ut rhoncus ex. Suspendisse ac rhoncus nisl, eu tempor urna. Curabitur vel bibendum lorem. Morbi convallis + convallis diam sit amet [lacinia](#). Aliquam in elementum - Curabitur tempor quis eros tempus lacinia. Nam bibendum pellentesque quam a convallis. Sed ut vulputate nisi. - Integer in felis sed leo vestibulum venenatis. Suspendisse quis arcu sem. Aenean feugiat ex eu vestibulum - vestibulum. Morbi a eleifend magna. Nam metus lacus, porttitor eu mauris a, blandit ultrices nibh. Mauris sit - amet magna non ligula vestibulum eleifend. Nulla varius volutpat turpis sed lacinia. Nam eget mi in purus - lobortis eleifend. Sed nec ante dictum sem condimentum ullamcorper quis venenatis nisi. Proin vitae facilisis - nisi, ac posuere leo. + Curabitur tempor quis eros tempus lacinia. Nam bibendum pellentesque quam a convallis. Sed ut vulputate nisi. + Integer in felis sed leo vestibulum venenatis. Suspendisse quis arcu sem. Aenean feugiat ex eu vestibulum + vestibulum. Morbi a eleifend magna. Nam metus lacus, porttitor eu mauris a, blandit ultrices nibh. Mauris sit + amet magna non ligula vestibulum eleifend. Nulla varius volutpat turpis sed lacinia. Nam eget mi in purus + lobortis eleifend. Sed nec ante dictum sem condimentum ullamcorper quis venenatis nisi. Proin vitae facilisis + nisi, ac posuere leo. - ### Another Heading + ### Another Heading - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. - Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. - - `Nam metus lacus`: porttitor eu mauris a, [blandit ultrices](#) nibh. - - `Class aptent`: taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. - - `Sed nec ante`: dictum sem condimentum [ullamcorper quis](#) venenatis nisi. + - `Nam metus lacus`: porttitor eu mauris a, [blandit ultrices](#) nibh. + - `Class aptent`: taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. + - `Sed nec ante`: dictum sem condimentum [ullamcorper quis](#) venenatis nisi. - ```typescript - import type { APIContext } from 'astro'; + ```typescript + import type { APIContext } from 'astro'; - export async function get({ params, request }: APIContext) { - return { - body: JSON.stringify({ - path: new URL(request.url).pathname - }) - }; - } - ``` + export async function get({ params, request }: APIContext) { + return { + body: JSON.stringify({ + path: new URL(request.url).pathname, + }), + }; + } + ``` - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. - Sed dignissim. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim. -
- test -
This is a test image!
-
+
+ test +
This is a test image!
+
-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. - Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. -

-

— Metus Nec

-
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis + tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed + risus. +

+

— Metus Nec

+
+ ## Conclusion - ## Conclusion - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. - Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. + +
+
+

Comments

+
+
+ - \ No newline at end of file + & div { + align-self: flex-end; + } + } + } + } + } + + diff --git a/src/pages/about.astro b/src/pages/about.astro index b716120..c8e3d6f 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -1,14 +1,14 @@ --- -import Page from '@layouts/Page.astro'; -import { Markdown } from 'astro/components'; -import { PageHeading } from '@root/components/PageHeading'; -import { Icon } from 'astro-icon' + import PageLayout from '@layouts/default.astro'; + import { Markdown } from 'astro/components'; + import { PageHeading } from '@root/components/PageHeading'; + import { Icon } from 'astro-icon' -// TODO: import content based on user ui language -import * as aboutContent from '../../content/about/ru/index.md'; + // TODO: import content based on user ui language + import * as aboutContent from '../../content/about/ru/index.md'; --- - +
@@ -152,16 +152,19 @@ import * as aboutContent from '../../content/about/ru/index.md'; column-gap: 40px; row-gap: 30px; margin-top: 5rem; + & .skills-list { & h3 { font-size: var(--font-size-md); color: var(--font-color-grayer); font-weight: 500; } + & ul { margin: 0; padding: 0; list-style: none; + & li { font-weight: 400; margin-bottom: 10px; @@ -174,14 +177,17 @@ import * as aboutContent from '../../content/about/ru/index.md'; } } } + @media screen and (max-width: 500px) { .about-skills { display: flex; flex-direction: column; + & .skills-list { & h3 { text-align: center; } + & ul { display: flex; flex-direction: column; @@ -191,4 +197,4 @@ import * as aboutContent from '../../content/about/ru/index.md'; } } - + \ No newline at end of file diff --git a/src/pages/articles.astro b/src/pages/articles.astro index 041b697..6430f36 100644 --- a/src/pages/articles.astro +++ b/src/pages/articles.astro @@ -1,19 +1,15 @@ --- -import Page from '@layouts/Page.astro'; -import { ArticlesList } from '@components/ArticlesList'; -import { IArticle } from '@root/interfaces'; -import * as utils from '@utils/index'; + import PageLayout from '@layouts/default.astro'; + import { ArticlesList } from '@components/ArticlesList'; + import { IArticle } from '@root/interfaces'; + import * as utils from '@utils/index'; -const articles = await Astro.glob('../../content/articles/**/*.md'); -const tags = new Set( - articles.map((article) => article.frontmatter.tags).flat() -); + const articles = await Astro.glob('../../content/articles/**/*.md'); + const tags = new Set( + articles.map((article) => article.frontmatter.tags).flat() + ); --- - - - + + + \ No newline at end of file diff --git a/src/pages/contacts.astro b/src/pages/contacts.astro index 5afa614..67cca06 100644 --- a/src/pages/contacts.astro +++ b/src/pages/contacts.astro @@ -1,58 +1,78 @@ --- -import Page from '@layouts/Page.astro'; +import PageLayout from '@layouts/default.astro'; import { PageHeading } from '@root/components/PageHeading'; -import { Icon } from 'astro-icon' -import { SITE_METADATA } from '@root/config' +import { Icon } from 'astro-icon'; +import { SITE_METADATA } from '@root/config'; --- - -
- -
-
-
- - -
- - -
- -
-
-
-
- Email - Github - Telegram -
-
- - + +
+ +
+
+
+ + +
+ + +
+ +
+
+
+
+ Email + + + Github + + + Telegram + + +
+
+ + diff --git a/src/pages/index.astro b/src/pages/index.astro index a03cdb6..4db24c5 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,115 +1,90 @@ --- -import Page from '@layouts/Page.astro'; -import { IArticle } from '@root/interfaces'; -import { ArticleItem } from '@components/ArticleItem'; +import type { IArticle } from '@root/interfaces'; + +import PageLayout from '@layouts/default.astro'; import { Icon } from 'astro-icon'; import * as utils from '@utils/index'; +import RecentArticles from '@root/components/RecentArticles'; const data = await Astro.glob('../../content/articles/**/*.md'); -const recent = utils.sortArtcilesByDate(utils.transformArticles(data)); +const articles = utils.transformArticles(data); --- - -
-
-
-

Hello, I'am Sergey

-

Fullstack web-developer and freelancer

-
-

- Я занимаюсь разработкой веб-сайтов и веб-приложений разной сложности, а - также публикую различные статьи и туториалы на разные IT темы. -

-
- -
+ +
+
+
+

Hello, I'am Sergey

+

Fullstack web-developer & freelancer

+
+

+ Я занимаюсь разработкой веб-сайтов и веб-приложений разной сложности, а также публикую различные статьи и туториалы на разные IT темы. +

+
+ +
-
-
-
-

недавние публикации

- смотреть все -
-
-
- {recent.slice(0, 5).map((article) => )} -
-
+ - - + &__description { + font-size: var(--font-size-lg); + max-width: 570px; + line-height: 1.5; + } + } + + &-links { + display: flex; + align-items: center; + column-gap: 20px; + + &__link { + display: flex; + align-items: center; + column-gap: 5px; + + & a { + color: var(--font-color-gray); + } + } + } + } + + [astro-icon='information'] { + fill: var(--color-gray-600); + } + + [astro-icon='email_filled'] { + fill: var(--color-gray-600); + } + + diff --git a/src/pages/projects.astro b/src/pages/projects.astro index e0c79d1..5727895 100644 --- a/src/pages/projects.astro +++ b/src/pages/projects.astro @@ -1,36 +1,24 @@ --- -import Page from '@layouts/Page.astro'; -import { PageHeading } from '@root/components/PageHeading'; -import { SITE_METADATA } from '@root/config'; + import PageLayout from '@layouts/default.astro'; + import { PageHeading } from '@root/components/PageHeading'; + import { SITE_METADATA } from '@root/config'; + import { Icon } from 'astro-icon' --- - +
- +
- смотреть все + + смотреть все

- - - - + yarkov.tech

2022 @@ -42,38 +30,16 @@ import { SITE_METADATA } from '@root/config';

- Исходник - - + + Исходник +

- - - + devthread

2021 @@ -85,22 +51,12 @@ import { SITE_METADATA } from '@root/config';

- Статья - Исходник - - + + Статья + + + Исходник +
@@ -112,19 +68,23 @@ import { SITE_METADATA } from '@root/config'; text-align: right; margin-bottom: 10px; } + & .projects-list { display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); gap: 10px; + & .project-item { border: 1px solid var(--border-color); border-radius: var(--border-radius-lg); padding: 15px; + &__heading { display: flex; align-items: center; justify-content: space-between; margin-bottom: 10px; + & h2 { display: flex; align-items: center; @@ -134,14 +94,17 @@ import { SITE_METADATA } from '@root/config'; margin: 0; padding: 0; } + & span { font-size: var(--font-size-sm); color: var(--font-color-gray); } } + &__description { margin-bottom: 15px; } + &__links { display: flex; column-gap: 5px; @@ -150,4 +113,4 @@ import { SITE_METADATA } from '@root/config'; } } - + \ No newline at end of file diff --git a/src/styles/global.scss b/src/styles/global.scss index 3dec2f3..17c33e2 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -1,289 +1,290 @@ -@import url('https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,400;0,500;0,600;0,700;1,400&display=swap'); - :root { - /* Fonts */ - --font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Arial, - sans-serif, Apple Color Emoji, Segoe UI Emoji; - --font-family-base: 'Rubik', var(--font-fallback); - --font-color: var(--color-black); - --font-color-gray: var(--color-gray-500); - --font-color-grayer: var(--color-gray-700); - --font-size-xs: 0.75rem; - --font-size-sm: 0.875rem; - --font-size-md: 1rem; - --font-size-lg: 1.125rem; - --font-size-xl: 1.25rem; - --font-size-2xl: 1.5rem; - --font-size-3xl: 1.875rem; - --font-size-4xl: 2.25rem; - --font-size-5xl: 3rem; - --font-size-6xl: 3.75rem; - --font-size-7xl: 4.5rem; - --font-size-8xl: 6rem; - --font-size-9xl: 8rem; + /* Fonts */ + --font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji; + --font-family-base: 'Rubik', var(--font-fallback); + --font-color: var(--color-black); + --font-color-gray: var(--color-gray-500); + --font-color-grayer: var(--color-gray-700); + --font-size-xs: 0.75rem; + --font-size-sm: 0.875rem; + --font-size-md: 1rem; + --font-size-lg: 1.125rem; + --font-size-xl: 1.25rem; + --font-size-2xl: 1.5rem; + --font-size-3xl: 1.875rem; + --font-size-4xl: 2.25rem; + --font-size-5xl: 3rem; + --font-size-6xl: 3.75rem; + --font-size-7xl: 4.5rem; + --font-size-8xl: 6rem; + --font-size-9xl: 8rem; - /* Line heights */ - --line-height-normal: 'normal'; - --line-height-none: 1; - --line-height-shorter: 1.25; - --line-height-short: 1.375; - --line-height-base: 1.5; - --line-height-tall: 1.625; + /* Line heights */ + --line-height-normal: 'normal'; + --line-height-none: 1; + --line-height-shorter: 1.25; + --line-height-short: 1.375; + --line-height-base: 1.5; + --line-height-tall: 1.625; - /* Colors */ - --color-white: #ffffff; - --color-black: #010409; + /* Colors */ + --color-white: #ffffff; + --color-black: #010409; - --color-blue-50: #cae8ff; - --color-blue-100: #a5d6ff; - --color-blue-200: #79c0ff; - --color-blue-300: #58a6ff; - --color-blue-400: #388bfd; - --color-blue-500: #1f6feb; - --color-blue-600: #1158c7; - --color-blue-700: #0d419d; - --color-blue-800: #0c2d6b; - --color-blue-900: #051d4d; + --color-blue-50: #cae8ff; + --color-blue-100: #a5d6ff; + --color-blue-200: #79c0ff; + --color-blue-300: #58a6ff; + --color-blue-400: #388bfd; + --color-blue-500: #1f6feb; + --color-blue-600: #1158c7; + --color-blue-700: #0d419d; + --color-blue-800: #0c2d6b; + --color-blue-900: #051d4d; - --color-gray-50: #f0f6fc; - --color-gray-100: #c9d1d9; - --color-gray-200: #b1bac4; - --color-gray-300: #8b949e; - --color-gray-400: #6e7681; - --color-gray-500: #484f58; - --color-gray-600: #30363d; - --color-gray-700: #21262d; - --color-gray-800: #161b22; - --color-gray-900: #0d1117; + --color-gray-50: #f0f6fc; + --color-gray-100: #c9d1d9; + --color-gray-200: #b1bac4; + --color-gray-300: #8b949e; + --color-gray-400: #6e7681; + --color-gray-500: #484f58; + --color-gray-600: #30363d; + --color-gray-700: #21262d; + --color-gray-800: #161b22; + --color-gray-900: #0d1117; - --color-orange-50: #ffdfb6; - --color-orange-100: #ffc680; - --color-orange-200: #ffa657; - --color-orange-300: #f0883e; - --color-orange-400: #db6d28; - --color-orange-500: #bd561d; - --color-orange-600: #9b4215; - --color-orange-700: #762d0a; - --color-orange-800: #5a1e02; - --color-orange-900: #3d1300; + --color-orange-50: #ffdfb6; + --color-orange-100: #ffc680; + --color-orange-200: #ffa657; + --color-orange-300: #f0883e; + --color-orange-400: #db6d28; + --color-orange-500: #bd561d; + --color-orange-600: #9b4215; + --color-orange-700: #762d0a; + --color-orange-800: #5a1e02; + --color-orange-900: #3d1300; - --color-yellow-50: #f8e3a1; - --color-yellow-100: #f2cc60; - --color-yellow-200: #e3b341; - --color-yellow-300: #d29922; - --color-yellow-400: #bb8009; - --color-yellow-500: #9e6a03; - --color-yellow-600: #845306; - --color-yellow-700: #693e00; - --color-yellow-800: #4b2900; - --color-yellow-900: #341a00; + --color-yellow-50: #f8e3a1; + --color-yellow-100: #f2cc60; + --color-yellow-200: #e3b341; + --color-yellow-300: #d29922; + --color-yellow-400: #bb8009; + --color-yellow-500: #9e6a03; + --color-yellow-600: #845306; + --color-yellow-700: #693e00; + --color-yellow-800: #4b2900; + --color-yellow-900: #341a00; - --background-color-hover: var(--color-gray-50); + --background-color-hover: var(--color-gray-50); - /* Border */ - --border-color: var(--color-gray-100); - --border-color-hover: var(--color-gray-400); - --border-radius-md: 3px; - --border-radius-lg: 5px; + /* Border */ + --border-color: var(--color-gray-100); + --border-color-hover: var(--color-gray-400); + --border-radius-md: 3px; + --border-radius-lg: 5px; - /* Sizes */ - --content-width: 760px; - --content-padding: 15px; + /* Sizes */ + --content-width: 760px; + --content-padding: 15px; - /* Elements */ - --background-body-color: var(--color-white); - --background-header-color: var(--color-white); - --background-scrollbar-track-color: #EFF1F5; - --background-scrollbar-thumb-color: var(--color-gray-100); - --background-inline-code: rgba(0,0,0,0.05); + /* Elements */ + --background-body-color: var(--color-white); + --background-header-color: var(--color-white); + --background-scrollbar-track-color: #eff1f5; + --background-scrollbar-thumb-color: var(--color-gray-100); + --background-inline-code: rgba(0, 0, 0, 0.05); + + --opacity-hover: 0.7; } /* Text selection */ ::selection { - background: var(--color-yellow-100); - color: var(--color-black); + background: var(--color-yellow-100); + color: var(--color-black); } - /* Scrollbar */ ::-webkit-scrollbar { - width: 10px; - height: 10px; + width: 10px; + height: 10px; } ::-webkit-scrollbar-track { - background: var(--background-scrollbar-track-color); + background: var(--background-scrollbar-track-color); } ::-webkit-scrollbar-thumb { - background: var(--background-scrollbar-thumb-color) + background: var(--background-scrollbar-thumb-color); } - html, body { - box-sizing: border-box; - display: flex; - flex-direction: column; - height: 100%; + box-sizing: border-box; + display: flex; + flex-direction: column; + min-height: 100vh; } -*, *:before, *:after { - box-sizing: inherit; +body[data-is-mobile-open='true'] { + overflow-y: hidden; +} + +*, +*:before, +*:after { + box-sizing: inherit; } html { - font-size: 16px; - font-weight: normal; - font-kerning: normal; - font-family: var(--font-family-base); + font-size: 16px; + font-weight: normal; + font-kerning: normal; + font-family: var(--font-family-base); } body { - margin: 0; - padding: 0; - color: var(--font-color); - background-color: var(--background-body-color); -} - - -.site-content { - flex: 1 0 auto; - width: 100%; - margin-top: 5rem; + margin: 0; + padding: 0; + color: var(--font-color); + background-color: var(--background-body-color); } .container { - max-width: var(--content-width); - margin: 0 auto; - padding: 0 var(--content-padding); + max-width: var(--content-width); + margin: 0 auto; + padding: 0 var(--content-padding); } .list-links { - display: flex; - flex-wrap: wrap; - gap: 5px; - margin: 0; - padding: 0; - list-style: none; + display: flex; + flex-wrap: wrap; + gap: 5px; + margin: 0; + padding: 0; + list-style: none; } /* Buttons */ .btn-link { - cursor: pointer; - display: inline-flex; - align-items: center; - column-gap: 5px; - padding: 3px 10px; - border-radius: var(--border-radius-md); - border: 1px solid var(--border-color); - text-decoration: none; - color: var(--font-color); - font-size: var(--font-size-sm); - font-weight: 400; - &:hover { - text-decoration: none; - color: inherit; - border-color: var(--border-color-hover); - } + cursor: pointer; + display: inline-flex; + align-items: center; + column-gap: 5px; + padding: 3px 10px; + border-radius: var(--border-radius-md); + border: 1px solid var(--border-color); + text-decoration: none; + color: var(--font-color); + font-size: var(--font-size-sm); + font-weight: 400; + &:hover { + text-decoration: none; + color: inherit; + border-color: var(--border-color-hover); + } } .article-content { - & p, - & em, - & q { - line-height: var(--line-height-base); - font-size: var(--font-size-lg); - } + & p, + & em, + & q { + line-height: var(--line-height-base); + font-size: var(--font-size-lg); + } - & ul { - padding-left: 1.5rem; - line-height: var(--line-height-base); - margin-bottom: 1.5rem; - margin-top: 0; - & li { - font-size: var(--font-size-lg); - line-height: var(--line-height-base); - margin-bottom: 0.5rem; - padding-left: 0.25rem; - } - } + & ul { + padding-left: 1.5rem; + line-height: var(--line-height-base); + margin-bottom: 1.5rem; + margin-top: 0; + & li { + font-size: var(--font-size-lg); + line-height: var(--line-height-base); + margin-bottom: 0.5rem; + padding-left: 0.25rem; + } + } - & q { - font-style: italic; - quotes: "«" "»"; - } + & q { + font-style: italic; + quotes: '«' '»'; + } - & h1, - & h2, - & h3, - & h4 { - margin-top: 3rem; - margin-bottom: 1rem; - padding-bottom: 0.35rem; - } + & h1, + & h2, + & h3, + & h4 { + margin-top: 3rem; + margin-bottom: 1rem; + padding-bottom: 0.35rem; + } - & h1:not(:first-child), - & h2:not(:first-child), - & h3:not(:first-child), - & h4:not(:first-child) { - margin-top: 3rem; - } + & h1:not(:first-child), + & h2:not(:first-child), + & h3:not(:first-child), + & h4:not(:first-child) { + margin-top: 3rem; + } - & h2 { - font-size: var(--font-size-3xl); - border-bottom: 1px solid var(--border-color); - } + & h2 { + font-size: var(--font-size-3xl); + border-bottom: 1px solid var(--border-color); + } - & h3 { - font-size: var(--font-size-2xl); - } + & h3 { + font-size: var(--font-size-2xl); + } - & a { - color: var(--color-blue-500); - text-underline-offset: 2.5px; - text-decoration-color: var(--color-blue-500); - font-weight: 500; - &:hover { - color: var(--color-blue-500); - text-decoration-thickness: 2px; - } - } + & h4 { + font-size: var(--font-size-xl); + } - & figure { - margin: 0 0 1em; - } + & a { + color: var(--color-blue-500); + text-underline-offset: 2.5px; + text-decoration-color: var(--color-blue-500); + font-weight: 500; + &:hover { + color: var(--color-blue-500); + text-decoration-thickness: 2px; + } + } - & figcaption { - font-size: 1em; - text-align: center; - margin: 0.7rem 0; - } + & figure { + margin: 0 0 1em; + } - & img { - display: block; - border-radius: var(--border-radius-md); - max-width: 100%; - margin: 0 auto; - } + & figcaption { + font-style: italic; + font-size: 1em; + text-align: center; + margin: 0.7rem 0; + } + + & img { + display: block; + border-radius: var(--border-radius-md); + max-width: 100%; + margin: 0 auto; + } } li::marker { - color: var(--color-blue-500); - font-size: 1.3rem; - line-height: var(--line-height-none); + color: var(--color-blue-500); + font-size: 1.3rem; + line-height: var(--line-height-none); } p { - margin-top: 0; - margin-bottom: 1.5rem; + margin-top: 0; + margin-bottom: 1.5rem; } hr { - background-color: var(--border-color); - margin: 40px 0; - border: none; - height: 1px; + background-color: var(--border-color); + margin: 40px 0; + border: none; + height: 1px; } h1, @@ -291,69 +292,70 @@ h2, h3, h4, h5 { - margin-top: 0; - margin-bottom: 1.5rem; + margin-top: 0; + margin-bottom: 1.5rem; } -input, textarea { - font-family: var(--font-family-base); - padding: 8px 15px; - border: 1px solid var(--border-color); - border-radius: var(--border-radius-md); - font-size: var(--font-size-sm); - width: 100%; - outline-color: var(--color-blue-500); - resize: vertical; +input, +textarea { + font-family: var(--font-family-base); + padding: 8px 15px; + border: 1px solid var(--border-color); + border-radius: var(--border-radius-md); + font-size: var(--font-size-sm); + width: 100%; + outline-color: var(--color-blue-500); + resize: vertical; } button { - cursor: pointer; - font-family: var(--font-family-base); - font-weight: 500; - font-size: var(--font-size-sm); - padding: 4px 15px; - border: 1px solid var(--border-color); - border-radius: var(--border-radius-md); - background: none; - &:hover { - border: 1px solid var(--border-color-hover); - } + cursor: pointer; + font-family: var(--font-family-base); + font-weight: 500; + font-size: var(--font-size-sm); + padding: 4px 15px; + border: 1px solid var(--border-color); + border-radius: var(--border-radius-md); + background: none; + &:hover { + border: 1px solid var(--border-color-hover); + } } textarea { - max-height: 500px; - min-height: 200px; + max-height: 500px; + min-height: 200px; } blockquote { - margin: 1.5rem 0; - font-style: italic; - border-left: 0.25rem solid var(--border-color); - padding-left: 1rem; + margin: 1.5rem 0; + font-style: italic; + border-left: 0.25rem solid var(--border-color); + padding-left: 1rem; } -:not(pre)>code { - -webkit-font-smoothing: subpixel-antialiased; - background: var(--background-inline-code); - border-radius: var(--border-radius-lg); - font-size: 1rem; - font-weight: 500; - padding: 0.2rem 0.3rem; +:not(pre) > code { + -webkit-font-smoothing: subpixel-antialiased; + background: var(--background-inline-code); + border-radius: var(--border-radius-lg); + font-size: 1rem; + font-weight: 500; + padding: 0.2rem 0.3rem; } pre { - font-size: var(--font-size-sm); - border-radius: var(--border-radius-md); + font-size: var(--font-size-sm); + border-radius: var(--border-radius-md); } a { - color: var(--color-blue-500); - font-weight: 500; - text-decoration: none; - &:hover { - text-decoration: underline; - color: var(--color-blue-500); - } + color: var(--color-blue-500); + font-weight: 500; + text-decoration: none; + &:hover { + text-decoration: underline; + color: var(--color-blue-500); + } } // pre[class*=language-]:before { @@ -371,9 +373,8 @@ a { // padding: 0.25rem 0.5rem; // } - // pre[class*=language-typescript]:before { // content: "ts"; // background: #007acc; // color: #eee; -// } \ No newline at end of file +// } diff --git a/public/styles/prism/prism-one-dark.css b/src/styles/prism-one-dark.css similarity index 100% rename from public/styles/prism/prism-one-dark.css rename to src/styles/prism-one-dark.css diff --git a/public/styles/prism/prism-one-light.css b/src/styles/prism-one-light.css similarity index 100% rename from public/styles/prism/prism-one-light.css rename to src/styles/prism-one-light.css diff --git a/src/utils/articles.ts b/src/utils/articles.ts index 13ae561..c0db657 100644 --- a/src/utils/articles.ts +++ b/src/utils/articles.ts @@ -1,36 +1,29 @@ import type { IArticle } from '@root/interfaces'; + import { MarkdownInstance } from 'astro'; -export const transformArticles = ( - articles: MarkdownInstance[] -): IArticle[] => articles.map((article) => ({ - title: article.frontmatter.title, - description: article.frontmatter.description, - author: article.frontmatter.author, - tags: article.frontmatter.tags, - published_at: article.frontmatter.published_at, - })) -; +export const transformArticles = (articles: MarkdownInstance[]): IArticle[] => + articles.map((article) => ({ + title: article.frontmatter.title, + author: article.frontmatter.author, + tags: article.frontmatter.tags, + published_at: article.frontmatter.published_at, + })); export const sortArtcilesByDate = (articles: IArticle[]): IArticle[] => { - return articles.sort( - (a, b) => - new Date(b.published_at).valueOf() - new Date(a.published_at).valueOf() - ); + return articles.sort((a, b) => new Date(b.published_at).valueOf() - new Date(a.published_at).valueOf()); }; -export const filterArticlesByYear = ( - articles: IArticle[] -): { [year: number]: IArticle[] } => { - const filtered = {}; +export const filterArticlesByYear = (articles: IArticle[]): { [year: number]: IArticle[] } => { + const filtered = {}; - for (const article of articles) { - const year = new Date(article.published_at).getFullYear(); + for (const article of articles) { + const year = new Date(article.published_at).getFullYear(); - if (!filtered[year]) filtered[year] = []; + if (!filtered[year]) filtered[year] = []; - filtered[year].push(article); - } + filtered[year].push(article); + } - return filtered; + return filtered; }; diff --git a/src/utils/date.ts b/src/utils/date.ts index 84e3fff..fcfd917 100644 --- a/src/utils/date.ts +++ b/src/utils/date.ts @@ -1,6 +1,6 @@ export const DateFormatter = new Intl.DateTimeFormat(undefined, { - timeZone: 'UTC', - month: 'short', - year: 'numeric', - day: 'numeric', + timeZone: 'UTC', + month: 'short', + year: 'numeric', + day: 'numeric', }); From 85e854cc71cd6427292d39d8e2ef94360f92ce65 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Tue, 19 Jul 2022 01:03:31 +0300 Subject: [PATCH 11/70] refactor: moved some elements into components --- .prettierrc.json | 2 +- README.md | 2 +- package.json | 58 ++--- .../ArticleContent/ArticleContent.astro | 5 + .../ArticleContent/ArticleContent.scss | 84 +++++++ src/components/ArticleContent/index.ts | 1 + src/components/ArticleItem/ArticleItem.scss | 3 +- src/components/ArticleItem/ArticleItem.tsx | 4 +- src/components/ArticlesList/ArticlesList.tsx | 166 +++++++------- src/components/BaseHead.astro | 2 +- src/components/BaseLayout/BaseLayout.scss | 6 + src/components/ContactForm/ContactForm.scss | 23 ++ src/components/ContactForm/ContactForm.tsx | 27 +++ src/components/ContactForm/index.ts | 1 + .../ContactsList/ContactsList.astro | 24 ++ src/components/ContactsList/ContactsList.scss | 11 + src/components/ContactsList/index.ts | 1 + src/components/Header/Header.scss | 11 +- src/components/Header/NavToggle/NavToggle.tsx | 2 +- src/components/PageHeading/PageHeading.astro | 17 ++ .../PageHeading/PageHeading.module.scss | 13 -- src/components/PageHeading/PageHeading.scss | 14 ++ src/components/PageHeading/PageHeading.tsx | 20 -- src/components/PageHeading/index.ts | 2 +- src/components/ProjectItem/ProjectItem.astro | 45 ++++ src/components/ProjectItem/ProjectItem.scss | 36 +++ src/components/ProjectItem/index.ts | 1 + .../ProjectsList/ProjectsList.astro | 7 + src/components/ProjectsList/ProjectsList.scss | 5 + src/components/ProjectsList/index.ts | 1 + .../RecentArticles/RecentArticles.astro | 4 +- src/components/SkillsBlock/SkillsBlock.astro | 30 +++ src/components/SkillsBlock/SkillsBlock.scss | 36 +++ src/components/SkillsBlock/index.ts | 1 + src/components/SkillsList/SkillsList.astro | 5 + src/components/SkillsList/SkillsList.scss | 14 ++ src/components/SkillsList/index.ts | 1 + src/config.ts | 75 +++++- src/interfaces/index.ts | 6 - src/pages/[article].astro | 9 +- src/pages/about.astro | 216 ++---------------- src/pages/articles.astro | 18 +- src/pages/contacts.astro | 76 +----- src/pages/index.astro | 11 +- src/pages/projects.astro | 126 ++-------- src/styles/global.scss | 87 +------ src/types/index.ts | 21 ++ src/utils/articles.ts | 8 +- tsconfig.json | 40 ++-- 49 files changed, 701 insertions(+), 677 deletions(-) create mode 100644 src/components/ArticleContent/ArticleContent.astro create mode 100644 src/components/ArticleContent/ArticleContent.scss create mode 100644 src/components/ArticleContent/index.ts create mode 100644 src/components/ContactForm/ContactForm.scss create mode 100644 src/components/ContactForm/ContactForm.tsx create mode 100644 src/components/ContactForm/index.ts create mode 100644 src/components/ContactsList/ContactsList.astro create mode 100644 src/components/ContactsList/ContactsList.scss create mode 100644 src/components/ContactsList/index.ts create mode 100644 src/components/PageHeading/PageHeading.astro delete mode 100644 src/components/PageHeading/PageHeading.module.scss create mode 100644 src/components/PageHeading/PageHeading.scss delete mode 100644 src/components/PageHeading/PageHeading.tsx create mode 100644 src/components/ProjectItem/ProjectItem.astro create mode 100644 src/components/ProjectItem/ProjectItem.scss create mode 100644 src/components/ProjectItem/index.ts create mode 100644 src/components/ProjectsList/ProjectsList.astro create mode 100644 src/components/ProjectsList/ProjectsList.scss create mode 100644 src/components/ProjectsList/index.ts create mode 100644 src/components/SkillsBlock/SkillsBlock.astro create mode 100644 src/components/SkillsBlock/SkillsBlock.scss create mode 100644 src/components/SkillsBlock/index.ts create mode 100644 src/components/SkillsList/SkillsList.astro create mode 100644 src/components/SkillsList/SkillsList.scss create mode 100644 src/components/SkillsList/index.ts delete mode 100644 src/interfaces/index.ts create mode 100644 src/types/index.ts diff --git a/.prettierrc.json b/.prettierrc.json index 580d103..3fbbbbb 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,5 +1,5 @@ { - "printWidth": 150, + "printWidth": 100, "semi": true, "singleQuote": true, "tabWidth": 2, diff --git a/README.md b/README.md index 71378f6..07f5f9b 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Personal website created with Astro. ### Todo - [x] HTML layout -- [ ] Adaptive & Responsive layout +- [x] Adaptive & Responsive layout - [ ] Dark/Light Theme - [ ] Multilang web-site - [ ] Form handling via Netlify Forms diff --git a/package.json b/package.json index 7cff3d7..d0d9f3a 100644 --- a/package.json +++ b/package.json @@ -1,31 +1,31 @@ { - "name": "yarkov.tech", - "version": "0.0.1", - "private": true, - "description": "Personal website created with Astro.", - "author": { - "name": "Sergey Yarkov", - "email": "serzh.yarkov@gmail.com", - "url": "https://yarkov.tech" - }, - "license": "MIT", - "scripts": { - "dev": "astro dev", - "start": "astro dev", - "build": "astro build", - "preview": "astro preview" - }, - "devDependencies": { - "@astrojs/solid-js": "^0.2.1", - "@typescript-eslint/eslint-plugin": "^5.30.6", - "@typescript-eslint/parser": "^5.30.6", - "astro": "^1.0.0-beta.63", - "astro-icon": "^0.7.1", - "eslint": "^8.19.0", - "eslint-plugin-solid": "^0.7.1", - "prettier": "^2.7.1", - "prettier-plugin-astro": "^0.1.1", - "sass": "^1.53.0", - "solid-js": "^1.4.7" - } + "name": "yarkov.tech", + "version": "0.0.1", + "private": true, + "description": "Personal website created with Astro.", + "author": { + "name": "Sergey Yarkov", + "email": "serzh.yarkov@gmail.com", + "url": "https://yarkov.tech" + }, + "license": "MIT", + "scripts": { + "dev": "astro dev --host", + "start": "astro dev", + "build": "astro build", + "preview": "astro preview --host" + }, + "devDependencies": { + "@astrojs/solid-js": "^0.2.1", + "@typescript-eslint/eslint-plugin": "^5.30.6", + "@typescript-eslint/parser": "^5.30.6", + "astro": "^1.0.0-beta.63", + "astro-icon": "^0.7.1", + "eslint": "^8.19.0", + "eslint-plugin-solid": "^0.7.1", + "prettier": "^2.7.1", + "prettier-plugin-astro": "^0.1.1", + "sass": "^1.53.0", + "solid-js": "^1.4.7" + } } diff --git a/src/components/ArticleContent/ArticleContent.astro b/src/components/ArticleContent/ArticleContent.astro new file mode 100644 index 0000000..45849c7 --- /dev/null +++ b/src/components/ArticleContent/ArticleContent.astro @@ -0,0 +1,5 @@ +--- +import './ArticleContent.scss'; +--- + +
diff --git a/src/components/ArticleContent/ArticleContent.scss b/src/components/ArticleContent/ArticleContent.scss new file mode 100644 index 0000000..9489645 --- /dev/null +++ b/src/components/ArticleContent/ArticleContent.scss @@ -0,0 +1,84 @@ +.article-content { + & p, + & em, + & q { + line-height: var(--line-height-base); + font-size: var(--font-size-lg); + } + + & ul { + padding-left: 1.5rem; + line-height: var(--line-height-base); + margin-bottom: 1.5rem; + margin-top: 0; + & li { + font-size: var(--font-size-lg); + line-height: var(--line-height-base); + margin-bottom: 0.5rem; + padding-left: 0.25rem; + } + } + + & q { + font-style: italic; + quotes: '«' '»'; + } + + & h1, + & h2, + & h3, + & h4 { + margin-top: 3rem; + margin-bottom: 1rem; + padding-bottom: 0.35rem; + } + + & h1:not(:first-child), + & h2:not(:first-child), + & h3:not(:first-child), + & h4:not(:first-child) { + margin-top: 3rem; + } + + & h2 { + font-size: var(--font-size-2xl); + border-bottom: 1px solid var(--border-color); + } + + & h3 { + font-size: var(--font-size-xl); + } + + & h4 { + font-size: var(--font-size-lg); + } + + & a { + color: var(--color-blue-500); + text-underline-offset: 2.5px; + text-decoration-color: var(--color-blue-500); + font-weight: 500; + &:hover { + color: var(--color-blue-500); + text-decoration-thickness: 2px; + } + } + + & figure { + margin: 0 0 1em; + } + + & figcaption { + font-style: italic; + font-size: 1em; + text-align: center; + margin: 0.7rem 0; + } + + & img { + display: block; + border-radius: var(--border-radius-md); + max-width: 100%; + margin: 0 auto; + } +} diff --git a/src/components/ArticleContent/index.ts b/src/components/ArticleContent/index.ts new file mode 100644 index 0000000..04e3c3b --- /dev/null +++ b/src/components/ArticleContent/index.ts @@ -0,0 +1 @@ +export { default } from './ArticleContent.astro'; diff --git a/src/components/ArticleItem/ArticleItem.scss b/src/components/ArticleItem/ArticleItem.scss index 45914d4..61a2b57 100644 --- a/src/components/ArticleItem/ArticleItem.scss +++ b/src/components/ArticleItem/ArticleItem.scss @@ -6,7 +6,6 @@ justify-content: space-between; align-items: center; column-gap: 10px; - row-gap: 5px; color: var(--font-color); padding: 8px 15px; & h3 { @@ -22,6 +21,7 @@ margin: 0; text-align: right; white-space: nowrap; + margin-bottom: 10px; } &:hover { text-decoration: none; @@ -34,6 +34,7 @@ @media screen and (max-width: 560px) { .article-item { + margin-bottom: 10px; & a { flex-direction: column-reverse; align-items: flex-start; diff --git a/src/components/ArticleItem/ArticleItem.tsx b/src/components/ArticleItem/ArticleItem.tsx index 0f29193..b23fe7c 100644 --- a/src/components/ArticleItem/ArticleItem.tsx +++ b/src/components/ArticleItem/ArticleItem.tsx @@ -1,11 +1,11 @@ -import type { IArticle } from '@root/interfaces'; +import type { ArticleType } from '@root/types'; import './ArticleItem.scss'; import { Component } from 'solid-js'; import { DateFormatter } from '@utils/date'; export type ArticleItemProps = { - data: IArticle; + data: ArticleType; }; export const ArticleItem: Component = (props) => { diff --git a/src/components/ArticlesList/ArticlesList.tsx b/src/components/ArticlesList/ArticlesList.tsx index ec11219..94a486b 100644 --- a/src/components/ArticlesList/ArticlesList.tsx +++ b/src/components/ArticlesList/ArticlesList.tsx @@ -1,97 +1,85 @@ -import "./ArticlesList.scss"; -import { Component, createSignal, Show, For } from "solid-js"; -import { PageHeading } from "@components/PageHeading"; -import type { IArticle } from "@root/interfaces"; -import * as utils from "@root/utils/articles"; -import { ArticleItem } from "../ArticleItem"; +import './ArticlesList.scss'; +import { Component, createSignal, Show, For } from 'solid-js'; +import type { ArticleType } from '@root/types'; + +import PageHeading from '@components/PageHeading'; +import * as utils from '@root/utils/articles'; +import { ArticleItem } from '../ArticleItem'; export type ArticlesListProps = { - data: IArticle[]; - tags: string[]; + data: ArticleType[]; + tags: string[]; }; export const ArticlesList: Component = (props) => { - const [articles, setArticles] = createSignal(utils.filterArticlesByYear(props.data)); - const [selectedTags, setSelectedTags] = createSignal([]); - const [filteredArticles, setFilteredArticles] = createSignal([]); + const [articles, setArticles] = createSignal(utils.filterArticlesByYear(props.data)); + const [selectedTags, setSelectedTags] = createSignal([]); + const [filteredArticles, setFilteredArticles] = createSignal([]); - return ( -
- + -
- - - - - {props.data.length} -
-
- -
-
- - {Object.keys(articles()) - .map(Number) - .sort((a, b) => b - a) - .map((year) => ( -
-

{year}

- {utils.sortArtcilesByDate(articles()[year]).map((article) => ( - - ))} -
- ))} - - - {utils.sortArtcilesByDate(filteredArticles()).map((article) => ( - - ))} - -
-
- ); + /> +
+ + + + + {props.data.length} +
+
+ +
+
+ + {Object.keys(articles()) + .map(Number) + .sort((a, b) => b - a) + .map((year) => ( +
+

{year}

+ {utils.sortArtcilesByDate(articles()[year]).map((article) => ( + + ))} +
+ ))} + + + {utils.sortArtcilesByDate(filteredArticles()).map((article) => ( + + ))} + +
+
+ ); }; diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index 4f1ba5b..bc28aed 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -19,4 +19,4 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props; {title} -{description && } + diff --git a/src/components/BaseLayout/BaseLayout.scss b/src/components/BaseLayout/BaseLayout.scss index 29682b5..d236099 100644 --- a/src/components/BaseLayout/BaseLayout.scss +++ b/src/components/BaseLayout/BaseLayout.scss @@ -3,3 +3,9 @@ width: 100%; margin-top: 5rem; } + +@media screen and (max-width: 768px) { + .site-content { + margin-top: 3rem; + } +} diff --git a/src/components/ContactForm/ContactForm.scss b/src/components/ContactForm/ContactForm.scss new file mode 100644 index 0000000..48a4b3b --- /dev/null +++ b/src/components/ContactForm/ContactForm.scss @@ -0,0 +1,23 @@ +.contact-form { + display: flex; + flex-direction: column; + row-gap: 7px; + margin-bottom: 3.125rem; + + & div:first-of-type { + display: flex; + column-gap: 10px; + } + + & div:last-of-type { + text-align: center; + margin-top: 15px; + } +} + +@media screen and (max-width: 560px) { + .contact-form div:first-of-type { + flex-direction: column; + row-gap: 7px; + } +} diff --git a/src/components/ContactForm/ContactForm.tsx b/src/components/ContactForm/ContactForm.tsx new file mode 100644 index 0000000..2e0f0e5 --- /dev/null +++ b/src/components/ContactForm/ContactForm.tsx @@ -0,0 +1,27 @@ +import type { Component } from 'solid-js'; +import './ContactForm.scss'; + +type InputFieldsType = { + name: string; + email: string; + subject: string; + message: string; +}; + +const ContactForm: Component = () => { + return ( +
+
+ + +
+ + -
- -
-
-
-
- Email - - - Github - - - Telegram - - -
+ +
- diff --git a/src/pages/index.astro b/src/pages/index.astro index 4db24c5..a48106a 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,12 +1,12 @@ --- -import type { IArticle } from '@root/interfaces'; +import type { ArticleType } from '@root/types'; -import PageLayout from '@layouts/default.astro'; import { Icon } from 'astro-icon'; import * as utils from '@utils/index'; -import RecentArticles from '@root/components/RecentArticles'; +import PageLayout from '@layouts/default.astro'; +import RecentArticles from '@components/RecentArticles'; -const data = await Astro.glob('../../content/articles/**/*.md'); +const data = await Astro.glob('../../content/articles/**/*.md'); const articles = utils.transformArticles(data); --- @@ -18,7 +18,8 @@ const articles = utils.transformArticles(data);

Fullstack web-developer & freelancer

- Я занимаюсь разработкой веб-сайтов и веб-приложений разной сложности, а также публикую различные статьи и туториалы на разные IT темы. + Я занимаюсь разработкой веб-сайтов и веб-приложений разной сложности, а также публикую + различные статьи и туториалы на разные IT темы.

diff --git a/src/components/RecentArticles/RecentArticles.astro b/src/components/RecentArticles/RecentArticles.astro index 6cb37a8..f495d37 100644 --- a/src/components/RecentArticles/RecentArticles.astro +++ b/src/components/RecentArticles/RecentArticles.astro @@ -16,14 +16,12 @@ const recent = sortArtcilesByDate(articles); ---
-
-
-

недавние публикации

- смотреть все -
+
+

недавние публикации

+ смотреть все
-
+
{recent.length !== 0 ? ( recent.slice(0, length).map((article) => ) ) : ( diff --git a/src/components/Splash/Splash.astro b/src/components/Splash/Splash.astro index c0bf7a7..4eab517 100644 --- a/src/components/Splash/Splash.astro +++ b/src/components/Splash/Splash.astro @@ -2,6 +2,6 @@ import './Splash.scss'; --- -
+
diff --git a/src/layouts/article.astro b/src/layouts/article.astro new file mode 100644 index 0000000..f923464 --- /dev/null +++ b/src/layouts/article.astro @@ -0,0 +1,34 @@ +--- +import type { Props as BaseHeadProps } from '@root/components/BaseHead.astro'; +import type { ArticleType } from '@root/types'; + +import '@styles/global.scss'; +import BaseHead from '@root/components/BaseHead.astro'; +import BaseLayout from '@components/BaseLayout'; +import { DateFormatter } from '@root/utils'; +import ArticleContent from '@root/components/ArticleContent'; +import ArticlePost from '@root/components/ArticlePost'; + +export interface Props extends BaseHeadProps { + lang?: string | undefined; + content: ArticleType; +} + +const { lang = 'ru', content } = Astro.props as Props; +--- + + + + + + + +
+ + + + + +
+ + diff --git a/src/layouts/default.astro b/src/layouts/default.astro index c70ef69..08a3d64 100644 --- a/src/layouts/default.astro +++ b/src/layouts/default.astro @@ -5,20 +5,25 @@ import '@styles/global.scss'; import BaseHead from '@root/components/BaseHead.astro'; import BaseLayout from '@components/BaseLayout'; import { SITE_METADATA } from '@root/config'; +import PageHeading from '@root/components/PageHeading'; export interface Props extends BaseHeadProps { lang?: string | undefined; + showPageHeading?: boolean | undefined; } -const { title = SITE_METADATA.title, description, lang = 'ru' } = Astro.props as Props; +const { title, description, lang = 'ru', showPageHeading = true } = Astro.props as Props; --- - + - +
+ {showPageHeading && } + +
diff --git a/src/pages/[article].astro b/src/pages/[article].astro index 2df4cb1..28e79f8 100644 --- a/src/pages/[article].astro +++ b/src/pages/[article].astro @@ -1,182 +1,80 @@ --- import '@root/styles/prism-one-light.css'; -import PageLayout from '@root/layouts/default.astro'; +import ArticleLayout from '@root/layouts/article.astro'; import { Markdown } from 'astro/components'; -import ArticleContent from '@components/ArticleContent'; export function getStaticPaths() { return [{ params: { article: 'article' } }]; } --- - -
-
-
- -
- - Опубликовал Sergey Yarkov -
-
-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit.

-
-
-
- Article Image -
-
-
- - - ## Introduction + + + ## Introduction - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. - Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. - Maecenas eget condimentum velit, sit amet feugiat lectus. Class aptent taciti sociosqu ad litora torquent per - conubia nostra, per inceptos himenaeos. [Praesent auctor](#) purus luctus enim egestas, ac scelerisque ante - pulvinar. - Donec ut rhoncus ex. Suspendisse ac rhoncus nisl, eu tempor urna. Curabitur vel bibendum lorem. Morbi convallis - convallis diam sit amet [lacinia](#). Aliquam in elementum + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. + Maecenas eget condimentum velit, sit amet feugiat lectus. Class aptent taciti sociosqu ad litora torquent per + conubia nostra, per inceptos himenaeos. [Praesent auctor](#) purus luctus enim egestas, ac scelerisque ante + pulvinar. + Donec ut rhoncus ex. Suspendisse ac rhoncus nisl, eu tempor urna. Curabitur vel bibendum lorem. Morbi convallis + convallis diam sit amet [lacinia](#). Aliquam in elementum - Curabitur tempor quis eros tempus lacinia. Nam bibendum pellentesque quam a convallis. Sed ut vulputate nisi. - Integer in felis sed leo vestibulum venenatis. Suspendisse quis arcu sem. Aenean feugiat ex eu vestibulum - vestibulum. Morbi a eleifend magna. Nam metus lacus, porttitor eu mauris a, blandit ultrices nibh. Mauris sit - amet magna non ligula vestibulum eleifend. Nulla varius volutpat turpis sed lacinia. Nam eget mi in purus - lobortis eleifend. Sed nec ante dictum sem condimentum ullamcorper quis venenatis nisi. Proin vitae facilisis - nisi, ac posuere leo. + Curabitur tempor quis eros tempus lacinia. Nam bibendum pellentesque quam a convallis. Sed ut vulputate nisi. + Integer in felis sed leo vestibulum venenatis. Suspendisse quis arcu sem. Aenean feugiat ex eu vestibulum + vestibulum. Morbi a eleifend magna. Nam metus lacus, porttitor eu mauris a, blandit ultrices nibh. Mauris sit + amet magna non ligula vestibulum eleifend. Nulla varius volutpat turpis sed lacinia. Nam eget mi in purus + lobortis eleifend. Sed nec ante dictum sem condimentum ullamcorper quis venenatis nisi. Proin vitae facilisis + nisi, ac posuere leo. - ### Another Heading + ### Another Heading - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. - Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. - - `Nam metus lacus`: porttitor eu mauris a, [blandit ultrices](#) nibh. - - `Class aptent`: taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. - - `Sed nec ante`: dictum sem condimentum [ullamcorper quis](#) venenatis nisi. + - `Nam metus lacus`: porttitor eu mauris a, [blandit ultrices](#) nibh. + - `Class aptent`: taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. + - `Sed nec ante`: dictum sem condimentum [ullamcorper quis](#) venenatis nisi. - ```typescript - import type { APIContext } from 'astro'; + ```typescript + import type { APIContext } from 'astro'; - export async function get({ params, request }: APIContext) { - return { - body: JSON.stringify({ - path: new URL(request.url).pathname, - }), - }; - } - ``` - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. - Sed dignissim. - -
- test -
This is a test image!
-
- -
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis - tellus. - Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed - risus. -

-

— Metus Nec

-
- - ## Conclusion - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. - Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. - - -
-

Comments

-
-
- - + ## Conclusion + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu turpis molestie, dictum est a, mattis tellus. + Sed dignissim, metus nec fringilla accumsan, risus sem sollicitudin lacus, ut interdum tellus elit sed risus. + + diff --git a/src/pages/about.astro b/src/pages/about.astro index a8a38c7..007e0d1 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -2,7 +2,6 @@ import { SITE_METADATA } from '@root/config'; import { Markdown } from 'astro/components'; import PageLayout from '@layouts/default.astro'; -import PageHeading from '@components/PageHeading'; import SkillsList from '@components/SkillsList'; import SkillsBlock from '@components/SkillsBlock'; @@ -13,9 +12,8 @@ import ArticleContent from '@components/ArticleContent'; const { skills } = SITE_METADATA; --- - -
- + +
diff --git a/src/pages/articles.astro b/src/pages/articles.astro index 2971767..479d6db 100644 --- a/src/pages/articles.astro +++ b/src/pages/articles.astro @@ -1,6 +1,5 @@ --- import PageLayout from '@layouts/default.astro'; -import { ArticlesList } from '@components/ArticlesList'; import { ArticleType } from '@root/types'; import * as utils from '@utils/index'; @@ -8,6 +7,9 @@ const articles = await Astro.glob('../../content/articles/**/*.md') const tags = new Set(articles.map((article) => article.frontmatter.tags).flat()); --- - + diff --git a/src/pages/contacts.astro b/src/pages/contacts.astro index 504b943..509d701 100644 --- a/src/pages/contacts.astro +++ b/src/pages/contacts.astro @@ -5,9 +5,8 @@ import ContactForm from '@components/ContactForm'; import ContactsList from '@components/ContactsList'; --- - -
- + +
diff --git a/src/pages/index.astro b/src/pages/index.astro index 6ba246d..9b474d6 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -10,7 +10,7 @@ const data = await Astro.glob('../../content/articles/**/*.md'); const articles = utils.transformArticles(data); --- - +
@@ -24,6 +24,5 @@ const articles = utils.transformArticles(data); написать мне - diff --git a/src/pages/projects.astro b/src/pages/projects.astro index 8bbe213..03f8ae5 100644 --- a/src/pages/projects.astro +++ b/src/pages/projects.astro @@ -1,16 +1,14 @@ --- import { SITE_METADATA } from '@root/config'; import PageLayout from '@layouts/default.astro'; -import PageHeading from '@root/components/PageHeading'; -import ProjectsList from '@root/components/ProjectsList'; -import ProjectItem from '@root/components/ProjectItem'; +import ProjectsList from '@components/ProjectsList'; +import ProjectItem from '@components/ProjectItem'; const { projects } = SITE_METADATA; --- - -
- + +
{projects.map((project) => )} diff --git a/src/types/index.ts b/src/types/index.ts index fdb8c38..aee6be5 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -2,7 +2,7 @@ export type ArticleType = { title: string; author: string; tags: Array; - published_at: number; + published_at: string; }; export type ProjectType = { From ef128816d9e1f05d1185c366845e65251a2a6533 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 20 Jul 2022 20:53:58 +0300 Subject: [PATCH 14/70] added content submodule --- .gitmodules | 3 +++ content | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 content diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f808c4c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "content"] + path = content + url = https://github.com/sergeyyarkov/content diff --git a/content b/content new file mode 160000 index 0000000..4129fab --- /dev/null +++ b/content @@ -0,0 +1 @@ +Subproject commit 4129fab6633a7d07a9c62507ef948f769709d028 From 135fb18956e7cad5488ccb10226404b46fd5b98e Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 20 Jul 2022 20:58:49 +0300 Subject: [PATCH 15/70] setup language --- .gitattributes | 1 + .gitignore | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dd1ee83 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.* linguist-language=astro \ No newline at end of file diff --git a/.gitignore b/.gitignore index 81f094d..d7e132f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,4 @@ pnpm-debug.log* .env.production # macOS-specific files -.DS_Store - -content \ No newline at end of file +.DS_Store \ No newline at end of file From bf6542bfd2174b4b4cfe3b9e7ca7994472b88993 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Fri, 22 Jul 2022 02:40:55 +0300 Subject: [PATCH 16/70] feat: search articles --- README.md | 3 +- astro.config.mjs | 20 +-- content | 2 +- src/components/ArticlesList/ArticlesList.scss | 55 +++---- src/components/ArticlesList/ArticlesList.tsx | 142 +++++++++--------- src/components/ArticlesList/index.ts | 2 +- src/components/SearchInput/SearchInput.scss | 23 +++ src/components/SearchInput/SearchInput.tsx | 67 +++++++++ src/components/SearchInput/index.ts | 1 + src/components/TagsList/TagsList.tsx | 99 ++++++++++++ src/components/TagsList/index.ts | 1 + src/pages/articles.astro | 14 +- src/store.ts | 3 + src/stores/index.ts | 1 + src/stores/searchStore.ts | 4 + src/styles/global.scss | 1 + src/types/index.ts | 4 + src/utils/articles.ts | 18 ++- src/utils/history.ts | 22 +++ src/utils/index.ts | 1 + tsconfig.json | 3 +- 21 files changed, 357 insertions(+), 129 deletions(-) create mode 100644 src/components/SearchInput/SearchInput.scss create mode 100644 src/components/SearchInput/SearchInput.tsx create mode 100644 src/components/SearchInput/index.ts create mode 100644 src/components/TagsList/TagsList.tsx create mode 100644 src/components/TagsList/index.ts create mode 100644 src/store.ts create mode 100644 src/stores/index.ts create mode 100644 src/stores/searchStore.ts create mode 100644 src/utils/history.ts diff --git a/README.md b/README.md index 07f5f9b..7b102dc 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,13 @@ Personal website created with Astro. -### Todo +### Features - [x] HTML layout - [x] Adaptive & Responsive layout - [ ] Dark/Light Theme - [ ] Multilang web-site +- [ ] Search articles by title or description - [ ] Form handling via Netlify Forms - [ ] SEO optimized diff --git a/astro.config.mjs b/astro.config.mjs index 242e336..505fe63 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -4,14 +4,14 @@ import solid from '@astrojs/solid-js'; // https://astro.build/config export default defineConfig({ - site: 'https://yarkov.tech', - integrations: [solid()], - markdown: { - syntaxHighlight: 'prism', - }, - vite: { - ssr: { - external: ["svgo"], - }, - }, + site: 'https://yarkov.tech', + integrations: [solid()], + markdown: { + syntaxHighlight: 'prism', + }, + vite: { + ssr: { + external: ['svgo'], + }, + }, }); diff --git a/content b/content index 4129fab..78e2d0d 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 4129fab6633a7d07a9c62507ef948f769709d028 +Subproject commit 78e2d0d252b8a7f0b2c0095e89b1e1c1cd1e3996 diff --git a/src/components/ArticlesList/ArticlesList.scss b/src/components/ArticlesList/ArticlesList.scss index f388180..98c5264 100644 --- a/src/components/ArticlesList/ArticlesList.scss +++ b/src/components/ArticlesList/ArticlesList.scss @@ -1,38 +1,21 @@ .articles { - &-search { - position: relative; - display: flex; - align-items: center; - column-gap: 15px; - margin-bottom: 10px; - - & svg { - position: absolute; - left: 8px; - fill: var(--font-color-grayer); - } - & input { - padding-left: 40px; - color: var(--font-color-grayer); - background-color: var(--background-color-hover); - } - & span { - font-size: var(--font-size-lg); - font-weight: 500; - color: var(--font-color-grayer); - } - } - &-tags { - margin-bottom: 45px; - } - &-list { - &__wrapper { - margin-top: 40px; - & h2 { - margin-bottom: 10px; - padding-bottom: 10px; - border-bottom: 1px solid var(--border-color); - } - } - } + &-tags { + margin-bottom: 45px; + } + &-list { + &__wrapper { + margin-top: 40px; + & h2 { + margin-bottom: 10px; + padding-bottom: 10px; + border-bottom: 1px solid var(--border-color); + } + } + &__empty { + color: var(--font-color-gray); + text-align: center; + user-select: none; + padding: 3rem 0; + } + } } diff --git a/src/components/ArticlesList/ArticlesList.tsx b/src/components/ArticlesList/ArticlesList.tsx index 94a486b..ed10451 100644 --- a/src/components/ArticlesList/ArticlesList.tsx +++ b/src/components/ArticlesList/ArticlesList.tsx @@ -1,85 +1,77 @@ -import './ArticlesList.scss'; -import { Component, createSignal, Show, For } from 'solid-js'; -import type { ArticleType } from '@root/types'; +import type { Component } from 'solid-js'; +import type { ArticleBlockType } from '@root/types'; -import PageHeading from '@components/PageHeading'; -import * as utils from '@root/utils/articles'; +import { createSignal, createEffect, For } from 'solid-js'; +import { search, selectedTags } from '@stores/searchStore'; import { ArticleItem } from '../ArticleItem'; +import * as utils from '@utils/articles'; +import './ArticlesList.scss'; -export type ArticlesListProps = { - data: ArticleType[]; - tags: string[]; +type ArticlesListProps = { + data: ArticleBlockType; + emptyPlaceholder?: string | undefined; }; -export const ArticlesList: Component = (props) => { - const [articles, setArticles] = createSignal(utils.filterArticlesByYear(props.data)); - const [selectedTags, setSelectedTags] = createSignal([]); - const [filteredArticles, setFilteredArticles] = createSignal([]); +const ArticlesList: Component = (props) => { + const [articles, setArticles] = createSignal(props.data); + + /** + * Sort articles by year in descending order + */ + const sortYears = (articles: ArticleBlockType) => { + return Object.keys(articles) + .map(Number) + .sort((a, b) => b - a); + }; + + const isEmpty = () => Object.keys(articles()).length === 0; + + createEffect(() => { + const { state } = window.history; + let filtered = props.data; + + /** + * Find articles by title + */ + if (state.search || search()) { + filtered = utils.findArticlesBySearch(search(), filtered); + setArticles(filtered); + } + + /** + * Find articles by selected tags + */ + if (selectedTags().length !== 0) { + filtered = utils.findArticlesByTags(selectedTags(), filtered); + setArticles(filtered); + + return; + } + + filtered = utils.findArticlesBySearch(search(), props.data); + setArticles(filtered); + }); return ( -
- + {isEmpty() && ( +
+

{props.emptyPlaceholder || 'No articles found...'}

+
+ )} + { + return ( +
+

{year}

+ } /> +
+ ); + }} /> -
- - - - - {props.data.length} -
-
- -
-
- - {Object.keys(articles()) - .map(Number) - .sort((a, b) => b - a) - .map((year) => ( -
-

{year}

- {utils.sortArtcilesByDate(articles()[year]).map((article) => ( - - ))} -
- ))} - - - {utils.sortArtcilesByDate(filteredArticles()).map((article) => ( - - ))} - -
-
+
); }; + +export default ArticlesList; diff --git a/src/components/ArticlesList/index.ts b/src/components/ArticlesList/index.ts index e4ba275..6834ac7 100644 --- a/src/components/ArticlesList/index.ts +++ b/src/components/ArticlesList/index.ts @@ -1 +1 @@ -export * from './ArticlesList'; +export { default } from './ArticlesList'; diff --git a/src/components/SearchInput/SearchInput.scss b/src/components/SearchInput/SearchInput.scss new file mode 100644 index 0000000..db15dad --- /dev/null +++ b/src/components/SearchInput/SearchInput.scss @@ -0,0 +1,23 @@ +.search-input { + position: relative; + display: flex; + align-items: center; + column-gap: 15px; + margin-bottom: 10px; + + & svg { + position: absolute; + left: 8px; + fill: var(--font-color-grayer); + } + & input { + padding-left: 40px; + color: var(--font-color-grayer); + background-color: var(--background-color-hover); + } + & span { + font-size: var(--font-size-lg); + font-weight: 500; + color: var(--font-color-grayer); + } +} diff --git a/src/components/SearchInput/SearchInput.tsx b/src/components/SearchInput/SearchInput.tsx new file mode 100644 index 0000000..d677a1d --- /dev/null +++ b/src/components/SearchInput/SearchInput.tsx @@ -0,0 +1,67 @@ +import type { Component, JSX } from 'solid-js'; + +import { createEffect } from 'solid-js'; +import { search, setSearch } from '@stores/searchStore'; +import * as utils from '@root/utils/history'; + +import './SearchInput.scss'; + +type SearchInputProps = { + length: number; + placeholder?: string | undefined; +}; + +const SearchInput: Component = (props) => { + /** + * Reset signal state and delete `search` param from url + */ + const resetSearch = () => { + const url = utils.deleteParamFromUrl('search'); + + setSearch(''); + utils.extendHistoryState({ search: '' }, url); + }; + + const onSearch: JSX.EventHandler = (e) => { + const value = e.currentTarget.value; + + if (value.length === 0) { + resetSearch(); + return; + } + + setSearch(e.currentTarget.value); + + const url = utils.setParamToUrl('search', search()); + + utils.extendHistoryState({ search: search() }, `${window.location.pathname}?${url}`); + }; + + /** + * Set the signal state by reading the `search` parameter from the URL. + */ + createEffect(() => { + const param = new URLSearchParams(window.location.search).get('search'); + + if (!param) { + resetSearch(); + return; + } + + setSearch(param); + + utils.extendHistoryState({ search: param }); + }); + + return ( +
+ + + + + {props.length} +
+ ); +}; + +export default SearchInput; diff --git a/src/components/SearchInput/index.ts b/src/components/SearchInput/index.ts new file mode 100644 index 0000000..7e9c713 --- /dev/null +++ b/src/components/SearchInput/index.ts @@ -0,0 +1 @@ +export { default } from './SearchInput'; diff --git a/src/components/TagsList/TagsList.tsx b/src/components/TagsList/TagsList.tsx new file mode 100644 index 0000000..d62aec5 --- /dev/null +++ b/src/components/TagsList/TagsList.tsx @@ -0,0 +1,99 @@ +import type { Component, JSX } from 'solid-js'; + +import { For, createEffect } from 'solid-js'; +import { selectedTags, setSelectedTags } from '@root/stores/searchStore'; +import * as utils from '@root/utils/history'; + +type TagsListProps = { + data: string[]; +}; + +const TagsList: Component = (props) => { + const isTagSelected = (tag: string) => selectedTags().includes(tag.toLocaleLowerCase()); + + /** + * Reset signal state and `tags` property in history state + */ + const resetSelected = () => { + const url = utils.deleteParamFromUrl('tags'); + + setSelectedTags([]); + utils.extendHistoryState({ tags: [] }, url); + }; + + const onSelect: JSX.EventHandler = (e) => { + const tag = e.target.getAttribute('data-tag'); + + /** + * Delete tag from selected tags if already selected + * and update param in url + */ + if (isTagSelected(tag)) { + const updated = selectedTags().filter((selectedTag) => selectedTag !== tag); + const url = utils.setParamToUrl('tags', updated.join(',')); + + if (updated.length === 0) { + resetSelected(); + return; + } + + utils.extendHistoryState({ tags: updated }, `${window.location.pathname}?${url}`); + setSelectedTags(updated); + return; + } + + /** + * Add selected tag to state and update url + */ + const updated = [...selectedTags(), tag]; + const url = utils.setParamToUrl('tags', updated.join(',')); + + setSelectedTags(updated); + utils.extendHistoryState({ tags: updated }, `${window.location.pathname}?${url}`); + }; + + createEffect(() => { + const param = new URLSearchParams(window.location.search).get('tags'); + + if (!param) { + resetSelected(); + return; + } + + if (param.split(',').length === 0) { + resetSelected(); + return; + } + + const tags: string[] = []; + + for (const tag of props.data) { + if (param.split(',').includes(tag.toLocaleLowerCase())) { + tags.push(tag.toLocaleLowerCase()); + } + } + + setSelectedTags(tags); + utils.extendHistoryState({ tags }); + }); + + return ( +
    + ( +
  • + {tag} +
    • + )} + /> +
+ ); +}; + +export default TagsList; diff --git a/src/components/TagsList/index.ts b/src/components/TagsList/index.ts new file mode 100644 index 0000000..c4d73f5 --- /dev/null +++ b/src/components/TagsList/index.ts @@ -0,0 +1 @@ +export { default } from './TagsList'; diff --git a/src/pages/articles.astro b/src/pages/articles.astro index 479d6db..6134b8d 100644 --- a/src/pages/articles.astro +++ b/src/pages/articles.astro @@ -1,7 +1,11 @@ --- +import type { ArticleType } from '@root/types'; + import PageLayout from '@layouts/default.astro'; -import { ArticleType } from '@root/types'; -import * as utils from '@utils/index'; +import ArticlesList from '@components/ArticlesList'; +import SearchInput from '@components/SearchInput'; +import TagsList from '@components/TagsList'; +import { transformArticles, filterArticlesByYear } from '@utils/articles'; const articles = await Astro.glob('../../content/articles/**/*.md'); const tags = new Set(articles.map((article) => article.frontmatter.tags).flat()); @@ -11,5 +15,9 @@ const tags = new Set(articles.map((article) => article.frontmatter.tags).flat()) title='Статьи' description='Технические статьи, туториалы и различные справочные материалы которые связаны с IT тематикой находятся здесь.' > - +
+ + + +
diff --git a/src/store.ts b/src/store.ts new file mode 100644 index 0000000..a096cc1 --- /dev/null +++ b/src/store.ts @@ -0,0 +1,3 @@ +import { createSignal } from 'solid-js'; + +export const [search, setSearch] = createSignal(''); diff --git a/src/stores/index.ts b/src/stores/index.ts new file mode 100644 index 0000000..8427539 --- /dev/null +++ b/src/stores/index.ts @@ -0,0 +1 @@ +export * from './searchStore'; diff --git a/src/stores/searchStore.ts b/src/stores/searchStore.ts new file mode 100644 index 0000000..3191919 --- /dev/null +++ b/src/stores/searchStore.ts @@ -0,0 +1,4 @@ +import { createSignal } from 'solid-js'; + +export const [search, setSearch] = createSignal(''); +export const [selectedTags, setSelectedTags] = createSignal([]); diff --git a/src/styles/global.scss b/src/styles/global.scss index 7de0ef9..31d1ed6 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -175,6 +175,7 @@ body { font-size: var(--font-size-sm); font-weight: 400; white-space: nowrap; + user-select: none; &:hover { text-decoration: none; color: inherit; diff --git a/src/types/index.ts b/src/types/index.ts index aee6be5..91132d0 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -19,3 +19,7 @@ export type SkillsType = { title: string; list: Array<{ icon?: string | undefined; name: string }>; }; + +export type ArticleBlockType = { + [year: number]: ArticleType[]; +}; diff --git a/src/utils/articles.ts b/src/utils/articles.ts index 798d9e9..7cae199 100644 --- a/src/utils/articles.ts +++ b/src/utils/articles.ts @@ -1,4 +1,4 @@ -import type { ArticleType } from '@root/types'; +import type { ArticleType, ArticleBlockType } from '@root/types'; import { MarkdownInstance } from 'astro'; @@ -27,3 +27,19 @@ export const filterArticlesByYear = (articles: ArticleType[]): { [year: number]: return filtered; }; + +export const findArticlesBySearch = (search: string, articles: ArticleBlockType): ArticleBlockType => { + const filtered = Object.values(articles) + .flat() + .filter((article) => article.title.toLocaleLowerCase().includes(search)); + + return filterArticlesByYear(filtered); +}; + +export const findArticlesByTags = (tags: string[], articles: ArticleBlockType): ArticleBlockType => { + const filtered = Object.values(articles) + .flat() + .filter((article) => article.tags.map((tag) => tag.toLocaleLowerCase()).some((t) => tags.includes(t))); + + return filterArticlesByYear(filtered); +}; diff --git a/src/utils/history.ts b/src/utils/history.ts new file mode 100644 index 0000000..e188e24 --- /dev/null +++ b/src/utils/history.ts @@ -0,0 +1,22 @@ +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); + + const url = !params.toString() ? window.location.pathname : '?' + params.toString(); + + return url; +}; + +export const setParamToUrl = (param: string, value: string): string => { + const params = new URLSearchParams(window.location.search); + params.set(param, value); + + return params.toString(); +}; diff --git a/src/utils/index.ts b/src/utils/index.ts index 9e3e297..869f0c2 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,2 +1,3 @@ export * from './articles'; export * from './date'; +export * from './history'; diff --git a/tsconfig.json b/tsconfig.json index c464884..9adedda 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,8 @@ "@styles/*": ["./src/styles/*"], "@components/*": ["./src/components/*"], "@layouts/*": ["./src/layouts/*"], - "@utils/*": ["./src/utils/*"] + "@utils/*": ["./src/utils/*"], + "@stores/*": ["./src/stores/*"] }, "outDir": "./dist" }, From 57d673edece628c3f520c7901413a4ed23303c01 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Fri, 22 Jul 2022 02:44:13 +0300 Subject: [PATCH 17/70] upd gitattrs --- .gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index dd1ee83..a3a3b8a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -*.* linguist-language=astro \ No newline at end of file +*.css linguist-detectable=false +*.scss linguist-detectable=false \ No newline at end of file From 486e3fbc9e8daa60bf7b858a920b6c35bdba4615 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Fri, 22 Jul 2022 02:47:20 +0300 Subject: [PATCH 18/70] format --- .eslintrc.json | 32 ++++++++++++-------------------- package.json | 3 ++- src/config.ts | 6 ++---- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index f23efa8..d261713 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,22 +1,14 @@ { - "env": { - "browser": true, - "es2021": true - }, - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:solid/typescript" - ], - "parser": "@typescript-eslint/parser", - "parserOptions": { - "ecmaVersion": "latest", - "sourceType": "module" - }, - "plugins": [ - "@typescript-eslint", - "solid" - ], - "rules": { - } + "env": { + "browser": true, + "es2021": true + }, + "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:solid/typescript"], + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaVersion": "latest", + "sourceType": "module" + }, + "plugins": ["@typescript-eslint", "solid"], + "rules": {} } diff --git a/package.json b/package.json index fa15079..5e1c9ef 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "dev": "astro dev --host", "start": "astro dev", "build": "astro build", - "preview": "astro preview --host" + "preview": "astro preview --host", + "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json}\"" }, "devDependencies": { "@astrojs/solid-js": "^0.4.1", diff --git a/src/config.ts b/src/config.ts index 3710d80..4e46ed2 100644 --- a/src/config.ts +++ b/src/config.ts @@ -20,8 +20,7 @@ export const SITE_METADATA = { icon: 'nodejs', name: 'yarkov.tech', year: '2022', - description: - 'Мой персональный веб-сайт где находятся информация обо мне и список различных статей, туториалов...', + description: 'Мой персональный веб-сайт где находятся информация обо мне и список различных статей, туториалов...', sourceUrl: 'https://github.com/sergeyyarkov/yarkov.tech', demoUrl: 'https://yarkov.tech', articleUrl: undefined, @@ -30,8 +29,7 @@ export const SITE_METADATA = { icon: 'triangle_filled', name: 'devthread', year: '2021', - description: - 'Статический веб-сайт для публикации различных статей, разработанный при помощи Gatsby.js и NetlifyCMS', + description: 'Статический веб-сайт для публикации различных статей, разработанный при помощи Gatsby.js и NetlifyCMS', sourceUrl: 'https://github.com/sergeyyarkov/devthread.ru', demoUrl: 'https://devthread.netlify.app', articleUrl: undefined, From 9b241432294be636f42084f97ea42337b47c0e24 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Fri, 22 Jul 2022 21:05:37 +0300 Subject: [PATCH 19/70] refactor: refactored search --- package.json | 3 ++- src/components/ArticlesList/ArticlesList.tsx | 3 +-- src/components/SearchInput/SearchInput.tsx | 21 +++++++++---------- src/components/TagsList/TagsList.tsx | 22 ++++++++++++-------- src/utils/articles.ts | 2 +- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 5e1c9ef..fcaa6d9 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,8 @@ "start": "astro dev", "build": "astro build", "preview": "astro preview --host", - "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json}\"" + "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json}\"", + "lint": "eslint '**/*.{js,mjs,ts,tsx}'" }, "devDependencies": { "@astrojs/solid-js": "^0.4.1", diff --git a/src/components/ArticlesList/ArticlesList.tsx b/src/components/ArticlesList/ArticlesList.tsx index ed10451..1df8d84 100644 --- a/src/components/ArticlesList/ArticlesList.tsx +++ b/src/components/ArticlesList/ArticlesList.tsx @@ -27,13 +27,12 @@ const ArticlesList: Component = (props) => { const isEmpty = () => Object.keys(articles()).length === 0; createEffect(() => { - const { state } = window.history; let filtered = props.data; /** * Find articles by title */ - if (state.search || search()) { + if (search()) { filtered = utils.findArticlesBySearch(search(), filtered); setArticles(filtered); } diff --git a/src/components/SearchInput/SearchInput.tsx b/src/components/SearchInput/SearchInput.tsx index d677a1d..80f465f 100644 --- a/src/components/SearchInput/SearchInput.tsx +++ b/src/components/SearchInput/SearchInput.tsx @@ -2,8 +2,7 @@ import type { Component, JSX } from 'solid-js'; import { createEffect } from 'solid-js'; import { search, setSearch } from '@stores/searchStore'; -import * as utils from '@root/utils/history'; - +import * as utils from '@utils/history'; import './SearchInput.scss'; type SearchInputProps = { @@ -13,15 +12,18 @@ type SearchInputProps = { const SearchInput: Component = (props) => { /** - * Reset signal state and delete `search` param from url + * Reset state and delete `search` param from url */ const resetSearch = () => { const url = utils.deleteParamFromUrl('search'); setSearch(''); - utils.extendHistoryState({ search: '' }, url); + history.replaceState(null, '', url); }; + /** + * Update state and set url param + */ const onSearch: JSX.EventHandler = (e) => { const value = e.currentTarget.value; @@ -30,18 +32,17 @@ const SearchInput: Component = (props) => { return; } - setSearch(e.currentTarget.value); + const url = utils.setParamToUrl('search', value); - const url = utils.setParamToUrl('search', search()); - - utils.extendHistoryState({ search: search() }, `${window.location.pathname}?${url}`); + history.replaceState(null, '', `${location.pathname}?${url}`); + setSearch(value); }; /** * Set the signal state by reading the `search` parameter from the URL. */ createEffect(() => { - const param = new URLSearchParams(window.location.search).get('search'); + const param = new URLSearchParams(location.search).get('search'); if (!param) { resetSearch(); @@ -49,8 +50,6 @@ const SearchInput: Component = (props) => { } setSearch(param); - - utils.extendHistoryState({ search: param }); }); return ( diff --git a/src/components/TagsList/TagsList.tsx b/src/components/TagsList/TagsList.tsx index d62aec5..472a5b3 100644 --- a/src/components/TagsList/TagsList.tsx +++ b/src/components/TagsList/TagsList.tsx @@ -1,8 +1,8 @@ import type { Component, JSX } from 'solid-js'; import { For, createEffect } from 'solid-js'; -import { selectedTags, setSelectedTags } from '@root/stores/searchStore'; -import * as utils from '@root/utils/history'; +import { selectedTags, setSelectedTags } from '@stores/searchStore'; +import * as utils from '@utils/history'; type TagsListProps = { data: string[]; @@ -18,7 +18,7 @@ const TagsList: Component = (props) => { const url = utils.deleteParamFromUrl('tags'); setSelectedTags([]); - utils.extendHistoryState({ tags: [] }, url); + history.replaceState(null, '', url); }; const onSelect: JSX.EventHandler = (e) => { @@ -37,8 +37,8 @@ const TagsList: Component = (props) => { return; } - utils.extendHistoryState({ tags: updated }, `${window.location.pathname}?${url}`); setSelectedTags(updated); + history.replaceState(null, '', `${location.pathname}?${url}`); return; } @@ -49,18 +49,21 @@ const TagsList: Component = (props) => { const url = utils.setParamToUrl('tags', updated.join(',')); setSelectedTags(updated); - utils.extendHistoryState({ tags: updated }, `${window.location.pathname}?${url}`); + history.replaceState(null, '', `${location.pathname}?${url}`); }; createEffect(() => { - const param = new URLSearchParams(window.location.search).get('tags'); + let param: string | string[] = new URLSearchParams(location.search).get('tags'); if (!param) { resetSelected(); return; } - if (param.split(',').length === 0) { + /* to array */ + param = param.split(','); + + if (param.length === 0) { resetSelected(); return; } @@ -68,13 +71,14 @@ const TagsList: Component = (props) => { const tags: string[] = []; for (const tag of props.data) { - if (param.split(',').includes(tag.toLocaleLowerCase())) { + const isTagExist = param.includes(tag.toLocaleLowerCase()); + + if (isTagExist) { tags.push(tag.toLocaleLowerCase()); } } setSelectedTags(tags); - utils.extendHistoryState({ tags }); }); return ( diff --git a/src/utils/articles.ts b/src/utils/articles.ts index 7cae199..c96bfb4 100644 --- a/src/utils/articles.ts +++ b/src/utils/articles.ts @@ -31,7 +31,7 @@ export const filterArticlesByYear = (articles: ArticleType[]): { [year: number]: export const findArticlesBySearch = (search: string, articles: ArticleBlockType): ArticleBlockType => { const filtered = Object.values(articles) .flat() - .filter((article) => article.title.toLocaleLowerCase().includes(search)); + .filter((article) => article.title.toLocaleLowerCase().includes(search.toLocaleLowerCase())); return filterArticlesByYear(filtered); }; From f2552eda174856c254f1925697bd712f58d98d13 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Sun, 24 Jul 2022 20:34:42 +0300 Subject: [PATCH 20/70] refactor: refactored articles search & articles list --- src/components/ArticlesList/ArticlesList.tsx | 65 ++++++++++++------- src/components/Header/Header.astro | 4 +- src/components/Header/NavToggle/NavToggle.tsx | 10 ++- src/components/Header/NavToggle/index.ts | 1 + src/components/SearchInput/SearchInput.tsx | 6 +- src/components/Splash/SplashHeading.scss | 7 ++ src/pages/articles.astro | 15 +++-- src/store.ts | 3 - src/styles/global.scss | 2 +- src/utils/articles.ts | 42 ++++++++---- 10 files changed, 99 insertions(+), 56 deletions(-) create mode 100644 src/components/Header/NavToggle/index.ts delete mode 100644 src/store.ts diff --git a/src/components/ArticlesList/ArticlesList.tsx b/src/components/ArticlesList/ArticlesList.tsx index 1df8d84..f12f06e 100644 --- a/src/components/ArticlesList/ArticlesList.tsx +++ b/src/components/ArticlesList/ArticlesList.tsx @@ -3,17 +3,23 @@ import type { ArticleBlockType } from '@root/types'; import { createSignal, createEffect, For } from 'solid-js'; import { search, selectedTags } from '@stores/searchStore'; -import { ArticleItem } from '../ArticleItem'; +import { ArticleItem } from '@components/ArticleItem'; import * as utils from '@utils/articles'; import './ArticlesList.scss'; +import SearchInput from '../SearchInput'; +import TagsList from '../TagsList'; type ArticlesListProps = { - data: ArticleBlockType; + data: { + articles: ArticleBlockType; + tags: string[]; + }; emptyPlaceholder?: string | undefined; }; const ArticlesList: Component = (props) => { - const [articles, setArticles] = createSignal(props.data); + // eslint-disable-next-line solid/reactivity + const [articles, setArticles] = createSignal(props.data.articles); /** * Sort articles by year in descending order @@ -25,9 +31,10 @@ const ArticlesList: Component = (props) => { }; const isEmpty = () => Object.keys(articles()).length === 0; + const getLength = () => Object.values(articles()).flat().length; createEffect(() => { - let filtered = props.data; + let filtered = props.data.articles; /** * Find articles by title @@ -47,29 +54,39 @@ const ArticlesList: Component = (props) => { return; } - filtered = utils.findArticlesBySearch(search(), props.data); - setArticles(filtered); + /** + * Set filtered variable as default value + */ + if (!search() && selectedTags().length === 0) { + filtered = props.data.articles; + setArticles(filtered); + } }); return ( -
- {isEmpty() && ( -
-

{props.emptyPlaceholder || 'No articles found...'}

-
- )} - { - return ( -
-

{year}

- } /> -
- ); - }} - /> -
+ <> + + +
+ {isEmpty() ? ( +
+

{props.emptyPlaceholder || 'No articles found...'}

+
+ ) : ( + { + return ( +
+

{year}

+ } /> +
+ ); + }} + /> + )} +
+ ); }; diff --git a/src/components/Header/Header.astro b/src/components/Header/Header.astro index 8c67fcd..c953f40 100644 --- a/src/components/Header/Header.astro +++ b/src/components/Header/Header.astro @@ -3,7 +3,7 @@ import './Header.scss'; import { SITE_METADATA } from '@root/config'; import ThemeSwitcher from '@components/ThemeSwticher'; import { Icon } from 'astro-icon'; -import { NavToggle } from './NavToggle/NavToggle.tsx'; +import NavToggle from './NavToggle'; const { name, nav, contacts } = SITE_METADATA; const { pathname } = Astro.canonicalURL; @@ -40,6 +40,6 @@ const { pathname } = Astro.canonicalURL;
- +
diff --git a/src/components/Header/NavToggle/NavToggle.tsx b/src/components/Header/NavToggle/NavToggle.tsx index 24ab898..e858b7f 100644 --- a/src/components/Header/NavToggle/NavToggle.tsx +++ b/src/components/Header/NavToggle/NavToggle.tsx @@ -1,7 +1,9 @@ -import './NavToggle.scss'; -import { Component, createSignal, createEffect } from 'solid-js'; +import type { Component } from 'solid-js'; -export const NavToggle: Component = () => { +import { createSignal, createEffect } from 'solid-js'; +import './NavToggle.scss'; + +const NavToggle: Component = () => { const [isNavShown, setIsNavShown] = createSignal(false); const toggleNav = () => setIsNavShown(!isNavShown()); @@ -25,3 +27,5 @@ export const NavToggle: Component = () => { ); }; + +export default NavToggle; diff --git a/src/components/Header/NavToggle/index.ts b/src/components/Header/NavToggle/index.ts new file mode 100644 index 0000000..57d70d5 --- /dev/null +++ b/src/components/Header/NavToggle/index.ts @@ -0,0 +1 @@ +export { default } from './NavToggle'; diff --git a/src/components/SearchInput/SearchInput.tsx b/src/components/SearchInput/SearchInput.tsx index 80f465f..d9ef696 100644 --- a/src/components/SearchInput/SearchInput.tsx +++ b/src/components/SearchInput/SearchInput.tsx @@ -1,4 +1,4 @@ -import type { Component, JSX } from 'solid-js'; +import { Component, JSX } from 'solid-js'; import { createEffect } from 'solid-js'; import { search, setSearch } from '@stores/searchStore'; @@ -6,7 +6,7 @@ import * as utils from '@utils/history'; import './SearchInput.scss'; type SearchInputProps = { - length: number; + count: number; placeholder?: string | undefined; }; @@ -58,7 +58,7 @@ const SearchInput: Component = (props) => { - {props.length} + {props.count}
); }; diff --git a/src/components/Splash/SplashHeading.scss b/src/components/Splash/SplashHeading.scss index af4faee..16bbb5b 100644 --- a/src/components/Splash/SplashHeading.scss +++ b/src/components/Splash/SplashHeading.scss @@ -19,3 +19,10 @@ line-height: 1.5; } } + +@media screen and (max-width: 560px) { + .splash-heading hgroup h1 { + font-size: var(--font-size-4xl); + margin-bottom: 0.85rem; + } +} diff --git a/src/pages/articles.astro b/src/pages/articles.astro index 6134b8d..8735f7d 100644 --- a/src/pages/articles.astro +++ b/src/pages/articles.astro @@ -3,9 +3,7 @@ import type { ArticleType } from '@root/types'; import PageLayout from '@layouts/default.astro'; import ArticlesList from '@components/ArticlesList'; -import SearchInput from '@components/SearchInput'; -import TagsList from '@components/TagsList'; -import { transformArticles, filterArticlesByYear } from '@utils/articles'; +import { transformArticles, formatToArticleBlocks } from '@utils/articles'; const articles = await Astro.glob('../../content/articles/**/*.md'); const tags = new Set(articles.map((article) => article.frontmatter.tags).flat()); @@ -16,8 +14,13 @@ const tags = new Set(articles.map((article) => article.frontmatter.tags).flat()) description='Технические статьи, туториалы и различные справочные материалы которые связаны с IT тематикой находятся здесь.' >
- - - +
diff --git a/src/store.ts b/src/store.ts deleted file mode 100644 index a096cc1..0000000 --- a/src/store.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { createSignal } from 'solid-js'; - -export const [search, setSearch] = createSignal(''); diff --git a/src/styles/global.scss b/src/styles/global.scss index 31d1ed6..1e14a15 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -85,7 +85,7 @@ /* Sizes */ --content-width: 760px; - --content-padding: 15px; + --content-padding: 24px; /* Elements */ --background-body-color: var(--color-white); diff --git a/src/utils/articles.ts b/src/utils/articles.ts index c96bfb4..f63124b 100644 --- a/src/utils/articles.ts +++ b/src/utils/articles.ts @@ -14,32 +14,46 @@ export const sortArtcilesByDate = (articles: ArticleType[]): ArticleType[] => { return articles.sort((a, b) => new Date(b.published_at).valueOf() - new Date(a.published_at).valueOf()); }; -export const filterArticlesByYear = (articles: ArticleType[]): { [year: number]: ArticleType[] } => { - const filtered = {}; +/** + * This function will distribute the array of articles by years. + */ +export const formatToArticleBlocks = (articles: ArticleType[]): ArticleBlockType => { + const blocks = {}; for (const article of articles) { const year = new Date(article.published_at).getFullYear(); - if (!filtered[year]) filtered[year] = []; - - filtered[year].push(article); + if (!blocks[year]) blocks[year] = []; + blocks[year].push(article); } - return filtered; + return blocks; }; export const findArticlesBySearch = (search: string, articles: ArticleBlockType): ArticleBlockType => { - const filtered = Object.values(articles) - .flat() - .filter((article) => article.title.toLocaleLowerCase().includes(search.toLocaleLowerCase())); + const matched: Array = []; - return filterArticlesByYear(filtered); + for (const year in articles) { + for (const article of articles[year]) { + const match = article.title.toLocaleLowerCase().includes(search.toLocaleLowerCase()); + if (match) matched.push(article); + } + } + + return formatToArticleBlocks(matched); }; export const findArticlesByTags = (tags: string[], articles: ArticleBlockType): ArticleBlockType => { - const filtered = Object.values(articles) - .flat() - .filter((article) => article.tags.map((tag) => tag.toLocaleLowerCase()).some((t) => tags.includes(t))); + const matched: Array = []; - return filterArticlesByYear(filtered); + for (const year in articles) { + for (const article of articles[year]) { + const entries = article.tags.map((tag) => tag.toLocaleLowerCase()); + const match = entries.some((tag) => tags.includes(tag)); + + if (match) matched.push(article); + } + } + + return formatToArticleBlocks(matched); }; From de8f2188a5131055a9340886205e0d65a9bda58f Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Sun, 24 Jul 2022 23:42:28 +0300 Subject: [PATCH 21/70] feat: added colors for themes --- public/assets/dark.css | 19 ++++++++++ public/assets/light.css | 19 ++++++++++ src/components/ArticlePost/ArticlePost.scss | 2 +- src/components/BaseHead.astro | 4 +- src/components/Header/Header.scss | 5 ++- src/components/SearchInput/SearchInput.scss | 4 +- src/components/TagsList/TagsList.tsx | 7 +--- .../ThemeSwticher/ThemeSwitcher.astro | 4 +- src/layouts/article.astro | 9 ++--- src/layouts/default.astro | 8 ++-- src/pages/contacts.astro | 1 - src/styles/global.scss | 37 +++++-------------- 12 files changed, 69 insertions(+), 50 deletions(-) create mode 100644 public/assets/dark.css create mode 100644 public/assets/light.css diff --git a/public/assets/dark.css b/public/assets/dark.css new file mode 100644 index 0000000..a4b81bd --- /dev/null +++ b/public/assets/dark.css @@ -0,0 +1,19 @@ +:root { + /* Fonts */ + --font-color: var(--color-white); + --font-color-gray: var(--color-gray-100); + --font-color-grayer: var(--color-gray-200); + + /* Border */ + --border-color: var(--color-gray-700); + --border-color-hover: var(--color-gray-600); + + /* Elements */ + --background-body-color: var(--color-gray-900); + --background-header-color: var(--color-gray-900); + --background-inline-code: var(--color-gray-800); + --background-color-hover: var(--color-gray-800); + --background-btn-link: var(--color-gray-800); + --background-btn-link-active: var(--color-gray-700); + --background-inputs-color: var(--color-gray-800); +} diff --git a/public/assets/light.css b/public/assets/light.css new file mode 100644 index 0000000..7e40887 --- /dev/null +++ b/public/assets/light.css @@ -0,0 +1,19 @@ +:root { + /* Fonts */ + --font-color: var(--color-black); + --font-color-gray: var(--color-gray-500); + --font-color-grayer: var(--color-gray-700); + + /* Border */ + --border-color: var(--color-gray-100); + --border-color-hover: var(--color-gray-400); + + /* Elements */ + --background-body-color: var(--color-white); + --background-header-color: var(--color-white); + --background-inline-code: rgba(0, 0, 0, 0.05); + --background-color-hover: var(--color-gray-50); + --background-btn-link: var(--color-white); + --background-btn-link-active: var(--color-white); + --background-inputs-color: var(--color-white); +} diff --git a/src/components/ArticlePost/ArticlePost.scss b/src/components/ArticlePost/ArticlePost.scss index 1ec4c44..b61fae7 100644 --- a/src/components/ArticlePost/ArticlePost.scss +++ b/src/components/ArticlePost/ArticlePost.scss @@ -27,7 +27,7 @@ & h1 { font-weight: 600; - font-size: 2.25rem; + font-size: 2.125rem; } & p { diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index bc28aed..f7d9cdb 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -12,6 +12,8 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props; + + @@ -19,4 +21,4 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props; {title} - + diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss index 049cc0e..40bbdf9 100644 --- a/src/components/Header/Header.scss +++ b/src/components/Header/Header.scss @@ -6,6 +6,7 @@ padding-top: 15px; padding-bottom: 15px; user-select: none; + z-index: 9999; & .container { display: flex; @@ -81,7 +82,7 @@ position: absolute; height: 3px; width: 100%; - background: var(--color-black); + background: var(--font-color); border-radius: 7px; opacity: 1; left: 0; @@ -125,7 +126,7 @@ body[data-is-mobile-open='true'] { & .header { - background-color: var(--color-white); + background-color: var(--background-header-color); position: fixed; right: 0; left: 0; diff --git a/src/components/SearchInput/SearchInput.scss b/src/components/SearchInput/SearchInput.scss index db15dad..1ba730e 100644 --- a/src/components/SearchInput/SearchInput.scss +++ b/src/components/SearchInput/SearchInput.scss @@ -12,12 +12,14 @@ } & input { padding-left: 40px; - color: var(--font-color-grayer); + color: var(--font-color-gray); background-color: var(--background-color-hover); } & span { font-size: var(--font-size-lg); font-weight: 500; color: var(--font-color-grayer); + min-width: 20px; + text-align: center; } } diff --git a/src/components/TagsList/TagsList.tsx b/src/components/TagsList/TagsList.tsx index 472a5b3..0e0a252 100644 --- a/src/components/TagsList/TagsList.tsx +++ b/src/components/TagsList/TagsList.tsx @@ -86,12 +86,7 @@ const TagsList: Component = (props) => { ( -
  • +
  • {tag}
    • )} diff --git a/src/components/ThemeSwticher/ThemeSwitcher.astro b/src/components/ThemeSwticher/ThemeSwitcher.astro index 360fe7f..915d7c0 100644 --- a/src/components/ThemeSwticher/ThemeSwitcher.astro +++ b/src/components/ThemeSwticher/ThemeSwitcher.astro @@ -1,8 +1,8 @@ --- import './ThemeSwitcher.scss'; -import { Icon } from 'astro-icon' +import { Icon } from 'astro-icon'; --- diff --git a/src/layouts/article.astro b/src/layouts/article.astro index f923464..4b34305 100644 --- a/src/layouts/article.astro +++ b/src/layouts/article.astro @@ -2,12 +2,11 @@ import type { Props as BaseHeadProps } from '@root/components/BaseHead.astro'; import type { ArticleType } from '@root/types'; -import '@styles/global.scss'; -import BaseHead from '@root/components/BaseHead.astro'; +import BaseHead from '@components/BaseHead.astro'; import BaseLayout from '@components/BaseLayout'; -import { DateFormatter } from '@root/utils'; -import ArticleContent from '@root/components/ArticleContent'; -import ArticlePost from '@root/components/ArticlePost'; +import ArticleContent from '@components/ArticleContent'; +import ArticlePost from '@components/ArticlePost'; +import '@styles/global.scss'; export interface Props extends BaseHeadProps { lang?: string | undefined; diff --git a/src/layouts/default.astro b/src/layouts/default.astro index 08a3d64..44ed720 100644 --- a/src/layouts/default.astro +++ b/src/layouts/default.astro @@ -1,11 +1,11 @@ --- -import type { Props as BaseHeadProps } from '@root/components/BaseHead.astro'; +import type { Props as BaseHeadProps } from '@components/BaseHead.astro'; -import '@styles/global.scss'; -import BaseHead from '@root/components/BaseHead.astro'; +import BaseHead from '@components/BaseHead.astro'; import BaseLayout from '@components/BaseLayout'; import { SITE_METADATA } from '@root/config'; -import PageHeading from '@root/components/PageHeading'; +import PageHeading from '@components/PageHeading'; +import '@styles/global.scss'; export interface Props extends BaseHeadProps { lang?: string | undefined; diff --git a/src/pages/contacts.astro b/src/pages/contacts.astro index 509d701..82caea4 100644 --- a/src/pages/contacts.astro +++ b/src/pages/contacts.astro @@ -1,6 +1,5 @@ --- import PageLayout from '@layouts/default.astro'; -import PageHeading from '@components/PageHeading'; import ContactForm from '@components/ContactForm'; import ContactsList from '@components/ContactsList'; --- diff --git a/src/styles/global.scss b/src/styles/global.scss index 1e14a15..3b2e08b 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -1,10 +1,9 @@ :root { + color-scheme: light dark; + /* Fonts */ --font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji; --font-family-base: 'Rubik', var(--font-fallback); - --font-color: var(--color-black); - --font-color-gray: var(--color-gray-500); - --font-color-grayer: var(--color-gray-700); --font-size-xs: 0.75rem; --font-size-sm: 0.875rem; --font-size-md: 1rem; @@ -75,11 +74,7 @@ --color-yellow-800: #4b2900; --color-yellow-900: #341a00; - --background-color-hover: var(--color-gray-50); - /* Border */ - --border-color: var(--color-gray-100); - --border-color-hover: var(--color-gray-400); --border-radius-md: 3px; --border-radius-lg: 5px; @@ -87,12 +82,7 @@ --content-width: 760px; --content-padding: 24px; - /* Elements */ - --background-body-color: var(--color-white); - --background-header-color: var(--color-white); - --background-scrollbar-track-color: #eff1f5; - --background-scrollbar-thumb-color: var(--color-gray-100); - --background-inline-code: rgba(0, 0, 0, 0.05); + --outline-color: var(--color-blue-500); --opacity-hover: 0.7; } @@ -102,19 +92,6 @@ color: var(--color-black); } -::-webkit-scrollbar { - width: 10px; - height: 10px; -} - -::-webkit-scrollbar-track { - background: var(--background-scrollbar-track-color); -} - -::-webkit-scrollbar-thumb { - background: var(--background-scrollbar-thumb-color); -} - html, body { box-sizing: border-box; @@ -168,6 +145,7 @@ body { align-items: center; column-gap: 5px; padding: 3px 10px; + background-color: var(--background-btn-link); border-radius: var(--border-radius-md); border: 1px solid var(--border-color); text-decoration: none; @@ -181,6 +159,10 @@ body { color: inherit; border-color: var(--border-color-hover); } + &[data-active='true'] { + background-color: var(--background-btn-link-active); + border-color: var(--border-color-hover); + } } li::marker { @@ -217,9 +199,10 @@ textarea { padding: 8px 15px; border: 1px solid var(--border-color); border-radius: var(--border-radius-md); + background-color: var(--background-inputs-color); font-size: var(--font-size-sm); width: 100%; - outline-color: var(--color-blue-500); + outline-color: var(--outline-color); resize: vertical; } From 768d34fabb6286cc802ab06c63337d3d24b21687 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Mon, 25 Jul 2022 16:44:22 +0300 Subject: [PATCH 22/70] setup prism theme --- public/assets/prism-one-dark.min.css | 1 + public/assets/prism-one-light.min.css | 1 + src/components/ArticleItem/ArticleItem.scss | 8 +- src/components/BaseHead.astro | 1 + src/components/Footer/Footer.scss | 64 +-- src/components/Header/Header.astro | 2 +- src/layouts/article.astro | 5 +- src/pages/[article].astro | 1 - src/styles/global.scss | 4 +- src/styles/prism-one-dark.css | 440 -------------------- src/styles/prism-one-light.css | 428 ------------------- 11 files changed, 43 insertions(+), 912 deletions(-) create mode 100644 public/assets/prism-one-dark.min.css create mode 100644 public/assets/prism-one-light.min.css delete mode 100644 src/styles/prism-one-dark.css delete mode 100644 src/styles/prism-one-light.css diff --git a/public/assets/prism-one-dark.min.css b/public/assets/prism-one-dark.min.css new file mode 100644 index 0000000..2339ae7 --- /dev/null +++ b/public/assets/prism-one-dark.min.css @@ -0,0 +1 @@ +code[class*=language-],pre[class*=language-]{background:#111b27;color:#aab1bf;text-shadow:0 1px rgba(0,0,0,.3);font-family:'Fira Code','Fira Mono',Menlo,Consolas,'DejaVu Sans Mono',monospace;direction:ltr;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;line-height:1.5;-moz-tab-size:2;-o-tab-size:2;tab-size:2;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection{background:#3e4450;color:inherit;text-shadow:none}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection{background:#3e4450;color:inherit;text-shadow:none}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto;border-radius:.3em}:not(pre)>code[class*=language-]{padding:.2em .3em;border-radius:.3em;white-space:normal}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}.token.cdata,.token.comment,.token.prolog{color:#5b6270}.token.doctype,.token.entity,.token.punctuation{color:#aab1bf}.token.atrule,.token.attr-name,.token.boolean,.token.class-name,.token.constant,.token.number{color:#d19965}.token.keyword{color:#c578dd}.token.deleted,.token.important,.token.property,.token.symbol,.token.tag{color:#df6b75}.token.attr-value,.token.attr-value>.token.punctuation,.token.builtin,.token.char,.token.inserted,.token.regex,.token.selector,.token.string{color:#97c279}.token.function,.token.operator,.token.variable{color:#61afef}.token.url{color:#56b5c2}.token.attr-value>.token.punctuation.attr-equals,.token.special-attr>.token.attr-value>.token.value.css{color:#aab1bf}.language-css .token.selector{color:#df6b75}.language-css .token.property{color:#aab1bf}.language-css .token.function,.language-css .token.url>.token.function{color:#56b5c2}.language-css .token.url>.token.string.url{color:#97c279}.language-css .token.atrule .token.rule,.language-css .token.important{color:#c578dd}.language-javascript .token.operator{color:#c578dd}.language-javascript .token.template-string>.token.interpolation>.token.interpolation-punctuation.punctuation{color:#be5046}.language-json .token.operator{color:#aab1bf}.language-json .token.null.keyword{color:#d19965}.language-markdown .token.url,.language-markdown .token.url-reference.url>.token.string,.language-markdown .token.url>.token.operator{color:#aab1bf}.language-markdown .token.url>.token.content{color:#61afef}.language-markdown .token.url-reference.url,.language-markdown .token.url>.token.url{color:#56b5c2}.language-markdown .token.blockquote.punctuation,.language-markdown .token.hr.punctuation{color:#5b6270;font-style:italic}.language-markdown .token.code-snippet{color:#97c279}.language-markdown .token.bold .token.content{color:#d19965}.language-markdown .token.italic .token.content{color:#c578dd}.language-markdown .token.list.punctuation,.language-markdown .token.strike .token.content,.language-markdown .token.strike .token.punctuation,.language-markdown .token.title.important>.token.punctuation{color:#df6b75}.token.bold{font-weight:700}.token.comment,.token.italic{font-style:italic}.token.entity{cursor:help}.token.namespace{opacity:.8}.token.token.cr:before,.token.token.lf:before,.token.token.space:before,.token.token.tab:not(:empty):before{color:hsla(220,14%,71%,.15);text-shadow:none}div.code-toolbar>.toolbar.toolbar>.toolbar-item{margin-right:.4em}div.code-toolbar>.toolbar.toolbar>.toolbar-item>a,div.code-toolbar>.toolbar.toolbar>.toolbar-item>button,div.code-toolbar>.toolbar.toolbar>.toolbar-item>span{background:#393f4a;color:#818896;padding:.1em .4em;border-radius:.3em}div.code-toolbar>.toolbar.toolbar>.toolbar-item>a:focus,div.code-toolbar>.toolbar.toolbar>.toolbar-item>a:hover,div.code-toolbar>.toolbar.toolbar>.toolbar-item>button:focus,div.code-toolbar>.toolbar.toolbar>.toolbar-item>button:hover,div.code-toolbar>.toolbar.toolbar>.toolbar-item>span:focus,div.code-toolbar>.toolbar.toolbar>.toolbar-item>span:hover{background:#3e4450;color:#aab1bf}.line-highlight.line-highlight{background:hsla(220,100%,80%,.04)}.line-highlight.line-highlight:before,.line-highlight.line-highlight[data-end]:after{background:#393f4a;color:#aab1bf;padding:.1em .6em;border-radius:.3em;box-shadow:0 2px 0 0 rgba(0,0,0,.2)}pre[id].linkable-line-numbers.linkable-line-numbers span.line-numbers-rows>span:hover:before{background-color:hsla(220,100%,80%,.04)}.command-line .command-line-prompt,.line-numbers.line-numbers .line-numbers-rows{border-right-color:hsla(220,14%,71%,.15)}.command-line .command-line-prompt>span:before,.line-numbers .line-numbers-rows>span:before{color:#626d82}.rainbow-braces .token.token.punctuation.brace-level-1,.rainbow-braces .token.token.punctuation.brace-level-5,.rainbow-braces .token.token.punctuation.brace-level-9{color:#df6b75}.rainbow-braces .token.token.punctuation.brace-level-10,.rainbow-braces .token.token.punctuation.brace-level-2,.rainbow-braces .token.token.punctuation.brace-level-6{color:#97c279}.rainbow-braces .token.token.punctuation.brace-level-11,.rainbow-braces .token.token.punctuation.brace-level-3,.rainbow-braces .token.token.punctuation.brace-level-7{color:#61afef}.rainbow-braces .token.token.punctuation.brace-level-12,.rainbow-braces .token.token.punctuation.brace-level-4,.rainbow-braces .token.token.punctuation.brace-level-8{color:#c578dd}pre.diff-highlight>code .token.token.deleted:not(.prefix),pre>code.diff-highlight .token.token.deleted:not(.prefix){background-color:hsla(353,100%,66%,.15)}pre.diff-highlight>code .token.token.deleted:not(.prefix) ::-moz-selection,pre.diff-highlight>code .token.token.deleted:not(.prefix)::-moz-selection,pre>code.diff-highlight .token.token.deleted:not(.prefix) ::-moz-selection,pre>code.diff-highlight .token.token.deleted:not(.prefix)::-moz-selection{background-color:hsla(353,95%,66%,.25)}pre.diff-highlight>code .token.token.deleted:not(.prefix) ::selection,pre.diff-highlight>code .token.token.deleted:not(.prefix)::selection,pre>code.diff-highlight .token.token.deleted:not(.prefix) ::selection,pre>code.diff-highlight .token.token.deleted:not(.prefix)::selection{background-color:hsla(353,95%,66%,.25)}pre.diff-highlight>code .token.token.inserted:not(.prefix),pre>code.diff-highlight .token.token.inserted:not(.prefix){background-color:hsla(137,100%,55%,.15)}pre.diff-highlight>code .token.token.inserted:not(.prefix) ::-moz-selection,pre.diff-highlight>code .token.token.inserted:not(.prefix)::-moz-selection,pre>code.diff-highlight .token.token.inserted:not(.prefix) ::-moz-selection,pre>code.diff-highlight .token.token.inserted:not(.prefix)::-moz-selection{background-color:hsla(135,73%,55%,.25)}pre.diff-highlight>code .token.token.inserted:not(.prefix) ::selection,pre.diff-highlight>code .token.token.inserted:not(.prefix)::selection,pre>code.diff-highlight .token.token.inserted:not(.prefix) ::selection,pre>code.diff-highlight .token.token.inserted:not(.prefix)::selection{background-color:hsla(135,73%,55%,.25)}.prism-previewer-gradient.prism-previewer-gradient div,.prism-previewer.prism-previewer:before{border-color:#252830}.prism-previewer-color.prism-previewer-color:before,.prism-previewer-easing.prism-previewer-easing:before,.prism-previewer-gradient.prism-previewer-gradient div{border-radius:.3em}.prism-previewer.prism-previewer:after{border-top-color:#252830}.prism-previewer-flipped.prism-previewer-flipped.after{border-bottom-color:#252830}.prism-previewer-angle.prism-previewer-angle:before,.prism-previewer-easing.prism-previewer-easing,.prism-previewer-time.prism-previewer-time:before{background:#30353f}.prism-previewer-angle.prism-previewer-angle circle,.prism-previewer-time.prism-previewer-time circle{stroke:#aab1bf;stroke-opacity:1}.prism-previewer-easing.prism-previewer-easing circle,.prism-previewer-easing.prism-previewer-easing line,.prism-previewer-easing.prism-previewer-easing path{stroke:#aab1bf}.prism-previewer-easing.prism-previewer-easing circle{fill:transparent} \ No newline at end of file diff --git a/public/assets/prism-one-light.min.css b/public/assets/prism-one-light.min.css new file mode 100644 index 0000000..37a3b9d --- /dev/null +++ b/public/assets/prism-one-light.min.css @@ -0,0 +1 @@ +code[class*=language-],pre[class*=language-]{background:#f9f9f9;color:#383942;font-family:'Fira Code','Fira Mono',Menlo,Consolas,'DejaVu Sans Mono',monospace;direction:ltr;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;line-height:1.5;-moz-tab-size:2;-o-tab-size:2;tab-size:2;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection{background:#e5e5e5;color:inherit}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection{background:#e5e5e5;color:inherit}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto;border-radius:.3em}:not(pre)>code[class*=language-]{padding:.2em .3em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.prolog{color:#9fa0a6}.token.doctype,.token.entity,.token.punctuation{color:#383942}.token.atrule,.token.attr-name,.token.boolean,.token.class-name,.token.constant,.token.number{color:#b66a00}.token.keyword{color:#a625a4}.token.deleted,.token.important,.token.property,.token.symbol,.token.tag{color:#e35549}.token.attr-value,.token.attr-value>.token.punctuation,.token.builtin,.token.char,.token.inserted,.token.regex,.token.selector,.token.string{color:#50a04f}.token.function,.token.operator,.token.variable{color:#4078f1}.token.url{color:#0083bb}.token.attr-value>.token.punctuation.attr-equals,.token.special-attr>.token.attr-value>.token.value.css{color:#383942}.language-css .token.selector{color:#e35549}.language-css .token.property{color:#383942}.language-css .token.function,.language-css .token.url>.token.function{color:#0083bb}.language-css .token.url>.token.string.url{color:#50a04f}.language-css .token.atrule .token.rule,.language-css .token.important{color:#a625a4}.language-javascript .token.operator{color:#a625a4}.language-javascript .token.template-string>.token.interpolation>.token.interpolation-punctuation.punctuation{color:#c91142}.language-json .token.operator{color:#383942}.language-json .token.null.keyword{color:#b66a00}.language-markdown .token.url,.language-markdown .token.url-reference.url>.token.string,.language-markdown .token.url>.token.operator{color:#383942}.language-markdown .token.url>.token.content{color:#4078f1}.language-markdown .token.url-reference.url,.language-markdown .token.url>.token.url{color:#0083bb}.language-markdown .token.blockquote.punctuation,.language-markdown .token.hr.punctuation{color:#9fa0a6;font-style:italic}.language-markdown .token.code-snippet{color:#50a04f}.language-markdown .token.bold .token.content{color:#b66a00}.language-markdown .token.italic .token.content{color:#a625a4}.language-markdown .token.list.punctuation,.language-markdown .token.strike .token.content,.language-markdown .token.strike .token.punctuation,.language-markdown .token.title.important>.token.punctuation{color:#e35549}.token.bold{font-weight:700}.token.comment,.token.italic{font-style:italic}.token.entity{cursor:help}.token.namespace{opacity:.8}.token.token.cr:before,.token.token.lf:before,.token.token.space:before,.token.token.tab:not(:empty):before{color:hsla(230,8%,24%,.2)}div.code-toolbar>.toolbar.toolbar>.toolbar-item{margin-right:.4em}div.code-toolbar>.toolbar.toolbar>.toolbar-item>a,div.code-toolbar>.toolbar.toolbar>.toolbar-item>button,div.code-toolbar>.toolbar.toolbar>.toolbar-item>span{background:#e5e5e5;color:#696b76;padding:.1em .4em;border-radius:.3em}div.code-toolbar>.toolbar.toolbar>.toolbar-item>a:focus,div.code-toolbar>.toolbar.toolbar>.toolbar-item>a:hover,div.code-toolbar>.toolbar.toolbar>.toolbar-item>button:focus,div.code-toolbar>.toolbar.toolbar>.toolbar-item>button:hover,div.code-toolbar>.toolbar.toolbar>.toolbar-item>span:focus,div.code-toolbar>.toolbar.toolbar>.toolbar-item>span:hover{background:#c6c6c7;color:#383942}.line-highlight.line-highlight{background:hsla(230,8%,24%,.05)}.line-highlight.line-highlight:before,.line-highlight.line-highlight[data-end]:after{background:#e5e5e5;color:#383942;padding:.1em .6em;border-radius:.3em;box-shadow:0 2px 0 0 rgba(0,0,0,.2)}pre[id].linkable-line-numbers.linkable-line-numbers span.line-numbers-rows>span:hover:before{background-color:hsla(230,8%,24%,.05)}.command-line .command-line-prompt,.line-numbers.line-numbers .line-numbers-rows{border-right-color:hsla(230,8%,24%,.2)}.command-line .command-line-prompt>span:before,.line-numbers .line-numbers-rows>span:before{color:#9d9d9f}.rainbow-braces .token.token.punctuation.brace-level-1,.rainbow-braces .token.token.punctuation.brace-level-5,.rainbow-braces .token.token.punctuation.brace-level-9{color:#e35549}.rainbow-braces .token.token.punctuation.brace-level-10,.rainbow-braces .token.token.punctuation.brace-level-2,.rainbow-braces .token.token.punctuation.brace-level-6{color:#50a04f}.rainbow-braces .token.token.punctuation.brace-level-11,.rainbow-braces .token.token.punctuation.brace-level-3,.rainbow-braces .token.token.punctuation.brace-level-7{color:#4078f1}.rainbow-braces .token.token.punctuation.brace-level-12,.rainbow-braces .token.token.punctuation.brace-level-4,.rainbow-braces .token.token.punctuation.brace-level-8{color:#a625a4}pre.diff-highlight>code .token.token.deleted:not(.prefix),pre>code.diff-highlight .token.token.deleted:not(.prefix){background-color:hsla(353,100%,66%,.15)}pre.diff-highlight>code .token.token.deleted:not(.prefix) ::-moz-selection,pre.diff-highlight>code .token.token.deleted:not(.prefix)::-moz-selection,pre>code.diff-highlight .token.token.deleted:not(.prefix) ::-moz-selection,pre>code.diff-highlight .token.token.deleted:not(.prefix)::-moz-selection{background-color:hsla(353,95%,66%,.25)}pre.diff-highlight>code .token.token.deleted:not(.prefix) ::selection,pre.diff-highlight>code .token.token.deleted:not(.prefix)::selection,pre>code.diff-highlight .token.token.deleted:not(.prefix) ::selection,pre>code.diff-highlight .token.token.deleted:not(.prefix)::selection{background-color:hsla(353,95%,66%,.25)}pre.diff-highlight>code .token.token.inserted:not(.prefix),pre>code.diff-highlight .token.token.inserted:not(.prefix){background-color:hsla(137,100%,55%,.15)}pre.diff-highlight>code .token.token.inserted:not(.prefix) ::-moz-selection,pre.diff-highlight>code .token.token.inserted:not(.prefix)::-moz-selection,pre>code.diff-highlight .token.token.inserted:not(.prefix) ::-moz-selection,pre>code.diff-highlight .token.token.inserted:not(.prefix)::-moz-selection{background-color:hsla(135,73%,55%,.25)}pre.diff-highlight>code .token.token.inserted:not(.prefix) ::selection,pre.diff-highlight>code .token.token.inserted:not(.prefix)::selection,pre>code.diff-highlight .token.token.inserted:not(.prefix) ::selection,pre>code.diff-highlight .token.token.inserted:not(.prefix)::selection{background-color:hsla(135,73%,55%,.25)}.prism-previewer-gradient.prism-previewer-gradient div,.prism-previewer.prism-previewer:before{border-color:#f2f2f2}.prism-previewer-color.prism-previewer-color:before,.prism-previewer-easing.prism-previewer-easing:before,.prism-previewer-gradient.prism-previewer-gradient div{border-radius:.3em}.prism-previewer.prism-previewer:after{border-top-color:#f2f2f2}.prism-previewer-flipped.prism-previewer-flipped.after{border-bottom-color:#f2f2f2}.prism-previewer-angle.prism-previewer-angle:before,.prism-previewer-easing.prism-previewer-easing,.prism-previewer-time.prism-previewer-time:before{background:#fff}.prism-previewer-angle.prism-previewer-angle circle,.prism-previewer-time.prism-previewer-time circle{stroke:#383942;stroke-opacity:1}.prism-previewer-easing.prism-previewer-easing circle,.prism-previewer-easing.prism-previewer-easing line,.prism-previewer-easing.prism-previewer-easing path{stroke:#383942}.prism-previewer-easing.prism-previewer-easing circle{fill:transparent} \ No newline at end of file diff --git a/src/components/ArticleItem/ArticleItem.scss b/src/components/ArticleItem/ArticleItem.scss index ed35e2b..8a1e6eb 100644 --- a/src/components/ArticleItem/ArticleItem.scss +++ b/src/components/ArticleItem/ArticleItem.scss @@ -7,7 +7,7 @@ align-items: center; column-gap: 10px; color: var(--font-color); - padding: 8px 15px; + padding: 8px 0; & h3 { font-size: var(--font-size-md); font-weight: normal; @@ -22,12 +22,6 @@ white-space: nowrap; margin-bottom: 0; } - &:hover { - text-decoration: none; - } - } - &:hover { - background-color: var(--background-color-hover); } } diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index f7d9cdb..a24784c 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -22,3 +22,4 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props; + diff --git a/src/components/Footer/Footer.scss b/src/components/Footer/Footer.scss index 66ad8de..82847af 100644 --- a/src/components/Footer/Footer.scss +++ b/src/components/Footer/Footer.scss @@ -1,34 +1,34 @@ .footer { - & .container { - margin-top: 5rem; - padding: 25px 0 10px 0; - font-weight: 500; - border-top: 1px solid var(--border-color); - display: flex; - flex-direction: column; - align-items: center; - row-gap: 15px; - user-select: none; - } - &__links { - display: flex; - align-items: center; - column-gap: 25px; - list-style: none; - margin: 0; - padding: 0; - & li { - display: flex; - align-items: center; - column-gap: 7px; - & a { - color: var(--font-color); - font-size: var(--font-size-sm); - } - } - } - &__copy { - text-align: center; - font-size: var(--font-size-xs); - } + & .container { + margin-top: 5rem; + padding: 25px 0 10px 0; + font-weight: 500; + border-top: 1px solid var(--border-color); + display: flex; + flex-direction: column; + align-items: center; + row-gap: 15px; + user-select: none; + } + &__links { + display: flex; + align-items: center; + column-gap: 25px; + list-style: none; + margin: 0; + padding: 0; + & li { + display: flex; + align-items: center; + column-gap: 7px; + & a { + color: var(--font-color); + font-size: var(--font-size-sm); + } + } + } + &__copy { + text-align: center; + font-size: var(--font-size-xs); + } } diff --git a/src/components/Header/Header.astro b/src/components/Header/Header.astro index c953f40..fdf366e 100644 --- a/src/components/Header/Header.astro +++ b/src/components/Header/Header.astro @@ -40,6 +40,6 @@ const { pathname } = Astro.canonicalURL;
    - +
    diff --git a/src/layouts/article.astro b/src/layouts/article.astro index 4b34305..265b5a9 100644 --- a/src/layouts/article.astro +++ b/src/layouts/article.astro @@ -18,7 +18,10 @@ const { lang = 'ru', content } = Astro.props as Props; - + + + + diff --git a/src/pages/[article].astro b/src/pages/[article].astro index 28e79f8..4828f16 100644 --- a/src/pages/[article].astro +++ b/src/pages/[article].astro @@ -1,5 +1,4 @@ --- -import '@root/styles/prism-one-light.css'; import ArticleLayout from '@root/layouts/article.astro'; import { Markdown } from 'astro/components'; diff --git a/src/styles/global.scss b/src/styles/global.scss index 3b2e08b..18c6507 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -210,8 +210,8 @@ button { cursor: pointer; font-family: var(--font-family-base); font-weight: 500; - font-size: var(--font-size-sm); - padding: 4px 15px; + font-size: var(--font-size-md); + padding: 5px 17px; border: 1px solid var(--border-color); border-radius: var(--border-radius-md); background: none; diff --git a/src/styles/prism-one-dark.css b/src/styles/prism-one-dark.css deleted file mode 100644 index 94f23e3..0000000 --- a/src/styles/prism-one-dark.css +++ /dev/null @@ -1,440 +0,0 @@ -/** - * One Dark theme for prism.js - * Based on Atom's One Dark theme: https://github.com/atom/atom/tree/master/packages/one-dark-syntax - */ - -/** - * One Dark colours (accurate as of commit 8ae45ca on 6 Sep 2018) - * From colors.less - * --mono-1: hsl(220, 14%, 71%); - * --mono-2: hsl(220, 9%, 55%); - * --mono-3: hsl(220, 10%, 40%); - * --hue-1: hsl(187, 47%, 55%); - * --hue-2: hsl(207, 82%, 66%); - * --hue-3: hsl(286, 60%, 67%); - * --hue-4: hsl(95, 38%, 62%); - * --hue-5: hsl(355, 65%, 65%); - * --hue-5-2: hsl(5, 48%, 51%); - * --hue-6: hsl(29, 54%, 61%); - * --hue-6-2: hsl(39, 67%, 69%); - * --syntax-fg: hsl(220, 14%, 71%); - * --syntax-bg: hsl(220, 13%, 18%); - * --syntax-gutter: hsl(220, 14%, 45%); - * --syntax-guide: hsla(220, 14%, 71%, 0.15); - * --syntax-accent: hsl(220, 100%, 66%); - * From syntax-variables.less - * --syntax-selection-color: hsl(220, 13%, 28%); - * --syntax-gutter-background-color-selected: hsl(220, 13%, 26%); - * --syntax-cursor-line: hsla(220, 100%, 80%, 0.04); - */ - - code[class*="language-"], - pre[class*="language-"] { - background: hsl(220, 13%, 18%); - color: hsl(220, 14%, 71%); - text-shadow: 0 1px rgba(0, 0, 0, 0.3); - font-family: "Fira Code", "Fira Mono", Menlo, Consolas, "DejaVu Sans Mono", monospace; - direction: ltr; - text-align: left; - white-space: pre; - word-spacing: normal; - word-break: normal; - line-height: 1.5; - -moz-tab-size: 2; - -o-tab-size: 2; - tab-size: 2; - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; - } - - /* Selection */ - code[class*="language-"]::-moz-selection, - code[class*="language-"] *::-moz-selection, - pre[class*="language-"] *::-moz-selection { - background: hsl(220, 13%, 28%); - color: inherit; - text-shadow: none; - } - - code[class*="language-"]::selection, - code[class*="language-"] *::selection, - pre[class*="language-"] *::selection { - background: hsl(220, 13%, 28%); - color: inherit; - text-shadow: none; - } - - /* Code blocks */ - pre[class*="language-"] { - padding: 1em; - margin: 0.5em 0; - overflow: auto; - border-radius: 0.3em; - } - - /* Inline code */ - :not(pre) > code[class*="language-"] { - padding: 0.2em 0.3em; - border-radius: 0.3em; - white-space: normal; - } - - /* Print */ - @media print { - code[class*="language-"], - pre[class*="language-"] { - text-shadow: none; - } - } - - .token.comment, - .token.prolog, - .token.cdata { - color: hsl(220, 10%, 40%); - } - - .token.doctype, - .token.punctuation, - .token.entity { - color: hsl(220, 14%, 71%); - } - - .token.attr-name, - .token.class-name, - .token.boolean, - .token.constant, - .token.number, - .token.atrule { - color: hsl(29, 54%, 61%); - } - - .token.keyword { - color: hsl(286, 60%, 67%); - } - - .token.property, - .token.tag, - .token.symbol, - .token.deleted, - .token.important { - color: hsl(355, 65%, 65%); - } - - .token.selector, - .token.string, - .token.char, - .token.builtin, - .token.inserted, - .token.regex, - .token.attr-value, - .token.attr-value > .token.punctuation { - color: hsl(95, 38%, 62%); - } - - .token.variable, - .token.operator, - .token.function { - color: hsl(207, 82%, 66%); - } - - .token.url { - color: hsl(187, 47%, 55%); - } - - /* HTML overrides */ - .token.attr-value > .token.punctuation.attr-equals, - .token.special-attr > .token.attr-value > .token.value.css { - color: hsl(220, 14%, 71%); - } - - /* CSS overrides */ - .language-css .token.selector { - color: hsl(355, 65%, 65%); - } - - .language-css .token.property { - color: hsl(220, 14%, 71%); - } - - .language-css .token.function, - .language-css .token.url > .token.function { - color: hsl(187, 47%, 55%); - } - - .language-css .token.url > .token.string.url { - color: hsl(95, 38%, 62%); - } - - .language-css .token.important, - .language-css .token.atrule .token.rule { - color: hsl(286, 60%, 67%); - } - - /* JS overrides */ - .language-javascript .token.operator { - color: hsl(286, 60%, 67%); - } - - .language-javascript .token.template-string > .token.interpolation > .token.interpolation-punctuation.punctuation { - color: hsl(5, 48%, 51%); - } - - /* JSON overrides */ - .language-json .token.operator { - color: hsl(220, 14%, 71%); - } - - .language-json .token.null.keyword { - color: hsl(29, 54%, 61%); - } - - /* MD overrides */ - .language-markdown .token.url, - .language-markdown .token.url > .token.operator, - .language-markdown .token.url-reference.url > .token.string { - color: hsl(220, 14%, 71%); - } - - .language-markdown .token.url > .token.content { - color: hsl(207, 82%, 66%); - } - - .language-markdown .token.url > .token.url, - .language-markdown .token.url-reference.url { - color: hsl(187, 47%, 55%); - } - - .language-markdown .token.blockquote.punctuation, - .language-markdown .token.hr.punctuation { - color: hsl(220, 10%, 40%); - font-style: italic; - } - - .language-markdown .token.code-snippet { - color: hsl(95, 38%, 62%); - } - - .language-markdown .token.bold .token.content { - color: hsl(29, 54%, 61%); - } - - .language-markdown .token.italic .token.content { - color: hsl(286, 60%, 67%); - } - - .language-markdown .token.strike .token.content, - .language-markdown .token.strike .token.punctuation, - .language-markdown .token.list.punctuation, - .language-markdown .token.title.important > .token.punctuation { - color: hsl(355, 65%, 65%); - } - - /* General */ - .token.bold { - font-weight: bold; - } - - .token.comment, - .token.italic { - font-style: italic; - } - - .token.entity { - cursor: help; - } - - .token.namespace { - opacity: 0.8; - } - - /* Plugin overrides */ - /* Selectors should have higher specificity than those in the plugins' default stylesheets */ - - /* Show Invisibles plugin overrides */ - .token.token.tab:not(:empty):before, - .token.token.cr:before, - .token.token.lf:before, - .token.token.space:before { - color: hsla(220, 14%, 71%, 0.15); - text-shadow: none; - } - - /* Toolbar plugin overrides */ - /* Space out all buttons and move them away from the right edge of the code block */ - div.code-toolbar > .toolbar.toolbar > .toolbar-item { - margin-right: 0.4em; - } - - /* Styling the buttons */ - div.code-toolbar > .toolbar.toolbar > .toolbar-item > button, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > a, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > span { - background: hsl(220, 13%, 26%); - color: hsl(220, 9%, 55%); - padding: 0.1em 0.4em; - border-radius: 0.3em; - } - - div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:hover, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:focus, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:hover, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:focus, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:hover, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:focus { - background: hsl(220, 13%, 28%); - color: hsl(220, 14%, 71%); - } - - /* Line Highlight plugin overrides */ - /* The highlighted line itself */ - .line-highlight.line-highlight { - background: hsla(220, 100%, 80%, 0.04); - } - - /* Default line numbers in Line Highlight plugin */ - .line-highlight.line-highlight:before, - .line-highlight.line-highlight[data-end]:after { - background: hsl(220, 13%, 26%); - color: hsl(220, 14%, 71%); - padding: 0.1em 0.6em; - border-radius: 0.3em; - box-shadow: 0 2px 0 0 rgba(0, 0, 0, 0.2); /* same as Toolbar plugin default */ - } - - /* Hovering over a linkable line number (in the gutter area) */ - /* Requires Line Numbers plugin as well */ - pre[id].linkable-line-numbers.linkable-line-numbers span.line-numbers-rows > span:hover:before { - background-color: hsla(220, 100%, 80%, 0.04); - } - - /* Line Numbers and Command Line plugins overrides */ - /* Line separating gutter from coding area */ - .line-numbers.line-numbers .line-numbers-rows, - .command-line .command-line-prompt { - border-right-color: hsla(220, 14%, 71%, 0.15); - } - - /* Stuff in the gutter */ - .line-numbers .line-numbers-rows > span:before, - .command-line .command-line-prompt > span:before { - color: hsl(220, 14%, 45%); - } - - /* Match Braces plugin overrides */ - /* Note: Outline colour is inherited from the braces */ - .rainbow-braces .token.token.punctuation.brace-level-1, - .rainbow-braces .token.token.punctuation.brace-level-5, - .rainbow-braces .token.token.punctuation.brace-level-9 { - color: hsl(355, 65%, 65%); - } - - .rainbow-braces .token.token.punctuation.brace-level-2, - .rainbow-braces .token.token.punctuation.brace-level-6, - .rainbow-braces .token.token.punctuation.brace-level-10 { - color: hsl(95, 38%, 62%); - } - - .rainbow-braces .token.token.punctuation.brace-level-3, - .rainbow-braces .token.token.punctuation.brace-level-7, - .rainbow-braces .token.token.punctuation.brace-level-11 { - color: hsl(207, 82%, 66%); - } - - .rainbow-braces .token.token.punctuation.brace-level-4, - .rainbow-braces .token.token.punctuation.brace-level-8, - .rainbow-braces .token.token.punctuation.brace-level-12 { - color: hsl(286, 60%, 67%); - } - - /* Diff Highlight plugin overrides */ - /* Taken from https://github.com/atom/github/blob/master/styles/variables.less */ - pre.diff-highlight > code .token.token.deleted:not(.prefix), - pre > code.diff-highlight .token.token.deleted:not(.prefix) { - background-color: hsla(353, 100%, 66%, 0.15); - } - - pre.diff-highlight > code .token.token.deleted:not(.prefix)::-moz-selection, - pre.diff-highlight > code .token.token.deleted:not(.prefix) *::-moz-selection, - pre > code.diff-highlight .token.token.deleted:not(.prefix)::-moz-selection, - pre > code.diff-highlight .token.token.deleted:not(.prefix) *::-moz-selection { - background-color: hsla(353, 95%, 66%, 0.25); - } - - pre.diff-highlight > code .token.token.deleted:not(.prefix)::selection, - pre.diff-highlight > code .token.token.deleted:not(.prefix) *::selection, - pre > code.diff-highlight .token.token.deleted:not(.prefix)::selection, - pre > code.diff-highlight .token.token.deleted:not(.prefix) *::selection { - background-color: hsla(353, 95%, 66%, 0.25); - } - - pre.diff-highlight > code .token.token.inserted:not(.prefix), - pre > code.diff-highlight .token.token.inserted:not(.prefix) { - background-color: hsla(137, 100%, 55%, 0.15); - } - - pre.diff-highlight > code .token.token.inserted:not(.prefix)::-moz-selection, - pre.diff-highlight > code .token.token.inserted:not(.prefix) *::-moz-selection, - pre > code.diff-highlight .token.token.inserted:not(.prefix)::-moz-selection, - pre > code.diff-highlight .token.token.inserted:not(.prefix) *::-moz-selection { - background-color: hsla(135, 73%, 55%, 0.25); - } - - pre.diff-highlight > code .token.token.inserted:not(.prefix)::selection, - pre.diff-highlight > code .token.token.inserted:not(.prefix) *::selection, - pre > code.diff-highlight .token.token.inserted:not(.prefix)::selection, - pre > code.diff-highlight .token.token.inserted:not(.prefix) *::selection { - background-color: hsla(135, 73%, 55%, 0.25); - } - - /* Previewers plugin overrides */ - /* Based on https://github.com/atom-community/atom-ide-datatip/blob/master/styles/atom-ide-datatips.less and https://github.com/atom/atom/blob/master/packages/one-dark-ui */ - /* Border around popup */ - .prism-previewer.prism-previewer:before, - .prism-previewer-gradient.prism-previewer-gradient div { - border-color: hsl(224, 13%, 17%); - } - - /* Angle and time should remain as circles and are hence not included */ - .prism-previewer-color.prism-previewer-color:before, - .prism-previewer-gradient.prism-previewer-gradient div, - .prism-previewer-easing.prism-previewer-easing:before { - border-radius: 0.3em; - } - - /* Triangles pointing to the code */ - .prism-previewer.prism-previewer:after { - border-top-color: hsl(224, 13%, 17%); - } - - .prism-previewer-flipped.prism-previewer-flipped.after { - border-bottom-color: hsl(224, 13%, 17%); - } - - /* Background colour within the popup */ - .prism-previewer-angle.prism-previewer-angle:before, - .prism-previewer-time.prism-previewer-time:before, - .prism-previewer-easing.prism-previewer-easing { - background: hsl(219, 13%, 22%); - } - - /* For angle, this is the positive area (eg. 90deg will display one quadrant in this colour) */ - /* For time, this is the alternate colour */ - .prism-previewer-angle.prism-previewer-angle circle, - .prism-previewer-time.prism-previewer-time circle { - stroke: hsl(220, 14%, 71%); - stroke-opacity: 1; - } - - /* Stroke colours of the handle, direction point, and vector itself */ - .prism-previewer-easing.prism-previewer-easing circle, - .prism-previewer-easing.prism-previewer-easing path, - .prism-previewer-easing.prism-previewer-easing line { - stroke: hsl(220, 14%, 71%); - } - - /* Fill colour of the handle */ - .prism-previewer-easing.prism-previewer-easing circle { - fill: transparent; - } \ No newline at end of file diff --git a/src/styles/prism-one-light.css b/src/styles/prism-one-light.css deleted file mode 100644 index 58f651d..0000000 --- a/src/styles/prism-one-light.css +++ /dev/null @@ -1,428 +0,0 @@ -/** - * One Light theme for prism.js - * Based on Atom's One Light theme: https://github.com/atom/atom/tree/master/packages/one-light-syntax - */ - -/** - * One Light colours (accurate as of commit eb064bf on 19 Feb 2021) - * From colors.less - * --mono-1: hsl(230, 8%, 24%); - * --mono-2: hsl(230, 6%, 44%); - * --mono-3: hsl(230, 4%, 64%) - * --hue-1: hsl(198, 99%, 37%); - * --hue-2: hsl(221, 87%, 60%); - * --hue-3: hsl(301, 63%, 40%); - * --hue-4: hsl(119, 34%, 47%); - * --hue-5: hsl(5, 74%, 59%); - * --hue-5-2: hsl(344, 84%, 43%); - * --hue-6: hsl(35, 99%, 36%); - * --hue-6-2: hsl(35, 99%, 40%); - * --syntax-fg: hsl(230, 8%, 24%); - * --syntax-bg: hsl(230, 1%, 98%); - * --syntax-gutter: hsl(230, 1%, 62%); - * --syntax-guide: hsla(230, 8%, 24%, 0.2); - * --syntax-accent: hsl(230, 100%, 66%); - * From syntax-variables.less - * --syntax-selection-color: hsl(230, 1%, 90%); - * --syntax-gutter-background-color-selected: hsl(230, 1%, 90%); - * --syntax-cursor-line: hsla(230, 8%, 24%, 0.05); - */ - - code[class*="language-"], - pre[class*="language-"] { - background: hsl(230, 1%, 98%); - color: hsl(230, 8%, 24%); - font-family: "Fira Code", "Fira Mono", Menlo, Consolas, "DejaVu Sans Mono", monospace; - direction: ltr; - text-align: left; - white-space: pre; - word-spacing: normal; - word-break: normal; - line-height: 1.5; - -moz-tab-size: 2; - -o-tab-size: 2; - tab-size: 2; - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; - } - - /* Selection */ - code[class*="language-"]::-moz-selection, - code[class*="language-"] *::-moz-selection, - pre[class*="language-"] *::-moz-selection { - background: hsl(230, 1%, 90%); - color: inherit; - } - - code[class*="language-"]::selection, - code[class*="language-"] *::selection, - pre[class*="language-"] *::selection { - background: hsl(230, 1%, 90%); - color: inherit; - } - - /* Code blocks */ - pre[class*="language-"] { - padding: 1em; - margin: 0.5em 0; - overflow: auto; - border-radius: 0.3em; - } - - /* Inline code */ - :not(pre) > code[class*="language-"] { - padding: 0.2em 0.3em; - border-radius: 0.3em; - white-space: normal; - } - - .token.comment, - .token.prolog, - .token.cdata { - color: hsl(230, 4%, 64%); - } - - .token.doctype, - .token.punctuation, - .token.entity { - color: hsl(230, 8%, 24%); - } - - .token.attr-name, - .token.class-name, - .token.boolean, - .token.constant, - .token.number, - .token.atrule { - color: hsl(35, 99%, 36%); - } - - .token.keyword { - color: hsl(301, 63%, 40%); - } - - .token.property, - .token.tag, - .token.symbol, - .token.deleted, - .token.important { - color: hsl(5, 74%, 59%); - } - - .token.selector, - .token.string, - .token.char, - .token.builtin, - .token.inserted, - .token.regex, - .token.attr-value, - .token.attr-value > .token.punctuation { - color: hsl(119, 34%, 47%); - } - - .token.variable, - .token.operator, - .token.function { - color: hsl(221, 87%, 60%); - } - - .token.url { - color: hsl(198, 99%, 37%); - } - - /* HTML overrides */ - .token.attr-value > .token.punctuation.attr-equals, - .token.special-attr > .token.attr-value > .token.value.css { - color: hsl(230, 8%, 24%); - } - - /* CSS overrides */ - .language-css .token.selector { - color: hsl(5, 74%, 59%); - } - - .language-css .token.property { - color: hsl(230, 8%, 24%); - } - - .language-css .token.function, - .language-css .token.url > .token.function { - color: hsl(198, 99%, 37%); - } - - .language-css .token.url > .token.string.url { - color: hsl(119, 34%, 47%); - } - - .language-css .token.important, - .language-css .token.atrule .token.rule { - color: hsl(301, 63%, 40%); - } - - /* JS overrides */ - .language-javascript .token.operator { - color: hsl(301, 63%, 40%); - } - - .language-javascript .token.template-string > .token.interpolation > .token.interpolation-punctuation.punctuation { - color: hsl(344, 84%, 43%); - } - - /* JSON overrides */ - .language-json .token.operator { - color: hsl(230, 8%, 24%); - } - - .language-json .token.null.keyword { - color: hsl(35, 99%, 36%); - } - - /* MD overrides */ - .language-markdown .token.url, - .language-markdown .token.url > .token.operator, - .language-markdown .token.url-reference.url > .token.string { - color: hsl(230, 8%, 24%); - } - - .language-markdown .token.url > .token.content { - color: hsl(221, 87%, 60%); - } - - .language-markdown .token.url > .token.url, - .language-markdown .token.url-reference.url { - color: hsl(198, 99%, 37%); - } - - .language-markdown .token.blockquote.punctuation, - .language-markdown .token.hr.punctuation { - color: hsl(230, 4%, 64%); - font-style: italic; - } - - .language-markdown .token.code-snippet { - color: hsl(119, 34%, 47%); - } - - .language-markdown .token.bold .token.content { - color: hsl(35, 99%, 36%); - } - - .language-markdown .token.italic .token.content { - color: hsl(301, 63%, 40%); - } - - .language-markdown .token.strike .token.content, - .language-markdown .token.strike .token.punctuation, - .language-markdown .token.list.punctuation, - .language-markdown .token.title.important > .token.punctuation { - color: hsl(5, 74%, 59%); - } - - /* General */ - .token.bold { - font-weight: bold; - } - - .token.comment, - .token.italic { - font-style: italic; - } - - .token.entity { - cursor: help; - } - - .token.namespace { - opacity: 0.8; - } - - /* Plugin overrides */ - /* Selectors should have higher specificity than those in the plugins' default stylesheets */ - - /* Show Invisibles plugin overrides */ - .token.token.tab:not(:empty):before, - .token.token.cr:before, - .token.token.lf:before, - .token.token.space:before { - color: hsla(230, 8%, 24%, 0.2); - } - - /* Toolbar plugin overrides */ - /* Space out all buttons and move them away from the right edge of the code block */ - div.code-toolbar > .toolbar.toolbar > .toolbar-item { - margin-right: 0.4em; - } - - /* Styling the buttons */ - div.code-toolbar > .toolbar.toolbar > .toolbar-item > button, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > a, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > span { - background: hsl(230, 1%, 90%); - color: hsl(230, 6%, 44%); - padding: 0.1em 0.4em; - border-radius: 0.3em; - } - - div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:hover, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:focus, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:hover, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:focus, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:hover, - div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:focus { - background: hsl(230, 1%, 78%); /* custom: darken(--syntax-bg, 20%) */ - color: hsl(230, 8%, 24%); - } - - /* Line Highlight plugin overrides */ - /* The highlighted line itself */ - .line-highlight.line-highlight { - background: hsla(230, 8%, 24%, 0.05); - } - - /* Default line numbers in Line Highlight plugin */ - .line-highlight.line-highlight:before, - .line-highlight.line-highlight[data-end]:after { - background: hsl(230, 1%, 90%); - color: hsl(230, 8%, 24%); - padding: 0.1em 0.6em; - border-radius: 0.3em; - box-shadow: 0 2px 0 0 rgba(0, 0, 0, 0.2); /* same as Toolbar plugin default */ - } - - /* Hovering over a linkable line number (in the gutter area) */ - /* Requires Line Numbers plugin as well */ - pre[id].linkable-line-numbers.linkable-line-numbers span.line-numbers-rows > span:hover:before { - background-color: hsla(230, 8%, 24%, 0.05); - } - - /* Line Numbers and Command Line plugins overrides */ - /* Line separating gutter from coding area */ - .line-numbers.line-numbers .line-numbers-rows, - .command-line .command-line-prompt { - border-right-color: hsla(230, 8%, 24%, 0.2); - } - - /* Stuff in the gutter */ - .line-numbers .line-numbers-rows > span:before, - .command-line .command-line-prompt > span:before { - color: hsl(230, 1%, 62%); - } - - /* Match Braces plugin overrides */ - /* Note: Outline colour is inherited from the braces */ - .rainbow-braces .token.token.punctuation.brace-level-1, - .rainbow-braces .token.token.punctuation.brace-level-5, - .rainbow-braces .token.token.punctuation.brace-level-9 { - color: hsl(5, 74%, 59%); - } - - .rainbow-braces .token.token.punctuation.brace-level-2, - .rainbow-braces .token.token.punctuation.brace-level-6, - .rainbow-braces .token.token.punctuation.brace-level-10 { - color: hsl(119, 34%, 47%); - } - - .rainbow-braces .token.token.punctuation.brace-level-3, - .rainbow-braces .token.token.punctuation.brace-level-7, - .rainbow-braces .token.token.punctuation.brace-level-11 { - color: hsl(221, 87%, 60%); - } - - .rainbow-braces .token.token.punctuation.brace-level-4, - .rainbow-braces .token.token.punctuation.brace-level-8, - .rainbow-braces .token.token.punctuation.brace-level-12 { - color: hsl(301, 63%, 40%); - } - - /* Diff Highlight plugin overrides */ - /* Taken from https://github.com/atom/github/blob/master/styles/variables.less */ - pre.diff-highlight > code .token.token.deleted:not(.prefix), - pre > code.diff-highlight .token.token.deleted:not(.prefix) { - background-color: hsla(353, 100%, 66%, 0.15); - } - - pre.diff-highlight > code .token.token.deleted:not(.prefix)::-moz-selection, - pre.diff-highlight > code .token.token.deleted:not(.prefix) *::-moz-selection, - pre > code.diff-highlight .token.token.deleted:not(.prefix)::-moz-selection, - pre > code.diff-highlight .token.token.deleted:not(.prefix) *::-moz-selection { - background-color: hsla(353, 95%, 66%, 0.25); - } - - pre.diff-highlight > code .token.token.deleted:not(.prefix)::selection, - pre.diff-highlight > code .token.token.deleted:not(.prefix) *::selection, - pre > code.diff-highlight .token.token.deleted:not(.prefix)::selection, - pre > code.diff-highlight .token.token.deleted:not(.prefix) *::selection { - background-color: hsla(353, 95%, 66%, 0.25); - } - - pre.diff-highlight > code .token.token.inserted:not(.prefix), - pre > code.diff-highlight .token.token.inserted:not(.prefix) { - background-color: hsla(137, 100%, 55%, 0.15); - } - - pre.diff-highlight > code .token.token.inserted:not(.prefix)::-moz-selection, - pre.diff-highlight > code .token.token.inserted:not(.prefix) *::-moz-selection, - pre > code.diff-highlight .token.token.inserted:not(.prefix)::-moz-selection, - pre > code.diff-highlight .token.token.inserted:not(.prefix) *::-moz-selection { - background-color: hsla(135, 73%, 55%, 0.25); - } - - pre.diff-highlight > code .token.token.inserted:not(.prefix)::selection, - pre.diff-highlight > code .token.token.inserted:not(.prefix) *::selection, - pre > code.diff-highlight .token.token.inserted:not(.prefix)::selection, - pre > code.diff-highlight .token.token.inserted:not(.prefix) *::selection { - background-color: hsla(135, 73%, 55%, 0.25); - } - - /* Previewers plugin overrides */ - /* Based on https://github.com/atom-community/atom-ide-datatip/blob/master/styles/atom-ide-datatips.less and https://github.com/atom/atom/blob/master/packages/one-light-ui */ - /* Border around popup */ - .prism-previewer.prism-previewer:before, - .prism-previewer-gradient.prism-previewer-gradient div { - border-color: hsl(0, 0, 95%); - } - - /* Angle and time should remain as circles and are hence not included */ - .prism-previewer-color.prism-previewer-color:before, - .prism-previewer-gradient.prism-previewer-gradient div, - .prism-previewer-easing.prism-previewer-easing:before { - border-radius: 0.3em; - } - - /* Triangles pointing to the code */ - .prism-previewer.prism-previewer:after { - border-top-color: hsl(0, 0, 95%); - } - - .prism-previewer-flipped.prism-previewer-flipped.after { - border-bottom-color: hsl(0, 0, 95%); - } - - /* Background colour within the popup */ - .prism-previewer-angle.prism-previewer-angle:before, - .prism-previewer-time.prism-previewer-time:before, - .prism-previewer-easing.prism-previewer-easing { - background: hsl(0, 0%, 100%); - } - - /* For angle, this is the positive area (eg. 90deg will display one quadrant in this colour) */ - /* For time, this is the alternate colour */ - .prism-previewer-angle.prism-previewer-angle circle, - .prism-previewer-time.prism-previewer-time circle { - stroke: hsl(230, 8%, 24%); - stroke-opacity: 1; - } - - /* Stroke colours of the handle, direction point, and vector itself */ - .prism-previewer-easing.prism-previewer-easing circle, - .prism-previewer-easing.prism-previewer-easing path, - .prism-previewer-easing.prism-previewer-easing line { - stroke: hsl(230, 8%, 24%); - } - - /* Fill colour of the handle */ - .prism-previewer-easing.prism-previewer-easing circle { - fill: transparent; - } \ No newline at end of file From 5f76f318db5bc7bd47c9eba4658fe6d330e35fe9 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Tue, 26 Jul 2022 01:01:56 +0300 Subject: [PATCH 23/70] invert color svg icons --- public/assets/dark.css | 10 ++ public/assets/light.css | 4 + src/components/ContactsList/ContactsList.scss | 4 + src/components/Header/Header.scss | 96 +++++++++---------- .../Header/NavToggle/NavToggle.scss | 14 ++- src/components/Header/NavToggle/NavToggle.tsx | 23 ++++- src/components/SearchInput/SearchInput.scss | 2 + src/icons/email.svg | 2 +- src/icons/socket-io.svg | 8 +- src/styles/global.scss | 4 +- 10 files changed, 105 insertions(+), 62 deletions(-) diff --git a/public/assets/dark.css b/public/assets/dark.css index a4b81bd..b6ec3e2 100644 --- a/public/assets/dark.css +++ b/public/assets/dark.css @@ -16,4 +16,14 @@ --background-btn-link: var(--color-gray-800); --background-btn-link-active: var(--color-gray-700); --background-inputs-color: var(--color-gray-800); + + /* Icons */ + --icon-primary: var(--color-white); + --icon-secondary: var(--color-gray-100); + --icon-filter: invert(100%); +} + +.header svg, +.site-content svg { + filter: var(--icon-filter); } diff --git a/public/assets/light.css b/public/assets/light.css index 7e40887..1daf165 100644 --- a/public/assets/light.css +++ b/public/assets/light.css @@ -16,4 +16,8 @@ --background-btn-link: var(--color-white); --background-btn-link-active: var(--color-white); --background-inputs-color: var(--color-white); + + /* Icons */ + --icon-primary: var(--color-white); + --icon-secondary: var(--color-gray-700); } diff --git a/src/components/ContactsList/ContactsList.scss b/src/components/ContactsList/ContactsList.scss index 9619d4a..feec5f3 100644 --- a/src/components/ContactsList/ContactsList.scss +++ b/src/components/ContactsList/ContactsList.scss @@ -8,4 +8,8 @@ display: flex; column-gap: 5px; } + + & svg { + filter: none; + } } diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss index 40bbdf9..b3e246e 100644 --- a/src/components/Header/Header.scss +++ b/src/components/Header/Header.scss @@ -65,55 +65,51 @@ } } &__button { - cursor: pointer; - width: 30px; - height: 21px; - position: relative; - transform: rotate(0deg); - background: none; - border: none; - &:hover { - border: none; - opacity: var(--opacity-hover); - } - & span { - pointer-events: none; - display: block; - position: absolute; - height: 3px; - width: 100%; - background: var(--font-color); - border-radius: 7px; - opacity: 1; - left: 0; - } - & span:nth-child(1) { - top: 2px; - transform-origin: left center; - } - & span:nth-child(2) { - top: 9px; - transform-origin: left center; - } - & span:nth-child(3) { - top: 16px; - transform-origin: left center; - } - &[aria-pressed='true'] { - & span:nth-child(1) { - transform: rotate(45deg); - top: -1px; - left: 5px; - } - & span:nth-child(2) { - display: none; - } - & span:nth-child(3) { - transform: rotate(-45deg); - top: 20px; - left: 5px; - } - } + // cursor: pointer; + // background: none; + // border: none; + // &:hover { + // border: none; + // opacity: var(--opacity-hover); + // } + // & span { + // pointer-events: none; + // display: block; + // position: absolute; + // height: 3px; + // width: 100%; + // background: var(--font-color); + // border-radius: 7px; + // opacity: 1; + // left: 0; + // } + // & span:nth-child(1) { + // top: 2px; + // transform-origin: left center; + // } + // & span:nth-child(2) { + // top: 9px; + // transform-origin: left center; + // } + // & span:nth-child(3) { + // top: 16px; + // transform-origin: left center; + // } + // &[aria-pressed='true'] { + // & span:nth-child(1) { + // transform: rotate(45deg); + // top: -1px; + // left: 5px; + // } + // & span:nth-child(2) { + // display: none; + // } + // & span:nth-child(3) { + // transform: rotate(-45deg); + // top: 20px; + // left: 5px; + // } + // } } } @@ -160,7 +156,7 @@ justify-content: center; } } - &__button { + & .nav-toggle { position: absolute; right: var(--content-padding); } diff --git a/src/components/Header/NavToggle/NavToggle.scss b/src/components/Header/NavToggle/NavToggle.scss index a708442..7ca42f4 100644 --- a/src/components/Header/NavToggle/NavToggle.scss +++ b/src/components/Header/NavToggle/NavToggle.scss @@ -1,5 +1,17 @@ +.nav-toggle { + display: flex; + padding: 0; + cursor: pointer; + // background: none; + border: none; + &:hover { + border: none; + opacity: var(--opacity-hover); + } +} + @media screen and (min-width: 769px) { - #nav-toggle { + .nav-toggle { display: none; } } diff --git a/src/components/Header/NavToggle/NavToggle.tsx b/src/components/Header/NavToggle/NavToggle.tsx index e858b7f..e8ca43a 100644 --- a/src/components/Header/NavToggle/NavToggle.tsx +++ b/src/components/Header/NavToggle/NavToggle.tsx @@ -3,6 +3,23 @@ import type { Component } from 'solid-js'; import { createSignal, createEffect } from 'solid-js'; import './NavToggle.scss'; +const MenuIcon: Component = () => ( + + + +); + +const CloseIcon: Component = () => ( + + + +); + const NavToggle: Component = () => { const [isNavShown, setIsNavShown] = createSignal(false); @@ -20,10 +37,8 @@ const NavToggle: Component = () => { }); return ( - ); }; diff --git a/src/components/SearchInput/SearchInput.scss b/src/components/SearchInput/SearchInput.scss index 1ba730e..a6ffffa 100644 --- a/src/components/SearchInput/SearchInput.scss +++ b/src/components/SearchInput/SearchInput.scss @@ -9,7 +9,9 @@ position: absolute; left: 8px; fill: var(--font-color-grayer); + filter: none; } + & input { padding-left: 40px; color: var(--font-color-gray); diff --git a/src/icons/email.svg b/src/icons/email.svg index 0983d16..7b38190 100644 --- a/src/icons/email.svg +++ b/src/icons/email.svg @@ -1,6 +1,6 @@ - + diff --git a/src/icons/socket-io.svg b/src/icons/socket-io.svg index 6d13e60..b68bfc4 100644 --- a/src/icons/socket-io.svg +++ b/src/icons/socket-io.svg @@ -1,11 +1,9 @@ - - - - + + - + diff --git a/src/styles/global.scss b/src/styles/global.scss index 18c6507..b6d7302 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -211,10 +211,12 @@ button { font-family: var(--font-family-base); font-weight: 500; font-size: var(--font-size-md); - padding: 5px 17px; + color: var(--font-color); + padding: 4px 16px; border: 1px solid var(--border-color); border-radius: var(--border-radius-md); background: none; + font-size: var(--font-size-sm); &:hover { border: 1px solid var(--border-color-hover); } From 75fa8117f66429a5c0640d58922f4898a11d35cf Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 27 Jul 2022 22:38:43 +0300 Subject: [PATCH 24/70] theme toggling --- package.json | 2 +- public/assets/dark.css | 29 ---- public/assets/light.css | 23 --- src/components/ArticleItem/ArticleItem.tsx | 4 +- src/components/ArticlePost/ArticlePost.astro | 2 - src/components/ArticlesList/ArticlesList.tsx | 1 - src/components/BaseHead.astro | 8 +- .../ContactsList/ContactsList.astro | 6 +- src/components/Header/Header.astro | 2 +- src/components/Header/Header.scss | 50 +------ .../Header/NavToggle/NavToggle.scss | 4 +- src/components/Header/NavToggle/NavToggle.tsx | 13 +- src/components/ProjectItem/ProjectItem.astro | 2 - .../RecentArticles/RecentArticles.astro | 2 - src/components/SearchInput/SearchInput.scss | 2 +- src/components/SearchInput/SearchInput.tsx | 2 +- src/components/SkillsBlock/SkillsBlock.astro | 2 - .../ThemeSwticher/ThemeSwitcher.astro | 8 - .../ThemeSwticher/ThemeSwitcher.scss | 5 + .../ThemeSwticher/ThemeSwitcher.tsx | 62 ++++++++ src/components/ThemeSwticher/index.ts | 2 +- src/config.ts | 4 + src/layouts/article.astro | 1 - src/layouts/default.astro | 2 +- src/pages/articles.astro | 2 - src/pages/index.astro | 2 - src/scripts/detect-theme.astro | 20 +++ src/scripts/index.ts | 1 + src/styles/global.scss | 101 +------------ src/styles/theme.scss | 140 ++++++++++++++++++ src/types/index.ts | 25 ---- src/types/main.d.ts | 39 +++++ src/utils/articles.ts | 2 - tsconfig.json | 3 +- 34 files changed, 304 insertions(+), 269 deletions(-) delete mode 100644 public/assets/dark.css delete mode 100644 public/assets/light.css delete mode 100644 src/components/ThemeSwticher/ThemeSwitcher.astro create mode 100644 src/components/ThemeSwticher/ThemeSwitcher.tsx create mode 100644 src/scripts/detect-theme.astro create mode 100644 src/scripts/index.ts create mode 100644 src/styles/theme.scss delete mode 100644 src/types/index.ts create mode 100644 src/types/main.d.ts diff --git a/package.json b/package.json index fcaa6d9..d6d80cf 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "scripts": { "dev": "astro dev --host", "start": "astro dev", - "build": "astro build", + "build": "astro check && tsc --noEmit && astro build", "preview": "astro preview --host", "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json}\"", "lint": "eslint '**/*.{js,mjs,ts,tsx}'" diff --git a/public/assets/dark.css b/public/assets/dark.css deleted file mode 100644 index b6ec3e2..0000000 --- a/public/assets/dark.css +++ /dev/null @@ -1,29 +0,0 @@ -:root { - /* Fonts */ - --font-color: var(--color-white); - --font-color-gray: var(--color-gray-100); - --font-color-grayer: var(--color-gray-200); - - /* Border */ - --border-color: var(--color-gray-700); - --border-color-hover: var(--color-gray-600); - - /* Elements */ - --background-body-color: var(--color-gray-900); - --background-header-color: var(--color-gray-900); - --background-inline-code: var(--color-gray-800); - --background-color-hover: var(--color-gray-800); - --background-btn-link: var(--color-gray-800); - --background-btn-link-active: var(--color-gray-700); - --background-inputs-color: var(--color-gray-800); - - /* Icons */ - --icon-primary: var(--color-white); - --icon-secondary: var(--color-gray-100); - --icon-filter: invert(100%); -} - -.header svg, -.site-content svg { - filter: var(--icon-filter); -} diff --git a/public/assets/light.css b/public/assets/light.css deleted file mode 100644 index 1daf165..0000000 --- a/public/assets/light.css +++ /dev/null @@ -1,23 +0,0 @@ -:root { - /* Fonts */ - --font-color: var(--color-black); - --font-color-gray: var(--color-gray-500); - --font-color-grayer: var(--color-gray-700); - - /* Border */ - --border-color: var(--color-gray-100); - --border-color-hover: var(--color-gray-400); - - /* Elements */ - --background-body-color: var(--color-white); - --background-header-color: var(--color-white); - --background-inline-code: rgba(0, 0, 0, 0.05); - --background-color-hover: var(--color-gray-50); - --background-btn-link: var(--color-white); - --background-btn-link-active: var(--color-white); - --background-inputs-color: var(--color-white); - - /* Icons */ - --icon-primary: var(--color-white); - --icon-secondary: var(--color-gray-700); -} diff --git a/src/components/ArticleItem/ArticleItem.tsx b/src/components/ArticleItem/ArticleItem.tsx index b23fe7c..7dd8672 100644 --- a/src/components/ArticleItem/ArticleItem.tsx +++ b/src/components/ArticleItem/ArticleItem.tsx @@ -1,8 +1,6 @@ -import type { ArticleType } from '@root/types'; - -import './ArticleItem.scss'; import { Component } from 'solid-js'; import { DateFormatter } from '@utils/date'; +import './ArticleItem.scss'; export type ArticleItemProps = { data: ArticleType; diff --git a/src/components/ArticlePost/ArticlePost.astro b/src/components/ArticlePost/ArticlePost.astro index 282e96f..9afa411 100644 --- a/src/components/ArticlePost/ArticlePost.astro +++ b/src/components/ArticlePost/ArticlePost.astro @@ -1,6 +1,4 @@ --- -import type { ArticleType } from '@root/types'; - import { DateFormatter } from '@root/utils'; import './ArticlePost.scss'; diff --git a/src/components/ArticlesList/ArticlesList.tsx b/src/components/ArticlesList/ArticlesList.tsx index f12f06e..9f5723f 100644 --- a/src/components/ArticlesList/ArticlesList.tsx +++ b/src/components/ArticlesList/ArticlesList.tsx @@ -1,5 +1,4 @@ import type { Component } from 'solid-js'; -import type { ArticleBlockType } from '@root/types'; import { createSignal, createEffect, For } from 'solid-js'; import { search, selectedTags } from '@stores/searchStore'; diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index a24784c..f6609a8 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -1,5 +1,6 @@ --- import { SITE_METADATA } from '@root/config'; +import { DetectThemeScript } from '@root/scripts'; export interface Props { title?: string | undefined; @@ -12,8 +13,8 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props; - - + + @@ -22,4 +23,7 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props; + + + diff --git a/src/components/ContactsList/ContactsList.astro b/src/components/ContactsList/ContactsList.astro index 08374b5..3ab3f95 100644 --- a/src/components/ContactsList/ContactsList.astro +++ b/src/components/ContactsList/ContactsList.astro @@ -11,14 +11,14 @@ const {
    Email - + Github - + Telegram - +
    diff --git a/src/components/Header/Header.astro b/src/components/Header/Header.astro index fdf366e..1426d4a 100644 --- a/src/components/Header/Header.astro +++ b/src/components/Header/Header.astro @@ -38,7 +38,7 @@ const { pathname } = Astro.canonicalURL; - + diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss index b3e246e..e890755 100644 --- a/src/components/Header/Header.scss +++ b/src/components/Header/Header.scss @@ -7,7 +7,6 @@ padding-bottom: 15px; user-select: none; z-index: 9999; - & .container { display: flex; align-items: center; @@ -64,57 +63,11 @@ } } } - &__button { - // cursor: pointer; - // background: none; - // border: none; - // &:hover { - // border: none; - // opacity: var(--opacity-hover); - // } - // & span { - // pointer-events: none; - // display: block; - // position: absolute; - // height: 3px; - // width: 100%; - // background: var(--font-color); - // border-radius: 7px; - // opacity: 1; - // left: 0; - // } - // & span:nth-child(1) { - // top: 2px; - // transform-origin: left center; - // } - // & span:nth-child(2) { - // top: 9px; - // transform-origin: left center; - // } - // & span:nth-child(3) { - // top: 16px; - // transform-origin: left center; - // } - // &[aria-pressed='true'] { - // & span:nth-child(1) { - // transform: rotate(45deg); - // top: -1px; - // left: 5px; - // } - // & span:nth-child(2) { - // display: none; - // } - // & span:nth-child(3) { - // transform: rotate(-45deg); - // top: 20px; - // left: 5px; - // } - // } - } } @media screen and (max-width: 768px) { .header { + padding: 10px 0; &__nav { display: none; } @@ -122,6 +75,7 @@ body[data-is-mobile-open='true'] { & .header { + padding: 15px 0; background-color: var(--background-header-color); position: fixed; right: 0; diff --git a/src/components/Header/NavToggle/NavToggle.scss b/src/components/Header/NavToggle/NavToggle.scss index 7ca42f4..9db71a9 100644 --- a/src/components/Header/NavToggle/NavToggle.scss +++ b/src/components/Header/NavToggle/NavToggle.scss @@ -1,9 +1,7 @@ .nav-toggle { - display: flex; - padding: 0; cursor: pointer; - // background: none; border: none; + padding: 0; &:hover { border: none; opacity: var(--opacity-hover); diff --git a/src/components/Header/NavToggle/NavToggle.tsx b/src/components/Header/NavToggle/NavToggle.tsx index e8ca43a..8af7531 100644 --- a/src/components/Header/NavToggle/NavToggle.tsx +++ b/src/components/Header/NavToggle/NavToggle.tsx @@ -4,19 +4,14 @@ import { createSignal, createEffect } from 'solid-js'; import './NavToggle.scss'; const MenuIcon: Component = () => ( - - + + ); const CloseIcon: Component = () => ( - - + + ); diff --git a/src/components/ProjectItem/ProjectItem.astro b/src/components/ProjectItem/ProjectItem.astro index a225f63..8c5bf74 100644 --- a/src/components/ProjectItem/ProjectItem.astro +++ b/src/components/ProjectItem/ProjectItem.astro @@ -1,6 +1,4 @@ --- -import type { ProjectType } from '@root/types'; - import './ProjectItem.scss'; import { Icon } from 'astro-icon'; diff --git a/src/components/RecentArticles/RecentArticles.astro b/src/components/RecentArticles/RecentArticles.astro index f495d37..8b5b7bc 100644 --- a/src/components/RecentArticles/RecentArticles.astro +++ b/src/components/RecentArticles/RecentArticles.astro @@ -1,6 +1,4 @@ --- -import type { ArticleType } from '@root/types'; - import './RecentArticles.scss'; import { ArticleItem } from '@components/ArticleItem'; import { sortArtcilesByDate } from '@utils/articles'; diff --git a/src/components/SearchInput/SearchInput.scss b/src/components/SearchInput/SearchInput.scss index a6ffffa..22fac36 100644 --- a/src/components/SearchInput/SearchInput.scss +++ b/src/components/SearchInput/SearchInput.scss @@ -20,7 +20,7 @@ & span { font-size: var(--font-size-lg); font-weight: 500; - color: var(--font-color-grayer); + color: var(--font-color-gray); min-width: 20px; text-align: center; } diff --git a/src/components/SearchInput/SearchInput.tsx b/src/components/SearchInput/SearchInput.tsx index d9ef696..9d0a8ad 100644 --- a/src/components/SearchInput/SearchInput.tsx +++ b/src/components/SearchInput/SearchInput.tsx @@ -54,7 +54,7 @@ const SearchInput: Component = (props) => { return (
    - + diff --git a/src/components/SkillsBlock/SkillsBlock.astro b/src/components/SkillsBlock/SkillsBlock.astro index 7e91dec..66db2a3 100644 --- a/src/components/SkillsBlock/SkillsBlock.astro +++ b/src/components/SkillsBlock/SkillsBlock.astro @@ -1,6 +1,4 @@ --- -import type { SkillsType } from '@root/types'; - import { Icon } from 'astro-icon'; import './SkillsBlock.scss'; diff --git a/src/components/ThemeSwticher/ThemeSwitcher.astro b/src/components/ThemeSwticher/ThemeSwitcher.astro deleted file mode 100644 index 915d7c0..0000000 --- a/src/components/ThemeSwticher/ThemeSwitcher.astro +++ /dev/null @@ -1,8 +0,0 @@ ---- -import './ThemeSwitcher.scss'; -import { Icon } from 'astro-icon'; ---- - - diff --git a/src/components/ThemeSwticher/ThemeSwitcher.scss b/src/components/ThemeSwticher/ThemeSwitcher.scss index 2838418..7d7d4fa 100644 --- a/src/components/ThemeSwticher/ThemeSwitcher.scss +++ b/src/components/ThemeSwticher/ThemeSwitcher.scss @@ -6,8 +6,13 @@ cursor: pointer; padding: 0; margin: 0; + opacity: 0; &:hover { opacity: var(--opacity-hover); border: none; } + &.ready { + opacity: 1; + transition: all 0.1s linear 0s; + } } diff --git a/src/components/ThemeSwticher/ThemeSwitcher.tsx b/src/components/ThemeSwticher/ThemeSwitcher.tsx new file mode 100644 index 0000000..120fc20 --- /dev/null +++ b/src/components/ThemeSwticher/ThemeSwitcher.tsx @@ -0,0 +1,62 @@ +import type { Component, JSX } from 'solid-js'; + +import { SITE_SETTINGS } from '@root/config'; +import { createSignal, onMount, Switch, Match } from 'solid-js'; +import './ThemeSwitcher.scss'; + +const MoonIcon: Component = () => ( + + + +); + +const SunIcon: Component = () => ( + + + +); + +const ThemeSwitcher: Component = () => { + const [theme, setTheme] = createSignal(SITE_SETTINGS.defaultTheme); + const [isReady, setIsReady] = createSignal(false); + + const toggleTheme: JSX.EventHandler = (e) => { + const newTheme = theme() === 'light' ? 'dark' : 'light'; + setTheme(newTheme); + localStorage.setItem('theme', newTheme); + document.documentElement.setAttribute('data-theme', newTheme); + }; + + onMount(() => { + setIsReady(true); + if (window.theme) { + setTheme(window.theme); + /* Update theme state on changing OS the,e */ + window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', ({ matches: isDark }) => { + const theme = isDark ? 'dark' : 'light'; + setTheme(theme); + }); + } + }); + + return ( + + ); +}; + +export default ThemeSwitcher; diff --git a/src/components/ThemeSwticher/index.ts b/src/components/ThemeSwticher/index.ts index 50e6b3d..9b6b9ee 100644 --- a/src/components/ThemeSwticher/index.ts +++ b/src/components/ThemeSwticher/index.ts @@ -1 +1 @@ -export { default } from './ThemeSwitcher.astro'; +export { default } from './ThemeSwitcher'; diff --git a/src/config.ts b/src/config.ts index 4e46ed2..ad1320f 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,3 +1,7 @@ +export const SITE_SETTINGS: SiteConfigType = { + defaultTheme: 'dark', +}; + export const SITE_METADATA = { title: 'Sergey Yarkov', name: 'yarkov.tech', diff --git a/src/layouts/article.astro b/src/layouts/article.astro index 265b5a9..8306dce 100644 --- a/src/layouts/article.astro +++ b/src/layouts/article.astro @@ -1,6 +1,5 @@ --- import type { Props as BaseHeadProps } from '@root/components/BaseHead.astro'; -import type { ArticleType } from '@root/types'; import BaseHead from '@components/BaseHead.astro'; import BaseLayout from '@components/BaseLayout'; diff --git a/src/layouts/default.astro b/src/layouts/default.astro index 44ed720..304a553 100644 --- a/src/layouts/default.astro +++ b/src/layouts/default.astro @@ -1,9 +1,9 @@ --- import type { Props as BaseHeadProps } from '@components/BaseHead.astro'; +import { SITE_METADATA } from '@root/config'; import BaseHead from '@components/BaseHead.astro'; import BaseLayout from '@components/BaseLayout'; -import { SITE_METADATA } from '@root/config'; import PageHeading from '@components/PageHeading'; import '@styles/global.scss'; diff --git a/src/pages/articles.astro b/src/pages/articles.astro index 8735f7d..8f2974e 100644 --- a/src/pages/articles.astro +++ b/src/pages/articles.astro @@ -1,6 +1,4 @@ --- -import type { ArticleType } from '@root/types'; - import PageLayout from '@layouts/default.astro'; import ArticlesList from '@components/ArticlesList'; import { transformArticles, formatToArticleBlocks } from '@utils/articles'; diff --git a/src/pages/index.astro b/src/pages/index.astro index 9b474d6..df9c19a 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,6 +1,4 @@ --- -import type { ArticleType } from '@root/types'; - import * as utils from '@utils/index'; import PageLayout from '@layouts/default.astro'; import RecentArticles from '@components/RecentArticles'; diff --git a/src/scripts/detect-theme.astro b/src/scripts/detect-theme.astro new file mode 100644 index 0000000..dddb31e --- /dev/null +++ b/src/scripts/detect-theme.astro @@ -0,0 +1,20 @@ + diff --git a/src/scripts/index.ts b/src/scripts/index.ts new file mode 100644 index 0000000..008a7dc --- /dev/null +++ b/src/scripts/index.ts @@ -0,0 +1 @@ +export { default as DetectThemeScript } from './detect-theme.astro'; diff --git a/src/styles/global.scss b/src/styles/global.scss index b6d7302..6bad530 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -1,91 +1,4 @@ -:root { - color-scheme: light dark; - - /* Fonts */ - --font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji; - --font-family-base: 'Rubik', var(--font-fallback); - --font-size-xs: 0.75rem; - --font-size-sm: 0.875rem; - --font-size-md: 1rem; - --font-size-lg: 1.125rem; - --font-size-xl: 1.25rem; - --font-size-2xl: 1.5rem; - --font-size-3xl: 1.875rem; - --font-size-4xl: 2.25rem; - --font-size-5xl: 3rem; - --font-size-6xl: 3.75rem; - --font-size-7xl: 4.5rem; - --font-size-8xl: 6rem; - --font-size-9xl: 8rem; - - /* Line heights */ - --line-height-normal: 'normal'; - --line-height-none: 1; - --line-height-shorter: 1.25; - --line-height-short: 1.375; - --line-height-base: 1.5; - --line-height-tall: 1.625; - - /* Colors */ - --color-white: #ffffff; - --color-black: #010409; - - --color-blue-50: #cae8ff; - --color-blue-100: #a5d6ff; - --color-blue-200: #79c0ff; - --color-blue-300: #58a6ff; - --color-blue-400: #388bfd; - --color-blue-500: #1f6feb; - --color-blue-600: #1158c7; - --color-blue-700: #0d419d; - --color-blue-800: #0c2d6b; - --color-blue-900: #051d4d; - - --color-gray-50: #f0f6fc; - --color-gray-100: #c9d1d9; - --color-gray-200: #b1bac4; - --color-gray-300: #8b949e; - --color-gray-400: #6e7681; - --color-gray-500: #484f58; - --color-gray-600: #30363d; - --color-gray-700: #21262d; - --color-gray-800: #161b22; - --color-gray-900: #0d1117; - - --color-orange-50: #ffdfb6; - --color-orange-100: #ffc680; - --color-orange-200: #ffa657; - --color-orange-300: #f0883e; - --color-orange-400: #db6d28; - --color-orange-500: #bd561d; - --color-orange-600: #9b4215; - --color-orange-700: #762d0a; - --color-orange-800: #5a1e02; - --color-orange-900: #3d1300; - - --color-yellow-50: #f8e3a1; - --color-yellow-100: #f2cc60; - --color-yellow-200: #e3b341; - --color-yellow-300: #d29922; - --color-yellow-400: #bb8009; - --color-yellow-500: #9e6a03; - --color-yellow-600: #845306; - --color-yellow-700: #693e00; - --color-yellow-800: #4b2900; - --color-yellow-900: #341a00; - - /* Border */ - --border-radius-md: 3px; - --border-radius-lg: 5px; - - /* Sizes */ - --content-width: 760px; - --content-padding: 24px; - - --outline-color: var(--color-blue-500); - - --opacity-hover: 0.7; -} +@import './theme.scss'; ::selection { background: var(--color-yellow-100); @@ -115,13 +28,14 @@ html { font-weight: normal; font-kerning: normal; font-family: var(--font-family-base); + background: var(--background-body-color); } body { margin: 0; padding: 0; color: var(--font-color); - background-color: var(--background-body-color); + background: var(--background-body-color); } .container { @@ -197,13 +111,14 @@ textarea { -webkit-appearance: none; font-family: var(--font-family-base); padding: 8px 15px; - border: 1px solid var(--border-color); + border: none; border-radius: var(--border-radius-md); background-color: var(--background-inputs-color); font-size: var(--font-size-sm); width: 100%; - outline-color: var(--outline-color); resize: vertical; + border: 1px solid var(--border-color); + outline-color: var(--color-blue-500); } button { @@ -249,12 +164,12 @@ pre { } a { - color: var(--color-blue-500); + color: var(--color-blue-400); font-weight: 500; text-decoration: none; &:hover { text-decoration: underline; - color: var(--color-blue-500); + color: var(--color-blue-400); } } diff --git a/src/styles/theme.scss b/src/styles/theme.scss new file mode 100644 index 0000000..9f13b2c --- /dev/null +++ b/src/styles/theme.scss @@ -0,0 +1,140 @@ +:root, +:root[data-theme='light'] { + color-scheme: light; + + /* Fonts */ + --font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji; + --font-family-base: 'Rubik', var(--font-fallback); + --font-size-xs: 0.75rem; + --font-size-sm: 0.875rem; + --font-size-md: 1rem; + --font-size-lg: 1.125rem; + --font-size-xl: 1.25rem; + --font-size-2xl: 1.5rem; + --font-size-3xl: 1.875rem; + --font-size-4xl: 2.25rem; + --font-size-5xl: 3rem; + --font-size-6xl: 3.75rem; + --font-size-7xl: 4.5rem; + --font-size-8xl: 6rem; + --font-size-9xl: 8rem; + + /* Line heights */ + --line-height-normal: 'normal'; + --line-height-none: 1; + --line-height-shorter: 1.25; + --line-height-short: 1.375; + --line-height-base: 1.5; + --line-height-tall: 1.625; + + /* Colors */ + --color-white: #ffffff; + --color-black: #010409; + + --color-blue-50: #cae8ff; + --color-blue-100: #a5d6ff; + --color-blue-200: #79c0ff; + --color-blue-300: #58a6ff; + --color-blue-400: #388bfd; + --color-blue-500: #1f6feb; + --color-blue-600: #1158c7; + --color-blue-700: #0d419d; + --color-blue-800: #0c2d6b; + --color-blue-900: #051d4d; + + --color-gray-50: #f0f6fc; + --color-gray-100: #c9d1d9; + --color-gray-200: #b1bac4; + --color-gray-300: #8b949e; + --color-gray-400: #6e7681; + --color-gray-500: #484f58; + --color-gray-600: #30363d; + --color-gray-700: #21262d; + --color-gray-800: #161b22; + --color-gray-900: #0d1117; + + --color-orange-50: #ffdfb6; + --color-orange-100: #ffc680; + --color-orange-200: #ffa657; + --color-orange-300: #f0883e; + --color-orange-400: #db6d28; + --color-orange-500: #bd561d; + --color-orange-600: #9b4215; + --color-orange-700: #762d0a; + --color-orange-800: #5a1e02; + --color-orange-900: #3d1300; + + --color-yellow-50: #f8e3a1; + --color-yellow-100: #f2cc60; + --color-yellow-200: #e3b341; + --color-yellow-300: #d29922; + --color-yellow-400: #bb8009; + --color-yellow-500: #9e6a03; + --color-yellow-600: #845306; + --color-yellow-700: #693e00; + --color-yellow-800: #4b2900; + --color-yellow-900: #341a00; + + /* Border */ + --border-radius-md: 3px; + --border-radius-lg: 5px; + + /* Sizes */ + --content-width: 760px; + --content-padding: 24px; + + --opacity-hover: 0.7; + + /* Fonts */ + --font-color: var(--color-black); + --font-color-gray: var(--color-gray-500); + --font-color-grayer: var(--color-gray-700); + + /* Border */ + --border-color: var(--color-gray-100); + --border-color-hover: var(--color-gray-400); + + /* Elements */ + --background-body-color: var(--color-white); + --background-header-color: var(--color-white); + --background-inline-code: rgba(0, 0, 0, 0.05); + --background-color-hover: var(--color-gray-50); + --background-btn-link: var(--color-white); + --background-btn-link-active: var(--color-white); + --background-inputs-color: var(--color-white); + + /* Icons */ + --icon-primary: var(--color-white); + --icon-secondary: var(--color-gray-700); +} + +:root[data-theme='dark'] { + color-scheme: dark; + /* Fonts */ + --font-color: var(--color-white); + --font-color-gray: var(--color-gray-100); + --font-color-grayer: var(--color-gray-200); + + /* Border */ + --border-color: var(--color-gray-700); + --border-color-hover: var(--color-gray-600); + + /* Elements */ + --background-body-color: var(--color-gray-900); + --background-header-color: var(--color-gray-900); + --background-inline-code: var(--color-gray-800); + --background-color-hover: var(--color-gray-800); + --background-btn-link: var(--color-gray-800); + --background-btn-link-active: var(--color-gray-700); + --background-inputs-color: var(--color-gray-800); + + /* Icons */ + --icon-primary: var(--color-white); + --icon-secondary: var(--color-gray-100); + --icon-filter: invert(100%); + + & .header svg, + & .site-content svg:not([data-filter='none']) { + filter: var(--icon-filter); + } +} diff --git a/src/types/index.ts b/src/types/index.ts deleted file mode 100644 index 91132d0..0000000 --- a/src/types/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -export type ArticleType = { - title: string; - author: string; - tags: Array; - published_at: string; -}; - -export type ProjectType = { - icon: string; - name: string; - year: string; - description: string; - sourceUrl?: string | undefined; - articleUrl?: string | undefined; - demoUrl?: string | undefined; -}; - -export type SkillsType = { - title: string; - list: Array<{ icon?: string | undefined; name: string }>; -}; - -export type ArticleBlockType = { - [year: number]: ArticleType[]; -}; diff --git a/src/types/main.d.ts b/src/types/main.d.ts new file mode 100644 index 0000000..fa3ff37 --- /dev/null +++ b/src/types/main.d.ts @@ -0,0 +1,39 @@ +export {}; + +declare global { + interface Window { + theme?: ThemeModeType | undefined; + } + + type ArticleType = { + title: string; + author: string; + tags: Array; + published_at: string; + }; + + type ProjectType = { + icon: string; + name: string; + year: string; + description: string; + sourceUrl?: string | undefined; + articleUrl?: string | undefined; + demoUrl?: string | undefined; + }; + + type SkillsType = { + title: string; + list: Array<{ icon?: string | undefined; name: string }>; + }; + + type ArticleBlockType = { + [year: number]: ArticleType[]; + }; + + type ThemeModeType = 'light' | 'dark'; + + type SiteConfigType = { + defaultTheme: ThemeModeType; + }; +} diff --git a/src/utils/articles.ts b/src/utils/articles.ts index f63124b..845d8b6 100644 --- a/src/utils/articles.ts +++ b/src/utils/articles.ts @@ -1,5 +1,3 @@ -import type { ArticleType, ArticleBlockType } from '@root/types'; - import { MarkdownInstance } from 'astro'; export const transformArticles = (articles: MarkdownInstance[]): ArticleType[] => diff --git a/tsconfig.json b/tsconfig.json index 9adedda..cdc34f0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,7 +17,8 @@ "@utils/*": ["./src/utils/*"], "@stores/*": ["./src/stores/*"] }, - "outDir": "./dist" + "outDir": "./dist", + "typeRoots": ["./node_modules/@types", "./src/types"] }, "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.ts"] } From b0d7490ecb2d577b92c5992719007f096bc8c531 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Thu, 28 Jul 2022 00:05:02 +0300 Subject: [PATCH 25/70] moved theme-detector to public folder --- README.md | 4 ++-- package.json | 2 +- .../assets/{ => css}/prism-one-dark.min.css | 0 .../assets/{ => css}/prism-one-light.min.css | 0 public/assets/js/detect-theme.js | 23 +++++++++++++++++++ src/components/BaseHead.astro | 7 ++---- src/components/Header/Header.astro | 2 +- .../ThemeSwticher/ThemeSwitcher.tsx | 6 +++-- src/layouts/article.astro | 4 ++-- src/scripts/detect-theme.astro | 20 ---------------- src/scripts/index.ts | 1 - src/types/main.d.ts | 4 ---- 12 files changed, 35 insertions(+), 38 deletions(-) rename public/assets/{ => css}/prism-one-dark.min.css (100%) rename public/assets/{ => css}/prism-one-light.min.css (100%) create mode 100644 public/assets/js/detect-theme.js delete mode 100644 src/scripts/detect-theme.astro delete mode 100644 src/scripts/index.ts diff --git a/README.md b/README.md index 7b102dc..bc6f887 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Personal website created with Astro. - [x] HTML layout - [x] Adaptive & Responsive layout -- [ ] Dark/Light Theme +- [x] Search articles by title or description +- [x] Dark/Light Theme - [ ] Multilang web-site -- [ ] Search articles by title or description - [ ] Form handling via Netlify Forms - [ ] SEO optimized diff --git a/package.json b/package.json index d6d80cf..fcaa6d9 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "scripts": { "dev": "astro dev --host", "start": "astro dev", - "build": "astro check && tsc --noEmit && astro build", + "build": "astro build", "preview": "astro preview --host", "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json}\"", "lint": "eslint '**/*.{js,mjs,ts,tsx}'" diff --git a/public/assets/prism-one-dark.min.css b/public/assets/css/prism-one-dark.min.css similarity index 100% rename from public/assets/prism-one-dark.min.css rename to public/assets/css/prism-one-dark.min.css diff --git a/public/assets/prism-one-light.min.css b/public/assets/css/prism-one-light.min.css similarity index 100% rename from public/assets/prism-one-light.min.css rename to public/assets/css/prism-one-light.min.css diff --git a/public/assets/js/detect-theme.js b/public/assets/js/detect-theme.js new file mode 100644 index 0000000..bf46454 --- /dev/null +++ b/public/assets/js/detect-theme.js @@ -0,0 +1,23 @@ +/** + * This script is used to determine the theme of the site. + * The theme value is taken from localstorage, otherwise from the operating system. + * It is very important to include this script before loading the CSS + * and body markup to prevent FOUC (Flash of unstyled content). + */ + +const getTheme = () => { + const local = localStorage.getItem('theme'); + if (local && (local === 'dark' || local === 'light')) return local; + const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches; + return isDark ? 'dark' : 'light'; +}; + +window.theme = getTheme(); +document.documentElement.setAttribute('data-theme', window.theme); + +/* Sync with OS theme */ +window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', ({ matches: isDark }) => { + window.theme = isDark ? 'dark' : 'light'; + localStorage.setItem('theme', window.theme); + document.documentElement.setAttribute('data-theme', window.theme); +}); diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index f6609a8..edc32c7 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -1,6 +1,5 @@ --- import { SITE_METADATA } from '@root/config'; -import { DetectThemeScript } from '@root/scripts'; export interface Props { title?: string | undefined; @@ -13,8 +12,6 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props; - - @@ -23,7 +20,7 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props; + diff --git a/src/components/Header/Header.astro b/src/components/Header/Header.astro index 1426d4a..13c833b 100644 --- a/src/components/Header/Header.astro +++ b/src/components/Header/Header.astro @@ -38,7 +38,7 @@ const { pathname } = Astro.canonicalURL;
    - + diff --git a/src/components/ThemeSwticher/ThemeSwitcher.tsx b/src/components/ThemeSwticher/ThemeSwitcher.tsx index 120fc20..e4895e4 100644 --- a/src/components/ThemeSwticher/ThemeSwitcher.tsx +++ b/src/components/ThemeSwticher/ThemeSwitcher.tsx @@ -26,7 +26,9 @@ const ThemeSwitcher: Component = () => { const [theme, setTheme] = createSignal(SITE_SETTINGS.defaultTheme); const [isReady, setIsReady] = createSignal(false); - const toggleTheme: JSX.EventHandler = (e) => { + const toggleTheme: JSX.EventHandler = () => { + if (!window.theme) return; + const newTheme = theme() === 'light' ? 'dark' : 'light'; setTheme(newTheme); localStorage.setItem('theme', newTheme); @@ -46,7 +48,7 @@ const ThemeSwitcher: Component = () => { }); return ( - )} - {!isError() && isSubmitted() && } - {isError() && isSubmitted() && } + {!isError() && isSubmitted() && } + {isError() && isSubmitted() && } ); diff --git a/src/components/ContactForm/Error.tsx b/src/components/ContactForm/Error.tsx index 0836ef3..a8976aa 100644 --- a/src/components/ContactForm/Error.tsx +++ b/src/components/ContactForm/Error.tsx @@ -1,7 +1,7 @@ import type { Component } from "solid-js"; -const Submitted: Component = () => { - return
    ❌ При отправке произошла ошибка. Повторите запрос позже.
    ; +const Submitted: Component<{ text: string }> = (props) => { + return
    ❌ {props.text}
    ; }; export default Submitted; diff --git a/src/components/ContactForm/Submitted.tsx b/src/components/ContactForm/Submitted.tsx index e06d187..980f305 100644 --- a/src/components/ContactForm/Submitted.tsx +++ b/src/components/ContactForm/Submitted.tsx @@ -1,7 +1,7 @@ import type { Component } from "solid-js"; -const Submitted: Component = () => { - return
    ✔️ Сообщение было успешно отправлено!
    ; +const Submitted: Component<{ text: string }> = (props) => { + return
    ✔️ {props.text}
    ; }; export default Submitted; diff --git a/src/components/ContactForm/validations.ts b/src/components/ContactForm/validations.ts index 5493763..9e9e195 100644 --- a/src/components/ContactForm/validations.ts +++ b/src/components/ContactForm/validations.ts @@ -1,3 +1,7 @@ import { isEmail } from "@utils/string"; -export const validateEmail = (field: HTMLInputElement) => (isEmail(field.value) ? false : "Заполните поле в формате e-mail."); +export default { + validateEmail: (error: string) => { + return (field: HTMLInputElement) => (isEmail(field.value) ? false : error); + }, +}; diff --git a/src/components/Header/Header.astro b/src/components/Header/Header.astro index e3ec58b..d11d738 100644 --- a/src/components/Header/Header.astro +++ b/src/components/Header/Header.astro @@ -2,9 +2,10 @@ import { Icon } from "astro-icon"; import { SITE_METADATA } from "@root/config"; import ThemeSwitcher from "@components/ThemeSwticher"; -import { removeSlashes } from "@utils/string"; +import UIString from "@components/UIString"; import NavToggle from "./NavToggle"; import "./Header.scss"; +import TranslatedLink from "@components/TranslatedLink"; const { name, nav, contacts } = SITE_METADATA; const { pathname } = Astro.url; @@ -13,23 +14,25 @@ const { pathname } = Astro.url;
    diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss index 03221ea..ee890a0 100644 --- a/src/components/Header/Header.scss +++ b/src/components/Header/Header.scss @@ -3,8 +3,8 @@ top: 0; border-bottom: 1px solid var(--border-color); background-color: var(--background-header-color); - padding-top: 15px; - padding-bottom: 15px; + padding-top: 13.5px; + padding-bottom: 13.5px; user-select: none; z-index: 9999; & .container { @@ -53,7 +53,7 @@ display: flex; align-items: center; column-gap: 10px; - margin-right: 40px; + margin-right: 30px; & a { text-decoration: none; font-size: 0; @@ -62,6 +62,9 @@ } } } + &-settings { + column-gap: 13.5px; + } } } diff --git a/src/components/ProjectItem/ProjectItem.astro b/src/components/ProjectItem/ProjectItem.astro index 415ac81..02773e0 100644 --- a/src/components/ProjectItem/ProjectItem.astro +++ b/src/components/ProjectItem/ProjectItem.astro @@ -1,12 +1,16 @@ --- -import { Icon } from 'astro-icon'; -import './ProjectItem.scss'; +import { FALLBACK_LANGUAGE } from "@root/config"; +import { getLanguageFromURL } from "@root/utils"; +import { Icon } from "astro-icon"; +import UIString from "../UIString"; +import "./ProjectItem.scss"; export interface Props { data: ProjectType; } const { data } = Astro.props as Props; +const lang = getLanguageFromURL(Astro.url.pathname); const { icon, name, year, description, articleUrl, sourceUrl, demoUrl } = data; --- @@ -19,25 +23,31 @@ const { icon, name, year, description, articleUrl, sourceUrl, demoUrl } = data; {year}
    -

    {description}

    +

    {description[lang] || description[FALLBACK_LANGUAGE]}

    - {articleUrl && ( - - Статья - - )} - {sourceUrl && ( - - Исходник - - - )} - {demoUrl && ( - - Демо - - - )} + { + articleUrl && ( + + + + ) + } + { + sourceUrl && ( + + + + + ) + } + { + demoUrl && ( + + + + + ) + }
    diff --git a/src/components/RecentArticles/EmptyList.astro b/src/components/RecentArticles/EmptyList.astro index fa3f0c1..dc4459e 100644 --- a/src/components/RecentArticles/EmptyList.astro +++ b/src/components/RecentArticles/EmptyList.astro @@ -1,5 +1,9 @@ +--- +import UIString from "@components/UIString"; +--- +
    -

    Пока что здесь ничего нет...

    +

    + + diff --git a/src/components/LanguageSelect/index.ts b/src/components/LanguageSelect/index.ts new file mode 100644 index 0000000..9d165f9 --- /dev/null +++ b/src/components/LanguageSelect/index.ts @@ -0,0 +1 @@ +export { default } from "./LanguageSelect.astro"; diff --git a/src/components/ProjectItem/ProjectItem.astro b/src/components/ProjectItem/ProjectItem.astro index 02773e0..e8735df 100644 --- a/src/components/ProjectItem/ProjectItem.astro +++ b/src/components/ProjectItem/ProjectItem.astro @@ -1,5 +1,5 @@ --- -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; import { getLanguageFromURL } from "@root/utils"; import { Icon } from "astro-icon"; import UIString from "../UIString"; @@ -23,7 +23,7 @@ const { icon, name, year, description, articleUrl, sourceUrl, demoUrl } = data; {year}
    -

    {description[lang] || description[FALLBACK_LANGUAGE]}

    +

    {description[lang] || description[DEFAULT_LANGUAGE]}

    { diff --git a/src/components/SkillsBlock/SkillsBlock.astro b/src/components/SkillsBlock/SkillsBlock.astro index c3468d3..1bddeb0 100644 --- a/src/components/SkillsBlock/SkillsBlock.astro +++ b/src/components/SkillsBlock/SkillsBlock.astro @@ -1,5 +1,5 @@ --- -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; import { getLanguageFromURL } from "@root/utils"; import { Icon } from "astro-icon"; import "./SkillsBlock.scss"; @@ -16,7 +16,7 @@ const {
    -

    {title[lang] || title[FALLBACK_LANGUAGE]}

    +

    {title[lang] || title[DEFAULT_LANGUAGE]}

      diff --git a/src/components/TranslatedLink/TranslatedLink.astro b/src/components/TranslatedLink/TranslatedLink.astro index 5f17c43..152bb16 100644 --- a/src/components/TranslatedLink/TranslatedLink.astro +++ b/src/components/TranslatedLink/TranslatedLink.astro @@ -1,5 +1,5 @@ --- -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; import { getLanguageFromURL } from "@root/utils"; export interface Props extends astroHTML.JSX.AnchorHTMLAttributes { @@ -8,7 +8,7 @@ export interface Props extends astroHTML.JSX.AnchorHTMLAttributes { const lang = getLanguageFromURL(Astro.url.pathname); const { to, ...attrs } = Astro.props as Props; -const href = lang === FALLBACK_LANGUAGE ? to : `/${lang}${to}`; +const href = lang === DEFAULT_LANGUAGE ? to : `/${lang}${to}`; --- diff --git a/src/config.ts b/src/config.ts index 3f1d014..f144370 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,4 +1,4 @@ -export const FALLBACK_LANGUAGE = "ru"; +export const DEFAULT_LANGUAGE: LanguageKeys = "ru"; export const SITE_METADATA: SiteMetadataType = { title: "Sergey Yarkov", diff --git a/src/i18n/en/ui.ts b/src/i18n/en/ui.ts index ebaa855..97b75e1 100644 --- a/src/i18n/en/ui.ts +++ b/src/i18n/en/ui.ts @@ -3,6 +3,7 @@ export default { "site.description": "Here I publish articles and tutorials on various IT topics, as well as talk about my projects that I have done over the past few years.", "articles.empty": "No articles found...", + "articlePost.comments": "Comments", "recentArticles.empty": "There is nothing here yet...", /* Page titles */ "pageTitle.about": "About me", diff --git a/src/i18n/ru/ui.ts b/src/i18n/ru/ui.ts index 6746ed9..7437df0 100644 --- a/src/i18n/ru/ui.ts +++ b/src/i18n/ru/ui.ts @@ -3,6 +3,7 @@ export default { "site.description": "Здесь я публикую статьи и туториалы на различные IT темы, а также рассказываю о своих проектах которые я сделал за последние несколько лет.", "articles.empty": "Не найдено ни одной статьи...", + "articlePost.comments": "Комментарии", "recentArticles.empty": "Пока что здесь ничего нет...", /* Page titles */ "pageTitle.about": "Обо мне", diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts index f714546..482a25f 100644 --- a/src/i18n/utils.ts +++ b/src/i18n/utils.ts @@ -1,6 +1,6 @@ import type { AstroGlobal } from "astro"; import * as utils from "@utils/url"; -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; import languages from "./languages"; export function getLanguageKeys(): Array { @@ -21,8 +21,8 @@ const translations = transformExports(import.meta.glob("./*/ui export function useTranslation(Astro: Readonly): (key: UIDictionaryKeys) => string | undefined { const lang = utils.getLanguageFromURL(Astro.url.pathname); return function translate(key: UIDictionaryKeys): string | undefined { - const string: string | undefined = translations[lang]?.[key] || translations[FALLBACK_LANGUAGE][key]; - if (string === undefined) console.error(`Cannot find any string for translation key "${key}" on "${Astro.url.pathname}" page.`); + const string: string | undefined = translations[lang]?.[key] || translations[DEFAULT_LANGUAGE][key]; + if (string === undefined) console.log(`Cannot find any string for translation key "${key}" on "${Astro.url.pathname}" page.`); return string; }; } diff --git a/src/layouts/article.astro b/src/layouts/article.astro index e82f86b..34ad016 100644 --- a/src/layouts/article.astro +++ b/src/layouts/article.astro @@ -1,32 +1,32 @@ --- -import type { Props as BaseHeadProps } from '@root/components/BaseHead.astro'; +import type { Props as BaseHeadProps } from "@root/components/BaseHead.astro"; -import BaseHead from '@components/BaseHead.astro'; -import BaseLayout from '@components/BaseLayout'; -import ArticleContent from '@components/ArticleContent'; -import ArticlePost from '@components/ArticlePost'; -import '@styles/global.scss'; +import BaseHead from "@components/BaseHead.astro"; +import BaseLayout from "@components/BaseLayout"; +import ArticleContent from "@components/ArticleContent"; +import ArticlePost from "@components/ArticlePost"; +import "@styles/global.scss"; export interface Props extends BaseHeadProps { lang?: string | undefined; content: ArticleType; } -const { lang = 'ru', content } = Astro.props as Props; +const { lang = "ru", content } = Astro.props as Props; --- - + - -
      - +
      + - +
      diff --git a/src/layouts/default.astro b/src/layouts/default.astro index 304a553..7a89a15 100644 --- a/src/layouts/default.astro +++ b/src/layouts/default.astro @@ -1,29 +1,29 @@ --- -import type { Props as BaseHeadProps } from '@components/BaseHead.astro'; +import type { Props as BaseHeadProps } from "@components/BaseHead.astro"; -import { SITE_METADATA } from '@root/config'; -import BaseHead from '@components/BaseHead.astro'; -import BaseLayout from '@components/BaseLayout'; -import PageHeading from '@components/PageHeading'; -import '@styles/global.scss'; +import { SITE_METADATA } from "@root/config"; +import BaseHead from "@components/BaseHead.astro"; +import BaseLayout from "@components/BaseLayout"; +import PageHeading from "@components/PageHeading"; +import "@styles/global.scss"; export interface Props extends BaseHeadProps { lang?: string | undefined; showPageHeading?: boolean | undefined; } -const { title, description, lang = 'ru', showPageHeading = true } = Astro.props as Props; +const { title, description, lang = "ru", showPageHeading = true } = Astro.props as Props; --- - + -
      +
      {showPageHeading && } - +
      diff --git a/src/pages/[lang]/about.astro b/src/pages/[lang]/about.astro index b1b24e1..db94f85 100644 --- a/src/pages/[lang]/about.astro +++ b/src/pages/[lang]/about.astro @@ -1,11 +1,11 @@ --- import { getLanguageKeys } from "@i18n/utils"; -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; import About from "@templates/About.astro"; export function getStaticPaths() { return getLanguageKeys() - .filter((lang) => lang !== FALLBACK_LANGUAGE) + .filter((lang) => lang !== DEFAULT_LANGUAGE) .map((lang) => ({ params: { lang } })); } --- diff --git a/src/pages/[lang]/articles.astro b/src/pages/[lang]/articles.astro index 6f75712..f7a0d2f 100644 --- a/src/pages/[lang]/articles.astro +++ b/src/pages/[lang]/articles.astro @@ -1,11 +1,11 @@ --- import { getLanguageKeys } from "@i18n/utils"; -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; import Articles from "@templates/Articles.astro"; export function getStaticPaths() { return getLanguageKeys() - .filter((lang) => lang !== FALLBACK_LANGUAGE) + .filter((lang) => lang !== DEFAULT_LANGUAGE) .map((lang) => ({ params: { lang } })); } --- diff --git a/src/pages/[lang]/contacts.astro b/src/pages/[lang]/contacts.astro index 109d30f..d9cb2ed 100644 --- a/src/pages/[lang]/contacts.astro +++ b/src/pages/[lang]/contacts.astro @@ -1,11 +1,11 @@ --- import { getLanguageKeys } from "@i18n/utils"; -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; import Contacts from "@templates/Contacts.astro"; export function getStaticPaths() { return getLanguageKeys() - .filter((lang) => lang !== FALLBACK_LANGUAGE) + .filter((lang) => lang !== DEFAULT_LANGUAGE) .map((lang) => ({ params: { lang } })); } --- diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro index 8d0b5d2..0b706e1 100644 --- a/src/pages/[lang]/index.astro +++ b/src/pages/[lang]/index.astro @@ -1,11 +1,11 @@ --- import { getLanguageKeys } from "@i18n/utils"; -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; import Home from "@templates/Home.astro"; export function getStaticPaths() { return getLanguageKeys() - .filter((lang) => lang !== FALLBACK_LANGUAGE) + .filter((lang) => lang !== DEFAULT_LANGUAGE) .map((lang) => ({ params: { lang } })); } --- diff --git a/src/pages/[lang]/projects.astro b/src/pages/[lang]/projects.astro index 68dd1c9..b745d2f 100644 --- a/src/pages/[lang]/projects.astro +++ b/src/pages/[lang]/projects.astro @@ -1,11 +1,11 @@ --- import { getLanguageKeys } from "@i18n/utils"; -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; import Projects from "@templates/Projects.astro"; export function getStaticPaths() { return getLanguageKeys() - .filter((lang) => lang !== FALLBACK_LANGUAGE) + .filter((lang) => lang !== DEFAULT_LANGUAGE) .map((lang) => ({ params: { lang } })); } --- diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro index 128eee4..83925fc 100644 --- a/src/pages/blog/[...slug].astro +++ b/src/pages/blog/[...slug].astro @@ -2,8 +2,10 @@ import type { MDXInstance } from "astro"; import ArticleLayout from "@layouts/article.astro"; +import { getLanguageFromURL } from "@root/utils"; + +const lang = getLanguageFromURL(Astro.url.pathname); -// TODO: generate pages based on user language export async function getStaticPaths() { const data = await Astro.glob("../../../content/articles/**/*.mdx"); return data.map((article) => { @@ -16,6 +18,6 @@ export async function getStaticPaths() { const { Content, frontmatter } = Astro.props as MDXInstance; --- - + diff --git a/src/styles/global.scss b/src/styles/global.scss index 619ac9c..2fc2d7e 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -13,10 +13,6 @@ body { min-height: 100vh; } -body[data-is-mobile-open="true"] { - overflow-y: hidden; -} - *, *:before, *:after { diff --git a/src/utils/url.ts b/src/utils/url.ts index aa781c6..f294648 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -1,4 +1,4 @@ -import { FALLBACK_LANGUAGE } from "@root/config"; +import { DEFAULT_LANGUAGE } from "@root/config"; export const encode = (data: object) => { return Object.keys(data) @@ -8,5 +8,5 @@ export const encode = (data: object) => { export const getLanguageFromURL = (pathname: string) => { const langCodeMatch = pathname.match(/\/([a-z]{1}-?[a-z]{1})\//); - return langCodeMatch ? langCodeMatch[1] : FALLBACK_LANGUAGE; + return langCodeMatch ? langCodeMatch[1] : DEFAULT_LANGUAGE; }; From b00382f1cc684b48d08d995070270adfa80ed4c7 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 17 Aug 2022 13:57:57 +0300 Subject: [PATCH 56/70] feat: render articles with multiple translations --- README.md | 2 +- package-lock.json | 557 ++++++------------- package.json | 12 +- src/components/ArticleItem/ArticleItem.scss | 4 + src/components/ArticleItem/ArticleItem.tsx | 15 +- src/components/ArticlePost/ArticlePost.astro | 3 +- src/i18n/utils.ts | 37 +- src/pages/blog/[...slug].astro | 10 +- src/templates/Articles.astro | 9 +- src/templates/Home.astro | 8 +- src/types/main.d.ts | 1 + src/utils/articles.ts | 1 + 12 files changed, 238 insertions(+), 421 deletions(-) diff --git a/README.md b/README.md index bc6f887..03c82cc 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ Personal website created with Astro. - [x] Adaptive & Responsive layout - [x] Search articles by title or description - [x] Dark/Light Theme +- [x] Form handling via Netlify Forms - [ ] Multilang web-site -- [ ] Form handling via Netlify Forms - [ ] SEO optimized ## License diff --git a/package-lock.json b/package-lock.json index ce4ff7b..168978c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,15 +10,15 @@ "license": "MIT", "devDependencies": { "@astrojs/image": "^0.3.4", - "@astrojs/mdx": "^0.9.0", + "@astrojs/mdx": "^0.10.0", "@astrojs/solid-js": "^1.0.0", "@types/mdx": "^2.0.2", - "@typescript-eslint/eslint-plugin": "^5.33.0", - "@typescript-eslint/parser": "^5.33.0", - "astro": "^1.0.4", - "astro-compress": "^0.0.18", + "@typescript-eslint/eslint-plugin": "^5.33.1", + "@typescript-eslint/parser": "^5.33.1", + "astro": "^1.0.6", + "astro-compress": "^0.0.19", "astro-icon": "^0.7.3", - "eslint": "^8.21.0", + "eslint": "^8.22.0", "eslint-plugin-solid": "^0.7.1", "hast-util-to-string": "^2.0.0", "hastscript": "^7.0.2", @@ -130,9 +130,9 @@ } }, "node_modules/@astrojs/mdx": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-0.9.0.tgz", - "integrity": "sha512-Z6W7YvCc36BenJZGkcG0oFi01OswR6KhUDWXL06prhgu51YSlKrpcvpykruGXaDQb1YkqGi3yxmWAmQwzgx6pQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-0.10.0.tgz", + "integrity": "sha512-nQcYzjPB8p0KWyP8g/8V6Rnxd7+5/VzNP4JLvQWUFs6mo7Akq98y4i+QjOl9/k5erzikl96Uul70MS/rjBheNQ==", "dev": true, "dependencies": { "@astrojs/prism": "^1.0.1", @@ -145,7 +145,6 @@ "rehype-raw": "^6.1.1", "remark-frontmatter": "^4.0.1", "remark-gfm": "^3.0.1", - "remark-shiki-twoslash": "^3.1.0", "remark-smartypants": "^2.0.0", "shiki": "^0.10.1", "unist-util-visit": "^4.1.0", @@ -1046,14 +1045,14 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz", - "integrity": "sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz", + "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/type-utils": "5.33.0", - "@typescript-eslint/utils": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/type-utils": "5.33.1", + "@typescript-eslint/utils": "5.33.1", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -1094,14 +1093,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.0.tgz", - "integrity": "sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz", + "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/typescript-estree": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/typescript-estree": "5.33.1", "debug": "^4.3.4" }, "engines": { @@ -1121,13 +1120,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz", - "integrity": "sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz", + "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/visitor-keys": "5.33.0" + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/visitor-keys": "5.33.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1138,12 +1137,12 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz", - "integrity": "sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz", + "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==", "dev": true, "dependencies": { - "@typescript-eslint/utils": "5.33.0", + "@typescript-eslint/utils": "5.33.1", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -1164,9 +1163,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.0.tgz", - "integrity": "sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz", + "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1177,13 +1176,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz", - "integrity": "sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz", + "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/visitor-keys": "5.33.0", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/visitor-keys": "5.33.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1219,15 +1218,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.0.tgz", - "integrity": "sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz", + "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/typescript-estree": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/typescript-estree": "5.33.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -1243,12 +1242,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz", - "integrity": "sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz", + "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.33.0", + "@typescript-eslint/types": "5.33.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -1259,35 +1258,6 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript/twoslash": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@typescript/twoslash/-/twoslash-3.1.0.tgz", - "integrity": "sha512-kTwMUQ8xtAZaC4wb2XuLkPqFVBj2dNBueMQ89NWEuw87k2nLBbuafeG5cob/QEr6YduxIdTVUjix0MtC7mPlmg==", - "dev": true, - "dependencies": { - "@typescript/vfs": "1.3.5", - "debug": "^4.1.1", - "lz-string": "^1.4.4" - } - }, - "node_modules/@typescript/twoslash/node_modules/@typescript/vfs": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.3.5.tgz", - "integrity": "sha512-pI8Saqjupf9MfLw7w2+og+fmb0fZS0J6vsKXXrp4/PDXEFvntgzXmChCXC/KefZZS0YGS6AT8e0hGAJcTsdJlg==", - "dev": true, - "dependencies": { - "debug": "^4.1.1" - } - }, - "node_modules/@typescript/vfs": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.3.4.tgz", - "integrity": "sha512-RbyJiaAGQPIcAGWFa3jAXSuAexU4BFiDRF1g3hy7LmRqfNpYlTQWGXjcrOaVZjJ8YkkpuwG0FcsYvtWQpd9igQ==", - "dev": true, - "dependencies": { - "debug": "^4.1.1" - } - }, "node_modules/@vscode/emmet-helper": { "version": "2.8.4", "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz", @@ -1498,9 +1468,9 @@ } }, "node_modules/astro": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/astro/-/astro-1.0.4.tgz", - "integrity": "sha512-wNXmDSHnhiFcEeMy2VWMJV1i8mPx8Lu4qLBfZSmP9nWrc/oxgBZfDQTWOj0/NFu+MkfZ2JEGJlL9RZFmHrKlew==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/astro/-/astro-1.0.6.tgz", + "integrity": "sha512-QAkdkzP3PbauiO4YnOgVTWY6z26heKruoXW9TnN8Bbmwtf7DUFIchi6CFSAVYSONX8XtRnj+p6fCkk06OWfJ4w==", "dev": true, "dependencies": { "@astrojs/compiler": "^0.23.3", @@ -1568,15 +1538,15 @@ } }, "node_modules/astro-compress": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.18.tgz", - "integrity": "sha512-6AaT8vlJkXYyImIQ70+bCkPTPfgSfvw3T+S9AOlSv65GFf1pZBuhO5nRuCg2jtEVBw4Eo/T4qC9khYbd6cVsWA==", + "version": "0.0.19", + "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.19.tgz", + "integrity": "sha512-Hgv1wX43vOwzUNuqRm7hbCMUXoH2xF+kTjBR+6RqAbM6hjqIlB8aKEGOVdELj6BiwnMDLf1dl6C1TmYPPgDMAg==", "dev": true, "dependencies": { "csso": "5.0.5", "deepmerge-ts": "4.2.1", "fast-glob": "3.2.11", - "html-minifier-terser": "6.1.0", + "html-minifier-terser": "7.0.0", "sharp": "0.30.7", "svgo": "2.8.0", "terser": "5.14.2" @@ -2069,9 +2039,9 @@ "dev": true }, "node_modules/clean-css": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz", - "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.0.tgz", + "integrity": "sha512-2639sWGa43EMmG7fn8mdVuBSs6HuWaSor+ZPoFWzenBc6oN+td8YhTfghWXZ25G1NiiSvz8bOFBS7PdSbTiqEA==", "dev": true, "dependencies": { "source-map": "~0.6.0" @@ -2204,12 +2174,12 @@ } }, "node_modules/commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", + "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==", "dev": true, "engines": { - "node": ">= 12" + "node": "^12.20.0 || >=14" } }, "node_modules/common-ancestor-path": { @@ -3041,9 +3011,9 @@ } }, "node_modules/eslint": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", - "integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", + "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.3.0", @@ -3610,15 +3580,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/fenceparser": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fenceparser/-/fenceparser-1.1.1.tgz", - "integrity": "sha512-VdkTsK7GWLT0VWMK5S5WTAPn61wJ98WPFwJiRHumhg4ESNUO/tnkU8bzzzc62o6Uk1SVhuZFLnakmDA4SGV7wA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, "node_modules/fetch-blob": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", @@ -4300,15 +4261,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "bin": { - "he": "bin/he" - } - }, "node_modules/html-entities": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", @@ -4322,24 +4274,36 @@ "dev": true }, "node_modules/html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.0.0.tgz", + "integrity": "sha512-Adqk0b/pWKIQiGvEAuzPKpBKNHiwblr3QSGS7TTr6v+xXKV9AI2k4vWW+6Oytt6Z5SeBnfvYypKOnz8r75pz3Q==", "dev": true, "dependencies": { "camel-case": "^4.1.2", - "clean-css": "^5.2.2", - "commander": "^8.3.0", - "he": "^1.2.0", + "clean-css": "5.2.0", + "commander": "^9.4.0", + "entities": "^4.3.1", "param-case": "^3.0.4", "relateurl": "^0.2.7", - "terser": "^5.10.0" + "terser": "^5.14.2" }, "bin": { "html-minifier-terser": "cli.js" }, "engines": { - "node": ">=12" + "node": "^14.13.1 || >=16.0.0" + } + }, + "node_modules/html-minifier-terser/node_modules/entities": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.3.1.tgz", + "integrity": "sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" } }, "node_modules/html-tags": { @@ -5143,15 +5107,6 @@ "node": ">=10" } }, - "node_modules/lz-string": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz", - "integrity": "sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==", - "dev": true, - "bin": { - "lz-string": "bin/bin.js" - } - }, "node_modules/magic-string": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", @@ -7252,12 +7207,6 @@ "node": ">=0.10.0" } }, - "node_modules/regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true - }, "node_modules/regexp.prototype.flags": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", @@ -7473,68 +7422,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/remark-shiki-twoslash": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/remark-shiki-twoslash/-/remark-shiki-twoslash-3.1.0.tgz", - "integrity": "sha512-6LqSqVtHQR4S0DKfdQ2/ePn9loTKUtpyopYvwk8johjDTeUW5MkaLQuZHlWNkkST/4aMbz6aTkstIcwfwcHpXg==", - "dev": true, - "dependencies": { - "@typescript/twoslash": "3.1.0", - "@typescript/vfs": "1.3.4", - "fenceparser": "^1.1.0", - "regenerator-runtime": "^0.13.7", - "shiki": "0.10.1", - "shiki-twoslash": "3.1.0", - "tslib": "2.1.0", - "typescript": ">3", - "unist-util-visit": "^2.0.0" - } - }, - "node_modules/remark-shiki-twoslash/node_modules/tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", - "dev": true - }, - "node_modules/remark-shiki-twoslash/node_modules/unist-util-is": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-shiki-twoslash/node_modules/unist-util-visit": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz", - "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0", - "unist-util-visit-parents": "^3.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-shiki-twoslash/node_modules/unist-util-visit-parents": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", - "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/remark-smartypants": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.0.0.tgz", @@ -7930,18 +7817,6 @@ "vscode-textmate": "5.2.0" } }, - "node_modules/shiki-twoslash": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/shiki-twoslash/-/shiki-twoslash-3.1.0.tgz", - "integrity": "sha512-uDqrTutOIZzyHbo103GsK7Vvc10saK1XCCivnOQ1NHJzgp3FBilEpftGeVzVSMOJs+JyhI7whkvhXV7kXQ5zCg==", - "dev": true, - "dependencies": { - "@typescript/twoslash": "3.1.0", - "@typescript/vfs": "1.3.4", - "shiki": "0.10.1", - "typescript": ">3" - } - }, "node_modules/shiki/node_modules/jsonc-parser": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz", @@ -8673,6 +8548,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", "dev": true, + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -9412,9 +9288,9 @@ } }, "@astrojs/mdx": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-0.9.0.tgz", - "integrity": "sha512-Z6W7YvCc36BenJZGkcG0oFi01OswR6KhUDWXL06prhgu51YSlKrpcvpykruGXaDQb1YkqGi3yxmWAmQwzgx6pQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-0.10.0.tgz", + "integrity": "sha512-nQcYzjPB8p0KWyP8g/8V6Rnxd7+5/VzNP4JLvQWUFs6mo7Akq98y4i+QjOl9/k5erzikl96Uul70MS/rjBheNQ==", "dev": true, "requires": { "@astrojs/prism": "^1.0.1", @@ -9427,7 +9303,6 @@ "rehype-raw": "^6.1.1", "remark-frontmatter": "^4.0.1", "remark-gfm": "^3.0.1", - "remark-shiki-twoslash": "^3.1.0", "remark-smartypants": "^2.0.0", "shiki": "^0.10.1", "unist-util-visit": "^4.1.0", @@ -10149,14 +10024,14 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz", - "integrity": "sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz", + "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/type-utils": "5.33.0", - "@typescript-eslint/utils": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/type-utils": "5.33.1", + "@typescript-eslint/utils": "5.33.1", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -10177,52 +10052,52 @@ } }, "@typescript-eslint/parser": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.0.tgz", - "integrity": "sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz", + "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/typescript-estree": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/typescript-estree": "5.33.1", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz", - "integrity": "sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz", + "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/visitor-keys": "5.33.0" + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/visitor-keys": "5.33.1" } }, "@typescript-eslint/type-utils": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz", - "integrity": "sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz", + "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==", "dev": true, "requires": { - "@typescript-eslint/utils": "5.33.0", + "@typescript-eslint/utils": "5.33.1", "debug": "^4.3.4", "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.0.tgz", - "integrity": "sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz", + "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz", - "integrity": "sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz", + "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/visitor-keys": "5.33.0", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/visitor-keys": "5.33.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -10242,60 +10117,29 @@ } }, "@typescript-eslint/utils": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.0.tgz", - "integrity": "sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz", + "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/typescript-estree": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/typescript-estree": "5.33.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/visitor-keys": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz", - "integrity": "sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz", + "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.33.0", + "@typescript-eslint/types": "5.33.1", "eslint-visitor-keys": "^3.3.0" } }, - "@typescript/twoslash": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@typescript/twoslash/-/twoslash-3.1.0.tgz", - "integrity": "sha512-kTwMUQ8xtAZaC4wb2XuLkPqFVBj2dNBueMQ89NWEuw87k2nLBbuafeG5cob/QEr6YduxIdTVUjix0MtC7mPlmg==", - "dev": true, - "requires": { - "@typescript/vfs": "1.3.5", - "debug": "^4.1.1", - "lz-string": "^1.4.4" - }, - "dependencies": { - "@typescript/vfs": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.3.5.tgz", - "integrity": "sha512-pI8Saqjupf9MfLw7w2+og+fmb0fZS0J6vsKXXrp4/PDXEFvntgzXmChCXC/KefZZS0YGS6AT8e0hGAJcTsdJlg==", - "dev": true, - "requires": { - "debug": "^4.1.1" - } - } - } - }, - "@typescript/vfs": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.3.4.tgz", - "integrity": "sha512-RbyJiaAGQPIcAGWFa3jAXSuAexU4BFiDRF1g3hy7LmRqfNpYlTQWGXjcrOaVZjJ8YkkpuwG0FcsYvtWQpd9igQ==", - "dev": true, - "requires": { - "debug": "^4.1.1" - } - }, "@vscode/emmet-helper": { "version": "2.8.4", "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz", @@ -10458,9 +10302,9 @@ "dev": true }, "astro": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/astro/-/astro-1.0.4.tgz", - "integrity": "sha512-wNXmDSHnhiFcEeMy2VWMJV1i8mPx8Lu4qLBfZSmP9nWrc/oxgBZfDQTWOj0/NFu+MkfZ2JEGJlL9RZFmHrKlew==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/astro/-/astro-1.0.6.tgz", + "integrity": "sha512-QAkdkzP3PbauiO4YnOgVTWY6z26heKruoXW9TnN8Bbmwtf7DUFIchi6CFSAVYSONX8XtRnj+p6fCkk06OWfJ4w==", "dev": true, "requires": { "@astrojs/compiler": "^0.23.3", @@ -10538,15 +10382,15 @@ } }, "astro-compress": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.18.tgz", - "integrity": "sha512-6AaT8vlJkXYyImIQ70+bCkPTPfgSfvw3T+S9AOlSv65GFf1pZBuhO5nRuCg2jtEVBw4Eo/T4qC9khYbd6cVsWA==", + "version": "0.0.19", + "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.19.tgz", + "integrity": "sha512-Hgv1wX43vOwzUNuqRm7hbCMUXoH2xF+kTjBR+6RqAbM6hjqIlB8aKEGOVdELj6BiwnMDLf1dl6C1TmYPPgDMAg==", "dev": true, "requires": { "csso": "5.0.5", "deepmerge-ts": "4.2.1", "fast-glob": "3.2.11", - "html-minifier-terser": "6.1.0", + "html-minifier-terser": "7.0.0", "sharp": "0.30.7", "svgo": "2.8.0", "terser": "5.14.2" @@ -10875,9 +10719,9 @@ "dev": true }, "clean-css": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz", - "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.0.tgz", + "integrity": "sha512-2639sWGa43EMmG7fn8mdVuBSs6HuWaSor+ZPoFWzenBc6oN+td8YhTfghWXZ25G1NiiSvz8bOFBS7PdSbTiqEA==", "dev": true, "requires": { "source-map": "~0.6.0" @@ -10977,9 +10821,9 @@ "dev": true }, "commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", + "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==", "dev": true }, "common-ancestor-path": { @@ -11508,9 +11352,9 @@ "dev": true }, "eslint": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", - "integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", + "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", "dev": true, "requires": { "@eslint/eslintrc": "^1.3.0", @@ -11935,12 +11779,6 @@ "format": "^0.2.0" } }, - "fenceparser": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fenceparser/-/fenceparser-1.1.1.tgz", - "integrity": "sha512-VdkTsK7GWLT0VWMK5S5WTAPn61wJ98WPFwJiRHumhg4ESNUO/tnkU8bzzzc62o6Uk1SVhuZFLnakmDA4SGV7wA==", - "dev": true - }, "fetch-blob": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", @@ -12454,12 +12292,6 @@ "space-separated-tokens": "^2.0.0" } }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, "html-entities": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", @@ -12473,18 +12305,26 @@ "dev": true }, "html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.0.0.tgz", + "integrity": "sha512-Adqk0b/pWKIQiGvEAuzPKpBKNHiwblr3QSGS7TTr6v+xXKV9AI2k4vWW+6Oytt6Z5SeBnfvYypKOnz8r75pz3Q==", "dev": true, "requires": { "camel-case": "^4.1.2", - "clean-css": "^5.2.2", - "commander": "^8.3.0", - "he": "^1.2.0", + "clean-css": "5.2.0", + "commander": "^9.4.0", + "entities": "^4.3.1", "param-case": "^3.0.4", "relateurl": "^0.2.7", - "terser": "^5.10.0" + "terser": "^5.14.2" + }, + "dependencies": { + "entities": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.3.1.tgz", + "integrity": "sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==", + "dev": true + } } }, "html-tags": { @@ -13029,12 +12869,6 @@ "yallist": "^4.0.0" } }, - "lz-string": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz", - "integrity": "sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==", - "dev": true - }, "magic-string": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", @@ -14478,12 +14312,6 @@ } } }, - "regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true - }, "regexp.prototype.flags": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", @@ -14640,58 +14468,6 @@ "unified": "^10.0.0" } }, - "remark-shiki-twoslash": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/remark-shiki-twoslash/-/remark-shiki-twoslash-3.1.0.tgz", - "integrity": "sha512-6LqSqVtHQR4S0DKfdQ2/ePn9loTKUtpyopYvwk8johjDTeUW5MkaLQuZHlWNkkST/4aMbz6aTkstIcwfwcHpXg==", - "dev": true, - "requires": { - "@typescript/twoslash": "3.1.0", - "@typescript/vfs": "1.3.4", - "fenceparser": "^1.1.0", - "regenerator-runtime": "^0.13.7", - "shiki": "0.10.1", - "shiki-twoslash": "3.1.0", - "tslib": "2.1.0", - "typescript": ">3", - "unist-util-visit": "^2.0.0" - }, - "dependencies": { - "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", - "dev": true - }, - "unist-util-is": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", - "dev": true - }, - "unist-util-visit": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz", - "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0", - "unist-util-visit-parents": "^3.0.0" - } - }, - "unist-util-visit-parents": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", - "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", - "dev": true, - "requires": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0" - } - } - } - }, "remark-smartypants": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.0.0.tgz", @@ -14984,18 +14760,6 @@ } } }, - "shiki-twoslash": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/shiki-twoslash/-/shiki-twoslash-3.1.0.tgz", - "integrity": "sha512-uDqrTutOIZzyHbo103GsK7Vvc10saK1XCCivnOQ1NHJzgp3FBilEpftGeVzVSMOJs+JyhI7whkvhXV7kXQ5zCg==", - "dev": true, - "requires": { - "@typescript/twoslash": "3.1.0", - "@typescript/vfs": "1.3.4", - "shiki": "0.10.1", - "typescript": ">3" - } - }, "side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -15520,7 +15284,8 @@ "version": "4.7.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", - "dev": true + "dev": true, + "peer": true }, "unbox-primitive": { "version": "1.0.2", diff --git a/package.json b/package.json index d95414a..11808cc 100644 --- a/package.json +++ b/package.json @@ -20,15 +20,15 @@ }, "devDependencies": { "@astrojs/image": "^0.3.4", - "@astrojs/mdx": "^0.9.0", + "@astrojs/mdx": "^0.10.0", "@astrojs/solid-js": "^1.0.0", "@types/mdx": "^2.0.2", - "@typescript-eslint/eslint-plugin": "^5.33.0", - "@typescript-eslint/parser": "^5.33.0", - "astro": "^1.0.4", - "astro-compress": "^0.0.18", + "@typescript-eslint/eslint-plugin": "^5.33.1", + "@typescript-eslint/parser": "^5.33.1", + "astro": "^1.0.6", + "astro-compress": "^0.0.19", "astro-icon": "^0.7.3", - "eslint": "^8.21.0", + "eslint": "^8.22.0", "eslint-plugin-solid": "^0.7.1", "hast-util-to-string": "^2.0.0", "hastscript": "^7.0.2", diff --git a/src/components/ArticleItem/ArticleItem.scss b/src/components/ArticleItem/ArticleItem.scss index c3cf57c..94116ee 100644 --- a/src/components/ArticleItem/ArticleItem.scss +++ b/src/components/ArticleItem/ArticleItem.scss @@ -8,6 +8,10 @@ column-gap: 10px; color: var(--font-color); padding: 8px 0; + & sup { + margin-left: 5px; + font-size: 0.7em; + } & h3 { font-size: var(--font-size-md); font-weight: normal; diff --git a/src/components/ArticleItem/ArticleItem.tsx b/src/components/ArticleItem/ArticleItem.tsx index 9fd136d..5104f33 100644 --- a/src/components/ArticleItem/ArticleItem.tsx +++ b/src/components/ArticleItem/ArticleItem.tsx @@ -1,6 +1,8 @@ +/* eslint-disable solid/reactivity */ import type { Component } from "solid-js"; import { createDateFormatter } from "@utils/date"; import "./ArticleItem.scss"; +import { DEFAULT_LANGUAGE } from "@root/config"; export type ArticleItemProps = { data: ArticleType; @@ -8,14 +10,17 @@ export type ArticleItemProps = { }; export const ArticleItem: Component = (props) => { - // eslint-disable-next-line solid/reactivity - const DateFormatter = createDateFormatter(props.lang); + const isNonDefaultLanguage = props.data.lang && props.data.lang !== props.lang; + const hrefLangPrefix = props.data.lang && props.data.lang !== DEFAULT_LANGUAGE ? "/en" : ""; return ( diff --git a/src/components/ArticlePost/ArticlePost.astro b/src/components/ArticlePost/ArticlePost.astro index 1b9da09..844456d 100644 --- a/src/components/ArticlePost/ArticlePost.astro +++ b/src/components/ArticlePost/ArticlePost.astro @@ -11,7 +11,6 @@ export type Props = { const { data, lang } = Astro.props as Props; const { title, tags, author, published_at } = data; -const DateFormatter = createDateFormatter("ru"); ---
      @@ -31,7 +30,7 @@ const DateFormatter = createDateFormatter("ru");

      {title}

      - + {author}
      { diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts index 482a25f..f1f2566 100644 --- a/src/i18n/utils.ts +++ b/src/i18n/utils.ts @@ -1,8 +1,43 @@ -import type { AstroGlobal } from "astro"; +import type { AstroGlobal, MDXInstance } from "astro"; import * as utils from "@utils/url"; import { DEFAULT_LANGUAGE } from "@root/config"; import languages from "./languages"; +export function getTranslatedArticles(Astro: Readonly): MDXInstance[] { + const data = import.meta.glob>("../../content/articles/**/*.mdx", { eager: true }); + const modules: Record>> = {}; + const siteLang = utils.getLanguageFromURL(Astro.url.pathname); + const articles: MDXInstance[] = []; + + for (const module of Object.values(data)) { + const splitted = module.file.split("/"); + const lang = splitted.at(-2); + const name = splitted.at(-3); + if (!modules[name]) modules[name] = {}; + modules[name][lang] = module; + } + + for (const key of Object.keys(modules)) { + const langs = Object.keys(modules[key]); + for (const articleLang of langs) { + const isNonDefaultLanguage = !langs.includes(siteLang) && langs.length === 1; + const article = modules[key]; + + if (articleLang === siteLang) { + articles.push(article[siteLang]); + article[siteLang].frontmatter.lang = siteLang; + } + + if (isNonDefaultLanguage) { + articles.push(article[articleLang]); + article[articleLang].frontmatter.lang = articleLang; + } + } + } + + return articles; +} + export function getLanguageKeys(): Array { return Object.keys(languages); } diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro index 83925fc..c5e3834 100644 --- a/src/pages/blog/[...slug].astro +++ b/src/pages/blog/[...slug].astro @@ -3,14 +3,20 @@ import type { MDXInstance } from "astro"; import ArticleLayout from "@layouts/article.astro"; import { getLanguageFromURL } from "@root/utils"; +import { DEFAULT_LANGUAGE } from "@root/config"; const lang = getLanguageFromURL(Astro.url.pathname); export async function getStaticPaths() { + const modules = import.meta.glob>("../../../content/articles/**/*.mdx", { eager: true }); + const entries = Object.keys(modules).map((key) => [key, key.split("/").slice(7)[0]]); const data = await Astro.glob("../../../content/articles/**/*.mdx"); - return data.map((article) => { + + return entries.map(([key, lang]) => { + const article = modules[key]; const published_at = new Date(article.frontmatter.published_at).toLocaleDateString("en-CA"); - const slug = `${published_at}/${article.frontmatter.slug}`; + const slug = `${published_at}/${lang !== DEFAULT_LANGUAGE ? lang + "/" : ""}${article.frontmatter.slug}`; + return { params: { slug }, props: article }; }); } diff --git a/src/templates/Articles.astro b/src/templates/Articles.astro index 7af8d69..7ce1421 100644 --- a/src/templates/Articles.astro +++ b/src/templates/Articles.astro @@ -3,12 +3,13 @@ import PageLayout from "@layouts/default.astro"; import ArticlesList from "@components/ArticlesList"; import { transformArticles, formatToArticleBlocks } from "@utils/articles"; import { getLanguageFromURL } from "@root/utils"; -import { useTranslation } from "@i18n/utils"; +import { useTranslation, getTranslatedArticles } from "@i18n/utils"; const t = useTranslation(Astro); -const articles = await Astro.glob("../../content/articles/**/*.mdx"); -const tags = new Set(articles.map((article) => article.frontmatter.tags).flat()); +const data = getTranslatedArticles(Astro); +const tags = new Set(data.map((article) => article.frontmatter.tags).flat()); const lang = getLanguageFromURL(Astro.url.pathname); +const articles = transformArticles(data); --- @@ -20,7 +21,7 @@ const lang = getLanguageFromURL(Astro.url.pathname); "input.search": t("input.search"), "articles.empty": t("articles.empty"), }} - data={{ articles: formatToArticleBlocks(transformArticles(articles)), tags: [...tags] }} + data={{ articles: formatToArticleBlocks(articles), tags: [...tags] }} />
    diff --git a/src/templates/Home.astro b/src/templates/Home.astro index 4b5b394..a94b881 100644 --- a/src/templates/Home.astro +++ b/src/templates/Home.astro @@ -4,13 +4,13 @@ import PageLayout from "@layouts/default.astro"; import RecentArticles from "@components/RecentArticles"; import { Splash, SplashHeading, SplashLinks, Link } from "@components/Splash"; import { getLanguageFromURL } from "@root/utils"; -import { useTranslation } from "@i18n/utils"; +import { getTranslatedArticles, useTranslation } from "@i18n/utils"; import UIString from "@components/UIString"; -const data = await Astro.glob("../../content/articles/**/*.mdx"); -const articles = utils.transformArticles(data); +const data = getTranslatedArticles(Astro); const t = useTranslation(Astro); const lang = getLanguageFromURL(Astro.url.pathname); +const articles = utils.transformArticles(data); --- @@ -27,5 +27,5 @@ const lang = getLanguageFromURL(Astro.url.pathname); - + diff --git a/src/types/main.d.ts b/src/types/main.d.ts index ee96d48..07e13bb 100644 --- a/src/types/main.d.ts +++ b/src/types/main.d.ts @@ -38,6 +38,7 @@ declare global { author: string; tags: Array; published_at: string; + lang?: string; }; type ProjectType = { diff --git a/src/utils/articles.ts b/src/utils/articles.ts index 60b8155..7ea06ce 100644 --- a/src/utils/articles.ts +++ b/src/utils/articles.ts @@ -8,6 +8,7 @@ export const transformArticles = (articles: MDXInstance[]): Article author: article.frontmatter.author, tags: article.frontmatter.tags, published_at: article.frontmatter.published_at, + lang: article.frontmatter.lang, })); export const sortArtcilesByDate = (articles: ArticleType[]): ArticleType[] => { From 628bae5bce1305ac984a509dccc9e9a9349e7aab Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 17 Aug 2022 14:01:32 +0300 Subject: [PATCH 57/70] upd readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 03c82cc..adae0fb 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,9 @@ Personal website created with Astro. - [x] Adaptive & Responsive layout - [x] Search articles by title or description - [x] Dark/Light Theme -- [x] Form handling via Netlify Forms -- [ ] Multilang web-site +- [x] Multilang web-site +- [x] Form handling via (Netlify Forms)(https://www.netlify.com/products/forms/) +- [ ] Comment system via [utterances](https://utteranc.es/) - [ ] SEO optimized ## License From a8be51891d4786809aec3a24afca314ea269f29d Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 17 Aug 2022 14:02:02 +0300 Subject: [PATCH 58/70] upd readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index adae0fb..101d4f2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Personal website created with Astro. - [x] Search articles by title or description - [x] Dark/Light Theme - [x] Multilang web-site -- [x] Form handling via (Netlify Forms)(https://www.netlify.com/products/forms/) +- [x] Form handling via [Netlify Forms](https://www.netlify.com/products/forms/) - [ ] Comment system via [utterances](https://utteranc.es/) - [ ] SEO optimized From 8f7601101866e72fc7024ff2824fe3efb0d81669 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 17 Aug 2022 15:01:45 +0300 Subject: [PATCH 59/70] fix: fixed language changing on article post page --- src/components/ArticlePost/ArticlePost.astro | 3 ++- src/components/LanguageSelect/LanguageSelect.astro | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/ArticlePost/ArticlePost.astro b/src/components/ArticlePost/ArticlePost.astro index 844456d..e2dd9c9 100644 --- a/src/components/ArticlePost/ArticlePost.astro +++ b/src/components/ArticlePost/ArticlePost.astro @@ -3,6 +3,7 @@ import { createDateFormatter } from "@root/utils"; import { Image } from "@astrojs/image/components"; import ArticleComments from "@components/ArticleComments"; import "./ArticlePost.scss"; +import TranslatedLink from "../TranslatedLink"; export type Props = { data: ArticleType; @@ -20,7 +21,7 @@ const { title, tags, author, published_at } = data; { tags.map((tag) => (
  • - {`${tag}${tags.at(-1) === tag ? "" : ","}`} + {`${tag}${tags.at(-1) === tag ? "" : ","}`}
    • )) } diff --git a/src/components/LanguageSelect/LanguageSelect.astro b/src/components/LanguageSelect/LanguageSelect.astro index 1169939..2ef2e6c 100644 --- a/src/components/LanguageSelect/LanguageSelect.astro +++ b/src/components/LanguageSelect/LanguageSelect.astro @@ -52,6 +52,12 @@ const lang = getLanguageFromURL(Astro.url.pathname); const pathname = window.location.pathname; const url = newLang === DEFAULT_LANGUAGE ? pathname.slice(3) : `${newLang}${pathname}`; + /* Move user to articles page with new language */ + if (window.location.pathname.includes("/blog/")) { + window.location.pathname = `${newLang === DEFAULT_LANGUAGE ? "" : newLang + "/"}` + "articles/"; + return; + } + window.location.pathname = url; }; From 793d6213690c71a77a5fa7ffd3b98bfcbb038183 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 17 Aug 2022 16:43:35 +0300 Subject: [PATCH 60/70] feat: added utterances comment system --- README.md | 2 +- package-lock.json | 14 ++++++------ package.json | 2 +- .../ArticleComments/ArticleComments.astro | 22 +++++++++++++++++++ src/config.ts | 7 ++++++ src/pages/blog/[...slug].astro | 1 - src/types/main.d.ts | 7 ++++++ 7 files changed, 45 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 101d4f2..81aae62 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Personal website created with Astro. - [x] Dark/Light Theme - [x] Multilang web-site - [x] Form handling via [Netlify Forms](https://www.netlify.com/products/forms/) -- [ ] Comment system via [utterances](https://utteranc.es/) +- [x] Comment system via [utterances](https://utteranc.es/) - [ ] SEO optimized ## License diff --git a/package-lock.json b/package-lock.json index 168978c..7bea0c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@typescript-eslint/eslint-plugin": "^5.33.1", "@typescript-eslint/parser": "^5.33.1", "astro": "^1.0.6", - "astro-compress": "^0.0.19", + "astro-compress": "^1.0.1", "astro-icon": "^0.7.3", "eslint": "^8.22.0", "eslint-plugin-solid": "^0.7.1", @@ -1538,9 +1538,9 @@ } }, "node_modules/astro-compress": { - "version": "0.0.19", - "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.19.tgz", - "integrity": "sha512-Hgv1wX43vOwzUNuqRm7hbCMUXoH2xF+kTjBR+6RqAbM6hjqIlB8aKEGOVdELj6BiwnMDLf1dl6C1TmYPPgDMAg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-1.0.1.tgz", + "integrity": "sha512-6w8n4KF5KbvEp86E5uUsRMB1uWNz04gml9EkyDXi5+7r8NKG/efOu+TVyhIaj7QWDevdDXLYPrMH//9HyNtCWA==", "dev": true, "dependencies": { "csso": "5.0.5", @@ -10382,9 +10382,9 @@ } }, "astro-compress": { - "version": "0.0.19", - "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.19.tgz", - "integrity": "sha512-Hgv1wX43vOwzUNuqRm7hbCMUXoH2xF+kTjBR+6RqAbM6hjqIlB8aKEGOVdELj6BiwnMDLf1dl6C1TmYPPgDMAg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-1.0.1.tgz", + "integrity": "sha512-6w8n4KF5KbvEp86E5uUsRMB1uWNz04gml9EkyDXi5+7r8NKG/efOu+TVyhIaj7QWDevdDXLYPrMH//9HyNtCWA==", "dev": true, "requires": { "csso": "5.0.5", diff --git a/package.json b/package.json index 11808cc..c234b21 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@typescript-eslint/eslint-plugin": "^5.33.1", "@typescript-eslint/parser": "^5.33.1", "astro": "^1.0.6", - "astro-compress": "^0.0.19", + "astro-compress": "^1.0.1", "astro-icon": "^0.7.3", "eslint": "^8.22.0", "eslint-plugin-solid": "^0.7.1", diff --git a/src/components/ArticleComments/ArticleComments.astro b/src/components/ArticleComments/ArticleComments.astro index 58752e9..82edd42 100644 --- a/src/components/ArticleComments/ArticleComments.astro +++ b/src/components/ArticleComments/ArticleComments.astro @@ -1,7 +1,29 @@ --- +import { UTTERANCES_CONFIG } from "@root/config"; import UIString from "../UIString"; ---

    +
    + + diff --git a/src/config.ts b/src/config.ts index f144370..c1cca3d 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,5 +1,12 @@ export const DEFAULT_LANGUAGE: LanguageKeys = "ru"; +export const UTTERANCES_CONFIG: UtterancesConfigType = { + repo: "sergeyyarkov/comments", + issueTerm: "title", + label: "Comments", + theme: "github-light", +}; + export const SITE_METADATA: SiteMetadataType = { title: "Sergey Yarkov", name: "yarkov.tech", diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro index c5e3834..0f517d1 100644 --- a/src/pages/blog/[...slug].astro +++ b/src/pages/blog/[...slug].astro @@ -10,7 +10,6 @@ const lang = getLanguageFromURL(Astro.url.pathname); export async function getStaticPaths() { const modules = import.meta.glob>("../../../content/articles/**/*.mdx", { eager: true }); const entries = Object.keys(modules).map((key) => [key, key.split("/").slice(7)[0]]); - const data = await Astro.glob("../../../content/articles/**/*.mdx"); return entries.map(([key, lang]) => { const article = modules[key]; diff --git a/src/types/main.d.ts b/src/types/main.d.ts index 07e13bb..42a9eec 100644 --- a/src/types/main.d.ts +++ b/src/types/main.d.ts @@ -15,6 +15,13 @@ 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; From 11baec11779b2d88adf4d769984d250e2904b7e9 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 17 Aug 2022 16:56:08 +0300 Subject: [PATCH 61/70] fix: fixed rehype & remark plugins --- astro.config.mjs | 93 ++++++++++--------- .../ArticleContent/ArticleContent.scss | 5 +- 2 files changed, 52 insertions(+), 46 deletions(-) diff --git a/astro.config.mjs b/astro.config.mjs index b369cb6..e23c72c 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -6,6 +6,10 @@ import solid from "@astrojs/solid-js"; import image from "@astrojs/image"; // import compress from "astro-compress"; import mdx from "@astrojs/mdx"; +import remarkGfm from "remark-gfm"; +import remarkSmartypants from "remark-smartypants"; +import rehypeSlug from "rehype-slug"; +import rehypeAutolinkHeadings from "rehype-autolink-headings"; const createAnchorLabel = (heading) => { const node = h("span.anchor-label", escape(heading)); @@ -16,51 +20,56 @@ const createAnchorLabel = (heading) => { // https://astro.build/config export default defineConfig({ site: "https://yarkov.tech", - integrations: [solid(), image(), mdx()], + integrations: [ + solid(), + image(), + mdx({ + remarkPlugins: [remarkGfm, remarkSmartypants], + rehypePlugins: [ + rehypeSlug, + [ + rehypeAutolinkHeadings, + { + properties: { + class: "anchor-link", + }, + behavior: "after", + group: ({ tagName }) => + h(`div.heading-wrapper.level-${tagName}`, { + tabIndex: -1, + }), + content: (heading) => [ + h( + `span.anchor-icon`, + undefined, + h( + "svg", + { + width: 18, + height: 18, + version: 1.1, + viewBox: "0 0 16 16", + xlmns: "http://www.w3.org/2000/svg", + ariaHidden: "true", + "data-filter": "none", + }, + h("path", { + fillRule: "evenodd", + fill: "currentcolor", + d: "M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z", + }) + ) + ), + createAnchorLabel(toString(heading)), + ], + }, + ], + ], + }), + ], trailingSlash: "always", markdown: { syntaxHighlight: "prism", - remarkPlugins: ["remark-gfm", "remark-smartypants"], - rehypePlugins: [ - "rehype-slug", - [ - "rehype-autolink-headings", - { - properties: { - class: "anchor-link", - }, - behavior: "after", - group: ({ tagName }) => - h(`div.heading-wrapper.level-${tagName}`, { - tabIndex: -1, - }), - content: (heading) => [ - h( - `span.anchor-icon`, - undefined, - h( - "svg", - { - width: 18, - height: 18, - version: 1.1, - viewBox: "0 0 16 16", - xlmns: "http://www.w3.org/2000/svg", - ariaHidden: "true", - "data-filter": "none", - }, - h("path", { - fillRule: "evenodd", - fill: "currentcolor", - d: "M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z", - }) - ) - ), - createAnchorLabel(toString(heading)), - ], - }, - ], - ], }, vite: { ssr: { diff --git a/src/components/ArticleContent/ArticleContent.scss b/src/components/ArticleContent/ArticleContent.scss index 42db060..96e8a2c 100644 --- a/src/components/ArticleContent/ArticleContent.scss +++ b/src/components/ArticleContent/ArticleContent.scss @@ -17,10 +17,6 @@ padding-bottom: 5px; } - h2 { - border-bottom: 1px solid var(--border-color); - } - & ul { padding-left: 1.5rem; line-height: var(--line-height-base); @@ -177,6 +173,7 @@ & .anchor-icon { position: absolute; left: -25px; + top: -13px; } & svg { vertical-align: middle; From 2f11e6020bbc962fc9ce97af5455b8d00fd4cd68 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 17 Aug 2022 19:29:37 +0300 Subject: [PATCH 62/70] feat: added favicon --- public/android-chrome-192x192.png | Bin 0 -> 4663 bytes public/android-chrome-256x256.png | Bin 0 -> 6258 bytes public/apple-touch-icon.png | Bin 0 -> 4371 bytes public/browserconfig.xml | 9 +++++++++ public/favicon-dark-16x16.png | Bin 0 -> 617 bytes public/favicon-dark-32x32.png | Bin 0 -> 938 bytes public/favicon-light-16x16.png | Bin 0 -> 635 bytes public/favicon-light-32x32.png | Bin 0 -> 955 bytes public/favicon.ico | Bin 4286 -> 15086 bytes public/mstile-150x150.png | Bin 0 -> 3557 bytes public/safari-pinned-tab.svg | 23 +++++++++++++++++++++++ public/site.webmanifest | 19 +++++++++++++++++++ src/components/BaseHead.astro | 8 ++++++++ src/layouts/article.astro | 2 +- src/layouts/default.astro | 2 +- 15 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 public/android-chrome-192x192.png create mode 100644 public/android-chrome-256x256.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/browserconfig.xml create mode 100644 public/favicon-dark-16x16.png create mode 100644 public/favicon-dark-32x32.png create mode 100644 public/favicon-light-16x16.png create mode 100644 public/favicon-light-32x32.png create mode 100644 public/mstile-150x150.png create mode 100644 public/safari-pinned-tab.svg create mode 100644 public/site.webmanifest diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..d005d3578c8e3d7c552a53feaf5acf28abe7a26a GIT binary patch literal 4663 zcmc&&c{J4F*Z8_!s|Zr2UjJ1{phr0su4YzXk$w^AM*_dYp;50sRjK4t5q^ z;ClcW0NDFY^mS~*XEyR9ZwmBB_qQuVZmG9PCW$}h=F*floK(+xIo@#TSslT#0`|s$ zUDW`8Mw*Y`AW5{&1_DarP9T)BrlS+B$QEm*bYsikMdNSQGn$)1Terd^_ugwSY<|OrwJEeeJ9zgqkf9W8ptNS0d`7V=8J*R^ zxSVC3canhULETyui&}|g)A~xtx*H9bw7=9hN@>~0W{Y9^hBf}80D(#OE?xu9-OAgRgcA!~j@ zNlcJDh#M=_M!4v@&niM>kwVeuubNw-K@5`~QqI`<+u9;tjwrU|AbQQ23+2*4rx+zR z{_gyh40IJn8~yecbM9xC9r?AU)o1eZL$xegxC)2sw?PulJDw9eGX)n+YoXEPQu`Nv zV9T3b!xUP*X&u+q=wsN$q&89?;-NS5AK16 zwmF@{cb1{NuD0{Eo{DLG5JTGoZ7Juids;pn>?h?Eloj6lSn%TAzhmc=6&IL)mB>iY zmG?cW&3beknv}wnwV>MN$+JR}j{rBwwInf0%H2bB z10rzga?=xfAlqF|_Jnet$T)nz1c39;WAll{-Om(t;T@M0B_9&=jxi+Yw-Vr$)flVg zw+yRfE)x)UVH|V%9j~k+#=`PWO3J=*Xeqce$5LGSR5+7`Sd~x4pxy;)_Nx4q&msNX~6Is@_b)$M#izR5S_tfua z#qV^qQW9F_BE*s;aAq4y!>lTBzN}pFJqoqM(RygajbI-fDY~bu} zoPVZ~8(LgMJ$5>}Aa)%h{}%YDggTAGD*sQ#rBw7hXtg!tqRwMbp{e6mgI|itA=6|+Ae%@W8!B(C3Z8~ng!O4LivNQT5F8uk;;HhPAtMN;{uM=xZtGIO zR!AyQyxC)JU7OS7Qw?GvcMniEp&J$P@;{LJRMDd2yT0)cQIuKwSd#8DSTwFLnHmul z81zi9m2tv_$7w&l7~S_%{(O?|>+|nmq8o`@EQCO7OpO*5qN?Lj=$?M{w_*Isg@UX$i5sg@4!hGswO zKSJ_$Rw1WEu=>S`UmNn?GoeLIw#+8N$v}s2Y&4&kZpUYh3w__Nd|SzT#qdKoXCHbL z>W4Q&;;-EN_-k~8r2HkdWldwN#@mjy_ugqj&!Ys(i#;AK=8o>j3u#Q(q(cTT|QwV*6^f0BbgK>5OjkHgny8+ z#~09HqS7LWW(pw%WE4aGB&$R2Qv|krI6<39EpKxHd$sne#gaGN{Q|u<*LF1L2V*i> z&CcT`8VPUE3)7SR`I)J4l`Cg@`S1z*Mu#EVU^*-x2!r-0@SAXwa#}8bS|aiy@Y<`V zv8;&!MNxvX{@ft;^cg)7KKt_NCW+T>SswK+tFfvAhZ<=b?x#vEmfQaD=bvX5%s#WV zte$bGM4sQRrnYMEA{7|%_ktTA+9XittCF%FAyV!G5p(jtnV zvqxo{JMA<#IM}_=YGOUq6V3orKSM;ZcN)NKYUI2Q&WCuuu;;x$}3C9p$_hh zQU)>^@xwbXzDVPX1pAy^H(YkDjvR!{H(OA~yNwWoVS3_q+WXjdgYUc^!rgq?sv~El z%CR}}g$0>72nEg>jrvV(8?MjL9~Xn$=1txvgMuAUInQe+Q2D?;-y5hR=LF@tUeETx zs5vi}3ihRtUl><)Y)2e;V2Z!FST4% z)?+fIa9~Pke8&32nv8Jt@=`+8xb}lK`KD^E5ct9;jv53^2o2Zz*9c7VdNlF90L+( z;xrBenc!blJR+I|wBfGR%~HW>8?VwDA3Rd?@0j1%Nvhxw)s9oaGZ=Zh1Eq6_2oW*=&Gv)4}Un2%XUwtmu+jD0K{EO~g8L40rKoZ(9c zq#0QdRC3B^r@x;yu1H<^o7iA!_Mx5Ws_9AP&)y`of936WB&C)%``x4Y7(M|-O1?u! zauxGMhaO8^m)Tg;PJ5S0bim@$9gSam=l*gJSh!Y(H&xEa%Q-QzUE2)G%;X?`v;7#> z1q7kKR=DTd)aftH7Db*}+xUDf=Gvycv=aTntpkMTnfvQ{H@`D5(_9*3=Eufnwt&?_P}~b4uAXjB!-!kfM#(mT&L(EkfN>;E*LhFt zd@E1NO5@Bfr;F1J->q~0f_+I7U%}KD6WnGhsv5#-H+;@qm2v!-mM!6TsZaUSv#S6# zpDJh$%S_*g*6`eyM}C2E;(vU@>NFE)&wTFiaC)S9BLZ~#Hw!2G6>fBur8H5E zuW01igBV*GJvpDb0#sa;-rJ|d-4+n>_d(P|L6|L9##z4OH$(;~nQx9CZfClbymGEv zhWwF~=^L{byj|X@n2Z4mr6*o}__WFNi#IKf^GS?CiJn zuw6+`x@_+~E!s@bL~V&!n30s4z-p4TeH0yg_KaRPZ<+*TcfGs+{Ojue{Jjk!Cg{r- zw2W=A0863C3)#z?`qvLX?>hEk}`;i!I zK-j}2qbH9l;>2CN0_@@zRJpYJe0a(){)KBz-bIauZgN!yQ`cUP8A`IhSyTOAhh`{o5_5x}8DMEc_P#B^!W z=*O>o)}A{|Lvj`P_Dk2$-<*#Z)=x%Pe>KQmE!!@tsV((9TP%nlF%fS_eey?J)}%Mq zpY0YK_7F3#C)+EHaO7f!F>W8S16NiBPqjBA+(-l8ll-kyQw9= z*Jyh+5i2Z;oHmXpao(;9EfMBj_6U_u-oV8|!>lh%IC?t{!TEizS{mTYfYgwOmg z_pE;1=`1EX8x-86{T{ZJu)!wy2r>IITb#jzrsR618E^fhjHA8l*f(;wQMnG|&E%RK zKP3r>eg~1YD@iR(8!*%BLn$ zS)&RmLG6Q0X=;R}Yzfq##hj#3Ju_6h}gdPr`$aB6J7dy zg4Q>tIw*my#-pY=N5_BR0udJN*mV>usTT~ZDK;M-%)IsE3&FqqLC$Y}xN6ysg1|&| z-zqdc7*bHg#9F%(mJWh*{OniGySzW{)m8u!Fk(;r3g?t%ARrpg*K_VH_tOLh{nCY->r&&WjM)|>T(;z z<@hkwM_1DngXE&hd;cjcOrJLr9wiFiKzZTnV@hW)_Fk&$1CMmy3@=(73A1^O5k|jH zJex<5txr;Y8_a5;xZQ#cnT%NWCp`cxqyxXQW4tbX71LtL5!ToZqOhn*iW11^~Zo0YEkj02na2 zE&B2|2C%)Rnlf-5mx}Makw`G=X1)MGM)My60XeyhH%ekZ4Q&vL# z)=)+n1g!pSyhNK+6zkL_g;;K+F0$ z)th8v|5mU#h&A}&E<&de*0hMCnR1XY?tPiIiCY$X*9#F@M(Ef=1d{As^_l=`w~410 zHFVocL{w-0ZYiO}V-IIi8^w}f_#Pb-Qy-12WT~B=OH+g0iyl^50vW90vMl)NdPL4Y zLb$84-2E8V{TCP37`!k`pZ<|8;^#745d{5J1EzFfa7(Zfq+5k{LsM4FEc;FGKT1yp zMCzBT_8CJt4+J4Nj-7r~?&o%~AuDXq3~q27#F^2FgTtF**_X7*SC3Km1_P?P8TM1N z1gSfh^UDUM@O_L#z8bGBA+7^YLRl@~iK|uW2uHs~wj>8~j#l8ErQ z{aO`q43~_JC!kjFe3a;l-6`qsC$MLL=!*i9@cH^ov)@p-9oZG#tAeNVHgtLj*Fl3* z@0d&H1^^S=UF*3GpQqu?VU5i zZ=`mDX=VV4-2NEniHSn8DGqex6nw7^*glY~fDJ2BxGIy0tf-zdNRU)RZTfhr=Ea5K zuCc@$Ujryg81hLXQsY!wBW97~U=oHe{;*OSWY4Wo4f10h!Ccem@}_4wZ?_;#4A;B^ z7jJLVS_>&tJ~p>er?VC5z$SB^m9o+%!#7c4XVnh@;)WGL&f*Yr^muHzC0ghp{~`9_ zDZO+2KSgc*@#p}tj6j4LHaL`iu0L(BKBkZgl^Z4Hk2tf7U|^$ajxbl+XEf$M-s8Rx z$~jP}paE<7&WlYbeB%=P3&G?QSSbI|4M9993KLi;g_QM5-F{LZdO4jM$=P4Muj1V+;|#Y;4w#* zV1YHX>qh38Bmp(WbnzFMLA%7+NK$-kqVhdplkxPxPjxgfN(IKGz_7m2KrR<#k%a@; zfP!Sypk4R=UznEMR!qUoh>Zd<)ZR>^e&2&YT^VZR0D3SkHzqF*S-Qb#QuzHRk6lM- zs^CdjGl@|!!sErx2MjkhQ-1L>+;C}wqmTWf;kwk}dw`Y6kkpu=@1Gzda%H)5@?(Ox z>KJZd5nGDzXOq_731vQ5|0r1}cQU97dintVUujxW2XOY^J|qOZ{nM*2*rklMPSyHY z1r7CKl_2Qb)DwC!iO5`(=F6h+Psl$DSFU9_eDF6T*M7{_?^iAKv9jhA5d?`Ti2iA8 z>?ou!)kKpjZ+e(5o1LCbux?nik<`Zpv70TiNpif-jqd-%tC^Ux?C?V^OlL&;M?%91@muR` zXC%^w@Gs z6Im!z#Z|2xYx{!o=6;+prhWYIjo&3$GsGhGS?zdZ*GB+Z`b5>Gy;SF1OIy67T*G?% z`0e~21Hp9BS#G82zA$jlp{+bS>EA}WRNy+@{S++|IqBdEVz2&|Biq}DihE$V$D2u_ zEP~d`(PTmfaCGR2C7W)wBD|hDD+mjSZR=hcs%x`Gc4oD*)a%^8_~S?7i$z8T5SB|1nRh zeCv3Pgp<&cb^6K_J=XxwxE@up*c`0IfXAY;D9uJZXFk?r&i;sk9cw~pVM)4aUTT+X6Xw|Ygn{t`sP~6=>AAI0EJ4- zmzbalVKA^3>bRW2Z|X4YgHM&t>#R8sQ2EXT`jTEG_SO3HzxW>R=h#5jhf+a>n&C;pbP@W$+g z?U$3JUD7R3t}@hiiGij!Nx-~va;c(`ibq~4xNP*iB0?dw31<#qVepv4bYCL(C+kcn z&dw@&=)2#uUQsbjNEsa7OwPdbP|F< zb5<85hZ~>3gYV*hISCP?v3Fhly!0Ffo;LD8F>f3aW2&bl~` zeeh*HX|cM!`-Uv9L5qvzmDTJTDHAvc4NZG-Qlw@yRZAggHS)}F48W1NPbI~~_CJrsv8zw+oZ0Po7i;$Cfr)3% z#YSJLduD0cd{RfBhv^G44kXdt7SSOANJFrJAdXr#cVuB$iBP(bSfCcn*lCS2x0j)1 zbH*>2?^?g1W?hBneb5dUajh@6$8{M}fgQ2-h$qUQA7c|ej_OVA2^>8RxElfDq6;*g z*);(iGKABK5FZtQ?D{tHeS~m(_X_{t~z~M`$`n1GnP~24%*ew4HPQjTxpb znt{~~Qt!a9JFVFgsUz_)I2r2v(0l6iQpC#w&7mi%VDw6!YSVeugyy+92oepLO>7AY zxSP5rxAu#hL18;bc%5IM@hy$^(&bnz%}sp$UL8Z5ly3gvlM*Y(N;W;EZkf|y*5r0t zp%bs66c}8P}zXqKDj9E@v^M*-rw(|MH7FQgsSplQz$qf84)k=?%~HN6@k zQZ1R%`OsH<+3v6x%p5>e&5UMJf9S$$?{4tzw1cz~vQ6Wi#z-FbWYUx;gdWz?n=MM2lcYdjtmo9>N^!zDNh7^gg=p*)+EBP z!%acz+6!BJRD5O|_Y1>nrGi?9DoyQB`L~38!#j?>Z4xti{kY|g)W%t_zMqEwHLqtR zAivWQ?BZqfm!>zmd00YmJGATUR_3k_HB$0AV24oh+T$1ZoWf7f&`{NOE!)diMWKZa zy+J>k%%Wq6VgRZ9tZj9xEz$JgAeYbNnpf8^6t7Dbopz4ozqSdCh!AS#CO%_xsJ10k z<{2k)SRdh-I!6sFZ}C?O?$N`$-8N|I7{uudXC59Vn~{-<^uz!Sn~7{A@08SvI!RXZ z?zw1O-(BIdKE7b9xNI6Uw9Q09Z4(P-u2`geiy0HxKFbj$9+2M0({ zgJ*j3t%9q5ONB+VkuKonpiQwmN9P{A+iqjBCilx<>Tp1+H6o5E8$$kq*V)#gXy>*s zs&k13H1c|ef)E5@_+ho1XmxL&$|Z&HwFsQ>(AV_km57Qw=s{n|1XqIqj;e)EPo1(_ z%gslfF3-}G=O(0ABk5sMko+d9FcG66MtJ1H!=dG$CX8rcu5a_v3a5not0P^Gh{y$r zk|a0{cqZ;h^_D~)i0SgPa#Q|MD(<7L=a*Kp+?!%N6xltqy|hCRN~>^gR#YvHj5^+^ zejVslT%AV4ffO09Q$0?0);`}+E_j8C``qZ6%4yKXB;YZ1^Gg_pN`}%aGUW$86D*fnL+kvN;ob9H7K5s3n!vGec^ zPCkkI`TW+m=*$72OMNH%Ae_05BqiF~n5-N_3i4SuKYE(;h-0{MQbZx{+(K0=cd}EV z$2`B#@G>C6rW=JqV=W6xleAuGcQUdFeX+*coqKG)>izx({Q8%)s`WG}B`FORsu}%n zeYySsbu|+)-(p_x5BLRt3Y6IC!;3@vs!F&1J>eoVu!p3^ z&d5=&;~v<24dzt5J-4>7Xtr9BiGZrwUk=R8hW|x#+tRyys)4}+hHQ>T_lx+!I}|Cj zK}>f48L4OKGeas^!eRguMK6vxJjm(DT1o(u%D}$^@ zTDWNq%Md460?%$57F#`kfCVWwee)0%L0CnQahn6VJ1)Gd{lXa8Xk0;L`;H2{sukr> zIp^N&)k$LcZqpxmX9YW41tC44CWdl|xn`-BRm!roPd9(3t`AaGbTV=x1h534Q-L6= zBDtvO;75@~N@i2J~_6WGYw1=PV?HF)Mo>iohwWvHvF=ShxwNjv6jw^ptzx&%0yk=nkk z?+r0A0NF10FZSQ`H=Mmu53)PG|6xD*)>6)2Gv^;3}%f6QQGatL9 z(n0$vb|I!~p}G1SLHNeIy^hSpW-I1y-?^8c+v*m(2~O~y^Bf%-K>~-vc6pM5PRO1K zvw5{}myA3go8oDmaAzT#Oa57oM4aMJAG|M3kZ<)G>nsamc9jyA$&`>VM%CYgpw`29sb>OD% zlFxMx*h_`7Fqg!(M`v>P-a^apw!xaQ@a)DI&R5ik{odgfU>&yt>1t+>Qb}af0ADFJZkyI za@OgrVE^dq(k#pwZ`1xw5y)@CBIVhTy?H@YU0xldGd&iPd2D&JYcKP^9TW|8HcVb! za4ND_{rbfY=&?l6Q<6$zsF^$}G)*oy>n-*qc0bL~l4oCsZ7&kH5>2P8xhw9?Eo+Zn zN*C&;b}+vGvr0UG0S8+G33j=CQ$9BOk2aHcD8fCB-CXr}+#J-q;M?K07GBbHhe$*y`enJ--cSntJz z$)vPVe)kfG^S^;mAV$OCsXgL&{`5q(Q*p{ui?)fyf^cb2)ccVSAf|uC8_JruT%w6c zA&@j^pZqYtah}#XF@b0;J{>c0c$vhul62L=Ce~ZeSRQUf4hh*OAlJE+J}A*X1%-z4 z1Hc{HLKy#&w>p)|GgVIt)`xTurBi_x>WC0dP!mSCxvJ(!PuWiIb*$p)*D_SmS8*+L zkC!*2`EsPP>H&4|>1zS0-{}|%V(}M&Lrm;6NOI=>TB@(qIA}-IbOyVJG01+uh>dlv z!?>Fj*+VwtkbJ40oJQ7@`p|W`NoI>gg&BZAx6FXUoK4NBeWIX7a8! zAJC6*t4_+(DR@K~8M|>nTx{kk5SHc#y>wL#`9`b&1+dsqP9 zZ_ND*<#&RObTA`6{HhBHoVLu_gIm!8+XU8BM(H`-Y;)o3WCbmg*5_*=^dw<=ek*ZX zvf&jobAiVKKcbk0F$q7q1(3Mds6f)!PYg!h05`}ZB}t-fh=VUGI}JlNw&Eh=wfFnD z@eSLciX}=;w2t_FM&R%@*G{j0EBmn1-T^Flf*_yumOiZ!oSM81%jXRSU9f-hJPb+z z<@OQ^sf9I1RKiKXi{#-68yNmZe75fAACYu3$!f}YWIs|Y(&d0!L}~1@=q$`mfqq5Y z0~M8)kB3ELU>6vAhqGdpE6)%dub(aRlSDVW+xiE5ZBI2BN2R&wrVLwD?X-p=bBf5a0=;|R}nG@4Z$Ua+5&+0m;1wb;!IVcg!L9cN= zkeCF`KnAPLei=W;{_TQfbe9|4kYpfXn1YBey4rDZ3G@6;T1T=7E>`hA|;Hoo%kIYOC l_2K(i`iMuc>iG{ufL{z$et*!C&u@+ZG*onyKcH=K{{yQr4153p literal 0 HcmV?d00001 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e8637e08047fa8ab5d560033e4764a75734b28bf GIT binary patch literal 4371 zcmcgvRag@M+Z~F6bV-bE6$GSHknR>xS{!T&1Lo)yhA_H&AfrVj411d;mZ&0sy$Ym4Y__01puWV9O2wkWB{w7~Ha(jO1^P zJ8yI}Q~@{PaoG0T?SY%-s}BGGDeZqi0LaW{ycLPyT6$_kYsA!4WQ<104~`-i29r7^!57-F&*VXnX`wD*Q6}av`OuZ5r?8yrjua*dI1-mGLP8_ojTPX!v@S#5j&MA_nfXFK%R-IZMhQiixU5Oc zp(N!r)eC{XJ+fa$^Ey_g=m~a4-A~eXe{zS4PTE{J=$nuYmYUc0RkClx|wSQx@BeVx_o@O-!`Lt6(1eCxmSTk*U2 z{H*BG=P+|`#_)$iqv$2O2W5Bhe2^%C1^S(%#WT}md|91(U6udO>H>3*BTN9^-X?z*i_3KV@E(R6svox9tB-e zds5D~&sJ5FK9pdco`7aJloEfHxyM9KDJIjQbXaPN6S8^JTIi!Z0{+oO&2_+U{2}UT zEnSm8sN2C=_qk?d&QJ4_Z(B!*JfojA*jUBrD0=xJM+Snee9L9>VE;KWw1BA?R6KC;9W>7J-h7|sC1KSwB!jLf1 z@4gX(mOWp;M=qS@MiEuv)L1Cv3jT_=w>V}f5r#whGl6EI2#lzJ+X^+gus{NjsZW{Pa>dV}t$bObgUPrM(?cKx39#cmxY}J~{VJy}e$z-snxPT>vht& z(EKkg-l{N!-6#2%zpAIhUSMit(+#}XX`0iY`W3iW@^Q@+Cm?54YI#)UFj8gh#wmko z^khBPUz~Dn_f`sgH)AeALkAUn?gBHg)}YS%=*JImA+kQH3eCf&TAR@J`Y83RgtBQw z_5dUf@@ST^e05*@`D065w>mOn=vqo}G|=(R@(cQ8)o8OudKm^&0`dln#gRA^=Ppbd zCM84+ExQYuX^ubDve4hr62k42=$1n9IA+|EigdFB?m@I@2x-_aa6$YDEJob_`d#b4 zJ@VWSTdnU!PGQ3x!SFL$BdGdAYa_{LCZ18}I)nAOL+J@6(7=#B<8g^PD@(m_Z{fU6>wD5i>dSf|etzeR$uey!5E&mtPLL4(vrIM=$3u zHp)vP3_H*tfmR-8ijh>omhXz0nyBLhRH?EI#lib_Px$WEe@E6xH}9p~e)f)JcjC;!+uW{@c~ zTw^AiM!G`dbWILw_!}KMGuxJ4ks$#pI`Pr``1Y$P-7rtb`Z%o5Z?hV5)+s(+t5@rdLJ|i`%w?{V`KI5dW&`!>geKD`0c(K*c^`6LpIGbV^8ZweGOoZof#tu@iL?e+BV`WBsRzmg@v~Z8*G1fl>g3PYV6A=r0hn2 zdVx4DjaL-Z_I!$`wmf1=%j3S6(JnL!WDd)uBqV>_2>!LUH|a8xDxDV7UsP5=?<(rH za}WUR=IK`wXCb>S9E>&UP?_C$oyb_j9I<;$q$ej@BdB^-Cg-7{3zGCJD)Lv+a(0{K z1@;|vbiFt-lTQr;PqBY5WF|CgOe-LadsVN8?6@weSB#4y?J?#<3nM7EBqJsc>yv$w zS7TSwt<8^vQVuHR+>?=DHT?2q6dTPp{$P>w$W#s1iaq$T8i6Y_AOvv%ack`*a!hq2 zRYMYU4_)hBG{s{APlEg-OK)!%1#WU^hBISiXC32I?s$(UwWw`aZA2i+Ig=B>=XImS zvmDT4$^J$9ZG2Aig4qPcBXiw>&*6``aSYrVaC70O@UNce!Mbv-=;@Pg7$b1v&-Fk; zqQ!x0^ou$@pYd%b6OZgSmffBpl%EaPvNVl!%ET8QWoxys4lF{12k`(Y z?pGkvwgibScV9a%q;B~3*5V@T16 z)DP{}W9kNvOy!Yn9iLjgu>`?Tc%qL{pTssQ&91Gj$I>5Hy}l@%X-`i?HC5A)7pwH% z$ymTK_{}t)ME{*oxW+cv2eQaRzj4yZZ?+1TV;%pB zrA+q;h~d5s2g#`HN57Nv54|q{udAI$l^Ps<_Oqdv6G}#Hd{|m$O6`KHQxHbm{Nx3S zMLK`eONw5f0P(+GURT)+-6y!|{lu*N>bvMn6{#gX>b#nkoWE;*bbPbJB8x@{>&d$M zs7dNqs-xW>W$((R9|WA`a?9QkXvdo5uViZPXI$@~WC@h>C!~_QM@kH?+M_Ri7Vb|7 zLWhM_a1kbX`LYscX7IFw94RWpv-7=ztFA{|r*Z+W{!RBAi3hrbyYAqR+D~qTnr&*P zmKSn8o3=F<%fA+N_8W_{5Jz86FBr|z*`|`)=U&DIuy01QL0C?1TwEnj8lBY^B6opx zSJ>5TsGHowz=~~#2G=-7MJD40%7FZJi`0go)Cmy?%}Y6|^D!`tls)FEzdW0sA)ELL zG(7xC(l52SNHc`kD~b9@yk0a&$e zZtX{Zt-1=G1h1z*qsTn>IJf!^o182Nn2$@9OSH7QSLYSb%4g6MTV$mcrT6#)!o17x z?!6gvk&iKqubg8|yjjp%Ia~u|r6|a0-QALedNa)6JC=Q0QID62Y?5?eNUVwTy)h>9 z#RBxQEs3g1yAicd6b;0hTBdTW<~B?geoB7K@%ERzQ^@7}<+wa^{axZ1aKI|-NviBk zThLCXAyTpAtDg9g#y|d}rd1^8ecmP#>-+igmKXkmebd|x=Sf=(MbbU03&S#O26G=- z#y!t{^{jHTJ_RC~!-PVgtxaEpBQ2fWv0^U=dgh{AaIG8%bNqRdL3zx|pH$s9qPq?U1wYikLUO+nbT2T2BNZ#GGAwfZ zo}A~ZgbB$|61r_lG`0Io}&WUw&jtNPPvy|9jBd>PDr*H-U^%z2|o2$ zvH3cA-o5U4a^mNN7yG$ay6<0AAR!8_IrsZ@o{s2q;N35QLOUjud_Cu^Eg~RGP)p#M zYP(cCKHYu(d(YDcDJGA)+2sQnMi&hCzuhe2jbzf!9Zz)X4qAjhw?4D;C)Z%3K9`Al zcQ;ln_-~GIx)a4cSJkXuLGXq6Kh(9Q5dsr%s+fCtvUMJbV{|3I@-Eq5VhU!9C8JF8 zbWhB;HL;?v zwm5Iz2e{5jzNd_Jr$(GJg$E<%*nSzA?|1;Am_XWdp11kNqX-1Nflot1Z9C?V$u(&4 z@Lu)D%F$B@gNuiOJ4bOlGb49^LAe^Z(;|6sw#jhm3|pezQwIH8y?igKEPW zY~OnjR-^0G_Oh%-{d09x(5Pi+9(znccKtgK3UKWq>s5;AW~M@z*!VNb=9G_&s$5u# zwyez2!o=t8hSKW6-Q9|3#&nv;N8Hyb*KpUq9~a<74~yj zaYi`l#FyD%B`)ks&k^--YVMx=N?lrJu>E7`CrVUqHu0x$C1F^wnQTn#qSGu^qB=yQ zF&E+ua52`SBj!=E4^CoP6ql+lb#7dt)dzYfTMRZ9ig| z!JPB>7=~p{B$V%6X%W}@`-cM0=sbpLa9Ly#+sEvb~y*S`JWdEsgn z@VEAGkgNj?bV~qH5mC{nBGONvNtr&Alzk>DD=ID^A|fjy!u~Vq;{OF)T;D<*eg1m@ znk=Ap8!-1ZwSXJjdvUnITpc0KAP%^X8;Aqq26q4eyt9`N$%x&}9zE(e7{F?+8UyZf zlL|SI(sI-4B+=ca_ MHGS0zWxJ671Bi-S$p8QV literal 0 HcmV?d00001 diff --git a/public/browserconfig.xml b/public/browserconfig.xml new file mode 100644 index 0000000..b3930d0 --- /dev/null +++ b/public/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/public/favicon-dark-16x16.png b/public/favicon-dark-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..6acf70577091427c39cb02d0f5c1153a2c7c1dee GIT binary patch literal 617 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L90|U1(2s1Lwnj--eWH0gbb!C6XAt=DF%CgMq4^Zf*r;B5V#`)HX8~qLih_wAL z*6i5sBCgBg&cyttPvzBtOX3BSkKAoB|Hyl1#vGXrKD9lJ(nr_@q{W=p?0xp_n}Nur zd(&QQpF3yr=l?(JA8F+kwp($S^)UEL2=jkr5a;aTXsJ+{x2UpU?z|cyeXjGmiXWd# zDKyp>yeU)`361y^CG#!C8<`)MX5lF!N|bKNY}tZ*U&t~(9Fuv)XLag+rYrez z3c0lGff~ZALLy3n63Z0|it^Jkb5a#bDhpB-G7CzQ85k<&JpRPPQ5dG7amxSn8PBId z49v>hddb|v%EI20MVN&ZTpCOcr!XsT4pBILk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-G$+Qd;gjJKptm- zM`SSr1Gg{;GcwGYBLNg-FY)wsWq-yYD8R4EvdrlZP?MFXi(`n#@wZcLGlUZ*j@O^B zp5E>0p{v*$BI2UCE#lYK2-g6|5{^ginUT6VMe#LIRqdsnhfCv}h7EQ!zOMOwu>C7HR7eLfP9`Ma(8dInd~rajw#-K-LJ z-ruh$d02IcCByFQ8+kL-o@0JL+zj1)0234>xC?;Fx~k zpWM#*T`!W&nC#Ci*L}ap%A{dQ`K}kn^K61LKRXm#o8GdU^)suDO~HAoY~E_~m{sBN zApv3Uyo}EZFj(DTyghkd*5Cf^V!Kz>`nB)o`q1=#iIjiTK9_ZRN5A?%b~^a!wep*F zW%_G)FB{L~-xu=yO!dnAu>G6YDE$hlyvsLX>+?NHMmxTQ)$bSn`uSwdr)NpCx4%@M zyokNRqk4kz843O5Z8F=e@A^*aid<*9&1~2OC7#SED=^9w*8k&a~npqi| zS{a*b8yHv_7%+rSYDUqJo1c=IR*73fA(xgtP(yfCNJL3cV!1*=QGQxxPO3slWkIS! zW2I`Q&6e6=(&6r>mdKI;Vst09Y1wFaQ7m literal 0 HcmV?d00001 diff --git a/public/favicon-light-16x16.png b/public/favicon-light-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..a2e1e13ccc82bd331f3d4db4ae9ba80bf44e7b15 GIT binary patch literal 635 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L90|U1(2s1Lwnj--eWH0gbb!C6XAt=BjQT{kqkAZ=a+tbA{MB{wx#Jyh3jv{X7 z=iYs>i?e%ykgs-xx7Of5a@BiRn`)J5-R$jslp_2+UB}Gn z8gJFEM7_^*fA>DP@T5V@Nv`=kXKr^bU*w{W2Z8R~)312U?0ppaLR9WN>q`6ejw1gP zp7+lydUBfQ>>{bz-%T!`*tq$^N>gp^R~ePp|9(7kk+<|!huPm9(&u`9cvw}PuI-t( z$Z^ig|I?=Q#clnr6}~V%_uSMa76+V5tjnILW$ieA)s#EuOo_0xs{1;3$0keu_(ye3 z8$T{zWyV{+yT;7suS=7PN5Bs;r@56rX$A6kd-dJ&U#2+wo?g_RHn&L3#OVA+v&rw@ zU0(E;cfo`NmR6%(8-XFETH+c}l9E`GYL#4+3Zxi}42+C)4J>pG%|i^$tPG8;j7+o* z46F9-8f8yaN4Aam!<$wB&=hGktW@T=@WNu+)VeiQz%)$yT4JLk4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-G$+Qd;gjJKptm- zM`SSr1Gg{;GcwGYBLNg-FY)wsWq-yYD8M68{y0_-sL9*Y#WBR=_}i)086u7n$Llw5 zF0ba-uR1O&zG#I&Q@@j?$AykX9kIU}dT&H5=UNoe;Vb2+d@EvxQIt#15(D)g4kl)u zl@3adf+DtGgo;k?E&HB!TuIGik8$)PF=~C+7s!}6-kLGx%Y}O% zUS)Sk1bvuvMT}A5gp|s59d_SKA5vrfPB>%I&xWsizFhoT%Vt@s z{(oCeg2DSk;@ej}fAeqYnoqn9o4#*YU@4nBaYO99&OVXP((m4;>2;_t<@d|}P$6+Q z@$H1et}e+8cA@jdd@qW+mbfn0+I()lU#?iyihwVDu2yTmT?lYodoSiLheOZJ$5Ue) z@3pL+A1binvd#69BSQNa*Q{`7ZC-by`x8HF)9TK~XN_0lE}JtL2K{-ZxALJ zo%Om_NB2{Rg-TrLvpZ7FZ1-PGOj&u!al<#WurE_=^PcaS^~q?v#MA>ir?&{+j(GYy zvujpu00_2#DeF4>n`N;ZV&08^T3iEBhjN@7W>RdP`( zkYX@0Ff!6Lu+TL$4>2^eGBmO>GSN0Lure@^KRNj)iiX_$l+3hB+#2$xXuAS6gja<` zlmsP~D-;yvr)B1(DwI?fq$*?3oE!Zm>f=FR^A+>jy_2ae3+o5pe~5QS^b}77-Lg zMR5J%inyRL?zqqRP&;-ulbD`pHnVhM)^~o_R8ObV9dED63@JFNdv90O`PZp)s_N9K zXj+gKqD4h%l1FOi`fJ)~P17PHYu+O?Em^)rNY3y74%M{(N`XOAMyhCwh4`+ge%~_# zf7?l!e+tD4#R>gSC?UWEPk4jjUqazRKT5$;AX?~{(CE19c$jV)JW0ap8QU|i@Mzxx`qsisYp zd)q!3!TOUB3A;Eh#Q1pIcCGq@1`SHyuwg^ip+kpqckbNzW!$)NA45Y!YnAbkCs?sj z<{4}oz458O4;?x*<;|NnCDoGB($dOay?RxWnVDI>dGqG1X3d&;+Xt|M8SJq_zSbMl zmMvR8gPrv9FW~93+7vS%vO`A4l zRaI5#rm=6|z8q)#u@#faRI2R9Y&L)E+qZABv$BEw79JjMe)Q;3vBLHC?b}jkc06j- zsMOrt+zM5$prD|VwIh&No$xYEnKC84u&}TaTon}+RoL;OMT?kAYuRz<&YctO`}y?g zQ)}0*UA>*JytaX(M~~(znO?tsy)ZE`@f-Txym|9FcFg)06BF}g$BrFeh7TW};zS-^ z<8h}=(cdIV-@so|Qc^W*)~t*pM~>uXXJ=Q8962)8MO%zZt+8=Y&fk48tzNy_Qdz01 zPBrUS$BrG%)22;Jr!UC3fp8h>H}m|hTek|8?i@I9K%aLyb?THzUs&VlPh;%^^L$=j zo<5&2mrR~KIZf%s-o1OXv19Z}eQRv}*uQ^&j*|V8Cr_-b$qM6y2@}$aii#@FoH>(U zv&S$rrmDWbbLMyEd4+%b_U*NFyhm=-Qvm|0d~#*Xxxfl zixw?DoIZUzAM9$cMsBfK%JC!Z*V9$2R#{lrzJC3xFAnI~)vH$v8gd-a8~k-}T)cSE zMwc&NE?}PN-@m`jPLVg|&@=oU_7kiRty{OYjggW|Aai^cS7eU^J#kjfzD(1zS3YWk z*y^@E01T*L7{)k@$V$Y!B7k-H!c_>q( z{YLgGenbq6SXhIfFS^lZupSpuG5Me5*M3v7%ObW=-B$Y9K68*7Hkx3_V)(l)oH>mRBV_zwjtIywKg%obC-vCrcSEj%YQVj zl)RUw<&z8gRPq*@7Ed0cX))wMf9AY4r9UMQ!=s&i;&~UjrIL#rm0XpamE5_f6)E(y zknNt9+~uk#p?@QUb_?AXdMD&7y{9eOr0stQ!OK1|$NVBh8EnHJwyD~M#{waB*GQzR z^L`^aHtBAkIoEaPY!@EzqQCG)9$<2tH)rSz7A*L*bm`Je?$k&dMzO;Sp73T&+?IEn zHf_wD>2bEoS>Wy4w~K1xCq^;AQ|X%9{Co81p~wA*oz0&=|I@N%%PetmaYe+Qq+KHz z;E4=8(sS-Fz;pNR-Pzr`bxY)I`N4w+#Y>hfsT23D!Q)IvJmT%Ff5dngk89Vi6*|Uk zRm^tg%$XVXcQ%~0f9^hTPeoz#Ro=F3Tl4+<_lx1pdH210_iE`Oy2^b3Vnlw3 zKbWvPVtw3)ijIy>C2lr%?p(*Xr8E6AD&Km`9X@S1tjhm z85xV#NvzF`W1B-`no25TjxYxN8R<7j^5E zsgXLw>~7q+p~v6lE~WjQACttyJ`=YSEN;)OMtDnHKM|WFe$E_x@ZiB575_osckSBs zB_}7RV(ZqepSyJFVsuV6ERzu|D;Ki(zu7lcXF|bk4F0B zP8sGkSHCsJ_`5rOZ7OSMKVevRo8(zbo<7?Hc_3Him-uCl`~e=d z|MY18{e!lR=py`;KjxAD;RObJ|HE7V%Sd1C%Q*U9(hc1g#3w`!$i*M}pxT88zMt|x zls|l<}oqC_QJq@$uoMC)u!tr^-n}yqqe;eD_E7@BaD&k9gsgDm>xMIR(cO zkwUg}icoo}o5JMNuR`~Pob9O`zwu64>ZrQE$#We)8{cj0*s-bH&z0XDb%i>LZ=JgG zn`zCOHGklDu^(#RzP)1^-d$nVdGS9O!-fq@;V$T$Idk-VJ6O2eT;t0*_RSun{)}I7 z^5n_9vuDqWSha+C^X7ee@#2NGXV0F7{2lzV=g*&8PncOFG!IM5I{lx~H+D|=vsjKWq*i!>p(C<_L literal 4286 zcmchZF=!M)6ox0}Fc8GdTHG!cdIY>nA!3n2f|wxIl0rn}Hl#=uf>?-!2r&jMEF^_k zh**lGut*gwBmoNv7AaB&2~nbzULg{WBhPQ{ZVzvF_HL8Cb&hv$_s#qN|IO^o>?+mA zuTW6tU%k~z<&{z+7$G%*nRsTcEO|90xy<-G5&JTt%CgZZCDT4%R?+{Vd^wh>P8_)} z`+dF$HQb9!>1o`Ivn;GInlCw{9T@Rt%q+d^T3Ke%cxkk;$v`{s^zCB9nHAv6w$Vbn z8fb<+eQTNM`;rf9#obfGnV#3+OQEUv4gU;{oA@zol%keY9-e>4W>p7AHmH~&!P7f7!Uj` zwgFeQ=<3G4O;mwWO`L!=R-=y3_~-DPjH3W^3f&jjCfC$o#|oGaahSL`_=f?$&Aa+W z2h8oZ+@?NUcjGW|aWJfbM*ZzxzmCPY`b~RobNrrj=rd`=)8-j`iSW64@0_b6?;GYk zNB+-fzOxlqZ?`y{OA$WigtZXa8)#p#=DPYxH=VeC_Q5q9Cv`mvW6*zU&Gnp1;oPM6 zaK_B3j(l^FyJgYeE9RrmDyhE7W2}}nW%ic#0v@i1E!yTey$W)U>fyd+!@2hWQ!Wa==NAtKoj`f3tp4y$Al`e;?)76?AjdaRR>|?&r)~3Git> zb1)a?uiv|R0_{m#A9c;7)eZ1y6l@yQ#oE*>(Z2fG-&&smPa2QTW>m*^K65^~`coP$ z8y5Y?iS<4Gz{Zg##$1mk)u-0;X|!xu^FCr;ce~X<&UWE&pBgqfYmEJTzpK9I%vr%b z3Ksd6qlPJLI%HFfeXK_^|BXiKZC>Ocu(Kk6hD3G-8usLzVG^q00Qh gz)s7ge@$ApxGu7=(6IGIk+uG&HTev01^#CH3$(Wk5&!@I diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png new file mode 100644 index 0000000000000000000000000000000000000000..c37abf32e8cee6d544e02335b0b08874fef7d90e GIT binary patch literal 3557 zcmcInXE5CTxBm%}jk1!5s4IG+w^ddN$)iVmh%N}LL|<%_h($z}5FR066D5d<609DU zWf9R6(O2(ftrk`Z{+s*mzPK;$+_`7w%$f5!=kqx;=f(HTH~t?JJ!S@O1^@t<4fM6m z0e}Yl$3b*dWUyXNni}Xl?ik+z0BkbjZ)bXH&JWi&HwJ*mHvk~&82}tpp{P{=cq9t| z>kj}xH3I-R5Sa~T>eRvo7ehU5;2fRYi>GFnkOsy&mzF_SuP||jEI3fbnO+!Z-?0dt z*qrk9u^7$j+}Uc{n+>aY$qc^nTph^@QV;NE1e@C&a~KS>|r1~i!iPUC(^=D>5HuwBpE)abX|9J;qy3^UYlp( zhaHc%qiyeUfRnJfpWK{jJfDyC?=hV?^mnjbXUpK%x3g%uyWB zpRZz^xgxtR&ZnJ9FUpTEh9>EaZ-odzukJQRam8($HGg#&zN%ZH^2~<7Z4QBIt}dg6 zx;PHK*)t-=J$iG~hmo?{(_7};&|46L=H8X~x;yXWUTa;Fh?CcErNVM*e_)TeT3ZG2 zzaNNnCg+56^1zLCI6rAW9YETY~FQDCG1v zJuiymhafmWLkCYK!rfuyrIC^kQ-EkyqA`lYEIEE|bxt6U+GB2}VN^b&W8~oiv#P{x zmYYv@OD>t<6Ega7h_OlIU2#UV7RN?!xJ;r%+)?RnBOM>CbdejM@X5^)=I1^u?yU?! z*el1j1idgENyPF76Z)3i)N9lcJvfA8S-jL49@48$5)%P}#(r{GR{9lj>*a4{t1o(A4xYb`JN{y9qL&L(O6BsRV&+Ht@~|MBL3- zEp;)-yusWR)BkIUfZ~|dOrX!r{un7-Xt*^@N>tTU7}$$!vR5TuJozLJ8T%cv)!Ass ztc*e&_Me|_WSoR2BO|eeq@5S%vd0Snd+fSSlCiW2VY%M#GB2T3l#)(1vw66;C*K#B zNHuKK!ax{aFO?{Zu)O<7N!3k+vGu>wDM9lwa~_I9q;DGHO&amg zo7E!Yhv&kZQdzH4?)D#9iqBZ735Y|aO$+qAb=mohm=u0Pa0NeJ4?6(Ki>UPd#xn`S zIYgKg#jB6!Nf6SvO^Saj+36l{fcm?$dnvVfhJ^tl_O0I%%odKi78GL!8(AZlRahUd9GSS89y}7#JlhKtg(yyoYorH6t{i_m&KP|| zWDyS60(3m=#iy)d%>IFW6suBvG@=-N4O=S=e>Cv(et5(qD0$&13$t9#tH98yfFIZ_ z;z}zsnKUnl2aL4)l?02c4R%iW$TBeK@h&WRn3H)9Pjgv@$IE6auNzsAo0DGG7J3{^ zwB{j(utIxDCA=V87U9N^eNP;DjvwUh4nH`csNlV`nW=O%Q899_I-v+M;#@mMw#a*YAavC%>Kf(#Li~mxrGw_WelH6xr290u zGAo;lx&Z~*jPPMa(U*4is`*yQP1xi6YgKC@6TyF0uf^qIU%bklHhs+=(tN9-l=eaO zFJx8gC)OLzBA?%vorAolq;@xYcYePT3$ZMF>0|T@Ex~d~!c2~C2NUmy8@g!CAIJ4| z%_m?!V^Ugb|JFE|KfJfHARyEBqi$jOL)x6$&MNnoB-3_M<7>zydJwn0K#a?{# z1tEuFKnXJk%PvpPT8Mq%&?gRoR!E#YFJT>jtunNj_v=enNa1NaV#k`sUbYC)+k#kI z6KfkV3iB?uW!!#zhOHuRa#r@kJz@?L8whejMCevF9>Lq)1RE!<^gIb6z03DsmPn{f z=qJWTa-Xh1Th}cVv{bdUj;!TbLadvoQ?6rLeUIaJ>jr+y*GSijx&##0t2Ju!Ra0LG zXj)K`Mdy{m7smc|makzpuu#9Hh>9DqVzwkM47|KZBmC^H`?gE19mrL*Urq*+ji%6QyR4WKds^{4|fjlc~U@g zXWFKqS$%TsxP9DrWCqb|ITrquPU@Tp0i8ZP``Uju^^qQlc4u)d#~71ZFNZ5=2-`du ziXXRYb(IS~k_mLfgouTACp#Ulm9dD({BqxGbIJ;zO4EGT7vEtPmD+LBJxG91!KXJJ z7d97KxDQW~4u{Jx9)C{Am&jjfCbL9*Y^-eXCAQC!jN!JKKKlX6a7S3u;BGHyQ4{d|4q3+LuMsQ zY=n`rv=ER;Txn}ZxEfT{4)ad8 z5~h7}ZfUANQk%#O;-|zw&kv_d%Rk6$bB5c6*iY<*Iq<$Aw*|Zx7g6 zpQLk~O1C9^nTvvJ*Z*8)kV)2wKA*+gX>MnWrJ6=y1o9-6w=t;_t%3ulhq+-@JRBJi zu&Av5r8+LhrGg64ZB|s&4<5_6s0l_KSaN@>GT3U&Xd9ONmX~?2jV8=-fh}RpH#O8| z4A(_D^iNewW1zxr;9c%pledMpX|P?pJk4FwLFil#IsphEM4Iz!=p!g$I*I7XJY*U7HDC7k@Wo9;%;@$@!q z1_4haNG|_EQR&E?OIOsLkLxi+TLN&}yW_!Sp#`@6%C$__$+-y1r}O8niTi&ygcM!KoO1Kp?rke8L0my(4^$thdNDXGfItI8`#$jYk9%JOxk z9{o3hufMCOd)WU>@Jo}>p%SbgTi77YokRE$f&T8EK5qQTFoYYwCjtovfY8i^T_#X~ zm8fX9X-}`gk~u&t#3&7CWEEmHOl6~G<=2i + + + +Created by potrace 1.14, written by Peter Selinger 2001-2017 + + + + + diff --git a/public/site.webmanifest b/public/site.webmanifest new file mode 100644 index 0000000..3bb1b80 --- /dev/null +++ b/public/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "yarkov.tech", + "short_name": "yarkov.tech", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-256x256.png", + "sizes": "256x256", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index a60d777..531d226 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -22,5 +22,13 @@ const { title = SITE_METADATA.title, description } = Astro.props as Props; + + + + + + + + diff --git a/src/layouts/article.astro b/src/layouts/article.astro index 34ad016..d35de24 100644 --- a/src/layouts/article.astro +++ b/src/layouts/article.astro @@ -15,7 +15,7 @@ export interface Props extends BaseHeadProps { const { lang = "ru", content } = Astro.props as Props; --- - + diff --git a/src/layouts/default.astro b/src/layouts/default.astro index 7a89a15..6979913 100644 --- a/src/layouts/default.astro +++ b/src/layouts/default.astro @@ -15,7 +15,7 @@ export interface Props extends BaseHeadProps { const { title, description, lang = "ru", showPageHeading = true } = Astro.props as Props; --- - + From 2550e807d38bdc36f52a9a5d0826ed30770e6c6b Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 17 Aug 2022 21:16:38 +0300 Subject: [PATCH 63/70] feat: added microdata to article post --- src/components/ArticleContent/ArticleContent.astro | 4 ++-- src/components/ArticlePost/ArticlePost.astro | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/ArticleContent/ArticleContent.astro b/src/components/ArticleContent/ArticleContent.astro index 45849c7..27cc78d 100644 --- a/src/components/ArticleContent/ArticleContent.astro +++ b/src/components/ArticleContent/ArticleContent.astro @@ -1,5 +1,5 @@ --- -import './ArticleContent.scss'; +import "./ArticleContent.scss"; --- -
    +
    diff --git a/src/components/ArticlePost/ArticlePost.astro b/src/components/ArticlePost/ArticlePost.astro index e2dd9c9..143db25 100644 --- a/src/components/ArticlePost/ArticlePost.astro +++ b/src/components/ArticlePost/ArticlePost.astro @@ -14,31 +14,31 @@ const { data, lang } = Astro.props as Props; const { title, tags, author, published_at } = data; --- -
    +
    -
      +
        { tags.map((tag) => (
      • - {`${tag}${tags.at(-1) === tag ? "" : ","}`} +
        • )) }
    -

    {title}

    +

    {title}

    - - {author} + +
    { data.coverImage && (
    - {data.title} + {data.title}
    ) From e2c3cd4779a714011d2a94edb123aef0e5e2e256 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Thu, 18 Aug 2022 08:21:55 +0300 Subject: [PATCH 64/70] feat: added rss feed for articles --- README.md | 1 + package-lock.json | 52 ++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + src/i18n/utils.ts | 34 +++++++++++++++++++---------- src/pages/rss.xml.ts | 35 +++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 12 deletions(-) create mode 100644 src/pages/rss.xml.ts diff --git a/README.md b/README.md index 81aae62..f3fc16c 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Personal website created with Astro. - [x] Multilang web-site - [x] Form handling via [Netlify Forms](https://www.netlify.com/products/forms/) - [x] Comment system via [utterances](https://utteranc.es/) +- [x] RSS Feed for articles - [ ] SEO optimized ## License diff --git a/package-lock.json b/package-lock.json index 7bea0c3..fa74583 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,9 @@ "name": "yarkov.tech", "version": "0.0.1", "license": "MIT", + "dependencies": { + "@astrojs/rss": "^1.0.0" + }, "devDependencies": { "@astrojs/image": "^0.3.4", "@astrojs/mdx": "^0.10.0", @@ -183,6 +186,14 @@ "node": "^14.18.0 || >=16.12.0" } }, + "node_modules/@astrojs/rss": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@astrojs/rss/-/rss-1.0.0.tgz", + "integrity": "sha512-vOPocf/SC0TfHsCwQXupvLGm0y3oIwpRCnnF2igDP3gFSxQEOk4nmsuVTEU2N87hYyX1/5uxbjJhixuSV/L8Cw==", + "dependencies": { + "fast-xml-parser": "^4.0.8" + } + }, "node_modules/@astrojs/solid-js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@astrojs/solid-js/-/solid-js-1.0.0.tgz", @@ -3558,6 +3569,21 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, + "node_modules/fast-xml-parser": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.9.tgz", + "integrity": "sha512-4G8EzDg2Nb1Qurs3f7BpFV4+jpMVsdgLVuG1Uv8O2OHJfVCg7gcA53obuKbmVqzd4Y7YXVBK05oJG7hzGIdyzg==", + "dependencies": { + "strnum": "^1.0.5" + }, + "bin": { + "fxparser": "src/cli/cli.js" + }, + "funding": { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + } + }, "node_modules/fastq": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", @@ -8146,6 +8172,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/strnum": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" + }, "node_modules/style-to-object": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", @@ -9335,6 +9366,14 @@ "prismjs": "^1.28.0" } }, + "@astrojs/rss": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@astrojs/rss/-/rss-1.0.0.tgz", + "integrity": "sha512-vOPocf/SC0TfHsCwQXupvLGm0y3oIwpRCnnF2igDP3gFSxQEOk4nmsuVTEU2N87hYyX1/5uxbjJhixuSV/L8Cw==", + "requires": { + "fast-xml-parser": "^4.0.8" + } + }, "@astrojs/solid-js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@astrojs/solid-js/-/solid-js-1.0.0.tgz", @@ -11761,6 +11800,14 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, + "fast-xml-parser": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.9.tgz", + "integrity": "sha512-4G8EzDg2Nb1Qurs3f7BpFV4+jpMVsdgLVuG1Uv8O2OHJfVCg7gcA53obuKbmVqzd4Y7YXVBK05oJG7hzGIdyzg==", + "requires": { + "strnum": "^1.0.5" + } + }, "fastq": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", @@ -14979,6 +15026,11 @@ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, + "strnum": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" + }, "style-to-object": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", diff --git a/package.json b/package.json index c234b21..4a4ecab 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "devDependencies": { "@astrojs/image": "^0.3.4", "@astrojs/mdx": "^0.10.0", + "@astrojs/rss": "^1.0.0", "@astrojs/solid-js": "^1.0.0", "@types/mdx": "^2.0.2", "@typescript-eslint/eslint-plugin": "^5.33.1", diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts index f1f2566..4482df5 100644 --- a/src/i18n/utils.ts +++ b/src/i18n/utils.ts @@ -3,11 +3,10 @@ import * as utils from "@utils/url"; import { DEFAULT_LANGUAGE } from "@root/config"; import languages from "./languages"; -export function getTranslatedArticles(Astro: Readonly): MDXInstance[] { - const data = import.meta.glob>("../../content/articles/**/*.mdx", { eager: true }); - const modules: Record>> = {}; - const siteLang = utils.getLanguageFromURL(Astro.url.pathname); - const articles: MDXInstance[] = []; +type TranslatedArticlesType = Record> | Record>; + +export function formatArticlesByLangs(data: Record>): TranslatedArticlesType { + const modules: TranslatedArticlesType = {}; for (const module of Object.values(data)) { const splitted = module.file.split("/"); @@ -17,6 +16,15 @@ export function getTranslatedArticles(Astro: Readonly): MDXInstance modules[name][lang] = module; } + return modules; +} + +export function getTranslatedArticles(Astro: Readonly): MDXInstance[] { + const data = import.meta.glob>("../../content/articles/**/*.mdx", { eager: true }); + const modules = formatArticlesByLangs(data); + const siteLang = utils.getLanguageFromURL(Astro.url.pathname); + const articles: MDXInstance[] = []; + for (const key of Object.keys(modules)) { const langs = Object.keys(modules[key]); for (const articleLang of langs) { @@ -53,11 +61,13 @@ function transformExports(modules: Record) { const translations = transformExports(import.meta.glob("./*/ui.ts", { eager: true })); -export function useTranslation(Astro: Readonly): (key: UIDictionaryKeys) => string | undefined { - const lang = utils.getLanguageFromURL(Astro.url.pathname); - return function translate(key: UIDictionaryKeys): string | undefined { - const string: string | undefined = translations[lang]?.[key] || translations[DEFAULT_LANGUAGE][key]; - if (string === undefined) console.log(`Cannot find any string for translation key "${key}" on "${Astro.url.pathname}" page.`); - return string; - }; +export function translate(key: UIDictionaryKeys, lang: LanguageKeys): string | undefined { + const string: string | undefined = translations[lang]?.[key] || translations[DEFAULT_LANGUAGE][key]; + if (string === undefined) console.log(`Cannot find any string for translation key "${key}".`); + return string; +} + +export function useTranslation(Astro: Readonly): (key: UIDictionaryKeys) => string | undefined { + const lang: LanguageKeys = utils.getLanguageFromURL(Astro.url.pathname) as LanguageKeys; + return (key: UIDictionaryKeys) => translate(key, lang); } diff --git a/src/pages/rss.xml.ts b/src/pages/rss.xml.ts new file mode 100644 index 0000000..cdc152e --- /dev/null +++ b/src/pages/rss.xml.ts @@ -0,0 +1,35 @@ +import type { MDXInstance } from "astro"; + +import rss from "@astrojs/rss"; +import { DEFAULT_LANGUAGE, SITE_METADATA } from "@root/config"; +import * as utils from "@i18n/utils"; + +const data = import.meta.glob>("../../content/articles/**/*.mdx", { eager: true }); +const articles = Object.values(utils.formatArticlesByLangs(data)); +const items = []; + +for (const key of Object.keys(articles)) { + const article: Record> = articles[key]; + for (const lang of Object.keys(article)) { + const { title, description, slug, published_at, coverImage } = article[lang].frontmatter; + items.push({ + link: + `${import.meta.env.SITE}blog/` + + new Date(published_at).toLocaleDateString("en-CA") + + `${lang !== DEFAULT_LANGUAGE ? "/" + lang : ""}` + + `/${slug}/`, + title, + description: `${description}${coverImage !== undefined ? `${title}` : ""}`, + pubDate: published_at, + customData: `${lang}`, + }); + } +} + +export const get = () => + rss({ + title: SITE_METADATA.name, + description: utils.translate("site.description", "ru"), + site: import.meta.env.SITE, + items, + }); From ea7c1a7c10e0e3cc74e4204e5b56397a55b8a454 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Thu, 18 Aug 2022 11:40:30 +0300 Subject: [PATCH 65/70] feat: added header banner --- astro.config.mjs | 18 ++- package-lock.json | 120 +++++++++++++++++- package.json | 1 + src/components/BaseLayout/BaseLayout.astro | 22 +++- src/components/Header/Header.astro | 8 +- .../HeaderBanner/HeaderBanner.astro | 34 +++++ src/components/HeaderBanner/index.ts | 1 + src/config.ts | 3 + src/i18n/en/ui.ts | 1 + src/i18n/ru/ui.ts | 1 + src/utils/string.ts | 6 + 11 files changed, 197 insertions(+), 18 deletions(-) create mode 100644 src/components/HeaderBanner/HeaderBanner.astro create mode 100644 src/components/HeaderBanner/index.ts diff --git a/astro.config.mjs b/astro.config.mjs index e23c72c..7336b5f 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -1,11 +1,12 @@ +import solid from "@astrojs/solid-js"; +import image from "@astrojs/image"; +import mdx from "@astrojs/mdx"; +import sitemap from "@astrojs/sitemap"; +// import compress from "astro-compress"; import { defineConfig } from "astro/config"; import { h } from "hastscript"; import { toString } from "hast-util-to-string"; import { escape } from "html-escaper"; -import solid from "@astrojs/solid-js"; -import image from "@astrojs/image"; -// import compress from "astro-compress"; -import mdx from "@astrojs/mdx"; import remarkGfm from "remark-gfm"; import remarkSmartypants from "remark-smartypants"; import rehypeSlug from "rehype-slug"; @@ -23,6 +24,15 @@ export default defineConfig({ integrations: [ solid(), image(), + sitemap({ + i18n: { + defaultLocale: "ru", + locales: { + ru: "ru-RU", + en: "en-US", + }, + }, + }), mdx({ remarkPlugins: [remarkGfm, remarkSmartypants], rehypePlugins: [ diff --git a/package-lock.json b/package-lock.json index fa74583..8ead71b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,12 +8,11 @@ "name": "yarkov.tech", "version": "0.0.1", "license": "MIT", - "dependencies": { - "@astrojs/rss": "^1.0.0" - }, "devDependencies": { "@astrojs/image": "^0.3.4", "@astrojs/mdx": "^0.10.0", + "@astrojs/rss": "^1.0.0", + "@astrojs/sitemap": "^1.0.0", "@astrojs/solid-js": "^1.0.0", "@types/mdx": "^2.0.2", "@typescript-eslint/eslint-plugin": "^5.33.1", @@ -190,10 +189,21 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/@astrojs/rss/-/rss-1.0.0.tgz", "integrity": "sha512-vOPocf/SC0TfHsCwQXupvLGm0y3oIwpRCnnF2igDP3gFSxQEOk4nmsuVTEU2N87hYyX1/5uxbjJhixuSV/L8Cw==", + "dev": true, "dependencies": { "fast-xml-parser": "^4.0.8" } }, + "node_modules/@astrojs/sitemap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@astrojs/sitemap/-/sitemap-1.0.0.tgz", + "integrity": "sha512-42GxuF5FP7RaKXZrwGLBLOX3hPv+Wl7ExJC43O0J5e34ojJkLeKf7QfwN1UwrJlqH0Ywi0Fm4/xGe482G09+wg==", + "dev": true, + "dependencies": { + "sitemap": "^7.1.1", + "zod": "^3.17.3" + } + }, "node_modules/@astrojs/solid-js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@astrojs/solid-js/-/solid-js-1.0.0.tgz", @@ -1037,6 +1047,12 @@ "@types/unist": "*" } }, + "node_modules/@types/node": { + "version": "17.0.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", + "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==", + "dev": true + }, "node_modules/@types/parse5": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz", @@ -1049,6 +1065,15 @@ "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", "dev": true }, + "node_modules/@types/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/unist": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", @@ -1413,6 +1438,12 @@ "node": ">= 8" } }, + "node_modules/arg": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", + "dev": true + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -3573,6 +3604,7 @@ "version": "4.0.9", "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.9.tgz", "integrity": "sha512-4G8EzDg2Nb1Qurs3f7BpFV4+jpMVsdgLVuG1Uv8O2OHJfVCg7gcA53obuKbmVqzd4Y7YXVBK05oJG7hzGIdyzg==", + "dev": true, "dependencies": { "strnum": "^1.0.5" }, @@ -7751,6 +7783,12 @@ "suf-log": "^2.5.3" } }, + "node_modules/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "dev": true + }, "node_modules/section-matter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", @@ -7943,6 +7981,25 @@ "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", "dev": true }, + "node_modules/sitemap": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.1.1.tgz", + "integrity": "sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg==", + "dev": true, + "dependencies": { + "@types/node": "^17.0.5", + "@types/sax": "^1.2.1", + "arg": "^5.0.0", + "sax": "^1.2.4" + }, + "bin": { + "sitemap": "dist/cli.js" + }, + "engines": { + "node": ">=12.0.0", + "npm": ">=5.6.0" + } + }, "node_modules/slash": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", @@ -8175,7 +8232,8 @@ "node_modules/strnum": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==", + "dev": true }, "node_modules/style-to-object": { "version": "0.3.0", @@ -9370,10 +9428,21 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/@astrojs/rss/-/rss-1.0.0.tgz", "integrity": "sha512-vOPocf/SC0TfHsCwQXupvLGm0y3oIwpRCnnF2igDP3gFSxQEOk4nmsuVTEU2N87hYyX1/5uxbjJhixuSV/L8Cw==", + "dev": true, "requires": { "fast-xml-parser": "^4.0.8" } }, + "@astrojs/sitemap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@astrojs/sitemap/-/sitemap-1.0.0.tgz", + "integrity": "sha512-42GxuF5FP7RaKXZrwGLBLOX3hPv+Wl7ExJC43O0J5e34ojJkLeKf7QfwN1UwrJlqH0Ywi0Fm4/xGe482G09+wg==", + "dev": true, + "requires": { + "sitemap": "^7.1.1", + "zod": "^3.17.3" + } + }, "@astrojs/solid-js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@astrojs/solid-js/-/solid-js-1.0.0.tgz", @@ -10044,6 +10113,12 @@ "@types/unist": "*" } }, + "@types/node": { + "version": "17.0.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", + "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==", + "dev": true + }, "@types/parse5": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz", @@ -10056,6 +10131,15 @@ "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", "dev": true }, + "@types/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/unist": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", @@ -10294,6 +10378,12 @@ "picomatch": "^2.0.4" } }, + "arg": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", + "dev": true + }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -11804,6 +11894,7 @@ "version": "4.0.9", "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.9.tgz", "integrity": "sha512-4G8EzDg2Nb1Qurs3f7BpFV4+jpMVsdgLVuG1Uv8O2OHJfVCg7gcA53obuKbmVqzd4Y7YXVBK05oJG7hzGIdyzg==", + "dev": true, "requires": { "strnum": "^1.0.5" } @@ -14730,6 +14821,12 @@ "suf-log": "^2.5.3" } }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "dev": true + }, "section-matter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", @@ -14867,6 +14964,18 @@ "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", "dev": true }, + "sitemap": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.1.1.tgz", + "integrity": "sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg==", + "dev": true, + "requires": { + "@types/node": "^17.0.5", + "@types/sax": "^1.2.1", + "arg": "^5.0.0", + "sax": "^1.2.4" + } + }, "slash": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", @@ -15029,7 +15138,8 @@ "strnum": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==", + "dev": true }, "style-to-object": { "version": "0.3.0", diff --git a/package.json b/package.json index 4a4ecab..e30221c 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@astrojs/image": "^0.3.4", "@astrojs/mdx": "^0.10.0", "@astrojs/rss": "^1.0.0", + "@astrojs/sitemap": "^1.0.0", "@astrojs/solid-js": "^1.0.0", "@types/mdx": "^2.0.2", "@typescript-eslint/eslint-plugin": "^5.33.1", diff --git a/src/components/BaseLayout/BaseLayout.astro b/src/components/BaseLayout/BaseLayout.astro index 28f6f3f..390519e 100644 --- a/src/components/BaseLayout/BaseLayout.astro +++ b/src/components/BaseLayout/BaseLayout.astro @@ -1,13 +1,25 @@ --- -import './BaseLayout.scss'; -import Header from '@components/Header'; -import Footer from '@components/Footer'; +import { IS_SITE_UNDER_CONSTRUCTION } from "@root/config"; +import Header from "@components/Header"; +import Footer from "@components/Footer"; +import HeaderBanner from "@components/HeaderBanner"; +import UIString from "@components/UIString"; +import "./BaseLayout.scss"; --- + { + IS_SITE_UNDER_CONSTRUCTION && ( + + 🚧  + +  🚧 + + ) + }
    -
    - +
    +