Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add implementation for subteams #1428

Merged
merged 1 commit into from
May 19, 2024
Merged

add implementation for subteams #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions src/components/pages/community/teams/MembersDisplay.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
const { title = "Members", isSubteam = false, members, contact, class: extraClasses } = Astro.props;
const titleClasses = `text-3xl font-heading font-bold text-nix-blue`;
---

<aside
class:list={[
!isSubteam && "bg-nix-blue-extralight rounded-xl px-4 py-3 w-full",
extraClasses]}>
<h2 class={titleClasses}>{title}</h2>
<ul class="mt-2 list-disc ml-4 font-light">
{
members.map((member) => (
<li class="mb-1 last:mb-0">
{member.name}
{member.discourse && (
<>
(
<a
href={
"https://discourse.nixos.org/u/" +
member.discourse
}
>
@{member.discourse}
</a>
)
</>
)}
{member.github && (
<>
(
<a href={"https://github.com/" + member.github}>
@{member.github}
</a>
)
</>
)}
{member.title && (
<>
&mdash;
{member.title}
</>
)}
</li>
))
}
</ul>
{
contact && (
<>
<h2 class="text-3xl font-heading font-bold text-nix-blue mt-4">
Contact
</h2>
<ul class="mt-2 list-disc ml-4">
{contact.map((contact) => (
<li class="mb-1 last:mb-0">
<a href={contact.href}>{contact.name}</a>
</li>
))}
</ul>
</>
)
}
</aside>
41 changes: 41 additions & 0 deletions src/content/teams/08_moderation.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,47 @@ contact:
href: https://discourse.nixos.org/c/meta/moderation-team/40
- name: GitHub
href: https://github.com/NixOS/moderation
subteams:
- name: TestTeam
members:
- name: Martin Weinelt
discourse: hexa
title:
- name: lassulus
discourse: lassulus
title:
- name: TestTeam
members:
- name: Martin Weinelt
discourse: hexa
title:
- name: lassulus
discourse: lassulus
title:
- name: TestTeam
members:
- name: Martin Weinelt
discourse: hexa
title:
- name: lassulus
discourse: lassulus
title:
- name: TestTeam
members:
- name: Martin Weinelt
discourse: hexa
title:
- name: lassulus
discourse: lassulus
title:
- name: TestTeam
members:
- name: Martin Weinelt
discourse: hexa
title:
- name: lassulus
discourse: lassulus
title:
---

This team is responsible for moderating participation on [official community
Expand Down
64 changes: 23 additions & 41 deletions src/pages/community/teams/[...slug].astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { getCollection } from "astro:content";
import Layout from "../../../layouts/Layout.astro";
import PageHeader from "../../../components/layout/PageHeader.astro";
import Container from "../../../components/layout/Container.astro";
import Tag from "../../../components/ui/Tag.astro";
import MembersDisplay from "../../../components/pages/community/teams/MembersDisplay.astro";

export async function getStaticPaths() {
const teamEntries = await getCollection("teams");
Expand All @@ -21,48 +21,30 @@ const { Content } = await entry.render();
<Layout title={entry.data.name}>
<PageHeader text={entry.data.name} parentPath="/community" />
<Container class="my-8">
<aside
class="float-right bg-nix-blue-extralight rounded-xl px-4 py-3 mb-4 ml-4 w-full sm:w-1/2 md:max-w-96"
>
<h1 class="text-3xl font-heading font-bold text-nix-blue">Members</h1>
<ul class="mt-2 list-disc ml-4 font-light">
{
entry.data.members.map((member) => (
<li class="mb-1 last:mb-0">
{member.name}
{member.discourse && (
<>
(<a href={"https://discourse.nixos.org/u/" + member.discourse}>@{member.discourse}</a>)
</>
)}
{member.github && (
<>
(<a href={"https://github.com/" + member.github}>@{member.github}</a>)
</>
)}
{member.title && (
<>
&mdash;
{member.title}
</>
)}
</li>
))
}
</ul>
<h1 class="text-3xl font-heading font-bold text-nix-blue mt-4">Contact</h1>
<ul class="mt-2 list-disc ml-4">
{
entry.data.contact.map((contact) => (
<li class="mb-1 last:mb-0">
<a href={contact.href}>{contact.name}</a>
</li>
))
}
</ul>
</aside>
<MembersDisplay
class="float-right mb-4 ml-4 sm:w-1/2 md:max-w-96"
members={entry.data.members}
contact={entry.data.contact}
/>
<article>
<Content />
</article>
{
entry.data.subteams && entry.data.subteams.length > 0 && (
<>
<div class="flex gap-4 flex-wrap pt-4">
{entry.data.subteams.map((subteam) => (
<MembersDisplay
key={subteam.name}
title={subteam.name}
class="mb-4"
members={subteam.members}
isSubteam
/>
))}
</div>
</>
)
}
</Container>
</Layout>