diff --git a/crates/app/src/langs/en-US.toml b/crates/app/src/langs/en-US.toml index 92f456e..be21778 100644 --- a/crates/app/src/langs/en-US.toml +++ b/crates/app/src/langs/en-US.toml @@ -5,6 +5,8 @@ version = "1.0.0" "general:link.home" = "Home" "general:link.popular" = "Popular" "general:link.communities" = "Communities" +"general:link.next" = "Next" +"general:link.previous" = "Previous" "general:action.save" = "Save" "general:action.delete" = "Delete" "general:action.back" = "Back" @@ -30,6 +32,7 @@ version = "1.0.0" "auth:label.relationship" = "Relationship" "auth:label.joined_communities" = "Joined communities" "auth:label.recent_posts" = "Recent posts" +"auth:label.moderation" = "Moderation" "communities:action.create" = "Create" "communities:action.select" = "Select" @@ -63,6 +66,7 @@ version = "1.0.0" "settings:tab.sessions" = "Sessions" "settings:label.change_password" = "Change password" "settings:label.current_password" = "Current password" +"settings:label.delete_account" = "Delete account" "settings:label.new_password" = "New password" "settings:label.change_username" = "Change username" "settings:label.new_username" = "New username" diff --git a/crates/app/src/public/html/communities/base.html b/crates/app/src/public/html/communities/base.html index 944c35f..10e08b4 100644 --- a/crates/app/src/public/html/communities/base.html +++ b/crates/app/src/public/html/communities/base.html @@ -137,7 +137,7 @@ }); }; - {% endif %} {% else %} + {% endif %} {% endif %} {% if is_owner or is_manager %} diff --git a/crates/app/src/public/html/communities/post.html b/crates/app/src/public/html/communities/post.html index 050c707..e406520 100644 --- a/crates/app/src/public/html/communities/post.html +++ b/crates/app/src/public/html/communities/post.html @@ -47,8 +47,12 @@
- {% for post in replies %} {{ components::post(post=post[0], - owner=post[1], secondary=true, show_community=false) }} {% endfor %} + + {% for post in replies %} + {{ components::post(post=post[0], owner=post[1], secondary=true, show_community=false) }} + {% endfor %} + + {{ components::pagination(page=page, items=replies|length) }}
diff --git a/crates/app/src/public/html/components.html b/crates/app/src/public/html/components.html index 24fa029..14df025 100644 --- a/crates/app/src/public/html/components.html +++ b/crates/app/src/public/html/components.html @@ -246,4 +246,20 @@ show_community=true) -%} {% if community and show_community %} {{ user.username }}
+{%- endmacro %} {% macro pagination(page=0, items=0) -%} +
+ {% if page > 0 %} + + {{ icon "arrow-left" }} + {{ text "general:link.previous" }} + + {% else %} +
+ {% endif %} {% if items != 0 %} + + {{ text "general:link.next" }} + {{ icon "arrow-right"}} + + {% endif %} +
{%- endmacro %} diff --git a/crates/app/src/public/html/profile/base.html b/crates/app/src/public/html/profile/base.html index cf66e8e..c73bb07 100644 --- a/crates/app/src/public/html/profile/base.html +++ b/crates/app/src/public/html/profile/base.html @@ -17,11 +17,11 @@ }}
-

+

{{ components::username(user=profile) }} {% if profile.is_verified %} - + {{ icon "badge-check" }} {% endif %} @@ -158,7 +158,7 @@

{% endif %} {% if not profile.settings.private_communities or - is_self %} + is_self or is_helper %}
{{ icon "users-round" }} @@ -177,7 +177,140 @@ {% endif %}
-
{% block content %}{% endblock %}
+
+ {% if is_helper %} +
+
+ {{ icon "shield" }} + {{ text "auth:label.moderation" }} +
+ +
+
+
+ + {{ icon "settings" }} + View settings + + + +
+
+ + +
+
+ {% endif %} {% block content %}{% endblock %} +
diff --git a/crates/app/src/public/html/profile/posts.html b/crates/app/src/public/html/profile/posts.html index d3de40c..7a4f3ed 100644 --- a/crates/app/src/public/html/profile/posts.html +++ b/crates/app/src/public/html/profile/posts.html @@ -11,6 +11,8 @@ content %} {% for post in posts %} {{ components::post(post=post[0], owner=post[1], secondary=true, community=post[2], show_community=true) }} {% endfor %} + + {{ components::pagination(page=page, items=posts|length) }} {% endblock %} diff --git a/crates/app/src/public/html/profile/settings.html b/crates/app/src/public/html/profile/settings.html index b7a0766..83a7eb6 100644 --- a/crates/app/src/public/html/profile/settings.html +++ b/crates/app/src/public/html/profile/settings.html @@ -2,6 +2,13 @@ Settings - {{ config.name }} {% endblock %} {% block body %} {{ macros::nav() }}
+ {% if profile.id != user.id %} +
+ {{ icon "skull" }} + Editing other user's settings! Please be careful. +
+ {% endif %} +
{{ text "settings:tab.account" }} @@ -95,6 +102,38 @@
+
+
+ {{ icon "skull" }} + {{ text "settings:label.delete_account" }} +
+ +
+
+ + +
+ + +
+
+