diff --git a/src/components/FooterCards.astro b/src/components/FooterCards.astro new file mode 100644 index 00000000..e2267a4a --- /dev/null +++ b/src/components/FooterCards.astro @@ -0,0 +1,38 @@ +--- +import { Card, CardContainer } from "@components"; + +interface Props { + language?: string; +} + +const { language = "en" } = Astro.props; +--- + + + + { + language === "ua" + ? "Школи, університети, громадські організації, стартапи та інші організації можуть звернутись до нас з запитом на спільний з Толокаром проект, воркшоп або тренінг." + : "Schools, universities, NGOs, Startups and other organizations can reach out to us to request the Tolocars for projects, workshops and trainings." + } + + + Ми шукаємо мейкерів, фаблаби, хакерспейси, мейкерспейси та інші спільноти, + які мають бажання налагодити партнерство з нами в Україні або в інших + країнах. + + diff --git a/src/components/Giscus.astro b/src/components/Giscus.astro index 24381d69..f38e3280 100644 --- a/src/components/Giscus.astro +++ b/src/components/Giscus.astro @@ -1,11 +1,27 @@ --- - +interface Props { + language?: string; +} +const { language = "en" } = Astro.props; --- +
-
Liked this resource? React or comment on GitHub
-
Comments
+
+ { + language === "ua" + ? "Сподобався цей ресурс? Відреагуйте або прокоментуйте на Github" + : "Liked this resource? React or comment on GitHub" + } +
+
+ {language === "ua" ? "Коментарі" : "Comments"} +
+ async>
-
\ No newline at end of file + diff --git a/src/components/HeroImage.tsx b/src/components/HeroImage.tsx index 6986b266..d51bc69d 100644 --- a/src/components/HeroImage.tsx +++ b/src/components/HeroImage.tsx @@ -5,9 +5,9 @@ interface Props { className?: string; } -const HeroImage: React.FC = ({ className }: Props) => { +const HeroImage: React.FC = ({ className }) => { return ( -
+
( "../pages/en/academy/*/*.mdx" @@ -27,14 +28,15 @@ const editDate = new Date(statsMtime); const parentPage = getParentPage(rawAcademyContent, url); const localeFromUrl = - Astro?.url?.pathname.replace(baseUrl, "").split("/").filter(Boolean)[0] || "en"; + Astro?.url?.pathname.replace(baseUrl, "").split("/").filter(Boolean)[0] || + "en"; ---
- Back to Academy Overview + + Back to Academy Overview +
- - Schools, universities, NGOs, Startups and other organizations can reach - out to us to request the Tolocars for projects, workshops and trainings. - We are looking for Makers, FabLabs, Hackerspaces, Makerspaces and other - Communities who wants to partner with us in the Ukraine and - internationally over the internet. - + diff --git a/src/layouts/AcademyIndex.astro b/src/layouts/AcademyIndex.astro index e18247af..99947a7b 100644 --- a/src/layouts/AcademyIndex.astro +++ b/src/layouts/AcademyIndex.astro @@ -1,31 +1,21 @@ --- +import FooterCards from "@components/FooterCards.astro"; import BaseLayout from "./BaseLayout.astro"; -import { ContentSection, Card, CardContainer } from "@components"; +import { ContentSection } from "@components"; +import CommonUtils from "@util/CommonUtils"; const { frontmatter } = Astro.props; + +const baseUrl = CommonUtils.getBaseUrl(false); + +const localeFromUrl = + Astro?.url?.pathname.replace(baseUrl, "").split("/").filter(Boolean)[0] || + "en"; ---
- - Schools, universities, NGOs, Startups and other organizations can reach - out to us to request the Tolocars for projects, workshops and trainings. - We are looking for Makers, FabLabs, Hackerspaces, Makerspaces and other - Communities who wants to partner with us in the Ukraine and - internationally over the internet. - + diff --git a/src/pages/en/_menu.mdx b/src/pages/en/_menu.mdx index 68603cff..2fc12e76 100644 --- a/src/pages/en/_menu.mdx +++ b/src/pages/en/_menu.mdx @@ -1,7 +1,7 @@ --- menu: - title: Home - target: "/en/#top" + target: "en/#top" hideInFooter: true - title: What is a Tolocar? diff --git a/src/pages/ua/_menu.mdx b/src/pages/ua/_menu.mdx index d98cf49a..2dab8b0e 100644 --- a/src/pages/ua/_menu.mdx +++ b/src/pages/ua/_menu.mdx @@ -1,20 +1,20 @@ --- menu: - title: Головна - target: "/ua/#top" + target: "ua/#top" hideInFooter: true - title: Мотивація - target: "/ua/#motivation" + target: "ua/#motivation" - title: Що таке толокар? - target: "/ua/#what-is-a-tolocar" + target: "ua/#what-is-a-tolocar" - title: Проєкти та спільнота - target: "/ua/#projects-community" + target: "ua/#projects-community" - title: Makerspace Academy - target: "/en/academy" + target: "ua/academy" - title: Контакти target: "mailto:info@tolocar.org" diff --git a/src/pages/ua/academy/index.mdx b/src/pages/ua/academy/index.mdx index 6fda1e28..9e161c2f 100644 --- a/src/pages/ua/academy/index.mdx +++ b/src/pages/ua/academy/index.mdx @@ -6,7 +6,7 @@ title: Maker Academy import { HeaderLogo, Footer, WideCard, Course } from "@components"; import AcademyIndexLoader from "@components/AcademyIndexLoader.astro"; - +