commit 59aa4ccf9e864605b8bd3a1a19eda72c81f3036e Author: Pili Guerra <pili@piliguerra.com> Date: Fri Feb 28 15:33:44 2020 +0100 Initial content skeleton --- content/anti-censorship/contents.lr | 21 ++++++++++++++++ content/applications/contents.lr | 21 ++++++++++++++++ content/metrics/contents.lr | 21 ++++++++++++++++ content/network-health/contents.lr | 48 +++++++++++++++++++++++++++++++++++++ content/network/contents.lr | 21 ++++++++++++++++ content/project-ideas/contents.lr | 23 ++++++++++++++++++ content/tor-ecosystem/contents.lr | 17 +++++++++++++ templates/gsoc.html | 24 +++++++++++++++++++ templates/home.html | 26 ++++++++++++++++---- templates/macros/projects.html | 24 +++++++++++++++++++ 10 files changed, 241 insertions(+), 5 deletions(-) diff --git a/content/anti-censorship/contents.lr b/content/anti-censorship/contents.lr new file mode 100644 index 0000000..c1259a3 --- /dev/null +++ b/content/anti-censorship/contents.lr @@ -0,0 +1,21 @@ +section: anti-censorship +--- +section_id: anti-censorship +--- +color: primary +--- +_template: layout.html +--- +title: Anti-Censorship Team +--- +subtitle: The anti-censorship team is a group of Tor people who make Tor reachable anywhere in the world. +--- +key: 1 +--- +html: training.html +--- +body: + +Welcome to the anti-censorship team page! + +The anti-censorship team is a group of Tor people who make Tor reachable anywhere in the world. We analyze censorship attempts and develop technology to work around these censorship attempts. \ No newline at end of file diff --git a/content/applications/contents.lr b/content/applications/contents.lr new file mode 100644 index 0000000..8e44939 --- /dev/null +++ b/content/applications/contents.lr @@ -0,0 +1,21 @@ +section: applications +--- +section_id: applications +--- +color: primary +--- +_template: layout.html +--- +title: Applications Team +--- +subtitle: The Applications Team is a group of Tor people who are working on different user facing products. +--- +key: 2 +--- +html: training.html +--- +body: + +Welcome to the Applications Team page. + +The Applications Team is a group of Tor people who are working on different user facing products: Tor Browser, Tor Messenger, Tor Mail, Orbot etc. \ No newline at end of file diff --git a/content/metrics/contents.lr b/content/metrics/contents.lr new file mode 100644 index 0000000..e870b2c --- /dev/null +++ b/content/metrics/contents.lr @@ -0,0 +1,21 @@ +section: metrics +--- +section_id: metrics +--- +color: primary +--- +_template: layout.html +--- +title: Metrics Team +--- +subtitle: The Metrics Team is a group of Tor people who care about measuring and analyzing things in the public Tor network. +--- +key: 3 +--- +html: training.html +--- +body: + +Welcome to the Metrics Team page! + +The Metrics Team is a group of Tor people who care about measuring and analyzing things in the public Tor network. If you're interested in measurements and analyses, the Metrics Team is what you're looking for. Welcome! \ No newline at end of file diff --git a/content/network-health/contents.lr b/content/network-health/contents.lr new file mode 100644 index 0000000..5bf3b54 --- /dev/null +++ b/content/network-health/contents.lr @@ -0,0 +1,48 @@ +section: network-health +--- +section_id: network-health +--- +color: primary +--- +_template: layout.html +--- +title: Network Health Team +--- +subtitle: The Network Health Team coordinates network performance and scalability work as well as other network health related tasks. +--- +key: 5 +--- +html: training.html +--- +body: + +Welcome to the Network Health Team page! + +The team was created on January 2020 and it works on these five areas: + +1. track community standards about what makes a good relay + - publish up-to-date expectations for relay operators + - set best practices for how to set relay families + - detect and resolve bad relays + - exitmap, sybil detection, hsdir traps +2. anomaly analysis / network health engineer [with network team] + - establish baselines of expected network behavior + - look for and resolve denial of service issues + - track connectivity issues between relays + - look for relays hitting resource limits +3. make sure usage/growth stats are collected and accurate + - track network performance, relay diversity by various metrics + - count users [with network team and metrics team] + - monitor bridge growth and usage [with censorship team] +4. relay advocacy [with community team] + - maintain docs for setting up and running relays and bridges + - grow a cohesive community of relay operators so they have peers + - keep relays on the right tor versions + - relaunch a gamification / badge system for lauding good relay progress + - strengthen relationships with non-profit orgs that run relays + - help companies that want to offset their tor network load +5. maintain the components of the network + - maintain directory authority relationships + - keep bandwidth authorities working (including setting the right balance between speed and location diversity) + - have enough tor browser default bridges, and keep them running smoothly [with censorship team] + - update the fallbackdirs list \ No newline at end of file diff --git a/content/network/contents.lr b/content/network/contents.lr new file mode 100644 index 0000000..6eed72a --- /dev/null +++ b/content/network/contents.lr @@ -0,0 +1,21 @@ +section: network +--- +section_id: network +--- +color: primary +--- +_template: layout.html +--- +title: Network Team +--- +subtitle: The Network Team is a group of Tor people who are working on the Tor back-end. +--- +key: 4 +--- +html: training.html +--- +body: + +Welcome to the Network Team page! + +The Network Team is a group of Tor people who are working on Tor back-end: the program called tor, the network simulators, the scripts that support directory authorities, onion services, etc. Basically, everything that sends and receives bytes from the network. \ No newline at end of file diff --git a/content/project-ideas/contents.lr b/content/project-ideas/contents.lr new file mode 100644 index 0000000..e56ab2b --- /dev/null +++ b/content/project-ideas/contents.lr @@ -0,0 +1,23 @@ +_template: layout.html +--- +_undiscoverable: true +--- +section: GSoC +--- +section_id: gsoc +--- +html: gsoc.html +--- +color: primary +--- +subtitle: Some project ideas for GSoC. +--- +cta: Get coding +--- +key: 0 +--- +title: Project Ideas +--- +body: + +You may find some of these projects to be good ideas for Google Summer of Code. We have labelled each idea with which of our core developers would be good mentors. If one or more of these ideas looks promising to you, please [contact us](mailto:gso+c@torproject.org) to discuss your plans rather than sending blind applications. diff --git a/content/tor-ecosystem/contents.lr b/content/tor-ecosystem/contents.lr new file mode 100644 index 0000000..489ce1a --- /dev/null +++ b/content/tor-ecosystem/contents.lr @@ -0,0 +1,17 @@ +section: tor-ecosystem +--- +section_id: tor-ecosystem +--- +color: primary +--- +_template: layout.html +--- +title: Tor Ecosystem +--- +subtitle: Here are some other organisations and teams that form part of the wider Tor Ecosystem +--- +key: 6 +--- +html: training.html +--- +body: \ No newline at end of file diff --git a/templates/gsoc.html b/templates/gsoc.html new file mode 100644 index 0000000..15f388d --- /dev/null +++ b/templates/gsoc.html @@ -0,0 +1,24 @@ +<div class="container py-5"> + <div class="row py-5"> + <div class="col-lg-12"> + {{ this.body }} + </div> + </div> + <div class="col-12"> + {% from "macros/projects.html" import render_active %} + {% for child in this.children.filter(F.active == True).all() %} + <div class="row"> + {{ render_active(child, this.alt) }} + </div> + {% endfor %} + </div> + <div class="row"> + <ul> + {% for child in this.children.filter(F.active == False).all() %} + <li>{{ item.title }}</li> + {% endfor %} + </div> + <div class="row py-5 text-center mx-auto"> + <p class="text-center">{{ _('None of these ideas seem appealing? You may also want to propose your own project idea — which often results in the best projects.') }} <a href="mailto:gso@torproject.org">{{ _('We invite you to contact us to discuss your own project idea.') }}</a></p> + </div> +</div> diff --git a/templates/home.html b/templates/home.html index 8b6f12f..a63f9ad 100644 --- a/templates/home.html +++ b/templates/home.html @@ -7,21 +7,37 @@ <section> <div class="container"> <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in site.query('/').filter(F.section_id != 'gsoc')|sort(attribute='key') %} <div class="col-sm-6 col-md-4 col-sm-12 col-xl-4 py-4"> <div class="card h-100 p-2"> <div class="card-body"> <h2 class="card-title ">{{ child.title }}</h2> <p class="card-text">{{ child.subtitle }}</p> - <div class="illo-container"> - <img src="/static/images/home/png/{{ child.section_id }}.png" class="img-fluid" alt="{{ child.section }}" /> - </div> </div> - <a href="{{ child.path|url }}" class="btn btn-primary">{{ child.cta }}</a> + <a href="{{ child.path|url }}" class="btn btn-primary">Learn More</a> </div> </div> {% endfor %} </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Research') }}</h2> + <p class="text-center"> + {{ _('Many people around the world are doing research on how to improve the Tor design, what\'s going on in the Tor network, and more generally on attacks and defenses for anonymous communication systems. Our research portal holds the resources we provide to help make your Tor research more effective.')}} + </p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://research.torproject.org"> + {{ _('Research Portal') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> + </div> + </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Project Ideas') }}</h2> + <p class="text-center"> + {{ _('Here you will find some projects that may be good ideas for Outreachy, Google Summer of Code or other internship programs we may participate in in future.')}} + </p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="/project-ideas"> + {{ _('Learn More') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> + </div> </div> </section> </div> diff --git a/templates/macros/projects.html b/templates/macros/projects.html new file mode 100644 index 0000000..a4e2850 --- /dev/null +++ b/templates/macros/projects.html @@ -0,0 +1,24 @@ +{% macro render_active(item, alternative) %} +<div class="card border-0"> + <div class="card-header bg-white border-0" id="headingOne"> + <h5 class="mb-0"> + <a href="{{ item.path|url }}">{{ item.title }}</a> + </h5> + Languages: + {% for lang in item.languages %} + <span class="badge badge-primary">{{ lang }}</span> + {% endfor %} + <br> + Mentors: + {% for person in item.mentors %} + <span class="badge badge-secondary">{{ person }}</span> + {% endfor %} + </div> + <div> + <div class="card-body"> + {{ item.subtitle }} + <a href="{{ item.path|url }}">{{ _('Read more.') }}</a> + </div> + </div> +</div> +{% endmacro %}