From 9e97ca3f14689927141763202547528f54eb5f2d Mon Sep 17 00:00:00 2001 From: valentin gagarin Date: Wed, 13 Nov 2024 15:24:41 +0100 Subject: [PATCH] list all news articles on a separate page --- website/content/navigation.nix | 17 ++----------- website/content/news.nix | 24 +++++++++++++++++++ website/content/news/nordunet-conference.nix | 3 +++ website/content/news/project-launch.nix | 3 +++ .../news/publicspaces-conference-2024.nix | 3 +++ website/content/news/tech-session.nix | 3 +++ website/content/news/website-launch.nix | 3 +++ 7 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 website/content/news.nix diff --git a/website/content/navigation.nix b/website/content/navigation.nix index c02ad577..6d124ada 100644 --- a/website/content/navigation.nix +++ b/website/content/navigation.nix @@ -19,21 +19,8 @@ in } { page = pages.fediversity; } { page = pages.grants; } - { - menu.label = "News"; - menu.items = - let - sorted = with lib; reverseList (sortOn (entry: entry.date) config.collections.news.entry); - in - map - (page: { - page = lib.recursiveUpdate page { title = "${page.date}: ${page.title}"; }; - }) - (lib.take 3 sorted); - } - { - page = pages.events; - } + { page = pages.news; } + { page = pages.events; } ]; }; } diff --git a/website/content/news.nix b/website/content/news.nix new file mode 100644 index 00000000..b689cf60 --- /dev/null +++ b/website/content/news.nix @@ -0,0 +1,24 @@ +{ config, lib, ... }: +{ + pages.news = { link, ... }: rec { + title = "News"; + description = "News about Fediversity"; + summary = description; + body = + with lib; + let + news = map + (article: '' + ## [${article.title}](${link article}) + + ${article.date} by ${article.author} + + ${article.summary} + '') + config.collections.news.entry; + in + '' + ${join "\n\n" news} + ''; + }; +} diff --git a/website/content/news/nordunet-conference.nix b/website/content/news/nordunet-conference.nix index 938a5e08..17ffefad 100644 --- a/website/content/news/nordunet-conference.nix +++ b/website/content/news/nordunet-conference.nix @@ -5,6 +5,9 @@ description = "Report from the NORDUnet Conference 2024"; date = "2024-09-17"; author = "Laurens Hof"; + summary = '' + Fediversity was represented in Bergen at the Nordunet Conference for 2024, with both the Internet Discourse Foundation and Nordunet themselves being present. + ''; body = '' Fediversity was represented in Bergen at the Nordunet Conference for 2024, with both the Internet Discourse Foundation and Nordunet themselves being present. This was a great opportunity for the different organisations in the consortium to meet with each other and exchange ideas. diff --git a/website/content/news/project-launch.nix b/website/content/news/project-launch.nix index d6f4cbd1..63472b65 100644 --- a/website/content/news/project-launch.nix +++ b/website/content/news/project-launch.nix @@ -5,6 +5,9 @@ description = "The Fediversity project has officially been announced"; date = "2024-01-01"; author = "Laurens Hof"; + summary = '' + We are pleased to introduce the launch of our new website dedicated to the Fediversity project. + ''; body = '' The Consortium behind the Fediversity project announces that the project has officially been started. NLnet, Tweag, NorduNet and the Open Internet Discourse Foundation are working together to build a new service for cloud hosters. diff --git a/website/content/news/publicspaces-conference-2024.nix b/website/content/news/publicspaces-conference-2024.nix index af0a4f29..b3850abf 100644 --- a/website/content/news/publicspaces-conference-2024.nix +++ b/website/content/news/publicspaces-conference-2024.nix @@ -5,6 +5,9 @@ description = "Report from the PublicSpaces Conference 2024 - 'Take Back the Internet'"; date = "2024-07-30"; author = "Laurens Hof"; + summary = '' + PublicSpaces and Waag Futurelabs recently held their yearly conference in Amsterdam, titled ‘Taking Back the Internet’ + ''; body = '' PublicSpaces and Waag Futurelabs recently held their yearly conference in Amsterdam, titled 'Taking Back the Internet'. PublicSpaces is a network of public organisations fighting for an internet based on public values. The Fediversity Project attended, to share ideas, and learn more about how people and organisations think about an ethical internet. If you are interested, you can view all sessions [here](https://conference.publicspaces.net/en/archive/pubconf2024) (hosted on PeerTube!). diff --git a/website/content/news/tech-session.nix b/website/content/news/tech-session.nix index bb572961..ebb8dd80 100644 --- a/website/content/news/tech-session.nix +++ b/website/content/news/tech-session.nix @@ -5,6 +5,9 @@ description = "Fediversity tech session - NixOS and Kubernetes"; date = "2024-08-05"; author = "Laurens Hof"; + summary = '' + Recently Fediversity hosted a tech session on NixOS and Kubernetes. We invited people within the community to discuss some design considerations of the Fediversity project with us. + ''; body = '' Recently Fediversity hosted a tech session on NixOS and Kubernetes. We invited people within the community to discuss some design considerations of the Fediversity project with us. diff --git a/website/content/news/website-launch.nix b/website/content/news/website-launch.nix index d17cf04c..2dae814e 100644 --- a/website/content/news/website-launch.nix +++ b/website/content/news/website-launch.nix @@ -5,6 +5,9 @@ description = "Announcing our new website for the Fediversity project"; date = "2024-05-15"; author = "Laurens Hof"; + summary = '' + We are pleased to introduce the launch of our new website dedicated to the Fediversity project. + ''; body = '' We are pleased to introduce the launch of our new website dedicated to the Fediversity project.