diff --git a/source/_data/common.json b/source/_data/common.json index 4c8f1f4..c9af0b7 100644 --- a/source/_data/common.json +++ b/source/_data/common.json @@ -67,6 +67,12 @@ "url" : "https://socialhome.network", "smallImg": "/img/socialhome.png", "descr": "Personal webpage with social networking functionality, suitable for image based content" + }, + { + "title": "PixelFed", + "url" : "https://pixelfed.org", + "smallImg": "/img/pixelfed.png", + "descr": "Federated social image sharing for everyone" } ], "protocols": @@ -96,7 +102,7 @@ [ { "name": "PHP", - "networks": "Friendica, GNU Social, Social, Hubzilla, Osada, Pixelfed, postActiv" + "networks": "Friendica, GNU Social, Social, Hubzilla, Osada, PixelFed, postActiv" }, { "name": "Ruby", diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index 2266cfc..db3fbf0 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -27,19 +27,6 @@ "OStatusClass": false, "categories": ["SN-ma"] }, - { - "title": "Pixelfed", - "source": "github.com/dansup/pixelfed", - "protocols": "ActivityPub", - "site": "pixelfed.org", - "logo": "/img/misc/pixelfed.svg", - "servers": "the-federation.info/pixelfed", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["Media", "SN-mi"] - }, { "title": "Funkwhale", "source": "code.eliotberriot.com/funkwhale/funkwhale", diff --git a/source/_data/numbers.json b/source/_data/numbers.json index a53bfd0..9a63461 100644 --- a/source/_data/numbers.json +++ b/source/_data/numbers.json @@ -68,6 +68,12 @@ "population": "107", "activeUsers": "107", "podsNum": "4" + }, + "pixelfed": + { + "population": "5.054", + "activeUsers": "2.800", + "podsNum": "21" } } } diff --git a/source/_data/pixelfed.json b/source/_data/pixelfed.json new file mode 100644 index 0000000..0a94787 --- /dev/null +++ b/source/_data/pixelfed.json @@ -0,0 +1,38 @@ + +{ + "data": + { + "title": "pixelfed", + "category": "social network", + "type": "image sharing, microblogging", + "logoClr": "6736dd", + "created": "2018", + "official": "https://pixelfed.org", + "license": "AGPL-3.0", + "repo": "https://github.com/dansup/pixelfed", + "language": "PHP", + "protocols": + [ + {"title": "ActivityPub", "url": "https://activitypub.rocks"} + ], + "wiki": "", + "servers": + [ + {"num": "1", "url": "https://the-federation.info/pixelfed"}, + {"num": "2", "url": "https://fediverse.network/pixelfed"} + ], + "mobile": "https://github.com/glitchpizza/morii", + "devTutorials": "https://github.com/pixelfed/pixelfed#installation", + "mascot": [{"item": "?"}], + "dwellers": "", + "communities": "", + "descr": "Pixelfed is an image sharing platform with modern user interface.", + "connections": ["Mastodon", "Pleroma"], + "donate": "https://www.patreon.com/dansup", + "tracker": "https://github.com/dansup/pixelfed/issues", + "bounty": "", + "translating": "", + "reading": "", + "notable": "" + } +} diff --git a/source/en/ganggo/index.md b/source/en/ganggo/index.md index 3c80fa5..2aee58a 100644 --- a/source/en/ganggo/index.md +++ b/source/en/ganggo/index.md @@ -1,6 +1,6 @@ --- -layout: "ganggo" +layout: "generic" title: "GangGo" network: "ganggo" subtitle: "social network written in GoLang" diff --git a/source/en/misskey/index.md b/source/en/misskey/index.md index 2f56eca..71c5911 100644 --- a/source/en/misskey/index.md +++ b/source/en/misskey/index.md @@ -1,6 +1,6 @@ --- -layout: "misskey" +layout: "generic" title: "Misskey" network: "misskey" subtitle: "sophisticated micro blogging" diff --git a/source/en/osada/index.md b/source/en/osada/index.md index 56a918c..5a9fa11 100644 --- a/source/en/osada/index.md +++ b/source/en/osada/index.md @@ -1,6 +1,6 @@ --- -layout: "osada" +layout: "generic" title: "Osada" network: "osada" subtitle: "powered by hyper-drive social engine" diff --git a/source/en/peertube/index.md b/source/en/peertube/index.md index c7ec4c4..1697845 100644 --- a/source/en/peertube/index.md +++ b/source/en/peertube/index.md @@ -1,6 +1,6 @@ --- -layout: "peertube" +layout: "generic" title: "PeerTube" network: "peertube" subtitle: "Take back the control of your videos" diff --git a/source/en/pixelfed/index.md b/source/en/pixelfed/index.md new file mode 100644 index 0000000..621e22b --- /dev/null +++ b/source/en/pixelfed/index.md @@ -0,0 +1,9 @@ + +--- +layout: "generic" +title: "PixelFed" +network: "pixelfed" +subtitle: "federated image sharing platform" +banner: "/img/pixelfed-bg.jpg" +percent: "0% 0%" +--- diff --git a/source/en/socialhome/index.md b/source/en/socialhome/index.md index 2e8e55c..1b70bac 100644 --- a/source/en/socialhome/index.md +++ b/source/en/socialhome/index.md @@ -1,6 +1,6 @@ --- -layout: "socialhome" +layout: "generic" title: "Socialhome" network: "socialhome" subtitle: "personal webpage with social networking functionality" diff --git a/source/img/pixelfed-bg.jpg b/source/img/pixelfed-bg.jpg new file mode 100644 index 0000000..3650a84 Binary files /dev/null and b/source/img/pixelfed-bg.jpg differ diff --git a/source/img/pixelfed.png b/source/img/pixelfed.png new file mode 100644 index 0000000..41fe5e7 Binary files /dev/null and b/source/img/pixelfed.png differ diff --git a/themes/starter/layout/_partial/svgfont.ejs b/themes/starter/layout/_partial/svgfont.ejs index d6b2443..684b741 100644 --- a/themes/starter/layout/_partial/svgfont.ejs +++ b/themes/starter/layout/_partial/svgfont.ejs @@ -74,4 +74,8 @@ + + + + diff --git a/themes/starter/layout/generic.ejs b/themes/starter/layout/generic.ejs new file mode 100644 index 0000000..b371f4e --- /dev/null +++ b/themes/starter/layout/generic.ejs @@ -0,0 +1,22 @@ + +--- +layout: layout +--- + +<% + const url = getPath(); + const data = site.data[url].data; + const file = '_partial/networks/' + url; +%> + +<%- partial('_partial/heroheader') %> +
+ <%- partial('_partial/header') %> +
+ <%- partial('_partial/generalinfo') %> +
+ <%- partial('_partial/world') %> +
+ <%- partial('_partial/contributing') %> + <%- partial('_partial/buttons') %> +
diff --git a/themes/starter/scripts/hexo-helpers.js b/themes/starter/scripts/hexo-helpers.js index c1025fe..1b97df5 100644 --- a/themes/starter/scripts/hexo-helpers.js +++ b/themes/starter/scripts/hexo-helpers.js @@ -3,6 +3,7 @@ hexo.extend.helper.register('is_root', isRoot); hexo.extend.helper.register('get_langs', getLangs); hexo.extend.helper.register('switch_lang', switchLang); +hexo.extend.helper.register('getPath', getPath); function isRoot() { return this.page.path === 'index.html'; @@ -22,3 +23,10 @@ function switchLang(lang) { } return ''; } + +function getPath() { + const url = this.page.path; + const filename = url.substr(3); + const splitPath = filename.split("/"); + return splitPath[0]; +} diff --git a/themes/starter/source/assets/scss/modules/_chronicles.scss b/themes/starter/source/assets/scss/modules/_chronicles.scss index 07b3fc7..9242a0a 100644 --- a/themes/starter/source/assets/scss/modules/_chronicles.scss +++ b/themes/starter/source/assets/scss/modules/_chronicles.scss @@ -184,7 +184,8 @@ $taglist: (diaspora, $diaspora), (postactiv, $postactiv), (peertube, $peertube), (misskey, $misskey), - (osada, $osada); + (osada, $osada), + (pixelfed, $pixelfed); @each $tag, $color in $taglist { svg.#{$tag} { diff --git a/themes/starter/source/assets/scss/modules/_index.scss b/themes/starter/source/assets/scss/modules/_index.scss index 20e9535..6197e3b 100644 --- a/themes/starter/source/assets/scss/modules/_index.scss +++ b/themes/starter/source/assets/scss/modules/_index.scss @@ -119,6 +119,11 @@ left: 90%; } +.f-PixelFed { + top: 74%; + left: 7%; +} + .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 5210836..c092733 100644 --- a/themes/starter/source/assets/scss/partials/_colors.scss +++ b/themes/starter/source/assets/scss/partials/_colors.scss @@ -21,3 +21,4 @@ $aardwolf: #46332d; $peertube: #f1680d; $misskey: #db3f86; $osada: #008000; +$pixelfed: #6736dd;