From 56de2362a01089c8a5ca3c6e1affcade00ffdfce Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Sat, 5 Nov 2022 20:10:39 -0600 Subject: [PATCH] Some user icon stuff --- static/css/style.css | 36 ++++++++++++++++- static/img/unknown-icon-128.png | Bin 0 -> 2864 bytes static/img/unknown_icon.svg | 67 ++++++++++++++++++++++++++++++++ takahe/urls.py | 1 + templates/base.html | 18 ++++++++- templates/identity/select.html | 14 ++++++- templates/identity/view.html | 3 ++ users/views/identity.py | 24 +++++++++++- 8 files changed, 157 insertions(+), 6 deletions(-) create mode 100644 static/img/unknown-icon-128.png create mode 100644 static/img/unknown_icon.svg diff --git a/static/css/style.css b/static/css/style.css index 93672c0..69eaa44 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -97,6 +97,8 @@ header { } header h1 { + font-family: "Raleway"; + font-weight: normal; background: var(--color-fg2); padding: 10px 7px 7px 7px; font-size: 130%; @@ -104,6 +106,12 @@ header h1 { color: var(--color-fg1); } +header h1 img { + display: inline; + vertical-align: top; + margin: 0 3px 0 0; +} + header a { color: inherit; text-decoration: none; @@ -117,8 +125,9 @@ header menu { } header menu li { - padding: 20px 10px 7px 10px; + padding: 10px 10px 7px 10px; color: #eee; + line-height: 32px; } main { @@ -150,10 +159,28 @@ main { .modal .option { display: block; - padding: 20px 30px; + padding: 15px 20px; color: var(--color-text-main); text-decoration: none; border-left: 3px solid transparent; + line-height: 32px; +} + +.modal .option img { + display: inline; + vertical-align: middle; + margin: 0 10px 3px 0; +} + +.modal .option i { + display: inline-block; + vertical-align: middle; + width: 32px; + height: 32px; + text-align: center; + line-height: 32px; + font-size: 150%; + margin: 0 10px 3px 0; } .modal a.option:hover { @@ -165,6 +192,11 @@ main { color: var(--color-text-dull); } +.modal .option small { + margin: 0 0 0 5px; + color: var(--color-text-dull); +} + .modal form { padding: 10px 10px 1px 10px; } diff --git a/static/img/unknown-icon-128.png b/static/img/unknown-icon-128.png new file mode 100644 index 0000000000000000000000000000000000000000..0bfef8e8f07aec3a94caa534c8627fcc9571f9ad GIT binary patch literal 2864 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 + + +? diff --git a/takahe/urls.py b/takahe/urls.py index c43e4fa..d6e4d8f 100644 --- a/takahe/urls.py +++ b/takahe/urls.py @@ -14,6 +14,7 @@ urlpatterns = [ path("@/actor/", identity.Actor.as_view()), path("@/actor/inbox/", identity.Inbox.as_view()), # Identity selection + path("@/activate/", identity.ActivateIdentity.as_view()), path("identity/select/", identity.SelectIdentity.as_view()), path("identity/create/", identity.CreateIdentity.as_view()), # Well-known endpoints diff --git a/templates/base.html b/templates/base.html index 4dc62ca..af2887f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -13,11 +13,25 @@
-

{{ config.site_name }}

+

+ + + {{ config.site_name }} + +

+
  • + +
  • {% if user.is_authenticated %} - Logout + + {% if user.icon_uri %} + + {% else %} + + {% endif %} + {% else %} Login {% endif %} diff --git a/templates/identity/select.html b/templates/identity/select.html index f5be401..dae1ca1 100644 --- a/templates/identity/select.html +++ b/templates/identity/select.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static %} {% block title %}Select Identity{% endblock %} @@ -6,12 +7,23 @@

    Select Identity

    {% for identity in identities %} - {{ identity }} + + {% if identity.icon_uri %} + + {% else %} + + {% endif %} + {{ identity }} + @{{ identity.short_handle }} + {% empty %}

    You have no identities.

    {% endfor %} Create a new identity + + Logout +
    {% endblock %} diff --git a/templates/identity/view.html b/templates/identity/view.html index 68bb7a3..deb7ae5 100644 --- a/templates/identity/view.html +++ b/templates/identity/view.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static %} {% block title %}{{ identity }}{% endblock %} @@ -6,6 +7,8 @@

    {% if identity.icon_uri %} + {% else %} + {% endif %} {{ identity }} {{ identity.handle }}

    diff --git a/users/views/identity.py b/users/views/identity.py index 9f2a7f9..fff521b 100644 --- a/users/views/identity.py +++ b/users/views/identity.py @@ -1,3 +1,5 @@ +import string + from django import forms from django.conf import settings from django.contrib.auth.decorators import login_required @@ -36,6 +38,20 @@ class SelectIdentity(TemplateView): } +@method_decorator(login_required, name="dispatch") +class ActivateIdentity(View): + def get(self, request, handle): + identity = by_handle_or_404(request, handle) + if not identity.users.filter(pk=request.user.pk).exists(): + raise Http404() + request.session["identity_id"] = identity.id + # Get next URL, not allowing offsite links + next = request.GET.get("next") or "/" + if ":" in next: + next = "/" + return redirect("/") + + @method_decorator(login_required, name="dispatch") class CreateIdentity(FormView): @@ -50,10 +66,16 @@ class CreateIdentity(FormView): def clean_handle(self): # Remove any leading @ value = self.cleaned_data["handle"].lstrip("@") + # Validate it's all ascii characters + for character in value: + if character not in string.ascii_letters + string.digits + "_-": + raise forms.ValidationError( + "Only the letters a-z, numbers 0-9, dashes and underscores are allowed." + ) # Don't allow custom domains here quite yet if "@" in value: raise forms.ValidationError( - "You are not allowed an @ sign in your handle" + "You are not allowed an @ sign in your handle." ) # Ensure there is a domain on the end if "@" not in value: