devol/guida-fediverso
1
0
Fork 0
mirror of https://git.feneas.org/feneas/fediverse.git synced 2024-12-23 03:18:04 +01:00
Code Issues Projects Releases Wiki Activity

Update numbers, relocate Osada

Browse Source
This commit is contained in:
lostinlight 2019-02-20 23:13:03 +03:00
parent 771c4d9bc7
commit b77a4d3b0f
9 changed files with 43 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/_data/common.json
View File

@ -44,12 +44,6 @@
"smallImg": "/img/misskey.png", "smallImg": "/img/misskey.png",
"descr": "Sophisticated microblogging with personality" "descr": "Sophisticated microblogging with personality"
}, },
{
"title": "Osada",
"url" : "https://zotlabs.com/osada",
"smallImg": "/img/osada.png",
"descr": "Conversational style network powered by hyper-drive social engine"
},
{ {
"title": "PeerTube", "title": "PeerTube",
"url" : "https://joinpeertube.org/en", "url" : "https://joinpeertube.org/en",

15
source/_data/miscellaneous.json
View File

@ -402,7 +402,20 @@
"zotClass": true, "zotClass": true,
"diasporaClass": false, "diasporaClass": false,
"OStatusClass": false, "OStatusClass": false,
"categories": ["Plugins"] "categories": ["SN-ma"]
},
{
"title": "Osada",
"source": "framagit.org/macgirvin/osada",
"protocols": "Zot",
"site": "zotlabs.com/osada",
"logo": "/img/misc/osada.svg",
"servers": "",
"apClass": false,
"zotClass": true,
"diasporaClass": false,
"OStatusClass": false,
"categories": ["SN-ma"]
} }
] ]
} }

60
source/_data/numbers.json
View File

@ -2,78 +2,72 @@
{ {
"list": "list":
{ {
"lastUpdate": "08/02/19", "lastUpdate": "20/02/19",
"diaspora": "diaspora":
{ {
"population": "672.293", "population": "678.314",
"activeUsers": "67.812", "activeUsers": "70.724",
"podsNum": "305" "podsNum": "298"
}, },
"friendica": "friendica":
{ {
"population": "14.255", "population": "14.250",
"activeUsers": "2.349", "activeUsers": "2.382",
"podsNum": "375" "podsNum": "375"
}, },
"hubzilla": "hubzilla":
{ {
"population": "6.495", "population": "6.508",
"activeUsers": "3.846", "activeUsers": "3.980",
"podsNum": "255" "podsNum": "250"
}, },
"ganggo": "ganggo":
{ {
"population": "229", "population": "225",
"activeUsers": "129", "activeUsers": "121",
"podsNum": "3" "podsNum": "3"
}, },
"socialhome": "socialhome":
{ {
"population": "893", "population": "962",
"activeUsers": "342", "activeUsers": "366",
"podsNum": "2" "podsNum": "5"
}, },
"mastodon": "mastodon":
{ {
"population": "1.941.086", "population": "1.973.994",
"activeUsers": "1.298.548", "activeUsers": "1.309.463",
"podsNum": "2.704" "podsNum": "2.689"
}, },
"gnusocial": "gnusocial":
{ {
"population": "13.119", "population": "12.981",
"activeUsers": "", "activeUsers": "",
"podsNum": "142" "podsNum": "140"
}, },
"pleroma": "pleroma":
{ {
"population": "9.255", "population": "11.248",
"activeUsers": "", "activeUsers": "",
"podsNum": "454" "podsNum": "446"
}, },
"misskey": "misskey":
{ {
"population": "1.185", "population": "1.070",
"activeUsers": "", "activeUsers": "",
"podsNum": "23" "podsNum": "43"
}, },
"peertube": "peertube":
{ {
"population": "12.553", "population": "12.271",
"activeUsers": "", "activeUsers": "",
"podsNum": "307" "podsNum": "308"
},
"osada":
{
"population": "224",
"activeUsers": "219",
"podsNum": "12"
}, },
"pixelfed": "pixelfed":
{ {
"population": "6.883", "population": "7.200",
"activeUsers": "3.948", "activeUsers": "3.948",
"podsNum": "40" "podsNum": "37"
} }
} }
} }

44
source/_data/osada.json
View File

@ -1,44 +0,0 @@
{
"data":
{
"title": "osada",
"category": "social network",
"type": "macroblogging",
"logoClr": "008000",
"created": "2018",
"official": "https://zotlabs.com/osada",
"license": "MIT",
"repo": "https://framagit.org/macgirvin/osada",
"language": "PHP",
"protocols":
[
{"title": "Zot", "url": "https://project.hubzilla.org/help/developer/zot_protocol"},
{"title": "ActivityPub", "url": "https://activitypub.rocks"}
],
"wiki": "",
"servers":
[
{"num": "1", "url": "https://the-federation.info/osada"},
{"num": "2", "url": "https://fediverse.network/osada"},
{"num": "3", "url": "https://osada.macgirvin.com/pubsites"}
],
"mobile": "",
"forTechies":
[
{"id": "0", "url": "https://framagit.org/zot/zap/blob/dev/spec/Zot6/Home.md"}
],
"devTutorials": "https://framagit.org/macgirvin/osada/blob/master/install/INSTALL.txt",
"mascot": [{"item": "?"}],
"dwellers": "?",
"communities": "",
"descr": "Osada is a general-purpose social network that provides essential features as photo albums, file storage and groups / forums. Its unique hyper-drive engine helps users grow their social network. Osada supports Zot6 protocol which uses industry standards where possible, the latest version is incompatible with previous version of Zot.",
"connections": ["Friendica", "Hubzilla", "Mastodon", "Pleroma", "PeerTube", "Misskey"],
"donate": "",
"tracker": "https://framagit.org/macgirvin/osada/issues",
"bounty": "",
"translating": "",
"reading": "",
"notable": ""
}
}

9
source/en/osada/index.md
View File

@ -1,9 +0,0 @@
---
layout: "osada"
title: "Osada"
network: "osada"
subtitle: "powered by hyper-drive social engine"
banner: "/img/osada-bg.jpg"
percent: "45% 50%"
---

2
source/img/misc/osada.svg Normal file
View File

@ -0,0 +1,2 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path fill="#008000" d="M23.484 10.926c-.065-.029-.789-.033-1.765-.024a9.565 9.565 0 0 0-1.952-4.613c.69-.669 1.2-1.176 1.239-1.254.25-.496-1.12-1.883-1.672-1.672-.066.025-.578.532-1.257 1.223a9.894 9.894 0 0 0-4.902-2.045c.014-.921.015-1.601-.012-1.682-.174-.527-2.123-.54-2.365 0-.028.063-.033.747-.025 1.68a9.89 9.89 0 0 0-4.888 2.024c-.662-.683-1.163-1.187-1.241-1.226-.496-.25-1.883 1.12-1.672 1.672.025.066.528.574 1.215 1.249a9.575 9.575 0 0 0-1.97 4.614c-.93-.014-1.619-.015-1.7.012-.527.174-.54 2.123 0 2.365.063.028.742.033 1.669.025a9.127 9.127 0 0 0 1.985 4.693c-.678.657-1.175 1.152-1.214 1.23-.25.496 1.12 1.883 1.672 1.672.066-.025.585-.539 1.272-1.238a10.082 10.082 0 0 0 4.843 1.911c-.014.93-.015 1.619.012 1.701.174.527 2.123.54 2.365 0 .028-.063.033-.754.025-1.695a10.077 10.077 0 0 0 4.898-1.927c.679.701 1.195 1.22 1.274 1.26.496.25 1.883-1.12 1.672-1.672-.025-.066-.53-.576-1.22-1.254a9.12 9.12 0 0 0 1.97-4.652c.953.015 1.661.016 1.744-.011.527-.175.54-2.124 0-2.366zm-3.446-.001c-1.789.029-3.684.073-4.08.083a4.042 4.042 0 0 0-.333-.78 632.43 632.43 0 0 0 2.932-2.775 7.96 7.96 0 0 1 1.481 3.472zm-3.137-5.133c-1.178 1.216-2.413 2.51-2.777 2.891a4.233 4.233 0 0 0-1.092-.474c.019-.632.071-2.361.108-3.985a8.234 8.234 0 0 1 3.761 1.568zm-6.108-1.568c.026 1.629.065 3.365.08 3.992a4.218 4.218 0 0 0-1.069.469 527.347 527.347 0 0 0-2.753-2.908 8.204 8.204 0 0 1 3.742-1.553zM5.39 7.432a584.547 584.547 0 0 0 2.914 2.799c-.14.248-.251.512-.335.786-.522-.016-2.356-.071-4.075-.111A7.973 7.973 0 0 1 5.39 7.432zm-1.534 5.821c1.72-.027 3.567-.07 4.105-.082.089.297.21.58.366.844-.372.35-1.728 1.627-2.986 2.827a7.596 7.596 0 0 1-1.485-3.589zm3.169 5.224c1.237-1.277 2.548-2.651 2.854-2.971.314.176.652.313 1.006.406-.02.66-.072 2.424-.11 4.057a8.372 8.372 0 0 1-3.75-1.492zm6.101 1.496c-.026-1.634-.066-3.4-.081-4.061a4.313 4.313 0 0 0 1.059-.436c.298.317 1.597 1.697 2.825 2.984a8.375 8.375 0 0 1-3.803 1.513zm5.479-3.154a638.548 638.548 0 0 0-2.975-2.857 3.77 3.77 0 0 0 .342-.805c.43.013 2.321.071 4.099.112a7.567 7.567 0 0 1-1.466 3.55z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

3
themes/starter/languages/en.yml
View File

@ -133,9 +133,6 @@ permissions: Channel permissions and roles cheatsheet
ownInstance: Setting up your instance ownInstance: Setting up your instance
dualQuitter: Dual boot with qvitter dualQuitter: Dual boot with qvitter
#Osada page
zot6: Zot6 specification
# Contributing partial # Contributing partial
foreword: Please, keep in mind that you are a participant, not a customer. foreword: Please, keep in mind that you are a participant, not a customer.
promptStart: If you'd like to help the promptStart: If you'd like to help the

4
themes/starter/layout/_partial/svgfont.ejs
View File

@ -71,10 +71,6 @@
<path d="M 21.447 8.646 Q 20.396 8.646 19.645 7.92 Q 18.919 7.169 18.919 6.118 Q 18.919 5.067 19.645 4.341 Q 20.396 3.59 21.447 3.59 Q 22.498 3.59 23.249 4.341 Q 24 5.067 24 6.118 Q 24 7.169 23.249 7.92 Q 22.498 8.646 21.447 8.646 Z M 21.472 9.147 Q 22.523 9.147 23.249 9.898 Q 24 10.648 24 11.7 L 24 17.882 Q 24 18.933 23.249 19.684 Q 22.523 20.41 21.472 20.41 Q 20.421 20.41 19.67 19.684 Q 18.919 18.933 18.919 17.882 L 18.919 11.7 Q 18.919 10.648 19.67 9.898 Q 20.421 9.147 21.472 9.147 Z M 8.911 16.84 C 7.871 16.843 6.979 16.217 6.558 15.488 C 6.333 15.169 5.888 15.056 5.882 15.488 L 5.882 17.482 C 5.882 18.282 5.59 18.975 5.006 19.559 C 4.439 20.126 3.746 20.41 2.928 20.41 C 2.128 20.41 1.435 20.126 0.851 19.559 C 0.284 18.975 0 18.282 0 17.482 L 0 6.518 C 0 5.901 0.175 5.342 0.526 4.841 C 0.893 4.324 1.36 3.965 1.927 3.765 C 2.244 3.648 2.578 3.59 2.928 3.59 C 3.83 3.59 4.58 3.94 5.181 4.641 C 5.498 4.992 5.682 5.175 5.732 5.192 C 5.732 5.192 8.111 8.069 8.178 8.119 C 8.245 8.169 8.441 8.552 8.911 8.552 C 9.38 8.552 9.601 8.169 9.668 8.119 C 9.735 8.069 12.114 5.192 12.114 5.192 C 12.131 5.209 12.306 5.025 12.64 4.641 C 13.257 3.94 14.017 3.59 14.918 3.59 C 15.251 3.59 15.585 3.648 15.919 3.765 C 16.486 3.965 16.945 4.324 17.296 4.841 C 17.663 5.342 17.846 5.901 17.846 6.518 L 17.846 17.482 C 17.846 18.282 17.554 18.975 16.97 19.559 C 16.403 20.126 15.71 20.41 14.893 20.41 C 14.092 20.41 13.399 20.126 12.815 19.559 C 12.248 18.975 11.964 18.282 11.964 17.482 L 11.964 15.488 C 11.915 14.944 11.434 15.287 11.263 15.488 C 10.813 16.322 9.95 16.836 8.911 16.84 Z"/> <path d="M 21.447 8.646 Q 20.396 8.646 19.645 7.92 Q 18.919 7.169 18.919 6.118 Q 18.919 5.067 19.645 4.341 Q 20.396 3.59 21.447 3.59 Q 22.498 3.59 23.249 4.341 Q 24 5.067 24 6.118 Q 24 7.169 23.249 7.92 Q 22.498 8.646 21.447 8.646 Z M 21.472 9.147 Q 22.523 9.147 23.249 9.898 Q 24 10.648 24 11.7 L 24 17.882 Q 24 18.933 23.249 19.684 Q 22.523 20.41 21.472 20.41 Q 20.421 20.41 19.67 19.684 Q 18.919 18.933 18.919 17.882 L 18.919 11.7 Q 18.919 10.648 19.67 9.898 Q 20.421 9.147 21.472 9.147 Z M 8.911 16.84 C 7.871 16.843 6.979 16.217 6.558 15.488 C 6.333 15.169 5.888 15.056 5.882 15.488 L 5.882 17.482 C 5.882 18.282 5.59 18.975 5.006 19.559 C 4.439 20.126 3.746 20.41 2.928 20.41 C 2.128 20.41 1.435 20.126 0.851 19.559 C 0.284 18.975 0 18.282 0 17.482 L 0 6.518 C 0 5.901 0.175 5.342 0.526 4.841 C 0.893 4.324 1.36 3.965 1.927 3.765 C 2.244 3.648 2.578 3.59 2.928 3.59 C 3.83 3.59 4.58 3.94 5.181 4.641 C 5.498 4.992 5.682 5.175 5.732 5.192 C 5.732 5.192 8.111 8.069 8.178 8.119 C 8.245 8.169 8.441 8.552 8.911 8.552 C 9.38 8.552 9.601 8.169 9.668 8.119 C 9.735 8.069 12.114 5.192 12.114 5.192 C 12.131 5.209 12.306 5.025 12.64 4.641 C 13.257 3.94 14.017 3.59 14.918 3.59 C 15.251 3.59 15.585 3.648 15.919 3.765 C 16.486 3.965 16.945 4.324 17.296 4.841 C 17.663 5.342 17.846 5.901 17.846 6.518 L 17.846 17.482 C 17.846 18.282 17.554 18.975 16.97 19.559 C 16.403 20.126 15.71 20.41 14.893 20.41 C 14.092 20.41 13.399 20.126 12.815 19.559 C 12.248 18.975 11.964 18.282 11.964 17.482 L 11.964 15.488 C 11.915 14.944 11.434 15.287 11.263 15.488 C 10.813 16.322 9.95 16.836 8.911 16.84 Z"/>
</symbol> </symbol>
<symbol id="icon-osada" viewBox="0 0 24 24">
<path d="M23.484 10.926c-.065-.029-.789-.033-1.765-.024a9.565 9.565 0 0 0-1.952-4.613c.69-.669 1.2-1.176 1.239-1.254.25-.496-1.12-1.883-1.672-1.672-.066.025-.578.532-1.257 1.223a9.894 9.894 0 0 0-4.902-2.045c.014-.921.015-1.601-.012-1.682-.174-.527-2.123-.54-2.365 0-.028.063-.033.747-.025 1.68a9.89 9.89 0 0 0-4.888 2.024c-.662-.683-1.163-1.187-1.241-1.226-.496-.25-1.883 1.12-1.672 1.672.025.066.528.574 1.215 1.249a9.575 9.575 0 0 0-1.97 4.614c-.93-.014-1.619-.015-1.7.012-.527.174-.54 2.123 0 2.365.063.028.742.033 1.669.025a9.127 9.127 0 0 0 1.985 4.693c-.678.657-1.175 1.152-1.214 1.23-.25.496 1.12 1.883 1.672 1.672.066-.025.585-.539 1.272-1.238a10.082 10.082 0 0 0 4.843 1.911c-.014.93-.015 1.619.012 1.701.174.527 2.123.54 2.365 0 .028-.063.033-.754.025-1.695a10.077 10.077 0 0 0 4.898-1.927c.679.701 1.195 1.22 1.274 1.26.496.25 1.883-1.12 1.672-1.672-.025-.066-.53-.576-1.22-1.254a9.12 9.12 0 0 0 1.97-4.652c.953.015 1.661.016 1.744-.011.527-.175.54-2.124 0-2.366zm-3.446-.001c-1.789.029-3.684.073-4.08.083a4.042 4.042 0 0 0-.333-.78 632.43 632.43 0 0 0 2.932-2.775 7.96 7.96 0 0 1 1.481 3.472zm-3.137-5.133c-1.178 1.216-2.413 2.51-2.777 2.891a4.233 4.233 0 0 0-1.092-.474c.019-.632.071-2.361.108-3.985a8.234 8.234 0 0 1 3.761 1.568zm-6.108-1.568c.026 1.629.065 3.365.08 3.992a4.218 4.218 0 0 0-1.069.469 527.347 527.347 0 0 0-2.753-2.908 8.204 8.204 0 0 1 3.742-1.553zM5.39 7.432a584.547 584.547 0 0 0 2.914 2.799c-.14.248-.251.512-.335.786-.522-.016-2.356-.071-4.075-.111A7.973 7.973 0 0 1 5.39 7.432zm-1.534 5.821c1.72-.027 3.567-.07 4.105-.082.089.297.21.58.366.844-.372.35-1.728 1.627-2.986 2.827a7.596 7.596 0 0 1-1.485-3.589zm3.169 5.224c1.237-1.277 2.548-2.651 2.854-2.971.314.176.652.313 1.006.406-.02.66-.072 2.424-.11 4.057a8.372 8.372 0 0 1-3.75-1.492zm6.101 1.496c-.026-1.634-.066-3.4-.081-4.061a4.313 4.313 0 0 0 1.059-.436c.298.317 1.597 1.697 2.825 2.984a8.375 8.375 0 0 1-3.803 1.513zm5.479-3.154a638.548 638.548 0 0 0-2.975-2.857 3.77 3.77 0 0 0 .342-.805c.43.013 2.321.071 4.099.112a7.567 7.567 0 0 1-1.466 3.55z"/>
</symbol>
<symbol id="icon-pixelfed" viewBox="-1 0 24 24"> <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"/> <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>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

40
themes/starter/layout/osada.ejs
View File

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