Update Fediverse page

source/_data/common.json

@@ -89,7 +89,7 @@
       },
       {
         "name": "Go",
-        "networks": "Honk, Littr.me, Socialtap, Tavern, WriteFreely"
+        "networks": "GoToSocial, Owncast, WriteFreely"
       },
       {
         "name": "Java",
@@ -101,23 +101,23 @@
       },
       {
         "name": "PHP",
-        "networks": "Castopod, Friendica, GNU Social, Hubzilla, Pixelfed, NextCloud-Social, Zap"
+        "networks": "Castopod, Friendica, Hubzilla, Pixelfed"
       },
       {
         "name": "Python",
-        "networks": "Bookwyrm, Epicyon, Fedeproxy, Funkwhale, microblog.pub, OLKi, Socialhome"
+        "networks": "Bookwyrm, Epicyon, Funkwhale, microblog.pub"
       },
       {
         "name": "Ruby",
-        "networks": "diaspora, Glitch-Soc, Hometown, Learn Awesome, Mastodon"
+        "networks": "diaspora, Mastodon"
       },
       {
         "name": "Rust",
-        "networks": "Lemmy, Kibou, Kroeg, Plume"
+        "networks": "Lemmy, Plume"
       },
       {
         "name": "TypeScript",
-        "networks": "Dolphin, Misskey, PeerTube"
+        "networks": "Misskey, PeerTube"
       }
     ]
 }

source/_data/fediverse.json

@@ -3,8 +3,8 @@
   "article":
     {
       "definition": "is a new word made of two words: “federation” + “universe”",
-      "preamble": "It is a common name for federated social networks running on free open software on a myriad of servers across the world. Historically, this term has included only microblogging platforms supporting a set of protocols called OStatus. With the wide adoption of a new standard protocol called ActivityPub, many new projects appeared. This guide unites all interconnected networks under one term.",
+      "preamble": "It is a federated social network running on free open software on a myriad of computers across the globe. Many independent servers are interconnected and allow people to interact with one another. There's no one central site: you choose a server to register. This ensures some decentralization and sovereignty of data. Fediverse (also called Fedi) has no built-in advertisements, no tricky algorithms, no one big corporation dictating the rules. Instead we have small cozy communities of like-minded people. Welcome!",
-      "info": "Fediverse social networks differ from mainstream platforms (Facebook, Twitter, Instagram, Pinterest, etc). Mainstream platforms concentrate millions of users on one website, where they control all the decision-making, enforce censorship, and hoard users' private data for commercial profit and spying. Fediverse networks, on the other hand, are developed by a community of people all around the globe, independent from any corporation or official institution. You are free to register on any Fediverse website you like. You can choose the person who will be in charge of your data - the administrator of your server. If you have technical knowledge, you can administrate your own server for your friends and family, connecting with thousands of other independent servers across the web. Fediverse is an autonomous universe where power and data are decentralized and scattered across multiple lands. No high fences. No algorithms. No ads. Don't trust our word - explore Fediverse yourself!",
+      "info": "Fediverse social network differs from mainstream platforms (Facebook, Twitter, Instagram, Pinterest, etc). Mainstream platforms concentrate millions of users on one website, where they control all the decision-making, enforce censorship, and hoard users' data for commercial profit and spying. Fediverse platforms, on the other hand, are developed by a community of people from all over the world, independent from any company or official institution. You are free to register on any Fediverse website you like. You can choose the person who will be in charge of your data - the administrator of your server. If you have technical knowledge, you can administrate your own server for your friends and family, connecting with thousands of other independent servers across the web. Fediverse is an autonomous universe where power and data are decentralized and scattered across multiple lands.",
       "history":
         [
           {
@@ -24,14 +24,9 @@
           }
         ],
       "projects":
-        [
+        ["nodes.fediverse.party", "fedidb.org", "fediverse.observer", "the-federation.info", "fediverse.to", "fedi.directory"],
-          {
+      "knowledge":
-            "title": "Fediverse visualization",
+        ["fedi.tips", "joinfediverse.wiki", "fediverse.space", "fediverse.info"],
-            "url": "https://kumu.io/wakest/fediverse"
-          }
-        ],
-      "servers":
-        ["nodes.fediverse.party", "fediverse.space", "fedidb.org", "fediverse.observer", "the-federation.info", "joinfediverse.wiki", "fediverse.to", "fediverse.info"],
       "reading":
         [
           {

themes/starter/languages/en.yml

@@ -21,7 +21,7 @@ universe: A universe that you shape, refine and expand.
 joinF: JOIN FEDIVERSE
 
 # Fediverse page
-networks: networks
+platforms: platforms
 protocols: protocols
 langs: programming languages
 history: history

themes/starter/layout/fediverse.ejs

@@ -5,8 +5,7 @@ layout: layout
 
 <%
   const fv = site.data.fediverse.article;
-  const servers = fv.servers;
+  const platforms = site.data.common.list;
-  const networks = site.data.common.list;
   const protocols = site.data.common.protocols;
   const langs = site.data.common.langs;
   const numbers = site.data.numbers.list.fediverse;
@@ -47,22 +46,20 @@ layout: layout
   <% } %>
 
   <div class="section">
-    <h4><%- __('networks') %></h4>
+    <h4><%- __('knowledge') %></h4>
-    <ul class="section-list">
+    <ul class="article-list">
-      <% for (item in networks) { %>
+      <% for (item in fv.knowledge) { %>
-      <li class="u-inline">
+      <li class="u-inline"><a href="https://<%= fv.knowledge[item] %>"><%= fv.knowledge[item] %></a></li>
-        <a href="<%= networks[item].url %>"><%= networks[item].title %></a><span>,&nbsp;&nbsp;</span>
-      </li>
       <% } %>
     </ul>
   </div>
 
   <div class="section">
-    <h4><%- __('protocols') %></h4>
+    <h4><%- __('platforms') %></h4>
     <ul class="section-list">
-      <% for (item in protocols) { %>
+      <% for (item in platforms) { %>
       <li class="u-inline">
-        <a href="<%= protocols[item].url %>"><%= protocols[item].name %></a><span>,&nbsp;&nbsp;</span>
+        <a href="<%= platforms[item].url %>"><%= platforms[item].title %></a><span>,&nbsp;&nbsp;</span>
       </li>
       <% } %>
     </ul>
@@ -77,11 +74,13 @@ layout: layout
     </ul>
   </div>
 
-  <div class="section">
+<div class="section">
-    <h4><%- __('links') %></h4>
+    <h4><%- __('protocols') %></h4>
-    <ul class="article-list">
+    <ul class="section-list">
-      <% for (item in servers) { %>
+      <% for (item in protocols) { %>
-      <li class="u-inline"><a href="https://<%= servers[item] %>"><%= servers[item] %></a></li>
+      <li class="u-inline">
+        <a href="<%= protocols[item].url %>"><%= protocols[item].name %></a><span>,&nbsp;&nbsp;</span>
+      </li>
       <% } %>
     </ul>
   </div>
@@ -105,7 +104,7 @@ layout: layout
     <h4><%- __('projects') %></h4>
     <ul class="article-list">
       <% for (item in fv.projects) { %>
-      <li><a href="<%= fv.projects[item].url %>"><%= fv.projects[item].title %></a></li>
+      <li class="u-inline"><a href="https://<%= fv.projects[item] %>"><%= fv.projects[item] %></a></li>
       <% } %>
     </ul>
   </div>