Merge pull request #167 from MichalSvatos/feature/knowledgebase-tweaks

Knowledgebase design tweaks + fixes

_data/_en/knowledgebase-text.yml

@@ -34,6 +34,8 @@ labels:
   android: "Android"
   ios: "iOS"
   desktop: "Desktop"
-  official: "Official web"
+  web: "Official web"
   youtube: "YouTube channel"
+  github: "Github"
+  fdroid: "F-droid"
 related: "May come in handy"

_data/_en/knowledgebase/external-resources/creators.yml

@@ -4,7 +4,8 @@
 #     - desc (string)
 #     - tags (array of strings):        contains misc info, eg. rendering engine, FOSS or proprietary, etc.
 #     - affil (string, optional):       affiliate link
-#     - labels:                         links to the official web (official) and different versions of the software (desktop, android, ios);
+#     - labels:                         links to the official web (web), YouTube channel (youtube)
+#                                       or anything for which there is an icon in `assets/icons/` (eg. github);
 #                                       see "_data/_en/content.yml --> resources --> knowledgebase --> labels"
 #     - color (string, optional):       color of the icon background (preferably in HEX format - #BADA55)
 #     - favorite (boolean, optional):   marks a favorite and show a "star" icon next to the name
@@ -14,14 +15,14 @@
 #
 #     - title (string)
 #     - url (string)
-#     - type (string): show the corresponding icon in front of the title (web, video, youtube)
+#     - type (string): show the corresponding icon in front of the title (eg. web, video, github); any icon from the `assets/icons/` folder
 #
 order: 3
 data:
   -
     name: "Surveillance Report"
     labels:
-      official: "https://surveillancereport.tech/"
+      web: "https://surveillancereport.tech/"
     color: "#323377"
   -
     name: "The Linux Experiment"
@@ -31,12 +32,12 @@ data:
   -
     name: "Firewalls Don't Stop Dragons"
     labels:
-      official: "https://firewallsdontstopdragons.com/"
+      web: "https://firewallsdontstopdragons.com/"
     color: "#111111"
   -
     name: "Opt Out"
     labels:
-      official: "https://www.optoutpod.com/"
+      web: "https://www.optoutpod.com/"
     color: "#DD4345"
   -
     name: "Naomi Brockwell"

_data/_en/knowledgebase/external-resources/digital-rights.yml

@@ -4,7 +4,8 @@
 #     - desc (string)
 #     - tags (array of strings):        contains misc info, eg. rendering engine, FOSS or proprietary, etc.
 #     - affil (string, optional):       affiliate link
-#     - labels:                         links to the official web (official) and different versions of the software (desktop, android, ios);
+#     - labels:                         links to the official web (web), YouTube channel (youtube)
+#                                       or anything for which there is an icon in `assets/icons/` (eg. github);
 #                                       see "_data/_en/content.yml --> resources --> knowledgebase --> labels"
 #     - color (string, optional):       color of the icon background (preferably in HEX format - #BADA55)
 #     - favorite (boolean, optional):   marks a favorite and show a "star" icon next to the name
@@ -14,37 +15,37 @@
 #
 #     - title (string)
 #     - url (string)
-#     - type (string): show the corresponding icon in front of the title (web, video, youtube)
+#     - type (string): show the corresponding icon in front of the title (eg. web, video, github); any icon from the `assets/icons/` folder
 #
 order: 2
 data:
   -
     name: "The Electronic Frontier Foundation (EFF)"
     labels:
-      official: "https://www.eff.org/"
+      web: "https://www.eff.org/"
     color: "#ED1E1E"
   -
     name: "European Digital Rights (EDRi)"
     labels:
-      official: "https://edri.org/"
+      web: "https://edri.org/"
     color: "#ffffff"
   -
     name: "Calyx Institute"
     labels:
-      official: "https://calyxinstitute.org/"
+      web: "https://calyxinstitute.org/"
     color: "#7BAB2B"
   -
     name: "Privacy International"
     labels:
-      official: "https://privacyinternational.org/"
+      web: "https://privacyinternational.org/"
     color: "#09DEFE"
   -
     name: "Electronic Privacy Information Center (EPIC)"
     labels:
-      official: "https://epic.org/"
+      web: "https://epic.org/"
     color: "#ffffff"
   -
     name: "noyb"
     labels:
-      official: "https://noyb.eu/"
+      web: "https://noyb.eu/"
     color: "#9c0c7e"

_data/_en/knowledgebase/external-resources/guides.yml

@@ -4,7 +4,8 @@
 #     - desc (string)
 #     - tags (array of strings):        contains misc info, eg. rendering engine, FOSS or proprietary, etc.
 #     - affil (string, optional):       affiliate link
-#     - labels:                         links to the official web (official) and different versions of the software (desktop, android, ios);
+#     - labels:                         links to the official web (web), YouTube channel (youtube)
+#                                       or anything for which there is an icon in `assets/icons/` (eg. github);
 #                                       see "_data/_en/content.yml --> resources --> knowledgebase --> labels"
 #     - color (string, optional):       color of the icon background (preferably in HEX format - #BADA55)
 #     - favorite (boolean, optional):   marks a favorite and show a "star" icon next to the name
@@ -14,42 +15,42 @@
 #
 #     - title (string)
 #     - url (string)
-#     - type (string): show the corresponding icon in front of the title (web, video, youtube)
+#     - type (string): show the corresponding icon in front of the title (eg. web, video, github); any icon from the `assets/icons/` folder
 #
 order: 1
 data:
   -
     name: "Privacy Guides"
     labels:
-      official: "https://privacyguides.org/"
+      web: "https://privacyguides.org/"
     color: "#ffffff"
   -
     name: "EFF Surveillance Self-Defense"
     labels:
-      official: "https://ssd.eff.org/"
+      web: "https://ssd.eff.org/"
     color: "#ffffff"
   -
     name: "The New Oil"
     labels:
-      official: "https://thenewoil.org/"
+      web: "https://thenewoil.org/"
     color: "#000000"
   -
     name: "CR Security Planner"
     labels:
-      official: "https://securityplanner.consumerreports.org/"
+      web: "https://securityplanner.consumerreports.org/"
     color: "#004a54"
   -
     name: "FOTP Guides & Training"
     labels:
-      official: "https://freedom.press/training/"
+      web: "https://freedom.press/training/"
     color: "#ffffff"
   -
     name: "Privacy Not Included"
     labels:
-      official: "https://foundation.mozilla.org/en/privacynotincluded/"
+      web: "https://foundation.mozilla.org/en/privacynotincluded/"
     color: "#ffffff"
   -
     name: "Hitchhiker's Guide"
     labels:
-      official: "https://anonymousplanet.org/"
+      web: "https://anonymousplanet.org/"
     color: "#000000"

_data/_en/knowledgebase/operating-systems/android.yml

@@ -4,7 +4,8 @@
 #     - desc (string)
 #     - tags (array of strings):        contains misc info, eg. rendering engine, FOSS or proprietary, etc.
 #     - affil (string, optional):       affiliate link
-#     - labels:                         links to the official web (official) and different versions of the software (desktop, android, ios);
+#     - labels:                         links to the official web (web), YouTube channel (youtube)
+#                                       or anything for which there is an icon in `assets/icons/` (eg. github);
 #                                       see "_data/_en/content.yml --> resources --> knowledgebase --> labels"
 #     - color (string, optional):       color of the icon background (preferably in HEX format - #BADA55)
 #     - favorite (boolean, optional):   marks a favorite and show a "star" icon next to the name
@@ -14,7 +15,7 @@
 #
 #     - title (string)
 #     - url (string)
-#     - type (string): show the corresponding icon in front of the title (web, video, youtube)
+#     - type (string): show the corresponding icon in front of the title (eg. web, video, github); any icon from the `assets/icons/` folder
 #
 order: 3
 data:
@@ -23,39 +24,38 @@ data:
     desc: "A private and secure mobile operating system with Android app compatibility via Sandboxed Google Play Services. Developed as a non-profit open source project."
     tags: ["Open Source", "Only Pixel line support"]
     labels:
-      official: "https://grapheneos.org/"
+      web: "https://grapheneos.org/"
     color: "#ffffff"
     favorite: true
   -
     name: "CalyxOS"
     desc: "CalyxOS maintains quality protection for most users, while offering many usability features via MicroG for app compatibility. Developed by a non-profit Calyx Institute with moderate device compatability."
     tags: ["Open Source", "Limited devices"]
     labels:
-      official: "https://calyxos.org/"
+      web: "https://calyxos.org/"
     color: "#9BCC01"
     favorite: true
   -
     name: "DivestOS"
     desc: "DivestOS attempts to fix some security issues with LineageOS (like bringing verified boot to some devices) while maintaing large device compatability & extra usability features."
     tags: ["Open Source", "Supports many devices"]
     labels:
-      official: "https://divestos.org/"
+      web: "https://divestos.org/"
     color: "#000000"
     favorite: true
   -
     name: "MicroG"
     desc: "MicroG is an open source replacement to proprietary Google Play Services. It allows apps & services to work as intended in a more privacy-respecting & transparent fashion on most custom ROMs."
     tags: ["Open Source"]
     labels:
-      official: "https://microg.org/"
+      web: "https://microg.org/"
     color: "#F2F2F2"
   -
     name: "Plexus"
     desc: "While MicroG & de-googled ROMs try to maintain the compatability of Google Play Services, they are not perfect. Plexus allows you to check what apps do/don't work, deveoped by us at Techlore."
     tags: ["Open Source"]
     labels:
-      official: "https://plexus.techlore.tech/"
-      android: "https://github.com/techlore/Plexus-app?tab=readme-ov-file#download"
+      web: "https://plexus.techlore.tech/"
     color: "#000000"
 related:
   -

_data/_en/knowledgebase/operating-systems/desktop-operating-systems.yml

@@ -4,7 +4,8 @@
 #     - desc (string)
 #     - tags (array of strings):        contains misc info, eg. rendering engine, FOSS or proprietary, etc.
 #     - affil (string, optional):       affiliate link
-#     - labels:                         links to the official web (official) and different versions of the software (desktop, android, ios);
+#     - labels:                         links to the official web (web), YouTube channel (youtube)
+#                                       or anything for which there is an icon in `assets/icons/` (eg. github);
 #                                       see "_data/_en/content.yml --> resources --> knowledgebase --> labels"
 #     - color (string, optional):       color of the icon background (preferably in HEX format - #BADA55)
 #     - favorite (boolean, optional):   marks a favorite and show a "star" icon next to the name
@@ -14,7 +15,7 @@
 #
 #     - title (string)
 #     - url (string)
-#     - type (string): show the corresponding icon in front of the title (web, video, youtube)
+#     - type (string): show the corresponding icon in front of the title (eg. web, video, github); any icon from the `assets/icons/` folder
 #
 order: 1
 data:
@@ -23,44 +24,44 @@ data:
     desc: "Fedora has strong out-of-the-box privacy & security practices, all backed by a trustworthy and commited team. Use Fedora Silverblue for an even more secure, atomic experience."
     tags: ["Open Source", "Linux", "Moderate"]
     labels:
-      official: "https://fedoraproject.org/"
+      web: "https://fedoraproject.org/"
     color: "#294172"
     favorite: true
   -
     name: "QubesOS"
     desc: "Qubes separates programs & operating systems into secure environments for maximum safety. It can be slower and may have compatibility issues with certain hardware."
     tags: ["Open Source", "Xen", "Advanced"]
     labels:
-      official: "https://www.qubes-os.org/"
+      web: "https://www.qubes-os.org/"
     color: "#3874d8"
     favorite: true
   -
     name: "Whonix"
     desc: "Whonix offers both a virtual and live environment with a goal of anonymity. All activities are routed through Tor with strong privacy & security precautions."
     tags: ["Open Source", "Virtual Machine", "Live OS"]
     labels:
-      official: "https://www.whonix.org/"
+      web: "https://www.whonix.org/"
     color: "#ffffff"
   -
     name: "TailsOS"
     desc: "TailsOS offers a Tor-routed live environment for privacy & anonymity."
     tags: ["Open Source", "Live OS"]
     labels:
-      official: "https://tails.net/"
+      web: "https://tails.net/"
     color: "#56347C"
   -
     name: "Arch"
     desc: "Arch offers bleeding-edge updates with a more configurable option for users. Many looking to harden Linux themselves enjoy the flexibility offered by Arch."
     tags: ["Open Source", "Linux", "Advanced"]
     labels:
-      official: "https://www.archlinux.org/"
+      web: "https://www.archlinux.org/"
     color: "#1793D1"
   -
     name: "MacOS"
     desc: "For users unable to use Linux for one reason or another: MacOS can be a reasonably private & secure option for many threat models. Despite being proprietary, it offers decent protection and is a great alternative to Windows. Please refer to the guide below for our MacOS hardening guide."
     tags: ["Proprietary", "Apple", "Simple"]
     labels:
-      official: "https://www.apple.com/macos/what-is/"
+      web: "https://www.apple.com/macos/what-is/"
     color: "#C70737"
     favorite: true
 related:

_data/_en/knowledgebase/other-services/aliasing.yml

@@ -4,7 +4,8 @@
 #     - desc (string)
 #     - tags (array of strings):        contains misc info, eg. rendering engine, FOSS or proprietary, etc.
 #     - affil (string, optional):       affiliate link
-#     - labels:                         links to the official web (official) and different versions of the software (desktop, android, ios);
+#     - labels:                         links to the official web (web), YouTube channel (youtube)
+#                                       or anything for which there is an icon in `assets/icons/` (eg. github);
 #                                       see "_data/_en/content.yml --> resources --> knowledgebase --> labels"
 #     - color (string, optional):       color of the icon background (preferably in HEX format - #BADA55)
 #     - favorite (boolean, optional):   marks a favorite and show a "star" icon next to the name
@@ -14,7 +15,7 @@
 #
 #     - title (string)
 #     - url (string)
-#     - type (string): show the corresponding icon in front of the title (web, video, youtube)
+#     - type (string): show the corresponding icon in front of the title (eg. web, video, github); any icon from the `assets/icons/` folder
 #
 order: 6
 data:
@@ -24,7 +25,7 @@ data:
     tags: ["Open Source", "Free Tier"]
     affil: "https://go.getproton.me/SH12Q"
     labels:
-      official: "https://proton.me/pass"
+      web: "https://proton.me/pass"
     color: "#6d49ff"
     favorite: true
   -
@@ -33,26 +34,22 @@ data:
     tags: ["Open Source", "Free tier"]
     affil: "https://simplelogin.io/?slref=techlore"
     labels:
-      official: "https://simplelogin.io/"
-      android: "https://play.google.com/store/apps/details?id=io.simplelogin.android"
-      ios: "https://apps.apple.com/app/id1494359858"
+      web: "https://simplelogin.io/"
     color: "#D13C8D"
     favorite: true
   -
     name: "addy.io"
     desc: "addy.io (previously AnonAddy) is a private & secure email aliasing service with a very generous free option. It's the main alternative to SimpleLogin/Proton Pass."
     tags: ["Open Source", "Free tier"]
     labels:
-      official: "https://addy.io/"
+      web: "https://addy.io/"
     color: "#181e5e"
   -
     name: "MySudo"
     desc: "MySudo is predominantly a phone number aliasing solution. Like most aliasing solutions, it's a transfer of trust from countless services to one."
     tags: ["Proprietary", "Paid"]
     labels:
-      official: "https://mysudo.com/"
-      android: "https://play.google.com/store/apps/details?id=com.anonyome.mysudo"
-      ios: "https://apps.apple.com/us/app/mysudo-private-secure/id1237892621"
+      web: "https://mysudo.com/"
     color: "#4C6EF3"
     favorite: true
   -
@@ -61,14 +58,12 @@ data:
     tags: ["Proprietary", "Free tier", "US only"]
     affil: "https://app.privacy.com/join/WYZ3N"
     labels:
-      official: "https://privacy.com/"
-      android: "https://play.google.com/store/apps/details?id=com.privacy.pay"
-      ios: "https://apps.apple.com/us/app/privacy-com/id1040298266?mt=8"
+      web: "https://privacy.com/"
     color: "#000000"
   -
     name: "Guerrilla Mail"
     desc: "Guerrilla Mail is a disposable email service, allowing users to generate ephemeral emails conveniently."
     tags: ["Proprietary", "Free"]
     labels:
-      official: "https://www.guerrillamail.com/"
+      web: "https://www.guerrillamail.com/"
     color: "#462400"