diff --git a/source/_data/common.json b/source/_data/common.json index e0e6a8a..32a1f10 100644 --- a/source/_data/common.json +++ b/source/_data/common.json @@ -61,6 +61,12 @@ "url" : "https://gnu.io/social", "smallImg": "/img/gnusocial.png", "descr": "Connecting free and independent communities across the web" + }, + { + "title": "PeerTube", + "url" : "https://joinpeertube.org/en", + "smallImg": "/img/peertube.png", + "descr": "Decentralized video hosting network, based on libre software. Take back the control of your videos" } ], "protocols": @@ -110,7 +116,7 @@ }, { "name": "(Node)JS", - "networks": "pump.io" + "networks": "pump.io, PeerTube" }, { "name": "Go", diff --git a/source/_data/numbers.json b/source/_data/numbers.json index f5def21..dfe9421 100644 --- a/source/_data/numbers.json +++ b/source/_data/numbers.json @@ -2,42 +2,42 @@ { "list": { - "lastUpdate": "21/04/18", + "lastUpdate": "22/04/18", "diaspora": { - "population": "670.674", - "activeUsers": "59.404", + "population": "671.347", + "activeUsers": "59.830", "podsNum": "242" }, "friendica": { - "population": "12.673", - "activeUsers": "1.590", + "population": "12.678", + "activeUsers": "1.625", "podsNum": "311" }, "hubzilla": { "population": "3.059", - "activeUsers": "846", + "activeUsers": "883", "podsNum": "171" }, "ganggo": { - "population": "73", - "activeUsers": "39", + "population": "75", + "activeUsers": "41", "podsNum": "1" }, "socialhome": { - "population": "491", - "activeUsers": "302", + "population": "475", + "activeUsers": "304", "podsNum": "3" }, "mastodon": { - "population": "1.205.140", + "population": "1.208.400", "activeUsers": "", - "podsNum": "2.504" + "podsNum": "2.526" }, "gnusocial": { @@ -62,6 +62,12 @@ "population": "?", "activeUsers": "", "podsNum": "?" + }, + "peertube": + { + "population": "?", + "activeUsers": "", + "podsNum": "88" } } } diff --git a/source/_data/peertube.json b/source/_data/peertube.json new file mode 100644 index 0000000..5538c43 --- /dev/null +++ b/source/_data/peertube.json @@ -0,0 +1,30 @@ + +{ + "data": + { + "title": "peertube", + "logoClr": "f1680d", + "created": "2017", + "official": "https://joinpeertube.org/en", + "license": "AGPL-3.0", + "repo": "https://github.com/Chocobozzz/PeerTube", + "language": "NodeJS", + "protocols": + [ + {"title": "ActivityPub", "url": "https://activitypub.rocks"} + ], + "wiki": "https://peertube.frama.wiki", + "servers": [ + {"num": "1", "url": "https://instances.joinpeertube.org/instances"}, + {"num": "2", "url": "https://peertube.frama.wiki/technics:list-of-servers"} + ], + "mobile": "", + "devTutorials": "https://peertube.frama.wiki/technics:installation", + "notable": "", + "communities": "", + "donate": "https://soutenir.framasoft.org/en", + "tracker": "https://github.com/Chocobozzz/PeerTube/issues", + "bounty": "", + "translating": "" + } +} diff --git a/source/_data/worldi18n.json b/source/_data/worldi18n.json index b391c55..bf2483e 100644 --- a/source/_data/worldi18n.json +++ b/source/_data/worldi18n.json @@ -190,6 +190,16 @@ "communities": "", "descr": "Under the dazzling sienna sun for miles and miles stretch Aardwolf lands. Its the home of craftsmen and groundbreakers, always willing to create something new, solid and consistent. Aardwolf is the newest federated network and still a work-in-progress. Its main goal is to be designed from the ground-up with privacy, security, and freedom in mind.", "reading": "" + }, + "peertubeWorld": + { + "category": "federated network", + "type": "video streaming", + "mascot": "", + "dwellers": "?", + "communities": "", + "descr": "PeerTube, a rich and fertile place reveling in warm orange sun rays, is home to visual creators and video gurus. As an alternative to centralized closed-source platforms, PeerTube considers each user as a person, and not as a product to track, profile, and better sell available brain time. PeerTube's goal is to create a network of small interconnected video hosting providers. Users are free to choose the hoster of their videos according to terms of service and moderation policy. There are no obscure recommendation algorithms and no need to give away extended copyright to the platform. PeerTube video broadcasting is peer-to-peer (through WebRTC), so when other people are watching a PeerTube video at the same time as you, as long as your tab remains open, your browser shares bits of that video and you participate in a healthier use of the Internet. Videos hosted on PeerTube can be viewed directly from Mastodon and (soon) other Fediverse networks.", + "reading": "" } } } diff --git a/source/en/peertube/index.md b/source/en/peertube/index.md new file mode 100644 index 0000000..c7ec4c4 --- /dev/null +++ b/source/en/peertube/index.md @@ -0,0 +1,9 @@ + +--- +layout: "peertube" +title: "PeerTube" +network: "peertube" +subtitle: "Take back the control of your videos" +banner: "/img/peertube-bg.jpg" +percent: "45% 15%" +--- diff --git a/source/img/peertube-bg.jpg b/source/img/peertube-bg.jpg new file mode 100644 index 0000000..44e05fa Binary files /dev/null and b/source/img/peertube-bg.jpg differ diff --git a/source/img/peertube.png b/source/img/peertube.png new file mode 100644 index 0000000..1a93147 Binary files /dev/null and b/source/img/peertube.png differ diff --git a/themes/starter/layout/_partial/header.ejs b/themes/starter/layout/_partial/header.ejs index 9948d58..fa9ce9c 100644 --- a/themes/starter/layout/_partial/header.ejs +++ b/themes/starter/layout/_partial/header.ejs @@ -6,8 +6,8 @@
- - <%= data.title %> logo + + <%= data.title %> logo

<%- __('overview') %>

diff --git a/themes/starter/layout/_partial/svgfont.ejs b/themes/starter/layout/_partial/svgfont.ejs index ce1840b..5b07006 100644 --- a/themes/starter/layout/_partial/svgfont.ejs +++ b/themes/starter/layout/_partial/svgfont.ejs @@ -62,4 +62,8 @@ + + + + diff --git a/themes/starter/layout/_partial/world.ejs b/themes/starter/layout/_partial/world.ejs index 46c3358..5febd3d 100644 --- a/themes/starter/layout/_partial/world.ejs +++ b/themes/starter/layout/_partial/world.ejs @@ -50,7 +50,7 @@
-

<%= world.descr %> Join <%= network %> today!

+

<%= world.descr %> Join <%= page.title %> today!

<% if (stars) { %>
diff --git a/themes/starter/layout/peertube.ejs b/themes/starter/layout/peertube.ejs new file mode 100644 index 0000000..9e6dca4 --- /dev/null +++ b/themes/starter/layout/peertube.ejs @@ -0,0 +1,39 @@ + +--- +layout: layout +--- + +<% + const data = site.data.peertube.data; + const servers = data.servers; +%> + +<%- partial('_partial/heroheader') %> + +
+ + <%- partial('_partial/header') %> + +
+ <%- partial('_partial/generalinfo') %> + +
+
+

<%- __('join') %>

+ +
+
+
+ + <%- partial('_partial/world') %> +
+ <%- partial('_partial/contributing') %> + + <%- partial('_partial/buttons') %> +
diff --git a/themes/starter/source/assets/scss/modules/_chronicles.scss b/themes/starter/source/assets/scss/modules/_chronicles.scss index 92cd9e2..b702bb8 100644 --- a/themes/starter/source/assets/scss/modules/_chronicles.scss +++ b/themes/starter/source/assets/scss/modules/_chronicles.scss @@ -147,7 +147,8 @@ $taglist: (diaspora, $diaspora), (pleroma, $pleroma), (ganggo, $ganggo), (aardwolf, $aardwolf), - (postactiv, $postactiv); + (postactiv, $postactiv), + (peertube, peertube); @each $tag, $color in $taglist { svg.f-tag.#{$tag} { diff --git a/themes/starter/source/assets/scss/modules/_index.scss b/themes/starter/source/assets/scss/modules/_index.scss index 2098a35..7834836 100644 --- a/themes/starter/source/assets/scss/modules/_index.scss +++ b/themes/starter/source/assets/scss/modules/_index.scss @@ -109,6 +109,11 @@ left: 83%; } +.f-PeerTube { + top: 65%; + left: 90%; +} + .grid__card { opacity: 0; position: absolute; diff --git a/themes/starter/source/assets/scss/partials/_colors.scss b/themes/starter/source/assets/scss/partials/_colors.scss index 6e4318a..3d04ca2 100644 --- a/themes/starter/source/assets/scss/partials/_colors.scss +++ b/themes/starter/source/assets/scss/partials/_colors.scss @@ -16,3 +16,4 @@ $postactiv: #ad68d5; $ganggo: #69d7e2; $pleroma: #ff7b6e; $aardwolf: #46332d; +$peertube: #f1680d;