diff --git a/src/main.rs b/src/main.rs index 3e1e463..3384941 100644 --- a/src/main.rs +++ b/src/main.rs @@ -68,9 +68,9 @@ fn abuse() -> Template { fn post() -> Template { Template::render("post", context! {}) } -#[get("/people")] -fn people() -> Template { - Template::render("people", context! {}) +#[get("/members")] +fn members() -> Template { + Template::render("members", context! {}) } #[get("/")] @@ -116,7 +116,7 @@ fn rocket() -> _ { build() .mount( "/", - routes![index, guests, post_msg, people, post, services, abuse], + routes![index, guests, post_msg, members, post, services, abuse], ) .mount("/assets", FileServer::from(ASSETS_DIR)) .attach(Template::fairing()) diff --git a/templates/abuse.html.tera b/templates/abuse.html.tera index bcd5b71..bef5c49 100644 --- a/templates/abuse.html.tera +++ b/templates/abuse.html.tera @@ -13,7 +13,7 @@ Please make sure your e-mail contains the following: Please consider the following when sending an abuse e-mail.
  1. We are *not* able to provide any personal identifiable information, as we do not store them.
  2. -
  3. We take abuse notifications very serious. Sending us multiple false abuse reports will result in being blacklisted from any further communication with us.
  4. +
  5. We take abuse notifications very serious. Sending us multiple false abuse reports will result in a permanent block from our mailserver.
  6. We try to respond within 48 hours. Do not flood our inboxes.
  7. Please be respectful at all times.
diff --git a/templates/base.html.tera b/templates/base.html.tera index 5eda2f8..0104aeb 100644 --- a/templates/base.html.tera +++ b/templates/base.html.tera @@ -16,7 +16,7 @@ home services guestbook - people + members report abuse
{% block content %}{% endblock content %}
diff --git a/templates/macros.html.tera b/templates/macros.html.tera index 913d1a5..6655393 100644 --- a/templates/macros.html.tera +++ b/templates/macros.html.tera @@ -1,11 +1,8 @@ -{% macro service(title, description, href, img, h="16", available=true) %} +{% macro service(title, description, href, img, h="16") %}

{{title}} - {% if not available %} - unavailable - {% endif %}


{{description}}

diff --git a/templates/people.html.tera b/templates/members.html.tera similarity index 63% rename from templates/people.html.tera rename to templates/members.html.tera index 853bd60..9d0e056 100644 --- a/templates/people.html.tera +++ b/templates/members.html.tera @@ -2,10 +2,11 @@ {% extends "base" %} {% block title %}members{% endblock title %} {% block content %} -These people are in some way related to iwakura.rip and have an account on here :3 +These are currently members of iwakura.rip, participating in some form. +If communicating with any of our members, please encrypt your message against their pgp key, if they have one. {% endblock content %} diff --git a/templates/services.html.tera b/templates/services.html.tera index 4dd9adc..0a5f476 100644 --- a/templates/services.html.tera +++ b/templates/services.html.tera @@ -4,11 +4,11 @@ {% block content %}
{{macros::service(title="Forgejo", description="A place for everyone to host their source code!", href="https://git.iwakura.rip", img="https://www.marefa.org/w/images/thumb/0/05/Forgejo_logo.svg/640px-Forgejo_logo.svg.png")}} - {{macros::service(title="Jellyfin", description="For all your media consumption needs.", href="https://media.iwakura.rip", img="/assets/img/jellyfin.png", available=false)}} + {{macros::service(title="Jellyfin", description="For all your media consumption needs.", href="https://media.iwakura.rip", img="/assets/img/jellyfin.png")}} {{macros::service(title="Woodpecker CI", description="Powerful CI/CD to use together with Forgejo.", href="https://ci.iwakura.rip", img="/assets/img/woodpecker.svg")}} - {{macros::service(title="Jellyseerr", description="Get information about your favorite movies and TV shows, all together in one place.", href="https://request.iwakura.rip", img="/assets/img/jellyseerr.ico", available=false)}} - {{macros::service(title="DN42", description="We are currently in the process of connecting all of our services to DN42 - an overlay network using internet technologies.", href="https://iwakura.dn42", img="/assets/img/dn42.png", available=false)}} - {{macros::service(title="Authelia", description="Open-source authentication & authorization platform.", href="https://auth.iwakura.rip", img="/assets/img/authelia.png")}} + {{macros::service(title="Jellyseerr", description="Get information about your favorite movies and TV shows, all together in one place.", href="https://request.iwakura.rip", img="/assets/img/jellyseerr.ico")}} + {{macros::service(title="DN42", description="We are currently in the process of connecting all of our services to DN42 - an overlay network using internet technologies.", href="https://iwakura.dn42", img="/assets/img/dn42.png")}} + {{macros::service(title="Authelia", description="Open-source authentication & authorization platform.", href="https://a.iwakura.rip", img="/assets/img/authelia.png")}} {{macros::service(title="E-mail", description="We are hosting our own e-mail servers on an off-shore hosting provider. Note: all emails are currently being stored in plain text. We recommend using PGP encryption.", href="https://mail.iwakura.rip", img="/assets/img/mail.png")}} {{macros::service(title="Blog", description="Our blog where we post some stuff, sometimes :)", href="https://blog.iwakura.rip", img="")}} {{macros::service(title="Enclosed", description="Enclosed is a minimalistic web application designed for sending private and secure notes.", href="https://bin.iwakura.rip", img="https://github.com/CorentinTh/enclosed/raw/main/.github/icon-light.png")}}