Skip to content

Commit

Permalink
fix: community pages split up
Browse files Browse the repository at this point in the history
  • Loading branch information
pReya committed Nov 21, 2024
1 parent a2a2ece commit 1bfe317
Show file tree
Hide file tree
Showing 11 changed files with 197 additions and 41 deletions.
1 change: 1 addition & 0 deletions astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default defineConfig({
plugins: [svgr()],
},
redirects: {
'/en/community': '/en/community/partners',
'/en/playbook': '/en/resources/playbook',
'/ua/playbook': '/ua/resources/playbook',
'/en/makersinnovationaward': '/en/get-involved/makers-innovation-award',
Expand Down
2 changes: 2 additions & 0 deletions src/layouts/BaseLayout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const isProduction = import.meta.env.MODE === "production";
const META_TITLE = `${title} - Tolocar Project`;
const META_CANONICAL_URL = new URL(Astro.url.pathname, Astro.site);
console.log(baseUrl);
---

<!doctype html>
Expand Down
6 changes: 3 additions & 3 deletions src/layouts/InterventionSingleView.astro
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import BaseLayout from "./BaseLayout.astro";
import BaseLayoutMarkdown from "./BaseLayout.astro";
import type { IInterventionFrontmatter } from "@interfaces/IIntervention";
import {
ContentSection,
Expand All @@ -26,7 +26,7 @@ const relatedInterventions = rawInterventionsContentWithoutIndex.filter(
);
---

<BaseLayout frontmatter={frontmatter}>
<BaseLayoutMarkdown {...frontmatter}>
<div class="container-width">
<InterventionSingleViewHeading
title={frontmatter.title}
Expand Down Expand Up @@ -67,4 +67,4 @@ const relatedInterventions = rawInterventionsContentWithoutIndex.filter(
</div>
<div class="absolute z-0 w-full bg-neutral-50 h-[90%] bottom-0"></div>
</div>
</BaseLayout>
</BaseLayoutMarkdown>
43 changes: 43 additions & 0 deletions src/layouts/SimpleContentLayout.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
import {
ContentSection,
InterventionImageCarousel,
InterventionSingleViewHeading,
} from "@components";
import BaseLayout from "@layouts/BaseLayout.astro";
export interface SimpleContentLayoutProps {
title: string;
subtitle?: string;
images: Array<string>;
teaser: string;
}
type Props = SimpleContentLayoutProps;
const { title, images, teaser, subtitle } = Astro.props;
---

<BaseLayout
title={title || "Not found"}
metaDescription={teaser}
metaImage={images?.[0]}
>
<div class="container-width">
<InterventionSingleViewHeading title={title} subtitle={subtitle} />
{
images && (
<InterventionImageCarousel images={images} client:load />
)
}
</div>
<ContentSection variant="white">
<div class="container-width my-10 lg:mt-14 lg:mb-[60px] default-prose">
<slot/>
</div>
</ContentSection>

<div class="relative w-full">
<div class="absolute z-0 w-full bg-neutral-50 h-[90%] bottom-0"></div>
</div>
</BaseLayout>
12 changes: 12 additions & 0 deletions src/layouts/SimpleContentLayoutMarkdown.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
import SimpleContentLayout, { type SimpleContentLayoutProps } from "./SimpleContentLayout.astro";
import type { MarkdownLayoutProps } from "astro";
type Props = MarkdownLayoutProps<SimpleContentLayoutProps>;
const { frontmatter } = Astro.props;
---

<SimpleContentLayout {...frontmatter}>
<slot />
</SimpleContentLayout>
4 changes: 2 additions & 2 deletions src/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@
},
{
"title": "Labs in Ukraine",
"target": "en/community/labs-ukraine"
"target": "en/community/labs-in-ukraine"
},
{
"title": "Global Maker Initiatives",
"target": "en/community/global-initiatives"
"target": "en/community/maker-initiatives"
}
]
},
Expand Down
29 changes: 29 additions & 0 deletions src/pages/en/community/labs-in-ukraine.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
layout: "@layouts/BaseLayoutMarkdown.astro"
title: Labs in Ukraine
darkNavigation: true
darkFooter: true
---

import { HeaderLogo, Footer, CommunityBanner, CommunityGridCard, ContentSection, CommunityHeader} from "@components";
import WideCard from "@components/WideCardWrapper.astro"

<CommunityHeader title="Community" text="We are a highly interactive group with diverse backgrounds driven by the desire to reduce suffering in Ukraine. We connect international makers and initiatives with local communities. You can join in this community effort in a variety of ways and be a part of the Tolocar project. Connect with us online or on the ground. This way we can jointly establish support networks and catalyze reconstruction efforts."/>

<ContentSection variant="white" id="labs">
<CommunityBanner className="mt-28" title="Labs in Ukraine" text="We aim to build strong relationships to all existing makerspaces and FabLabs in Ukraine. Meanwhile our approach is to support initiatives by founding their labs or even plant completely new labs or small scale productions." bg={2}/>

<div className="container-width grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
<CommunityGridCard title="Creative Rural Hub" text="A hub for makers, artists, architects, scientists and all creatives in Ivano-Frankivska." target="www.creativeruralhub.org"/>
<CommunityGridCard title="Hub Lab" text="Coworking for inventors, technical specialty students and other people who want to implement technological projects." target="www.impacthub.odessa.ua"/>
<CommunityGridCard title="Hack Lab" text="Oldest hackerspace/open lab in Ukraine (founded 2013). Has long been a center of a large maker community." target="www.hacklab.kyiv.ua" url="www.hacklab.kyiv.ua"/>
<CommunityGridCard title="Makerspace Lviv" text="Lab with STEAM workshops for children and teenagers in Lviv." target="www.makerspace.com.ua" url="www.makerspace.com.ua"/>
<CommunityGridCard title="Ksiprostir" text="An open art workshop where everyone can find a place to realize their own ideas." target="www.ksiprostir.org"/>
<CommunityGridCard title="Maker Hub" text="A makerspace in Kyiv which organised Kyiv Mini Maker Faire, Odesa Mini Maker Faire, Raspberry Jam's, Maker BBQ etc." target="https://makerhub.org"/>
</div>
</ContentSection>

<ContentSection variant="white">
<WideCard className="mt-28 lg:mt-24" title="Discuss and contribute to our community!" text="We're using GitHub Discussions as a place to connect with other members of our community." target="https://www.github.com/tolocar-project/community" newTab={true} caption="Open GitHub" linkButtonVariant="github" bg={2}/>
<div class="absolute w-full bg-neutral-50 h-52 bottom-0" />
</ContentSection>
29 changes: 29 additions & 0 deletions src/pages/en/community/maker-initiatives.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
layout: "@layouts/BaseLayoutMarkdown.astro"
title: Labs in Ukraine
darkNavigation: true
darkFooter: true
---

import { HeaderLogo, Footer, CommunityBanner, CommunityGridCard, ContentSection, CommunityHeader} from "@components";
import WideCard from "@components/WideCardWrapper.astro"

<CommunityHeader title="Community" text="We are a highly interactive group with diverse backgrounds driven by the desire to reduce suffering in Ukraine. We connect international makers and initiatives with local communities. You can join in this community effort in a variety of ways and be a part of the Tolocar project. Connect with us online or on the ground. This way we can jointly establish support networks and catalyze reconstruction efforts."/>

<ContentSection variant="white" id="maker-initiatives">
<CommunityBanner className="mt-28" title="Global maker initiatives" text="Throughout our network we are connected to several maker initiatives around the globe. We invite them to participate in the Tolocar project and connect them to Ukrainian communities." bg={3}/>

<div className="container-width grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
<CommunityGridCard img="images/logos/Appropedia.png" title="Appropedia" text="Appropedia, a widely recognized platform for accessible solutions, serves as a comprehensive resource for global development and aid, allowing individuals to access, replicate, and utilize projects and training kits worldwide." target="www.appropedia.org"/>
<CommunityGridCard img="images/logos/NPI.png" title="New Production Institute" text="A think tank for the future of value creation and production which deals with the transformation of value creation systems." target="www.newproductioninstitute.de"/>
<CommunityGridCard img="images/logos/FCHH.png" title="Fab City Hamburg" text="Fab City Hamburg proposes a new urban, economic, social and industrial model that relocalises production to Hamburg and its bioregional context." target="www.fabcity.hamburg"/>
<CommunityGridCard img="images/logos/IoP.png" title="Internet of Production" text="An initiative for sustainable, globally networked, local manufacturing." target="www.internetofproduction.org" url="www.internetofproduction.org"/>
<CommunityGridCard img="images/logos/fieldready.png" title="Field Ready" text="Field Ready manufacture supplies in the field so that people have what they need, where and when they need it." target="www.fieldready.org"/>
<CommunityGridCard img="images/logos/interfacer.png" title="INTERFACER" text="The EU-EFRE project INTERFACER is developing a federated open source platform called Fab City OS." target="www.interfacerproject.eu"/>
</div>
</ContentSection>

<ContentSection variant="white">
<WideCard className="mt-28 lg:mt-24" title="Discuss and contribute to our community!" text="We're using GitHub Discussions as a place to connect with other members of our community." target="https://www.github.com/tolocar-project/community" newTab={true} caption="Open GitHub" linkButtonVariant="github" bg={2}/>
<div class="absolute w-full bg-neutral-50 h-52 bottom-0" />
</ContentSection>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: "@layouts/BaseLayoutMarkdown.astro"
title: Community
title: Project Partners
darkNavigation: true
darkFooter: true
---
Expand Down Expand Up @@ -31,32 +31,6 @@ import WideCard from "@components/WideCardWrapper.astro"
</div>
</ContentSection>

<ContentSection variant="white" id="labs">
<CommunityBanner className="mt-28" title="Labs in Ukraine" text="We aim to build strong relationships to all existing makerspaces and FabLabs in Ukraine. Meanwhile our approach is to support initiatives by founding their labs or even plant completely new labs or small scale productions." bg={2}/>

<div className="container-width grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
<CommunityGridCard title="Creative Rural Hub" text="A hub for makers, artists, architects, scientists and all creatives in Ivano-Frankivska." target="www.creativeruralhub.org"/>
<CommunityGridCard title="Hub Lab" text="Coworking for inventors, technical specialty students and other people who want to implement technological projects." target="www.impacthub.odessa.ua"/>
<CommunityGridCard title="Hack Lab" text="Oldest hackerspace/open lab in Ukraine (founded 2013). Has long been a center of a large maker community." target="www.hacklab.kyiv.ua" url="www.hacklab.kyiv.ua"/>
<CommunityGridCard title="Makerspace Lviv" text="Lab with STEAM workshops for children and teenagers in Lviv." target="www.makerspace.com.ua" url="www.makerspace.com.ua"/>
<CommunityGridCard title="Ksiprostir" text="An open art workshop where everyone can find a place to realize their own ideas." target="www.ksiprostir.org"/>
<CommunityGridCard title="Maker Hub" text="A makerspace in Kyiv which organised Kyiv Mini Maker Faire, Odesa Mini Maker Faire, Raspberry Jam's, Maker BBQ etc." target="https://makerhub.org"/>
</div>
</ContentSection>

<ContentSection variant="white" id="maker-initiatives">
<CommunityBanner className="mt-28" title="Global maker initiatives" text="Throughout our network we are connected to several maker initiatives around the globe. We invite them to participate in the Tolocar project and connect them to Ukrainian communities." bg={3}/>

<div className="container-width grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
<CommunityGridCard img="images/logos/Appropedia.png" title="Appropedia" text="Appropedia, a widely recognized platform for accessible solutions, serves as a comprehensive resource for global development and aid, allowing individuals to access, replicate, and utilize projects and training kits worldwide." target="www.appropedia.org"/>
<CommunityGridCard img="images/logos/NPI.png" title="New Production Institute" text="A think tank for the future of value creation and production which deals with the transformation of value creation systems." target="www.newproductioninstitute.de"/>
<CommunityGridCard img="images/logos/FCHH.png" title="Fab City Hamburg" text="Fab City Hamburg proposes a new urban, economic, social and industrial model that relocalises production to Hamburg and its bioregional context." target="www.fabcity.hamburg"/>
<CommunityGridCard img="images/logos/IoP.png" title="Internet of Production" text="An initiative for sustainable, globally networked, local manufacturing." target="www.internetofproduction.org" url="www.internetofproduction.org"/>
<CommunityGridCard img="images/logos/fieldready.png" title="Field Ready" text="Field Ready manufacture supplies in the field so that people have what they need, where and when they need it." target="www.fieldready.org"/>
<CommunityGridCard img="images/logos/interfacer.png" title="INTERFACER" text="The EU-EFRE project INTERFACER is developing a federated open source platform called Fab City OS." target="www.interfacerproject.eu"/>
</div>
</ContentSection>

<ContentSection variant="white">
<WideCard className="mt-28 lg:mt-24" title="Discuss and contribute to our community!" text="We're using GitHub Discussions as a place to connect with other members of our community." target="https://www.github.com/tolocar-project/community" newTab={true} caption="Open GitHub" linkButtonVariant="github" bg={2}/>
<div class="absolute w-full bg-neutral-50 h-52 bottom-0" />
Expand Down
Loading

0 comments on commit 1bfe317

Please sign in to comment.