| ID | -Username | -User | Timezone | -Admin | Max Apps | -Exports Used | Max Exports | +Exports Used | Created At | -||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| <%= user.id %> | -<%= user.username %> | -<%= user.email %> | ++ <%= user.username %> <%= user.is_admin ? 'β ' : 'β' %> + <%= user.email %> + | <%= user.timezone %> | -<%= user.is_admin ? 'Yes' : 'No' %> | <%= user.max_apps_allowed %> | -<%= user.export_count %> | <%= user.max_export_count_allowed %> | -<%= new Date(user.created_at).toLocaleString() %> | -- π View - π Edit + | <%= user.export_count %> | +<%= user.created_at %> | +|||||
|
+
+
User Details+
|
Max Exports | Exports Used | Created At | +Apps | @@ -23,7 +35,7 @@|||||||||||||
| <%= user.id %> | - <%= user.username %> <%= user.is_admin ? 'β ' : 'β' %> + <%= user.is_admin ? 'β ' : '' %> <%= user.username %> <%= user.email %> | <%= user.timezone %> | @@ -31,11 +43,11 @@<%= user.max_export_count_allowed %> | <%= user.export_count %> | <%= user.created_at %> | +||||||||||||
| <%= user.id %> | - <%= user.is_admin ? 'β ' : '' %> <%= user.username %> + <%= user.is_admin ? 'βοΈ' : '' %> <%= user.username %> <%= user.email %> | <%= user.timezone %> | @@ -52,20 +52,33 @@|||||||||||||||
| ID | -Name | -URL | -Active | +App | +Alert Info | Created At | |||||||||||
| <%= app.id %> | -<%= app.name %> | -<%= app.url || 'N/A' %> | -<%= app.is_active ? 'β ' : 'β' %> | -<%= app.created_at %> | +|||||||||||||
| <%= app.id %> | ++ <%= app.name %> <%= app.is_active ? 'β ' : 'β' %> + <% if (app.url) { %> + <%= app.url %> + <% } %> + <% if (app.description) { %> + <%= app.description %> + <% } %> + | +
+
+ Monthly Alerts Allowed: <%= app.max_monthly_alerts_allowed %>
+ Monthly Limit Threshold: <%= app.user_monthly_limit_threshold || 'N/A' %>
+ Alerts Sent This Month: <%= app.alerts_sent_this_month %>
+ Alerts Reset Date: <%= app.alerts_reset_date %>
+
+ |
+ <%= app.created_at %> | ||||||||||||||
| ID | -User | -Timezone | -Max Apps | -Max Exports | -Exports Used | -Created At | -Apps | +π·οΈ ID | +π€ User | +β±οΈ Timezone | +π± Max Apps | +β¬οΈ Max Exports | +β¬οΈ Exports Used | +ποΈ Created At | +π± Apps |
|---|
| ID | -App | -Alert Info | -Created At | +π·οΈ ID | +π± App | +π Alert Info | +ποΈ Created At | <%= app.name %> <%= app.is_active ? 'β ' : 'β' %> <% if (app.url) { %> - <%= app.url %> + π <%= app.url %> <% } %> <% if (app.description) { %> - <%= app.description %> + π <%= app.description %> <% } %> |
- Monthly Alerts Allowed: <%= app.max_monthly_alerts_allowed %>
- Monthly Limit Threshold: <%= app.user_monthly_limit_threshold || 'N/A' %>
- Alerts Sent This Month: <%= app.alerts_sent_this_month %>
- Alerts Reset Date: <%= app.alerts_reset_date %>
+ Allowed: <%= app.max_monthly_alerts_allowed %>
+
+ Threshold: <%= app.user_monthly_limit_threshold || 'N/A' %>
+ /
+ Sent: <%= app.alerts_sent_this_month %>
+
+ Reset Date: <%= app.alerts_reset_date %>
|
<%= app.created_at %> | From 3efaa8056d291a049857049af5dea86a10926200 Mon Sep 17 00:00:00 2001 From: wajeht <58354193+wajeht@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:00:16 -0500 Subject: [PATCH 05/15] style: Update table styles in admin-users page --- src/views/pages/admin-users.html | 51 ++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/src/views/pages/admin-users.html b/src/views/pages/admin-users.html index 36feeef..ac1283d 100644 --- a/src/views/pages/admin-users.html +++ b/src/views/pages/admin-users.html @@ -14,47 +14,50 @@
|---|
| π·οΈ ID | -π€ User | -β±οΈ Timezone | -π± Max Apps | -β¬οΈ Max Exports | -β¬οΈ Exports Used | -ποΈ Created At | -π± Apps | +||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| π·οΈ ID | +π€ User | +β±οΈ Timezone | +π± Max Apps | +β¬οΈ Max Exports | +β¬οΈ Exports Used | +ποΈ Created At | +π± Apps | ||||||
| <%= user.id %> | -+ | ||||||||||||
| <%= user.id %> | +<%= user.is_admin ? 'βοΈ' : '' %> <%= user.username %> <%= user.email %> | -<%= user.timezone %> | -<%= user.max_apps_allowed %> | -<%= user.max_export_count_allowed %> | -<%= user.export_count %> | -<%= user.created_at %> | -+ | <%= user.timezone %> | +<%= user.max_apps_allowed %> | +<%= user.max_export_count_allowed %> | +<%= user.export_count %> | +<%= user.created_at %> | +<%= user.max_export_count_allowed %> | <%= user.export_count %> | <%= user.created_at %> | -+ | + + + | <% user.apps?.forEach(app => { %>
| <%= app.id %> | +
<%= app.name %> <%= app.is_active ? 'β
' : 'β' %>
<% if (app.url) { %>
@@ -73,6 +78,7 @@ π€ Usersπ <%= app.description %> <% } %> |
+
Allowed: <%= app.max_monthly_alerts_allowed %>
@@ -84,7 +90,12 @@
π€ UsersReset Date: <%= app.alerts_reset_date %> |
+
<%= app.created_at %> | + ++ + | <%= user.created_at %> | - + + | <% }); %> From 103676069720e1d13336cf79d94f2a89a2828c57 Mon Sep 17 00:00:00 2001 From: wajeht <58354193+wajeht@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:24:01 -0500 Subject: [PATCH 08/15] style: Update layout in admin-users.html for user limits display --- src/views/pages/admin-users.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/views/pages/admin-users.html b/src/views/pages/admin-users.html index 36b29de..85b0113 100644 --- a/src/views/pages/admin-users.html +++ b/src/views/pages/admin-users.html @@ -25,9 +25,7 @@π·οΈ ID | π€ User | β±οΈ Timezone | -π± Max Apps | -β¬οΈ Max Exports | -β¬οΈ Exports Used | +β οΈ Limits | ποΈ Created At | οΈβ‘οΈ Actions | @@ -42,9 +40,14 @@<%= user.timezone %> | -<%= user.max_apps_allowed %> | -<%= user.max_export_count_allowed %> | -<%= user.export_count %> | +
+ Max Apps: <%= user.max_apps_allowed %>
+
+ Max Exports: <%= user.max_export_count_allowed%>
+ /
+ Exported: <%= user.export_count %>
+
+ |
<%= user.created_at %> |
From d7a63f47c28bc4b80001226b52907f5490d09db0 Mon Sep 17 00:00:00 2001
From: wajeht <58354193+wajeht@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:25:16 -0500
Subject: [PATCH 09/15] style(admin-users.html): Update styling and spacing in
admin user page
---
src/views/pages/admin-users.html | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/views/pages/admin-users.html b/src/views/pages/admin-users.html
index 85b0113..12505d8 100644
--- a/src/views/pages/admin-users.html
+++ b/src/views/pages/admin-users.html
@@ -21,6 +21,7 @@ π€ Users
|