From 5b3498c385650f5bf38cfd93366dcc22b51a148b Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 9 Dec 2024 19:02:12 +0000 Subject: [PATCH] feat: add ability to re-order placeholders and redesign leaderboards page to match member list (#3559) --- core/classes/Misc/Placeholders.php | 10 +- ...er_order_to_placeholder_settings_table.php | 15 +++ .../integrations/minecraft/placeholders.tpl | 44 +++++++- custom/panel_templates/Default/template.php | 4 + custom/templates/DefaultRevamp/css/custom.css | 35 ++++++ .../templates/DefaultRevamp/leaderboards.tpl | 90 +++++++++------- modules/Core/language/en_UK.json | 2 + modules/Core/pages/leaderboards.php | 10 +- modules/Core/pages/panel/placeholders.php | 102 +++++++++++------- 9 files changed, 225 insertions(+), 87 deletions(-) create mode 100644 core/migrations/20241201113419_add_placeholder_order_to_placeholder_settings_table.php diff --git a/core/classes/Misc/Placeholders.php b/core/classes/Misc/Placeholders.php index 2df5adadcc..bbc35dacbf 100644 --- a/core/classes/Misc/Placeholders.php +++ b/core/classes/Misc/Placeholders.php @@ -17,7 +17,13 @@ public function __construct() { $this->_db = DB::getInstance(); - $placeholders_query = $this->_db->get('placeholders_settings', ['name', '<>', ''])->results(); + $placeholders_query = $this->_db->query( + <<<'SQL' + SELECT * + FROM nl2_placeholders_settings + ORDER BY `order` + SQL + )->results(); $placeholders = []; foreach ($placeholders_query as $placeholder) { @@ -78,7 +84,7 @@ public function loadUserPlaceholders(string $uuid): array { $binUuid = hex2bin(str_replace('-', '', $uuid)); - $placeholder_query = $this->_db->query('SELECT * FROM nl2_users_placeholders up JOIN nl2_placeholders_settings ps ON up.name = ps.name AND up.server_id = ps.server_id WHERE up.uuid = ?', [$binUuid]); + $placeholder_query = $this->_db->query('SELECT * FROM nl2_users_placeholders up JOIN nl2_placeholders_settings ps ON up.name = ps.name AND up.server_id = ps.server_id WHERE up.uuid = ? ORDER BY ps.`order`', [$binUuid]); if (!$placeholder_query->count()) { return []; diff --git a/core/migrations/20241201113419_add_placeholder_order_to_placeholder_settings_table.php b/core/migrations/20241201113419_add_placeholder_order_to_placeholder_settings_table.php new file mode 100644 index 0000000000..2ca0b6e50e --- /dev/null +++ b/core/migrations/20241201113419_add_placeholder_order_to_placeholder_settings_table.php @@ -0,0 +1,15 @@ +table('nl2_placeholders_settings') + ->addColumn('order', 'integer', ['length' => 11, 'null' => true, 'default' => null]) + ->update(); + } +} diff --git a/custom/panel_templates/Default/integrations/minecraft/placeholders.tpl b/custom/panel_templates/Default/integrations/minecraft/placeholders.tpl index b7a04c4013..ef7219494b 100644 --- a/custom/panel_templates/Default/integrations/minecraft/placeholders.tpl +++ b/custom/panel_templates/Default/integrations/minecraft/placeholders.tpl @@ -39,7 +39,8 @@
{$INFO}
- {$PLACEHOLDERS_INFO} +

{$PLACEHOLDERS_INFO}

+

{$DRAG_AND_DROP_INFO}

@@ -95,9 +96,9 @@ - + {foreach from=$ALL_PLACEHOLDERS item=placeholder} - + {$placeholder->server_id} {$placeholder->name} @@ -216,8 +217,45 @@ }); } + {include file='scripts.tpl'} + + diff --git a/custom/panel_templates/Default/template.php b/custom/panel_templates/Default/template.php index e49ea3b5d6..af0a2317ce 100644 --- a/custom/panel_templates/Default/template.php +++ b/custom/panel_templates/Default/template.php @@ -413,6 +413,10 @@ public function onPageLoad() $this->addJSScript('$(".image-picker").imagepicker();'); } + } elseif (MINECRAFT_PAGE === 'placeholders') { + $this->assets()->include([ + AssetTree::JQUERY_UI, + ]); } break; diff --git a/custom/templates/DefaultRevamp/css/custom.css b/custom/templates/DefaultRevamp/css/custom.css index b9815c0e43..b62f360d55 100755 --- a/custom/templates/DefaultRevamp/css/custom.css +++ b/custom/templates/DefaultRevamp/css/custom.css @@ -275,6 +275,31 @@ body.pushable>.pusher { max-width: none; } +.ui.grid.segment.leaderboard_table { + margin-top: 0; +} + +.leaderboard_table .ui.list { + margin-left: -10px; +} + +.leaderboard_table .ui.list li a { + display: block; + height: 100%; + width: 100%; +} + +.leaderboard_table .middle.aligned.content { + display: inline-block; + overflow: hidden; + text-overflow: ellipsis;; + white-space: nowrap; +} + +.leaderboard_table ol li:before { + display: none; +} + #reactions { margin-top: 1rem; padding: .7em 1.2em .7em 1.2em; @@ -1211,6 +1236,16 @@ body.dark .ui.vertical.menu { box-shadow: none; } +body.dark .ui.vertical.menu .active.item { + background-color: #464646; +} + +body.dark .ui.vertical.pointing.menu .active.item:after { + background-color: #464646; + border-top: 1px solid #464646; + border-right: 1px solid #464646; +} + body.dark .ui.segment#profile-header { border: none; } diff --git a/custom/templates/DefaultRevamp/leaderboards.tpl b/custom/templates/DefaultRevamp/leaderboards.tpl index bd27fb361b..e9781e23af 100644 --- a/custom/templates/DefaultRevamp/leaderboards.tpl +++ b/custom/templates/DefaultRevamp/leaderboards.tpl @@ -7,52 +7,62 @@
-
+
-
-
+
+
{foreach from=$LEADERBOARD_PLACEHOLDERS item=placeholder} - - {$placeholder->leaderboard_title} - + + {$placeholder->leaderboard_title} + {/foreach}
-
+ +
{foreach from=$LEADERBOARD_PLACEHOLDERS item=placeholder} - + {/foreach}
diff --git a/modules/Core/language/en_UK.json b/modules/Core/language/en_UK.json index 7d1a74e43f..fb80fc35fc 100644 --- a/modules/Core/language/en_UK.json +++ b/modules/Core/language/en_UK.json @@ -157,6 +157,7 @@ "admin/download": "Download", "admin/download_sitemap": "Download Sitemap", "admin/downloads_x": "Downloads: {{downloads}}", + "admin/drag_and_drop": "You can drag and drop the items in this list.", "admin/drag_files_here": "Drag files here to upload.", "admin/dropdown_items": "Dropdown Items", "admin/dropdown_name": "Dropdown Name", @@ -867,6 +868,7 @@ "general/invalid_token": "Invalid token, please try again.", "general/ip": "IP", "general/joined": "Joined", + "general/last_updated": "Last updated: {{lastUpdated}}", "general/latest_member": "Latest Member", "general/leaderboards": "Leaderboards", "general/link": "Link", diff --git a/modules/Core/pages/leaderboards.php b/modules/Core/pages/leaderboards.php index 43cdba603e..ffaed11bf5 100644 --- a/modules/Core/pages/leaderboards.php +++ b/modules/Core/pages/leaderboards.php @@ -53,12 +53,20 @@ $leaderboard_users[$uuid] = $integration_user; } + $last_updated = $timeago->inWords($row->last_updated, $language); + $row_data->server_id = $leaderboard_placeholder->server_id; $row_data->name = $leaderboard_placeholder->name; $row_data->username = Output::getClean($leaderboard_users[$uuid]->data()->username); $row_data->avatar = AvatarSource::getAvatarFromUUID($uuid, 24); $row_data->value = $row->value; - $row_data->last_updated = ucfirst($timeago->inWords($row->last_updated, $language)); + $row_data->last_updated_string = $language->get('general', 'last_updated', ['lastUpdated' => $last_updated]); + $row_data->last_updated = $last_updated; + $row_data->last_updated_full = date(DATE_FORMAT, $row->last_updated); + $row_data->style = $leaderboard_users[$uuid]->getUser()->getGroupStyle(); + $row_data->profile = $leaderboard_users[$uuid]->getUser()->getProfileURL(); + $row_data->groups = $leaderboard_users[$uuid]->getUser()->getAllGroupHtml(); + $row_data->groupIds = $leaderboard_users[$uuid]->getUser()->getAllGroupIds(); $leaderboard_placeholders_data[] = $row_data; } diff --git a/modules/Core/pages/panel/placeholders.php b/modules/Core/pages/panel/placeholders.php index 49d4cae809..77c9c6f1b2 100644 --- a/modules/Core/pages/panel/placeholders.php +++ b/modules/Core/pages/panel/placeholders.php @@ -79,55 +79,74 @@ 'LEADERBOARD_SORT' => $language->get('admin', 'placeholder_leaderboard_sort'), 'INTEGRATIONS' => $language->get('admin', 'integrations'), 'MINECRAFT' => $language->get('admin', 'minecraft'), - 'MINECRAFT_LINK' => URL::build('/panel/minecraft') + 'MINECRAFT_LINK' => URL::build('/panel/minecraft'), + 'REORDER_DRAG_URL' => URL::build('/panel/minecraft/placeholders', 'action=order'), ]); } else { Redirect::to(URL::build('/panel/minecraft/placeholders')); } } else { - if (Input::exists()) { - if (Token::check()) { - - if (Input::get('action') === 'settings') { - // Update placeholders value - Settings::set('placeholders', (isset($_POST['placeholders_enabled']) && $_POST['placeholders_enabled'] == 'on') ? '1' : '0'); - - foreach ($all_placeholders as $placeholder) { - $friendly_name_input = Input::get('friendly_name-' . $placeholder->name . '-server-' . $placeholder->server_id); - $friendly_name = $friendly_name_input == '' ? null : $friendly_name_input; - $show_on_profile = Input::get('show_on_profile-' . $placeholder->name . '-server-' . $placeholder->server_id) == 'on' ? 1 : 0; - $show_on_forum = Input::get('show_on_forum-' . $placeholder->name . '-server-' . $placeholder->server_id) == 'on' ? 1 : 0; - - DB::getInstance()->query('UPDATE nl2_placeholders_settings SET friendly_name = ?, show_on_profile = ?, show_on_forum = ? WHERE name = ? AND server_id = ?', [ - $friendly_name, - $show_on_profile, - $show_on_forum, - $placeholder->name, - $placeholder->server_id - ]); - } - - Session::flash('placeholders_success', $language->get('admin', 'updated_placeholder_settings')); - Redirect::to(URL::build('/panel/minecraft/placeholders')); - } else { - // Deleting placeholder - $placeholder_safe_name = Input::get('placeholder_safe_name'); - $server_id = Input::get('server_id'); - - $placeholder = Placeholders::getInstance()->getPlaceholder($server_id, $placeholder_safe_name); - if ($placeholder) { - DB::getInstance()->query('DELETE FROM nl2_placeholders_settings WHERE name = ? AND server_id = ?', [ - $placeholder->name, - $placeholder->server_id, - ]); - - die('Ok'); - } - - die('No placeholder found'); + switch (Input::get('action')) { + case 'settings': + // Update placeholders value + Settings::set('placeholders', (isset($_POST['placeholders_enabled']) && $_POST['placeholders_enabled'] == 'on') ? '1' : '0'); + + foreach ($all_placeholders as $placeholder) { + $friendly_name_input = Input::get('friendly_name-' . $placeholder->name . '-server-' . $placeholder->server_id); + $friendly_name = $friendly_name_input == '' ? null : $friendly_name_input; + $show_on_profile = Input::get('show_on_profile-' . $placeholder->name . '-server-' . $placeholder->server_id) == 'on' ? 1 : 0; + $show_on_forum = Input::get('show_on_forum-' . $placeholder->name . '-server-' . $placeholder->server_id) == 'on' ? 1 : 0; + + DB::getInstance()->query('UPDATE nl2_placeholders_settings SET friendly_name = ?, show_on_profile = ?, show_on_forum = ? WHERE name = ? AND server_id = ?', [ + $friendly_name, + $show_on_profile, + $show_on_forum, + $placeholder->name, + $placeholder->server_id + ]); + } + + Session::flash('placeholders_success', $language->get('admin', 'updated_placeholder_settings')); + Redirect::to(URL::build('/panel/minecraft/placeholders')); + + case 'order': + if (isset($_POST['placeholders'])) { + $placeholders = json_decode($_POST['placeholders'])->placeholders; + + $i = 1; + foreach ($placeholders as $item) { + $exploded = explode('-', $item); + $server_id = array_shift($exploded); + $placeholder_name = implode('-', $exploded); + + DB::getInstance()->query('UPDATE nl2_placeholders_settings SET `order` = ? WHERE `name` = ? AND server_id = ?', [ + $i++, + $placeholder_name, + $server_id, + ]); + } + } + die('Complete'); + + default: + // Deleting placeholder + $placeholder_safe_name = Input::get('placeholder_safe_name'); + $server_id = Input::get('server_id'); + + $placeholder = Placeholders::getInstance()->getPlaceholder($server_id, $placeholder_safe_name); + if ($placeholder) { + DB::getInstance()->query('DELETE FROM nl2_placeholders_settings WHERE name = ? AND server_id = ?', [ + $placeholder->name, + $placeholder->server_id, + ]); + + die('Ok'); + } + + die('No placeholder found'); } } else { @@ -143,6 +162,7 @@ 'TOKEN' => Token::get(), 'INFO' => $language->get('general', 'info'), 'SUBMIT' => $language->get('general', 'submit'), + 'DRAG_AND_DROP_INFO' => $language->get('admin', 'drag_and_drop'), 'PLACEHOLDERS_INFO' => $language->get('admin', 'placeholders_info'), 'ALL_PLACEHOLDERS' => $all_placeholders, 'NO_PLACEHOLDERS' => $language->get('admin', 'placeholders_none'),