From 484caafaf4656f0f26bea5c4a6f5cf57a092c32a Mon Sep 17 00:00:00 2001 From: mabasian <54101509+mabasian@users.noreply.github.com> Date: Wed, 3 Jul 2024 21:29:16 +0200 Subject: [PATCH] UPDATE: tooltips and languages (#1921) * update the fetching * fix the new api for the testers * Revert "fix the new api for the testers" This reverts commit ab01562bba614a5ac3a60f186204e4ba992a178a. * Revert "update the fetching" This reverts commit b5a052c880f412cd597f73d00b5e0c6ad9702836. * Fix the nuke modal animation * Revert "Fix the nuke modal animation" This reverts commit 3c5b547c69f0681fc0651fa392d327489d46ecc2. * FIX: footer and multi Server size * ADD: tooltips to the server details * ADD: tooltip for change the password * ADD:tooltip to the server panel * ADD:tooltip to the login page * ADD: tooltips to ssh manaement tab * ADD: tooltips to os update management * ADD: tooltip to server node setting * ADD: tooltips to the 2fa tab --- launcher/public/output.css | 17 +- .../server-management/MultiServerScreen.vue | 25 +- .../components/login-form/LoginForm.vue | 79 ++- .../components/saved-servers/ServerPanel.vue | 13 +- .../server-details/ChangePassword.vue | 22 +- .../server-details/ServerDetails.vue | 75 ++- .../server-settings/ServerSettings.vue | 16 +- .../components/server-update/UpdateRow.vue | 13 + .../components/server-update/UpdateServer.vue | 19 +- .../ssh-management/SshManagement.vue | 9 + .../two-factor-auth/TwoFactoSetupBox.vue | 7 + .../two-factor-auth/TwoFactorAuth.vue | 21 + .../components/UI/the-control/PeerToPeer.vue | 4 +- .../components/UI/the-control/SyncStatus.vue | 2 +- .../UI/the-node/ResyncSeparateServices.vue | 546 ------------------ launcher/src/components/layers/TheFooter.vue | 2 +- launcher/src/languages/en.json | 52 ++ 17 files changed, 275 insertions(+), 647 deletions(-) delete mode 100755 launcher/src/components/UI/the-node/ResyncSeparateServices.vue diff --git a/launcher/public/output.css b/launcher/public/output.css index 0546724a0..5df92cdad 100755 --- a/launcher/public/output.css +++ b/launcher/public/output.css @@ -1,7 +1,7 @@ @import url("https://fonts.googleapis.com/css2?family=Noto+Sans:wght@100;200;300;400;500;600;700;800;900&display=swap"); /* -! tailwindcss v3.4.3 | MIT License | https://tailwindcss.com +! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com */ /* @@ -1808,6 +1808,10 @@ video { height: 95%; } +.h-\[95\.5\%\]{ + height: 95.5%; +} + .h-fit{ height: -webkit-fit-content; height: -moz-fit-content; @@ -2380,12 +2384,6 @@ video { flex-shrink: 0; } -.flex-grow{ - -webkit-box-flex: 1; - -ms-flex-positive: 1; - flex-grow: 1; -} - .origin-top-right{ -webkit-transform-origin: top right; transform-origin: top right; @@ -5513,6 +5511,11 @@ html body { border-color: rgb(77 117 117 / var(--tw-border-opacity)); } +.hover\:border-amber-300:hover{ + --tw-border-opacity: 1; + border-color: rgb(252 211 77 / var(--tw-border-opacity)); +} + .hover\:border-blue-400:hover{ --tw-border-opacity: 1; border-color: rgb(96 165 250 / var(--tw-border-opacity)); diff --git a/launcher/src/components/UI/server-management/MultiServerScreen.vue b/launcher/src/components/UI/server-management/MultiServerScreen.vue index 9f24287ae..0edac6472 100644 --- a/launcher/src/components/UI/server-management/MultiServerScreen.vue +++ b/launcher/src/components/UI/server-management/MultiServerScreen.vue @@ -1,7 +1,7 @@ import ServerHeader from './components/ServerHeader.vue'; @@ -220,9 +212,7 @@ const serverHandler = (server) => { server.isSelected = true; } - serverStore.savedServers.savedConnections = [ - ...serverStore.savedServers.savedConnections, - ]; + serverStore.savedServers.savedConnections = [...serverStore.savedServers.savedConnections]; }; //Change password handling @@ -260,8 +250,7 @@ const removeServerHandler = async () => { serverStore.isRemoveProcessing = true; serverStore.savedServers.savedConnections = serverStore.savedServers.savedConnections.filter( (item) => - item.host !== serverStore.selectedServerToConnect?.host && - item.name !== serverStore.selectedServerToConnect?.name + item.host !== serverStore.selectedServerToConnect?.host && item.name !== serverStore.selectedServerToConnect?.name ); await remove(); @@ -285,9 +274,7 @@ const readSSHKeyFile = async () => { const confirmDelete = async (key) => { serverStore.sshKeys = serverStore.sshKeys.filter((item) => item !== key); try { - await ControlService.writeSSHKeyFile( - serverStore.sshKeys.filter((item) => item !== key) - ); + await ControlService.writeSSHKeyFile(serverStore.sshKeys.filter((item) => item !== key)); await readSSHKeyFile(); } catch (err) { console.log(err); diff --git a/launcher/src/components/UI/server-management/components/login-form/LoginForm.vue b/launcher/src/components/UI/server-management/components/login-form/LoginForm.vue index bce1cc9b7..ab7d72bd8 100644 --- a/launcher/src/components/UI/server-management/components/login-form/LoginForm.vue +++ b/launcher/src/components/UI/server-management/components/login-form/LoginForm.vue @@ -2,34 +2,30 @@
-
+
Login to server
-
+
{{ serverNameError ? serverNameError : `${t("multiServer.serverName")}` }}
@@ -59,8 +55,8 @@ src="/img/icon/server-management-icons/plus-icon.png" alt="icon" @mousedown.prevent - @mouseenter="addHovered = true" - @mouseleave="addHovered = false" + @mouseenter="(addHovered = true), (footerStore.cursorLocation = `${t('loginForm.save')}`)" + @mouseleave="(addHovered = false), (footerStore.cursorLocation = '')" @click="saveServer" />
-
+
-
+
-
+
-
+
{{ $t("formsetup.usessh") }} - +
@@ -222,20 +216,13 @@ for="keypath-file" class="h-8 col-start-12 col-span-full row-start-2 row-span-2 self-center w-full flex justify-center items-center cursor-pointer bg-gray-200 rounded-r-md" > -
+
+
- +
-
+
@@ -44,6 +46,8 @@ class="col-start-1 col-span-full w-full h-8 text-sm bg-gray-300 text-gray-700 font-semibold px-2 outline-none border rounded-sm" :class="error ? 'border-red-500' : 'border-transparent'" :placeholder="`${$t('multiServer.verifyPass')}`" + @mouseenter="footerStore.cursorLocation = `${t('serverDetail.confirmPass2')}`" + @mouseleave="footerStore.cursorLocation = ''" @input="handleInput" @keydown.enter="changePassword" /> @@ -55,12 +59,16 @@
Confirm
Cancel
@@ -69,9 +77,11 @@
@@ -80,6 +90,12 @@ - - diff --git a/launcher/src/components/layers/TheFooter.vue b/launcher/src/components/layers/TheFooter.vue index b38817fa0..bce06c875 100644 --- a/launcher/src/components/layers/TheFooter.vue +++ b/launcher/src/components/layers/TheFooter.vue @@ -24,7 +24,7 @@
- {{ footerStore.cursorLocation }} + {{ footerStore.cursorLocation }}
diff --git a/launcher/src/languages/en.json b/launcher/src/languages/en.json index 71ec09ef3..c32078227 100755 --- a/launcher/src/languages/en.json +++ b/launcher/src/languages/en.json @@ -999,5 +999,57 @@ "turnoff": "Turn off the {service}", "restart": "Restart the {service}", "log": "Open the logs of the {service}" + }, + "serverDetail": { + "serverName": "Server Name is {serverName}", + "serverIp": "Server IP is {serverIp}", + "machine": "Machine Name is {machineName}", + "port": "Port is {port}", + "userName": "Username is {userName}", + "chngAvatar": "Click to change the avatar", + "chngPass": "Click to change the password", + "confirmPass": "Please enter a password to change it", + "confirmPass2": "Please enter the password again", + "confirmBtn": "click to change your password", + "cancel": "cancel password change" + }, + "serverList": { + "search": "Search for a saved server", + "addServer": "Add a new server connection" + }, + "loginForm": { + "addServerName": "Add a server name", + "ipOrHost": "IP or Hostname", + "port": "default port is 22 but you can change it", + "uName": "Username", + "pass": "enter your password", + "tgll": "toggle to SSH key or password", + "save": "save added server", + "rem": "remove server" + }, + "sshManage": { + "genSshKey": "Generate SSH Key", + "addkey": "add an existing key" + }, + "osUpdate": { + "updateBtn": "Ready to update “{name}” to the new version “{version}”", + "updateAll": "Update all available updates" + }, + "serverSetting": { + "nodeServerTtl": "NODE & SERVER SETTINGS", + "auto": "Automated Node Updates", + "tgl": "Toggle to enable or disable automated node updates" + }, + "twoFactor": { + "setup": "agree to the terms and conditions", + "timeBase": "check if you want authentication tokens to be time-based", + "timeLimit": "check if you want to increase the original generation time limit to permit a time skew of up to 4 minutes", + "rateLimit": "check if you want to enable rate-limiting", + "next": "if you already check configuration click next", + "backUp": "do a backup by pressing the save button", + "confirm": "click confirm to activate 2FA", + "rem": "click to remove 2FA", + "send": "click to send the verification code", + "zoomQr": "click to zoom in the QR code" } }