From 9841db4c24cd2bb1189a6259892727dbb2918587 Mon Sep 17 00:00:00 2001 From: lostinlight Date: Wed, 20 Mar 2019 19:22:21 +0300 Subject: [PATCH] Update misc, network pages, numbers --- source/_data/common.json | 6 -- source/_data/ganggo.json | 37 -------- source/_data/miscellaneous.json | 91 +++++++++++-------- source/_data/numbers.json | 56 +++++------- source/_data/pixelfed.json | 2 +- source/en/ganggo/index.md | 9 -- source/img/misc/ganggo.svg | 1 + themes/starter/layout/_partial/svgfont.ejs | 4 - themes/starter/layout/miscellaneous.ejs | 2 +- .../source/assets/scss/modules/_index.scss | 5 - .../source/assets/scss/modules/_misc.scss | 5 +- 11 files changed, 84 insertions(+), 134 deletions(-) delete mode 100644 source/_data/ganggo.json delete mode 100644 source/en/ganggo/index.md create mode 100644 source/img/misc/ganggo.svg diff --git a/source/_data/common.json b/source/_data/common.json index 7ec0b9d..ff82c1c 100644 --- a/source/_data/common.json +++ b/source/_data/common.json @@ -14,12 +14,6 @@ "smallImg": "/img/friendica.png", "descr": "Personal network with no central authority or ownership. Keep in contact with people you care about" }, - { - "title": "GangGo", - "url" : "https://ggg.social", - "smallImg": "/img/ganggo.png", - "descr": "Decentralized platform in early Alpha stage" - }, { "title": "GNU Social", "url" : "https://gnu.io/social", diff --git a/source/_data/ganggo.json b/source/_data/ganggo.json deleted file mode 100644 index c2980f6..0000000 --- a/source/_data/ganggo.json +++ /dev/null @@ -1,37 +0,0 @@ - -{ - "data": - { - "title": "ganggo", - "category": "social network", - "type": "macroblogging", - "logoClr": "69d7e2", - "created": "2017", - "official": "https://ggg.social", - "license": "GPL-3.0", - "repo": "https://git.feneas.org/ganggo/ganggo", - "language": "Go", - "protocols": - [ - {"title": "diaspora", "url": "https://github.com/ganggo/federation"} - ], - "wiki": "", - "servers": - [ - {"num": "1", "url": "https://the-federation.info/ganggo"}, - {"num": "2", "url": "https://fediverse.network/ganggo"} - ], - "mobile": "https://play.google.com/apps/testing/io.github.ganggo", - "devTutorial": "https://ganggo.git.feneas.org/documentation", - "mascot": [{"item": "GangGo (good-natured creature)"}], - "dwellers": "ganggorians", - "communities": "", - "descr": "GangGo is a new federated social network written in GoLang. The platform is in early Alpha stage.", - "connections": ["diaspora*", "Friendica", "Hubzilla", "Socialhome"], - "tracker": "https://github.com/ganggo/ganggo/issues", - "bounty": "", - "translating": "", - "reading": "", - "notable": "" - } -} diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index 6039838..3f878aa 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -1,6 +1,58 @@ { "apps": [ + { + "title": "WriteFreely", + "source": "github.com/writeas/writefreely", + "protocols": "ActivityPub", + "site": "writefreely.org", + "logo": "/img/misc/writefreely.svg", + "servers": "the-federation.info/writefreely", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "Plume", + "source": "github.com/Plume-org/Plume", + "protocols": "ActivityPub", + "site": "joinplu.me", + "logo": "/img/misc/plume.svg", + "servers": "the-federation.info/plume", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "Funkwhale", + "source": "code.eliotberriot.com/funkwhale/funkwhale", + "protocols": "ActivityPub", + "site": "join.funkwhale.audio", + "logo": "/img/misc/funkwhale.svg", + "servers": "the-federation.info/funkwhale", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "GangGo", + "source": "git.feneas.org/ganggo/ganggo", + "protocols": "diaspora", + "site": "ganggo.git.feneas.org/documentation", + "logo": "/img/misc/ganggo.svg", + "servers": "the-federation.info/ganggo", + "apClass": false, + "zotClass": false, + "diasporaClass": true, + "OStatusClass": false, + "categories": ["SN-ma"] + }, { "title": "postActiv", "source": "gitea.postactiv.com/postActiv/postActiv", @@ -27,19 +79,6 @@ "OStatusClass": false, "categories": ["SN-ma"] }, - { - "title": "Funkwhale", - "source": "code.eliotberriot.com/funkwhale/funkwhale", - "protocols": "ActivityPub", - "site": "join.funkwhale.audio", - "logo": "/img/misc/funkwhale.svg", - "servers": "the-federation.info/funkwhale", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["Media"] - }, { "title": "Kroeg", "source": "git.puckipedia.com/kroeg", @@ -66,32 +105,6 @@ "OStatusClass": false, "categories": ["SN-mi"] }, - { - "title": "WriteFreely", - "source": "github.com/writeas/writefreely", - "protocols": "ActivityPub", - "site": "writefreely.org", - "logo": "/img/misc/writefreely.svg", - "servers": "the-federation.info/writefreely", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["Blog-Pub"] - }, - { - "title": "Plume", - "source": "github.com/Plume-org/Plume", - "protocols": "ActivityPub", - "site": "joinplu.me", - "logo": "/img/misc/plume.svg", - "servers": "the-federation.info/plume", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["Blog-Pub"] - }, { "title": "Read.as", "source": "github.com/writeas/Read.as", diff --git a/source/_data/numbers.json b/source/_data/numbers.json index 8d76874..0f03070 100644 --- a/source/_data/numbers.json +++ b/source/_data/numbers.json @@ -2,42 +2,36 @@ { "list": { - "lastUpdate": "10/03/19", + "lastUpdate": "20/03/19", "diaspora": { - "population": "683.428", - "activeUsers": "75.085", - "podsNum": "304" + "population": "689.791", + "activeUsers": "78.533", + "podsNum": "305" }, "friendica": { - "population": "14.204", - "activeUsers": "2.488", - "podsNum": "385" + "population": "14.254", + "activeUsers": "2.509", + "podsNum": "383" }, "hubzilla": { - "population": "7.687", - "activeUsers": "4.189", - "podsNum": "264" - }, - "ganggo": - { - "population": "15", - "activeUsers": "1", - "podsNum": "1" + "population": "7.694", + "activeUsers": "4.416", + "podsNum": "267" }, "socialhome": { - "population": "987", - "activeUsers": "375", - "podsNum": "7" + "population": "999", + "activeUsers": "376", + "podsNum": "6" }, "mastodon": { - "population": "2.082.704", - "activeUsers": "1.081.617", - "podsNum": "2.725" + "population": "2.100.725", + "activeUsers": "1.549.089", + "podsNum": "2.730" }, "gnusocial": { @@ -47,27 +41,27 @@ }, "pleroma": { - "population": "12.323", + "population": "23.816", "activeUsers": "", - "podsNum": "463" + "podsNum": "475" }, "misskey": { - "population": "1032", + "population": "1205", "activeUsers": "", - "podsNum": "56" + "podsNum": "51" }, "peertube": { - "population": "13.000", + "population": "13.343", "activeUsers": "", - "podsNum": "319" + "podsNum": "326" }, "pixelfed": { - "population": "8.037", - "activeUsers": "7.607", - "podsNum": "42" + "population": "8.848", + "activeUsers": "8.086", + "podsNum": "41" } } } diff --git a/source/_data/pixelfed.json b/source/_data/pixelfed.json index d14a6bc..36bb3ed 100644 --- a/source/_data/pixelfed.json +++ b/source/_data/pixelfed.json @@ -27,7 +27,7 @@ "dwellers": "?", "communities": "", "descr": "Pixelfed is an image sharing platform with modern user interface.", - "connections": ["Friendica", "Hubzilla", "Mastodon", "Pleroma"], + "connections": ["Friendica", "Mastodon", "Misskey", "Pleroma"], "donate": "https://www.patreon.com/dansup", "tracker": "https://github.com/dansup/pixelfed/issues", "bounty": "", diff --git a/source/en/ganggo/index.md b/source/en/ganggo/index.md deleted file mode 100644 index 2aee58a..0000000 --- a/source/en/ganggo/index.md +++ /dev/null @@ -1,9 +0,0 @@ - ---- -layout: "generic" -title: "GangGo" -network: "ganggo" -subtitle: "social network written in GoLang" -banner: "/img/ganggo-bg.jpg" -percent: "50% 10%" ---- diff --git a/source/img/misc/ganggo.svg b/source/img/misc/ganggo.svg new file mode 100644 index 0000000..c175de8 --- /dev/null +++ b/source/img/misc/ganggo.svg @@ -0,0 +1 @@ + diff --git a/themes/starter/layout/_partial/svgfont.ejs b/themes/starter/layout/_partial/svgfont.ejs index c9358c7..010e26c 100644 --- a/themes/starter/layout/_partial/svgfont.ejs +++ b/themes/starter/layout/_partial/svgfont.ejs @@ -59,10 +59,6 @@ - - - - diff --git a/themes/starter/layout/miscellaneous.ejs b/themes/starter/layout/miscellaneous.ejs index 39ff964..e8eb198 100644 --- a/themes/starter/layout/miscellaneous.ejs +++ b/themes/starter/layout/miscellaneous.ejs @@ -34,7 +34,7 @@ layout: layout <% for (item in apps) { %> <% let type = apps[item].categories %> -
+
<% if (apps[item].logo) { %>logo<% } %> diff --git a/themes/starter/source/assets/scss/modules/_index.scss b/themes/starter/source/assets/scss/modules/_index.scss index 6197e3b..2de21b5 100644 --- a/themes/starter/source/assets/scss/modules/_index.scss +++ b/themes/starter/source/assets/scss/modules/_index.scss @@ -74,11 +74,6 @@ left: 4%; } -.f-GangGo { - top: 1em; - left: 48%; -} - .f-Hubzilla { top: 9.5em; left: 26%; diff --git a/themes/starter/source/assets/scss/modules/_misc.scss b/themes/starter/source/assets/scss/modules/_misc.scss index cb95384..adff175 100644 --- a/themes/starter/source/assets/scss/modules/_misc.scss +++ b/themes/starter/source/assets/scss/modules/_misc.scss @@ -1,11 +1,14 @@ .miscellaneous .hero-header { - height: 100%; max-height: 350px; box-shadow: 1px 1px 4px 2px $black; } +.miscellaneous small { + display: none; +} + .misc { background: $asphalt; color: $white;