diff --git a/_includes/nav.html b/_includes/nav.html index 129f4fe497..7df99eb370 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 6893b3951d..0000000000 --- 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 0000000000..20470f0c4f --- /dev/null +++ b/_includes/sections/video-audio-providers.html @@ -0,0 +1,27 @@ +

Decentralized Video/Audio Platforms

+ + + +

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" + 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 c2d94c4555..232ef8cea5 100644 --- a/_includes/sections/video-frontends.html +++ b/_includes/sections/video-frontends.html @@ -7,6 +7,7 @@

+ + + + + + + + + + + + + + diff --git a/assets/img/svg/3rd-party/funkwhale.svg b/assets/img/svg/3rd-party/funkwhale.svg new file mode 100644 index 0000000000..1a218ee0ed --- /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 0000000000..507aabbd62 --- /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 1e1c6d2d4e..a6c1d6eec3 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 0000000000..9c2f1ebe85 --- /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 b749f75fe1..09be252b00 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 646299fe62..dca1ad1740 100644 --- a/pages/old.html +++ b/pages/old.html @@ -63,7 +63,7 @@ {% 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 0000000000..74d25fa4bd --- /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 21fb82c5e2..0000000000 --- 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 %}