From 12eccde4eafd49b924db96fc79092014f74b25c3 Mon Sep 17 00:00:00 2001 From: Philippe Loctaux Date: Fri, 14 Apr 2023 18:15:16 +0200 Subject: [PATCH] renamed avatar macro to user, added user_info, show user info in mobile --- .../templates/pages/oauth/authorize.html.tera | 4 ++-- .../templates/pages/oauth/redirect.html.tera | 4 ++-- crates/ezidam/templates/shell.html.tera | 2 +- .../ezidam/templates/shell/header.html.tera | 19 +++++++++---------- .../{avatar.html.tera => user.html.tera} | 12 ++++++++++++ 5 files changed, 26 insertions(+), 15 deletions(-) rename crates/ezidam/templates/utils/{avatar.html.tera => user.html.tera} (71%) diff --git a/crates/ezidam/templates/pages/oauth/authorize.html.tera b/crates/ezidam/templates/pages/oauth/authorize.html.tera index ca16672..e652257 100644 --- a/crates/ezidam/templates/pages/oauth/authorize.html.tera +++ b/crates/ezidam/templates/pages/oauth/authorize.html.tera @@ -1,6 +1,6 @@ {% extends "base" %} -{% import "utils/avatar" as avatar %} +{% import "utils/user" as user %} {% block page %} @@ -27,7 +27,7 @@
{% if user %}
- {{ avatar::avatar(username=user.username, name=user.name, size="xl", css="mb-3") }} + {{ user::avatar(username=user.username, name=user.name, size="xl", css="mb-3") }}

{% if user.name %} {{ user.name }} diff --git a/crates/ezidam/templates/pages/oauth/redirect.html.tera b/crates/ezidam/templates/pages/oauth/redirect.html.tera index f2cc3f3..b334b00 100644 --- a/crates/ezidam/templates/pages/oauth/redirect.html.tera +++ b/crates/ezidam/templates/pages/oauth/redirect.html.tera @@ -1,6 +1,6 @@ {% extends "base" %} -{% import "utils/avatar" as avatar %} +{% import "utils/user" as user %} {% block page %} @@ -19,7 +19,7 @@

Preparing application

- {{ avatar::avatar(username=username, name=name, size="xl", css="mb-3") }} + {{ user::avatar(username=username, name=name, size="xl", css="mb-3") }}

{% if name %} {{ name }} diff --git a/crates/ezidam/templates/shell.html.tera b/crates/ezidam/templates/shell.html.tera index 15ab6cb..a271e30 100644 --- a/crates/ezidam/templates/shell.html.tera +++ b/crates/ezidam/templates/shell.html.tera @@ -1,6 +1,6 @@ {% extends "base" %} -{% import "utils/avatar" as avatar %} +{% import "utils/user" as user %} {% block page %} diff --git a/crates/ezidam/templates/shell/header.html.tera b/crates/ezidam/templates/shell/header.html.tera index 765068e..213ecc2 100644 --- a/crates/ezidam/templates/shell/header.html.tera +++ b/crates/ezidam/templates/shell/header.html.tera @@ -11,20 +11,19 @@
- {{ avatar::avatar(username=user.username, name=user.name, size="sm", css="") }} + {{ user::avatar(username=user.username, name=user.name, size="sm", css="") }}
- {% if user.name %} -
{{ user.name }}
- {% else %} -
{{ user.username }}
- {% endif %} - - {% if user.email %} -
{{ user.email }}
- {% endif %} + {{ user::user_info(name=user.name, username=user.username, email=user.email) }}
+
+
+ {{ user::user_info(name=user.name, username=user.username, email=user.email) }} +
+ +
+
{% if user.isAdmin == true %} Admin panel
diff --git a/crates/ezidam/templates/utils/avatar.html.tera b/crates/ezidam/templates/utils/user.html.tera similarity index 71% rename from crates/ezidam/templates/utils/avatar.html.tera rename to crates/ezidam/templates/utils/user.html.tera index fe164b2..58c83d2 100644 --- a/crates/ezidam/templates/utils/avatar.html.tera +++ b/crates/ezidam/templates/utils/user.html.tera @@ -21,3 +21,15 @@ {{ avatar }} {% endmacro avatar %} + +{% macro user_info(name, username, email) %} +{% if name %} +
{{ name }}
+{% else %} +
{{ username }}
+{% endif %} + +{% if email %} +
{{ email }}
+{% endif %} +{% endmacro user_info %}