From 1229aba69de4a167a851a1d8fb6e3f1f205bcb5b Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Thu, 2 Jul 2020 22:29:44 -0500 Subject: [PATCH 1/7] Add video hosting platforms --- _includes/nav.html | 1 + _includes/sections/decentralized-video.html | 14 ++++++++++++++ assets/img/svg/3rd-party/peertube.svg | 1 + pages/providers/video-hosting.html | 8 ++++++++ 4 files changed, 24 insertions(+) create mode 100644 _includes/sections/decentralized-video.html create mode 100644 assets/img/svg/3rd-party/peertube.svg create mode 100644 pages/providers/video-hosting.html diff --git a/_includes/nav.html b/_includes/nav.html index a649fe92..b4160482 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -32,6 +32,7 @@ Search Engines Social Networks Social News Aggregators + Video Hosting VPN diff --git a/_includes/sections/decentralized-video.html b/_includes/sections/decentralized-video.html new file mode 100644 index 00000000..7d95cfc8 --- /dev/null +++ b/_includes/sections/decentralized-video.html @@ -0,0 +1,14 @@ +

Decentralized Video Platforms

+ + + +{% include cardv2.html + title="PeerTube" + image="/assets/img/svg/3rd-party/mastodon.svg" + description='PeerTube, developed by Framasoft, is the free and decentralized alternative to video platforms, providing you over 200,000 videos published by 30,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/assets/img/svg/3rd-party/peertube.svg b/assets/img/svg/3rd-party/peertube.svg new file mode 100644 index 00000000..b749f75f --- /dev/null +++ b/assets/img/svg/3rd-party/peertube.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pages/providers/video-hosting.html b/pages/providers/video-hosting.html new file mode 100644 index 00000000..058ca198 --- /dev/null +++ b/pages/providers/video-hosting.html @@ -0,0 +1,8 @@ +--- +layout: page +permalink: /providers/video/ +title: "Video Hosting" +description: "Find a video platform that doesn't pry into your data or monetize your profile." +--- + +{% include sections/decentralized-video.html %} -- 2.47.2 From cdf77d242fba789c876153c7313dcb9f51915c0d Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Thu, 2 Jul 2020 22:30:46 -0500 Subject: [PATCH 2/7] Add tube.privacytools.io --- pages/services.html | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/services.html b/pages/services.html index 4669ea64..dff496ad 100644 --- a/pages/services.html +++ b/pages/services.html @@ -13,6 +13,7 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
  • Mastodon - Tracker Free Social Networking at social.privacytools.io
  • Matrix - Federated private chat at chat.privacytools.io
  • Discourse - Forum at forum.privacytools.io
    • +
  • PeerTube - Decentralized Video at tube.privacytools.io
  • Write Freely - Federated minimalist blog at write.privacytools.io
  • PrivateBin - Encrypted Pastebin at bin.privacytools.io
    • -- 2.47.2 From 3950e393e6e4095c5f19ddce9cde15549e449b57 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 3 Jul 2020 12:09:12 -0500 Subject: [PATCH 3/7] Add LBRY, Invidio.us --- _includes/sections/decentralized-video.html | 16 +++++++++++++++- _includes/sections/video-frontends.html | 14 ++++++++++++++ assets/img/svg/3rd-party/invidious.svg | 1 + assets/img/svg/3rd-party/lbrytv.svg | 1 + pages/providers/video-hosting.html | 2 ++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 _includes/sections/video-frontends.html create mode 100644 assets/img/svg/3rd-party/invidious.svg create mode 100644 assets/img/svg/3rd-party/lbrytv.svg diff --git a/_includes/sections/decentralized-video.html b/_includes/sections/decentralized-video.html index 7d95cfc8..f1fa6370 100644 --- a/_includes/sections/decentralized-video.html +++ b/_includes/sections/decentralized-video.html @@ -6,9 +6,23 @@ {% include cardv2.html title="PeerTube" - image="/assets/img/svg/3rd-party/mastodon.svg" + image="/assets/img/svg/3rd-party/peertube.svg" description='PeerTube, developed by Framasoft, is the free and decentralized alternative to video platforms, providing you over 200,000 videos published by 30,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="LBRY" + image="/assets/img/svg/3rd-party/lbrytv.svg" + description='LBRY is a Blockchain-based open and community run digital marketplace for content creators and audiences. LBRY\'s goal is to allow "publishers and their fans to interact directly without the risk of demonetization or other meddling."' + website="https://lbry.com" + privacy-policy="https://lbry.com/privacypolicy" + windows="https://lbry.com/get" + mac="https://lbry.com/get" + linux="https://lbry.com/get" + web="https://lbry.tv" + googleplay="https://play.google.com/store/apps/details?id=io.lbry.browser" + github="https://github.com/lbryio" +%} diff --git a/_includes/sections/video-frontends.html b/_includes/sections/video-frontends.html new file mode 100644 index 00000000..227ebf83 --- /dev/null +++ b/_includes/sections/video-frontends.html @@ -0,0 +1,14 @@ +

    Frontends and Proxies

    + + + +{% include cardv2.html + title="Invidious" + image="/assets/img/svg/3rd-party/invidious.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.' + website="https://invidio.us" + github="https://github.com/omarroth/invidious" + web="https://instances.invidio.us" +%} diff --git a/assets/img/svg/3rd-party/invidious.svg b/assets/img/svg/3rd-party/invidious.svg new file mode 100644 index 00000000..1e1c6d2d --- /dev/null +++ b/assets/img/svg/3rd-party/invidious.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/img/svg/3rd-party/lbrytv.svg b/assets/img/svg/3rd-party/lbrytv.svg new file mode 100644 index 00000000..5e10da6e --- /dev/null +++ b/assets/img/svg/3rd-party/lbrytv.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pages/providers/video-hosting.html b/pages/providers/video-hosting.html index 058ca198..d2607683 100644 --- a/pages/providers/video-hosting.html +++ b/pages/providers/video-hosting.html @@ -6,3 +6,5 @@ description: "Find a video platform that doesn't pry into your data or monetize --- {% include sections/decentralized-video.html %} + +{% include sections/video-frontends.html %} -- 2.47.2 From cdb8d44a00bdf2aae889edf77a41768ad7f2fd82 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sun, 5 Jul 2020 12:15:13 -0500 Subject: [PATCH 4/7] Update page --- _includes/nav.html | 2 +- pages/old.html | 4 ++++ pages/providers/{video-hosting.html => video.html} | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) rename pages/providers/{video-hosting.html => video.html} (50%) diff --git a/_includes/nav.html b/_includes/nav.html index b4160482..35581edf 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -32,7 +32,7 @@ Search Engines Social Networks Social News Aggregators - Video Hosting + Video Platforms VPN diff --git a/pages/old.html b/pages/old.html index c7149c09..d2df5fd8 100644 --- a/pages/old.html +++ b/pages/old.html @@ -63,6 +63,10 @@ permalink: /classic/ {% include sections/social-news-aggregator.html %} +{% include sections/decentralized-video.html %} + +{% include sections/video-frontends.html %} + {% include sections/dns.html %} {% include sections/notebooks.html %} diff --git a/pages/providers/video-hosting.html b/pages/providers/video.html similarity index 50% rename from pages/providers/video-hosting.html rename to pages/providers/video.html index d2607683..21fb82c5 100644 --- a/pages/providers/video-hosting.html +++ b/pages/providers/video.html @@ -1,8 +1,8 @@ --- layout: page permalink: /providers/video/ -title: "Video Hosting" -description: "Find a video platform that doesn't pry into your data or monetize your profile." +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 %} -- 2.47.2 From fe465671279a150ac59cfaed56d2f6661480684d Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sun, 5 Jul 2020 12:15:22 -0500 Subject: [PATCH 5/7] Save LBRY for another issue --- _includes/sections/decentralized-video.html | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/_includes/sections/decentralized-video.html b/_includes/sections/decentralized-video.html index f1fa6370..4cd9d1da 100644 --- a/_includes/sections/decentralized-video.html +++ b/_includes/sections/decentralized-video.html @@ -7,22 +7,8 @@ {% include cardv2.html title="PeerTube" image="/assets/img/svg/3rd-party/peertube.svg" - description='PeerTube, developed by Framasoft, is the free and decentralized alternative to video platforms, providing you over 200,000 videos published by 30,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' + 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="LBRY" - image="/assets/img/svg/3rd-party/lbrytv.svg" - description='LBRY is a Blockchain-based open and community run digital marketplace for content creators and audiences. LBRY\'s goal is to allow "publishers and their fans to interact directly without the risk of demonetization or other meddling."' - website="https://lbry.com" - privacy-policy="https://lbry.com/privacypolicy" - windows="https://lbry.com/get" - mac="https://lbry.com/get" - linux="https://lbry.com/get" - web="https://lbry.tv" - googleplay="https://play.google.com/store/apps/details?id=io.lbry.browser" - github="https://github.com/lbryio" -%} -- 2.47.2 From 5d1d991ade879941a0a2fee767037c1b551e5a19 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sun, 12 Jul 2020 20:25:06 -0500 Subject: [PATCH 6/7] Fix FontAwesome Icon --- _includes/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index 35581edf..08d2e62b 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -32,7 +32,7 @@ Search Engines Social Networks Social News Aggregators - Video Platforms + Video Platforms VPN -- 2.47.2 From 6ed6e28cd2308b656d81081ccb7ffbac32967d2a Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sun, 12 Jul 2020 20:30:36 -0500 Subject: [PATCH 7/7] Fix Anchors --- _includes/sections/decentralized-video.html | 2 +- _includes/sections/video-frontends.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sections/decentralized-video.html b/_includes/sections/decentralized-video.html index 4cd9d1da..6893b395 100644 --- a/_includes/sections/decentralized-video.html +++ b/_includes/sections/decentralized-video.html @@ -1,4 +1,4 @@ -

    Decentralized Video Platforms

    +

    Decentralized Video Platforms