diff --git a/assets/css/global.css b/assets/css/global.css
index 717b5ca..2a792f8 100644
--- a/assets/css/global.css
+++ b/assets/css/global.css
@@ -67,12 +67,9 @@ bu {
word-wrap: break-word;
}
a {
- font-weight: 900;
+ text-decoration: none;
color: var(--term-color);
}
-#content a:hover {
- color: #7efc64 !important;
-}
#post-container {
text-align: center;
padding: 5px;
diff --git a/src/main.rs b/src/main.rs
index 7067adf..3e1e463 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -68,9 +68,9 @@ fn abuse() -> Template {
fn post() -> Template {
Template::render("post", context! {})
}
-#[get("/webring")]
-fn webring() -> Template {
- Template::render("webring", context! {})
+#[get("/people")]
+fn people() -> Template {
+ Template::render("people", context! {})
}
#[get("/")]
@@ -116,7 +116,7 @@ fn rocket() -> _ {
build()
.mount(
"/",
- routes![index, guests, post_msg, webring, post, services, abuse],
+ routes![index, guests, post_msg, people, 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 85215ec..bcd5b71 100644
--- a/templates/abuse.html.tera
+++ b/templates/abuse.html.tera
@@ -3,11 +3,19 @@
{% block content %}
We ask that you report any abuse you find to: abuse@iwakura.rip.
Please make sure your e-mail contains the following:
-
- Type of abuse
- - Evidence (no screenshots, these can be faked.)
+ - Evidence (no screenshots, hard evidence only)
- Origin of abuse (e-mail address, IP, domain etc)
- Additional information that might help us.
+
+Please consider the following when sending an abuse e-mail.
+
+ - We are *not* able to provide any personal identifiable information, as we do not store them.
+ - We take abuse notifications very serious. Sending us multiple false abuse reports will result in being blacklisted from any further communication with us.
+ - We try to respond within 48 hours. Do not flood our inboxes.
+ - Please be respectful at all times.
+
+
{% endblock content %}
diff --git a/templates/base.html.tera b/templates/base.html.tera
index 9b6c075..0efcfae 100644
--- a/templates/base.html.tera
+++ b/templates/base.html.tera
@@ -16,7 +16,7 @@
home
services
guestbook
- webring
+ people
report abuse
{% block content %}{% endblock content %}
diff --git a/templates/index.html.tera b/templates/index.html.tera
index 59f7605..e9643ac 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -1,5 +1,8 @@
{% extends "base" %}
{% block title %}homepage{% endblock title %}
{% block content %}
-A website belonging to hex's homelab.
+Welcome to iwakura.rip. We are a small group of technology nerds and geeks fascinated by computers and technology.
+We host a bunch of services on this domain for usage by friends & co.
+
+P.S. check out heroin.zone, a tilde-like pubnix. Click here for my personal website. -- hex
{% endblock content %}
diff --git a/templates/people.html.tera b/templates/people.html.tera
new file mode 100644
index 0000000..853bd60
--- /dev/null
+++ b/templates/people.html.tera
@@ -0,0 +1,11 @@
+{% import "macros" as macros %}
+{% 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
+
+ {{macros::user_display(username="hex", role=2)}}
+ {{macros::user_display(username="andre", role=1)}}
+ {{macros::user_display(username="grng", role=1)}}
+
+{% endblock content %}
diff --git a/templates/services.html.tera b/templates/services.html.tera
index 1da5b95..842d55c 100644
--- a/templates/services.html.tera
+++ b/templates/services.html.tera
@@ -3,14 +3,16 @@
{% block title %}services{% endblock title %}
{% block content %}
- {{macros::service(title="Forgejo", description="A github alternative - store the sauce here.", 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="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="Woodpecker CI", description="Powerful CI/CD to use together with Forgejo.", href="https://ci.iwakura.rip", img="/assets/img/woodpecker.svg")}}
{{macros::service(title="Prosody", description="Prosody is a XMPP messaging server, and superior to Matrix :3", href="https://prosody.im/", img="/assets/img/prosody.svg")}}
{{macros::service(title="Synapse", description="Synapse is the official server implementation for the Matrix protocol.", href="https://matrix.iwakura.rip", img="/assets/img/matrix.jpg")}}
{{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="E-mail", description="We are hosting our own e-mail servers on a small ARM64 VPS at Hetzern running OpenBSD. Note: all emails are stored in plain text. We recommend using PGP encryption.", href="https://mail.iwakura.rip", img="/assets/img/mail.png")}}
- {{macros::service(title="Blog", description="A blog where mostly hex writes stuff :D", href="https://blog.iwakura.rip", img="")}}
+ {{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")}}
+Other services can be added on request. We also try to provide space for members wanting to host their own services, though iwakura.rip is a hobby project made by a single guy in his basement, so stability is something to think about when asking for this.
+We do not own the copyright for any of the projects mentioned above. All copyright goes to their respective owners. We only host instances of them.
{% endblock content %}
diff --git a/templates/webring.html.tera b/templates/webring.html.tera
deleted file mode 100644
index 066ca9d..0000000
--- a/templates/webring.html.tera
+++ /dev/null
@@ -1,6 +0,0 @@
-{% import "macros" as macros %}
-{% extends "base" %}
-{% block title %}members{% endblock title %}
-{% block content %}
-Coming soon!
-{% endblock content %}