diff --git a/source/_data/common.json b/source/_data/common.json index ce1dabe..7d5ad57 100644 --- a/source/_data/common.json +++ b/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": diff --git a/source/_data/funkwhale.json b/source/_data/funkwhale.json new file mode 100644 index 0000000..1078f04 --- /dev/null +++ b/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": "" + } +} diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index 16fc5cb..968786b 100644 --- a/source/_data/miscellaneous.json +++ b/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", diff --git a/source/_data/numbers.json b/source/_data/numbers.json index af2d445..fa9b234 100644 --- a/source/_data/numbers.json +++ b/source/_data/numbers.json @@ -2,72 +2,78 @@ { "list": { - "lastUpdate": "17/11/19", + "lastUpdate": "20/12/19", "diaspora": { - "population": "759.816", - "activeUsers": "72.418", - "podsNum": "257" + "population": "757.065", + "activeUsers": "71.369", + "podsNum": "243" }, "friendica": { - "population": "14.276", - "activeUsers": "2.167", - "podsNum": "338" + "population": "14.812", + "activeUsers": "2.347", + "podsNum": "334" }, "hubzilla": { - "population": "9.405", - "activeUsers": "3.443", - "podsNum": "260" + "population": "9.401", + "activeUsers": "3.451", + "podsNum": "262" }, "socialhome": { - "population": "1.240", - "activeUsers": "298", + "population": "1.279", + "activeUsers": "312", "podsNum": "5" }, "mastodon": { - "population": "3.598.416", - "activeUsers": "1.304.417", - "podsNum": "2.689" + "population": "3.600.211", + "activeUsers": "1.226.342", + "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", - "activeUsers": "", - "podsNum": "4.741" + { + "population": "4.462.513", + "activeUsers": "1.305.301", + "podsNum": "4.847" } } } diff --git a/source/en/funkwhale/index.md b/source/en/funkwhale/index.md new file mode 100644 index 0000000..6c3fc4a --- /dev/null +++ b/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%" +--- diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index b90e6a9..d02d6f1 100644 --- a/source/en/portal/servers/index.md +++ b/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 diff --git a/source/img/funkwhale-bg.jpg b/source/img/funkwhale-bg.jpg new file mode 100644 index 0000000..64e133e Binary files /dev/null and b/source/img/funkwhale-bg.jpg differ diff --git a/source/img/funkwhale.png b/source/img/funkwhale.png new file mode 100644 index 0000000..a25e234 Binary files /dev/null and b/source/img/funkwhale.png differ diff --git a/source/img/misc/funkwhale.svg b/source/img/misc/funkwhale.svg deleted file mode 100644 index a2de65e..0000000 --- a/source/img/misc/funkwhale.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/source/img/screenshots/funkwhale-1.png b/source/img/screenshots/funkwhale-1.png index 3bc657a..1b5ad77 100644 Binary files a/source/img/screenshots/funkwhale-1.png and b/source/img/screenshots/funkwhale-1.png differ diff --git a/source/img/screenshots/funkwhale-2.jpg b/source/img/screenshots/funkwhale-2.jpg index 2111b7a..19ef6ec 100644 Binary files a/source/img/screenshots/funkwhale-2.jpg and b/source/img/screenshots/funkwhale-2.jpg differ diff --git a/themes/starter/layout/_partial/svgfont.ejs b/themes/starter/layout/_partial/svgfont.ejs index 010e26c..3586757 100644 --- a/themes/starter/layout/_partial/svgfont.ejs +++ b/themes/starter/layout/_partial/svgfont.ejs @@ -70,4 +70,8 @@ + + + + diff --git a/themes/starter/layout/funkwhale.ejs b/themes/starter/layout/funkwhale.ejs new file mode 100644 index 0000000..78f9e0e --- /dev/null +++ b/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') %> + +
+ + <%- partial('_partial/header') %> + +
+ <%- partial('_partial/generalinfo') %> +
+
+

<%- __('users') %>

+
    + <% for (item in data.forUsers) { %> + <% let n = data.forUsers[item].id %> +
  • + <%= uxList[n] %> +
    • + <% } %> +
+
+
+
+ + <%- partial('_partial/world') %> +
+ <%- partial('_partial/contributing') %> + + <%- partial('_partial/buttons') %> +
diff --git a/themes/starter/source/assets/scss/modules/_index.scss b/themes/starter/source/assets/scss/modules/_index.scss index 050c81d..2469cfb 100644 --- a/themes/starter/source/assets/scss/modules/_index.scss +++ b/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; - left: 87%; + top: 3em; + 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%; - left: 79%; + top: 76%; + 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 { diff --git a/themes/starter/source/assets/scss/partials/_colors.scss b/themes/starter/source/assets/scss/partials/_colors.scss index e72e1f7..7bbb852 100644 --- a/themes/starter/source/assets/scss/partials/_colors.scss +++ b/themes/starter/source/assets/scss/partials/_colors.scss @@ -22,3 +22,4 @@ $peertube: #f1680d; $misskey: #fb4e4e; $osada: #008000; $pixelfed: #6736dd; +$funkwhale: #009FE3; diff --git a/themes/starter/source/assets/scss/partials/_layout.scss b/themes/starter/source/assets/scss/partials/_layout.scss index fd9e3e9..4e91b58 100644 --- a/themes/starter/source/assets/scss/partials/_layout.scss +++ b/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} {