-
{props.data.title}
- {isNonDefaultLanguage && {props.data.lang.toLocaleUpperCase()}} +{props.title}
+ {articleLang !== props.pageLang && {articleLang.toLocaleUpperCase()}}-
+ {
+ tags && (
+
+ )
+ }
+
+
+
+
+
+ {title}
+
+
+ {author}
+
+ {coverImage &&
+
+ + {description} +
+
-
-
-
-
-
-
- {title}
-
-
- {author}
-
- {
- coverImage && (
-
-
-
-
- )
- }
-
-
- - {description} -
-
- {isEmpty() ? (
+ {!isEmpty() ? (
+
+ {(year) => (
+
+ ) : (
- ) : (
- {
- return (
-
diff --git a/src/components/SearchInput/SearchInput.scss b/src/components/ArticlesList/SearchInput/SearchInput.scss
similarity index 100%
rename from src/components/SearchInput/SearchInput.scss
rename to src/components/ArticlesList/SearchInput/SearchInput.scss
diff --git a/src/components/SearchInput/SearchInput.tsx b/src/components/ArticlesList/SearchInput/SearchInput.tsx
similarity index 86%
rename from src/components/SearchInput/SearchInput.tsx
rename to src/components/ArticlesList/SearchInput/SearchInput.tsx
index d535d5e..2b95dc9 100644
--- a/src/components/SearchInput/SearchInput.tsx
+++ b/src/components/ArticlesList/SearchInput/SearchInput.tsx
@@ -1,14 +1,11 @@
import type { Component, JSX } from "solid-js";
-
import { createEffect } from "solid-js";
-import { search, setSearch } from "@stores/searchStore";
+import { search, setSearch, count } from "@stores/searchStore";
import * as utils from "@utils/history";
import "./SearchInput.scss";
-type SearchInputProps = {
- count: number;
- placeholder?: string | undefined;
-};
+type UiStringsType = { "input.search": string };
+type SearchInputProps = { i18n: UiStringsType };
const SearchInput: Component
+
+ {({ id, title, pubDate }) => (
+
+
+ )}
+ {year}
+{props.i18n["articles.empty"]}
-
- );
- }}
- />
)}
{year}
-
-
);
};
diff --git a/src/components/SearchInput/index.ts b/src/components/ArticlesList/SearchInput/index.ts
similarity index 100%
rename from src/components/SearchInput/index.ts
rename to src/components/ArticlesList/SearchInput/index.ts
diff --git a/src/components/TagsList/TagsList.tsx b/src/components/ArticlesList/TagsList/TagsList.tsx
similarity index 73%
rename from src/components/TagsList/TagsList.tsx
rename to src/components/ArticlesList/TagsList/TagsList.tsx
index d844cd6..17ca589 100644
--- a/src/components/TagsList/TagsList.tsx
+++ b/src/components/ArticlesList/TagsList/TagsList.tsx
@@ -1,15 +1,12 @@
import type { Component, JSX } from "solid-js";
-
import { For, createEffect } from "solid-js";
import { selectedTags, setSelectedTags } from "@stores/searchStore";
import * as utils from "@utils/history";
-type TagsListProps = {
- data: string[];
-};
+type TagsListProps = { tags: string[] };
const TagsList: Component- +
- {tag} )} diff --git a/src/components/TagsList/index.ts b/src/components/ArticlesList/TagsList/index.ts similarity index 100% rename from src/components/TagsList/index.ts rename to src/components/ArticlesList/TagsList/index.ts diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index 616677a..805d55f 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -1,18 +1,24 @@ --- -import { SITE_METADATA } from "@root/config"; -import { useTranslation } from "@i18n/utils"; +import "@styles/global.scss"; +import siteconfig from "siteconfig.json"; +import { SITE_METADATA } from "@root/constants"; +import YaMetrika from "./Analytics/YaMetrika.astro"; +import { useTranslation } from "@root/i18n/utils"; export interface Props { - title?: string | undefined; - description?: string | undefined; - canonicalUrl?: string | undefined; + title?: string; + description?: string; + image?: string; } +const canonicalURL = new URL(Astro.url.pathname, Astro.site); +const { title, description } = Astro.props; +const isDev = import.meta.env.DEV; const t = useTranslation(Astro); -const { title = SITE_METADATA.title, description, canonicalUrl } = Astro.props as Props; --- + - {canonicalUrl && } + + + + + -
-
+
-
+
- {count()}
-
- );
-};
-
-export default Counter;
diff --git a/src/components/Counter/index.ts b/src/components/Counter/index.ts
deleted file mode 100644
index e09713b..0000000
--- a/src/components/Counter/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./Counter";
diff --git a/src/components/RecentArticles/EmptyList.astro b/src/components/EmptyList.astro
similarity index 81%
rename from src/components/RecentArticles/EmptyList.astro
rename to src/components/EmptyList.astro
index dc4459e..e929987 100644
--- a/src/components/RecentArticles/EmptyList.astro
+++ b/src/components/EmptyList.astro
@@ -1,5 +1,5 @@
---
-import UIString from "@components/UIString";
+import UIString from "@components/UIString.astro";
---
-
-
-
-
-
-
diff --git a/src/components/Footer.astro b/src/components/Footer.astro
new file mode 100644
index 0000000..89a2394
--- /dev/null
+++ b/src/components/Footer.astro
@@ -0,0 +1,52 @@
+---
+import { SITE_METADATA } from "@root/constants";
+import { Icon } from "astro-icon";
+import TranslatedLink from "./TranslatedLink.astro";
+import UIString from "./UIString.astro";
+---
+
+
+
+
diff --git a/src/components/Footer/Footer.astro b/src/components/Footer/Footer.astro
deleted file mode 100644
index 69d30a1..0000000
--- a/src/components/Footer/Footer.astro
+++ /dev/null
@@ -1,58 +0,0 @@
----
-import { Icon } from "astro-icon";
----
-
-
-
-
diff --git a/src/components/Footer/index.ts b/src/components/Footer/index.ts
deleted file mode 100644
index e869e33..0000000
--- a/src/components/Footer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./Footer.astro";
diff --git a/src/components/Header/Header.astro b/src/components/Header.astro
similarity index 70%
rename from src/components/Header/Header.astro
rename to src/components/Header.astro
index c1df846..dcaddda 100644
--- a/src/components/Header/Header.astro
+++ b/src/components/Header.astro
@@ -1,33 +1,29 @@
---
import { Icon } from "astro-icon";
-import { IS_SITE_UNDER_CONSTRUCTION, SITE_METADATA } from "@root/config";
-import { removeSlashes } from "@utils/string";
+import { IS_SITE_UNDER_CONSTRUCTION, SITE_METADATA } from "@root/constants";
import ThemeSwitcher from "@components/ThemeSwticher";
-import UIString from "@components/UIString";
-import TranslatedLink from "@components/TranslatedLink";
-import LanguageSelect from "@components/LanguageSelect";
-import NavToggle from "./NavToggle";
-
-const { name, nav, contacts } = SITE_METADATA;
-const { pathname } = Astro.url;
+import LanguageSelect from "@components/LanguageSelect.astro";
+import NavToggle from "@components/NavToggle";
+import UIString from "@components/UIString.astro";
+import TranslatedLink from "@components/TranslatedLink.astro";
---
-
- {name}
+
+ {SITE_METADATA.name}