diff --git a/.github/ABOUT.md b/.github/ABOUT.md
deleted file mode 100644
index 7235270..0000000
--- a/.github/ABOUT.md
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-# Repository Admin
-
-## Mirror
-
----
-
-## Credits
-
-The credits section has now been moved to **[CREDITS.md](https://github.com/Lissy93/awesome-privacy/blob/main/.github/CREDITS.md)**
-
----
-
-## Website
-
-A web-version of Awesome-Privacy is available at: **[awesome-privacy.xyz](https://awesome-privacy.xyz)**
-
-The source for the website is managed in the [`gh-pages`](https://github.com/Lissy93/awesome-privacy/tree/gh-pages) branch.
-
-The content is in markdown format, and pulled from the main branch using [this workflow](https://github.com/Lissy93/awesome-privacy/blob/main/.github/workflows/sync-docs-branch.yml) running on GitHub actions. The site is built with [Docsify](https://docsify.js.org), and deployed automatically onto [Netlify](https://netlify.com).
-
-A mirror is also deployed to GH Pages, at: [lissy93.github.io/awesome-privacy](https://lissy93.github.io/awesome-privacy/)
-
-### Making Changes to the Website
-
-#### Making changes to content
-To add, remove or amend any piece of software on the list, please follow the [Contributing Guide](https://github.com/Lissy93/awesome-privacy/blob/main/.github/CONTRIBUTING.md), and submit changes only to the main branch.
-
-#### Making changes to the website
-To make changes to the layout, style or logic of the web app, excluding any markdown files, changes should be submitted directly to the gh-pages branch.
-
-
-### Website Privacy
-
-Although no analytics or tracking is included in the website, the third-party services involved in deploying, hosting and DNS all potentially have the ability to see user traffic, and may collect, store and process data on visitors. You should refer to the following privacy policies for more information:
-- [CloudFlare Privacy Policy](https://cloudflare.com/privacypolicy/) _(used for DNS)_
-- [Netlify Privacy Policy](https://www.netlify.com/privacy/) _(used for website hosting)_
-- [GitHub Privacy Policy](https://docs.github.com/en/site-policy/privacy-policies/github-privacy-statement) _(used for code hosting)_
-
----
-
-## Transparency
-
-
----
-
-## Disclaimer
-
-
----
-
-## Author Pledge
-
----
-
-## License
-
-Awesome-Privacy is licensed under [Creative Commons, CC BY 4.0](https://creativecommons.org/licenses/by/4.0/).
-
-In short, this means:
-- You are free to use and distribute this repository, and any or it's content for personal or commerical use.
-- But you must include the copyright, give credit to the original author, and state what changes you've made.
-- And you cannot hold the author liable for any damages, and there is no warranty for any of the content.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 63c4992..b57bbe6 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,36 +4,51 @@
### How to make an Addition
-You can add entries to this list by opening a pull request.
+You can add, edit or remove entries by opening a pull request.
-Get started by [editing](https://github.com/Lissy93/awesome-privacy/edit/main/README.md) the readme, committing changes to your fork, and opening a pull request upstream to this repo's main branch.
-If you are new to GitHub, [this tutorial](https://www.freecodecamp.org/news/how-to-make-your-first-pull-request-on-github/) may help you.
+All data is stored in [`awesome-privacy.yml`](https://github.com/Lissy93/awesome-privacy/blob/main/awesome-privacy.yml).
+If you're adding, editing or removing a listing - **this is the only file you need to edit**.
+
+Get started by forking the repo, [editing](https://github.com/Lissy93/awesome-privacy/edit/main/awesome-privacy.yml) the data, committing changes to your fork, and opening a pull request upstream to this repo's main branch. If you're new to open source, you can find some resources to get you started at [git-in.to](https://git-in.to), but feel free to reach out if you need any help 😊
Your request will be reviewed, then either merged, or have changes requested, or if the [Guidelines](#guidelines) are not met, it may be closed with a comment explaining why.
-To make layout or stylistic amendments to the website ([awesome-privacy.xyz](https://awesome-privacy.xyz)), pull requests should be made to the `gh-pages` branch. For more information about the website, see [About --> Website](https://github.com/Lissy93/awesome-privacy/blob/main/.github/ABOUT.md#website)
+To make layout or stylistic amendments to the website ([awesome-privacy.xyz](https://awesome-privacy.xyz)), see [Website docs](https://github.com/Lissy93/awesome-privacy#the-website) in the readme for build and running instructions.
---
### Requirements
-Software additions to this list, will usually need to meet the following requirements.
+For software to be included in this list, it must meet the following requirements:
- **Privacy Respecting**
- - The project must respect users privacy, not collect more data than necessary, and store info securely
+ - The project must respect users privacy, not collect more data than necessary, and store info securely
+ - For hosted services, the project must have a clear privacy policy
+ - The user must remain in full control of their data, and be able to delete it at any time
- **Secure**
+ - The software must be secure by default, without requiring additional configuration
- There should be no current, critical security issues
- The handling of past issues must have been prompt, transparent and effective
- **Open Source**
- - The full source code should be released under an open source license
+ - The full source code should be released under an open source license
+ - Ideally it should be possible for the user to build and run/deploy the software themselves from source
- **Actively Maintained**
- The developers should address dependency updates and security patches in a timely manner
- **Transparent**
- It should be clear who is behind the project, what their motives are, and what (if any) the funding model is
- **Ethical**
- Must not suppress free speech, discriminate or disregard any human rights
+- **Relevant**
+ - The software must be relevant, and fit into one of the existing categories
+- **Functional**
+ - Must be fully functional, and not just a concept or idea
+ - A stable (non-alpha/beta) release is required at a minimum
+ - Must be accessible to the general public, and not just a select group of people
+ - If technical knowledge is required to run it, the software must be well documented
-_There may be some exceptions, but these would need to be fully justified, reviewed by the community, and drawbacks / anti-features must be listed along-side the software when merged. Usually these entries go within the "Notable Mentions" section instead._
+_There may be some exceptions, but these would need to be fully justified, reviewed
+by the community, and the drawbacks / anti-features must be clearly listed along-side the software.
+Usually these entries go within the "Notable Mentions" section instead._
---
@@ -41,6 +56,7 @@ _There may be some exceptions, but these would need to be fully justified, revie
Your pull request must follow these requirements. Failure to do so, might result in it being closed.
+- Do not edit the README directly when adding / editing a listing
- Ensure your PR is not a duplicate, search for existing / previous submissions first
- You must respond to any comments or requests for changes in a timely manner, 48-hours maximum
- Write short but descriptive git commit messages, under 50 characters. This must be in the format of `Adds [software-name] to [section-name]`. Your PR will be rejected if you name it `Updates README.md`
@@ -59,4 +75,4 @@ Your pull request must follow these requirements. Failure to do so, might result
- Your changes must be correctly formatted, in valid markdown
- The addition title must be a link the project, and in bold
- The addition description must be no less than 50, and no more than 250 characters, keep it clear and to the point
-- The structure of additions is as follows: `[Project Name](https://project-link/) | Brief description`
+
diff --git a/.github/CREDITS.md b/.github/CREDITS.md
deleted file mode 100644
index b693cdf..0000000
--- a/.github/CREDITS.md
+++ /dev/null
@@ -1,992 +0,0 @@
-# Credits
-
-### Sponsors
-
-
-
-
----
-
-### Contributors
-
-
-
-
----
-
-### Original Contributors
-
-_Awesome-Privacy originated from [Personal-Security-Checklist](https://github.com/Lissy93/personal-security-checklist), in which the following users contributed to._
-
-
-
----
-
-### Newest Stargazers & Forkers
-
-
-
----
-
-### You?
-
-Contributions of any type are very welcome!
-
-Ways that you can help out include, submitting a pull request, raising an issue, sharing the repo with your network, starring / forking the project, or sponsoring us on GitHub.
-
-> **Note**
If you're adding, editing or removing something from the list, please read through the [Contributing Docs](/.github/CONTRIBUTING.md) before submitting your PR.
-
-
-## Follow for More
-
-If you've enjoyed Awesome-Privacy, you might be interested on some of the other projects that I'm working on.
-Consider following me for updates!
-
-[](https://twitter.com/Lissy_Sykes)
-[](https://github.com/Lissy93)
-[](https://mastodon.social/web/accounts/1032965)
-[](https://keybase.io/aliciasykes)
-[](https://aliciasykes.com)
-[](https://notes.aliciasykes.com/)
-[](https://keybase.io/aliciasykes/pgp_keys.asc)
-
-
diff --git a/.github/README.md b/.github/README.md
new file mode 100644
index 0000000..1602bef
--- /dev/null
+++ b/.github/README.md
@@ -0,0 +1,200 @@
+
+
+🌐 awesome-privacy.xyz
+
+*A curated list of privacy & security-focused apps, software, and providers 🔐
*
+
+[⏬ Skip to Content ⏬](#password-managers)
+
+## Intro [](https://awesome.re)
+
+Large data-hungry corporations dominate the digital world but with little, or no respect for your privacy.
+Migrating to open-source applications with a strong emphasis on privacy and security will help stop
+corporations, governments, and hackers from logging, storing or selling your personal data.
+
+**Note**: Remember that [no software is perfect](#important-considerations), and it is important to follow good [security practices](https://github.com/Lissy93/personal-security-checklist/blob/HEAD/CHECKLIST.md).
+
+A Codeberg mirror is available [here](https://codeberg.org/alicia/awesome-privacy).
+
+
+
+
+---
+
+## Final Notes
+
+### Conclusion
+
+Many corporations put profit before people, collecting data and exploiting privacy. They claim to be secure but without being open source it can't be verified, until there's been a breach and it's too late. Switching to privacy-respecting open source software will drastically help improving your security, privacy and anonymity online.
+
+However, that's not all you need to do. It is also important to: use strong and unique passwords, 2-factor authentication,
+adopt good networking practices and be mindful of data that are collected when browsing the web. You can see the full
+**[personal security checklist](https://github.com/Lissy93/personal-security-checklist/blob/HEAD/CHECKLIST.md)** for more tips to stay safe.
+
+
+### Important Considerations
+
+**Compartmentalise, Update and Be Ready**
+No piece of software is truly secure or private. Further to this, software can only as secure as the system it is running on. Vulnerabilities are being discovered and patched all the time, so you much keep your system up-to-date. Breaches occur regularly, so compartmentalise your data to minimise damage. It's not just about choosing secure software, you must also follow good security practices.
+
+**Attack Surface**
+It is a good idea to keep your trusted software base small, to reduce potential attack surface. At the same time trusting a single application for too many tasks or too much personal data could be a weakness in your system. So you will need to judge the situation according to your threat model, and carefully plan which software and applications you trust with each segment of your data.
+
+**Convenience Vs Security**
+There is often a trade-off between convenience and security. Construct a threat model, and choose a balance that is right for you. In a similar way in some situations there is privacy and security conflict (e.g. Find My Phone is great for security, but terrible for privacy, and anonymous payments may be good for privacy but less secure than insured fiat currency). Again it is about assessing your situation, understanding the risks and making an informed decision.
+
+**Hosted Vs Self-Hosted Considerations**
+When using a hosted or managed application that is open-source software - there is often no easy way to tell if the version running is the same as that of the published source code (even published signatures can be faked). There is always the possibility that additional backdoors may have been knowingly or unknowingly implemented in the running instance. One way round this is to self-host software yourself. When self-hosting you will then know for sure which code is running, however you will also be responsible for the managing security of the server, and so may not be recommended for beginners.
+
+**Open Source Software Considerations**
+Open source software has long had a reputation of being more secure than its closed source counterparts. Since bugs are raised transparently, fixed quickly, the code can be checked by experts in the community and there is usually little or no data collection or analytics.
+That being said, there is no piece of software that it totally bug free, and hence never truly secure or private. Being open source, is in no way a guarantee that something is safe. There is no shortage of poorly-written, obsolete or sometimes harmful open source projects on the internet. Some open source apps, or a dependency bundled within it are just plain malicious (such as, that time [Colourama was found in the PyPI Repository](https://hackaday.com/2018/10/31/when-good-software-goes-bad-malware-in-open-source/))
+
+**Proprietary Software Considerations**
+When using a hosted or proprietary solution - always check the privacy policy, research the reputation of the organisation, and be weary about which data you trust them with. It may be best to choose open source software for security-critical situations, where possible.
+
+**Maintenance**
+When selecting a new application, ensure it is still being regularly maintained, as this will allow for recently discovered security issues to be addressed. Software in an alpha or beta phase, may be buggy and lacking in features, but more importantly - it could have critical vulnerabilities open to exploit. Similarly, applications that are no longer being actively maintained may pose a security risk, due to lack of patching. When using a forked application, or software that is based on an upstream code base, be aware that it may receive security-critical patches and updates at a slightly later date than the original application.
+
+**This List: Disclaimer**
+This list contains packages that range from entry-level to advanced, a lot of the software here will not be appropriate for all audiences. It is in no way a definitive list of secure applications, and aims only to be a guide, a collection of software and services that myself and other contributors have used, and would recommend. There will always be new vulnerabilities discovered or introduced, bugs and security-critical glitches, malicious actors and poorly configured systems. It is up to you to do your research, draw up a threat model, and decide where and how your data are managed.
+
+If you find something on this list that should no longer be deemed secure or private/ or should have a warning note attached, please raise an issue. In the same way if you know of something that is missing, or would like to make an edit, then pull requests are welcome, and are much appreciated!
+
+### Further Reading
+
+**More Awesome Software Lists**
+
+This list was focused on privacy-respecting software. Below are other awesome lists, maintained by the community of open source software, categorised by operating system.
+
+- Windows: [awesome-windows-apps](https://github.com/Awesome-Windows/Awesome) by 'many'
+- MacOS: [awesome-macOS-apps](https://github.com/iCHAIT/awesome-macOS) by @iCHAIT
+- Linux: [awesome-linux-software](https://github.com/luong-komorebi/Awesome-Linux-Software) by @luong-komorebi
+- iOS: [open-source-ios-apps](https://github.com/dkhamsing/open-source-ios-apps) by @dkhamsing
+- Android: [open-source-android-apps](https://github.com/pcqpcq/open-source-android-apps) by @pcqpcq
+- Server: [awesome-selfhosted](https://github.com/awesome-selfhosted/awesome-selfhosted) by 'many'
+- [**More GitHub Awesome Lists →**](https://github.com/Lissy93/personal-security-checklist/blob/master/articles/4_Privacy_And_Security_Links.md#more-awesome-github-lists)
+
+**Security List**
+- [Personal Security Checklist](https://github.com/lissy93/personal-security-checklist) - A curated list of security and privacy advice, tools, and resources.
+
+**News & Updates**
+A custom Reddit feed covering news and updates for all the apps covered here can be found [here](https://www.reddit.com/user/lissy93/m/software_projects/)
+
+---
+
+## The Website
+The easist way to browse Awesome Privacy, is via our website, at **[awesome-privacy.xyz](https://awesome-privacy.xyz)**
+
+[](https://awesome-privacy.xyz)
+
+### About Website
+The source for the website is in the [`web/`](https://github.com/Lissy93/awesome-privacy/tree/main/web) directory.
+
+This is a statically generated site, built with Astro, Svelte, TypeScript an SCSS.
+At build-time, it reads the data from [`awesome-privacy.yml`](https://github.com/Lissy93/awesome-privacy/blob/main/awesome-privacy.yml) and generates the pages.
+
+### Running the Website Locally
+You'll need [Node.js](https://nodejs.org/en) (20.11.1 or later) and [Git](https://git-scm.com/) installed.
+Then run the following commands to fetch the code, install dependencies and start the dev server.
+
+```shell
+git clone git@github.com:Lissy93/awesome-privacy.git
+cd awesome-privacy/web
+yarn
+yarn dev
+# Then open 127.0.0.1:4321 in your browser
+```
+
+### Deploying the Website
+Follow the steps above, then run `yarn build` to generate the static files.
+You can then upload the `./dist` directory to any web server, static host or CDN.
+Alternatively, you can fork the repo and import it into either Vercel or Netlify.
+
+---
+
+## Contributing
+We welcome suggestions, additions, edits and removals to the list.
+It's thanks to contributors like you that this project is possible 💜
+
+All data is stored in [`awesome-privacy.yml`](https://github.com/Lissy93/awesome-privacy/blob/main/awesome-privacy.yml).
+If you're adding, editing or removing a listing - **this is the only file you need to edit**.
+
+Please familiarise yourself with the [Contributing Guidelines](https://github.com/Lissy93/awesome-privacy/blob/main/.github/CONTRIBUTING.md) before submiting your pull request, as we have some guidelines that **must be followed** to ensure your PR can be accepted.
+
+If you're new to open source, you can find some resources to get you started at [git-in.to](https://git-in.to),
+but feel free to reach out if you need any help 😊
+
+---
+
+## Acknowledgements
+
+### Sponsors
+Huge thanks to the following sponsors, for their ongoing support 💖
+
+
+
+
+
+### Contributors
+This project exists thanks to all the people who've helped build and maintain it 🌟
+
+
+
+---
+
+## License
+
+> _**[Lissy93/Awesome-Privacy](https://github.com/Lissy93/awesome-privacy)** is licensed under [MIT](https://github.com/Lissy93/awesome-privacy/blob/HEAD/LICENSE) © [Alicia Sykes](https://aliciasykes.com) 2024._
+> For information, see TLDR Legal > MIT
+
+
+Expand License
+
+```
+The MIT License (MIT)
+Copyright (c) Alicia Sykes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included install
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANT ABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+```
+
+
+
+
+
+
+ © Alicia Sykes 2024
+ Licensed under MIT
+ 
+ Thanks for visiting :)
+
+
+
+
+
diff --git a/.github/screenshots/1_category-page.png b/.github/screenshots/1_category-page.png
new file mode 100644
index 0000000..d7c2278
Binary files /dev/null and b/.github/screenshots/1_category-page.png differ
diff --git a/.github/screenshots/2_section-page.png b/.github/screenshots/2_section-page.png
new file mode 100644
index 0000000..f256df8
Binary files /dev/null and b/.github/screenshots/2_section-page.png differ
diff --git a/.github/screenshots/3_browse-page.png b/.github/screenshots/3_browse-page.png
new file mode 100644
index 0000000..f6b0d29
Binary files /dev/null and b/.github/screenshots/3_browse-page.png differ
diff --git a/.github/screenshots/4_search-page.png b/.github/screenshots/4_search-page.png
new file mode 100644
index 0000000..6085f45
Binary files /dev/null and b/.github/screenshots/4_search-page.png differ
diff --git a/.github/screenshots/5_about-page.png b/.github/screenshots/5_about-page.png
new file mode 100644
index 0000000..ee9299e
Binary files /dev/null and b/.github/screenshots/5_about-page.png differ
diff --git a/.github/screenshots/6_section-page2.png b/.github/screenshots/6_section-page2.png
new file mode 100644
index 0000000..b38d6a4
Binary files /dev/null and b/.github/screenshots/6_section-page2.png differ
diff --git a/.github/screenshots/grid.png b/.github/screenshots/grid.png
new file mode 100644
index 0000000..157a05e
Binary files /dev/null and b/.github/screenshots/grid.png differ
diff --git a/.github/screenshots/homepage.png b/.github/screenshots/homepage.png
new file mode 100644
index 0000000..10d494a
Binary files /dev/null and b/.github/screenshots/homepage.png differ
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-