diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 751d68a..b73b7d0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,20 +1,43 @@ # CONTRIBUTING -Don't hesitate to send a merge request! +Don't hesitate to send a merge request. -Two easy and most welcome ways to contribute are: -1. submitting short news to The Chronicles -2. writing an internal article for the website +### [Submitting software](submitting-software) -### Submitting news +Tools submitted to **/MORE** website page **must be**: +* Fully open source (please, consider showcasing your closed source apps on https://the-federation.info) +* Supporting or planning to support one of the following protocols: OStatus, diaspora, Zot, ActivityPub (please, consider showcasing your apps federating via other protocols on https://the-federation.info) + +Fork this repository. Add your project data to `./source/_data/miscellaneous.json` file. + +A project **must have** *title, source, protocols (1 string, comma separated), categories* and appropriate protocol classes marked as `true`. + +Please, choose no more than **2 categories** (array of strings) for the tool. The ones it was initially designed for. + +#### Categories (WIP, may change in the future) +* `SN-ma` (social network: macroblogging) +* `SN-mi` (social network: microblogging) +* `Blog-Pub` (blog and publishing software) +* `Media` (media sharing: images, audio, etc) +* `Links` (link sharing) +* `Ev-Meet` (events, meetups, calendars) +* `Files` (file hosting software) +* `Coop` (cooperatives, shared management) +* `Econ` (economic activities) +* `DevTools` (developer tools: libraries and such) +* `Plugins` (plugins) + +A project may have a logo / image (45x45px), placed in `./source/img/misc` folder. + +### [Submitting news](submitting-news) **Data located in**: `/source/_posts` folder **[Chronicles](https://fediverse.party/en/chronicles)** page aggregates latest news about major releases, development, interviews, related projects of Fediverse *social networks* (i.e., all the networks listed on main page). -Posts are available via [RSS](https://fediverse.gitlab.io/atom.xml) subscription. -`Preview` is rendered on Chronicles page (limited ammount), text after metadata is shown in RSS (unlimited). +Posts are available via [RSS](https://fediverse.party/atom.xml) subscription. +`Preview` is rendered on Chronicles page (limited ammount), text after metadata is shown in RSS (unlimited) and on post's page (see [Tags](https://fediverse.party/tags) ). Every post **must have** the following __metadata__: @@ -31,11 +54,11 @@ lang: en ``` `Tags` -A post may have one of these tags: fediverse, gnusocial, diaspora, friendica, hubzilla, mastodon, postactiv, pleroma, socialhome, ganggo, misskey, peertube, aardwolf +A post may have one of these tags: fediverse, gnusocial, diaspora, friendica, hubzilla, mastodon, postactiv, pleroma, socialhome, ganggo, misskey, peertube, osada `Preview` Limit 150 characters - for "regular" and "wanted" posts, limit 350 characters - for "featured" post. -Please, make preview a 150-characters note (350-characters for "featured"), otherwise it gets truncated half-sentence and will be posted that way on the Chronicles front page. Not good. +Please, stay within the limits in preview, otherwise it gets truncated half-sentence and will be posted that way on the Chronicles front page. Not good. __Optional metadata__: @@ -55,19 +78,15 @@ Add this metadata to a new internal website's article, to show the post in a pro `Wanted` and `featured` can't be mixed and are temporary. This metadata must be removed from an older post when creating a new "featured" or "wanted" post. `Banner` -Required for "featured" posts only, an image wide enough to be used as a fullscreen background, should be placed in `/source/_posts/exact-post-file-name` folder. See [example](./source/_posts/why-use-federated-networks). +Required for "featured" posts only, an image wide enough to be used as a fullscreen background, should be placed in `/source/_posts/exact-post-file-name` folder. See [example](https://gitlab.com/fediverse/fediverse.gitlab.io/tree/master/source/_posts/fediverse-saves-from-pickup-artists-and-7-more-reasons-to-join). `Authors` Required for "featured" posts only. Add an array of object(s): name you wish to be shown as the author, and one website link. If it's the link to yout account on Fediverse, specify network name - lower case, without spaces. -### Writing an internal article +### [Writing internal article](Writing-internal-article) -Please, feel free to work on [FAQ](https://fediverse.party/en/post/FAQ-for-newcomers), [why use federated networks](https://fediverse.party/en/post/why-use-federated-networks) stub articles, or submit a piece dedicated to the topic of your own choosing (related to Fediverse social networks). - -Each new internal article will be posted as "featured" in the prominent part of the Chronicles page, and will stay there for a while. It will also be distributed via RSS subscription. Your name and avatar will be featured as the author(s). - -Please, consider submitting an original text that hasn't yet been published elsewhere. If you have a good relevant post on your own blog, submit it as a link addition to any Network page or Fediverse page. It doesn't make much sense to duplicate content. +Each new internal article will be posted as "featured" in the prominent part of the Chronicles page, and will stay there for a while. It will also be distributed via RSS subscription. Your name will be featured as the author(s). A merge request with an article will include all the things mentioned above for a `featured` post: a file placed in `/source/_posts` folder with necessary metadata, a 350-character preview and full text after metadata section, written in markdown. A banner image should be added to `/source/_posts/exact-post-file-name` folder that you'll create. Any other images used in the article may be placed there as well. -**Thanks in advance!** +**Thanks!** diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index 3e20557..60e7720 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -27,45 +27,6 @@ "OStatusClass": false, "categories": ["Media"] }, - { - "title": "Plume", - "source": "github.com/Plume-org/Plume", - "protocols": "ActivityPub", - "site": "", - "logo": "/img/misc/plume.svg", - "servers": "the-federation.info/plume", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["Blog-Pub"] - }, - { - "title": "Write Freely", - "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": "Read.as", - "source": "github.com/writeas/Read.as", - "protocols": "ActivityPub", - "site": "read.as", - "logo": "", - "servers": "the-federation.info/read.as", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["Blog-Pub"] - }, { "title": "Kroeg", "source": "git.puckipedia.com/kroeg", @@ -79,19 +40,6 @@ "OStatusClass": false, "categories": ["SN-mi"] }, - { - "title": "microblog.pub", - "source": "github.com/tsileo/microblog.pub", - "protocols": "ActivityPub", - "site": "", - "logo": "", - "servers": "fediverse.network/microblogpub", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["SN-mi"] - }, { "title": "Rustodon", "source": "github.com/rustodon/rustodon", @@ -106,12 +54,12 @@ "categories": ["SN-mi"] }, { - "title": "dokieli", - "source": "github.com/linkeddata/dokieli", + "title": "Write Freely", + "source": "github.com/writeas/writefreely", "protocols": "ActivityPub", - "site": "dokie.li", - "logo": "", - "servers": "", + "site": "writefreely.org", + "logo": "/img/misc/writefreely.svg", + "servers": "the-federation.info/writefreely", "apClass": true, "zotClass": false, "diasporaClass": false, @@ -119,43 +67,56 @@ "categories": ["Blog-Pub"] }, { - "title": "Prismo", - "source": "gitlab.com/mbajur/prismo", + "title": "Plume", + "source": "github.com/Plume-org/Plume", + "protocols": "ActivityPub", + "site": "", + "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", + "protocols": "ActivityPub", + "site": "read.as", + "logo": "/img/misc/readas.svg", + "servers": "the-federation.info/read.as", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "microblog.pub", + "source": "github.com/tsileo/microblog.pub", "protocols": "ActivityPub", "site": "", "logo": "", - "servers": "", + "servers": "fediverse.network/microblogpub", "apClass": true, "zotClass": false, "diasporaClass": false, "OStatusClass": false, - "categories": ["Links"] + "categories": ["SN-mi"] }, { - "title": "Nextcloud", - "source": "github.com/nextcloud/activity", + "title": "Mobilizon", + "source": "framagit.org/framasoft/mobilizon", "protocols": "ActivityPub", - "site": "nextcloud.com", + "site": "", "logo": "", - "servers": "", + "servers": "the-federation.info/mobilizon", "apClass": true, "zotClass": false, "diasporaClass": false, "OStatusClass": false, - "categories": ["Files-Cal"] - }, - { - "title": "ownCloud", - "source": "github.com/owncloud/activity", - "protocols": "ActivityPub", - "site": "owncloud.org", - "logo": "", - "servers": "", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["Files-Cal"] + "categories": ["Ev-Meet"] }, { "title": "reel2bits", @@ -169,6 +130,214 @@ "diasporaClass": false, "OStatusClass": false, "categories": ["Media"] + }, + { + "title": "CommonsPub", + "source": "gitlab.com/OpenCoop/CommonsPub", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Coop"] + }, + { + "title": "dokieli", + "source": "github.com/linkeddata/dokieli", + "protocols": "ActivityPub", + "site": "dokie.li", + "logo": "/img/misc/dokieli.png", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "FediBlog", + "source": "framagit.org/DavidLibeau/FediBlog", + "protocols": "ActivityPub", + "site": "fedi.blog", + "logo": "/img/misc/fediblog.svg", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "Prismo", + "source": "gitlab.com/mbajur/prismo", + "protocols": "ActivityPub", + "site": "", + "logo": "/img/misc/prismo.png", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Links"] + }, + { + "title": "Littr.go", + "source": "github.com/mariusor/littr.go", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Links"] + }, + { + "title": "ForgeFed", + "source": "github.com/forgefed/forgefed", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["DevTools"] + }, + { + "title": "Anfora", + "source": "github.com/anforaProject/anfora", + "protocols": "ActivityPub", + "site": "", + "logo": "/img/misc/anfora.svg", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "Go-Fed Activity", + "source": "github.com/go-fed/activity", + "protocols": "ActivityPub", + "site": "go-fed.org", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["DevTools"] + }, + { + "title": "Pterotype", + "source": "github.com/pterotype-project/pterotype", + "protocols": "ActivityPub", + "site": "getpterotype.com", + "logo": "/img/misc/pterotype.png", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Plugins"] + }, + { + "title": "BridgyFed", + "source": "github.com/snarfed/bridgy-fed", + "protocols": "ActivityPub, OStatus", + "site": "fed.brid.gy", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": true, + "categories": ["DevTools"] + }, + { + "title": "Federation", + "source": "git.feneas.org/jaywink/federation", + "protocols": "ActivityPub, diaspora", + "site": "federation.readthedocs.io", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": true, + "OStatusClass": false, + "categories": ["DevTools"] + }, + { + "title": "Little Boxes", + "source": "github.com/tsileo/little-boxes", + "protocols": "ActivityPub", + "site": "little-boxes.readthedocs.io", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["DevTools"] + }, + { + "title": "Python ActivityPub", + "source": "github.com/dsblank/activitypub", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["DevTools"] + }, + { + "title": "pubgate", + "source": "github.com/autogestion/pubgate", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["DevTools"] + }, + { + "title": "Nextcloud", + "source": "github.com/nextcloud/activity", + "protocols": "ActivityPub", + "site": "nextcloud.com", + "logo": "/img/misc/nextcloud.png", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Files"] + }, + { + "title": "ownCloud", + "source": "github.com/owncloud/activity", + "protocols": "ActivityPub", + "site": "owncloud.org", + "logo": "/img/misc/owncloud.png", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Files"] } ] } diff --git a/source/en/miscellaneous/index.md b/source/en/miscellaneous/index.md index 2004359..bd36a5e 100644 --- a/source/en/miscellaneous/index.md +++ b/source/en/miscellaneous/index.md @@ -3,5 +3,5 @@ layout: "miscellaneous" title: "" banner: "/img/misc-bg.png" -percent: "45% 60%" +percent: "45% 100%" --- diff --git a/source/img/misc/aardwolf.png b/source/img/misc/aardwolf.png index caebb45..6a18a6f 100644 Binary files a/source/img/misc/aardwolf.png and b/source/img/misc/aardwolf.png differ diff --git a/source/img/misc/anfora.svg b/source/img/misc/anfora.svg new file mode 100644 index 0000000..a50215c --- /dev/null +++ b/source/img/misc/anfora.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/img/misc/dokieli.png b/source/img/misc/dokieli.png new file mode 100644 index 0000000..d3995fd Binary files /dev/null and b/source/img/misc/dokieli.png differ diff --git a/source/img/misc/fediblog.svg b/source/img/misc/fediblog.svg new file mode 100644 index 0000000..7e67769 --- /dev/null +++ b/source/img/misc/fediblog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/img/misc/nextcloud.png b/source/img/misc/nextcloud.png new file mode 100644 index 0000000..106994e Binary files /dev/null and b/source/img/misc/nextcloud.png differ diff --git a/source/img/misc/owncloud.png b/source/img/misc/owncloud.png new file mode 100644 index 0000000..3626641 Binary files /dev/null and b/source/img/misc/owncloud.png differ diff --git a/source/img/misc/prismo.png b/source/img/misc/prismo.png new file mode 100644 index 0000000..236f131 Binary files /dev/null and b/source/img/misc/prismo.png differ diff --git a/source/img/misc/pterotype.png b/source/img/misc/pterotype.png new file mode 100644 index 0000000..2d3fa12 Binary files /dev/null and b/source/img/misc/pterotype.png differ diff --git a/source/img/misc/readas.svg b/source/img/misc/readas.svg new file mode 100644 index 0000000..a257624 --- /dev/null +++ b/source/img/misc/readas.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index 7335082..fe8b37d 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -6,6 +6,7 @@ menu: MENU chronicles: Chronicles knowledge: Knowledge +more: More apps portal: Portal logo: logo hub about: ABOUT diff --git a/themes/starter/layout/_partial/heroheader.ejs b/themes/starter/layout/_partial/heroheader.ejs index 4cc31f8..1a3c552 100644 --- a/themes/starter/layout/_partial/heroheader.ejs +++ b/themes/starter/layout/_partial/heroheader.ejs @@ -1,5 +1,5 @@ -
+

<%= page.title %>

<%= page.subtitle || "" %>

diff --git a/themes/starter/layout/_partial/navbar.ejs b/themes/starter/layout/_partial/navbar.ejs index 6c1cb8b..1b6d3f5 100644 --- a/themes/starter/layout/_partial/navbar.ejs +++ b/themes/starter/layout/_partial/navbar.ejs @@ -20,6 +20,7 @@
  • Fediverse
  • <%- __('chronicles') %>
  • <%- __('knowledge') %>
  • +
  • <%- __('more') %>
  • <%- __('portal') %>
  • diff --git a/themes/starter/layout/miscellaneous.ejs b/themes/starter/layout/miscellaneous.ejs index c9d310d..88284cd 100644 --- a/themes/starter/layout/miscellaneous.ejs +++ b/themes/starter/layout/miscellaneous.ejs @@ -17,15 +17,17 @@ layout: layout

    OStatus


    -

    Social network (macro)

    -

    Social network (micro)

    -

    Blog & Publishing

    -

    Media sharing (audio, images)

    -

    Link sharing

    -

    Events & meetups

    -

    File hosting & Calendar

    -

    Developer Tools

    -

    Plugins

    +

    Social network (macro)

    +

    Social network (micro)

    +

    Blog & Publishing

    +

    Media sharing (audio, images)

    +

    Link sharing

    +

    Events & meetups

    +

    File hosting

    +

    Economic activities

    +

    Cooperatives & shared

    +

    Developer Tools

    +

    Plugins

    <% for (item in apps) { %> @@ -55,4 +57,8 @@ layout: layout
    <% } %> +

    Something's missing? Add it.

    +

    Software no longer maintained, renamed, broken link? Please, let us know.

    +

    Special thanks to @strypey - for curating this list.

    +

    Other sources: spreadsheet by @mayel, implementation report on activitypub.rocks website.

    diff --git a/themes/starter/source/assets/scss/modules/_misc.scss b/themes/starter/source/assets/scss/modules/_misc.scss index a7b5f2b..57403e6 100644 --- a/themes/starter/source/assets/scss/modules/_misc.scss +++ b/themes/starter/source/assets/scss/modules/_misc.scss @@ -1,16 +1,14 @@ .miscellaneous .hero-header { - height: 420px; + height: 100%; + max-height: 350px; box-shadow: 1px 1px 4px 2px $black; } .misc { background: $asphalt; color: $white; -} - -.misc a { - border: 0; + min-height: 90%; } .misc svg { @@ -35,11 +33,11 @@ } .misc input { - vertical-align: sub; - margin: 0 1.2em 0 .4em; + vertical-align: middle; + margin: 0 1em 0 .2em; } -.misc p:nth-of-type(n+5):nth-of-type(-n+13) { +.misc p:nth-of-type(n+5):nth-of-type(-n+15) { color: $white; } @@ -50,6 +48,10 @@ margin: 1.2em 0; } +.misc__grid a { + border: 0; +} + .misc__grid .card { background-color: $white; color: $black; @@ -101,54 +103,20 @@ display: inline-block; } -.option + #sortAP:checked ~ .misc__grid .card:not(.ap) { - display: none; -} - -.option + #sortZot:checked ~ .misc__grid .card:not(.zot) { - display: none; -} - -.option + #sortDiaspora:checked ~ .misc__grid .card:not(.dia) { - display: none; -} - -.option + #sortOstatus:checked ~ .misc__grid .card:not(.os) { - display: none; -} - -.option + #snMacro:checked ~ .misc__grid .card:not(.SN-ma) { - display: none; -} - -.option + #snMicro:checked ~ .misc__grid .card:not(.SN-mi) { - display: none; -} - -.option + #blogPub:checked ~ .misc__grid .card:not(.Blog-Pub) { - display: none; -} - -.option + #media:checked ~ .misc__grid .card:not(.Media) { - display: none; -} - -.option + #links:checked ~ .misc__grid .card:not(.Links) { - display: none; -} - -.option + #evMeet:checked ~ .misc__grid .card:not(.Ev-Meet) { - display: none; -} - -.option + #files:checked ~ .misc__grid .card:not(.Files-Cal) { - display: none; -} - -.option + #dev:checked ~ .misc__grid .card:not(.Devtools) { - display: none; -} - +.option + #sortAP:checked ~ .misc__grid .card:not(.ap), +.option + #sortZot:checked ~ .misc__grid .card:not(.zot), +.option + #sortDiaspora:checked ~ .misc__grid .card:not(.dia), +.option + #sortOstatus:checked ~ .misc__grid .card:not(.os), +.option + #snMacro:checked ~ .misc__grid .card:not(.SN-ma), +.option + #snMicro:checked ~ .misc__grid .card:not(.SN-mi), +.option + #blogPub:checked ~ .misc__grid .card:not(.Blog-Pub), +.option + #media:checked ~ .misc__grid .card:not(.Media), +.option + #links:checked ~ .misc__grid .card:not(.Links), +.option + #evMeet:checked ~ .misc__grid .card:not(.Ev-Meet), +.option + #files:checked ~ .misc__grid .card:not(.Files), +.option + #dev:checked ~ .misc__grid .card:not(.DevTools), +.option + #econ:checked ~ .misc__grid .card:not(.Econ), +.option + #coop:checked ~ .misc__grid .card:not(.Coop), .option + #plugins:checked ~ .misc__grid .card:not(.Plugins) { display: none; } diff --git a/themes/starter/source/assets/scss/partials/_layout.scss b/themes/starter/source/assets/scss/partials/_layout.scss index d2fbb47..4e381c2 100644 --- a/themes/starter/source/assets/scss/partials/_layout.scss +++ b/themes/starter/source/assets/scss/partials/_layout.scss @@ -64,6 +64,17 @@ a { } } +a.dark-ui { + color: $white; + border-bottom: 1px solid $white; + &:hover, + &:focus, + &:active { + color: $golden; + outline: none; + } +} + small { font-size: .85rem; } @@ -141,7 +152,7 @@ dfn { .container-wrapper { height: inherit; width: inherit; - overflow: scroll; + overflow-y: scroll; } .container {