Merge pull request #187 from Grizzelbee/Development

V2.5.1 (2022-03-23) (Halo of the dark)
Grizzelbee · Mar 23, 2022 · 1a25a22 · 1a25a22
2 parents 9f8953b + 03454ab
commit 1a25a22
Show file tree

Hide file tree

Showing 17 changed files with 137 additions and 65 deletions.
diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "Passwort Ihres Dyson-Kontos.",
     "switzerland": "Schweiz",
     "temperatureUnit_desc": "Einheit zur Anzeige der Temperatur.",
-    "token_inside": "Ein Token wurde empfangen und gespeichert."
+    "token_inside": "Ein Token wurde empfangen und gespeichert.",
+    "token_inside_desc": "Zeigt an, ob von den Dyson-Servern ein Authentifizierungstoken empfangen wurde, das für die Anmeldung erforderlich ist – der Adapter funktioniert nicht, wenn dieses Kontrollkästchen nicht aktiviert ist."
 }
diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "Password of your dyson account.",
     "switzerland": "Switzerland",
     "temperatureUnit_desc": "Unit to display the temperature.",
-    "token_inside": "A token has been received and stored."
+    "token_inside": "A token has been received and stored.",
+    "token_inside_desc": "Indicates whether an auth-token has been received from the dyson servers which is needed to login - the adapter will not work without having this checkbox checked."
 }
diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "Contraseña de su cuenta de dyson.",
     "switzerland": "Suiza",
     "temperatureUnit_desc": "Unidad para mostrar la temperatura.",
-    "token_inside": "Se ha recibido y almacenado un token."
+    "token_inside": "Se ha recibido y almacenado un token.",
+    "token_inside_desc": "Indica si se ha recibido un token de autenticación de los servidores de Dyson que se necesita para iniciar sesión; el adaptador no funcionará sin marcar esta casilla de verificación."
 }
diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "Mot de passe de votre compte dyson.",
     "switzerland": "Suisse",
     "temperatureUnit_desc": "Unité pour afficher la température.",
-    "token_inside": "Un jeton a été reçu et stocké."
+    "token_inside": "Un jeton a été reçu et stocké.",
+    "token_inside_desc": "Indique si un jeton d'authentification a été reçu des serveurs Dyson qui est nécessaire pour se connecter - l'adaptateur ne fonctionnera pas si cette case n'est pas cochée."
 }
diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "Password del tuo account dyson.",
     "switzerland": "Svizzera",
     "temperatureUnit_desc": "Unità per visualizzare la temperatura.",
-    "token_inside": "Un token è stato ricevuto e archiviato."
+    "token_inside": "Un token è stato ricevuto e archiviato.",
+    "token_inside_desc": "Indica se è stato ricevuto un token di autenticazione dai server dyson che è necessario per accedere: l'adattatore non funzionerà senza aver selezionato questa casella di controllo."
 }
diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "Wachtwoord van uw dyson-account.",
     "switzerland": "Zwitserland",
     "temperatureUnit_desc": "Eenheid om de temperatuur weer te geven.",
-    "token_inside": "Er is een token ontvangen en opgeslagen."
+    "token_inside": "Er is een token ontvangen en opgeslagen.",
+    "token_inside_desc": "Geeft aan of er een auth-token is ontvangen van de dyson-servers die nodig is om in te loggen - de adapter zal niet werken zonder dat dit selectievakje is aangevinkt."
 }
diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "Hasło Twojego konta Dyson.",
     "switzerland": "Szwajcaria",
     "temperatureUnit_desc": "Jednostka do wyświetlania temperatury.",
-    "token_inside": "Token został odebrany i zapisany."
+    "token_inside": "Token został odebrany i zapisany.",
+    "token_inside_desc": "Wskazuje, czy z serwerów dyson został odebrany token uwierzytelniania, który jest potrzebny do zalogowania — adapter nie będzie działał bez zaznaczenia tego pola wyboru."
 }
diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "Senha da sua conta dyson.",
     "switzerland": "Suíça",
     "temperatureUnit_desc": "Unidade para exibir a temperatura.",
-    "token_inside": "Um token foi recebido e armazenado."
+    "token_inside": "Um token foi recebido e armazenado.",
+    "token_inside_desc": "Indica se um token de autenticação foi recebido dos servidores dison que é necessário para efetuar login - o adaptador não funcionará sem que esta caixa de seleção esteja marcada."
 }
diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "Пароль вашей учетной записи dyson.",
     "switzerland": "Швейцария",
     "temperatureUnit_desc": "Единица для отображения температуры.",
-    "token_inside": "Токен получен и сохранен."
+    "token_inside": "Токен получен и сохранен.",
+    "token_inside_desc": "Указывает, был ли получен токен авторизации от серверов Dyson, необходимый для входа в систему — адаптер не будет работать, если этот флажок не установлен."
 }
diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json
@@ -40,5 +40,6 @@
     "password_desc": "dyson帐户的密码。",
     "switzerland": "瑞士",
     "temperatureUnit_desc": "显示温度的单位。",
-    "token_inside": "已接收并存储令牌。"
+    "token_inside": "已接收并存储令牌。",
+    "token_inside_desc": "指示是否已从需要登录的戴森服务器接收到身份验证令牌 - 如果不选中此复选框，适配器将无法工作。"
 }
diff --git a/admin/index_m.html b/admin/index_m.html
@@ -239,44 +239,41 @@
                     <label for="disableReconnectLogging"  class="translate">disableReconnectLogging</label><br/>
                     <span class="tooltiptext translate">disableReconnectLogging_desc</span>
                 </div>
-
-            </div>
-            <div class="row">
-                <div class="col s12 m12"> <!--s12 m4 l2 -->
-                    <button class="waves-effect waves-light btn btn-iobroker col s4 m3 l3" onclick="getDyson2faMail()"><span class="translate">Get 2 FA code</span></button>
-                    </br></br></br><div>
-                    <span class="translate">btn_2fa_desc</span></div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="input-field col s12 m4">
-                    <input class="value" id="challengeId" type="text">
-                    <label class="translate" for="challengeId">Lbl_challengeId</label>
-                    <span class="translate">challengeId_desc</span>
-                </div>
-                <div class="input-field col s12 m4">
-                    <input class="value" id="dyson_code" maxlength="32" type="text">
-                    <label class="translate" for="dyson_code">Lbl_dyson_code</label>
-                    <span class="translate">dyson_code_desc</span>
-                </div>
-                <div class="input-field col s6 m4">
-                    </br></br>
+                <div class="input-field tooltip col s6 m4">
                     <input type="checkbox" id="token_inside" class="value" onclick="return false;" onkeydown="return false;" disabled="true"/>
                     <span for="token_inside"  class="translate">token_inside</span>
-                    </br>
-                </div>
-                <div class="input-field col s12 m4 hide">
-                    <input class="value hide" id="token" type="text">
-                    <label class="translate hide" for="token">Lbl_token</label>
+                    <span class="tooltiptext translate">token_inside_desc</span>
                 </div>
             </div>
             <div class="row">
-                <div class="col s12 m12"> <!--s12 m4 l2 -->
-                    <button class="waves-effect waves-light btn btn-iobroker col s4 m3 l3" onclick="getDysonToken()"><span class="translate">Finish</span></button>
-                    </br></br></br>
-                    <div><span class="translate">finish_desc</span></div>
+                <div class="row">
+                    <div class="input-field col s12 m4">
+                        <input class="value" id="challengeId" type="text">
+                        <label class="translate" for="challengeId">Lbl_challengeId</label>
+                        <span class="translate">challengeId_desc</span>
+                    </div>
+                    <div class="input-field col s12 m4">
+                        <input class="value" id="dyson_code" maxlength="32" type="text">
+                        <label class="translate" for="dyson_code">Lbl_dyson_code</label>
+                        <span class="translate">dyson_code_desc</span>
+                    </div>
+                    <div class="input-field col s12 m4 hide">
+                        <input class="value hide" id="token" type="text">
+                        <label class="translate hide" for="token">Lbl_token</label>
+                    </div>
+                </div>
+                <div class="input-field col s6 m4"> <!--s12 m4 l2 -->
+                    <button class="waves-effect waves-light btn btn-iobroker col s6 m6 l6" onclick="getDyson2faMail()"><span class="translate">Get 2 FA code</span></button>
+                    <br/><br/><br/>
+                    <span class="translate">btn_2fa_desc</span>
+                </div>
+                <div class="input-field col s6 m4"> <!--s12 m4 l2 -->
+                    <button class="waves-effect waves-light btn btn-iobroker col s6 m6 l6" onclick="getDysonToken()"><span class="translate">Finish</span></button>
+                    <br/><br/><br/>
+                    <span class="translate">finish_desc</span>
                 </div>
             </div>
+
         </div>
     </body>
 </html>
diff --git a/admin/style.css b/admin/style.css
@@ -8,3 +8,52 @@
 }
 
 /* Add your styles here */
+/* Add your styles here */
+/* Tooltip container */
+.tooltip {
+    position: relative;
+    display: inline-block;
+    /*border-bottom: 1px dotted black; /* If you want dots under the hoverable text */
+}
+
+/* Tooltip text */
+.tooltip .tooltiptext {
+    visibility: hidden;
+    width: 250px;
+    background-color: #777;
+    color: #fff;
+    text-align: center;
+    padding: 5px 0;
+    border-radius: 6px;
+
+    /* Position the tooltip text */
+    position: absolute;
+    z-index: 1;
+    bottom: 125%;
+    left: 50%;
+    margin-left: -60px;
+
+    /* Fade in tooltip */
+    opacity: 0;
+    transition: opacity 1s;
+
+    font-size: 10px;
+}
+
+/* Tooltip arrow */
+.tooltip .tooltiptext::after {
+    content: "";
+    position: absolute;
+    top: 100%;
+    left: 23.5%;
+    margin-left: -5px;
+    border-width: 5px;
+    border-style: solid;
+    border-color: #555 transparent transparent transparent;
+}
+
+/* Show the tooltip text when you mouse over the tooltip container */
+.tooltip:hover .tooltiptext {
+    visibility: visible;
+    opacity: 1;
+}
diff --git a/admin/words.js b/admin/words.js
diff --git a/io-package.json b/io-package.json
@@ -1,8 +1,20 @@
 {
     "common": {
         "name": "dysonairpurifier",
-        "version": "2.5.0",
+        "version": "2.5.1",
         "news": {
+            "2.5.1": {
+                "en": "Improved layout of config page and added tooltips to checkboxes.",
+                "de": "Verbessertes Layout der Konfigurationsseite und Tooltips zu Kontrollkästchen hinzugefügt.",
+                "ru": "Улучшен макет страницы конфигурации и добавлены всплывающие подсказки к флажкам.",
+                "pt": "Layout aprimorado da página de configuração e dicas de ferramentas adicionadas às caixas de seleção.",
+                "nl": "Verbeterde lay-out van de configuratiepagina en tooltips toegevoegd aan selectievakjes.",
+                "fr": "Mise en page améliorée de la page de configuration et ajout d'info-bulles aux cases à cocher.",
+                "it": "Layout migliorato della pagina di configurazione e aggiunta di suggerimenti alle caselle di controllo.",
+                "es": "Se mejoró el diseño de la página de configuración y se agregó información sobre herramientas a las casillas de verificación.",
+                "pl": "Ulepszony układ strony konfiguracji i dodane podpowiedzi do pól wyboru.",
+                "zh-cn": "改进了配置页面的布局并为复选框添加了工具提示。"
+            },
             "2.5.0": {
                 "en": "Added option to disable the logging of reconnect events.",
                 "de": "Option hinzugefügt, um die Protokollierung von Wiederverbindungsereignissen zu deaktivieren.",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.dysonairpurifier",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "dyson air purifiers and fans",
   "author": {
     "name": "grizzelbee",
@@ -25,13 +25,13 @@
   "dependencies": {
     "@iobroker/adapter-core": "^2.6.0",
     "@iobroker/plugin-sentry": "^1.2.0",
+    "@snyk/protect": "^1.880.0",
     "axios": "^0.26.1",
     "flatted": "^3.2.5",
     "https": "^1.0.0",
     "lodash": "^4.17.21",
     "mqtt": "^4.3.7",
     "path": "^0.12.7",
-    "snyk": "^1.880.0",
     "ssl-root-cas": "^1.3.1"
   },
   "devDependencies": {
@@ -64,7 +64,7 @@
     "test:integration": "mocha test/integration --exit",
     "test": "npm run test:js && npm run test:package",
     "lint": "eslint",
-    "snyk-protect": "snyk protect",
+    "snyk-protect": "snyk-protect",
     "prepare": "npm run snyk-protect"
   },
   "bugs": {