Skip to content

Commit 1a25a22

Browse files
GrizzelbeeGrizzelbee
authored
Merge pull request #187 from Grizzelbee/Development
V2.5.1 (2022-03-23) (Halo of the dark)
2 parents 9f8953b + 03454ab commit 1a25a22

17 files changed

+137
-65
lines changed

‎admin/i18n/de/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "Passwort Ihres Dyson-Kontos.",
4141
"switzerland": "Schweiz",
4242
"temperatureUnit_desc": "Einheit zur Anzeige der Temperatur.",
43-
"token_inside": "Ein Token wurde empfangen und gespeichert."
43+
"token_inside": "Ein Token wurde empfangen und gespeichert.",
44+
"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."
4445
}

‎admin/i18n/en/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "Password of your dyson account.",
4141
"switzerland": "Switzerland",
4242
"temperatureUnit_desc": "Unit to display the temperature.",
43-
"token_inside": "A token has been received and stored."
43+
"token_inside": "A token has been received and stored.",
44+
"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."
4445
}

‎admin/i18n/es/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "Contraseña de su cuenta de dyson.",
4141
"switzerland": "Suiza",
4242
"temperatureUnit_desc": "Unidad para mostrar la temperatura.",
43-
"token_inside": "Se ha recibido y almacenado un token."
43+
"token_inside": "Se ha recibido y almacenado un token.",
44+
"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."
4445
}

‎admin/i18n/fr/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "Mot de passe de votre compte dyson.",
4141
"switzerland": "Suisse",
4242
"temperatureUnit_desc": "Unité pour afficher la température.",
43-
"token_inside": "Un jeton a été reçu et stocké."
43+
"token_inside": "Un jeton a été reçu et stocké.",
44+
"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."
4445
}

‎admin/i18n/it/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "Password del tuo account dyson.",
4141
"switzerland": "Svizzera",
4242
"temperatureUnit_desc": "Unità per visualizzare la temperatura.",
43-
"token_inside": "Un token è stato ricevuto e archiviato."
43+
"token_inside": "Un token è stato ricevuto e archiviato.",
44+
"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."
4445
}

‎admin/i18n/nl/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "Wachtwoord van uw dyson-account.",
4141
"switzerland": "Zwitserland",
4242
"temperatureUnit_desc": "Eenheid om de temperatuur weer te geven.",
43-
"token_inside": "Er is een token ontvangen en opgeslagen."
43+
"token_inside": "Er is een token ontvangen en opgeslagen.",
44+
"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."
4445
}

‎admin/i18n/pl/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "Hasło Twojego konta Dyson.",
4141
"switzerland": "Szwajcaria",
4242
"temperatureUnit_desc": "Jednostka do wyświetlania temperatury.",
43-
"token_inside": "Token został odebrany i zapisany."
43+
"token_inside": "Token został odebrany i zapisany.",
44+
"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."
4445
}

‎admin/i18n/pt/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "Senha da sua conta dyson.",
4141
"switzerland": "Suíça",
4242
"temperatureUnit_desc": "Unidade para exibir a temperatura.",
43-
"token_inside": "Um token foi recebido e armazenado."
43+
"token_inside": "Um token foi recebido e armazenado.",
44+
"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."
4445
}

‎admin/i18n/ru/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "Пароль вашей учетной записи dyson.",
4141
"switzerland": "Швейцария",
4242
"temperatureUnit_desc": "Единица для отображения температуры.",
43-
"token_inside": "Токен получен и сохранен."
43+
"token_inside": "Токен получен и сохранен.",
44+
"token_inside_desc": "Указывает, был ли получен токен авторизации от серверов Dyson, необходимый для входа в систему — адаптер не будет работать, если этот флажок не установлен."
4445
}

‎admin/i18n/zh-cn/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"password_desc": "dyson帐户的密码。",
4141
"switzerland": "瑞士",
4242
"temperatureUnit_desc": "显示温度的单位。",
43-
"token_inside": "已接收并存储令牌。"
43+
"token_inside": "已接收并存储令牌。",
44+
"token_inside_desc": "指示是否已从需要登录的戴森服务器接收到身份验证令牌 - 如果不选中此复选框，适配器将无法工作。"
4445
}

‎admin/index_m.html

+28-31
Original file line numberDiff line numberDiff line change
@@ -239,44 +239,41 @@
239239
<label for="disableReconnectLogging" class="translate">disableReconnectLogging</label><br/>
240240
<span class="tooltiptext translate">disableReconnectLogging_desc</span>
241241
</div>
242-
243-
</div>
244-
<div class="row">
245-
<div class="col s12 m12"> <!--s12 m4 l2 -->
246-
<button class="waves-effect waves-light btn btn-iobroker col s4 m3 l3" onclick="getDyson2faMail()"><span class="translate">Get 2 FA code</span></button>
247-
</br></br></br><div>
248-
<span class="translate">btn_2fa_desc</span></div>
249-
</div>
250-
</div>
251-
<div class="row">
252-
<div class="input-field col s12 m4">
253-
<input class="value" id="challengeId" type="text">
254-
<label class="translate" for="challengeId">Lbl_challengeId</label>
255-
<span class="translate">challengeId_desc</span>
256-
</div>
257-
<div class="input-field col s12 m4">
258-
<input class="value" id="dyson_code" maxlength="32" type="text">
259-
<label class="translate" for="dyson_code">Lbl_dyson_code</label>
260-
<span class="translate">dyson_code_desc</span>
261-
</div>
262-
<div class="input-field col s6 m4">
263-
</br></br>
242+
<div class="input-field tooltip col s6 m4">
264243
<input type="checkbox" id="token_inside" class="value" onclick="return false;" onkeydown="return false;" disabled="true"/>
265244
<span for="token_inside" class="translate">token_inside</span>
266-
</br>
267-
</div>
268-
<div class="input-field col s12 m4 hide">
269-
<input class="value hide" id="token" type="text">
270-
<label class="translate hide" for="token">Lbl_token</label>
245+
<span class="tooltiptext translate">token_inside_desc</span>
271246
</div>
272247
</div>
273248
<div class="row">
274-
<div class="col s12 m12"> <!--s12 m4 l2 -->
275-
<button class="waves-effect waves-light btn btn-iobroker col s4 m3 l3" onclick="getDysonToken()"><span class="translate">Finish</span></button>
276-
</br></br></br>
277-
<div><span class="translate">finish_desc</span></div>
249+
<div class="row">
250+
<div class="input-field col s12 m4">
251+
<input class="value" id="challengeId" type="text">
252+
<label class="translate" for="challengeId">Lbl_challengeId</label>
253+
<span class="translate">challengeId_desc</span>
254+
</div>
255+
<div class="input-field col s12 m4">
256+
<input class="value" id="dyson_code" maxlength="32" type="text">
257+
<label class="translate" for="dyson_code">Lbl_dyson_code</label>
258+
<span class="translate">dyson_code_desc</span>
259+
</div>
260+
<div class="input-field col s12 m4 hide">
261+
<input class="value hide" id="token" type="text">
262+
<label class="translate hide" for="token">Lbl_token</label>
263+
</div>
264+
</div>
265+
<div class="input-field col s6 m4"> <!--s12 m4 l2 -->
266+
<button class="waves-effect waves-light btn btn-iobroker col s6 m6 l6" onclick="getDyson2faMail()"><span class="translate">Get 2 FA code</span></button>
267+
<br/><br/><br/>
268+
<span class="translate">btn_2fa_desc</span>
269+
</div>
270+
<div class="input-field col s6 m4"> <!--s12 m4 l2 -->
271+
<button class="waves-effect waves-light btn btn-iobroker col s6 m6 l6" onclick="getDysonToken()"><span class="translate">Finish</span></button>
272+
<br/><br/><br/>
273+
<span class="translate">finish_desc</span>
278274
</div>
279275
</div>
276+
280277
</div>
281278
</body>
282279
</html>

‎admin/style.css

+49
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,52 @@
88
}
99

1010
/* Add your styles here */
11+
/* Add your styles here */
12+
/* Tooltip container */
13+
.tooltip {
14+
position: relative;
15+
display: inline-block;
16+
/*border-bottom: 1px dotted black; /* If you want dots under the hoverable text */
17+
}
18+
19+
/* Tooltip text */
20+
.tooltip .tooltiptext {
21+
visibility: hidden;
22+
width: 250px;
23+
background-color: #777;
24+
color: #fff;
25+
text-align: center;
26+
padding: 5px 0;
27+
border-radius: 6px;
28+
29+
/* Position the tooltip text */
30+
position: absolute;
31+
z-index: 1;
32+
bottom: 125%;
33+
left: 50%;
34+
margin-left: -60px;
35+
36+
/* Fade in tooltip */
37+
opacity: 0;
38+
transition: opacity 1s;
39+
40+
font-size: 10px;
41+
}
42+
43+
/* Tooltip arrow */
44+
.tooltip .tooltiptext::after {
45+
content: "";
46+
position: absolute;
47+
top: 100%;
48+
left: 23.5%;
49+
margin-left: -5px;
50+
border-width: 5px;
51+
border-style: solid;
52+
border-color: #555 transparent transparent transparent;
53+
}
54+
55+
/* Show the tooltip text when you mouse over the tooltip container */
56+
.tooltip:hover .tooltiptext {
57+
visibility: visible;
58+
opacity: 1;
59+
}

‎admin/words.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎io-package.json

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11
{
22
"common": {
33
"name": "dysonairpurifier",
4-
"version": "2.5.0",
4+
"version": "2.5.1",
55
"news": {
6+
"2.5.1": {
7+
"en": "Improved layout of config page and added tooltips to checkboxes.",
8+
"de": "Verbessertes Layout der Konfigurationsseite und Tooltips zu Kontrollkästchen hinzugefügt.",
9+
"ru": "Улучшен макет страницы конфигурации и добавлены всплывающие подсказки к флажкам.",
10+
"pt": "Layout aprimorado da página de configuração e dicas de ferramentas adicionadas às caixas de seleção.",
11+
"nl": "Verbeterde lay-out van de configuratiepagina en tooltips toegevoegd aan selectievakjes.",
12+
"fr": "Mise en page améliorée de la page de configuration et ajout d'info-bulles aux cases à cocher.",
13+
"it": "Layout migliorato della pagina di configurazione e aggiunta di suggerimenti alle caselle di controllo.",
14+
"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.",
15+
"pl": "Ulepszony układ strony konfiguracji i dodane podpowiedzi do pól wyboru.",
16+
"zh-cn": "改进了配置页面的布局并为复选框添加了工具提示。"
17+
},
618
"2.5.0": {
719
"en": "Added option to disable the logging of reconnect events.",
820
"de": "Option hinzugefügt, um die Protokollierung von Wiederverbindungsereignissen zu deaktivieren.",

‎package-lock.json

+19-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "iobroker.dysonairpurifier",
3-
"version": "2.5.0",
3+
"version": "2.5.1",
44
"description": "dyson air purifiers and fans",
55
"author": {
66
"name": "grizzelbee",
@@ -25,13 +25,13 @@
2525
"dependencies": {
2626
"@iobroker/adapter-core": "^2.6.0",
2727
"@iobroker/plugin-sentry": "^1.2.0",
28+
"@snyk/protect": "^1.880.0",
2829
"axios": "^0.26.1",
2930
"flatted": "^3.2.5",
3031
"https": "^1.0.0",
3132
"lodash": "^4.17.21",
3233
"mqtt": "^4.3.7",
3334
"path": "^0.12.7",
34-
"snyk": "^1.880.0",
3535
"ssl-root-cas": "^1.3.1"
3636
},
3737
"devDependencies": {
@@ -64,7 +64,7 @@
6464
"test:integration": "mocha test/integration --exit",
6565
"test": "npm run test:js && npm run test:package",
6666
"lint": "eslint",
67-
"snyk-protect": "snyk protect",
67+
"snyk-protect": "snyk-protect",
6868
"prepare": "npm run snyk-protect"
6969
},
7070
"bugs": {

0 commit comments

Comments
 (0)