From 220d3cfc1fe2df52adb72bcb8c58394b2acc533e Mon Sep 17 00:00:00 2001 From: Stephen L Date: Wed, 2 Jun 2021 18:46:01 +0200 Subject: [PATCH 1/2] rename Video Platforms into Video/Audio Platforms + add Funkwhale (recommendation) + clean up and add dark mode images for Peertube and Invidious Signed-off-by: Stephen L. --- _includes/nav.html | 2 +- _includes/sections/decentralized-video.html | 14 ----------- _includes/sections/video-audio-providers.html | 25 +++++++++++++++++++ _includes/sections/video-frontends.html | 1 + assets/img/svg/3rd-party/funkwhale-dark.svg | 19 ++++++++++++++ assets/img/svg/3rd-party/funkwhale.svg | 19 ++++++++++++++ assets/img/svg/3rd-party/invidious-dark.svg | 2 ++ assets/img/svg/3rd-party/invidious.svg | 3 ++- assets/img/svg/3rd-party/peertube-dark.svg | 2 ++ assets/img/svg/3rd-party/peertube.svg | 3 ++- pages/old.html | 2 +- pages/providers/video-audio.html | 10 ++++++++ pages/providers/video.html | 10 -------- 13 files changed, 84 insertions(+), 28 deletions(-) delete mode 100644 _includes/sections/decentralized-video.html create mode 100644 _includes/sections/video-audio-providers.html create mode 100644 assets/img/svg/3rd-party/funkwhale-dark.svg create mode 100644 assets/img/svg/3rd-party/funkwhale.svg create mode 100644 assets/img/svg/3rd-party/invidious-dark.svg create mode 100644 assets/img/svg/3rd-party/peertube-dark.svg create mode 100644 pages/providers/video-audio.html delete mode 100644 pages/providers/video.html diff --git a/_includes/nav.html b/_includes/nav.html index 129f4fe4..7df99eb3 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -32,7 +32,7 @@ Search Engines Social Networks Social News Aggregators - Video Platforms + Video/Audio Platforms VPN diff --git a/_includes/sections/decentralized-video.html b/_includes/sections/decentralized-video.html deleted file mode 100644 index 6893b395..00000000 --- a/_includes/sections/decentralized-video.html +++ /dev/null @@ -1,14 +0,0 @@ -

Decentralized Video Platforms

- - - -{% include cardv2.html - title="PeerTube" - image="/assets/img/svg/3rd-party/peertube.svg" - description='PeerTube, developed by Framasoft, is a free and decentralized alternative to video platforms, with over 400,000 videos published by over 50,000 users and viewed over 10 million times. If you are looking for a server to join, you are welcome to join our hosted instance: tube.privacytools.io' - website="https://joinpeertube.org" - github="https://github.com/Chocobozzz/PeerTube" - web="https://joinpeertube.org/#what-is-peertube" -%} diff --git a/_includes/sections/video-audio-providers.html b/_includes/sections/video-audio-providers.html new file mode 100644 index 00000000..15eca7c2 --- /dev/null +++ b/_includes/sections/video-audio-providers.html @@ -0,0 +1,25 @@ +

Decentralized Video/Audio Platforms

+ + + +{% include cardv2.html + title="PeerTube" + image="/assets/img/svg/3rd-party/peertube.svg" + image-dark="/assets/img/svg/3rd-party/peertube-dark.svg" + description='PeerTube, developed by Framasoft, is a free and decentralized alternative to video platforms, with over 400,000 videos published by over 50,000 users and viewed over 10 million times. If you are looking for a server to join, you are welcome to join our hosted instance: tube.privacytools.io' + website="https://joinpeertube.org" + github="https://github.com/Chocobozzz/PeerTube" + web="https://joinpeertube.org/#what-is-peertube" +%} + +{% include cardv2.html + title="Funkwhale" + image="/assets/img/svg/3rd-party/funkwhale.svg" + image-dark="/assets/img/svg/3rd-party/funkwhale-dark.svg" + description='Funkwhale is a decentralized federated audio sharing and social platform.' + website="https://funkwhale.audio/" + gitlab="https://dev.funkwhale.audio/funkwhale" + web="https://funkwhale.audio/#get-started" +%} diff --git a/_includes/sections/video-frontends.html b/_includes/sections/video-frontends.html index c2d94c45..232ef8ce 100644 --- a/_includes/sections/video-frontends.html +++ b/_includes/sections/video-frontends.html @@ -7,6 +7,7 @@ {% include cardv2.html title="Invidious" image="/assets/img/svg/3rd-party/invidious.svg" + image-dark="/assets/img/svg/3rd-party/invidious-dark.svg" description='Invidious is an alternative front-end to YouTube. It is free software, with no advertising or Javascript dependency to play videos, with lots of other features that allow you to have a complete YouTube experience, sans Google.' labels="color==warning::icon==fas fa-exclamation-triangle::link==https://github.com/iv-org/documentation/blob/master/Always-use-%22local%22-to-proxy-video-through-the-server-without-creating-an-account.md::text==Warning::tooltip==By default, Invidious will not proxy videos through the instance's proxy." website="https://invidio.us" diff --git a/assets/img/svg/3rd-party/funkwhale-dark.svg b/assets/img/svg/3rd-party/funkwhale-dark.svg new file mode 100644 index 00000000..5e1dafa6 --- /dev/null +++ b/assets/img/svg/3rd-party/funkwhale-dark.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/assets/img/svg/3rd-party/funkwhale.svg b/assets/img/svg/3rd-party/funkwhale.svg new file mode 100644 index 00000000..1a218ee0 --- /dev/null +++ b/assets/img/svg/3rd-party/funkwhale.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/assets/img/svg/3rd-party/invidious-dark.svg b/assets/img/svg/3rd-party/invidious-dark.svg new file mode 100644 index 00000000..507aabbd --- /dev/null +++ b/assets/img/svg/3rd-party/invidious-dark.svg @@ -0,0 +1,2 @@ + + diff --git a/assets/img/svg/3rd-party/invidious.svg b/assets/img/svg/3rd-party/invidious.svg index 1e1c6d2d..a6c1d6ee 100644 --- a/assets/img/svg/3rd-party/invidious.svg +++ b/assets/img/svg/3rd-party/invidious.svg @@ -1 +1,2 @@ - \ No newline at end of file + + diff --git a/assets/img/svg/3rd-party/peertube-dark.svg b/assets/img/svg/3rd-party/peertube-dark.svg new file mode 100644 index 00000000..9c2f1ebe --- /dev/null +++ b/assets/img/svg/3rd-party/peertube-dark.svg @@ -0,0 +1,2 @@ + + diff --git a/assets/img/svg/3rd-party/peertube.svg b/assets/img/svg/3rd-party/peertube.svg index b749f75f..09be252b 100644 --- a/assets/img/svg/3rd-party/peertube.svg +++ b/assets/img/svg/3rd-party/peertube.svg @@ -1 +1,2 @@ - \ No newline at end of file + + diff --git a/pages/old.html b/pages/old.html index 646299fe..dca1ad17 100644 --- a/pages/old.html +++ b/pages/old.html @@ -63,7 +63,7 @@ permalink: /classic/ {% include sections/social-news-aggregator.html %} -{% include sections/decentralized-video.html %} +{% include sections/video-audio-providers.html %} {% include sections/video-frontends.html %} diff --git a/pages/providers/video-audio.html b/pages/providers/video-audio.html new file mode 100644 index 00000000..74d25fa4 --- /dev/null +++ b/pages/providers/video-audio.html @@ -0,0 +1,10 @@ +--- +layout: page +permalink: /providers/video-audio/ +title: "Video/Audio Platforms" +description: "Find a platform to watch and host audios and videos that doesn't pry into your data or monetize your profile." +--- + +{% include sections/video-audio-providers.html %} + +{% include sections/video-frontends.html %} diff --git a/pages/providers/video.html b/pages/providers/video.html deleted file mode 100644 index 21fb82c5..00000000 --- a/pages/providers/video.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: page -permalink: /providers/video/ -title: "Video Platforms" -description: "Find a platform to watch and host videos that doesn't pry into your data or monetize your profile." ---- - -{% include sections/decentralized-video.html %} - -{% include sections/video-frontends.html %} -- 2.47.2 From 081e39075a18fe103b34ba83addaf1e7bbd63bfd Mon Sep 17 00:00:00 2001 From: Stephen L Date: Wed, 2 Jun 2021 19:24:28 +0200 Subject: [PATCH 2/2] Add note that content creators cannot be anonymous with currently listed decentralized video/audio platforms Signed-off-by: Stephen L. --- _includes/sections/video-audio-providers.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/sections/video-audio-providers.html b/_includes/sections/video-audio-providers.html index 15eca7c2..20470f0c 100644 --- a/_includes/sections/video-audio-providers.html +++ b/_includes/sections/video-audio-providers.html @@ -4,6 +4,8 @@ If you are currently using a platform like YouTube, Vimeo or SoundCloud, you should pick an alternative here. +

Note that content creators can not be anonymous with these platforms since the content is shared from peer-to-peer, directly from the content creator's device to the viewers.

+ {% include cardv2.html title="PeerTube" image="/assets/img/svg/3rd-party/peertube.svg" -- 2.47.2