From 4d3e8bee8491d3ee5d171810673136eadf3592f6 Mon Sep 17 00:00:00 2001 From: Zack Spear Date: Wed, 27 Sep 2023 17:14:42 -0700 Subject: [PATCH] refactor(web): replace key eligibility using store --- .../dynamix.my.servers/include/state.php | 3 +- web/components/Registration/ReplaceCheck.vue | 95 ++-------------- web/store/replaceCheck.ts | 107 ++++++++++++++++++ 3 files changed, 117 insertions(+), 88 deletions(-) create mode 100644 web/store/replaceCheck.ts diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php index 3f2c63f63..daf9d0ba8 100644 --- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php +++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php @@ -59,12 +59,13 @@ $serverState = [ "name" => htmlspecialchars($var['NAME']), "osVersion" => $var['version'], "protocol" => $_SERVER['REQUEST_SCHEME'], + "regDev" => (int)$var['regDev'] ?? 0, "regGen" => (int)$var['regGen'], "regGuid" => @$var['regGUID'] ?? '', "regTo" => @htmlspecialchars($var['regTo']) ?? '', "regTm" => $var['regTm'] ? @$var['regTm'] * 1000 : '', // JS expects milliseconds "regTy" => @$var['regTy'] ?? '', - "regUpdExpAt" => $var['regUpdExpAt'] ? @$var['regUpdExpAt'] * 1000 : '', // JS expects milliseconds + "regExp" => $var['regExp'] ? @$var['regExp'] * 1000 : '', // JS expects milliseconds "registered" => $registered, "registeredTime" => $myservers['remote']['regWizTime'] ?? '', "site" => $_SERVER['REQUEST_SCHEME'] . "://" . $_SERVER['HTTP_HOST'], diff --git a/web/components/Registration/ReplaceCheck.vue b/web/components/Registration/ReplaceCheck.vue index 47ebd8637..f827b1544 100644 --- a/web/components/Registration/ReplaceCheck.vue +++ b/web/components/Registration/ReplaceCheck.vue @@ -1,119 +1,40 @@