From 2f42422d35865541b0e515ed780a5cd6d7a62c3c Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 8 Feb 2024 14:49:37 -0600 Subject: [PATCH] Squashed commit of the following: commit 44b1c8c7ba8b45cb682973fb89b70445d0f5c478 Merge: 489c15b7fd 4dadb64af0 Author: Sabe Jones Date: Thu Feb 8 14:49:05 2024 -0600 Merge branch 'release' into phillip/panel_profile commit 489c15b7fd0a2a14cbdd2ef381fc525b1550965a Author: Phillip Thelen Date: Wed Dec 14 13:29:32 2022 +0100 allow profiles to be edited in admin panel commit 1afaaf40891183ee6651d6b53e5d2b3bee4eb431 Author: Phillip Thelen Date: Wed Dec 14 12:50:47 2022 +0100 include month for next hourglass date in admin panel --- .../admin-panel/user-support/index.vue | 7 ++ .../admin-panel/user-support/userProfile.vue | 105 ++++++++++++++++++ website/server/controllers/api-v3/hall.js | 1 + 3 files changed, 113 insertions(+) create mode 100644 website/client/src/components/admin-panel/user-support/userProfile.vue diff --git a/website/client/src/components/admin-panel/user-support/index.vue b/website/client/src/components/admin-panel/user-support/index.vue index 6d8e2c73ce..3002ca8e4e 100644 --- a/website/client/src/components/admin-panel/user-support/index.vue +++ b/website/client/src/components/admin-panel/user-support/index.vue @@ -26,6 +26,11 @@ :reset-counter="resetCounter" /> + + +
+

+ Users Profile +

+
+
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+ +
+
+
+ + + + + diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js index 0de5ec74bf..9d0a9015df 100644 --- a/website/server/controllers/api-v3/hall.js +++ b/website/server/controllers/api-v3/hall.js @@ -403,6 +403,7 @@ api.updateHero = { if (updateData.flags && _.isBoolean(updateData.flags.chatShadowMuted)) { hero.flags.chatShadowMuted = updateData.flags.chatShadowMuted; } + if (updateData.profile) _.assign(hero.profile, updateData.profile); if (updateData.secret) { if (typeof updateData.secret.text !== 'undefined') {