From e04b619071fbcd58bbec7dfea307694949e13aa8 Mon Sep 17 00:00:00 2001 From: Zack Spear Date: Mon, 25 Sep 2023 18:22:22 -0700 Subject: [PATCH] feat(web): WIP registration page UI UX --- .../dynamix.my.servers/Registration.page | 249 +----------------- web/components/Registration.ce.vue | 11 + web/components/Registration/Item.vue | 12 +- web/components/Ui/CardWrapper.vue | 11 +- web/components/Ui/PageContainer.vue | 13 +- web/components/UpdateOs.ce.vue | 4 +- 6 files changed, 46 insertions(+), 254 deletions(-) diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page index fa79d9bc9..6665f33a7 100644 --- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page +++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page @@ -4,18 +4,7 @@ Title="Registration" Icon="icon-registration" Tag="pencil" --- - -'; ?> - - - - -_(Thank you for trying Unraid OS)_! - - - -_(Thank you for choosing Unraid OS)_! - - - - - -
-:registration_1_plug: -Your server will not be usable until you purchase a Registration key or install a free 30 day *Trial* key. A *Trial* -key provides all the functionality of a *Pro* Registration key. - -Registration keys are bound to your USB Flash boot device serial number (GUID). Please use a high quality name brand device -at least 1GB in size (min 4GB recommended). - -Note: USB memory card readers are generally **not** supported because most do not present unique serial numbers. -:end -
- - - - - -
-:registration_3_plug: -Your *Trial* key includes all the functionality and device support of a *Pro* Registration key. - -After your *Trial* key has reached expiration, your server **still functions normally** until the next time you **Stop** the array. - -At that point, you may either purchase a Registration key, or request a *Trial* extension. -:end -
- - - - - -
-_(Cannot connect to key-server)_! - -_(Your *Trial* key requires an internet connection)_. _(Please check your)_ [_(Network Settings)_](NetworkSettings). -
- - - - - -
-_(Release has been withdrawn)_! - -_(This release has been withdrawn for use with *Trial* keys)_. -
- - - - - -
-_(Your *Trial* key has expired)_. - - -:registration_4_plug: -To continue using Unraid OS you may purchase a Registration key. Alternately, you may request a *Trial* extension key. -:end - -:registration_trial_extension_ineligible_plug: -You have used all your Trial extensions. To continue using Unraid OS you may purchase a Registration key. -:end - -
- - - - - -_(Invalid *Trial* Installation)_ -
-:registration_5_plug: -It is not possible to use a *Trial* key with an existing Unraid OS installation. - -You may purchase a Registration key corresponding to this USB Flash device to continue using this installation. - -For more information, please [Contact Support](https://lime-technology.com/contact). -:end -
- - - - - -_(Missing Key File)_ -
-:registration_6_plug: -It appears that your Registration key file is corrupted or missing. The key file should be located in the -[config](/Registration/Browse?dir=/boot/config) directory on your USB Flash boot device. - -If you do not have a backup copy of your Registration key file, [Contact Support](https://lime-technology.com/contact). - -If this was a *Trial* installation, you may purchase a Registration key. -:end -
- - - - - -_(The registered GUID does not match the USB Flash boot device GUID)_ - - - -
-:registration_7_plug: -*Trial* installations are only valid with the originally registered USB Flash device. - -To continue using this installation with this USB Flash device, you may purchase a Registration key. -:end -
- - - -
-:registration_8_plug: -The Registration key file does not correspond to the USB Flash boot device. -Please copy the correct key file to the [config](/Registration/Browse?dir=/boot/config) directory -on your USB Flash boot device. If you do not have a backup copy of your key file, [Contact Support](https://lime-technology.com/contact). - -If you want to replace your Registration key with a new key bound to this USB Flash device, click Replace Key below. An original key may be -replaced anytime. Thereafter, a replacement key may be replaced again after one year has passed. If you require -another replacement key sooner, [Contact Support](https://lime-technology.com/contact). - -**Note:** Replacing a Registration key results in permanently *blacklisting* the previous USB Flash GUID. -:end -
- - - - - - -_(Blacklisted USB Flash GUID)_ -
-:registration_9_plug: -This USB Flash boot device has been *blacklisted*. This can occur as a result of transfering your Registration key to -a replacement USB Flash device, and you are currently booted from your old USB Flash device. - -A USB Flash device may also be *blacklisted* if there is no serial number, or if we discover the serial number -is not unique (this is common with USB card readers). - -For more information, please [Contact Support](https://lime-technology.com/contact). -:end -
- - - - - -_(***Trial*** key expires on)_: -: - - - - - -_(Expiration)_: -: - - - - - -_(Registered to)_: -: - -_(Registered on)_: -: - - - - - -_(Registered GUID)_: -: - - - - - -_(Error accessing your physical USB Flash boot device)_ -
-_(There is a physical problem accessing your USB Flash boot device)_. _(Please)_ [Contact Support](https://lime-technology.com/contact). - -_(Flash GUID)_: -: _(Error code)_: - - - -_(Flash GUID)_: -: - - - -_(Flash Vendor)_: -: - -_(Flash Product)_: -: - - - -_(Replaceable)_: -: - - - - - -
- - - -  -: diff --git a/web/components/Registration.ce.vue b/web/components/Registration.ce.vue index 047cad7a7..bbd0fb67b 100644 --- a/web/components/Registration.ce.vue +++ b/web/components/Registration.ce.vue @@ -41,8 +41,10 @@ const { guid, flashVendor, flashProduct, + regGuid, regTm, regTo, + state, stateData, stateDataError, } = storeToRefs(serverStore); @@ -61,6 +63,15 @@ const items = computed(() => { label: 'Updates Expire:', text: dayjs(regTm.value).format('YYYY-MM-DD HH:mm'), }, + ...(state.value === 'EGUID' + ? [ + { + label: 'Registered GUID:', + text: regGuid.value, + }, + ] + : [] + ), { label: 'Flash GUID:', text: guid.value, diff --git a/web/components/Registration/Item.vue b/web/components/Registration/Item.vue index a1a84d3d6..69ce3ed8e 100644 --- a/web/components/Registration/Item.vue +++ b/web/components/Registration/Item.vue @@ -1,4 +1,7 @@ +