Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Revamp website following UX work #195

Merged
merged 9 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 4 additions & 28 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,13 @@ name = "Contribute"
url = "/page/contribute/"
weight = 3
[[languages.en.menu.main]]
name = "Supporters"
url = "/page/supporters/"
weight = 4
[[languages.en.menu.main]]
name = "Press"
url = "/page/press/"
weight = 5
[[languages.en.menu.main]]
name = "Events"
url = "/page/events/"
weight = 6
[[languages.en.menu.main]]
name = "Blog"
url = "/post/"
weight = 7
weight = 4
[[languages.en.menu.main]]
name = "FAQ"
url = "/page/faq/"
weight = 8
weight = 5

[languages.fr]
languageName = "Français"
Expand All @@ -65,25 +53,13 @@ name = "Contribuer"
url = "/page/contribute/"
weight = 3
[[languages.fr.menu.main]]
name = "Nos soutiens"
url = "/page/supporters/"
weight = 4
[[languages.fr.menu.main]]
name = "Presse"
url = "/page/press/"
weight = 5
[[languages.fr.menu.main]]
name = "Evénements"
url = "/page/events/"
weight = 6
[[languages.fr.menu.main]]
name = "Blog"
url = "/post/"
weight = 7
weight = 4
[[languages.fr.menu.main]]
name = "FAQ"
url = "/page/faq/"
weight = 8
weight = 5

[params]
navbarBgColorClass = "bg-primary"
Expand Down
15 changes: 15 additions & 0 deletions content/page/coc.en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
title: "Code of conduct"
date: 2024-01-25
draft: false
---

## Code of conduct

Exodus Privacy's purpose is to raise awareness about tracking done by Android applications with the help of analysis tools and teaching materials. This code of conduct is meant to be a framework that allow everyone to express themselves both freely and safely.
Exodus Privacy forbids any form of discrimination or harassment about gender, skills, knowledge, disabilities, origin, sexual orientation, physical appearance, age, religion or addictions targeting any member of our community and by any means whatsoever (image, text, joke, word…). Oral and written communications must be inclusive or non-gendered. Nobody can assume the gender of a person nor force one on them.

Exodus Privacy expects from its members to be polite in all Exodus Privacy's spaces, whether online or offline. Discrimination or harassment of any kind will result in sanctions, including permanent exclusion from the association and all communication places (IRC channels, forum...), pronounced by the bureau of Exodus Privacy.
Do not insist when somebody declines a solicitation. If you are accused of oppressive or hurtful behavior, excuse yourself and try to understand what the issue was.
If you are harassed or face discrimination, or if you witness harassment or discrimination toward other people, or if you fear an incident occurring during Exodus Privacy's activities, you can contact a member of the bureau by email at <[email protected]> or via any other way (IRC query, forum private message…).
Every report done in good faith will be taken seriously. The bureau will respect, as often as possible, requests for anonymity in order to protect victims form further abuses.
15 changes: 15 additions & 0 deletions content/page/coc.fr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
title: "Code de conduite"
date: 2024-01-25
draft: false
---

## Code de conduite

Le but d’Exodus Privacy est la sensibilisation au pistage par les applications Android, par le biais d’outils d’analyse et de supports pédagogiques destinés au grand public. Ce code de conduite se veut un outil permettant à chacun·e de s’exprimer librement et sans risque au sein d’Exodus Privacy.
Exodus Privacy refuse toute forme de discrimination ou de harcèlement concernant le genre des personnes, leurs compétences et connaissances, leur handicap, leur origine, leur orientation sexuelle, leur apparence physique, leur âge, leur religion, leurs addictions (liste non exhaustive)… et sous quelque forme que ce soit (parole, image, blague, texte…). Les communications écrites et orales doivent être inclusives ou non genrées. Personne ne peut présupposer le genre d’une personne et encore moins lui en imposer un.

Exodus Privacy attend de ses membres une politesse, un savoir-vivre dans tous les espaces d’expression d’Exodus Privacy, qu’ils soient en ligne ou hors-ligne. Les discriminations et harcèlements quels qu’ils soient peuvent donner lieu à une sanction allant jusqu’à l’exclusion définitive de l’association, ainsi que tous les lieux d’échange (canaux IRC, forum…) prononcée après délibération du bureau d’Exodus Privacy.
N’insistez pas lorsqu’une personne décline une sollicitation. Si on vous reproche un comportement oppressant ou blessant, excusez-vous et essayez de comprendre ce qui a pu poser problème.
Si vous êtes harcelé·e ou victime de discrimination, ou si vous êtes témoin de harcèlement ou de discrimination à l’égard d’autre(s) personnes, ou si vous craignez la survenue d’un incident dans le cadre des activités d’Exodus Privacy vous pouvez contacter un·e membre du bureau, par mail à <[email protected]> ou bien par tout autre moyen (IRC, message privé sur le forum…).
Tous les rapports faits de bonne foi seront pris au sérieux. Le bureau respectera dans la mesure du possible les demandes d’anonymat afin de protéger les victimes d’abus supplémentaires.
70 changes: 28 additions & 42 deletions content/page/contribute.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@ title: "Contribute"
date: 2018-01-11 16:53:09
draft: false
---
# How to contribute

# Contribute

## Code of conduct

See [our code of conduct](/en/page/coc/).

## How to contribute

<div class="row">
<div class="col-md-4 text-center">
Expand Down Expand Up @@ -39,7 +46,7 @@ draft: false
</div>

<p>
If you don't know where to begin, how to use GitHub or if you want simply to discuss, feel free to <a href="https://forum.exodus-privacy.eu.org/">sign up on our forum</a> or come and <a href="https://web.libera.chat/?nick=webguest?#exodus-privacy">talk to the team on IRC</a>.
If you don't know where to begin, how to use GitHub or if you want simply to discuss, feel free to <a href="https://web.libera.chat/?nick=webguest?#exodus-privacy">talk to the team on IRC</a>.
</p>

<a name="finance"></a>
Expand Down Expand Up @@ -68,74 +75,53 @@ Membership is to be renewed every year. The membership fee remains free.
## Help us to finance Exodus Privacy

<div class="row">
<div class="col-md-12 text-center">
<div class="col-md-6 text-center">
<div class="card-body">
<h5>Goodies</h5>
<a href="https://shop.spreadshirt.fr/exodus-privacy/all">
<img src="/media/page/contribute/sweatEP.jpg" caption="our spreadshirt shop" alt="Spreadshirt shop" width="172px" height="172px">
</a>
</div>
</div>
</div>

<div class="row">
<div class="col-md-12 text-center">
<div class="card-body">
<h5>Ğ1</h5>
<a href="duniter:DegD5SFHyPDeVCjxG6v7DUqbJGipXoaS8rVQxMQHUZEy?label=exodus">
<samp class="small">DegD5SFHyPDeVCjxG6v7DUqbJGipXoaS8rVQxMQHUZEy</samp>
<br>
<img src="/media/page/contribute/duniter.png" width="120" alt="QR code and Duniter link" caption="QR code and Duniter link">
<div class="col-md-6 mb-4 text-center">
<h5>Donations</h5>
<div class="mt-2">
<a href="https://liberapay.com/exodus/donate">
<img src="/media/page/contribute/liberapay.png" caption="Logo and Liberapay link" alt="Logo and Liberapay link" width="148px" height="51px">
</a>
</div>
<div class="mt-2">
<a href="https://donorbox.org/exodus">
<img src="/media/page/contribute/donorbox.png" caption="Logo and Donorbox link" alt "Logo and Donorbox link" width="148px" height="51px">
</a>
</div>
<div class="mt-2">
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=EUR&[email protected]&item_name=Exodus%20donation">
<img src="/media/page/contribute/paypal.png" caption"Logo and Paypal link" alt="Logo and Paypal link" width="148px" height="51px">
</a>
</div>
</div>
</div>

<div class="row">
<div class="col-md-4 mb-4 text-center">
<a href="https://liberapay.com/exodus/donate">
<img src="/media/page/contribute/liberapay.png" caption="Logo and Liberapay link" alt="Logo and Liberapay link" width="148px" height="51px">
</a>
</div>
<div class="col-md-4 mb-4 text-center">
<a href="https://donorbox.org/exodus">
<img src="/media/page/contribute/donorbox.png" caption="Logo and Donorbox link" alt "Logo and Donorbox link" width="148px" height="51px">
</a>
</div>
<div class="col-md-4 mb-4 text-center">
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=EUR&[email protected]&item_name=Exodus%20donation">
<img src="/media/page/contribute/paypal.png" caption"Logo and Paypal link" alt="Logo and Paypal link" width="148px" height="51px">
</a>
</div>
</div>

## And help us by spreading the word about us

The main interest of Exodus Privacy is to <b>make people aware of the tracking done by mobile applications</b>. To do so, we animate 3 social network accounts and a video channel:
<div class="row">
The main interest of Exodus Privacy is to <b>make people aware of the tracking done by mobile applications</b>. To do so, we animate 2 social network accounts and a video channel:

<div class="row justify-content-md-center">
<div class="col-md-4 text-center">
<i class="fab fa-3x fa-mastodon mt-2 ml-auto mr-auto text-primary"></i>
<div class="card-body">
<h5 class="card-title"><code>@exodus</code></h5>
<a href="https://framapiaf.org/@exodus" class="btn btn-primary">Follow us!</a>
</div>
</div>
<div class="col-md-4 text-center">
<i class="fab fa-3x fa-twitter mt-2 ml-auto mr-auto text-primary"></i>
<div class="card-body">
<h5 class="card-title"><code>@ExodusPrivacy</code></h5>
<a href="https://twitter.com/ExodusPrivacy" class="btn btn-primary">Follow us!</a>
</div>
</div>
<div class="col-md-4 text-center">
<i class="fab fa-3x fa-facebook-square mt-2 ml-auto mr-auto text-primary"></i>
<div class="card-body">
<h5 class="card-title"><code>exodusprivacy</code></h5>
<a href="https://facebook.com/exodusprivacy" class="btn btn-primary">Follow us!</a>
</div>
</div>
</div>
<div class="row justify-content-md-center">
<div class="col-md-4 text-center">
<i class="fab fa-3x fa-youtube-square mt-2 ml-auto mr-auto text-primary"></i>
<div class="card-body">
Expand Down
72 changes: 29 additions & 43 deletions content/page/contribute.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@ title: "Contribuer"
date: 2018-01-11 16:53:09
draft: false
---
# Comment contribuer

# Contribuer

## Code de conduite

Voir [notre code de conduite](/fr/page/coc/).

## Comment contribuer

<div class="row">
<div class="col-md-4 text-center">
Expand Down Expand Up @@ -39,7 +46,7 @@ draft: false
</div>

<p>
Si vous ne savez pas par où commencer, comment utiliser GitHub ou bien si vous voulez simplement discuter avec l’équipe, n’hésitez pas à ouvrir un compte sur <a href="https://forum.exodus-privacy.eu.org/">notre forum</a> ou à passer sur <a href="https://web.libera.chat/?nick=webguest?#exodus-privacy">IRC</a>.
Si vous ne savez pas par où commencer, comment utiliser GitHub ou bien si vous voulez simplement discuter avec l’équipe, n’hésitez pas à passer sur <a href="https://web.libera.chat/?nick=webguest?#exodus-privacy">IRC</a>.
</p>

<a name="finance"></a>
Expand Down Expand Up @@ -68,74 +75,53 @@ L’adhésion est à renouveler tous les ans. La cotisation, elle, reste gratuit
## Nous aider à financer Exodus Privacy

<div class="row">
<div class="col-md-12 text-center">
<div class="col-md-6 text-center">
<div class="card-body">
<h5>Notre boutique</h5>
<h5>Goodies</h5>
<a href="https://shop.spreadshirt.fr/exodus-privacy/all">
<img src="/media/page/contribute/sweatEP.jpg" caption="our spreadshirt shop" alt="Spreadshirt shop" width="172px" height="172px">
</a>
</div>
</div>
</div>

<div class="row">
<div class="col-md-12 text-center">
<div class="card-body">
<h5>Ğ1</h5>
<a href="duniter:DegD5SFHyPDeVCjxG6v7DUqbJGipXoaS8rVQxMQHUZEy?label=exodus">
<samp class="small">DegD5SFHyPDeVCjxG6v7DUqbJGipXoaS8rVQxMQHUZEy</samp>
<br>
<img src="/media/page/contribute/duniter.png" width="120" alt="QR code et lien Duniter" caption="QR code et lien Duniter">
<div class="col-md-6 mb-4 text-center">
<h5>Dons</h5>
<div class="mt-2">
<a href="https://liberapay.com/exodus/donate">
<img src="/media/page/contribute/liberapay.png" caption="Logo et lien Liberapay" alt="Logo et lien Liberapay" width="148px" height="51px">
</a>
</div>
<div class="mt-2">
<a href="https://donorbox.org/exodus">
<img src="/media/page/contribute/donorbox.png" caption="Logo et lien Donorbox" alt "Logo et lien Donorbox" width="148px" height="51px">
</a>
</div>
<div class="mt-2">
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=EUR&[email protected]&item_name=Exodus%20donation">
<img src="/media/page/contribute/paypal.png" caption"Logo et lien Paypal" alt="Logo et lien Paypal" width="148px" height="51px">
</a>
</div>
</div>
</div>

<div class="row">
<div class="col-md-4 mb-4 text-center">
<a href="https://liberapay.com/exodus/donate">
<img src="/media/page/contribute/liberapay.png" caption="Logo et lien Liberapay" alt="Logo et lien Liberapay" width="148px" height="51px">
</a>
</div>
<div class="col-md-4 mb-4 text-center">
<a href="https://donorbox.org/exodus">
<img src="/media/page/contribute/donorbox.png" caption="Logo et lien Donorbox" alt "Logo et lien Donorbox" width="148px" height="51px">
</a>
</div>
<div class="col-md-4 mb-4 text-center">
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=EUR&[email protected]&item_name=Exodus%20donation">
<img src="/media/page/contribute/paypal.png" caption"Logo et lien Paypal" alt="Logo et lien Paypal" width="148px" height="51px">
</a>
</div>
</div>

## Nous aider à nous faire connaître

Le but principal d’Exodus Privacy est d’<b>avertir les utilisateurs du pistage effectué par les applications mobiles</b>. Pour ce faire, nous animons 3 comptes sur les réseaux sociaux et une chaîne vidéo :
<div class="row">
Le but principal d’Exodus Privacy est d’<b>avertir les utilisateurs du pistage effectué par les applications mobiles</b>. Pour ce faire, nous animons 2 comptes sur les réseaux sociaux et une chaîne vidéo :

<div class="row justify-content-md-center">
<div class="col-md-4 text-center">
<i class="fab fa-3x fa-mastodon mt-2 ml-auto mr-auto text-primary"></i>
<div class="card-body">
<h5 class="card-title"><code>@exodus</code></h5>
<a href="https://framapiaf.org/@exodus" class="btn btn-primary">Suivez-nous !</a>
</div>
</div>
<div class="col-md-4 text-center">
<i class="fab fa-3x fa-twitter mt-2 ml-auto mr-auto text-primary"></i>
<div class="card-body">
<h5 class="card-title"><code>@ExodusPrivacy</code></h5>
<a href="https://twitter.com/ExodusPrivacy" class="btn btn-primary">Suivez-nous !</a>
</div>
</div>
<div class="col-md-4 text-center">
<i class="fab fa-3x fa-facebook-square mt-2 ml-auto mr-auto text-primary"></i>
<div class="card-body">
<h5 class="card-title"><code>exodusprivacy</code></h5>
<a href="https://facebook.com/exodusprivacy" class="btn btn-primary">Suivez-nous !</a>
</div>
</div>
</div>
<div class="row justify-content-md-center">
<div class="col-md-4 text-center">
<i class="fab fa-3x fa-youtube-square mt-2 ml-auto mr-auto text-primary"></i>
<div class="card-body">
Expand Down
2 changes: 2 additions & 0 deletions content/page/events.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Exodus Privacy is regulary performing talks about its works and results, in Fren

## Next events

No events are planned for now!

## Past events

### 2021
Expand Down
2 changes: 2 additions & 0 deletions content/page/events.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ L'association Exodus Privacy propose régulièrement des conférences et interve

## Prochains événements

Pas d'événements prévus pour le moment !

## Evénements passés

### 2021
Expand Down
Loading
Loading