Update numbers, move Funkwhale to main page - closes #21

source/_data/common.json

@@ -61,6 +61,12 @@
         "url" : "https://pixelfed.org",
         "smallImg": "/img/pixelfed.png",
         "descr": "Federated social image sharing for everyone"
+      },
+      {
+        "title": "Funkwhale",
+        "url" : "https://funkwhale.audio",
+        "smallImg": "/img/funkwhale.png",
+        "descr": "A social platform to enjoy and share music"
       }
     ],
   "protocols":

source/_data/funkwhale.json

@@ -0,0 +1,55 @@
+{
+  "data":
+    {
+      "title": "funkwhale",
+      "category": "social network",
+      "type": "audio streaming",
+      "logoClr": "009FE3",
+      "created": "2017",
+      "official": "https://funkwhale.audio",
+      "license": "AGPL-3.0",
+      "repo": "https://dev.funkwhale.audio/funkwhale/funkwhale",
+      "language": "Python",
+      "protocols":
+        [
+          {"title": "ActivityPub", "url": "https://activitypub.rocks"}
+        ],
+      "wiki": "https://docs.funkwhale.audio",
+      "servers":
+        [
+          {"num": "1", "url": "https://network.funkwhale.audio/dashboards/d/overview/network-overview"},
+          {"num": "2", "url": "https://the-federation.info/funkwhale"},
+          {"num": "3", "url": "https://fediverse.network/funkwhale"}
+        ],
+      "mobile": "https://funkwhale.audio/en_US/apps",
+      "forUsers":
+        [
+          {"id": "0", "url": "https://docs.funkwhale.audio/users/index.html"}
+        ],
+      "devTutorial": "https://docs.funkwhale.audio/installation/index.html",
+      "mascot": [{"item": "whale", "imgNum": "1"}],
+      "dwellers": "?",
+      "communities": "",
+      "descr": "Funkwhale is a community-driven project that lets you listen and share music within a decentralized, open network. Funkwhale is not only an audio server and player, it was designed to be a place for socializing around music and discovering new content.",
+      "connections": ["Mastodon"],
+      "screenshots":
+        [
+          {"descr": "Funkwhale interface", "img": "funkwhale-1.png"},
+          {"descr": "Funkwhale profile interface", "img": "funkwhale-2.jpg"}
+        ],
+      "features":
+        [
+          "radios",
+          "playlists",
+          "favourites",
+          "broadcasts",
+          "recommendations"
+        ],
+      "donate": "https://funkwhale.audio/support-us#donate",
+      "tracker": "https://dev.funkwhale.audio/funkwhale/funkwhale/issues",
+      "bounty": "",
+      "translating": "https://docs.funkwhale.audio/translators.html",
+      "reading": "",
+      "notable": ""
+    }
+}

source/_data/miscellaneous.json

@@ -27,19 +27,6 @@
         "OStatusClass": false,
         "categories": ["Blog-Pub"]
       },
-      {
-        "title": "Funkwhale",
-        "source": "https://code.eliotberriot.com/funkwhale/funkwhale",
-        "protocols": "ActivityPub",
-        "site": "https://funkwhale.audio",
-        "logo": "/img/misc/funkwhale.svg",
-        "servers": "https://the-federation.info/funkwhale",
-        "apClass": true,
-        "zotClass": false,
-        "diasporaClass": false,
-        "OStatusClass": false,
-        "categories": ["Media"]
-      },
       {
         "title": "GangGo",
         "source": "https://git.feneas.org/ganggo/ganggo",

source/_data/numbers.json

@@ -2,72 +2,78 @@
 {
   "list":
     {
-      "lastUpdate": "17/11/19",
+      "lastUpdate": "20/12/19",
       "diaspora":
         {
-          "population": "759.816",
+          "population": "757.065",
-          "activeUsers": "72.418",
+          "activeUsers": "71.369",
-          "podsNum": "257"
+          "podsNum": "243"
         },
       "friendica":
         {
-          "population": "14.276",
+          "population": "14.812",
-          "activeUsers": "2.167",
+          "activeUsers": "2.347",
-          "podsNum": "338"
+          "podsNum": "334"
         },
       "hubzilla":
         {
-          "population": "9.405",
+          "population": "9.401",
-          "activeUsers": "3.443",
+          "activeUsers": "3.451",
-          "podsNum": "260"
+          "podsNum": "262"
         },
       "socialhome":
         {
-          "population": "1.240",
+          "population": "1.279",
-          "activeUsers": "298",
+          "activeUsers": "312",
           "podsNum": "5"
         },
       "mastodon":
         {
-          "population": "3.598.416",
+          "population": "3.600.211",
-          "activeUsers": "1.304.417",
+          "activeUsers": "1.226.342",
-          "podsNum": "2.689"
+          "podsNum": "2.755"
         },
       "gnusocial":
         {
-          "population": "4.785",
+          "population": "3.447",
           "activeUsers": "",
-          "podsNum": "105"
+          "podsNum": "101"
         },
       "pleroma":
         {
-          "population": "28.881",
+          "population": "31.218",
           "activeUsers": "",
-          "podsNum": "597"
+          "podsNum": "599"
         },
       "misskey":
         {
           "population": "500",
           "activeUsers": "",
-          "podsNum": "66"
+          "podsNum": "75"
         },
       "peertube":
         {
-          "population": "22.746",
+          "population": "25.070",
           "activeUsers": "",
-          "podsNum": "327"
+          "podsNum": "336"
         },
       "pixelfed":
         {
-          "population": "15.100",
+          "population": "16.389",
           "activeUsers": "",
-          "podsNum": "97"
+          "podsNum": "104"
+        },
+      "funkwhale":
+        {
+          "population": "3.121",
+          "activeUsers": "1.480",
+          "podsNum": "33"
         },
       "fediverse":
-      {
+        {
-        "population": "4.455.165",
+          "population": "4.462.513",
-        "activeUsers": "",
+          "activeUsers": "1.305.301",
-        "podsNum": "4.741"
+          "podsNum": "4.847"
         }
     }
 }

source/en/funkwhale/index.md

@@ -0,0 +1,9 @@
+
+---
+layout: "funkwhale"
+title: "Funkwhale"
+network: "funkwhale"
+subtitle: "a social platform to enjoy and share music"
+banner: "/img/funkwhale-bg.jpg"
+percent: "100% 20%"
+---

source/en/portal/servers/index.md

@@ -104,7 +104,7 @@ title: "Themed servers"
 * [tamiltoot.online](https://tamiltoot.online) - India
 
 #### 🎬 [Game / Book / Show theme](#entertainment)
-** [tenforward.social](https://tenforward.social) - theme Star Trek
+* [tenforward.social](https://tenforward.social) - theme Star Trek
 * [kirakiratter.com](https://kirakiratter.com) - for Aikatsu fans
 * [donphan.social](https://donphan.social) - for Pokémon enthusiasts
 * [cmdr.social](https://cmdr.social) - dedicated to Elite: Dangerous

source/img/misc/funkwhale.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><g fill="#4082B4"><path d="M12.068 14.792a4.052 4.052 0 0 0 4.05-4.05.212.212 0 0 0-.21-.21H14.38a.212.212 0 0 0-.21.21 2.108 2.108 0 0 1-2.102 2.102 2.108 2.108 0 0 1-2.102-2.102.212.212 0 0 0-.21-.21H8.228a.212.212 0 0 0-.21.21 4.051 4.051 0 0 0 4.05 4.05z"/><path d="M12.068 18.613c4.337 0 7.871-3.534 7.871-7.871a.212.212 0 0 0-.21-.21H18.2a.212.212 0 0 0-.21.21c0 3.267-2.656 5.923-5.923 5.923s-5.923-2.656-5.923-5.923a.212.212 0 0 0-.21-.21H4.407a.212.212 0 0 0-.21.21c-.02 4.337 3.515 7.871 7.871 7.871z"/><path d="M23.569 10.532h-1.528a.212.212 0 0 0-.21.21c0 5.388-4.394 9.763-9.763 9.763-5.388 0-9.763-4.375-9.763-9.763a.212.212 0 0 0-.21-.21H.566a.212.212 0 0 0-.21.21c0 6.458 5.254 11.711 11.711 11.711s11.711-5.254 11.711-11.711a.21.21 0 0 0-.209-.21z"/></g><path fill="#222" d="M6.795 5.469c.783.401 1.624.478 2.388.917.497.287.802.611 1.108 1.089.478.726.459 1.624.459 1.624l.057.993s.382.993 1.223.993c.898 0 1.223-.993 1.223-.993l.057-.993s-.019-.898.459-1.624c.306-.478.611-.822 1.108-1.089.764-.439 1.605-.516 2.388-.917.783-.401 1.548-.917 2.063-1.643.516-.726.764-1.681.478-2.522-1.49-.076-3.21.096-4.528.802-1.834.974-2.942.63-3.267 2.082h-.019c-.325-1.471-1.433-1.108-3.267-2.082-1.319-.706-3.038-.878-4.529-.802-.286.841-.038 1.796.478 2.522.573.726 1.337 1.242 2.121 1.643z"/></svg>

themes/starter/layout/_partial/svgfont.ejs

@@ -70,4 +70,8 @@
   <symbol id="icon-pixelfed" viewBox="-1 0 24 24">
     <path d="M9.082 16.915h4.74c4.465 0 8.085-3.701 8.085-8.264S18.289.387 13.822.387H6.98c-2.577 0-4.665 2.134-4.665 4.768v18.559l6.767-6.799z"/>
   </symbol>
+
+  <symbol id="icon-funkwhale" viewBox="0 0 24 24">
+    <path d="M12.068 14.792a4.052 4.052 0 0 0 4.05-4.05.212.212 0 0 0-.21-.21H14.38a.212.212 0 0 0-.21.21 2.108 2.108 0 0 1-2.102 2.102 2.108 2.108 0 0 1-2.102-2.102.212.212 0 0 0-.21-.21H8.228a.212.212 0 0 0-.21.21 4.051 4.051 0 0 0 4.05 4.05z"/><path d="M12.068 18.613c4.337 0 7.871-3.534 7.871-7.871a.212.212 0 0 0-.21-.21H18.2a.212.212 0 0 0-.21.21c0 3.267-2.656 5.923-5.923 5.923s-5.923-2.656-5.923-5.923a.212.212 0 0 0-.21-.21H4.407a.212.212 0 0 0-.21.21c-.02 4.337 3.515 7.871 7.871 7.871z"/><path d="M23.569 10.532h-1.528a.212.212 0 0 0-.21.21c0 5.388-4.394 9.763-9.763 9.763-5.388 0-9.763-4.375-9.763-9.763a.212.212 0 0 0-.21-.21H.566a.212.212 0 0 0-.21.21c0 6.458 5.254 11.711 11.711 11.711s11.711-5.254 11.711-11.711a.21.21 0 0 0-.209-.21z"/><path d="M6.795 5.469c.783.401 1.624.478 2.388.917.497.287.802.611 1.108 1.089.478.726.459 1.624.459 1.624l.057.993s.382.993 1.223.993c.898 0 1.223-.993 1.223-.993l.057-.993s-.019-.898.459-1.624c.306-.478.611-.822 1.108-1.089.764-.439 1.605-.516 2.388-.917.783-.401 1.548-.917 2.063-1.643.516-.726.764-1.681.478-2.522-1.49-.076-3.21.096-4.528.802-1.834.974-2.942.63-3.267 2.082h-.019c-.325-1.471-1.433-1.108-3.267-2.082-1.319-.706-3.038-.878-4.529-.802-.286.841-.038 1.796.478 2.522.573.726 1.337 1.242 2.121 1.643z"/>
+  </symbol>
 </svg>

themes/starter/layout/funkwhale.ejs

@@ -0,0 +1,40 @@
+
+---
+layout: layout
+network: true
+---
+
+<%
+  const data = site.data.funkwhale.data;
+  const uxList = [ __('userGuide')];
+%>
+
+<%- partial('_partial/heroheader') %>
+
+<main class="contents">
+
+  <%- partial('_partial/header') %>
+
+  <div class="section-wrapper">
+    <%- partial('_partial/generalinfo') %>
+    <section class="column">
+      <div class="section u-block">
+        <h4><%- __('users') %></h4>
+        <ul class="section-list">
+          <% for (item in data.forUsers) { %>
+            <% let n = data.forUsers[item].id %>
+            <li>
+              <a href="<%= data.forUsers[item].url %>"><%= uxList[n] %></a>
+            </li>
+          <% } %>
+        </ul>
+      </div>
+    </section>
+  </div>
+
+  <%- partial('_partial/world') %>
+  <br>
+  <%- partial('_partial/contributing') %>
+
+  <%- partial('_partial/buttons') %>
+</main>

themes/starter/source/assets/scss/modules/_index.scss

@@ -81,12 +81,12 @@
 
 .f-Hubzilla {
   top: 9.5em;
-  left: 26%;
+  left: 28%;
 }
 
 .f-diaspora {
-  top: 6em;
+  top: 3em;
-  left: 87%;
+  left: 84%;
 }
 
 .f-Pleroma {
@@ -96,21 +96,21 @@
 
 .f-Mastodon {
   top: 35%;
-  left: 81%;
+  left: 75%;
 }
 
 .f-Friendica {
   top: 82%;
-  left: 23%;
+  left: 32%;
 }
 
 .f-GNUSocial {
-  top: 83%;
+  top: 76%;
-  left: 79%;
+  left: 83%;
 }
 
 .f-PeerTube {
-  top: 65%;
+  top: 53%;
   left: 85%;
 }
 
@@ -119,6 +119,11 @@
   left: 7%;
 }
 
+.f-Funkwhale {
+  top: 85%;
+  left: 63%;
+}
+
 .grid__card {
   opacity: 0;
   position: absolute;
@@ -294,7 +299,7 @@
   }
 
   .f-Mastodon {
-    top: 39%;
+    top: 37%;
   }
 
   .intro {

themes/starter/source/assets/scss/partials/_colors.scss

@@ -22,3 +22,4 @@ $peertube: #f1680d;
 $misskey: #fb4e4e;
 $osada: #008000;
 $pixelfed: #6736dd;
+$funkwhale: #009FE3;

themes/starter/source/assets/scss/partials/_layout.scss

@@ -381,7 +381,8 @@ $list:  (diaspora, $diaspora),
         (peertube, $peertube),
         (misskey, $misskey),
         (osada, $osada),
-        (pixelfed, $pixelfed);
+        (pixelfed, $pixelfed),
+        (funkwhale, $funkwhale);
 
 @each $tag, $color in $list {
   svg.#{$tag} {