diff --git a/.github/workflows/Attach Artifacts.yml b/.github/workflows/Attach Artifacts.yml index 7f0203286..f8e48a5dd 100644 --- a/.github/workflows/Attach Artifacts.yml +++ b/.github/workflows/Attach Artifacts.yml @@ -2,6 +2,8 @@ name: Manually Attach Artifacts ( If the automation fails ) run-name: Manually Attach Artifacts against ${{ github.event.inputs.tag }} on: + repository_dispatch: + types: [attach-artifacts] workflow_dispatch: inputs: tag: @@ -18,6 +20,10 @@ jobs: uses: actions/setup-node@v1 with: node-version: 20.x + + - name: Get previous tag + id: previoustag + uses: "WyriHaximus/github-action-get-previous-tag@v1" # Sanity check to ensure that release tags don't start with a 'v' version prefix but adhere to the X.Y.Z format - name: Check for Tag name Format @@ -30,7 +36,7 @@ jobs: - name: Install package run: | export npm_config_prefix=$(pwd)/package - npm install -g homebridge-config-ui-x@${{ github.event.inputs.tag }} + npm install -g homebridge-config-ui-x@$${{ needs.analyze-tags.outputs.previous-tag }} - name: Remove invalid node-pty node-gyp run run: | @@ -39,11 +45,11 @@ jobs: - name: Create Bundle run: | tar -C $(pwd)/package --owner=0 --group=0 --format=posix -czvf homebridge-config-ui-x-${{ github.event.inputs.tag }}.tar.gz . - shasum -a 256 homebridge-config-ui-x-${{ github.event.inputs.tag }}.tar.gz > SHASUMS256.txt + shasum -a 256 homebridge-config-ui-x-${{ needs.analyze-tags.outputs.previous-tag }}.tar.gz > SHASUMS256.txt - name: Attach Bundle uses: AButler/upload-release-assets@v2.0 with: - files: 'homebridge-config-ui-x-${{ github.event.inputs.tag }}.tar.gz;SHASUMS256.txt' + files: 'homebridge-config-ui-x-${{ needs.analyze-tags.outputs.previous-tag }}.tar.gz;SHASUMS256.txt' repo-token: ${{ secrets.GITHUB_TOKEN }} release-tag: ${{ github.event.inputs.tag }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5691ac3cb..3f524197c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,9 +61,7 @@ jobs: tar -C $(pwd)/package --owner=0 --group=0 --format=posix -czvf homebridge-config-ui-x-${{ github.event.release.tag_name }}.tar.gz . shasum -a 256 homebridge-config-ui-x-${{ github.event.release.tag_name }}.tar.gz > SHASUMS256.txt - - name: Attach Bundle - uses: AButler/upload-release-assets@v2.0 + - name: Repository Dispatch + uses: peter-evans/repository-dispatch@v2 with: - files: 'homebridge-config-ui-x-${{ github.event.release.tag_name }}.tar.gz;SHASUMS256.txt' - repo-token: ${{ secrets.GITHUB_TOKEN }} - release-tag: ${{ github.event.release.tag_name }} + event-type: attach-artifacts diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f809f684..9fbcc2f37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ All notable changes to homebridge-config-ui-x will be documented in this file. +## Beta-4.52.4 (TBD) + +### Notable Changes + + + +### i18n Changes + +- **i18n:** Update fr.json ([#1705](https://github.com/homebridge/homebridge-config-ui-x/pull/1705)) + +### Bug Fixes + ## 4.52.3 (2023-11-14) ### Bug Fixes diff --git a/extract-plugin-alias.js b/extract-plugin-alias.js index 5808ad271..9f548f660 100644 --- a/extract-plugin-alias.js +++ b/extract-plugin-alias.js @@ -4,8 +4,8 @@ * This script "mocks" homebridge and is used to extract the plugin alias and type. */ -const path = require('path'); const EventEmitter = require('events').EventEmitter; +const path = require('path'); let pluginAlias; let pluginType; diff --git a/package-lock.json b/package-lock.json index 6f9bd7889..89422ed4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "homebridge-config-ui-x", - "version": "4.52.3", + "version": "4.52.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "homebridge-config-ui-x", - "version": "4.52.3", + "version": "4.52.4", "funding": [ { "type": "github", @@ -23,23 +23,23 @@ "@fastify/multipart": "8.0.0", "@fastify/static": "6.12.0", "@fastify/swagger": "8.12.0", - "@homebridge/node-pty-prebuilt-multiarch": "0.11.10", + "@homebridge/node-pty-prebuilt-multiarch": "0.11.11", "@nestjs/axios": "3.0.1", - "@nestjs/common": "10.2.8", - "@nestjs/core": "10.2.8", + "@nestjs/common": "10.2.9", + "@nestjs/core": "10.2.9", "@nestjs/jwt": "10.2.0", "@nestjs/passport": "10.0.2", - "@nestjs/platform-fastify": "10.2.8", - "@nestjs/platform-socket.io": "10.2.8", - "@nestjs/swagger": "7.1.15", - "@nestjs/websockets": "10.2.8", + "@nestjs/platform-fastify": "10.2.9", + "@nestjs/platform-socket.io": "10.2.9", + "@nestjs/swagger": "7.1.16", + "@nestjs/websockets": "10.2.9", "@oznu/hap-client": "1.9.0", - "axios": "1.6.1", + "axios": "1.6.2", "class-transformer": "0.5.1", "class-validator": "0.14.0", "commander": "11.1.0", "dayjs": "1.11.10", - "emoji-js": "3.7.0", + "emoji-js": "3.8.0", "fastify": "4.24.3", "fs-extra": "11.1.1", "node-cache": "5.1.2", @@ -51,7 +51,7 @@ "reflect-metadata": "0.1.13", "rxjs": "7.8.1", "semver": "7.5.4", - "systeminformation": "5.21.16", + "systeminformation": "5.21.17", "tail": "2.2.6", "tar": "6.2.0", "tcp-port-used": "1.0.2", @@ -62,7 +62,7 @@ "homebridge-config-ui-x": "dist/bin/standalone.js" }, "devDependencies": { - "@nestjs/testing": "^10.2.7", + "@nestjs/testing": "^10.2.9", "@types/fs-extra": "^11.0.4", "@types/jest": "^29.5.8", "@types/lodash": "^4.14.201", @@ -74,8 +74,8 @@ "@types/tar": "^6.1.9", "@types/tcp-port-used": "^1.0.4", "@types/unzipper": "^0.10.9", - "@typescript-eslint/eslint-plugin": "^6.10.0", - "@typescript-eslint/parser": "^6.10.0", + "@typescript-eslint/eslint-plugin": "^6.11.0", + "@typescript-eslint/parser": "^6.11.0", "babel-jest": "^29.7.0", "bash-color": "^0.0.4", "buffer-shims": "^1.0.0", @@ -93,10 +93,10 @@ "lodash": "^4.17.21", "nodemon": "^3.0.1", "otplib": "^12.0.1", - "prettier": "^3.0.3", + "prettier": "^3.1.0", "rimraf": "^5.0.5", "ts-jest": "^29.1.1", - "ts-loader": "^9.5.0", + "ts-loader": "^9.5.1", "ts-node": "^10.9.1", "tsconfig-paths": "^4.2.0", "typescript": "^5.2.2", @@ -817,9 +817,9 @@ } }, "node_modules/@fastify/cors": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@fastify/cors/-/cors-8.4.0.tgz", - "integrity": "sha512-MlVvMTenltToByTpLwlWtO+7dQ3l2J+1OpmGrx9JpSNWo1d+dhfNCOi23zHhxdFhtpDzfwGwCsKu9DTeG7k7nQ==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@fastify/cors/-/cors-8.4.1.tgz", + "integrity": "sha512-iYQJtrY3pFiDS5mo5zRaudzg2OcUdJ96PD6xfkKOOEilly5nnrFZx/W6Sce2T79xxlEn2qpU3t5+qS2phS369w==", "dependencies": { "fastify-plugin": "^4.0.0", "mnemonist": "0.39.5" @@ -942,9 +942,9 @@ } }, "node_modules/@homebridge/node-pty-prebuilt-multiarch": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@homebridge/node-pty-prebuilt-multiarch/-/node-pty-prebuilt-multiarch-0.11.10.tgz", - "integrity": "sha512-ttOE8QQRq/aRXDoKD2rfYEF50AiDLM9LPTohqCog1Z78g8k3Zqk15R/EHfTl/8cfw4l0fxt3y0dWL56wq79p2A==", + "version": "0.11.11", + "resolved": "https://registry.npmjs.org/@homebridge/node-pty-prebuilt-multiarch/-/node-pty-prebuilt-multiarch-0.11.11.tgz", + "integrity": "sha512-g7XB2DxGXUuJV4ZS5+8BbztaeqKyihK1zowPL2EeLRp4wfew1qZ3Xw1FWYncpiuRbRvjXrEzXDkcTiYe/XC/ZA==", "hasInstallScript": true, "dependencies": { "nan": "^2.18.0", @@ -1882,9 +1882,9 @@ } }, "node_modules/@nestjs/common": { - "version": "10.2.8", - "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-10.2.8.tgz", - "integrity": "sha512-rmpwcdvq2IWMmsUVP8rsdKub6uDWk7dwCYo0aif50JTwcvcxzaP3iKVFKoSgvp0RKYu8h15+/AEOfaInmPpl0Q==", + "version": "10.2.9", + "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-10.2.9.tgz", + "integrity": "sha512-i7vb2zMLJUDIPqjfBhMkgIITK1AnKDkFYSsM+aaRHpNa9xv/CwsiQuINaXfzStMpnwjkq5FDE3aoF0wkTfD2cQ==", "dependencies": { "iterare": "1.2.1", "tslib": "2.6.2", @@ -1910,9 +1910,9 @@ } }, "node_modules/@nestjs/core": { - "version": "10.2.8", - "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-10.2.8.tgz", - "integrity": "sha512-9+MZ2s8ixfY9Bl/M9ofChiyYymcwdK9ZWNH4GDMF7Am7XRAQ1oqde6MYGG05rhQwiVXuTwaYLlXciJKfsrg5qg==", + "version": "10.2.9", + "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-10.2.9.tgz", + "integrity": "sha512-Hl6HC9hR7JD3YmzwcveBKeydaq9cguEsMdEghzLuVH3VEH0M+bTFHjCIKhsxMez4/O7/K6n3EhNx1Et4Z+BqWg==", "hasInstallScript": true, "dependencies": { "@nuxtjs/opencollective": "0.3.2", @@ -1987,11 +1987,11 @@ } }, "node_modules/@nestjs/platform-fastify": { - "version": "10.2.8", - "resolved": "https://registry.npmjs.org/@nestjs/platform-fastify/-/platform-fastify-10.2.8.tgz", - "integrity": "sha512-ZeqIHeGLD7YgJ22K9AkyjcFv/yH/LH+HmujukBq/yDLFlJuurKCgbDPfL0PHq0RRMZu5CeB0dhs8+qihw96yjA==", + "version": "10.2.9", + "resolved": "https://registry.npmjs.org/@nestjs/platform-fastify/-/platform-fastify-10.2.9.tgz", + "integrity": "sha512-kSkNivpAIwgt5Xnawwe8hfcafo9XMmnjNWcNCSXcjkic8pLPJvU4FD2D1+jmOWEx7uqFKKvg1Cf0Y6HenYfaMA==", "dependencies": { - "@fastify/cors": "8.4.0", + "@fastify/cors": "8.4.1", "@fastify/formbody": "7.4.0", "@fastify/middie": "8.3.0", "fastify": "4.24.3", @@ -2019,9 +2019,9 @@ } }, "node_modules/@nestjs/platform-socket.io": { - "version": "10.2.8", - "resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-10.2.8.tgz", - "integrity": "sha512-P/Olw9alAaKD7Q1vS/ol7K81x1l7Bmi+AXthBNUPGMmG/W8kxO1krerW4rEhtF3BKJ0qJIa5bhDlb80p4lZcNA==", + "version": "10.2.9", + "resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-10.2.9.tgz", + "integrity": "sha512-xuXsUWUtgzdRnNBSWZADQv0sShBOsyHK7iEwwIpFMerqbthSMwjsyUv0s3hDoPEnS6Nf4MMf2KReD5JBAnMBFQ==", "dependencies": { "socket.io": "4.7.2", "tslib": "2.6.2" @@ -2037,9 +2037,9 @@ } }, "node_modules/@nestjs/swagger": { - "version": "7.1.15", - "resolved": "https://registry.npmjs.org/@nestjs/swagger/-/swagger-7.1.15.tgz", - "integrity": "sha512-ZaAO90R9MQXk4iLQLijIH6jrsllkUSYoh0Su6DECGgu8Y4Q/9LfdESwsZ9nmzr/48aLOu+wrv+cdI5Wr6fLKJw==", + "version": "7.1.16", + "resolved": "https://registry.npmjs.org/@nestjs/swagger/-/swagger-7.1.16.tgz", + "integrity": "sha512-f9KBk/BX9MUKPTj7tQNYJ124wV/jP5W2lwWHLGwe/4qQXixuDOo39zP55HIJ44LE7S04B7BOeUOo9GBJD/vRcw==", "dependencies": { "@nestjs/mapped-types": "2.0.3", "js-yaml": "4.1.0", @@ -2068,9 +2068,9 @@ } }, "node_modules/@nestjs/testing": { - "version": "10.2.8", - "resolved": "https://registry.npmjs.org/@nestjs/testing/-/testing-10.2.8.tgz", - "integrity": "sha512-9Kj5IQhM67/nj/MT6Wi2OmWr5YQnCMptwKVFrX1TDaikpY12196v7frk0jVjdT7wms7rV07GZle9I2z0aSjqtQ==", + "version": "10.2.9", + "resolved": "https://registry.npmjs.org/@nestjs/testing/-/testing-10.2.9.tgz", + "integrity": "sha512-E+66R27Op+WAQHHH6RnUsz7QpKApl4Bn42nheCAGvS/sxbaDJ8RKtm4stE4Iz2aioPCUvRi8j4z8Ze73k0CcGQ==", "dev": true, "dependencies": { "tslib": "2.6.2" @@ -2095,9 +2095,9 @@ } }, "node_modules/@nestjs/websockets": { - "version": "10.2.8", - "resolved": "https://registry.npmjs.org/@nestjs/websockets/-/websockets-10.2.8.tgz", - "integrity": "sha512-oZN1VJFApN7d2eftr65a36QrV0IJNGba4znqyjFnyGvtDWTDcQwzDcnEfvJBTTYhOSBNS7KDfVhne0ythkl6tg==", + "version": "10.2.9", + "resolved": "https://registry.npmjs.org/@nestjs/websockets/-/websockets-10.2.9.tgz", + "integrity": "sha512-Hp/ioNMcBtCzkubgcDHeA5KH4YLBL1jHfMEacLctKDa20Kn/LFXhJhXVWEr4jEzUKXbD+Q+GyYk1V/1rJi6eHA==", "dependencies": { "iterare": "1.2.1", "object-hash": "3.0.0", @@ -2750,16 +2750,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz", - "integrity": "sha512-uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.11.0.tgz", + "integrity": "sha512-uXnpZDc4VRjY4iuypDBKzW1rz9T5YBBK0snMn8MaTSNd2kMlj50LnLBABELjJiOL5YHk7ZD8hbSpI9ubzqYI0w==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.10.0", - "@typescript-eslint/type-utils": "6.10.0", - "@typescript-eslint/utils": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0", + "@typescript-eslint/scope-manager": "6.11.0", + "@typescript-eslint/type-utils": "6.11.0", + "@typescript-eslint/utils": "6.11.0", + "@typescript-eslint/visitor-keys": "6.11.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -2785,15 +2785,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.10.0.tgz", - "integrity": "sha512-+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.11.0.tgz", + "integrity": "sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.10.0", - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/typescript-estree": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0", + "@typescript-eslint/scope-manager": "6.11.0", + "@typescript-eslint/types": "6.11.0", + "@typescript-eslint/typescript-estree": "6.11.0", + "@typescript-eslint/visitor-keys": "6.11.0", "debug": "^4.3.4" }, "engines": { @@ -2813,13 +2813,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz", - "integrity": "sha512-TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz", + "integrity": "sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0" + "@typescript-eslint/types": "6.11.0", + "@typescript-eslint/visitor-keys": "6.11.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2830,13 +2830,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz", - "integrity": "sha512-wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.11.0.tgz", + "integrity": "sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.10.0", - "@typescript-eslint/utils": "6.10.0", + "@typescript-eslint/typescript-estree": "6.11.0", + "@typescript-eslint/utils": "6.11.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -2857,9 +2857,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.10.0.tgz", - "integrity": "sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.11.0.tgz", + "integrity": "sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2870,13 +2870,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz", - "integrity": "sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz", + "integrity": "sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0", + "@typescript-eslint/types": "6.11.0", + "@typescript-eslint/visitor-keys": "6.11.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2897,17 +2897,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.10.0.tgz", - "integrity": "sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.11.0.tgz", + "integrity": "sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.10.0", - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/typescript-estree": "6.10.0", + "@typescript-eslint/scope-manager": "6.11.0", + "@typescript-eslint/types": "6.11.0", + "@typescript-eslint/typescript-estree": "6.11.0", "semver": "^7.5.4" }, "engines": { @@ -2922,12 +2922,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz", - "integrity": "sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz", + "integrity": "sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.10.0", + "@typescript-eslint/types": "6.11.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -3502,9 +3502,9 @@ } }, "node_modules/axios": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz", - "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -3954,9 +3954,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001561", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz", - "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==", + "version": "1.0.30001563", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz", + "integrity": "sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw==", "dev": true, "funding": [ { @@ -4965,9 +4965,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.581", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.581.tgz", - "integrity": "sha512-6uhqWBIapTJUxgPTCHH9sqdbxIMPt7oXl0VcAL1kOtlU6aECdcMncCrX5Z7sHQ/invtrC9jUQUef7+HhO8vVFw==", + "version": "1.4.587", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.587.tgz", + "integrity": "sha512-RyJX0q/zOkAoefZhB9XHghGeATVP0Q3mwA253XD/zj2OeXc+JZB9pCaEv6R578JUYaWM9PRhye0kXvd/V1cQ3Q==", "dev": true }, "node_modules/emittery": { @@ -4983,16 +4983,16 @@ } }, "node_modules/emoji-datasource": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/emoji-datasource/-/emoji-datasource-7.0.2.tgz", - "integrity": "sha512-F5TTUSktTIfbjHIlaz8tjsQ8EAD0UpJtj1i5O13jQARWTddtFgam3nE1W5WgSQoqU/cuTnF1H9tK/wlCOyzfiA==" + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/emoji-datasource/-/emoji-datasource-15.0.1.tgz", + "integrity": "sha512-aF5Q6LCKXzJzpG4K0ETiItuzz0xLYxNexR9qWw45/shuuEDWZkOIbeGHA23uopOSYA/LmeZIXIFsySCx+YKg2g==" }, "node_modules/emoji-js": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/emoji-js/-/emoji-js-3.7.0.tgz", - "integrity": "sha512-YNJCF8DOYI1AZnkSIcJbmIN6rtXtSv5DObqzvHuGAP8VLQc15MMN+DG9rQVSfHPXGFkFub9pGvbiO4FNz5+sjg==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/emoji-js/-/emoji-js-3.8.0.tgz", + "integrity": "sha512-A5FNHKlRPRo6RJWrrdGWnoolIBMkVXHy4qkO0V5ahekQPjfVECxvOOWADeAF/SbzRVA9Sxdj24FCoRYGt06skA==", "dependencies": { - "emoji-datasource": "7.0.2" + "emoji-datasource": "15.0.1" } }, "node_modules/emoji-regex": { @@ -5133,9 +5133,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.0.tgz", - "integrity": "sha512-lcCr3v3OLezdfFyx9r5NRYHOUTQNnFEQ9E87Mx8Kc+iqyJNkO7MJoB4GQRTlIMw9kLLTwGw0OAkm4BQQud/d9g==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", + "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", "dev": true }, "node_modules/es-set-tostringtag": { @@ -6213,9 +6213,9 @@ } }, "node_modules/flat-cache": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", - "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, "dependencies": { "flatted": "^3.2.9", @@ -6223,7 +6223,7 @@ "rimraf": "^3.0.2" }, "engines": { - "node": ">=12.0.0" + "node": "^10.12.0 || >=12.0.0" } }, "node_modules/flat-cache/node_modules/glob": { @@ -6835,9 +6835,9 @@ ] }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", "dev": true, "engines": { "node": ">= 4" @@ -9476,9 +9476,9 @@ } }, "node_modules/luxon": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz", - "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", "engines": { "node": ">=12" } @@ -10361,9 +10361,9 @@ } }, "node_modules/pino": { - "version": "8.16.1", - "resolved": "https://registry.npmjs.org/pino/-/pino-8.16.1.tgz", - "integrity": "sha512-3bKsVhBmgPjGV9pyn4fO/8RtoVDR8ssW1ev819FsRXlRNgW8gR/9Kx+gCK4UPWd4JjrRDLWpzd/pb1AyWm3MGA==", + "version": "8.16.2", + "resolved": "https://registry.npmjs.org/pino/-/pino-8.16.2.tgz", + "integrity": "sha512-2advCDGVEvkKu9TTVSa/kWW7Z3htI/sBKEZpqiHk6ive0i/7f5b1rsU8jn0aimxqfnSz5bj/nOYkwhBUn5xxvg==", "dependencies": { "atomic-sleep": "^1.0.0", "fast-redact": "^3.1.1", @@ -10489,9 +10489,9 @@ } }, "node_modules/prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", + "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -11602,9 +11602,9 @@ } }, "node_modules/systeminformation": { - "version": "5.21.16", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.16.tgz", - "integrity": "sha512-WJZdc5RbmDF1VOJcS+G2oIBeNgmMTyJ8+enHe9stIyBg2XhboUTsSfN9HrFMDV+fgXwJ50kNKgD3TzodsFgB+g==", + "version": "5.21.17", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.17.tgz", + "integrity": "sha512-JZYRCbIjk3WuBV59A9/rTla2rROX+aAJ9uo2Z1dI+bjieORcukClN8rlM1zE9NYKpULSbaGc+KKct/870lO0DA==", "os": [ "darwin", "linux", @@ -12036,9 +12036,9 @@ } }, "node_modules/ts-loader": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.0.tgz", - "integrity": "sha512-LLlB/pkB4q9mW2yLdFMnK3dEHbrBjeZTYguaaIfusyojBgAGf5kF+O6KcWqiGzWqHk0LBsoolrp4VftEURhybg==", + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz", + "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==", "dev": true, "dependencies": { "chalk": "^4.1.0", diff --git a/package.json b/package.json index 678a41bd9..3163c7ed3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "homebridge-config-ui-x", "displayName": "Homebridge UI", - "version": "4.52.3", + "version": "4.52.4", "description": "A web based management, configuration and control platform for Homebridge.", "license": "MIT", "author": "oznu ", @@ -32,7 +32,9 @@ "homebridge": "^1.6.0" }, "scripts": { - "check": "npm install && npm outdated", + "check": "npm run check:server && npm run check:ui", + "check:server": "npm install && npm outdated", + "check:ui": "npm install --prefix ui && npm outdated --prefix ui", "watch": "concurrently \"npm run watch:ui\" \"npm run watch:server\"", "watch:server": "nodemon", "watch:ui": "npm run start --prefix ui", @@ -56,23 +58,23 @@ "@fastify/multipart": "8.0.0", "@fastify/static": "6.12.0", "@fastify/swagger": "8.12.0", - "@homebridge/node-pty-prebuilt-multiarch": "0.11.10", + "@homebridge/node-pty-prebuilt-multiarch": "0.11.11", "@nestjs/axios": "3.0.1", - "@nestjs/common": "10.2.8", - "@nestjs/core": "10.2.8", + "@nestjs/common": "10.2.9", + "@nestjs/core": "10.2.9", "@nestjs/jwt": "10.2.0", "@nestjs/passport": "10.0.2", - "@nestjs/platform-fastify": "10.2.8", - "@nestjs/platform-socket.io": "10.2.8", - "@nestjs/swagger": "7.1.15", - "@nestjs/websockets": "10.2.8", + "@nestjs/platform-fastify": "10.2.9", + "@nestjs/platform-socket.io": "10.2.9", + "@nestjs/swagger": "7.1.16", + "@nestjs/websockets": "10.2.9", "@oznu/hap-client": "1.9.0", - "axios": "1.6.1", + "axios": "1.6.2", "class-transformer": "0.5.1", "class-validator": "0.14.0", "commander": "11.1.0", "dayjs": "1.11.10", - "emoji-js": "3.7.0", + "emoji-js": "3.8.0", "fastify": "4.24.3", "fs-extra": "11.1.1", "node-cache": "5.1.2", @@ -84,14 +86,14 @@ "reflect-metadata": "0.1.13", "rxjs": "7.8.1", "semver": "7.5.4", - "systeminformation": "5.21.16", + "systeminformation": "5.21.17", "tail": "2.2.6", "tar": "6.2.0", "tcp-port-used": "1.0.2", "unzipper": "0.10.14" }, "devDependencies": { - "@nestjs/testing": "^10.2.7", + "@nestjs/testing": "^10.2.9", "@types/fs-extra": "^11.0.4", "@types/jest": "^29.5.8", "@types/lodash": "^4.14.201", @@ -103,8 +105,8 @@ "@types/tar": "^6.1.9", "@types/tcp-port-used": "^1.0.4", "@types/unzipper": "^0.10.9", - "@typescript-eslint/eslint-plugin": "^6.10.0", - "@typescript-eslint/parser": "^6.10.0", + "@typescript-eslint/eslint-plugin": "^6.11.0", + "@typescript-eslint/parser": "^6.11.0", "babel-jest": "^29.7.0", "bash-color": "^0.0.4", "buffer-shims": "^1.0.0", @@ -122,10 +124,10 @@ "lodash": "^4.17.21", "nodemon": "^3.0.1", "otplib": "^12.0.1", - "prettier": "^3.0.3", + "prettier": "^3.1.0", "rimraf": "^5.0.5", "ts-jest": "^29.1.1", - "ts-loader": "^9.5.0", + "ts-loader": "^9.5.1", "ts-node": "^10.9.1", "tsconfig-paths": "^4.2.0", "typescript": "^5.2.2", @@ -161,4 +163,4 @@ "smart home", "hb-service" ] -} \ No newline at end of file +} diff --git a/scripts/lang-sync.ts b/scripts/lang-sync.ts index 30ce49206..2cd2263bf 100644 --- a/scripts/lang-sync.ts +++ b/scripts/lang-sync.ts @@ -1,10 +1,12 @@ /** - * Script to copy new english translation strings to the other language files + * Script to: + * - copy new english translation strings to the other language files + * - remove old translation strings from the other language files */ -import * as fs from 'fs-extra'; import * as path from 'path'; +import * as fs from 'fs-extra'; const basePath = path.dirname(__dirname); @@ -18,11 +20,19 @@ for (const lang of langFiles) { const translationStrings = fs.readJsonSync(langPath); if (lang !== 'en.json') { + // find any keys in the main file that are not in the translation file, and add for (const [key, value] of Object.entries(main)) { if (!translationStrings.hasOwnProperty(key)) { translationStrings[key] = value; } } + + // find any keys in the translation file that are not in the main file, and remove + for (const key of Object.keys(translationStrings)) { + if (!main.hasOwnProperty(key)) { + delete translationStrings[key]; + } + } } // sort keys diff --git a/src/bin/hb-service.ts b/src/bin/hb-service.ts index 0953ce6b9..9b601fe58 100644 --- a/src/bin/hb-service.ts +++ b/src/bin/hb-service.ts @@ -421,12 +421,7 @@ export class HomebridgeServiceHelper { return; } - // allow the --strict-plugin-resolution flag on Homebridge v1.4.1 or later only - if ( - this.homebridgePackage && - process.env.UIX_STRICT_PLUGIN_RESOLUTION === '1' && - semver.gte(this.homebridgePackage.version, '1.4.1-beta.1') - ) { + if (this.homebridgePackage && process.env.UIX_STRICT_PLUGIN_RESOLUTION === '1') { if (!this.homebridgeOpts.includes('--strict-plugin-resolution')) { this.homebridgeOpts.push('--strict-plugin-resolution'); } @@ -1217,7 +1212,7 @@ export class HomebridgeServiceHelper { /** * Extract the Node.js tarball */ - public async extractNodejs(targetVersion: string, extractConfig) { + public async extractNodejs(targetVersion: string, extractConfig: tar.ExtractOptions) { const spinner = ora(`Installing Node.js ${targetVersion}`).start(); try { diff --git a/src/modules/status/status.service.ts b/src/modules/status/status.service.ts index 14ada25e6..2e3d19ec4 100644 --- a/src/modules/status/status.service.ts +++ b/src/modules/status/status.service.ts @@ -283,8 +283,8 @@ export class StatusService { client.emit('homebridge-status', await this.getHomebridgeStats()); - // ipc status events are only available in Homebridge 1.3.3 or later - and when running in service mode - if (this.configService.serviceMode && this.configService.homebridgeVersion && semver.gt(this.configService.homebridgeVersion, '1.3.3-beta.5')) { + // ipc status events are only available when running in service mode + if (this.configService.serviceMode) { homebridgeStatusChangeSub = this.homebridgeStatusChange.subscribe(async () => { client.emit('homebridge-status', await this.getHomebridgeStats()); }); @@ -330,7 +330,7 @@ export class StatusService { * Check if homebridge is running on the local system */ public async checkHomebridgeStatus() { - if (this.configService.serviceMode && this.configService.homebridgeVersion && semver.gt(this.configService.homebridgeVersion, '1.3.3-beta.5')) { + if (this.configService.serviceMode) { return this.homebridgeStatus; } @@ -451,7 +451,7 @@ export class StatusService { try { const versionList = (await this.httpService.get('https://nodejs.org/dist/index.json').toPromise()).data; - const currentLts = versionList.filter(x => x.lts)[0]; + const currentLts = versionList.filter((x: any) => x.lts)[0]; // See why this is set to 2.29 at https://homebridge.io/w/JJSun const glibcVersion = this.getGlibcVersion(); diff --git a/ui/.eslintrc.json b/ui/.eslintrc.json index adba90d63..a0e6a99bf 100644 --- a/ui/.eslintrc.json +++ b/ui/.eslintrc.json @@ -19,6 +19,8 @@ "plugin:@angular-eslint/ng-cli-compat--formatting-add-on", "plugin:@angular-eslint/template/process-inline-templates" ], + "plugins": [ + "import", "import-newlines", "sort-exports"], "rules": { "@angular-eslint/component-selector": [ "error", @@ -77,7 +79,12 @@ ], "id-blacklist": "off", "id-match": "off", + "import-newlines/enforce": ["error", 3], + "import/no-extraneous-dependencies": "off", + "import/order": ["warn", { "alphabetize": { "order": "asc" }, "newlines-between": "never" }], "no-underscore-dangle": "off", + "sort-exports/sort-exports": ["warn", { "sortDir": "asc" }], + "sort-imports": ["warn", { "ignoreDeclarationSort": true }], "space-before-function-paren": "error" } }, diff --git a/ui/package-lock.json b/ui/package-lock.json index d3073964a..c494f81a0 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -66,6 +66,8 @@ "@angular/language-service": "^14.3.0", "@fortawesome/fontawesome-free": "^6.4.2", "@types/emoji-js": "^3.5.2", + "@types/file-saver": "^2.0.7", + "@types/lodash-es": "^4.17.11", "@types/node": "^18.18.9", "@types/qrcode": "^1.5.5", "@types/semver": "^7.5.5", @@ -76,8 +78,10 @@ "codelyzer": "^6.0.2", "eslint": "^8.53.0", "eslint-plugin-import": "^2.29.0", + "eslint-plugin-import-newlines": "^1.3.4", "eslint-plugin-jsdoc": "^41.1.2", "eslint-plugin-prefer-arrow": "^1.2.3", + "eslint-plugin-sort-exports": "^0.8.0", "ts-node": "^10.9.1", "typescript": "^4.8.4" } @@ -3616,6 +3620,12 @@ "@types/send": "*" } }, + "node_modules/@types/file-saver": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.7.tgz", + "integrity": "sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==", + "dev": true + }, "node_modules/@types/http-errors": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", @@ -3643,6 +3653,21 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, + "node_modules/@types/lodash": { + "version": "4.14.201", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.201.tgz", + "integrity": "sha512-y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ==", + "dev": true + }, + "node_modules/@types/lodash-es": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.11.tgz", + "integrity": "sha512-eCw8FYAWHt2DDl77s+AMLLzPn310LKohruumpucZI4oOFJkIgnlaJcy23OKMJxx4r9PeTF13Gv6w+jqjWQaYUg==", + "dev": true, + "dependencies": { + "@types/lodash": "*" + } + }, "node_modules/@types/mime": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", @@ -5340,9 +5365,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001561", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz", - "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==", + "version": "1.0.30001563", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz", + "integrity": "sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw==", "funding": [ { "type": "opencollective", @@ -5669,9 +5694,12 @@ "integrity": "sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==" }, "node_modules/component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", + "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/component-inherit": { "version": "0.0.3", @@ -5896,9 +5924,9 @@ } }, "node_modules/copy-webpack-plugin/node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", "dev": true, "engines": { "node": ">= 4" @@ -6561,9 +6589,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.581", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.581.tgz", - "integrity": "sha512-6uhqWBIapTJUxgPTCHH9sqdbxIMPt7oXl0VcAL1kOtlU6aECdcMncCrX5Z7sHQ/invtrC9jUQUef7+HhO8vVFw==" + "version": "1.4.587", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.587.tgz", + "integrity": "sha512-RyJX0q/zOkAoefZhB9XHghGeATVP0Q3mwA253XD/zj2OeXc+JZB9pCaEv6R578JUYaWM9PRhye0kXvd/V1cQ3Q==" }, "node_modules/emoji-regex": { "version": "8.0.0", @@ -7377,6 +7405,21 @@ "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" } }, + "node_modules/eslint-plugin-import-newlines": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.4.tgz", + "integrity": "sha512-Lmf/BbK+EQKUfjKPcZpslE/KTGYlgaI8ZJ/sYzdbb3BVTg5+GmLBLHBjsUKNEVRM1SEhDTF/didtOSYKi4tSnQ==", + "dev": true, + "bin": { + "import-linter": "lib/index.js" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "eslint": ">=6.0.0" + } + }, "node_modules/eslint-plugin-import/node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -7472,6 +7515,15 @@ "eslint": ">=2.0.0" } }, + "node_modules/eslint-plugin-sort-exports": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.8.0.tgz", + "integrity": "sha512-5x7kJNjIS5bSyehFJ6Gk2gh2wUPt/rmhwDHF8JPDicSH7bvrLRFdlkhHu74YqYBjEySHYaOZVoKNP90TjI0v6w==", + "dev": true, + "peerDependencies": { + "eslint": ">=5.0.0" + } + }, "node_modules/eslint-scope": { "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", @@ -8128,9 +8180,9 @@ } }, "node_modules/flat-cache": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", - "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, "dependencies": { "flatted": "^3.2.9", @@ -8138,7 +8190,7 @@ "rimraf": "^3.0.2" }, "engines": { - "node": ">=12.0.0" + "node": "^10.12.0 || >=12.0.0" } }, "node_modules/flatted": { @@ -10690,9 +10742,9 @@ } }, "node_modules/node-gyp-build": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", - "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.0.tgz", + "integrity": "sha512-PbZERfeFdrHQOOXiAKOY0VPbykZy90ndPKk0d+CFDegTKmWp1VgOTz2xACVbr1BjCWxrQp68CXtvNsveFhqDJg==", "dev": true, "optional": true, "bin": { diff --git a/ui/package.json b/ui/package.json index df025d28c..7eb85a8ab 100644 --- a/ui/package.json +++ b/ui/package.json @@ -68,6 +68,8 @@ "@angular/language-service": "^14.3.0", "@fortawesome/fontawesome-free": "^6.4.2", "@types/emoji-js": "^3.5.2", + "@types/file-saver": "^2.0.7", + "@types/lodash-es": "^4.17.11", "@types/node": "^18.18.9", "@types/qrcode": "^1.5.5", "@types/semver": "^7.5.5", @@ -78,8 +80,10 @@ "codelyzer": "^6.0.2", "eslint": "^8.53.0", "eslint-plugin-import": "^2.29.0", + "eslint-plugin-import-newlines": "^1.3.4", "eslint-plugin-jsdoc": "^41.1.2", "eslint-plugin-prefer-arrow": "^1.2.3", + "eslint-plugin-sort-exports": "^0.8.0", "ts-node": "^10.9.1", "typescript": "^4.8.4" }, diff --git a/ui/src/app/app-routing.module.ts b/ui/src/app/app-routing.module.ts index 083715a25..ea035624d 100644 --- a/ui/src/app/app-routing.module.ts +++ b/ui/src/app/app-routing.module.ts @@ -1,19 +1,18 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AuthGuard } from '@/app/core/auth/auth.guard'; +import { RouterModule, Routes } from '@angular/router'; import { AdminGuard } from '@/app/core/auth/admin.guard'; +import { AuthGuard } from '@/app/core/auth/auth.guard'; import { LoginComponent } from '@/app/modules/login/login.component'; import { LoginGuard } from '@/app/modules/login/login.guard'; +import { RestartComponent } from '@/app/modules/restart/restart.component'; import { SetupWizardGuard } from '@/app/modules/setup-wizard/setup-wizard.guard'; +import { StatusComponent } from '@/app/modules/status/status.component'; import { LayoutComponent } from '@/app/shared/layout/layout.component'; /* * The status and restart modules should not be lazy loaded * to ensure restarts after an update go smoothly */ -import { RestartComponent } from '@/app/modules/restart/restart.component'; -import { StatusComponent } from '@/app/modules/status/status.component'; const routes: Routes = [ { diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index cfc370ac2..f37287512 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -1,7 +1,6 @@ import { Component } from '@angular/core'; -import { Router, NavigationEnd } from '@angular/router'; +import { NavigationEnd, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; - import { SettingsService } from '@/app/core/settings.service'; @Component({ @@ -9,8 +8,6 @@ import { SettingsService } from '@/app/core/settings.service'; templateUrl: './app.component.html', }) export class AppComponent { - public langdir = 'ltr'; - constructor( router: Router, translate: TranslateService, @@ -50,18 +47,14 @@ export class AppComponent { 'he', ]; - // which langs should use RTL + // which languages should use RTL const rtlLanguages = [ 'he', ]; // watch for lang changes translate.onLangChange.subscribe(() => { - if (rtlLanguages.includes(translate.currentLang)) { - $settings.rtl = true; - } else { - $settings.rtl = false; - } + $settings.rtl = rtlLanguages.includes(translate.currentLang); }); const browserLang = languages.find(x => x === translate.getBrowserLang() || x === translate.getBrowserCultureLang()); diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index a31da1a25..efbc158dd 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -1,29 +1,29 @@ +import { HttpClientModule } from '@angular/common/http'; +import { LOCALE_ID, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { HttpClientModule } from '@angular/common/http'; -import { NgModule, LOCALE_ID } from '@angular/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { ToastrModule } from 'ngx-toastr'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { MonacoEditorModule } from 'ngx-monaco-editor'; import { DragulaModule } from 'ng2-dragula'; - -import { CoreModule } from '@/app/core/core.module'; -import { AuthModule } from '@/app/core/auth/auth.module'; -import { onMonacoLoad } from '@/app/core/monaco-editor.service'; -import { supportedLocales } from '@/app/core/locales'; - -import { AppComponent } from './app.component'; +import { MonacoEditorModule } from 'ngx-monaco-editor'; +import { ToastrModule } from 'ngx-toastr'; import { AppRoutingModule } from './app-routing.module'; -import { LayoutComponent } from './shared/layout/layout.component'; +import { AppComponent } from './app.component'; +import { LoginModule } from './modules/login/login.module'; import { RestartModule } from './modules/restart/restart.module'; import { StatusModule } from './modules/status/status.module'; -import { LoginModule } from './modules/login/login.module'; +import { LayoutComponent } from './shared/layout/layout.component'; +import { AuthModule } from '@/app/core/auth/auth.module'; +import { CoreModule } from '@/app/core/core.module'; +import { supportedLocales } from '@/app/core/locales'; +import { onMonacoLoad } from '@/app/core/monaco-editor.service'; +import { RestartOptionsModalComponent } from '@/app/shared/layout/restart-options-modal/restart-options-modal.component'; @NgModule({ declarations: [ AppComponent, LayoutComponent, + RestartOptionsModalComponent, ], imports: [ BrowserModule, diff --git a/ui/src/app/core/accessories/accessories.module.ts b/ui/src/app/core/accessories/accessories.module.ts index 94fa94cb5..bda482932 100644 --- a/ui/src/app/core/accessories/accessories.module.ts +++ b/ui/src/app/core/accessories/accessories.module.ts @@ -1,61 +1,59 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { NgxMdModule } from 'ngx-md'; import { InlineSVGModule } from 'ng-inline-svg'; import { NouisliderModule } from 'ng2-nouislider'; - -import { CoreModule } from '@/app/core/core.module'; +import { NgxMdModule } from 'ngx-md'; import { AccessoriesService } from './accessories.service'; - -import { SwitchComponent } from './types/switch/switch.component'; -import { StatelessprogrammableswitchComponent } from './types/statelessprogrammableswitch/statelessprogrammableswitch.component'; -import { ThermostatComponent } from './types/thermostat/thermostat.component'; -import { ThermostatManageComponent } from './types/thermostat/thermostat.manage.component'; -import { OutletComponent } from './types/outlet/outlet.component'; +import { AccessoryTileComponent } from './accessory-tile/accessory-tile.component'; +import { InfoModalComponent } from './info-modal/info-modal.component'; +import { AirpurifierComponent } from './types/airpurifier/airpurifier.component'; +import { AirpurifierManageComponent } from './types/airpurifier/airpurifier.manage.component'; +import { AirqualitysensorComponent } from './types/airqualitysensor/airqualitysensor.component'; +import { BatteryserviceComponent } from './types/batteryservice/batteryservice.component'; +import { ContactsensorComponent } from './types/contactsensor/contactsensor.component'; +import { DoorComponent } from './types/door/door.component'; +import { DoorManageComponent } from './types/door/door.manage.component'; import { FanComponent } from './types/fan/fan.component'; import { FanManageComponent } from './types/fan/fan.manage.component'; import { Fanv2Component } from './types/fanv2/fanv2.component'; import { Fanv2ManageComponent } from './types/fanv2/fanv2.manage.component'; -import { UnknownComponent } from './types/unknown/unknown.component'; +import { GaragedooropenerComponent } from './types/garagedooropener/garagedooropener.component'; +import { HeaterCoolerComponent } from './types/heatercooler/heatercooler.component'; +import { HeaterCoolerManageComponent } from './types/heatercooler/heatercooler.manage.component'; +import { HumidifierDehumidifierComponent } from './types/humidifierdehumidifier/humidifierdehumidifier.component'; +import { HumidifierDehumidifierManageComponent } from './types/humidifierdehumidifier/humidifierdehumidifier.manage.component'; +import { HumiditysensorComponent } from './types/humiditysensor/humiditysensor.component'; +import { IrrigationSystemComponent } from './types/irrigationsystem/irrigationsystem.component'; +import { LeaksensorComponent } from './types/leaksensor/leaksensor.component'; import { LightbulbComponent } from './types/lightbulb/lightbulb.component'; import { LightbulbManageComponent } from './types/lightbulb/lightbulb.manage.component'; import { LightsensorComponent } from './types/lightsensor/lightsensor.component'; import { LockmechanismComponent } from './types/lockmechanism/lockmechanism.component'; -import { TemperaturesensorComponent } from './types/temperaturesensor/temperaturesensor.component'; -import { GaragedooropenerComponent } from './types/garagedooropener/garagedooropener.component'; import { MotionsensorComponent } from './types/motionsensor/motionsensor.component'; import { OccupancysensorComponent } from './types/occupancysensor/occupancysensor.component'; -import { HumiditysensorComponent } from './types/humiditysensor/humiditysensor.component'; -import { AirqualitysensorComponent } from './types/airqualitysensor/airqualitysensor.component'; -import { WindowcoveringComponent } from './types/windowcovering/windowcovering.component'; -import { WindowcoveringManageComponent } from './types/windowcovering/windowcovering.manage.component'; -import { WindowComponent } from './types/window/window.component'; -import { WindowManageComponent } from './types/window/window.manage.component'; -import { DoorComponent } from './types/door/door.component'; -import { DoorManageComponent } from './types/door/door.manage.component'; -import { TelevisionComponent } from './types/television/television.component'; -import { ContactsensorComponent } from './types/contactsensor/contactsensor.component'; -import { BatteryserviceComponent } from './types/batteryservice/batteryservice.component'; -import { SpeakerComponent } from './types/speaker/speaker.component'; -import { SpeakerManageComponent } from './types/speaker/speaker.manage.component'; +import { OutletComponent } from './types/outlet/outlet.component'; import { SecuritysystemComponent } from './types/securitysystem/securitysystem.component'; import { SecuritysystemManageComponent } from './types/securitysystem/securitysystem.manage.component'; -import { LeaksensorComponent } from './types/leaksensor/leaksensor.component'; import { SmokesensorComponent } from './types/smokesensor/smokesensor.component'; +import { SpeakerComponent } from './types/speaker/speaker.component'; +import { SpeakerManageComponent } from './types/speaker/speaker.manage.component'; +import { StatelessprogrammableswitchComponent } from './types/statelessprogrammableswitch/statelessprogrammableswitch.component'; +import { SwitchComponent } from './types/switch/switch.component'; +import { TelevisionComponent } from './types/television/television.component'; +import { TemperaturesensorComponent } from './types/temperaturesensor/temperaturesensor.component'; +import { ThermostatComponent } from './types/thermostat/thermostat.component'; +import { ThermostatManageComponent } from './types/thermostat/thermostat.manage.component'; +import { UnknownComponent } from './types/unknown/unknown.component'; import { ValveComponent } from './types/valve/valve.component'; import { ValveManageComponent } from './types/valve/valve.manage.component'; -import { IrrigationSystemComponent } from './types/irrigationsystem/irrigationsystem.component'; -import { AirpurifierComponent } from './types/airpurifier/airpurifier.component'; -import { AirpurifierManageComponent } from './types/airpurifier/airpurifier.manage.component'; -import { HeaterCoolerComponent } from './types/heatercooler/heatercooler.component'; -import { HeaterCoolerManageComponent } from './types/heatercooler/heatercooler.manage.component'; -import { HumidifierDehumidifierComponent } from './types/humidifierdehumidifier/humidifierdehumidifier.component'; -import { HumidifierDehumidifierManageComponent } from './types/humidifierdehumidifier/humidifierdehumidifier.manage.component'; -import { InfoModalComponent } from './info-modal/info-modal.component'; -import { AccessoryTileComponent } from './accessory-tile/accessory-tile.component'; +import { WindowComponent } from './types/window/window.component'; +import { WindowManageComponent } from './types/window/window.manage.component'; +import { WindowcoveringComponent } from './types/windowcovering/windowcovering.component'; +import { WindowcoveringManageComponent } from './types/windowcovering/windowcovering.manage.component'; +import { CoreModule } from '@/app/core/core.module'; @NgModule({ declarations: [ diff --git a/ui/src/app/core/accessories/accessories.service.ts b/ui/src/app/core/accessories/accessories.service.ts index d51f61588..36b8a135c 100644 --- a/ui/src/app/core/accessories/accessories.service.ts +++ b/ui/src/app/core/accessories/accessories.service.ts @@ -1,12 +1,10 @@ import { Injectable } from '@angular/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceType } from '@oznu/hap-client'; import { ToastrService } from 'ngx-toastr'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Subject } from 'rxjs'; - -import { WsService, IoNamespace } from '../ws.service'; import { AuthService } from '../auth/auth.service'; -import { ApiService } from '../api.service'; +import { IoNamespace, WsService } from '../ws.service'; import { ServiceTypeX } from './accessories.interfaces'; import { InfoModalComponent } from './info-modal/info-modal.component'; @@ -46,7 +44,6 @@ export class AccessoriesService { public $toastr: ToastrService, private $ws: WsService, public $auth: AuthService, - private $api: ApiService, ) { } /** @@ -123,14 +120,14 @@ export class AccessoriesService { /** * Parse the incoming accessory data and refresh existing accessory statuses */ - private parseServices(services) { + private parseServices(services: any) { if (!this.accessories.services.length) { this.accessories.services = services; return; } // update the existing objects to avoid re-painting the dom element each refresh - services.forEach((service) => { + services.forEach((service: any) => { const existing = this.accessories.services.find(x => x.uniqueId === service.uniqueId); if (existing) { @@ -296,7 +293,7 @@ export class AccessoriesService { /** * */ - showAccessoryInformation(service) { + showAccessoryInformation(service: any) { const ref = this.modalService.open(InfoModalComponent, { size: 'lg', }); @@ -320,5 +317,4 @@ export class AccessoriesService { this.roomsOrdered = false; delete this.accessoryLayout; } - } diff --git a/ui/src/app/core/accessories/accessory-tile/accessory-tile.component.ts b/ui/src/app/core/accessories/accessory-tile/accessory-tile.component.ts index f5ef6094f..dedb98a0a 100644 --- a/ui/src/app/core/accessories/accessory-tile/accessory-tile.component.ts +++ b/ui/src/app/core/accessories/accessory-tile/accessory-tile.component.ts @@ -16,5 +16,4 @@ export class AccessoryTileComponent implements OnInit { ngOnInit(): void { } - } diff --git a/ui/src/app/core/accessories/info-modal/info-modal.component.html b/ui/src/app/core/accessories/info-modal/info-modal.component.html index 502a8a4f0..a90504f8b 100644 --- a/ui/src/app/core/accessories/info-modal/info-modal.component.html +++ b/ui/src/app/core/accessories/info-modal/info-modal.component.html @@ -1,8 +1,7 @@
{{ service.customName || service.serviceName }}
-
@@ -71,4 +70,13 @@
{{ service.customName || service.serviceName }}
- \ No newline at end of file +
+
+
+ +
+
+
+ diff --git a/ui/src/app/core/accessories/info-modal/info-modal.component.ts b/ui/src/app/core/accessories/info-modal/info-modal.component.ts index 1691fdd03..c29688fd7 100644 --- a/ui/src/app/core/accessories/info-modal/info-modal.component.ts +++ b/ui/src/app/core/accessories/info-modal/info-modal.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '@/app/core/accessories/accessories.interfaces'; diff --git a/ui/src/app/core/accessories/types/airpurifier/airpurifier.component.ts b/ui/src/app/core/accessories/types/airpurifier/airpurifier.component.ts index 00453509f..18c50c823 100644 --- a/ui/src/app/core/accessories/types/airpurifier/airpurifier.component.ts +++ b/ui/src/app/core/accessories/types/airpurifier/airpurifier.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { AirpurifierManageComponent } from './airpurifier.manage.component'; @Component({ diff --git a/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.html b/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.html index 776f6099b..fd62c300b 100644 --- a/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.html +++ b/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.html @@ -2,7 +2,7 @@
@@ -33,4 +33,4 @@
{{ 'accessories.control.label_rotation_speed' | translate }} - \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.ts b/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.ts index 98d65c89a..aa4a7a445 100644 --- a/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.ts +++ b/ui/src/app/core/accessories/types/airpurifier/airpurifier.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-airpurifier-manage', diff --git a/ui/src/app/core/accessories/types/airqualitysensor/airqualitysensor.component.ts b/ui/src/app/core/accessories/types/airqualitysensor/airqualitysensor.component.ts index 5f1723509..fa3d08e6d 100644 --- a/ui/src/app/core/accessories/types/airqualitysensor/airqualitysensor.component.ts +++ b/ui/src/app/core/accessories/types/airqualitysensor/airqualitysensor.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/batteryservice/batteryservice.component.ts b/ui/src/app/core/accessories/types/batteryservice/batteryservice.component.ts index feacfff8d..c2b36dec0 100644 --- a/ui/src/app/core/accessories/types/batteryservice/batteryservice.component.ts +++ b/ui/src/app/core/accessories/types/batteryservice/batteryservice.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/contactsensor/contactsensor.component.ts b/ui/src/app/core/accessories/types/contactsensor/contactsensor.component.ts index 3d8f4f502..21fb8186a 100644 --- a/ui/src/app/core/accessories/types/contactsensor/contactsensor.component.ts +++ b/ui/src/app/core/accessories/types/contactsensor/contactsensor.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/door/door.component.ts b/ui/src/app/core/accessories/types/door/door.component.ts index eb6aea236..45c524a01 100644 --- a/ui/src/app/core/accessories/types/door/door.component.ts +++ b/ui/src/app/core/accessories/types/door/door.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { DoorManageComponent } from './door.manage.component'; @Component({ diff --git a/ui/src/app/core/accessories/types/door/door.manage.component.html b/ui/src/app/core/accessories/types/door/door.manage.component.html index b9297b831..6d7a2dc18 100644 --- a/ui/src/app/core/accessories/types/door/door.manage.component.html +++ b/ui/src/app/core/accessories/types/door/door.manage.component.html @@ -2,7 +2,7 @@
diff --git a/ui/src/app/core/accessories/types/door/door.manage.component.ts b/ui/src/app/core/accessories/types/door/door.manage.component.ts index fcaf6ee8b..be8f4ab5b 100644 --- a/ui/src/app/core/accessories/types/door/door.manage.component.ts +++ b/ui/src/app/core/accessories/types/door/door.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-door-manage', diff --git a/ui/src/app/core/accessories/types/fan/fan.component.ts b/ui/src/app/core/accessories/types/fan/fan.component.ts index 56e04f41f..535b182e7 100644 --- a/ui/src/app/core/accessories/types/fan/fan.component.ts +++ b/ui/src/app/core/accessories/types/fan/fan.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { FanManageComponent } from './fan.manage.component'; @Component({ diff --git a/ui/src/app/core/accessories/types/fan/fan.manage.component.html b/ui/src/app/core/accessories/types/fan/fan.manage.component.html index a6be9f8e8..466670101 100644 --- a/ui/src/app/core/accessories/types/fan/fan.manage.component.html +++ b/ui/src/app/core/accessories/types/fan/fan.manage.component.html @@ -2,7 +2,7 @@
@@ -34,4 +34,4 @@
{{ 'accessories.control.label_rotation_speed' | translate }} - \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/fan/fan.manage.component.ts b/ui/src/app/core/accessories/types/fan/fan.manage.component.ts index 1fc4ca4a6..aec170939 100644 --- a/ui/src/app/core/accessories/types/fan/fan.manage.component.ts +++ b/ui/src/app/core/accessories/types/fan/fan.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-fan-manage', diff --git a/ui/src/app/core/accessories/types/fanv2/fanv2.component.ts b/ui/src/app/core/accessories/types/fanv2/fanv2.component.ts index 4e47a9769..59ab69cd9 100644 --- a/ui/src/app/core/accessories/types/fanv2/fanv2.component.ts +++ b/ui/src/app/core/accessories/types/fanv2/fanv2.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { Fanv2ManageComponent } from './fanv2.manage.component'; @Component({ diff --git a/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.html b/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.html index 43f58c172..14ace7fea 100644 --- a/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.html +++ b/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.html @@ -2,7 +2,7 @@
@@ -34,4 +34,4 @@
{{ 'accessories.control.label_rotation_speed' | translate }} - \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.ts b/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.ts index 7e74d32aa..ed2ae1919 100644 --- a/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.ts +++ b/ui/src/app/core/accessories/types/fanv2/fanv2.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-fanv2-manage', diff --git a/ui/src/app/core/accessories/types/garagedooropener/garagedooropener.component.ts b/ui/src/app/core/accessories/types/garagedooropener/garagedooropener.component.ts index c77c24bb4..b7717425b 100644 --- a/ui/src/app/core/accessories/types/garagedooropener/garagedooropener.component.ts +++ b/ui/src/app/core/accessories/types/garagedooropener/garagedooropener.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/heatercooler/heatercooler.component.ts b/ui/src/app/core/accessories/types/heatercooler/heatercooler.component.ts index 5ecafae76..d9af0dd8e 100644 --- a/ui/src/app/core/accessories/types/heatercooler/heatercooler.component.ts +++ b/ui/src/app/core/accessories/types/heatercooler/heatercooler.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { HeaterCoolerManageComponent } from './heatercooler.manage.component'; @Component({ diff --git a/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.html b/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.html index 7fcda58d4..c3e7f87ab 100644 --- a/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.html +++ b/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.html @@ -2,7 +2,7 @@
@@ -63,4 +63,4 @@
{{ 'accessories.control.label_target_temperature' | translate }}
- \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.ts b/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.ts index 15cc52f02..ff4d17603 100644 --- a/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.ts +++ b/ui/src/app/core/accessories/types/heatercooler/heatercooler.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-heatercooler-manage', diff --git a/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.component.ts b/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.component.ts index fe94fba22..5423dabe6 100644 --- a/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.component.ts +++ b/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { HumidifierDehumidifierManageComponent } from './humidifierdehumidifier.manage.component'; @Component({ diff --git a/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html b/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html index 61d898a68..5bd80ec8e 100644 --- a/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html +++ b/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.html @@ -2,7 +2,7 @@
@@ -65,4 +65,4 @@
{{ 'accessories.control.label_target_humidity' | translate }}
- \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.ts b/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.ts index 262eb9e62..56f97a7e7 100644 --- a/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.ts +++ b/ui/src/app/core/accessories/types/humidifierdehumidifier/humidifierdehumidifier.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-humidifierdehumidifier-manage', diff --git a/ui/src/app/core/accessories/types/humiditysensor/humiditysensor.component.ts b/ui/src/app/core/accessories/types/humiditysensor/humiditysensor.component.ts index ed7acf3e4..9f04d7f6e 100644 --- a/ui/src/app/core/accessories/types/humiditysensor/humiditysensor.component.ts +++ b/ui/src/app/core/accessories/types/humiditysensor/humiditysensor.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/leaksensor/leaksensor.component.ts b/ui/src/app/core/accessories/types/leaksensor/leaksensor.component.ts index 69a91d857..7704a7b17 100644 --- a/ui/src/app/core/accessories/types/leaksensor/leaksensor.component.ts +++ b/ui/src/app/core/accessories/types/leaksensor/leaksensor.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html index 9f8735667..37553f096 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html @@ -1,4 +1,4 @@ -
@@ -8,4 +8,4 @@
{{ service.values.Brightness }}%
- \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts index fca9bcf1d..a3488e03b 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { LightbulbManageComponent } from './lightbulb.manage.component'; @Component({ @@ -30,7 +29,7 @@ export class LightbulbComponent implements OnInit { onLongClick() { if ('Brightness' in this.service.values) { const ref = this.modalService.open(LightbulbManageComponent, { - size: 'sm', + size: 'md', }); ref.componentInstance.service = this.service; } diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html index 33055c32a..c3d391da6 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html @@ -2,11 +2,11 @@
-
+
@@ -34,4 +34,4 @@
{{ 'accessories.control.label_brightness' | translate }}
- \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.ts b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.ts index 3b13e081f..45b201473 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.ts +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-lightbulb-manage', diff --git a/ui/src/app/core/accessories/types/lightsensor/lightsensor.component.ts b/ui/src/app/core/accessories/types/lightsensor/lightsensor.component.ts index 0553d7e1e..82ee865bb 100644 --- a/ui/src/app/core/accessories/types/lightsensor/lightsensor.component.ts +++ b/ui/src/app/core/accessories/types/lightsensor/lightsensor.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/lockmechanism/lockmechanism.component.ts b/ui/src/app/core/accessories/types/lockmechanism/lockmechanism.component.ts index a6ee068d8..b69c82bdf 100644 --- a/ui/src/app/core/accessories/types/lockmechanism/lockmechanism.component.ts +++ b/ui/src/app/core/accessories/types/lockmechanism/lockmechanism.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/motionsensor/motionsensor.component.ts b/ui/src/app/core/accessories/types/motionsensor/motionsensor.component.ts index 83ad7d7c6..da3c41a3b 100644 --- a/ui/src/app/core/accessories/types/motionsensor/motionsensor.component.ts +++ b/ui/src/app/core/accessories/types/motionsensor/motionsensor.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/occupancysensor/occupancysensor.component.ts b/ui/src/app/core/accessories/types/occupancysensor/occupancysensor.component.ts index 72d71a7dc..f6cd0a53e 100644 --- a/ui/src/app/core/accessories/types/occupancysensor/occupancysensor.component.ts +++ b/ui/src/app/core/accessories/types/occupancysensor/occupancysensor.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/outlet/outlet.component.ts b/ui/src/app/core/accessories/types/outlet/outlet.component.ts index 8bb6b30db..d2dbc7eed 100644 --- a/ui/src/app/core/accessories/types/outlet/outlet.component.ts +++ b/ui/src/app/core/accessories/types/outlet/outlet.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/securitysystem/securitysystem.component.ts b/ui/src/app/core/accessories/types/securitysystem/securitysystem.component.ts index 38d491b7e..0b804d662 100644 --- a/ui/src/app/core/accessories/types/securitysystem/securitysystem.component.ts +++ b/ui/src/app/core/accessories/types/securitysystem/securitysystem.component.ts @@ -1,6 +1,5 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; - import { ServiceTypeX } from '../../accessories.interfaces'; import { SecuritysystemManageComponent } from './securitysystem.manage.component'; diff --git a/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.html b/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.html index 9c06dc856..752bdc866 100644 --- a/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.html +++ b/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.html @@ -2,7 +2,7 @@
@@ -25,4 +25,4 @@
- \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.ts b/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.ts index 22d384f7f..8fcb1b948 100644 --- a/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.ts +++ b/ui/src/app/core/accessories/types/securitysystem/securitysystem.manage.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; diff --git a/ui/src/app/core/accessories/types/smokesensor/smokesensor.component.ts b/ui/src/app/core/accessories/types/smokesensor/smokesensor.component.ts index 58927e963..3a3d7f9bd 100644 --- a/ui/src/app/core/accessories/types/smokesensor/smokesensor.component.ts +++ b/ui/src/app/core/accessories/types/smokesensor/smokesensor.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/speaker/speaker.component.ts b/ui/src/app/core/accessories/types/speaker/speaker.component.ts index 9a3c9742c..c0f789ab1 100644 --- a/ui/src/app/core/accessories/types/speaker/speaker.component.ts +++ b/ui/src/app/core/accessories/types/speaker/speaker.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { SpeakerManageComponent } from './speaker.manage.component'; @Component({ diff --git a/ui/src/app/core/accessories/types/speaker/speaker.manage.component.html b/ui/src/app/core/accessories/types/speaker/speaker.manage.component.html index 4d9d6bd50..80c043b1b 100644 --- a/ui/src/app/core/accessories/types/speaker/speaker.manage.component.html +++ b/ui/src/app/core/accessories/types/speaker/speaker.manage.component.html @@ -2,7 +2,7 @@
@@ -33,4 +33,4 @@
{{ 'accessories.control.label_speaker_volume' | translate }} - \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/speaker/speaker.manage.component.ts b/ui/src/app/core/accessories/types/speaker/speaker.manage.component.ts index d7713324b..18f682d04 100644 --- a/ui/src/app/core/accessories/types/speaker/speaker.manage.component.ts +++ b/ui/src/app/core/accessories/types/speaker/speaker.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-speaker-manage', diff --git a/ui/src/app/core/accessories/types/statelessprogrammableswitch/statelessprogrammableswitch.component.ts b/ui/src/app/core/accessories/types/statelessprogrammableswitch/statelessprogrammableswitch.component.ts index d92aaab45..02ec9a730 100644 --- a/ui/src/app/core/accessories/types/statelessprogrammableswitch/statelessprogrammableswitch.component.ts +++ b/ui/src/app/core/accessories/types/statelessprogrammableswitch/statelessprogrammableswitch.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/switch/switch.component.ts b/ui/src/app/core/accessories/types/switch/switch.component.ts index 638658bba..4cd065023 100644 --- a/ui/src/app/core/accessories/types/switch/switch.component.ts +++ b/ui/src/app/core/accessories/types/switch/switch.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/television/television.component.ts b/ui/src/app/core/accessories/types/television/television.component.ts index 086f5705d..be9c451a4 100644 --- a/ui/src/app/core/accessories/types/television/television.component.ts +++ b/ui/src/app/core/accessories/types/television/television.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/temperaturesensor/temperaturesensor.component.ts b/ui/src/app/core/accessories/types/temperaturesensor/temperaturesensor.component.ts index 3ac6f7234..6ac628ebc 100644 --- a/ui/src/app/core/accessories/types/temperaturesensor/temperaturesensor.component.ts +++ b/ui/src/app/core/accessories/types/temperaturesensor/temperaturesensor.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/thermostat/thermostat.component.ts b/ui/src/app/core/accessories/types/thermostat/thermostat.component.ts index b1cc457b0..83a468a52 100644 --- a/ui/src/app/core/accessories/types/thermostat/thermostat.component.ts +++ b/ui/src/app/core/accessories/types/thermostat/thermostat.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { ThermostatManageComponent } from './thermostat.manage.component'; @Component({ diff --git a/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.html b/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.html index 1bf646d5f..c7d727d03 100644 --- a/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.html +++ b/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.html @@ -2,7 +2,7 @@
@@ -39,4 +39,4 @@
{{ 'accessories.control.label_target_temperature' | translate }}
- \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.ts b/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.ts index e7001d36a..16c22f879 100644 --- a/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.ts +++ b/ui/src/app/core/accessories/types/thermostat/thermostat.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-thermostat-manage', diff --git a/ui/src/app/core/accessories/types/unknown/unknown.component.ts b/ui/src/app/core/accessories/types/unknown/unknown.component.ts index 46c0e6fcf..b31773bfe 100644 --- a/ui/src/app/core/accessories/types/unknown/unknown.component.ts +++ b/ui/src/app/core/accessories/types/unknown/unknown.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ diff --git a/ui/src/app/core/accessories/types/valve/valve.component.ts b/ui/src/app/core/accessories/types/valve/valve.component.ts index 98c0a4082..16887d61c 100644 --- a/ui/src/app/core/accessories/types/valve/valve.component.ts +++ b/ui/src/app/core/accessories/types/valve/valve.component.ts @@ -1,10 +1,14 @@ -import { Component, OnInit, Input, OnDestroy, OnChanges } from '@angular/core'; +import { + Component, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Subscription, interval } from 'rxjs'; +import { filter } from 'rxjs/operators'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { ValveManageComponent } from './valve.manage.component'; -import { interval, Subscription } from 'rxjs'; -import { filter } from 'rxjs/operators'; @Component({ selector: 'app-valve', diff --git a/ui/src/app/core/accessories/types/valve/valve.manage.component.html b/ui/src/app/core/accessories/types/valve/valve.manage.component.html index 1d8ad3886..dfaf834ed 100644 --- a/ui/src/app/core/accessories/types/valve/valve.manage.component.html +++ b/ui/src/app/core/accessories/types/valve/valve.manage.component.html @@ -3,7 +3,7 @@
@@ -16,4 +16,4 @@
diff --git a/ui/src/app/core/accessories/types/window/window.manage.component.ts b/ui/src/app/core/accessories/types/window/window.manage.component.ts index aad6b8faf..a06db1b0e 100644 --- a/ui/src/app/core/accessories/types/window/window.manage.component.ts +++ b/ui/src/app/core/accessories/types/window/window.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-window-manage', diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.html b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.html index 46fdc3a50..4ec709a91 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.html +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.html @@ -1,4 +1,4 @@ -
-
\ No newline at end of file +
diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss index 9f06a9bdd..d090a4563 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss @@ -3,4 +3,4 @@ font-size: 1.4rem; text-transform: initial; } -} \ No newline at end of file +} diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts index 73ab97218..6b1312d7a 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ServiceTypeX } from '../../accessories.interfaces'; - import { WindowcoveringManageComponent } from './windowcovering.manage.component'; @Component({ @@ -28,7 +27,7 @@ export class WindowcoveringComponent implements OnInit { onLongClick() { const ref = this.modalService.open(WindowcoveringManageComponent, { - size: 'sm', + size: 'md', }); ref.componentInstance.service = this.service; } diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html index 768c67106..e0adf6bd7 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html @@ -2,11 +2,11 @@
-
+
@@ -32,4 +32,4 @@
-
\ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.ts b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.ts index e5ef5742c..7ce61b599 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.ts +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ServiceTypeX } from '../../accessories.interfaces'; - import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ServiceTypeX } from '../../accessories.interfaces'; @Component({ selector: 'app-windowcovering-manage', diff --git a/ui/src/app/core/api.service.ts b/ui/src/app/core/api.service.ts index af5be53ef..730ef4bd3 100644 --- a/ui/src/app/core/api.service.ts +++ b/ui/src/app/core/api.service.ts @@ -1,8 +1,7 @@ -import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; - -import { environment } from '@/environments/environment'; +import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; +import { environment } from '@/environments/environment'; @Injectable({ providedIn: 'root', diff --git a/ui/src/app/core/auth/admin.guard.ts b/ui/src/app/core/auth/admin.guard.ts index 9f07c168b..35f53b507 100644 --- a/ui/src/app/core/auth/admin.guard.ts +++ b/ui/src/app/core/auth/admin.guard.ts @@ -1,8 +1,12 @@ import { Injectable } from '@angular/core'; -import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { +ActivatedRouteSnapshot, +CanActivate, +Router, +RouterStateSnapshot, +} from '@angular/router'; import { ToastrService } from 'ngx-toastr'; - +import { Observable } from 'rxjs'; import { AuthService } from './auth.service'; @Injectable({ diff --git a/ui/src/app/core/auth/auth.guard.ts b/ui/src/app/core/auth/auth.guard.ts index d30a92178..c9e533e3f 100644 --- a/ui/src/app/core/auth/auth.guard.ts +++ b/ui/src/app/core/auth/auth.guard.ts @@ -1,8 +1,12 @@ import { Injectable } from '@angular/core'; -import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router'; - -import { SettingsService } from '@/app/core/settings.service'; +import { + ActivatedRouteSnapshot, + CanActivate, + Router, + RouterStateSnapshot, +} from '@angular/router'; import { AuthService } from './auth.service'; +import { SettingsService } from '@/app/core/settings.service'; @Injectable({ providedIn: 'root', diff --git a/ui/src/app/core/auth/auth.module.ts b/ui/src/app/core/auth/auth.module.ts index 69470a17b..aa8acd713 100644 --- a/ui/src/app/core/auth/auth.module.ts +++ b/ui/src/app/core/auth/auth.module.ts @@ -1,16 +1,14 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { JwtModule } from '@auth0/angular-jwt'; import { TranslateModule } from '@ngx-translate/core'; - -import { environment } from '@/environments/environment'; -import { AuthService } from './auth.service'; -import { AuthGuard } from './auth.guard'; import { AdminGuard } from './admin.guard'; +import { AuthGuard } from './auth.guard'; +import { AuthService } from './auth.service'; +import { environment } from '@/environments/environment'; -// token getter -export const tokenGetter = () => localStorage.getItem(environment.jwt.tokenKey); +const tokenGetter = () => localStorage.getItem(environment.jwt.tokenKey); @NgModule({ imports: [ @@ -35,4 +33,7 @@ export const tokenGetter = () => localStorage.getItem(environment.jwt.tokenKey); ], exports: [], }) -export class AuthModule { } +class AuthModule { } + +// token getter +export { AuthModule, tokenGetter }; diff --git a/ui/src/app/core/auth/auth.service.ts b/ui/src/app/core/auth/auth.service.ts index 56b8c1795..15acf0e95 100644 --- a/ui/src/app/core/auth/auth.service.ts +++ b/ui/src/app/core/auth/auth.service.ts @@ -1,10 +1,9 @@ import { Injectable } from '@angular/core'; import { JwtHelperService } from '@auth0/angular-jwt'; import * as dayjs from 'dayjs'; - -import { environment } from '@/environments/environment'; import { ApiService } from '@/app/core/api.service'; import { SettingsService } from '@/app/core/settings.service'; +import { environment } from '@/environments/environment'; interface UserInterface { username?: string; diff --git a/ui/src/app/core/backup-restore/backup-restore.component.html b/ui/src/app/core/backup-restore/backup-restore.component.html index 4809ef947..54389b513 100644 --- a/ui/src/app/core/backup-restore/backup-restore.component.html +++ b/ui/src/app/core/backup-restore/backup-restore.component.html @@ -1,8 +1,7 @@
-
@@ -45,16 +44,27 @@

-
- - +
+
+ +
+
+
+ +
-
- +
+
+
+ +
+
diff --git a/ui/src/app/core/backup-restore/backup-restore.component.ts b/ui/src/app/core/backup-restore/backup-restore.component.ts index f8ea46d33..1d066995a 100644 --- a/ui/src/app/core/backup-restore/backup-restore.component.ts +++ b/ui/src/app/core/backup-restore/backup-restore.component.ts @@ -1,16 +1,20 @@ -import { Component, OnInit, OnDestroy, Input } from '@angular/core'; import { HttpEventType, HttpResponse } from '@angular/common/http'; +import { + Component, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; import { Router } from '@angular/router'; import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { saveAs } from 'file-saver'; +import { ToastrService } from 'ngx-toastr'; import { Terminal } from 'xterm'; import { FitAddon } from 'xterm-addon-fit'; -import { ToastrService } from 'ngx-toastr'; - +import { ScheduledBackupsComponent } from './scheduled-backups/scheduled-backups.component'; import { ApiService } from '@/app/core/api.service'; import { WsService } from '@/app/core/ws.service'; -import { ScheduledBackupsComponent } from './scheduled-backups/scheduled-backups.component'; @Component({ selector: 'app-backup-restore', diff --git a/ui/src/app/core/backup-restore/scheduled-backups/scheduled-backups.component.html b/ui/src/app/core/backup-restore/scheduled-backups/scheduled-backups.component.html index f49ef0d56..9edac2c62 100644 --- a/ui/src/app/core/backup-restore/scheduled-backups/scheduled-backups.component.html +++ b/ui/src/app/core/backup-restore/scheduled-backups/scheduled-backups.component.html @@ -1,8 +1,7 @@
-
@@ -43,18 +42,19 @@

{{ 'toast.title_error' | translate }}

-
-
- - - +
+
+ +
+
+
+ +
-
diff --git a/ui/src/app/core/backup-restore/scheduled-backups/scheduled-backups.component.ts b/ui/src/app/core/backup-restore/scheduled-backups/scheduled-backups.component.ts index a220fefac..e09229f87 100644 --- a/ui/src/app/core/backup-restore/scheduled-backups/scheduled-backups.component.ts +++ b/ui/src/app/core/backup-restore/scheduled-backups/scheduled-backups.component.ts @@ -1,9 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { ToastrService } from 'ngx-toastr'; import { saveAs } from 'file-saver'; - +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @Component({ diff --git a/ui/src/app/core/components/confirm/confirm.component.html b/ui/src/app/core/components/confirm/confirm.component.html index 0a9c12ffe..21e5a8b9f 100644 --- a/ui/src/app/core/components/confirm/confirm.component.html +++ b/ui/src/app/core/components/confirm/confirm.component.html @@ -1,20 +1,25 @@ -
+
{{ title }}
-
-
+
+

{{ message }}

-
- - +
+
+ +
+
+
+ +
-
\ No newline at end of file +
diff --git a/ui/src/app/core/components/confirm/confirm.component.ts b/ui/src/app/core/components/confirm/confirm.component.ts index 1f2ecc97d..3d6c18c88 100644 --- a/ui/src/app/core/components/confirm/confirm.component.ts +++ b/ui/src/app/core/components/confirm/confirm.component.ts @@ -1,6 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-confirm', @@ -8,20 +7,14 @@ import { TranslateService } from '@ngx-translate/core'; styleUrls: ['./confirm.component.scss'], }) export class ConfirmComponent implements OnInit { - @Input() title; - @Input() message; - @Input() confirmButtonLabel; - @Input() cancelButtonLabel; + @Input() title: string; + @Input() message: string; + @Input() confirmButtonLabel: string; + @Input() faIconClass: string|undefined; constructor( public activeModal: NgbActiveModal, - private translate: TranslateService, ) { } - ngOnInit() { - if (!this.cancelButtonLabel) { - this.cancelButtonLabel = this.translate.instant('form.button_cancel'); - } - } - + ngOnInit() {} } diff --git a/ui/src/app/core/components/information/information.component.html b/ui/src/app/core/components/information/information.component.html index b6ccefb60..1732df2fe 100644 --- a/ui/src/app/core/components/information/information.component.html +++ b/ui/src/app/core/components/information/information.component.html @@ -1,17 +1,25 @@ -
+
{{ title }}
-
-
-

{{ message }}

+
+ +

{{ message }}

-
- - {{ ctaButtonLabel }} - +
+
+ +
+
+
+ + {{ ctaButtonLabel }} + +
diff --git a/ui/src/app/core/components/information/information.component.ts b/ui/src/app/core/components/information/information.component.ts index 7d68be7aa..5a4ef5874 100644 --- a/ui/src/app/core/components/information/information.component.ts +++ b/ui/src/app/core/components/information/information.component.ts @@ -11,6 +11,7 @@ export class InformationComponent implements OnInit { @Input() message: string; @Input() ctaButtonLabel: string; @Input() ctaButtonLink: string; + @Input() faIconClass: string; constructor( public activeModal: NgbActiveModal, diff --git a/ui/src/app/core/components/qrcode/qrcode.component.ts b/ui/src/app/core/components/qrcode/qrcode.component.ts index 0a986d6ea..7a213e6ae 100644 --- a/ui/src/app/core/components/qrcode/qrcode.component.ts +++ b/ui/src/app/core/components/qrcode/qrcode.component.ts @@ -1,4 +1,10 @@ -import { Component, ElementRef, Input, OnChanges, ViewChild } from '@angular/core'; +import { + Component, + ElementRef, + Input, + OnChanges, + ViewChild, +} from '@angular/core'; import * as QRCode from 'qrcode'; @Component({ diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html new file mode 100644 index 000000000..d1a31b112 --- /dev/null +++ b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html @@ -0,0 +1,25 @@ +
+
+
{{ 'platform.version.title_service_restart_required' | translate }}
+ +
+
+ +

{{ 'plugins.manage.message_thanks_for_updating_restart' | translate }}

+
+
+
+ +
+
+
+ +
+
+
diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.scss b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.ts b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.ts new file mode 100644 index 000000000..b494dace5 --- /dev/null +++ b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.ts @@ -0,0 +1,22 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'app-confirm', + templateUrl: './restart-homebridge.component.html', + styleUrls: ['./restart-homebridge.component.scss'], +}) +export class RestartHomebridgeComponent implements OnInit { + constructor( + public activeModal: NgbActiveModal, + private $router: Router, + ) { } + + ngOnInit() {} + + public onRestartHomebridgeClick() { + this.$router.navigate(['/restart']); + this.activeModal.close(); + } +} diff --git a/ui/src/app/core/components/schema-form/schema-form.component.ts b/ui/src/app/core/components/schema-form/schema-form.component.ts index 9c72731e2..6e1b9c8cb 100644 --- a/ui/src/app/core/components/schema-form/schema-form.component.ts +++ b/ui/src/app/core/components/schema-form/schema-form.component.ts @@ -1,4 +1,9 @@ -import { Component, OnInit, Input, Output } from '@angular/core'; +import { + Component, + Input, + OnInit, + Output, +} from '@angular/core'; import { EventEmitter } from '@angular/core'; @Component({ diff --git a/ui/src/app/core/core.module.ts b/ui/src/app/core/core.module.ts index e0ff1bbca..d4f79b05c 100644 --- a/ui/src/app/core/core.module.ts +++ b/ui/src/app/core/core.module.ts @@ -1,22 +1,22 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { Bootstrap4FrameworkModule } from '@oznu/ngx-bs4-jsonform'; - -import { SpinnerComponent } from './components/spinner/spinner.component'; -import { ConvertTempPipe } from './pipes/convert-temp.pipe'; -import { ReplacePipe } from './pipes/replace.pipe'; -import { ExternalLinkIconPipe } from './pipes/external-link-icon.pipe'; -import { PluginsMarkdownDirective } from './directives/plugins.markdown.directive'; -import { LongClickDirective } from './directives/longclick.directive'; import { BackupRestoreComponent } from './backup-restore/backup-restore.component'; import { ScheduledBackupsComponent } from './backup-restore/scheduled-backups/scheduled-backups.component'; import { ConfirmComponent } from './components/confirm/confirm.component'; -import { SchemaFormComponent } from './components/schema-form/schema-form.component'; import { QrcodeComponent } from './components/qrcode/qrcode.component'; -import { RtlDirective } from './directives/rtl.directive'; +import { SchemaFormComponent } from './components/schema-form/schema-form.component'; +import { SpinnerComponent } from './components/spinner/spinner.component'; import { JsonSchemaFormPatchDirective } from './directives/json-schema-form-patch.directive'; +import { LongClickDirective } from './directives/longclick.directive'; +import { PluginsMarkdownDirective } from './directives/plugins.markdown.directive'; +import { RtlDirective } from './directives/rtl.directive'; +import { ConvertTempPipe } from './pipes/convert-temp.pipe'; +import { ExternalLinkIconPipe } from './pipes/external-link-icon.pipe'; +import { ReplacePipe } from './pipes/replace.pipe'; import { InformationComponent } from '@/app/core/components/information/information.component'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; @NgModule({ declarations: [ @@ -33,6 +33,7 @@ import { InformationComponent } from '@/app/core/components/information/informat ScheduledBackupsComponent, ConfirmComponent, InformationComponent, + RestartHomebridgeComponent, QrcodeComponent, ], imports: [ diff --git a/ui/src/app/core/directives/json-schema-form-patch.directive.ts b/ui/src/app/core/directives/json-schema-form-patch.directive.ts index 26d5c2d69..078c2c4ef 100644 --- a/ui/src/app/core/directives/json-schema-form-patch.directive.ts +++ b/ui/src/app/core/directives/json-schema-form-patch.directive.ts @@ -1,6 +1,12 @@ -import {Directive, Host, Input, Optional, Self} from '@angular/core'; -import {JsonSchemaFormComponent} from '@oznu/ngx-bs4-jsonform'; -import {cloneDeep, merge, uniqueId} from 'lodash-es'; +import { + Directive, + Host, + Input, + Optional, + Self, +} from '@angular/core'; +import { JsonSchemaFormComponent } from '@oznu/ngx-bs4-jsonform'; +import { cloneDeep, merge, uniqueId } from 'lodash-es'; @Directive({ selector: '[jsfPatch]', diff --git a/ui/src/app/core/directives/longclick.directive.ts b/ui/src/app/core/directives/longclick.directive.ts index cb1f826b2..468521e4e 100644 --- a/ui/src/app/core/directives/longclick.directive.ts +++ b/ui/src/app/core/directives/longclick.directive.ts @@ -1,4 +1,11 @@ -import { OnDestroy, Directive, EventEmitter, HostListener, Input, Output } from '@angular/core'; +import { + Directive, + EventEmitter, + HostListener, + Input, + OnDestroy, + Output, +} from '@angular/core'; @Directive({ selector: '[appLongclick]', diff --git a/ui/src/app/core/directives/rtl.directive.ts b/ui/src/app/core/directives/rtl.directive.ts index 7707817d3..6c79d6b90 100644 --- a/ui/src/app/core/directives/rtl.directive.ts +++ b/ui/src/app/core/directives/rtl.directive.ts @@ -1,4 +1,9 @@ -import { Directive, ElementRef, Input, OnInit } from '@angular/core'; +import { + Directive, + ElementRef, + Input, + OnInit, +} from '@angular/core'; import { SettingsService } from '@/app/core/settings.service'; @Directive({ diff --git a/ui/src/app/core/locales.ts b/ui/src/app/core/locales.ts index 85dba25c4..d3e3dc0a9 100644 --- a/ui/src/app/core/locales.ts +++ b/ui/src/app/core/locales.ts @@ -1,31 +1,30 @@ import { registerLocaleData } from '@angular/common'; - -import localeEn from '@angular/common/locales/en'; +import localeBg from '@angular/common/locales/bg'; +import localeCa from '@angular/common/locales/ca'; +import localeCs from '@angular/common/locales/cs'; import localeDe from '@angular/common/locales/de'; +import localeEn from '@angular/common/locales/en'; +import localeEs from '@angular/common/locales/es'; import localeFr from '@angular/common/locales/fr'; -import localePl from '@angular/common/locales/pl'; -import localeCs from '@angular/common/locales/cs'; -import localeRu from '@angular/common/locales/ru'; -import localeZhCn from '@angular/common/locales/zh-Hans'; -import localeZhTw from '@angular/common/locales/zh-Hant'; +import localeHE from '@angular/common/locales/he'; import localeHu from '@angular/common/locales/hu'; -import localeJa from '@angular/common/locales/ja'; -import localeEs from '@angular/common/locales/es'; -import localeNl from '@angular/common/locales/nl'; -import localeTr from '@angular/common/locales/tr'; -import localeIt from '@angular/common/locales/it'; -import localeBg from '@angular/common/locales/bg'; -import localeSv from '@angular/common/locales/sv'; -import localeNo from '@angular/common/locales/nb'; -import localeSl from '@angular/common/locales/sl'; -import localePt from '@angular/common/locales/pt'; import localeId from '@angular/common/locales/id'; -import localeCa from '@angular/common/locales/ca'; +import localeIt from '@angular/common/locales/it'; +import localeJa from '@angular/common/locales/ja'; import localeKo from '@angular/common/locales/ko'; import localeMk from '@angular/common/locales/mk'; +import localeNo from '@angular/common/locales/nb'; +import localeNl from '@angular/common/locales/nl'; +import localePl from '@angular/common/locales/pl'; +import localePt from '@angular/common/locales/pt'; +import localeRu from '@angular/common/locales/ru'; +import localeSl from '@angular/common/locales/sl'; +import localeSv from '@angular/common/locales/sv'; import localeTh from '@angular/common/locales/th'; +import localeTr from '@angular/common/locales/tr'; import localeUk from '@angular/common/locales/uk'; -import localeHE from '@angular/common/locales/he'; +import localeZhCn from '@angular/common/locales/zh-Hans'; +import localeZhTw from '@angular/common/locales/zh-Hant'; registerLocaleData(localeEn); registerLocaleData(localeDe); diff --git a/ui/src/app/core/log.service.ts b/ui/src/app/core/log.service.ts index 8d2ef4f46..3eb969616 100644 --- a/ui/src/app/core/log.service.ts +++ b/ui/src/app/core/log.service.ts @@ -1,11 +1,10 @@ -import { Injectable, ElementRef } from '@angular/core'; -import { Terminal, ITerminalOptions } from 'xterm'; -import { FitAddon } from 'xterm-addon-fit'; -import { WebLinksAddon } from 'xterm-addon-web-links'; +import { ElementRef, Injectable } from '@angular/core'; import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; - -import { WsService, IoNamespace } from '@/app/core/ws.service'; +import { ITerminalOptions, Terminal } from 'xterm'; +import { FitAddon } from 'xterm-addon-fit'; +import { WebLinksAddon } from 'xterm-addon-web-links'; +import { IoNamespace, WsService } from '@/app/core/ws.service'; @Injectable({ providedIn: 'root', @@ -18,6 +17,7 @@ export class LogService { private webLinksAddon: WebLinksAddon; private resize: Subject; private elementResize: Subject | undefined; + private pluginName: string; constructor( private $ws: WsService, @@ -26,7 +26,10 @@ export class LogService { startTerminal( targetElement: ElementRef, termOpts: ITerminalOptions = {}, - elementResize?: Subject) { + elementResize?: Subject, + pluginName?: string, + ) { + this.pluginName = pluginName; // handle element resize events this.elementResize = elementResize; @@ -75,8 +78,29 @@ export class LogService { }); // subscribe to incoming data events from server to client - this.io.socket.on('stdout', data => { - this.term.write(data); + this.io.socket.on('stdout', (data: string) => { + if (this.pluginName) { + const lines = data.split('\n'); + let includeNextLine = false; + + lines.forEach((line) => { + if (includeNextLine) { + if (line.match(/36m\[.*?]/)) { + includeNextLine = false; + } else { + this.term.write(line + '\r\n'); + return; + } + } + + if (line.includes(`36m[${this.pluginName}]`)) { + this.term.write(line + '\r\n'); + includeNextLine = true; + } + }); + } else { + this.term.write(data); + } }); // handle resize events from the client diff --git a/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.html b/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.html index 9853878bf..b4588a605 100644 --- a/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.html +++ b/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.html @@ -4,24 +4,24 @@
{{ 'child_bridge.label_bridge_settings' | translate }}: {{ plugin.displayName || plugin.name }}
-
-

{{ 'child_bridge.message_about' | translate }} + + {{ 'child_bridge.message_wiki_link' | translate }} + +

-
-

- - {{ 'child_bridge.message_select_platforms_accessories' | translate }}: - +

+ {{ 'child_bridge.message_child_bridges_must_be_paired_separately' | translate }}

- +

{{ 'child_bridge.message_select_platforms_accessories' | translate }}:

  • @@ -47,20 +47,21 @@
    - +

    + {{ deviceInfo[item._bridge?.username].pincode }} +

    {{ 'status.message_code_scan_instructions' | translate }}

    - -

    + +

    {{ 'child_bridge.label_bridge_paired' | translate }}

    -
- -

- {{ 'child_bridge.message_child_bridges_must_be_paired_separately' | translate }} -

- {{ 'child_bridge.message_must_configure_plugin_first' | translate }} -
{{ 'plugins.settings.message_manual_config_required' | translate }} {{ 'plugins.settings.message_consult_documentation' | translate }} -
- -

- - {{ 'child_bridge.message_wiki_link' | translate }} - - -

-
-
- +
+
- -
+
- -
- - +
diff --git a/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts b/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts index f0b53821b..ec6825037 100644 --- a/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts +++ b/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts @@ -1,11 +1,12 @@ import { Component, Input, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { Router } from '@angular/router'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; +import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; import { SettingsService } from '@/app/core/settings.service'; -import { NotificationService } from '@/app/core/notification.service'; @Component({ selector: 'app-bridge-plugins-modal', @@ -28,8 +29,10 @@ export class BridgePluginsModalComponent implements OnInit { constructor( public activeModal: NgbActiveModal, public $settings: SettingsService, - private $notification: NotificationService, private $api: ApiService, + private $modal: NgbModal, + private $plugins: ManagePluginsService, + private $router: Router, private $toastr: ToastrService, private $translate: TranslateService, ) { } @@ -96,8 +99,8 @@ export class BridgePluginsModalComponent implements OnInit { try { await this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, this.configBlocks).toPromise(); - this.$notification.configUpdated.next(undefined); this.activeModal.close(); + this.$modal.open(RestartHomebridgeComponent); } catch (err) { this.$toastr.error( this.$translate.instant('config.toast_failed_to_save_config') + ': ' + err.error?.message, @@ -108,6 +111,18 @@ export class BridgePluginsModalComponent implements OnInit { } } + openPluginConfig() { + // Close the existing modal + this.activeModal.close(); + + // Open the plugin config modal + this.$plugins.settings({ + name: this.plugin.name, + settingsSchema: true, + links: {}, + }); + } + async restartChildBridge(username: string) { this.restartInProgress[username] = true; try { @@ -145,4 +160,8 @@ export class BridgePluginsModalComponent implements OnInit { return username; } + openFullConfigEditor() { + this.$router.navigate(['/config']); + this.activeModal.close(); + } } diff --git a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html index 4e097ba85..57b994aae 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html +++ b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html @@ -1,13 +1,27 @@
-
{{ plugin.displayName || plugin.name }}
-
-
+
+ +

+ Please restart Homebridge for the changes to apply. +

+

+ Please restart the plugin's child bridges for the changes to apply. +

+
+ +
@@ -45,32 +59,46 @@
{{ plugin.displayName || plugin.name }}
-
-
- +
+
+
- -
+
- -
- +
+
- - +
+
+ +
+
+
+ + +
+
diff --git a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts index 18ca7c191..5a1337f3d 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts +++ b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts @@ -1,14 +1,21 @@ -import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { + Component, + ElementRef, + Input, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; +import { Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; import { Subject } from 'rxjs'; import { debounceTime, skip } from 'rxjs/operators'; - -import { environment } from '@/environments/environment'; import { ApiService } from '@/app/core/api.service'; -import { WsService } from '@/app/core/ws.service'; import { NotificationService } from '@/app/core/notification.service'; +import { WsService } from '@/app/core/ws.service'; +import { environment } from '@/environments/environment'; @Component({ selector: 'app-custom-plugins', @@ -29,8 +36,10 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { public loading = true; public saveInProgress = false; + public justSavedAndExited = false; public pluginSpinner = false; public uiLoaded = false; + public childBridges: any[] = []; private basePath: string; private iframe: HTMLIFrameElement; @@ -43,9 +52,9 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { public schemaFormUpdatedSubject = new Subject(); // other forms - public formId; - public formSchema; - public formData; + public formId: string; + public formSchema: any; + public formData: any; public formSubmitButtonLabel: string; public formCancelButtonLabel: string; public formValid = true; @@ -57,6 +66,7 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { private $translate: TranslateService, private $toastr: ToastrService, private $api: ApiService, + private $router: Router, private $ws: WsService, private $notification: NotificationService, ) { } @@ -402,7 +412,7 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { /** * Fired when a custom form is cancelled or submitted * - * @param action + * @param formEvent */ formActionEvent(formEvent: 'cancel' | 'submit') { this.iframe.contentWindow.postMessage({ @@ -428,16 +438,17 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { return await this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, this.pluginConfig) .toPromise() .then(data => { - this.$toastr.success( - this.$translate.instant('plugins.settings.toast_restart_required'), - this.$translate.instant('plugins.settings.toast_plugin_config_saved'), - ); + // this.$toastr.success( + // this.$translate.instant('plugins.settings.toast_restart_required'), + // this.$translate.instant('plugins.settings.toast_plugin_config_saved'), + // ); this.saveInProgress = false; - this.$notification.configUpdated.next(undefined); + // this.$notification.configUpdated.next(undefined); if (exit) { - this.activeModal.close(); + this.getChildBridges(); + this.justSavedAndExited = true; } }) .catch(err => { @@ -446,6 +457,47 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { }); } + getChildBridges(): any[] { + try { + this.$api.get('/status/homebridge/child-bridges').subscribe((data: any[]) => { + data.forEach((bridge) => { + if (this.plugin.name === bridge.plugin) { + this.childBridges.push(bridge); + } + }); + }); + return this.childBridges; + } catch (err) { + this.$toastr.error(err.message, this.$translate.instant('toast.title_error')); + return []; + } + } + + public onRestartHomebridgeClick() { + this.$router.navigate(['/restart']); + this.activeModal.close(); + } + + public async onRestartChildBridgeClick() { + try { + for (const bridge of this.childBridges) { + await this.$api.put(`/server/restart/${bridge.username}`, {}).toPromise(); + } + this.$toastr.success( + this.$translate.instant('plugins.manage.child_bridge_restart_success'), + this.$translate.instant('toast.title_success'), + ); + } catch (err) { + this.$notification.configUpdated.next(undefined); // highlight the restart icon in the navbar + this.$toastr.error( + this.$translate.instant('plugins.manage.child_bridge_restart_failed'), + this.$translate.instant('toast.title_error'), + ); + } finally { + this.activeModal.close(); + } + } + deletePluginConfig() { this.updateConfigBlocks([]); this.savePluginConfig(true); diff --git a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.module.ts b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.module.ts index ffae1b0c3..c72f1f17d 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.module.ts +++ b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.module.ts @@ -1,18 +1,16 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { Bootstrap4FrameworkModule } from '@oznu/ngx-bs4-jsonform'; import { NgxMdModule } from 'ngx-md'; - -import { CoreModule } from '@/app/core/core.module'; -import { CustomPluginsService } from './custom-plugins.service'; - import { CustomPluginsComponent } from './custom-plugins.component'; -import { HomebridgeGoogleSmarthomeComponent } from './homebridge-google-smarthome/homebridge-google-smarthome.component'; +import { CustomPluginsService } from './custom-plugins.service'; import { HomebridgeDeconzComponent } from './homebridge-deconz/homebridge-deconz.component'; +import { HomebridgeGoogleSmarthomeComponent } from './homebridge-google-smarthome/homebridge-google-smarthome.component'; import { HomebridgeHueComponent } from './homebridge-hue/homebridge-hue.component'; +import { CoreModule } from '@/app/core/core.module'; @NgModule({ declarations: [ diff --git a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.service.ts b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.service.ts index f549ae223..a00c5f00e 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.service.ts +++ b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.service.ts @@ -1,9 +1,8 @@ import { Injectable } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; - import { ApiService } from '../../api.service'; -import { HomebridgeGoogleSmarthomeComponent } from './homebridge-google-smarthome/homebridge-google-smarthome.component'; import { CustomPluginsComponent } from './custom-plugins.component'; +import { HomebridgeGoogleSmarthomeComponent } from './homebridge-google-smarthome/homebridge-google-smarthome.component'; @Injectable({ providedIn: 'root', diff --git a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-deconz/homebridge-deconz.component.ts b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-deconz/homebridge-deconz.component.ts index 6b052c35d..a7bc4c933 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-deconz/homebridge-deconz.component.ts +++ b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-deconz/homebridge-deconz.component.ts @@ -1,8 +1,7 @@ import { Component } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { ToastrService } from 'ngx-toastr'; import { saveAs } from 'file-saver'; - +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @Component({ diff --git a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html index f89979725..f6aabba84 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html +++ b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html @@ -2,7 +2,7 @@
Homebridge Google Smart Home
diff --git a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.ts b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.ts index a5d0dfa12..8a7b28ff6 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.ts +++ b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.ts @@ -1,12 +1,16 @@ -import { Component, OnInit, OnDestroy, Input } from '@angular/core'; +import { + Component, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; +import { JwtHelperService } from '@auth0/angular-jwt'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { JwtHelperService } from '@auth0/angular-jwt'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; -import { SettingsService } from '@/app/core/settings.service'; import { NotificationService } from '@/app/core/notification.service'; +import { SettingsService } from '@/app/core/settings.service'; @Component({ selector: 'app-homebridge-google-smarthome', diff --git a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-hue/homebridge-hue.component.ts b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-hue/homebridge-hue.component.ts index 800946aba..87be7ccd4 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-hue/homebridge-hue.component.ts +++ b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-hue/homebridge-hue.component.ts @@ -1,8 +1,7 @@ import { Component } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { ToastrService } from 'ngx-toastr'; import { saveAs } from 'file-saver'; - +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @Component({ diff --git a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html index b7ef5ab96..5ea907129 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html +++ b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html @@ -18,18 +18,10 @@

Please restart the plugin's child bridges for the changes to apply.

-
- - -
-

- +
+ +

@@ -48,18 +40,37 @@

-

Release Notes

-

Beta Information

-
{{ release.name }}
- +
{{ 'plugins.manage.label_release_notes' | translate }} ({{ release.name }})
+
{{ 'plugins.manage.label_release_notes_beta' | translate }} ({{ release.name }})
+
+ +
-
- - +
+
+ +
+
+ +
+
+ + + +
diff --git a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts index bff339ae9..4fc1e3a88 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts +++ b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts @@ -1,15 +1,20 @@ -import { Component, OnInit, Input, OnDestroy } from '@angular/core'; +import { + Component, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; import { Router } from '@angular/router'; +import {NgbActiveModal, NgbModal} from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrService } from 'ngx-toastr'; import { Terminal } from 'xterm'; import { FitAddon } from 'xterm-addon-fit'; - import { ApiService } from '@/app/core/api.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; +import { NotificationService } from '@/app/core/notification.service'; import { SettingsService } from '@/app/core/settings.service'; import { WsService } from '@/app/core/ws.service'; -import { NotificationService } from '@/app/core/notification.service'; @Component({ selector: 'app-manage-plugins-modal', @@ -49,6 +54,7 @@ export class ManagePluginsModalComponent implements OnInit, OnDestroy { private $translate: TranslateService, public $settings: SettingsService, private $api: ApiService, + private $modal: NgbModal, private $ws: WsService, private $notification: NotificationService, private $router: Router, @@ -136,9 +142,8 @@ export class ManagePluginsModalComponent implements OnInit, OnDestroy { termRows: this.term.rows, }).subscribe( () => { - this.activeModal.close(); this.$router.navigate(['/plugins']); - this.$toastr.success(`${this.pastTenseVerb} ${this.pluginName}`, this.toastSuccess); + this.$modal.open(RestartHomebridgeComponent); }, (err) => { this.actionFailed = true; diff --git a/ui/src/app/core/manage-plugins/manage-plugins.module.ts b/ui/src/app/core/manage-plugins/manage-plugins.module.ts index 3529e3349..85af58a4e 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins.module.ts +++ b/ui/src/app/core/manage-plugins/manage-plugins.module.ts @@ -1,22 +1,22 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { NgxMdModule } from 'ngx-md'; import { MonacoEditorModule } from 'ngx-monaco-editor'; - -import { CoreModule } from '@/app/core/core.module'; +import { BridgePluginsModalComponent } from './bridge-plugins-modal/bridge-plugins-modal.component'; +import { CustomPluginsModule } from './custom-plugins/custom-plugins.module'; import { InterpolateMdPipe } from './interpolate-md.pipe'; -import { ManagePluginsService } from './manage-plugins.service'; -import { SettingsPluginsModalComponent } from './settings-plugins-modal/settings-plugins-modal.component'; import { ManagePluginsModalComponent } from './manage-plugins-modal/manage-plugins-modal.component'; -import { CustomPluginsModule } from './custom-plugins/custom-plugins.module'; -import { UninstallPluginsModalComponent } from './uninstall-plugins-modal/uninstall-plugins-modal.component'; -import { NodeUpdateRequiredModalComponent } from './node-update-required-modal/node-update-required-modal.component'; +import { ManagePluginsService } from './manage-plugins.service'; import { ManualPluginConfigModalComponent } from './manual-plugin-config-modal/manual-plugin-config-modal.component'; +import { NodeUpdateRequiredModalComponent } from './node-update-required-modal/node-update-required-modal.component'; import { SelectPreviousVersionComponent } from './select-previous-version/select-previous-version.component'; -import { BridgePluginsModalComponent } from './bridge-plugins-modal/bridge-plugins-modal.component'; +import { SettingsPluginsModalComponent } from './settings-plugins-modal/settings-plugins-modal.component'; +import { UninstallPluginsModalComponent } from './uninstall-plugins-modal/uninstall-plugins-modal.component'; +import { CoreModule } from '@/app/core/core.module'; +import { PluginLogModalComponent } from '@/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component'; @NgModule({ declarations: [ @@ -28,6 +28,7 @@ import { BridgePluginsModalComponent } from './bridge-plugins-modal/bridge-plugi ManualPluginConfigModalComponent, SelectPreviousVersionComponent, BridgePluginsModalComponent, + PluginLogModalComponent, ], imports: [ CommonModule, diff --git a/ui/src/app/core/manage-plugins/manage-plugins.service.ts b/ui/src/app/core/manage-plugins/manage-plugins.service.ts index 84b8939e7..df480c0d8 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins.service.ts +++ b/ui/src/app/core/manage-plugins/manage-plugins.service.ts @@ -1,18 +1,17 @@ import { Injectable } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { gte, minVersion } from 'semver'; import { ToastrService } from 'ngx-toastr'; - -import { SettingsService } from '@/app/core/settings.service'; -import { ApiService } from '@/app/core/api.service'; +import { gte, minVersion } from 'semver'; +import { BridgePluginsModalComponent } from './bridge-plugins-modal/bridge-plugins-modal.component'; import { CustomPluginsService } from './custom-plugins/custom-plugins.service'; import { ManagePluginsModalComponent } from './manage-plugins-modal/manage-plugins-modal.component'; -import { UninstallPluginsModalComponent } from './uninstall-plugins-modal/uninstall-plugins-modal.component'; -import { SettingsPluginsModalComponent } from './settings-plugins-modal/settings-plugins-modal.component'; -import { NodeUpdateRequiredModalComponent } from './node-update-required-modal/node-update-required-modal.component'; import { ManualPluginConfigModalComponent } from './manual-plugin-config-modal/manual-plugin-config-modal.component'; +import { NodeUpdateRequiredModalComponent } from './node-update-required-modal/node-update-required-modal.component'; import { SelectPreviousVersionComponent } from './select-previous-version/select-previous-version.component'; -import { BridgePluginsModalComponent } from './bridge-plugins-modal/bridge-plugins-modal.component'; +import { SettingsPluginsModalComponent } from './settings-plugins-modal/settings-plugins-modal.component'; +import { UninstallPluginsModalComponent } from './uninstall-plugins-modal/uninstall-plugins-modal.component'; +import { ApiService } from '@/app/core/api.service'; +import { SettingsService } from '@/app/core/settings.service'; @Injectable({ providedIn: 'root', diff --git a/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.html b/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.html index e510fc531..ea2c81aef 100644 --- a/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.html +++ b/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.html @@ -63,27 +63,23 @@
{{ block.name || pluginAlias }}
-
- +
+
- -
+
- -
- - -
diff --git a/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts b/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts index 1414cc432..8e6581d98 100644 --- a/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts +++ b/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts @@ -1,14 +1,13 @@ import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { ToastrService } from 'ngx-toastr'; import * as JSON5 from 'json5'; - +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; -import { SettingsService } from '@/app/core/settings.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; -import { NotificationService } from '@/app/core/notification.service'; +import { SettingsService } from '@/app/core/settings.service'; @Component({ selector: 'app-manual-plugin-config-modal', @@ -40,8 +39,8 @@ export class ManualPluginConfigModalComponent implements OnInit { constructor( public activeModal: NgbActiveModal, private $api: ApiService, + private $modal: NgbModal, private $settings: SettingsService, - private $notification: NotificationService, private $toastr: ToastrService, private translate: TranslateService, private $router: Router, @@ -216,12 +215,8 @@ export class ManualPluginConfigModalComponent implements OnInit { try { await this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, this.pluginConfig) .toPromise(); - this.$toastr.success( - this.translate.instant('plugins.settings.toast_restart_required'), - this.translate.instant('plugins.settings.toast_plugin_config_saved')); - - this.$notification.configUpdated.next(undefined); this.activeModal.close(); + this.$modal.open(RestartHomebridgeComponent); } catch { this.$toastr.error(this.translate.instant('config.toast_failed_to_save_config'), this.translate.instant('toast.title_error')); this.saveInProgress = false; diff --git a/ui/src/app/core/manage-plugins/node-update-required-modal/node-update-required-modal.component.html b/ui/src/app/core/manage-plugins/node-update-required-modal/node-update-required-modal.component.html index c618ab9f7..c5218a52d 100644 --- a/ui/src/app/core/manage-plugins/node-update-required-modal/node-update-required-modal.component.html +++ b/ui/src/app/core/manage-plugins/node-update-required-modal/node-update-required-modal.component.html @@ -1,8 +1,7 @@
{{'plugins.node_update.title' | translate}}
-
@@ -54,18 +53,23 @@
{{'plugins.node_update.title' | translate}}
-
- - - + +
+
+ +
+
+ +
+
+ +
diff --git a/ui/src/app/core/manage-plugins/node-update-required-modal/node-update-required-modal.component.ts b/ui/src/app/core/manage-plugins/node-update-required-modal/node-update-required-modal.component.ts index 197615962..bc91c0eda 100644 --- a/ui/src/app/core/manage-plugins/node-update-required-modal/node-update-required-modal.component.ts +++ b/ui/src/app/core/manage-plugins/node-update-required-modal/node-update-required-modal.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { minVersion, SemVer } from 'semver'; - +import { SemVer, minVersion } from 'semver'; import { SettingsService } from '@/app/core/settings.service'; @Component({ diff --git a/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html new file mode 100644 index 000000000..0970989bf --- /dev/null +++ b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html @@ -0,0 +1,12 @@ +
+
+
Logs: {{ plugin.displayName || plugin.name }}
+ +
+
+
+
+
diff --git a/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.scss b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts new file mode 100644 index 000000000..5a87e252e --- /dev/null +++ b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts @@ -0,0 +1,62 @@ +import { + Component, + ElementRef, + HostListener, + Input, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; +import { ToastrService } from 'ngx-toastr'; +import { Subject } from 'rxjs'; +import { ApiService } from '@/app/core/api.service'; +import { LogService } from '@/app/core/log.service'; + +@Component({ + selector: 'app-plugin-log-modal', + templateUrl: './plugin-log-modal.component.html', + styleUrls: ['./plugin-log-modal.component.scss'], +}) +export class PluginLogModalComponent implements OnInit, OnDestroy { + @Input() plugin: any; + @ViewChild('pluginlogoutput', { static: true }) termTarget: ElementRef; + private resizeEvent = new Subject(); + + constructor( + public activeModal: NgbActiveModal, + private $api: ApiService, + private $log: LogService, + private $toastr: ToastrService, + private $translate: TranslateService, + ) { } + + ngOnInit(): void { + this.getPluginLog(); + } + + @HostListener('window:resize', ['$event']) + onWindowResize() { + this.resizeEvent.next(undefined); + } + + getPluginLog() { + // Get the plugin name as configured in the config file + console.log(this.plugin); + this.$api.get(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`).subscribe( + (result) => { + const logAlias = this.plugin.name === 'homebridge-config-ui-x' ? 'Homebridge UI' : (result[0]?.name || this.plugin.name); + this.$log.startTerminal(this.termTarget, {}, this.resizeEvent, logAlias); + }, + (err) => { + this.$toastr.error(`${err.error.message || err.message}`, this.$translate.instant('toast.title_error')); + this.activeModal.dismiss(); + }, + ); + } + + ngOnDestroy() { + this.$log.destroyTerminal(); + } +} diff --git a/ui/src/app/core/manage-plugins/select-previous-version/select-previous-version.component.html b/ui/src/app/core/manage-plugins/select-previous-version/select-previous-version.component.html index 96d962ac1..2c0c041e5 100644 --- a/ui/src/app/core/manage-plugins/select-previous-version/select-previous-version.component.html +++ b/ui/src/app/core/manage-plugins/select-previous-version/select-previous-version.component.html @@ -1,8 +1,7 @@
{{'plugins.manage.label_install' | translate}}: {{ plugin.displayName || plugin.name }}
-
@@ -13,8 +12,8 @@
{{'plugins.manage.label_install' | translate}}: {{ plugi
- -

+ +

{{ 'plugins.manage.message_select_version_to_install' | translate }}:

-
-
- - +
+
+ +
+
+
+ +
diff --git a/ui/src/app/core/manage-plugins/select-previous-version/select-previous-version.component.ts b/ui/src/app/core/manage-plugins/select-previous-version/select-previous-version.component.ts index 4d2655f04..8380491bf 100644 --- a/ui/src/app/core/manage-plugins/select-previous-version/select-previous-version.component.ts +++ b/ui/src/app/core/manage-plugins/select-previous-version/select-previous-version.component.ts @@ -1,9 +1,8 @@ import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; -import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-select-previous-version', diff --git a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html index f67927925..4ecea89df 100644 --- a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html +++ b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html @@ -4,12 +4,11 @@
{{'plugins.settings.title_settings' | translate}}: {{ plugin.displayName || plugin.name }}
-
-
+
@@ -55,13 +54,23 @@
{{ block.name }}
*ngIf="schema.footerDisplay">
-
-
- +
+ +

+ Please restart Homebridge for the changes to apply. +

+

+ Please restart the plugin's child bridges for the changes to apply. +

+
+
+
+
- -
+
{{ block.name }}
- -
+
+
+
+ +
+
+
+ + +
+
diff --git a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.ts b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.ts index 4e9fe81d1..b9decf77a 100644 --- a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.ts +++ b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.ts @@ -1,12 +1,12 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; +import { Component, Input, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; import { v4 as uuid } from 'uuid'; - import { ApiService } from '@/app/core/api.service'; -import { SettingsService } from '@/app/core/settings.service'; import { NotificationService } from '@/app/core/notification.service'; +import { SettingsService } from '@/app/core/settings.service'; export interface PluginConfigBlock { config: Record; @@ -30,12 +30,16 @@ export class SettingsPluginsModalComponent implements OnInit { public form: any = {}; public show = ''; public saveInProgress: boolean; + public justSavedAndExited = false; + + public childBridges: any[] = []; constructor( public activeModal: NgbActiveModal, private $api: ApiService, private $settings: SettingsService, private $notification: NotificationService, + private $router: Router, private $toastr: ToastrService, private translate: TranslateService, ) { } @@ -85,17 +89,20 @@ export class SettingsPluginsModalComponent implements OnInit { try { await this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, configBlocks) .toPromise(); - this.$toastr.success( - this.translate.instant('plugins.settings.toast_restart_required'), - this.translate.instant('plugins.settings.toast_plugin_config_saved')); - - this.activeModal.close(configBlocks.length ? this.schema : null); - this.$notification.configUpdated.next(undefined); + // this.$toastr.success( + // this.translate.instant('plugins.settings.toast_restart_required'), + // this.translate.instant('plugins.settings.toast_plugin_config_saved')); + // + // this.activeModal.close(configBlocks.length ? this.schema : null); + // this.$notification.configUpdated.next(undefined); // reload app settings if the config was changed for Homebridge UI if (this.plugin.name === 'homebridge-config-ui-x') { this.$settings.getAppSettings().catch(); } + + this.getChildBridges(); + this.justSavedAndExited = true; } catch (err) { this.$toastr.error( this.translate.instant('config.toast_failed_to_save_config') + ': ' + err.error?.message, @@ -132,6 +139,47 @@ export class SettingsPluginsModalComponent implements OnInit { this.pluginConfig.splice(pluginConfigIndex, 1); } + getChildBridges(): any[] { + try { + this.$api.get('/status/homebridge/child-bridges').subscribe((data: any[]) => { + data.forEach((bridge) => { + if (this.plugin.name === bridge.plugin) { + this.childBridges.push(bridge); + } + }); + }); + return this.childBridges; + } catch (err) { + this.$toastr.error(err.message, this.translate.instant('toast.title_error')); + return []; + } + } + + public onRestartHomebridgeClick() { + this.$router.navigate(['/restart']); + this.activeModal.close(); + } + + public async onRestartChildBridgeClick() { + try { + for (const bridge of this.childBridges) { + await this.$api.put(`/server/restart/${bridge.username}`, {}).toPromise(); + } + this.$toastr.success( + this.translate.instant('plugins.manage.child_bridge_restart_success'), + this.translate.instant('toast.title_success'), + ); + } catch (err) { + this.$notification.configUpdated.next(undefined); // highlight the restart icon in the navbar + this.$toastr.error( + this.translate.instant('plugins.manage.child_bridge_restart_failed'), + this.translate.instant('toast.title_error'), + ); + } finally { + this.activeModal.close(); + } + } + /** * Homebridge Hue - ensure users object is preserved */ diff --git a/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.html b/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.html index c0ae2d6ac..ed6dbd53e 100644 --- a/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.html +++ b/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.html @@ -1,20 +1,17 @@
{{'plugins.manage.label_uninstall' | translate}}: {{ plugin.displayName || plugin.name }}
-
-
-
- -

+

@@ -28,15 +25,18 @@

{{'plugins.manage.label_uninstall' | translate}}: {{ plu {{ 'plugins.manage.message_uninstall_remove_config_required' | translate }}
-
-
- - +
+
+ +
+
+
+ +
diff --git a/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.ts b/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.ts index 2b6dde754..4fc6d7305 100644 --- a/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.ts +++ b/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.ts @@ -1,8 +1,7 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; import { ManagePluginsModalComponent } from '@/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component'; diff --git a/ui/src/app/core/mobile-detect.service.ts b/ui/src/app/core/mobile-detect.service.ts index ba6871db6..49f281098 100644 --- a/ui/src/app/core/mobile-detect.service.ts +++ b/ui/src/app/core/mobile-detect.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; - import * as MobileDetect from 'mobile-detect'; const preventDefault = (e) => { @@ -10,7 +9,7 @@ const preventDefault = (e) => { providedIn: 'root', }) export class MobileDetectService { - public detect; + public detect: MobileDetect; public isTouchMoveLocked = false; constructor() { diff --git a/ui/src/app/core/pipes/convert-temp.pipe.ts b/ui/src/app/core/pipes/convert-temp.pipe.ts index e85b73f8b..e0f00a9c1 100644 --- a/ui/src/app/core/pipes/convert-temp.pipe.ts +++ b/ui/src/app/core/pipes/convert-temp.pipe.ts @@ -1,5 +1,4 @@ import { Pipe, PipeTransform } from '@angular/core'; - import { SettingsService } from '@/app/core/settings.service'; @Pipe({ name: 'convertTemp' }) diff --git a/ui/src/app/core/settings.service.ts b/ui/src/app/core/settings.service.ts index b2d847745..43ff55608 100644 --- a/ui/src/app/core/settings.service.ts +++ b/ui/src/app/core/settings.service.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; import { Title } from '@angular/platform-browser'; -import { ToastrService } from 'ngx-toastr'; import { TranslateService } from '@ngx-translate/core'; +import * as dayjs from 'dayjs'; +import { ToastrService } from 'ngx-toastr'; import { Subject } from 'rxjs'; import { first } from 'rxjs/operators'; -import * as dayjs from 'dayjs'; - import { ApiService } from '@/app/core/api.service'; interface EnvInterface { @@ -34,13 +33,6 @@ interface EnvInterface { recommendChildBridges: boolean; } -interface AppSettingsInterface { - env: EnvInterface; - formAuth: boolean; - theme: string; - serverTimestamp: string; -} - @Injectable({ providedIn: 'root', }) @@ -68,19 +60,17 @@ export class SettingsService { this.getAppSettings(); } - getAppSettings() { - return this.$api.get('/auth/settings').toPromise() - .then((data: AppSettingsInterface) => { - this.formAuth = data.formAuth; - this.env = data.env; - this.setTheme(data.theme || 'auto'); - this.setTitle(this.env.homebridgeInstanceName); - this.checkServerTime(data.serverTimestamp); - this.setUiVersion(data.env.packageVersion); - this.setLang(this.env.lang); - this.settingsLoaded = true; - this.settingsLoadedSubject.next(undefined); - }); + async getAppSettings() { + const data = await this.$api.get('/auth/settings').toPromise(); + this.formAuth = data.formAuth; + this.env = data.env; + this.setTheme(data.theme || 'auto'); + this.setTitle(this.env.homebridgeInstanceName); + this.checkServerTime(data.serverTimestamp); + this.setUiVersion(data.env.packageVersion); + this.setLang(this.env.lang); + this.settingsLoaded = true; + this.settingsLoadedSubject.next(undefined); } setTheme(theme: string) { @@ -113,7 +103,7 @@ export class SettingsService { this.$title.setTitle(title || 'Homebridge'); } - setUiVersion(version) { + setUiVersion(version: string) { if (!this.uiVersion) { this.uiVersion = version; } diff --git a/ui/src/app/core/terminal.service.ts b/ui/src/app/core/terminal.service.ts index 763a1728f..808a8c5d9 100644 --- a/ui/src/app/core/terminal.service.ts +++ b/ui/src/app/core/terminal.service.ts @@ -1,11 +1,10 @@ -import { Injectable, ElementRef } from '@angular/core'; -import { Terminal, ITerminalOptions } from 'xterm'; +import { ElementRef, Injectable } from '@angular/core'; +import { Subject } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; +import { ITerminalOptions, Terminal } from 'xterm'; import { FitAddon } from 'xterm-addon-fit'; import { WebLinksAddon } from 'xterm-addon-web-links'; -import { Subject, Subscription } from 'rxjs'; -import { debounceTime } from 'rxjs/operators'; - -import { WsService, IoNamespace } from '@/app/core/ws.service'; +import { IoNamespace, WsService } from '@/app/core/ws.service'; @Injectable({ providedIn: 'root', @@ -80,7 +79,7 @@ export class TerminalService { }); // subscribe to incoming data events from server to client - this.io.socket.on('stdout', data => { + this.io.socket.on('stdout', (data: string) => { this.term.write(data); }); diff --git a/ui/src/app/core/ws.service.ts b/ui/src/app/core/ws.service.ts index cafa8d93d..f637f7084 100644 --- a/ui/src/app/core/ws.service.ts +++ b/ui/src/app/core/ws.service.ts @@ -2,9 +2,8 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { Subject } from 'rxjs'; import { connect } from 'socket.io-client'; - -import { environment } from '@/environments/environment'; import { AuthService } from '@/app/core/auth/auth.service'; +import { environment } from '@/environments/environment'; export interface IoNamespace { connected?: Subject; @@ -34,7 +33,7 @@ export class WsService { const io: IoNamespace = this.namespaceConnectionCache[namespace]; io.connected = new Subject(); - // broadcast to sbuscribers that the connection is ready + // broadcast to subscribers that the connection is ready setTimeout(() => { if (io.socket.connected) { io.connected.next(undefined); @@ -59,7 +58,7 @@ export class WsService { const io = this.establishConnectionToNamespace(namespace); io.connected = new Subject(); - // wait for the connection and broadcase when ready + // wait for the connection and broadcast when ready io.socket.on('connect', () => { io.connected.next(undefined); }); @@ -93,8 +92,8 @@ export class WsService { }, }); - const request = (resource, payload): Observable => new Observable((observer) => { - socket.emit(resource, payload, (resp) => { + const request = (resource: string, payload: any): Observable => new Observable((observer) => { + socket.emit(resource, payload, (resp: any) => { if (typeof resp === 'object' && resp.error) { observer.error(resp); } else { diff --git a/ui/src/app/modules/accessories/accessories-routing.module.ts b/ui/src/app/modules/accessories/accessories-routing.module.ts index 516077f1d..303e27644 100644 --- a/ui/src/app/modules/accessories/accessories-routing.module.ts +++ b/ui/src/app/modules/accessories/accessories-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AccessoriesComponent } from './accessories.component'; const routes: Routes = [ diff --git a/ui/src/app/modules/accessories/accessories.component.html b/ui/src/app/modules/accessories/accessories.component.html index 43f679e51..d9ebcb7d8 100644 --- a/ui/src/app/modules/accessories/accessories.component.html +++ b/ui/src/app/modules/accessories/accessories.component.html @@ -35,7 +35,7 @@
-
diff --git a/ui/src/app/modules/accessories/accessories.component.scss b/ui/src/app/modules/accessories/accessories.component.scss index 864fb047c..5ea4dd349 100644 --- a/ui/src/app/modules/accessories/accessories.component.scss +++ b/ui/src/app/modules/accessories/accessories.component.scss @@ -1,5 +1,3 @@ - - .room-title { margin-left: 10px; @media (max-width: 575px) { @@ -24,3 +22,6 @@ } } +a:hover { + text-decoration: none !important; +} diff --git a/ui/src/app/modules/accessories/accessories.component.ts b/ui/src/app/modules/accessories/accessories.component.ts index 3d5d83dab..439c33103 100644 --- a/ui/src/app/modules/accessories/accessories.component.ts +++ b/ui/src/app/modules/accessories/accessories.component.ts @@ -1,14 +1,13 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ToastrService } from 'ngx-toastr'; -import { TranslateService } from '@ngx-translate/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; import { DragulaService } from 'ng2-dragula'; +import { ToastrService } from 'ngx-toastr'; import { Subscription } from 'rxjs'; - -import { SettingsService } from '@/app/core/settings.service'; +import { AddRoomModalComponent } from './add-room-modal/add-room-modal.component'; import { AccessoriesService } from '@/app/core/accessories/accessories.service'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; -import { AddRoomModalComponent } from './add-room-modal/add-room-modal.component'; +import { SettingsService } from '@/app/core/settings.service'; @Component({ selector: 'app-accessories', diff --git a/ui/src/app/modules/accessories/accessories.module.ts b/ui/src/app/modules/accessories/accessories.module.ts index 89395f5c3..d1ff9605f 100644 --- a/ui/src/app/modules/accessories/accessories.module.ts +++ b/ui/src/app/modules/accessories/accessories.module.ts @@ -1,18 +1,15 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; - -import { TranslateModule } from '@ngx-translate/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; import { DragulaModule } from 'ng2-dragula'; - -import { CoreModule } from '@/app/core/core.module'; -import { AccessoriesCoreModule } from '@/app/core/accessories/accessories.module'; import { AccessoriesRoutingModule } from './accessories-routing.module'; -import { DragHerePlaceholderComponent } from './drag-here-placeholder/drag-here-placeholder.component'; -import { AddRoomModalComponent } from './add-room-modal/add-room-modal.component'; - import { AccessoriesComponent } from './accessories.component'; +import { AddRoomModalComponent } from './add-room-modal/add-room-modal.component'; +import { DragHerePlaceholderComponent } from './drag-here-placeholder/drag-here-placeholder.component'; +import { AccessoriesCoreModule } from '@/app/core/accessories/accessories.module'; +import { CoreModule } from '@/app/core/core.module'; @NgModule({ declarations: [ diff --git a/ui/src/app/modules/accessories/add-room-modal/add-room-modal.component.html b/ui/src/app/modules/accessories/add-room-modal/add-room-modal.component.html index b2429715a..3bb85f515 100644 --- a/ui/src/app/modules/accessories/add-room-modal/add-room-modal.component.html +++ b/ui/src/app/modules/accessories/add-room-modal/add-room-modal.component.html @@ -1,12 +1,11 @@
-
-
Create New Room
- -
+
+
Create New Room
+ +
@@ -17,9 +16,18 @@
Create
-
- +
+
+ +
+
+
+ +
diff --git a/ui/src/app/modules/accessories/add-room-modal/add-room-modal.component.ts b/ui/src/app/modules/accessories/add-room-modal/add-room-modal.component.ts index 76146a102..a9bb21ba7 100644 --- a/ui/src/app/modules/accessories/add-room-modal/add-room-modal.component.ts +++ b/ui/src/app/modules/accessories/add-room-modal/add-room-modal.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ diff --git a/ui/src/app/modules/config-editor/config-editor-routing.module.ts b/ui/src/app/modules/config-editor/config-editor-routing.module.ts index 6a8bc4e1f..11129b987 100644 --- a/ui/src/app/modules/config-editor/config-editor-routing.module.ts +++ b/ui/src/app/modules/config-editor/config-editor-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { ConfigEditorComponent } from './config-editor.component'; import { ConfigEditorResolver } from './config-editor.resolver'; diff --git a/ui/src/app/modules/config-editor/config-editor.component.ts b/ui/src/app/modules/config-editor/config-editor.component.ts index 8a5f061f5..990dbf9c1 100644 --- a/ui/src/app/modules/config-editor/config-editor.component.ts +++ b/ui/src/app/modules/config-editor/config-editor.component.ts @@ -1,17 +1,16 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { ToastrService } from 'ngx-toastr'; -import { NgxEditorModel } from 'ngx-monaco-editor'; +import { TranslateService } from '@ngx-translate/core'; import * as JSON5 from 'json5'; - +import { NgxEditorModel } from 'ngx-monaco-editor'; +import { ToastrService } from 'ngx-toastr'; +import { ConfigRestoreBackupComponent } from './config-restore-backup/config.restore-backup.component'; import { ApiService } from '@/app/core/api.service'; -import { SettingsService } from '@/app/core/settings.service'; -import { NotificationService } from '@/app/core/notification.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; import { MonacoEditorService } from '@/app/core/monaco-editor.service'; -import { ConfigRestoreBackupComponent } from './config-restore-backup/config.restore-backup.component'; +import { SettingsService } from '@/app/core/settings.service'; @Component({ selector: 'app-config', @@ -22,16 +21,15 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { public originalConfig: string; public saveInProgress: boolean; public isMobile: any = false; - public backupUrl: string; - public monacoEditor; + public monacoEditor: any; public editorOptions = { language: 'json', theme: this.$settings.theme.startsWith('dark-mode') ? 'vs-dark' : 'vs-light', automaticLayout: true, }; - private editorDecoractions = []; + private editorDecorations = []; public monacoEditorModel: NgxEditorModel; private lastHeight: number; @@ -41,8 +39,8 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { private $settings: SettingsService, private $api: ApiService, private $md: MobileDetectService, + private $modal: NgbModal, private $monacoEditor: MonacoEditorService, - private $notification: NotificationService, public $toastr: ToastrService, private $route: ActivatedRoute, private translate: TranslateService, @@ -73,7 +71,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { uri: window['monaco'] ? window['monaco'].Uri.parse('a://homebridge/config.json') : undefined, }; - // if monaco is not loaded yet, wait for it, otherwise setup the editor now + // if monaco is not loaded yet, wait for it, otherwise set up the editor now if (!window['monaco']) { this.$monacoEditor.readyEvent.subscribe({ next: () => { @@ -88,7 +86,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { /** * Called when the monaco editor is ready */ - onEditorInit(editor) { + onEditorInit(editor: any) { this.monacoEditor = editor; this.monacoEditor.getModel().setValue(this.homebridgeConfig); window['editor'] = editor; @@ -110,7 +108,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { // hide decorations if (this.monacoEditor) { - this.editorDecoractions = this.monacoEditor.deltaDecorations(this.editorDecoractions, []); + this.editorDecorations = this.monacoEditor.deltaDecorations(this.editorDecorations, []); } this.saveInProgress = true; @@ -152,7 +150,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { this.translate.instant('config.toast_config_bridge_missing'), this.translate.instant('config.toast_title_config_error'), ); - } else if (!/^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$/.test(config.bridge.username)) { + } else if (!/^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$/.test(config.bridge.username)) { this.$toastr.error( this.translate.instant('config.toast_config_username_format_error'), this.translate.instant('config.toast_title_config_error'), @@ -205,17 +203,15 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { } } - saveConfig(config) { - return this.$api.post('/config-editor', config) - .toPromise() - .then(data => { - this.$notification.configUpdated.next(undefined); - this.$toastr.success(this.translate.instant('config.toast_config_saved'), this.translate.instant('toast.title_success')); - this.homebridgeConfig = JSON.stringify(data, null, 4); - }) - .catch(err => { - this.$toastr.error(this.translate.instant('config.toast_failed_to_save_config'), this.translate.instant('toast.title_error')); - }); + async saveConfig(config: any) { + try { + const data = await this.$api.post('/config-editor', config) + .toPromise(); + this.homebridgeConfig = JSON.stringify(data, null, 4); + this.$modal.open(RestartHomebridgeComponent); + } catch { + this.$toastr.error(this.translate.instant('config.toast_failed_to_save_config'), this.translate.instant('toast.title_error')); + } } onRestore() { @@ -240,7 +236,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { // update the editor if (this.monacoEditor && window['editor'].modifiedEditor) { // remove all decorations - this.editorDecoractions = this.monacoEditor.deltaDecorations(this.editorDecoractions, []); + this.editorDecorations = this.monacoEditor.deltaDecorations(this.editorDecorations, []); // remove existing config this.monacoEditor.executeEdits('beautifier', [ @@ -312,7 +308,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { return true; } - validatePlugins(plugins: any[], key) { + validatePlugins(plugins: any[], key: string) { for (const item of plugins) { if (typeof item !== 'string') { this.$toastr.error(`Each item in the ${key} array must be a string.`); @@ -325,7 +321,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { /** * Highlight the problematic rows in the editor */ - highlightOffendingArrayItem(block) { + highlightOffendingArrayItem(block: string) { if (!this.monacoEditor) { return; } @@ -345,7 +341,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { matchRange.endColumn, ); - this.editorDecoractions = this.monacoEditor.deltaDecorations(this.editorDecoractions, [ + this.editorDecorations = this.monacoEditor.deltaDecorations(this.editorDecorations, [ { range, options: { isWholeLine: true, linesDecorationsClassName: 'hb-monaco-editor-line-error' } }, ]); } @@ -353,7 +349,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { } /** - * Setup a json schema object used to check the config against + * Set up a json schema object used to check the config against */ setMonacoEditorModel() { if (window['monaco'].languages.json.jsonDefaults.diagnosticsOptions.schemas.some(x => x.uri === 'http://homebridge/config.json')) { @@ -484,7 +480,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { platforms: { type: 'array', description: 'Plugins that expose a "Platform" should have there config entered in this array.' + - '\nSeperate each plugin config block using a comma.', + '\nSeparate each plugin config block using a comma.', items: { type: 'object', required: ['platform'], @@ -526,7 +522,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { accessories: { type: 'array', description: 'Plugins that expose a "Accessory" should have there config entered in this array.' + - '\nSeperate each plugin config block using a comma.', + '\nSeparate each plugin config block using a comma.', items: { type: 'object', required: ['accessory', 'name'], diff --git a/ui/src/app/modules/config-editor/config-editor.module.ts b/ui/src/app/modules/config-editor/config-editor.module.ts index c2bf0dfe6..6497841f3 100644 --- a/ui/src/app/modules/config-editor/config-editor.module.ts +++ b/ui/src/app/modules/config-editor/config-editor.module.ts @@ -1,14 +1,13 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { MonacoEditorModule } from 'ngx-monaco-editor'; - import { ConfigEditorRoutingModule } from './config-editor-routing.module'; -import { ConfigRestoreBackupComponent } from './config-restore-backup/config.restore-backup.component'; import { ConfigEditorComponent } from './config-editor.component'; import { ConfigEditorResolver } from './config-editor.resolver'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { ConfigRestoreBackupComponent } from './config-restore-backup/config.restore-backup.component'; @NgModule({ declarations: [ diff --git a/ui/src/app/modules/config-editor/config-editor.resolver.ts b/ui/src/app/modules/config-editor/config-editor.resolver.ts index 17b125d33..c4591e4af 100644 --- a/ui/src/app/modules/config-editor/config-editor.resolver.ts +++ b/ui/src/app/modules/config-editor/config-editor.resolver.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; -import { Resolve, RouterStateSnapshot, ActivatedRouteSnapshot, Router } from '@angular/router'; +import { Resolve, Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; @Injectable() @@ -12,15 +11,13 @@ export class ConfigEditorResolver implements Resolve { private $router: Router, ) { } - resolve( - route: ActivatedRouteSnapshot, - state: RouterStateSnapshot, - ) { - return this.$api.get('/config-editor').toPromise() - .then((json) => JSON.stringify(json, null, 4)) - .catch((err) => { - this.$toastr.error(err.message, 'Failed to Load Config'); - this.$router.navigate(['/']); - }); + async resolve() { + try { + const json = await this.$api.get('/config-editor').toPromise(); + return JSON.stringify(json, null, 4); + } catch (err) { + this.$toastr.error(err.message, 'Failed to Load Config'); + this.$router.navigate(['/']); + } } } diff --git a/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.html b/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.html index 0323ccc0e..92877329f 100644 --- a/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.html +++ b/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.html @@ -3,8 +3,7 @@
Restore Homebridge Config Backup
-
@@ -27,10 +26,17 @@
No Backups
-
- - +
+
+ +
+
+
+ +
diff --git a/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.ts b/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.ts index 407ab19ef..4b396b8c0 100644 --- a/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.ts +++ b/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.ts @@ -1,8 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; @Component({ @@ -37,13 +36,13 @@ export class ConfigRestoreBackupComponent implements OnInit { ); } - restore(backupId) { + restore(backupId: any) { return this.activeModal.close(backupId); } deleteAllBackups() { return this.$api.delete('/config-editor/backups').subscribe( - (data) => { + () => { this.activeModal.dismiss(); this.$toastr.success(this.translate.instant('config.restore.toast_backups_deleted'), this.translate.instant('toast.title_success')); }, diff --git a/ui/src/app/modules/login/login.component.ts b/ui/src/app/modules/login/login.component.ts index 70c869033..e35164551 100644 --- a/ui/src/app/modules/login/login.component.ts +++ b/ui/src/app/modules/login/login.component.ts @@ -1,11 +1,10 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { Validators, FormGroup, FormControl } from '@angular/forms'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { debounceTime } from 'rxjs/operators'; - -import { environment } from '@/environments/environment'; -import { SettingsService } from '@/app/core/settings.service'; import { AuthService } from '@/app/core/auth/auth.service'; +import { SettingsService } from '@/app/core/settings.service'; +import { environment } from '@/environments/environment'; @Component({ selector: 'app-login', @@ -13,9 +12,9 @@ import { AuthService } from '@/app/core/auth/auth.service'; styleUrls: ['./login.component.scss'], }) export class LoginComponent implements OnInit { - @ViewChild('password') private passwordInput; - @ViewChild('username') private usernameInput; - @ViewChild('otp') private otpInput; + @ViewChild('password') private passwordInput: any; + @ViewChild('username') private usernameInput: any; + @ViewChild('otp') private otpInput: any; public form: FormGroup<{ username: FormControl; @@ -92,7 +91,7 @@ export class LoginComponent implements OnInit { } await this.$auth.login(this.form.getRawValue()) - .then((user) => { + .then(() => { this.$router.navigateByUrl(this.targetRoute); window.sessionStorage.removeItem('target_route'); }) diff --git a/ui/src/app/modules/login/login.guard.ts b/ui/src/app/modules/login/login.guard.ts index 2bfd48161..2b6e874a4 100644 --- a/ui/src/app/modules/login/login.guard.ts +++ b/ui/src/app/modules/login/login.guard.ts @@ -1,6 +1,10 @@ import { Injectable } from '@angular/core'; -import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router'; - +import { + ActivatedRouteSnapshot, + CanActivate, + Router, + RouterStateSnapshot, +} from '@angular/router'; import { AuthService } from '@/app/core/auth/auth.service'; import { SettingsService } from '@/app/core/settings.service'; @@ -23,7 +27,7 @@ export class LoginGuard implements CanActivate { } if (this.$settings.env.setupWizardComplete === false) { - // redirect to setup wizard page + // redirect to set up wizard page this.$router.navigate(['/setup']); return false; } diff --git a/ui/src/app/modules/login/login.module.ts b/ui/src/app/modules/login/login.module.ts index 38f58aece..9458b52f9 100644 --- a/ui/src/app/modules/login/login.module.ts +++ b/ui/src/app/modules/login/login.module.ts @@ -1,8 +1,7 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; - import { LoginComponent } from './login.component'; import { LoginGuard } from './login.guard'; diff --git a/ui/src/app/modules/logs/logs-routing.module.ts b/ui/src/app/modules/logs/logs-routing.module.ts index f4b5320b9..dfa38a5a5 100644 --- a/ui/src/app/modules/logs/logs-routing.module.ts +++ b/ui/src/app/modules/logs/logs-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { LogsComponent } from './logs.component'; const routes: Routes = [ diff --git a/ui/src/app/modules/logs/logs.component.ts b/ui/src/app/modules/logs/logs.component.ts index b8341b35c..42d9df0fd 100644 --- a/ui/src/app/modules/logs/logs.component.ts +++ b/ui/src/app/modules/logs/logs.component.ts @@ -1,15 +1,21 @@ -import { Component, OnInit, HostListener, OnDestroy, ViewChild, ElementRef } from '@angular/core'; -import { HttpResponse, HttpErrorResponse } from '@angular/common/http'; -import { TranslateService } from '@ngx-translate/core'; +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { + Component, + ElementRef, + HostListener, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { Subject } from 'rxjs'; +import { TranslateService } from '@ngx-translate/core'; import { saveAs } from 'file-saver'; import { ToastrService } from 'ngx-toastr'; - -import { SettingsService } from '@/app/core/settings.service'; +import { Subject } from 'rxjs'; import { ApiService } from '@/app/core/api.service'; -import { LogService } from '@/app/core/log.service'; import { ConfirmComponent } from '@/app/core/components/confirm/confirm.component'; +import { LogService } from '@/app/core/log.service'; +import { SettingsService } from '@/app/core/settings.service'; @Component({ selector: 'app-logs', @@ -38,7 +44,7 @@ export class LogsComponent implements OnInit, OnDestroy { } @HostListener('window:resize', ['$event']) - onWindowResize(event) { + onWindowResize() { this.resizeEvent.next(undefined); } @@ -63,7 +69,7 @@ export class LogsComponent implements OnInit, OnDestroy { saveAs(res.body, 'homebridge.log.txt'); }, async (err: HttpErrorResponse) => { - let message; + let message: string; try { message = JSON.parse(await err.error.text()).message; } catch (e) { @@ -86,7 +92,7 @@ export class LogsComponent implements OnInit, OnDestroy { ref.result.then(() => { this.$api.put('/platform-tools/hb-service/log/truncate', {}) .subscribe( - (res) => { + () => { this.$toastr.success( this.$translate.instant('logs.message_log_file_truncated'), this.$translate.instant('toast.title_success'), @@ -103,12 +109,3 @@ export class LogsComponent implements OnInit, OnDestroy { } } - -export const LogsStates = { - name: 'logs', - url: '/logs', - component: LogsComponent, - data: { - requiresAuth: true, - }, -}; diff --git a/ui/src/app/modules/logs/logs.module.ts b/ui/src/app/modules/logs/logs.module.ts index 117d93731..f69ed5395 100644 --- a/ui/src/app/modules/logs/logs.module.ts +++ b/ui/src/app/modules/logs/logs.module.ts @@ -1,7 +1,6 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; - import { LogsRoutingModule } from './logs-routing.module'; import { LogsComponent } from './logs.component'; diff --git a/ui/src/app/modules/platform-tools/docker/container-restart/container-restart.component.ts b/ui/src/app/modules/platform-tools/docker/container-restart/container-restart.component.ts index 090a6a4cc..5da2a80fc 100644 --- a/ui/src/app/modules/platform-tools/docker/container-restart/container-restart.component.ts +++ b/ui/src/app/modules/platform-tools/docker/container-restart/container-restart.component.ts @@ -1,11 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; -import { WsService } from '@/app/core/ws.service'; import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-container-restart', diff --git a/ui/src/app/modules/platform-tools/docker/docker-routing.module.ts b/ui/src/app/modules/platform-tools/docker/docker-routing.module.ts index ec44b7a82..5a159a01b 100644 --- a/ui/src/app/modules/platform-tools/docker/docker-routing.module.ts +++ b/ui/src/app/modules/platform-tools/docker/docker-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { StartupScriptComponent } from './startup-script/startup-script.component'; +import { RouterModule, Routes } from '@angular/router'; import { ContainerRestartComponent } from './container-restart/container-restart.component'; +import { StartupScriptComponent } from './startup-script/startup-script.component'; import { StartupScriptResolver } from './startup-script/startup-script.resolver'; const routes: Routes = [ diff --git a/ui/src/app/modules/platform-tools/docker/docker.module.ts b/ui/src/app/modules/platform-tools/docker/docker.module.ts index 83a56ec0e..7d55493e5 100644 --- a/ui/src/app/modules/platform-tools/docker/docker.module.ts +++ b/ui/src/app/modules/platform-tools/docker/docker.module.ts @@ -1,15 +1,14 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { MonacoEditorModule } from 'ngx-monaco-editor'; - -import { CoreModule } from '@/app/core/core.module'; +import { ContainerRestartComponent } from './container-restart/container-restart.component'; import { DockerRoutingModule } from './docker-routing.module'; import { StartupScriptComponent } from './startup-script/startup-script.component'; -import { ContainerRestartComponent } from './container-restart/container-restart.component'; import { StartupScriptResolver } from './startup-script/startup-script.resolver'; +import { CoreModule } from '@/app/core/core.module'; @NgModule({ declarations: [ diff --git a/ui/src/app/modules/platform-tools/docker/startup-script/startup-script.component.ts b/ui/src/app/modules/platform-tools/docker/startup-script/startup-script.component.ts index dc33827e2..09667d443 100644 --- a/ui/src/app/modules/platform-tools/docker/startup-script/startup-script.component.ts +++ b/ui/src/app/modules/platform-tools/docker/startup-script/startup-script.component.ts @@ -1,13 +1,12 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { ToastrService } from 'ngx-toastr'; import { NgxEditorModel } from 'ngx-monaco-editor'; - -import { SettingsService } from '@/app/core/settings.service'; +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; import { MonacoEditorService } from '@/app/core/monaco-editor.service'; +import { SettingsService } from '@/app/core/settings.service'; @Component({ selector: 'app-startup-script', diff --git a/ui/src/app/modules/platform-tools/docker/startup-script/startup-script.resolver.ts b/ui/src/app/modules/platform-tools/docker/startup-script/startup-script.resolver.ts index 96b2b7077..af1f055f4 100644 --- a/ui/src/app/modules/platform-tools/docker/startup-script/startup-script.resolver.ts +++ b/ui/src/app/modules/platform-tools/docker/startup-script/startup-script.resolver.ts @@ -1,7 +1,11 @@ import { Injectable } from '@angular/core'; -import { Resolve, RouterStateSnapshot, ActivatedRouteSnapshot, Router } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot, +} from '@angular/router'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; @Injectable() diff --git a/ui/src/app/modules/platform-tools/linux/linux-routing.module.ts b/ui/src/app/modules/platform-tools/linux/linux-routing.module.ts index ba77a1c2b..b7936f1f9 100644 --- a/ui/src/app/modules/platform-tools/linux/linux-routing.module.ts +++ b/ui/src/app/modules/platform-tools/linux/linux-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { LinuxComponent } from './linux.component'; import { RestartLinuxComponent } from './restart-linux/restart-linux.component'; import { ShutdownLinuxComponent } from './shutdown-linux/shutdown-linux.component'; diff --git a/ui/src/app/modules/platform-tools/linux/linux.module.ts b/ui/src/app/modules/platform-tools/linux/linux.module.ts index 4827c7687..7474afee2 100644 --- a/ui/src/app/modules/platform-tools/linux/linux.module.ts +++ b/ui/src/app/modules/platform-tools/linux/linux.module.ts @@ -1,7 +1,6 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; - import { CoreModule } from '../../../../app/core/core.module'; import { LinuxRoutingModule } from './linux-routing.module'; import { LinuxComponent } from './linux.component'; diff --git a/ui/src/app/modules/platform-tools/linux/restart-linux/restart-linux.component.ts b/ui/src/app/modules/platform-tools/linux/restart-linux/restart-linux.component.ts index 7bdadfa9a..2e2f265c9 100644 --- a/ui/src/app/modules/platform-tools/linux/restart-linux/restart-linux.component.ts +++ b/ui/src/app/modules/platform-tools/linux/restart-linux/restart-linux.component.ts @@ -1,11 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; -import { WsService } from '@/app/core/ws.service'; import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-restart-linux', diff --git a/ui/src/app/modules/platform-tools/linux/shutdown-linux/shutdown-linux.component.ts b/ui/src/app/modules/platform-tools/linux/shutdown-linux/shutdown-linux.component.ts index 4fb6938de..37c454874 100644 --- a/ui/src/app/modules/platform-tools/linux/shutdown-linux/shutdown-linux.component.ts +++ b/ui/src/app/modules/platform-tools/linux/shutdown-linux/shutdown-linux.component.ts @@ -1,11 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; -import { WsService } from '@/app/core/ws.service'; import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-shutdown-linux', diff --git a/ui/src/app/modules/platform-tools/platform-tools-routing.module.ts b/ui/src/app/modules/platform-tools/platform-tools-routing.module.ts index ca630aeab..1cd085b5f 100644 --- a/ui/src/app/modules/platform-tools/platform-tools-routing.module.ts +++ b/ui/src/app/modules/platform-tools/platform-tools-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; const routes: Routes = [ { diff --git a/ui/src/app/modules/platform-tools/platform-tools.module.ts b/ui/src/app/modules/platform-tools/platform-tools.module.ts index 57d8b29a8..3e4877f79 100644 --- a/ui/src/app/modules/platform-tools/platform-tools.module.ts +++ b/ui/src/app/modules/platform-tools/platform-tools.module.ts @@ -1,6 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NgModule } from '@angular/core'; import { PlatformToolsRoutingModule } from './platform-tools-routing.module'; @NgModule({ diff --git a/ui/src/app/modules/platform-tools/terminal/terminal-routing.module.ts b/ui/src/app/modules/platform-tools/terminal/terminal-routing.module.ts index 0f67a8f9c..bfe75a2d4 100644 --- a/ui/src/app/modules/platform-tools/terminal/terminal-routing.module.ts +++ b/ui/src/app/modules/platform-tools/terminal/terminal-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { TerminalComponent } from './terminal.component'; const routes: Routes = [ diff --git a/ui/src/app/modules/platform-tools/terminal/terminal.component.ts b/ui/src/app/modules/platform-tools/terminal/terminal.component.ts index e4e932f0d..2f4de24ce 100644 --- a/ui/src/app/modules/platform-tools/terminal/terminal.component.ts +++ b/ui/src/app/modules/platform-tools/terminal/terminal.component.ts @@ -1,6 +1,12 @@ -import { Component, OnInit, HostListener, OnDestroy, ViewChild, ElementRef } from '@angular/core'; +import { + Component, + ElementRef, + HostListener, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; import { Subject } from 'rxjs'; - import { TerminalService } from '@/app/core/terminal.service'; @Component({ diff --git a/ui/src/app/modules/platform-tools/terminal/terminal.module.ts b/ui/src/app/modules/platform-tools/terminal/terminal.module.ts index b7028721b..62da9654e 100644 --- a/ui/src/app/modules/platform-tools/terminal/terminal.module.ts +++ b/ui/src/app/modules/platform-tools/terminal/terminal.module.ts @@ -1,6 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NgModule } from '@angular/core'; import { TerminalRoutingModule } from './terminal-routing.module'; import { TerminalComponent } from './terminal.component'; diff --git a/ui/src/app/modules/plugins/donate-modal/donate-modal.component.html b/ui/src/app/modules/plugins/donate-modal/donate-modal.component.html index eca2a23c1..187efc767 100644 --- a/ui/src/app/modules/plugins/donate-modal/donate-modal.component.html +++ b/ui/src/app/modules/plugins/donate-modal/donate-modal.component.html @@ -3,13 +3,21 @@
-
+
+ +
+

+ As more users install their plugins through the Homebridge UI, they are less likely to visit the projects' GitHub page where the ways to support a developer would typically be displayed. +

+

+ Adding donation links directly in the Homebridge UI ensures users know how to support Homebridge developers if they wish to do so. +

-
-
-

- - {{ 'plugins.donate.message_learn_more' | translate}} - -

+
+
+ +
+
+
+ + More Info +
diff --git a/ui/src/app/modules/plugins/donate-modal/donate-modal.component.ts b/ui/src/app/modules/plugins/donate-modal/donate-modal.component.ts index 9c167959e..3125cad44 100644 --- a/ui/src/app/modules/plugins/donate-modal/donate-modal.component.ts +++ b/ui/src/app/modules/plugins/donate-modal/donate-modal.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ @@ -7,7 +7,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; styleUrls: ['./donate-modal.component.scss'], }) export class DonateModalComponent implements OnInit { - @Input() plugin; + @Input() plugin: any; public fundingOptions: { type: string; url: string }[]; @@ -27,7 +27,7 @@ export class DonateModalComponent implements OnInit { // normalise the different funding attribute formats if (Array.isArray(this.plugin.funding)) { - this.fundingOptions = this.plugin.funding.map((option) => { + this.fundingOptions = this.plugin.funding.map((option: any) => { if (typeof option === 'string') { return { type: 'other', @@ -72,5 +72,4 @@ export class DonateModalComponent implements OnInit { return 'fas fa-fw fa-fw fa-link'; } } - } diff --git a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html index 58bee0e16..37170b393 100644 --- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html +++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html @@ -1,151 +1,139 @@
-
-
-

- {{ 'plugins.status_installed' | translate }} -

-

- {{ 'plugins.status_not_installed' | translate }} -

-

- {{ 'plugins.status_update_available' | translate }} -

-

- {{ 'plugins.status_update_beta_available' | translate }} -

-

- {{ 'plugins.status_disabled' | translate }} -

+
+
+ + + +
-
-

- @{{ plugin.author }} -

-

- - - {{ 'plugins.donate.button_donate' | translate }} - - - - Verified - +

+
+

+ {{ plugin.displayName || ((plugin.name.charAt(0) === '@' ? plugin.name.split('/')[1] : plugin.name) | + replace:'-':' ' | titlecase) }} +

+ +
+

{{ plugin.name }} v{{ plugin.installedVersion || plugin.latestVersion }} + ({{ plugin.lastUpdated | date:'yyyy-MM-dd' }})

-
-
-

- {{ plugin.displayName || ((plugin.name.charAt(0) === '@' ? plugin.name.split('/')[1] : plugin.name) | - replace:'-':' ' | titlecase) }} -

-

{{ plugin.name }} v{{ plugin.installedVersion || plugin.latestVersion }} - ({{ plugin.lastUpdated | date:'yyyy-MM-dd' }}) -

-
- - {{ 'plugins.button_settings' | translate | uppercase }} - - - {{ 'plugins.button_install' | translate | uppercase }} - - -
- - - - - - - - - +
+ + {{ 'plugins.button_settings' | translate | uppercase }} - - - - - + + {{ 'plugins.button_install' | translate | uppercase }} - - - - - - - +
+ + + + + +
- - - -
- + + + +
- +
+ + + + + +
- + {{ 'plugins.button_api_documentation' | translate }} + *ngIf="plugin.links.homepage || plugin.links.npm" [href]="plugin.links.homepage || plugin.links.npm"> + class="{{ plugin.links.homepage.startsWith('https://github.com/') ? 'fab fa-fw fa-github' : 'fas fa-external-link-alt' }}"> {{ 'plugins.button_homepage' | translate }}
+
+
diff --git a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts index 4d665d022..a0f8b10ca 100644 --- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts +++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts @@ -2,17 +2,16 @@ import { Component, Input, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; -import { gt } from 'semver'; - -import { SettingsService } from '@/app/core/settings.service'; import { ApiService } from '@/app/core/api.service'; -import { WsService } from '@/app/core/ws.service'; -import { NotificationService } from '@/app/core/notification.service'; +import { ConfirmComponent } from '@/app/core/components/confirm/confirm.component'; +import { InformationComponent } from '@/app/core/components/information/information.component'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; +import { PluginLogModalComponent } from '@/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; -import { ConfirmComponent } from '@/app/core/components/confirm/confirm.component'; +import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; import { DonateModalComponent } from '@/app/modules/plugins/donate-modal/donate-modal.component'; -import { InformationComponent } from '@/app/core/components/information/information.component'; @Component({ selector: 'app-plugin-card', @@ -24,9 +23,6 @@ export class PluginCardComponent implements OnInit { private io = this.$ws.getExistingNamespace('child-bridges'); - public canDisablePlugins = false; - public canManageBridgeSettings = false; - public isMobile = this.$md.detect.mobile(); private _childBridges = []; @@ -35,46 +31,49 @@ export class PluginCardComponent implements OnInit { public allChildBridgesStopped = false; public childBridgeStatus = 'pending'; public childBridgeRestartInProgress = false; - public canStopStartChildBridges = false; + public recommendChildBridge = false; constructor( public $plugin: ManagePluginsService, - private $settings: SettingsService, private $api: ApiService, private $ws: WsService, - private $notification: NotificationService, private $translate: TranslateService, private $modal: NgbModal, private $toastr: ToastrService, private $md: MobileDetectService, - ) { } + private $settings: SettingsService, + ) {} ngOnInit(): void { - // check if the homebridge version supports disabled plugins - this.canDisablePlugins = this.$settings.env.homebridgeVersion ? - gt(this.$settings.env.homebridgeVersion, '1.3.0-beta.46') : false; - - // check if the homebridge version supports external bridges - this.canManageBridgeSettings = this.$settings.env.homebridgeVersion ? - gt(this.$settings.env.homebridgeVersion, '1.3.0-beta.47') : false; - - // check if the homebridge version supports stopping / starting child bridges - this.canStopStartChildBridges = this.$settings.env.homebridgeVersion ? - gt(this.$settings.env.homebridgeVersion, '1.5.0-beta.1') : false; + if ( + !this.$settings.env.recommendChildBridges + || !this.$settings.env.serviceMode + || ['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name) + ) { + this.recommendChildBridge = false; + return; + } + this.$api.get(`/plugins/config-schema/${encodeURIComponent(this.plugin.name)}`, {}).toPromise() + .then((schema) => { + this.recommendChildBridge = schema.pluginType === 'platform'; + }) + .catch(() => { + this.recommendChildBridge = false; + }); } @Input() set childBridges(childBridges: any[]) { this.hasChildBridges = childBridges.length > 0; - this.hasUnpairedChildBridges = childBridges.filter(x => x.paired === false).length > 0; - this.allChildBridgesStopped = childBridges.filter(x => x.manuallyStopped === true).length === childBridges.length; + this.hasUnpairedChildBridges = childBridges.filter((x: any) => x.paired === false).length > 0; + this.allChildBridgesStopped = childBridges.filter((x: any) => x.manuallyStopped === true).length === childBridges.length; if (this.hasChildBridges) { // get the "worse" status of all child bridges and use that for colour icon - if (childBridges.some(x => x.status === 'down')) { + if (childBridges.some((x: any) => x.status === 'down')) { this.childBridgeStatus = 'down'; - } else if (childBridges.some(x => x.status === 'pending')) { + } else if (childBridges.some((x: any) => x.status === 'pending')) { this.childBridgeStatus = 'pending'; - } else if (childBridges.some(x => x.status === 'ok')) { + } else if (childBridges.some((x: any) => x.status === 'ok')) { this.childBridgeStatus = 'ok'; } } @@ -93,6 +92,7 @@ export class PluginCardComponent implements OnInit { ref.componentInstance.message = this.$translate.instant('plugins.manage.modal_verified_message'); ref.componentInstance.ctaButtonLabel = this.$translate.instant('plugins.manage.modal_verified_cta'); ref.componentInstance.ctaButtonLink = 'https://github.com/homebridge/homebridge/wiki/verified-Plugins'; + ref.componentInstance.faIconClass = 'fa-shield-alt green-text'; } disablePlugin(plugin: any) { @@ -101,7 +101,7 @@ export class PluginCardComponent implements OnInit { ref.componentInstance.title = `${this.$translate.instant('plugins.manage.disable')}: ${plugin.name}`; ref.componentInstance.message = this.$translate.instant('plugins.manage.message_confirm_disable', { pluginName: plugin.name }); ref.componentInstance.confirmButtonLabel = this.$translate.instant('plugins.manage.disable'); - ref.componentInstance.cancelButtonLabel = this.$translate.instant('form.button_cancel'); + ref.componentInstance.faIconClass = 'fa-circle-pause primary-text'; ref.result.then(async () => { try { @@ -109,14 +109,10 @@ export class PluginCardComponent implements OnInit { // mark as disabled plugin.disabled = true; // stop all child bridges - if (this.hasChildBridges && this.canStopStartChildBridges) { - this.doChildBridgeAction('stop'); + if (this.hasChildBridges) { + await this.doChildBridgeAction('stop'); } - this.$toastr.success( - this.$translate.instant('plugins.settings.toast_restart_required'), - this.$translate.instant('toast.title_success'), - ); - this.$notification.configUpdated.next(undefined); + this.$modal.open(RestartHomebridgeComponent); } catch (err) { this.$toastr.error(`Failed to disable plugin: ${err.message}`, this.$translate.instant('toast.title_error')); } @@ -131,7 +127,7 @@ export class PluginCardComponent implements OnInit { ref.componentInstance.title = `${this.$translate.instant('plugins.manage.enable')}: ${plugin.name}`; ref.componentInstance.message = this.$translate.instant('plugins.manage.message_confirm_enable', { pluginName: plugin.name }); ref.componentInstance.confirmButtonLabel = this.$translate.instant('plugins.manage.enable'); - ref.componentInstance.cancelButtonLabel = this.$translate.instant('form.button_cancel'); + ref.componentInstance.faIconClass = 'fa-circle-play primary-text'; ref.result.then(async () => { try { @@ -139,14 +135,10 @@ export class PluginCardComponent implements OnInit { // mark as enabled plugin.disabled = false; // start all child bridges - if (this.hasChildBridges && this.canStopStartChildBridges) { + if (this.hasChildBridges) { await this.doChildBridgeAction('start'); } - this.$toastr.success( - this.$translate.instant('plugins.settings.toast_restart_required'), - this.$translate.instant('toast.title_success'), - ); - this.$notification.configUpdated.next(undefined); + this.$modal.open(RestartHomebridgeComponent); } catch (err) { this.$toastr.error(`Failed to enable plugin: ${err.message}`, this.$translate.instant('toast.title_error')); } @@ -155,6 +147,15 @@ export class PluginCardComponent implements OnInit { }); } + viewPluginLog(plugin: any) { + const ref = this.$modal.open(PluginLogModalComponent, { + size: 'xl', + backdrop: 'static', + }); + + ref.componentInstance.plugin = plugin; + } + async doChildBridgeAction(action: 'stop' | 'start' | 'restart') { this.childBridgeRestartInProgress = true; try { diff --git a/ui/src/app/modules/plugins/plugins-routing.module.ts b/ui/src/app/modules/plugins/plugins-routing.module.ts index e03aac34f..ccf2733a4 100644 --- a/ui/src/app/modules/plugins/plugins-routing.module.ts +++ b/ui/src/app/modules/plugins/plugins-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { PluginsComponent } from './plugins.component'; const routes: Routes = [ diff --git a/ui/src/app/modules/plugins/plugins.component.scss b/ui/src/app/modules/plugins/plugins.component.scss index 573a2e5f9..d58d12b5e 100644 --- a/ui/src/app/modules/plugins/plugins.component.scss +++ b/ui/src/app/modules/plugins/plugins.component.scss @@ -35,6 +35,6 @@ width: calc(1 / 2 * 100% - (1 - 1 / 3) * 10px); @media only screen and (max-width: 991px) { - width: calc(100% - (1 - 1 / 3) * 10px); + width: 100%; } } diff --git a/ui/src/app/modules/plugins/plugins.component.ts b/ui/src/app/modules/plugins/plugins.component.ts index 3da041589..3de645220 100644 --- a/ui/src/app/modules/plugins/plugins.component.ts +++ b/ui/src/app/modules/plugins/plugins.component.ts @@ -1,15 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { Router, NavigationEnd, ActivatedRoute } from '@angular/router'; +import { NavigationEnd, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; -import { take } from 'rxjs/operators'; -import { gt } from 'semver'; - -import { SettingsService } from '@/app/core/settings.service'; +import { Subscription } from 'rxjs'; import { ApiService } from '@/app/core/api.service'; import { WsService } from '@/app/core/ws.service'; -import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; @Component({ selector: 'app-plugins', @@ -27,16 +23,12 @@ export class PluginsComponent implements OnInit, OnDestroy { }); public loading = true; - public searchQuery: string; - private navigationSubscription; + private navigationSubscription: Subscription; constructor( - private $settings: SettingsService, private $api: ApiService, private $ws: WsService, - private $plugin: ManagePluginsService, private $router: Router, - private $route: ActivatedRoute, private $toastr: ToastrService, private $translate: TranslateService, ) { } @@ -47,7 +39,7 @@ export class PluginsComponent implements OnInit, OnDestroy { this.io.socket.emit('monitor-child-bridge-status'); }); - this.io.socket.on('child-bridge-status-update', (data) => { + this.io.socket.on('child-bridge-status-update', (data: any) => { const existingBridge = this.childBridges.find(x => x.username === data.username); if (existingBridge) { Object.assign(existingBridge, data); @@ -82,21 +74,6 @@ export class PluginsComponent implements OnInit, OnDestroy { this.$translate.instant('toast.title_error'), ); } - - this.$route.queryParams.pipe(take(1)).subscribe(async (params) => { - if (params.installed && this.installedPlugins.find(x => x.name === params.installed)) { - const plugin = this.installedPlugins.find(x => x.name === params.installed); - this.$plugin.settings(plugin) - .then((schema?) => { - this.recommendChildBridge(plugin, schema); - }) - .finally(() => { - this.$router.navigate([], { - queryParams: {}, - }); - }); - } - }); } search() { @@ -121,7 +98,7 @@ export class PluginsComponent implements OnInit, OnDestroy { this.loadInstalledPlugins(); } - onSubmit({ value, valid }) { + onSubmit({ value }) { if (!value.query.length) { this.loadInstalledPlugins(); } else { @@ -129,25 +106,13 @@ export class PluginsComponent implements OnInit, OnDestroy { } } - recommendChildBridge(plugin, schema) { - if ( - this.$settings.env.recommendChildBridges && - this.$settings.env.serviceMode && - gt(this.$settings.env.homebridgeVersion, '1.5.0-beta.1') && - schema && - schema.pluginType === 'platform' - ) { - this.$plugin.bridgeSettings(plugin); - } - } - getChildBridgeMetadata() { this.io.request('get-homebridge-child-bridge-status').subscribe((data) => { this.childBridges = data; }); } - getPluginChildBridges(plugin) { + getPluginChildBridges(plugin: any) { return this.childBridges.filter(x => x.plugin === plugin.name); } diff --git a/ui/src/app/modules/plugins/plugins.module.ts b/ui/src/app/modules/plugins/plugins.module.ts index 892f4523e..f836f67f4 100644 --- a/ui/src/app/modules/plugins/plugins.module.ts +++ b/ui/src/app/modules/plugins/plugins.module.ts @@ -1,15 +1,14 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { TranslateModule } from '@ngx-translate/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; - -import { CoreModule } from '@/app/core/core.module'; -import { ManagePluginsModule } from '@/app/core/manage-plugins/manage-plugins.module'; -import { PluginsRoutingModule } from './plugins-routing.module'; -import { PluginsComponent } from './plugins.component'; +import { TranslateModule } from '@ngx-translate/core'; import { DonateModalComponent } from './donate-modal/donate-modal.component'; import { PluginCardComponent } from './plugin-card/plugin-card.component'; +import { PluginsRoutingModule } from './plugins-routing.module'; +import { PluginsComponent } from './plugins.component'; +import { CoreModule } from '@/app/core/core.module'; +import { ManagePluginsModule } from '@/app/core/manage-plugins/manage-plugins.module'; @NgModule({ declarations: [ diff --git a/ui/src/app/modules/restart/restart.component.ts b/ui/src/app/modules/restart/restart.component.ts index fab3f0831..3a6e9d84b 100644 --- a/ui/src/app/modules/restart/restart.component.ts +++ b/ui/src/app/modules/restart/restart.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; -import { WsService } from '@/app/core/ws.service'; -import { SettingsService } from '@/app/core/settings.service'; import { NotificationService } from '@/app/core/notification.service'; +import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-restart', @@ -25,7 +24,6 @@ export class RestartComponent implements OnInit, OnDestroy { error: any = false; public uiOnline = false; - public homebridgeOnline = false; constructor( private $api: ApiService, diff --git a/ui/src/app/modules/restart/restart.module.ts b/ui/src/app/modules/restart/restart.module.ts index 0dd56a29e..2c0cb9988 100644 --- a/ui/src/app/modules/restart/restart.module.ts +++ b/ui/src/app/modules/restart/restart.module.ts @@ -1,9 +1,8 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; - -import { CoreModule } from '@/app/core/core.module'; import { RestartComponent } from './restart.component'; +import { CoreModule } from '@/app/core/core.module'; @NgModule({ declarations: [ @@ -15,4 +14,5 @@ import { RestartComponent } from './restart.component'; CoreModule, ], }) + export class RestartModule { } diff --git a/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.html b/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.html index c31fc990c..ba82fbb51 100644 --- a/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.html +++ b/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.html @@ -1,8 +1,7 @@
Clear Cached Accessories
-
@@ -19,13 +18,18 @@

Warning automations. -
- -

-
- +
+
+ +
+
+
+ +
-
\ No newline at end of file +
diff --git a/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.ts b/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.ts index 9ae244673..d55591cb0 100644 --- a/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.ts +++ b/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.ts @@ -22,14 +22,14 @@ export class RemoveAllCachedAccessoriesModalComponent { onResetCachedAccessoriesClick() { this.clicked = true; return this.$api.put('/server/reset-cached-accessories', {}).subscribe( - data => { + () => { this.toastr.success( this.translate.instant('reset.toast_clear_cached_accessories_success'), this.translate.instant('toast.title_success'), ); this.activeModal.close(); }, - err => { + () => { this.toastr.error(this.translate.instant('reset.toast_failed_to_reset'), this.translate.instant('toast.title_error')); }, ); diff --git a/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.html b/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.html index 16e814610..dc9998176 100644 --- a/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.html +++ b/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.html @@ -3,8 +3,7 @@
Remove Single Cached Accessory
-
@@ -26,8 +25,13 @@
- +
+
+
+ +
+
-
\ No newline at end of file +
diff --git a/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.ts b/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.ts index 8e138cb1d..b54b007c2 100644 --- a/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.ts +++ b/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ToastrService } from 'ngx-toastr'; import { TranslateService } from '@ngx-translate/core'; +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @Component({ @@ -36,7 +36,7 @@ export class RemoveSingleCachedAccessoryModalComponent implements OnInit { } } - removeAccessory(item) { + removeAccessory(item: any) { this.deleting = item.UUID; this.toastr.info(this.translate.instant('reset.toast_removing_cached_accessory_please_wait')); @@ -46,7 +46,7 @@ export class RemoveSingleCachedAccessoryModalComponent implements OnInit { cacheFile: item.$cacheFile, }, }).subscribe( - async data => { + async () => { await this.loadCachedAccessories(); this.deleting = null; @@ -57,7 +57,7 @@ export class RemoveSingleCachedAccessoryModalComponent implements OnInit { this.toastr.success(this.translate.instant('reset.toast_cached_accessory_removed'), this.translate.instant('toast.title_success')); }, - err => { + () => { this.deleting = null; this.toastr.error(this.translate.instant( 'reset.toast_failed_to_delete_cached_accessory'), diff --git a/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.html b/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.html index 4100ceb03..edded32dc 100644 --- a/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.html +++ b/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.html @@ -1,7 +1,7 @@
Reset Homebridge Accessory
-
@@ -15,11 +15,18 @@

Warning
  • Your Homebridge username and pin will be changed.
  • The rest of your config will not be changed. If Homebridge is not starting due to a bad config a reset will not fix it.
    • -
    - -

    -
    - +
    +
    + +
    +
    +
    + +
    -
    \ No newline at end of file +
    diff --git a/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.ts b/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.ts index ebc3114e3..7ee2037cb 100644 --- a/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.ts +++ b/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Router } from '@angular/router'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @@ -22,12 +22,12 @@ export class ResetHomebridgeModalComponent { onResetHomebridgeAccessoryClick() { this.clicked = true; return this.$api.put('/server/reset-homebridge-accessory', {}).subscribe( - data => { + () => { this.toastr.success(this.translate.instant('reset.toast_accessory_reset'), this.translate.instant('toast.title_success')); this.activeModal.close(); this.$route.navigate(['/restart']); }, - async err => { + async () => { this.toastr.error(this.translate.instant('reset.toast_failed_to_reset'), this.translate.instant('toast.title_error')); }, ); diff --git a/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.html b/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.html index 804a7f1e4..aadfaf005 100644 --- a/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.html +++ b/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.html @@ -1,8 +1,7 @@
    -
    @@ -35,12 +34,19 @@
    -
    -
    - - -
    \ No newline at end of file +
    +
    + +
    +
    +
    + +
    +
    +
    diff --git a/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.ts b/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.ts index cba6e6e66..cf25984b2 100644 --- a/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.ts +++ b/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.ts @@ -19,7 +19,7 @@ export class SelectNetworkInterfacesComponent implements OnInit { submit() { this.activeModal.close( - this.availableNetworkAdapters.filter(x => x.selected).map(x => x.iface), + this.availableNetworkAdapters.filter((x: any) => x.selected).map((x: any) => x.iface), ); } diff --git a/ui/src/app/modules/settings/settings-routing.module.ts b/ui/src/app/modules/settings/settings-routing.module.ts index 832929181..0a3c4e9a6 100644 --- a/ui/src/app/modules/settings/settings-routing.module.ts +++ b/ui/src/app/modules/settings/settings-routing.module.ts @@ -1,8 +1,7 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AdminGuard } from '@/app/core/auth/admin.guard'; +import { RouterModule, Routes } from '@angular/router'; import { SettingsComponent } from './settings.component'; +import { AdminGuard } from '@/app/core/auth/admin.guard'; const routes: Routes = [ { diff --git a/ui/src/app/modules/settings/settings.component.html b/ui/src/app/modules/settings/settings.component.html index 577382f67..28227935f 100644 --- a/ui/src/app/modules/settings/settings.component.html +++ b/ui/src/app/modules/settings/settings.component.html @@ -7,7 +7,7 @@

    -
    +
      diff --git a/ui/src/app/modules/settings/settings.component.ts b/ui/src/app/modules/settings/settings.component.ts index f89ccb240..85f5fb1ae 100644 --- a/ui/src/app/modules/settings/settings.component.ts +++ b/ui/src/app/modules/settings/settings.component.ts @@ -1,25 +1,17 @@ import { Component, OnInit } from '@angular/core'; -import { UntypedFormBuilder, UntypedFormControl, FormGroup, FormControl } from '@angular/forms'; -import { ToastrService } from 'ngx-toastr'; -import { ActivatedRoute, Router } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; +import { FormControl, FormGroup, UntypedFormControl } from '@angular/forms'; +import { Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ToastrService } from 'ngx-toastr'; import { debounceTime } from 'rxjs/operators'; -import * as semver from 'semver'; - -import { SettingsService } from '@/app/core/settings.service'; -import { ApiService } from '@/app/core/api.service'; -import { NotificationService } from '@/app/core/notification.service'; - -import { - RemoveAllCachedAccessoriesModalComponent, -} from './remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component'; +import { RemoveAllCachedAccessoriesModalComponent } from './remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component'; // eslint-disable-line max-len +import { RemoveSingleCachedAccessoryModalComponent } from './remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component'; // eslint-disable-line max-len import { ResetHomebridgeModalComponent } from './reset-homebridge-modal/reset-homebridge-modal.component'; -import { - RemoveSingleCachedAccessoryModalComponent, -} from './remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component'; -import { UnpairAccessoryModalComponent } from './unpair-accessory-modal/unpair-accessory-modal.component'; import { SelectNetworkInterfacesComponent } from './select-network-interfaces/select-network-interfaces.component'; +import { UnpairAccessoryModalComponent } from './unpair-accessory-modal/unpair-accessory-modal.component'; +import { ApiService } from '@/app/core/api.service'; +import { NotificationService } from '@/app/core/notification.service'; +import { SettingsService } from '@/app/core/settings.service'; @Component({ selector: 'app-settings', @@ -38,7 +30,6 @@ export class SettingsComponent implements OnInit { public legacyMdnsFormControl = new UntypedFormControl(false); public saved = false; - public showNetworking = false; public showAvahiMdnsOption = false; public showResolvedMdnsOption = false; public availableNetworkAdapters: Record = []; @@ -48,12 +39,9 @@ export class SettingsComponent implements OnInit { public $settings: SettingsService, private $api: ApiService, private $notification: NotificationService, - public $fb: UntypedFormBuilder, public $toastr: ToastrService, private $modal: NgbModal, - private $route: ActivatedRoute, private $router: Router, - private translate: TranslateService, ) { } ngOnInit() { @@ -112,33 +100,23 @@ export class SettingsComponent implements OnInit { this.$router.navigate(['/restart']); }, (err) => { - this.$toastr.error(err.message, 'Failed to set force setvice restart flag.'); + this.$toastr.error(err.message, 'Failed to set force service restart flag.'); }, ); } async initNetworkingOptions() { try { - const homebridgePackage = await this.$api.get('/status/homebridge-version').toPromise(); - if (semver.gte(homebridgePackage.installedVersion, '1.3.0-beta.0')) { - this.showNetworking = true; - this.getNetworkSettings(); - } + await this.getNetworkSettings(); const onLinux = ( this.$settings.env.runningInLinux || this.$settings.env.runningInDocker || this.$settings.env.runningInSynologyPackage || this.$settings.env.runningInPackageMode ); - if (semver.gte(homebridgePackage.installedVersion, '1.4.0-beta.0')) { if (onLinux) { this.showAvahiMdnsOption = true; - } - } - if (semver.gte(homebridgePackage.installedVersion, '1.6.0-beta.0')) { - if (onLinux) { this.showResolvedMdnsOption = true; - } } } catch (e) { @@ -193,7 +171,7 @@ export class SettingsComponent implements OnInit { } this.bridgeNetworkAdapters = adapters.map((interfaceName) => { - const i = this.availableNetworkAdapters.find((x => x.iface === interfaceName)); + const i = this.availableNetworkAdapters.find(((x: any) => x.iface === interfaceName)); if (i) { i.selected = true; i.missing = false; diff --git a/ui/src/app/modules/settings/settings.module.ts b/ui/src/app/modules/settings/settings.module.ts index c9e913611..f17026f5c 100644 --- a/ui/src/app/modules/settings/settings.module.ts +++ b/ui/src/app/modules/settings/settings.module.ts @@ -1,20 +1,15 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { TranslateModule } from '@ngx-translate/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; - +import { TranslateModule } from '@ngx-translate/core'; +import { RemoveAllCachedAccessoriesModalComponent } from './remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component'; // eslint-disable-line max-len +import { RemoveSingleCachedAccessoryModalComponent } from './remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component'; // eslint-disable-line max-len +import { ResetHomebridgeModalComponent } from './reset-homebridge-modal/reset-homebridge-modal.component'; +import { SelectNetworkInterfacesComponent } from './select-network-interfaces/select-network-interfaces.component'; import { SettingsRoutingModule } from './settings-routing.module'; import { SettingsComponent } from './settings.component'; -import { ResetHomebridgeModalComponent } from './reset-homebridge-modal/reset-homebridge-modal.component'; import { UnpairAccessoryModalComponent } from './unpair-accessory-modal/unpair-accessory-modal.component'; -import { - RemoveAllCachedAccessoriesModalComponent, -} from './remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component'; -import { - RemoveSingleCachedAccessoryModalComponent, -} from './remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component'; -import { SelectNetworkInterfacesComponent } from './select-network-interfaces/select-network-interfaces.component'; @NgModule({ declarations: [ diff --git a/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.html b/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.html index 333a004ec..e984717c7 100644 --- a/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.html +++ b/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.html @@ -2,8 +2,7 @@
      -
      @@ -24,8 +23,13 @@
      - +
      +
      +
      + +
      +
      -
    \ No newline at end of file +
    diff --git a/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.ts b/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.ts index 9b4178102..513e46fb0 100644 --- a/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.ts +++ b/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ToastrService } from 'ngx-toastr'; import { TranslateService } from '@ngx-translate/core'; +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @Component({ @@ -27,7 +27,7 @@ export class UnpairAccessoryModalComponent implements OnInit { async loadPairings() { try { this.pairings = (await this.$api.get('/server/pairings').toPromise()) - .sort((a, b) => b._main ? 1 : -1); + .sort((_: any, b: any) => b._main ? 1 : -1); } catch (e) { this.toastr.error('Paired accessories could not be loaded.', this.translate.instant('toast.title_error')); this.activeModal.close(); @@ -38,7 +38,7 @@ export class UnpairAccessoryModalComponent implements OnInit { this.deleting = id; this.$api.delete(`/server/pairings/${id}`).subscribe( - async data => { + async () => { await this.loadPairings(); if (!this.pairings.length) { @@ -52,11 +52,10 @@ export class UnpairAccessoryModalComponent implements OnInit { this.translate.instant('toast.title_success'), ); }, - err => { + () => { this.deleting = null; this.toastr.error('Failed to un-pair accessory.', this.translate.instant('toast.title_error')); }, ); } - } diff --git a/ui/src/app/modules/setup-wizard/setup-wizard-routing.module.ts b/ui/src/app/modules/setup-wizard/setup-wizard-routing.module.ts index a4f8e3e18..4ff2bfd6f 100644 --- a/ui/src/app/modules/setup-wizard/setup-wizard-routing.module.ts +++ b/ui/src/app/modules/setup-wizard/setup-wizard-routing.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - import { SetupWizardComponent } from './setup-wizard.component'; const routes: Routes = [ diff --git a/ui/src/app/modules/setup-wizard/setup-wizard.component.ts b/ui/src/app/modules/setup-wizard/setup-wizard.component.ts index b34829a32..40c2305ea 100644 --- a/ui/src/app/modules/setup-wizard/setup-wizard.component.ts +++ b/ui/src/app/modules/setup-wizard/setup-wizard.component.ts @@ -1,16 +1,19 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms'; -import { Router } from '@angular/router'; +import { + AbstractControl, + FormControl, + FormGroup, + Validators, +} from '@angular/forms'; import { Title } from '@angular/platform-browser'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - -import { environment } from '@/environments/environment'; import { ApiService } from '@/app/core/api.service'; import { AuthService } from '@/app/core/auth/auth.service'; -import { SettingsService } from '@/app/core/settings.service'; import { BackupRestoreComponent } from '@/app/core/backup-restore/backup-restore.component'; +import { SettingsService } from '@/app/core/settings.service'; +import { environment } from '@/environments/environment'; @Component({ selector: 'app-setup-wizard', @@ -33,7 +36,6 @@ export class SetupWizardComponent implements OnInit, OnDestroy { public restoreUploading = false; constructor( - private $router: Router, private $modal: NgbModal, private $translate: TranslateService, private $toastr: ToastrService, diff --git a/ui/src/app/modules/setup-wizard/setup-wizard.guard.ts b/ui/src/app/modules/setup-wizard/setup-wizard.guard.ts index db2490ae1..5972a182c 100644 --- a/ui/src/app/modules/setup-wizard/setup-wizard.guard.ts +++ b/ui/src/app/modules/setup-wizard/setup-wizard.guard.ts @@ -1,6 +1,6 @@ -import { SettingsService } from '@/app/core/settings.service'; import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; +import { CanActivate, Router } from '@angular/router'; +import { SettingsService } from '@/app/core/settings.service'; @Injectable({ providedIn: 'root', @@ -11,9 +11,7 @@ export class SetupWizardGuard implements CanActivate { private $settings: SettingsService, ) { } - async canActivate( - route: ActivatedRouteSnapshot, - state: RouterStateSnapshot): Promise { + async canActivate(): Promise { if (!this.$settings.settingsLoaded) { await this.$settings.onSettingsLoaded.toPromise(); @@ -24,8 +22,6 @@ export class SetupWizardGuard implements CanActivate { } this.$router.navigate(['/']); - return true; } - } diff --git a/ui/src/app/modules/setup-wizard/setup-wizard.module.ts b/ui/src/app/modules/setup-wizard/setup-wizard.module.ts index 54b7f37f6..0a0e40a97 100644 --- a/ui/src/app/modules/setup-wizard/setup-wizard.module.ts +++ b/ui/src/app/modules/setup-wizard/setup-wizard.module.ts @@ -1,13 +1,12 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { TranslateModule } from '@ngx-translate/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; - -import { CoreModule } from '@/app/core/core.module'; +import { TranslateModule } from '@ngx-translate/core'; import { SetupWizardRoutingModule } from './setup-wizard-routing.module'; import { SetupWizardComponent } from './setup-wizard.component'; import { SetupWizardGuard } from './setup-wizard.guard'; +import { CoreModule } from '@/app/core/core.module'; @NgModule({ declarations: [ diff --git a/ui/src/app/modules/status/status.component.html b/ui/src/app/modules/status/status.component.html index a75b86656..04a8e673d 100644 --- a/ui/src/app/modules/status/status.component.html +++ b/ui/src/app/modules/status/status.component.html @@ -36,15 +36,15 @@ © 2023 - Homebridge. - - - {{ $settings.env.packageName }} - v{{ $settings.env.packageVersion }} - - originally created by - oznu. + · + + Homebridge v{{ $settings.env.homebridgeVersion }} + · + + UI v{{ $settings.env.packageVersion }} + · + UI developed by + oznu
    diff --git a/ui/src/app/modules/status/status.component.ts b/ui/src/app/modules/status/status.component.ts index 56144e9f7..16ff4d47c 100644 --- a/ui/src/app/modules/status/status.component.ts +++ b/ui/src/app/modules/status/status.component.ts @@ -1,17 +1,16 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { ToastrService } from 'ngx-toastr'; import { GridsterConfig, GridsterItem } from 'angular-gridster2'; +import { ToastrService } from 'ngx-toastr'; import { Subject } from 'rxjs'; import { take } from 'rxjs/operators'; - -import { WsService } from '@/app/core/ws.service'; +import { WidgetAddComponent } from './widget-add/widget-add.component'; +import { WidgetControlComponent } from './widget-control/widget-control.component'; import { AuthService } from '@/app/core/auth/auth.service'; -import { SettingsService } from '@/app/core/settings.service'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; import { NotificationService } from '@/app/core/notification.service'; -import { WidgetControlComponent } from './widget-control/widget-control.component'; -import { WidgetAddComponent } from './widget-add/widget-add.component'; +import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-status', @@ -87,7 +86,7 @@ export class StatusComponent implements OnInit, OnDestroy { this.consoleStatus = 'down'; }); - this.io.socket.on('homebridge-status', (data) => { + this.io.socket.on('homebridge-status', (data: any) => { // check if client is up-to-date if (data.packageVersion && data.packageVersion !== this.$settings.uiVersion) { window.location.reload(); @@ -170,7 +169,7 @@ export class StatusComponent implements OnInit, OnDestroy { this.options.api.optionsChanged(); } - gridResizeEvent(item: any, itemComponent: any) { + gridResizeEvent(_item: any, itemComponent: any) { itemComponent.item.$resizeEvent.next('resize'); this.page.mobile = (window.innerWidth < 1024); } @@ -246,7 +245,7 @@ export class StatusComponent implements OnInit, OnDestroy { }); } - manageWidget(item) { + manageWidget(item: any) { const ref = this.$modal.open(WidgetControlComponent); ref.componentInstance.widget = item; @@ -268,5 +267,4 @@ export class StatusComponent implements OnInit, OnDestroy { this.io.end(); this.saveWidgetsEvent.complete(); } - } diff --git a/ui/src/app/modules/status/status.module.ts b/ui/src/app/modules/status/status.module.ts index 2c02e807a..312e395a8 100644 --- a/ui/src/app/modules/status/status.module.ts +++ b/ui/src/app/modules/status/status.module.ts @@ -1,34 +1,32 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { RouterModule } from '@angular/router'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { GridsterModule } from 'angular-gridster2'; -import { DragulaModule } from 'ng2-dragula'; import { ChartsModule } from 'ng2-charts'; - -import { CoreModule } from '@/app/core/core.module'; -import { ManagePluginsModule } from '@/app/core/manage-plugins/manage-plugins.module'; -import { AccessoriesCoreModule } from '@/app/core/accessories/accessories.module'; - +import { DragulaModule } from 'ng2-dragula'; import { StatusComponent } from './status.component'; -import { WidgetsComponent } from './widgets/widgets.component'; +import { WidgetAddComponent } from './widget-add/widget-add.component'; import { WidgetControlComponent } from './widget-control/widget-control.component'; +import { AccessoriesWidgetComponent } from './widgets/accessories-widget/accessories-widget.component'; +import { ChildBridgeWidgetComponent } from './widgets/child-bridge-widget/child-bridge-widget.component'; +import { ClockWidgetComponent } from './widgets/clock-widget/clock-widget.component'; +import { CpuWidgetComponent } from './widgets/cpu-widget/cpu-widget.component'; import { HapQrcodeWidgetComponent } from './widgets/hap-qrcode-widget/hap-qrcode-widget.component'; import { HomebridgeLogsWidgetComponent } from './widgets/homebridge-logs-widget/homebridge-logs-widget.component'; -import { TerminalWidgetComponent } from './widgets/terminal-widget/terminal-widget.component'; -import { CpuWidgetComponent } from './widgets/cpu-widget/cpu-widget.component'; -import { NetworkWidgetComponent } from './widgets/network-widget/network-widget.component'; -import { MemoryWidgetComponent } from './widgets/memory-widget/memory-widget.component'; -import { UptimeWidgetComponent } from './widgets/uptime-widget/uptime-widget.component'; import { HomebridgeStatusWidgetComponent } from './widgets/homebridge-status-widget/homebridge-status-widget.component'; +import { MemoryWidgetComponent } from './widgets/memory-widget/memory-widget.component'; +import { NetworkWidgetComponent } from './widgets/network-widget/network-widget.component'; import { SystemInfoWidgetComponent } from './widgets/system-info-widget/system-info-widget.component'; -import { WidgetAddComponent } from './widget-add/widget-add.component'; +import { TerminalWidgetComponent } from './widgets/terminal-widget/terminal-widget.component'; +import { UptimeWidgetComponent } from './widgets/uptime-widget/uptime-widget.component'; import { WeatherWidgetComponent } from './widgets/weather-widget/weather-widget.component'; -import { AccessoriesWidgetComponent } from './widgets/accessories-widget/accessories-widget.component'; -import { ClockWidgetComponent } from './widgets/clock-widget/clock-widget.component'; -import { ChildBridgeWidgetComponent } from './widgets/child-bridge-widget/child-bridge-widget.component'; +import { WidgetsComponent } from './widgets/widgets.component'; +import { AccessoriesCoreModule } from '@/app/core/accessories/accessories.module'; +import { CoreModule } from '@/app/core/core.module'; +import { ManagePluginsModule } from '@/app/core/manage-plugins/manage-plugins.module'; @NgModule({ declarations: [ diff --git a/ui/src/app/modules/status/widget-add/widget-add.component.html b/ui/src/app/modules/status/widget-add/widget-add.component.html index b40b8469c..3086fdb38 100644 --- a/ui/src/app/modules/status/widget-add/widget-add.component.html +++ b/ui/src/app/modules/status/widget-add/widget-add.component.html @@ -1,8 +1,7 @@
    Add Widget
    -
    @@ -18,20 +17,25 @@

    {{ 'status.widget.label_no_additional_widgets' | translate }}

    -
    - - - - + +
    +
    + +
    +
    + + +
    +
    + +
    diff --git a/ui/src/app/modules/status/widget-add/widget-add.component.ts b/ui/src/app/modules/status/widget-add/widget-add.component.ts index 1f1ef8512..1e015ac61 100644 --- a/ui/src/app/modules/status/widget-add/widget-add.component.ts +++ b/ui/src/app/modules/status/widget-add/widget-add.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; - import { SettingsService } from '@/app/core/settings.service'; @Component({ @@ -10,7 +9,7 @@ import { SettingsService } from '@/app/core/settings.service'; styleUrls: ['./widget-add.component.scss'], }) export class WidgetAddComponent implements OnInit { - @Input() dashboard; + @Input() dashboard: any; @Input() resetLayout: () => void; @Input() lockLayout: () => void; @Input() unlockLayout: () => void; @@ -136,10 +135,10 @@ export class WidgetAddComponent implements OnInit { ) { } ngOnInit() { - this.availableWidgets = this.allWidgets.filter(x => !this.dashboard.some(i => i.component === x.component) && !x.hidden); + this.availableWidgets = this.allWidgets.filter(x => !this.dashboard.some((i: any) => i.component === x.component) && !x.hidden); } - selectWidget(widget) { + selectWidget(widget: any) { this.activeModal.close(widget); } diff --git a/ui/src/app/modules/status/widget-control/widget-control.component.html b/ui/src/app/modules/status/widget-control/widget-control.component.html index 212f2325f..d7d36f267 100644 --- a/ui/src/app/modules/status/widget-control/widget-control.component.html +++ b/ui/src/app/modules/status/widget-control/widget-control.component.html @@ -1,8 +1,7 @@
    Manage Widget
    -
    @@ -136,12 +135,18 @@
    Manage
    -
    - - + +
    +
    + +
    +
    +
    + +
    diff --git a/ui/src/app/modules/status/widget-control/widget-control.component.ts b/ui/src/app/modules/status/widget-control/widget-control.component.ts index ee676bcaa..c6a0dbe4b 100644 --- a/ui/src/app/modules/status/widget-control/widget-control.component.ts +++ b/ui/src/app/modules/status/widget-control/widget-control.component.ts @@ -1,10 +1,16 @@ -import { Component, OnInit, Input } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { Observable, of } from 'rxjs'; -import { debounceTime, distinctUntilChanged, map, tap, switchMap, catchError } from 'rxjs/operators'; - +import { + catchError, + debounceTime, + distinctUntilChanged, + map, + switchMap, + tap, +} from 'rxjs/operators'; import { environment } from '@/environments/environment'; @Component({ @@ -19,7 +25,7 @@ export class WidgetControlComponent implements OnInit { private $http: HttpClient, private $translate: TranslateService, ) { } - @Input() widget; + @Input() widget: any; // weather public searching: boolean; @@ -71,7 +77,7 @@ export class WidgetControlComponent implements OnInit { switchMap(term => term.length < 3 ? [] : this.findOpenWeatherMapCity(term).pipe( - catchError((e) => { + catchError(() => { this.searching = false; return of([]); })), @@ -106,7 +112,7 @@ export class WidgetControlComponent implements OnInit { }, }), }).pipe( - map((response: any) => response.list.map((item) => ({ + map((response: any) => response.list.map((item: any) => ({ id: item.id, name: item.name, country: item.sys.country, diff --git a/ui/src/app/modules/status/widgets/accessories-widget/accessories-widget.component.ts b/ui/src/app/modules/status/widgets/accessories-widget/accessories-widget.component.ts index 653fa419c..83fb2101c 100644 --- a/ui/src/app/modules/status/widgets/accessories-widget/accessories-widget.component.ts +++ b/ui/src/app/modules/status/widgets/accessories-widget/accessories-widget.component.ts @@ -1,10 +1,14 @@ -import { Component, OnInit, OnDestroy, Input } from '@angular/core'; -import { Subscription } from 'rxjs'; +import { + Component, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; import { DragulaService } from 'ng2-dragula'; - +import { Subscription } from 'rxjs'; +import { ServiceTypeX } from '@/app/core/accessories/accessories.interfaces'; import { AccessoriesService } from '@/app/core/accessories/accessories.service'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; -import { ServiceTypeX } from '@/app/core/accessories/accessories.interfaces'; @Component({ selector: 'app-accessories-widget', diff --git a/ui/src/app/modules/status/widgets/child-bridge-widget/child-bridge-widget.component.ts b/ui/src/app/modules/status/widgets/child-bridge-widget/child-bridge-widget.component.ts index 4548cc230..76d74eef1 100644 --- a/ui/src/app/modules/status/widgets/child-bridge-widget/child-bridge-widget.component.ts +++ b/ui/src/app/modules/status/widgets/child-bridge-widget/child-bridge-widget.component.ts @@ -1,7 +1,11 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { + Component, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { WsService } from '@/app/core/ws.service'; @Component({ diff --git a/ui/src/app/modules/status/widgets/clock-widget/clock-widget.component.ts b/ui/src/app/modules/status/widgets/clock-widget/clock-widget.component.ts index 94a737230..f1755d954 100644 --- a/ui/src/app/modules/status/widgets/clock-widget/clock-widget.component.ts +++ b/ui/src/app/modules/status/widgets/clock-widget/clock-widget.component.ts @@ -1,4 +1,9 @@ -import { Component, OnInit, OnDestroy, Input } from '@angular/core'; +import { + Component, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; import { Subscription, interval } from 'rxjs'; @Component({ diff --git a/ui/src/app/modules/status/widgets/cpu-widget/cpu-widget.component.ts b/ui/src/app/modules/status/widgets/cpu-widget/cpu-widget.component.ts index 74211c896..b4fe13d9a 100644 --- a/ui/src/app/modules/status/widgets/cpu-widget/cpu-widget.component.ts +++ b/ui/src/app/modules/status/widgets/cpu-widget/cpu-widget.component.ts @@ -1,10 +1,16 @@ -import { Component, OnInit, OnDestroy, ViewChild, ElementRef, Input } from '@angular/core'; -import { Subscription, interval } from 'rxjs'; +import { + Component, + ElementRef, + Input, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; import { ChartOptions } from 'chart.js'; -import { Color, BaseChartDirective } from 'ng2-charts'; - -import { WsService } from '@/app/core/ws.service'; +import { BaseChartDirective, Color } from 'ng2-charts'; +import { Subscription, interval } from 'rxjs'; import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-cpu-widget', diff --git a/ui/src/app/modules/status/widgets/hap-qrcode-widget/hap-qrcode-widget.component.ts b/ui/src/app/modules/status/widgets/hap-qrcode-widget/hap-qrcode-widget.component.ts index 1a6e13ae8..60f334556 100644 --- a/ui/src/app/modules/status/widgets/hap-qrcode-widget/hap-qrcode-widget.component.ts +++ b/ui/src/app/modules/status/widgets/hap-qrcode-widget/hap-qrcode-widget.component.ts @@ -1,6 +1,11 @@ -import { Component, OnInit, ElementRef, ViewChild, Input } from '@angular/core'; +import { + Component, + ElementRef, + Input, + OnInit, + ViewChild, +} from '@angular/core'; import { Subject } from 'rxjs'; - import { WsService } from '@/app/core/ws.service'; @Component({ diff --git a/ui/src/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.ts b/ui/src/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.ts index 24e2f6545..4a534badd 100644 --- a/ui/src/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.ts +++ b/ui/src/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.ts @@ -1,7 +1,13 @@ -import { Component, OnInit, ViewChild, ElementRef, Input, OnDestroy } from '@angular/core'; +import { + Component, + ElementRef, + Input, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; import { Subject } from 'rxjs'; import { ITerminalOptions } from 'xterm'; - import { LogService } from '@/app/core/log.service'; @Component({ diff --git a/ui/src/app/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.ts b/ui/src/app/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.ts index 25e26d294..da88822a4 100644 --- a/ui/src/app/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.ts +++ b/ui/src/app/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; - -import { WsService } from '@/app/core/ws.service'; -import { SettingsService } from '@/app/core/settings.service'; import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; +import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-homebridge-status-widget', diff --git a/ui/src/app/modules/status/widgets/memory-widget/memory-widget.component.ts b/ui/src/app/modules/status/widgets/memory-widget/memory-widget.component.ts index e159db64d..1d6a6e346 100644 --- a/ui/src/app/modules/status/widgets/memory-widget/memory-widget.component.ts +++ b/ui/src/app/modules/status/widgets/memory-widget/memory-widget.component.ts @@ -1,10 +1,15 @@ -import { Component, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/core'; -import { interval, Subscription } from 'rxjs'; +import { + Component, + ElementRef, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; import { ChartOptions } from 'chart.js'; -import { Color, BaseChartDirective } from 'ng2-charts'; - -import { WsService } from '@/app/core/ws.service'; +import { BaseChartDirective, Color } from 'ng2-charts'; +import { Subscription, interval } from 'rxjs'; import { AuthService } from '@/app/core/auth/auth.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-memory-widget', diff --git a/ui/src/app/modules/status/widgets/network-widget/network-widget.component.ts b/ui/src/app/modules/status/widgets/network-widget/network-widget.component.ts index f7ed4e2dd..d783d30d1 100644 --- a/ui/src/app/modules/status/widgets/network-widget/network-widget.component.ts +++ b/ui/src/app/modules/status/widgets/network-widget/network-widget.component.ts @@ -1,10 +1,15 @@ -import { Component, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/core'; -import { interval, Subscription } from 'rxjs'; +import { + Component, + ElementRef, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; import { ChartOptions } from 'chart.js'; -import { Color, BaseChartDirective } from 'ng2-charts'; - -import { WsService } from '@/app/core/ws.service'; +import { BaseChartDirective, Color } from 'ng2-charts'; +import { Subscription, interval } from 'rxjs'; import { AuthService } from '@/app/core/auth/auth.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-network-widget', diff --git a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html index f2fc53491..0a5d09ed4 100644 --- a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html +++ b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html @@ -87,13 +87,10 @@ Yes - + Service Mode - - {{ 'status.widget.systeminfo.label_enabled' | translate }} - - + {{ 'status.widget.systeminfo.label_disabled' | translate }} diff --git a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts index d2eb4c3dc..dd27d1dc0 100644 --- a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts +++ b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts @@ -1,10 +1,9 @@ import { Component, OnInit } from '@angular/core'; - -import { WsService } from '@/app/core/ws.service'; -import { AuthService } from '@/app/core/auth/auth.service'; -import { InformationComponent } from '@/app/core/components/information/information.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; +import { AuthService } from '@/app/core/auth/auth.service'; +import { InformationComponent } from '@/app/core/components/information/information.component'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-system-info-widget', @@ -49,6 +48,7 @@ export class SystemInfoWidgetComponent implements OnInit { ref.componentInstance.title = this.$translate.instant('status.widget.systeminfo.modal_glibc_title'); ref.componentInstance.message = this.$translate.instant('status.widget.systeminfo.modal_glibc_message'); ref.componentInstance.ctaButtonLabel = this.$translate.instant('status.widget.systeminfo.modal_glibc_cta'); + ref.componentInstance.faIconClass = 'fab fa-fw fa-node-js primary-text'; // eslint-disable-next-line max-len ref.componentInstance.ctaButtonLink = 'https://github.com/homebridge/homebridge-config-ui-x/wiki/Troubleshooting/#error---update-node---your-version-of-linux-does-not-meet-the-glibc-version'; @@ -59,6 +59,7 @@ export class SystemInfoWidgetComponent implements OnInit { ref.componentInstance.title = this.$translate.instant('status.widget.systeminfo.modal_servicemode_title'); ref.componentInstance.message = this.$translate.instant('status.widget.systeminfo.modal_servicemode_message'); ref.componentInstance.ctaButtonLabel = this.$translate.instant('status.widget.systeminfo.modal_servicemode_cta'); + ref.componentInstance.faIconClass = 'fas fa-fw fa-circle-exclamation primary-text'; // eslint-disable-next-line max-len ref.componentInstance.ctaButtonLink = 'https://github.com/homebridge/homebridge-config-ui-x/wiki/How-To-Swap-From-Standalone-Mode-to-Service-Mode'; diff --git a/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.ts b/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.ts index 606273d77..1311eff2a 100644 --- a/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.ts +++ b/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.ts @@ -1,7 +1,13 @@ -import { Component, OnInit, ViewChild, ElementRef, Input, OnDestroy } from '@angular/core'; +import { + Component, + ElementRef, + Input, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; import { Subject } from 'rxjs'; import { ITerminalOptions } from 'xterm'; - import { TerminalService } from '@/app/core/terminal.service'; @Component({ diff --git a/ui/src/app/modules/status/widgets/uptime-widget/uptime-widget.component.ts b/ui/src/app/modules/status/widgets/uptime-widget/uptime-widget.component.ts index eb56e10aa..2234f9713 100644 --- a/ui/src/app/modules/status/widgets/uptime-widget/uptime-widget.component.ts +++ b/ui/src/app/modules/status/widgets/uptime-widget/uptime-widget.component.ts @@ -1,8 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { interval, Subscription } from 'rxjs'; - -import { WsService } from '@/app/core/ws.service'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Subscription, interval } from 'rxjs'; import { AuthService } from '@/app/core/auth/auth.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-uptime-widget', diff --git a/ui/src/app/modules/status/widgets/weather-widget/weather-widget.component.ts b/ui/src/app/modules/status/widgets/weather-widget/weather-widget.component.ts index 8010fe29a..0fa9e9fb3 100644 --- a/ui/src/app/modules/status/widgets/weather-widget/weather-widget.component.ts +++ b/ui/src/app/modules/status/widgets/weather-widget/weather-widget.component.ts @@ -1,11 +1,15 @@ -import { Component, OnInit, Input, OnDestroy } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { + Component, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Subject, Subscription, interval } from 'rxjs'; import * as dayjs from 'dayjs'; - -import { WsService } from '@/app/core/ws.service'; +import { Subject, Subscription, interval } from 'rxjs'; import { AuthService } from '@/app/core/auth/auth.service'; +import { WsService } from '@/app/core/ws.service'; import { environment } from '@/environments/environment'; @Component({ diff --git a/ui/src/app/modules/status/widgets/widgets.component.ts b/ui/src/app/modules/status/widgets/widgets.component.ts index 5b94f0a2d..1eab87a69 100644 --- a/ui/src/app/modules/status/widgets/widgets.component.ts +++ b/ui/src/app/modules/status/widgets/widgets.component.ts @@ -1,21 +1,27 @@ import { - Component, OnInit, Input, ComponentFactoryResolver, - ApplicationRef, Injector, ElementRef, EmbeddedViewRef, OnDestroy, + ApplicationRef, + Component, + ComponentFactoryResolver, + ElementRef, + EmbeddedViewRef, + Injector, + Input, + OnDestroy, + OnInit, } from '@angular/core'; - +import { AccessoriesWidgetComponent } from './accessories-widget/accessories-widget.component'; +import { ChildBridgeWidgetComponent } from './child-bridge-widget/child-bridge-widget.component'; +import { ClockWidgetComponent } from './clock-widget/clock-widget.component'; +import { CpuWidgetComponent } from './cpu-widget/cpu-widget.component'; import { HapQrcodeWidgetComponent } from './hap-qrcode-widget/hap-qrcode-widget.component'; import { HomebridgeLogsWidgetComponent } from './homebridge-logs-widget/homebridge-logs-widget.component'; -import { TerminalWidgetComponent } from './terminal-widget/terminal-widget.component'; -import { CpuWidgetComponent } from './cpu-widget/cpu-widget.component'; -import { NetworkWidgetComponent } from './network-widget/network-widget.component'; -import { MemoryWidgetComponent } from './memory-widget/memory-widget.component'; -import { UptimeWidgetComponent } from './uptime-widget/uptime-widget.component'; import { HomebridgeStatusWidgetComponent } from './homebridge-status-widget/homebridge-status-widget.component'; +import { MemoryWidgetComponent } from './memory-widget/memory-widget.component'; +import { NetworkWidgetComponent } from './network-widget/network-widget.component'; import { SystemInfoWidgetComponent } from './system-info-widget/system-info-widget.component'; +import { TerminalWidgetComponent } from './terminal-widget/terminal-widget.component'; +import { UptimeWidgetComponent } from './uptime-widget/uptime-widget.component'; import { WeatherWidgetComponent } from './weather-widget/weather-widget.component'; -import { AccessoriesWidgetComponent } from './accessories-widget/accessories-widget.component'; -import { ClockWidgetComponent } from './clock-widget/clock-widget.component'; -import { ChildBridgeWidgetComponent } from './child-bridge-widget/child-bridge-widget.component'; @Component({ selector: 'app-widgets', diff --git a/ui/src/app/modules/users/users-add/users-add.component.html b/ui/src/app/modules/users/users-add/users-add.component.html index b3b6bd5c3..544d5e230 100644 --- a/ui/src/app/modules/users/users-add/users-add.component.html +++ b/ui/src/app/modules/users/users-add/users-add.component.html @@ -1,9 +1,12 @@
    -
    - -
    -

    - + +
    +
    {{ 'users.title_add_user' | translate }}
    + +
    +
    Username
    -
    -
    @@ -40,18 +41,23 @@
    - -
    +
    - -
    - +
    +
    +
    +
    - - - -
    +
    +
    + +
    +
    +
    diff --git a/ui/src/app/modules/users/users-add/users-add.component.ts b/ui/src/app/modules/users/users-add/users-add.component.ts index a20ad5848..623627bc6 100644 --- a/ui/src/app/modules/users/users-add/users-add.component.ts +++ b/ui/src/app/modules/users/users-add/users-add.component.ts @@ -1,10 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { AbstractControl } from '@angular/forms'; -import { TranslateService } from '@ngx-translate/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; @Component({ @@ -47,9 +46,9 @@ export class UsersAddComponent implements OnInit { } } - onSubmit({ value, valid }) { + onSubmit({ value }) { this.$api.post(`/users`, value).subscribe( - data => { + () => { this.activeModal.close(); this.toastr.success(this.translate.instant('users.toast_added_new_user'), this.translate.instant('toast.title_success')); }, diff --git a/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.html b/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.html index 8d81eb9be..32a34155a 100644 --- a/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.html +++ b/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.html @@ -1,8 +1,7 @@
    {{ 'users.setup_2fa_disable' | translate }}
    -
    @@ -17,13 +16,18 @@
    {{ 'users.setup_2fa_disable' | translate }}
    [translate]="'login.message_invalid_username_or_password'">Invalid Username and Password

    -
    - - + +
    +
    + +
    +
    +
    + +
    -
    \ No newline at end of file +
    diff --git a/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.ts b/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.ts index df7c8d92c..c917eb589 100644 --- a/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.ts +++ b/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.ts @@ -1,9 +1,8 @@ import { Component, OnInit } from '@angular/core'; -import { UntypedFormGroup, UntypedFormControl, Validators, FormGroup, FormControl } from '@angular/forms'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ToastrService } from 'ngx-toastr'; import { TranslateService } from '@ngx-translate/core'; - +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @Component({ @@ -33,11 +32,11 @@ export class UsersDisable2faComponent implements OnInit { disable2fa() { this.invalidCredentials = false; this.$api.post('/users/otp/deactivate', this.formGroup.value).subscribe( - data => { + () => { this.activeModal.close(); this.toastr.success(this.translate.instant('users.setup_2fa_disable_success'), this.translate.instant('toast.title_success')); }, - err => { + () => { this.formGroup.setValue({ password: '' }); this.invalidCredentials = true; }, diff --git a/ui/src/app/modules/users/users-edit/users-edit.component.html b/ui/src/app/modules/users/users-edit/users-edit.component.html index 0adb77c6b..de057433f 100644 --- a/ui/src/app/modules/users/users-edit/users-edit.component.html +++ b/ui/src/app/modules/users/users-edit/users-edit.component.html @@ -1,9 +1,12 @@
    -
    - -
    -

    - + +
    +
    {{ 'users.title_edit_user' | translate }}
    + +
    +
    -
    +
    - -
    - +
    +
    +
    +
    - - - -
    +
    +
    + +
    +
    +
    diff --git a/ui/src/app/modules/users/users-edit/users-edit.component.ts b/ui/src/app/modules/users/users-edit/users-edit.component.ts index 376c3f0d4..8eb87c52f 100644 --- a/ui/src/app/modules/users/users-edit/users-edit.component.ts +++ b/ui/src/app/modules/users/users-edit/users-edit.component.ts @@ -1,10 +1,9 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { AbstractControl } from '@angular/forms'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - import { ApiService } from '@/app/core/api.service'; import { AuthService } from '@/app/core/auth/auth.service'; @@ -13,7 +12,7 @@ import { AuthService } from '@/app/core/auth/auth.service'; templateUrl: './users-edit.component.html', }) export class UsersEditComponent implements OnInit { - @Input() user; + @Input() user: any; public form = new FormGroup({ username: new FormControl('', [Validators.required]), @@ -54,9 +53,9 @@ export class UsersEditComponent implements OnInit { } } - onSubmit({ value, valid }) { + onSubmit({ value }) { this.$api.patch(`/users/${this.user.id}`, value).subscribe( - data => { + () => { this.activeModal.close(); this.toastr.success(this.translate.instant('users.toast_updated_user'), this.translate.instant('toast.title_success')); diff --git a/ui/src/app/modules/users/users-routing.module.ts b/ui/src/app/modules/users/users-routing.module.ts index 57771de0f..7697dd8d1 100644 --- a/ui/src/app/modules/users/users-routing.module.ts +++ b/ui/src/app/modules/users/users-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { UsersComponent } from './users.component'; import { UsersResolver } from './users.resolver'; diff --git a/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.html b/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.html index cf8ba3403..7542e3aa1 100644 --- a/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.html +++ b/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.html @@ -1,8 +1,7 @@
    {{ 'users.setup_2fa' | translate }}
    -
    @@ -35,13 +34,19 @@

    {{ 'users.setup_2fa_cannot_setup_2fa' | translate }}

    autocomplete="one-time-code" autocapitalize="none" inputmode="numeric" pattern="[0-9]*">
    -
    -
    - - +
    +
    + +
    +
    +
    + +
    -
    \ No newline at end of file +
    diff --git a/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.ts b/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.ts index 4372310d6..8ac4da3fc 100644 --- a/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.ts +++ b/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.ts @@ -1,10 +1,15 @@ -import { Component, OnInit, Input, ViewChild, ElementRef } from '@angular/core'; +import { + Component, + ElementRef, + Input, + OnInit, + ViewChild, +} from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { UntypedFormGroup, UntypedFormControl, Validators, FormGroup, FormControl } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; -import { ToastrService } from 'ngx-toastr'; import * as dayjs from 'dayjs'; - +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @Component({ @@ -13,7 +18,7 @@ import { ApiService } from '@/app/core/api.service'; styleUrls: ['./users-setup2fa.component.scss'], }) export class UsersSetup2faComponent implements OnInit { - @Input() public user; + @Input() public user: any; @ViewChild('qrcode', { static: true }) qrcodeElement: ElementRef; @@ -42,14 +47,14 @@ export class UsersSetup2faComponent implements OnInit { err => { this.activeModal.dismiss(); this.toastr.error( - err.error.message || 'An error occured while attempting to setup 2FA', + err.error.message || 'An error occurred while attempting to setup 2FA', this.translate.instant('toast.title_error'), ); }, ); } - checkTimeDiff(timestamp) { + checkTimeDiff(timestamp: string) { const diffMs = dayjs(timestamp).diff(new Date(), 'millisecond'); if (diffMs < -5000 || diffMs > 5000) { this.timeDiffError = diffMs; @@ -60,12 +65,12 @@ export class UsersSetup2faComponent implements OnInit { enable2fa() { this.$api.post('/users/otp/activate', this.formGroup.value).subscribe( - data => { + () => { this.toastr.success(this.translate.instant('users.setup_2fa_enabled_success'), this.translate.instant('toast.title_success')); this.activeModal.close(); }, err => { - this.toastr.error(err.error.message || 'An error occured', this.translate.instant('toast.title_error')); + this.toastr.error(err.error.message || 'An error occurred', this.translate.instant('toast.title_error')); }, ); } diff --git a/ui/src/app/modules/users/users.component.ts b/ui/src/app/modules/users/users.component.ts index 49e9991b5..d31a6dfeb 100644 --- a/ui/src/app/modules/users/users.component.ts +++ b/ui/src/app/modules/users/users.component.ts @@ -1,15 +1,14 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; - -import { ApiService } from '@/app/core/api.service'; -import { AuthService } from '@/app/core/auth/auth.service'; import { UsersAddComponent } from './users-add/users-add.component'; +import { UsersDisable2faComponent } from './users-disable2fa/users-disable2fa.component'; import { UsersEditComponent } from './users-edit/users-edit.component'; import { UsersSetup2faComponent } from './users-setup2fa/users-setup2fa.component'; -import { UsersDisable2faComponent } from './users-disable2fa/users-disable2fa.component'; +import { ApiService } from '@/app/core/api.service'; +import { AuthService } from '@/app/core/auth/auth.service'; @Component({ selector: 'app-users', @@ -52,7 +51,7 @@ export class UsersComponent implements OnInit { }); } - openEditUser(user) { + openEditUser(user: any) { const ref = this.modalService.open(UsersEditComponent, { size: 'lg', }); @@ -63,9 +62,9 @@ export class UsersComponent implements OnInit { }); } - deleteUser(id) { + deleteUser(id: string) { this.$api.delete(`/users/${id}`).subscribe( - data => { + () => { this.toastr.success(this.translate.instant('users.toast_user_deleted'), this.translate.instant('toast.title_success')); this.reloadUsers(); }, @@ -78,7 +77,7 @@ export class UsersComponent implements OnInit { ); } - setup2fa(user) { + setup2fa(user: any) { const ref = this.modalService.open(UsersSetup2faComponent, { size: 'lg', backdrop: 'static', @@ -90,7 +89,7 @@ export class UsersComponent implements OnInit { }); } - disable2fa(user) { + disable2fa(user: any) { const ref = this.modalService.open(UsersDisable2faComponent, { backdrop: 'static', }); diff --git a/ui/src/app/modules/users/users.module.ts b/ui/src/app/modules/users/users.module.ts index 50bade72a..6a1493bbf 100644 --- a/ui/src/app/modules/users/users.module.ts +++ b/ui/src/app/modules/users/users.module.ts @@ -1,17 +1,16 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; - -import { CoreModule } from '@/app/core/core.module'; -import { UsersRoutingModule } from './users-routing.module'; -import { UsersComponent } from './users.component'; +import { TranslateModule } from '@ngx-translate/core'; import { UsersAddComponent } from './users-add/users-add.component'; +import { UsersDisable2faComponent } from './users-disable2fa/users-disable2fa.component'; import { UsersEditComponent } from './users-edit/users-edit.component'; -import { UsersResolver } from './users.resolver'; +import { UsersRoutingModule } from './users-routing.module'; import { UsersSetup2faComponent } from './users-setup2fa/users-setup2fa.component'; -import { UsersDisable2faComponent } from './users-disable2fa/users-disable2fa.component'; +import { UsersComponent } from './users.component'; +import { UsersResolver } from './users.resolver'; +import { CoreModule } from '@/app/core/core.module'; @NgModule({ declarations: [ diff --git a/ui/src/app/modules/users/users.resolver.ts b/ui/src/app/modules/users/users.resolver.ts index 0874db3e5..4df3c7a9c 100644 --- a/ui/src/app/modules/users/users.resolver.ts +++ b/ui/src/app/modules/users/users.resolver.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; -import { Resolve, RouterStateSnapshot, ActivatedRouteSnapshot, Router } from '@angular/router'; +import { Resolve, Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; - import { ApiService } from '@/app/core/api.service'; @Injectable() @@ -12,14 +11,12 @@ export class UsersResolver implements Resolve { private $router: Router, ) { } - resolve( - route: ActivatedRouteSnapshot, - state: RouterStateSnapshot, - ) { - return this.$api.get('/users').toPromise() - .catch((err) => { - this.$toastr.error(err.message, 'Failed to Load Users'); - this.$router.navigate(['/']); - }); + async resolve() { + try { + return await this.$api.get('/users').toPromise(); + } catch (err) { + this.$toastr.error(err.message, 'Failed to Load Users'); + this.$router.navigate(['/']); + } } } diff --git a/ui/src/app/shared/layout/layout.component.html b/ui/src/app/shared/layout/layout.component.html index 213763ff7..b4b7b85fb 100644 --- a/ui/src/app/shared/layout/layout.component.html +++ b/ui/src/app/shared/layout/layout.component.html @@ -28,14 +28,14 @@
      -
    • +
    • + [ngClass]="{ 'fa-beat': rPiCurrentlyUnderVoltage }">
      • @@ -62,16 +62,16 @@ *ngIf="$settings.env.enableTerminalAccess && $auth.user.admin" routerLink="/platform-tools/terminal"> {{ 'menu.linux.label_terminal' | translate }} - + {{ 'menu.linux.label_logs' | translate }}
      - Homebridge {{ 'menu.docker.label_settings' | translate }} + {{ 'menu.label_settings_hb' | translate }} - {{ 'menu.label_ui_settings' | translate }} + {{ 'menu.label_settings_ui' | translate }} @@ -80,27 +80,10 @@ {{'menu.tooltip_user_accounts' | translate}} -
      - - {{ 'menu.tooltip_restart' | translate }} +
      +       + {{ 'menu.restart.title' | translate }} - - {{ 'menu.docker.label_startup_script' | translate }} - - - {{ 'menu.docker.label_restart_container' | translate }} - - - {{ 'menu.linux.label_restart_server' | translate }} - - - {{ 'menu.linux.label_shutdown_server' | translate }} - -
      {{ 'menu.tooltip_logout' | translate }} - {{ $auth.user.username }} diff --git a/ui/src/app/shared/layout/layout.component.ts b/ui/src/app/shared/layout/layout.component.ts index 60cedb099..256181c37 100644 --- a/ui/src/app/shared/layout/layout.component.ts +++ b/ui/src/app/shared/layout/layout.component.ts @@ -1,19 +1,23 @@ -import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import { + Component, + ElementRef, + OnInit, + ViewChild, +} from '@angular/core'; import { Router } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { lt } from 'semver'; +import { TranslateService } from '@ngx-translate/core'; import { throttleTime } from 'rxjs/operators'; - -import { environment } from '@/environments/environment'; -import { WsService } from '@/app/core/ws.service'; -import { SettingsService } from '@/app/core/settings.service'; +import { lt } from 'semver'; import { AuthService } from '@/app/core/auth/auth.service'; -import { NotificationService } from '@/app/core/notification.service'; - import { BackupRestoreComponent } from '@/app/core/backup-restore/backup-restore.component'; -import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; import { ConfirmComponent } from '@/app/core/components/confirm/confirm.component'; +import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; +import { NotificationService } from '@/app/core/notification.service'; +import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; +import { RestartOptionsModalComponent } from '@/app/shared/layout/restart-options-modal/restart-options-modal.component'; +import { environment } from '@/environments/environment'; @Component({ selector: 'app-layout', @@ -23,8 +27,8 @@ import { ConfirmComponent } from '@/app/core/components/confirm/confirm.componen export class LayoutComponent implements OnInit { private io = this.$ws.connectToNamespace('app'); - public rPiCurrentlyUndervoltage = false; - public rPiWasUndervoltage = false; + public rPiCurrentlyUnderVoltage = false; + public rPiWasUnderVoltage = false; @ViewChild('restartHomebridgeIcon') restartHomebridgeIcon: ElementRef; @@ -63,10 +67,10 @@ export class LayoutComponent implements OnInit { this.$notification.raspberryPiThrottled.subscribe((throttled) => { if (throttled['Under-voltage detected']) { - this.rPiCurrentlyUndervoltage = true; + this.rPiCurrentlyUnderVoltage = true; } if (throttled['Under-voltage has occurred']) { - this.rPiWasUndervoltage = true; + this.rPiWasUnderVoltage = true; } }); @@ -88,49 +92,8 @@ export class LayoutComponent implements OnInit { }); } - restartHomebridge() { - const ref = this.$modal.open(ConfirmComponent); - ref.componentInstance.title = this.translate.instant('menu.hbrestart.title'); - ref.componentInstance.message = this.translate.instant('menu.hbrestart.confirmation'); - ref.componentInstance.confirmButtonLabel = this.translate.instant('menu.hbrestart.confirm_button'); - - ref.result - .then(() => { - this.$router.navigate(['/restart']); - }) - .finally(() => { - // do nothing - }); - } - - restartServer() { - const ref = this.$modal.open(ConfirmComponent); - ref.componentInstance.title = this.translate.instant('menu.linux.label_restart_server'); - ref.componentInstance.message = this.translate.instant('platform.linux.restart.confirmation'); - ref.componentInstance.confirmButtonLabel = this.translate.instant('menu.linux.label_restart_server'); - - ref.result - .then(() => { - this.$router.navigate(['/platform-tools/linux/restart-server']); - }) - .finally(() => { - // do nothing - }); - } - - shutdownServer() { - const ref = this.$modal.open(ConfirmComponent); - ref.componentInstance.title = this.translate.instant('menu.linux.label_shutdown_server'); - ref.componentInstance.message = this.translate.instant('platform.linux.shutdown.confirmation'); - ref.componentInstance.confirmButtonLabel = this.translate.instant('menu.linux.label_shutdown_server'); - - ref.result - .then(() => { - this.$router.navigate(['/platform-tools/linux/shutdown-server']); - }) - .finally(() => { - // do nothing - }); + openRestartOptionsModal() { + this.$modal.open(RestartOptionsModalComponent); } async compareServerUiVersion() { @@ -143,11 +106,12 @@ export class LayoutComponent implements OnInit { const ref = this.$modal.open(ConfirmComponent); ref.componentInstance.title = this.translate.instant('platform.version.title_service_restart_required'); - ref.componentInstance.confirmButtonLabel = this.translate.instant('menu.tooltip_restart'); ref.componentInstance.message = this.translate.instant('platform.version.message_service_restart_required', { serverVersion: this.$settings.uiVersion, uiVersion: environment.serverTarget, }); + ref.componentInstance.confirmButtonLabel = this.translate.instant('menu.tooltip_restart'); + ref.componentInstance.faIconClass = 'fas fa-fw-power-off'; ref.result.then(() => { this.$router.navigate(['/restart']); diff --git a/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.html b/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.html new file mode 100644 index 000000000..e7ba332da --- /dev/null +++ b/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.html @@ -0,0 +1,54 @@ +
      +
      +
      {{ 'menu.restart.title' | translate }}
      + +
      +
      + +
      + +
      + +

      + +

      +

      + +

      +

      + +

      +

      + +

      +

      + +

      +

      + +

      +
      +
      +
      +
      + +
      +
      +
      +
      diff --git a/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.scss b/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.ts b/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.ts new file mode 100644 index 000000000..969c40100 --- /dev/null +++ b/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.ts @@ -0,0 +1,60 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ToastrService } from 'ngx-toastr'; +import { ApiService } from '@/app/core/api.service'; +import { SettingsService } from '@/app/core/settings.service'; + +@Component({ + selector: 'app-confirm', + templateUrl: './restart-options-modal.component.html', + styleUrls: ['./restart-options-modal.component.scss'], +}) +export class RestartOptionsModalComponent implements OnInit { + constructor( + public activeModal: NgbActiveModal, + private $api: ApiService, + private $router: Router, + public $settings: SettingsService, + public $toastr: ToastrService, + ) { } + + ngOnInit() {} + + restartHomebridge() { + this.$router.navigate(['/restart']); + this.activeModal.close(); + } + + restartHomebridgeService() { + this.$api.put('/platform-tools/hb-service/set-full-service-restart-flag', {}).subscribe( + () => { + this.$router.navigate(['/restart']); + this.activeModal.close(); + }, + (err) => { + this.$toastr.error(err.message, 'Failed to set force service restart flag.'); + }, + ); + } + + restartServer() { + this.$router.navigate(['/platform-tools/linux/restart-server']); + this.activeModal.close(); + } + + shutdownServer() { + this.$router.navigate(['/platform-tools/linux/shutdown-server']); + this.activeModal.close(); + } + + dockerStartupScript() { + this.$router.navigate(['/platform-tools/docker/startup-script']); + this.activeModal.close(); + } + + dockerRestartContainer() { + this.$router.navigate(['/platform-tools/docker/restart-container']); + this.activeModal.close(); + } +} diff --git a/ui/src/assets/hap-icons/light.svg b/ui/src/assets/hap-icons/light.svg index c6c09c4a5..320a08c8f 100644 --- a/ui/src/assets/hap-icons/light.svg +++ b/ui/src/assets/hap-icons/light.svg @@ -5,7 +5,7 @@ width="140.000000pt" height="140.000000pt" viewBox="0 0 140.000000 140.000000" preserveAspectRatio="xMidYMid meet"> - diff --git a/ui/src/assets/hap-icons/windowcovering-open.svg b/ui/src/assets/hap-icons/windowcovering-open.svg index 841c00675..c887b6725 100644 --- a/ui/src/assets/hap-icons/windowcovering-open.svg +++ b/ui/src/assets/hap-icons/windowcovering-open.svg @@ -3,7 +3,7 @@ diff --git a/ui/src/i18n/bg.json b/ui/src/i18n/bg.json index d2d363807..3882665d8 100644 --- a/ui/src/i18n/bg.json +++ b/ui/src/i18n/bg.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge Paired", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge Settings", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Отказ", "form.button_close": "Затвори", "form.button_delete": "Изтрий", + "form.button_disable": "Disable", "form.button_edit": "Промени", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Запази", + "form.button_unlock": "Unlock", "login.button_login": "Вписване", "login.label_2fa_code": "Two Factor Authentication Code", "login.label_password": "Парола", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Стартов скрипт", "menu.docker.label_terminal": "Терминал", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Аксесоари", "menu.label_config": "Конфигуратор", "menu.label_plugins": "Добавки", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI Settings", "menu.label_status": "Статус", - "menu.label_ui_settings": "UI Settings", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Рестартирай Сървъра", "menu.linux.label_shutdown_server": "Изключи Сървъра", "menu.linux.label_terminal": "Терминал", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Излез", "menu.tooltip_restart": "Рестарт", "menu.tooltip_user_accounts": "Потребители", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "Сървъра ще се изключи скоро.", "platform.linux.shutdown.title_shutting_down_server": "Сървъра се изключва", "platform.version.message_service_restart_required": "WARNING: Homebridge UI v{{ uiVersion }} has been installed, but the server service is still running v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Service Restart Required", + "platform.version.title_service_restart_required": "Restart Required", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Инсталирай", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Are you sure you want to update {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} requires Node.js v{{minVersion}} or later. You are currently running Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "The {{ pluginName }} plugin recommends running on Node.js v{{ minVersion }} or later. You are currently running Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Инсталиран", "plugins.status_not_installed": "Не е инсталиран", "plugins.status_update_available": "Налична е актуализация", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Неуспешно зареждане на добавките", "plugins.tooltip_update_plugin_to": "Актуализирай добавката до v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.", - "reset.button_reset_homebridge_now": "Нулирай Homebridge сега", "reset.message_accessory_config_will_not_be_changed": "Останалата част от конфигурацията ви няма да бъде променена. Ако Homebridge не се стартира поради лоша конфигурация, нулирането няма да го поправи.", "reset.message_action_is_irreversible": "Това действие е необратимо. Моля, прочетете внимателно, преди да продължите.", "reset.message_all_automations_will_be_reset": "Всички автоматизации и ще трябва да бъдат пренастроени след нулиране.", diff --git a/ui/src/i18n/ca.json b/ui/src/i18n/ca.json index 0b2930acd..aee1d952c 100644 --- a/ui/src/i18n/ca.json +++ b/ui/src/i18n/ca.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Pont aparellat", "child_bridge.label_bridge_restart_child_bridges": "Reiniciar els ponts fills", "child_bridge.label_bridge_settings": "Configuració del pont", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Ponts fill", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Cancel·lar", "form.button_close": "Tancar", "form.button_delete": "Eliminar", + "form.button_disable": "Disable", "form.button_edit": "Editar", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Guardar", + "form.button_unlock": "Unlock", "login.button_login": "Iniciar Sesión", "login.label_2fa_code": "Codi 2FA", "login.label_password": "Contrasenya", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Script d'inici", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Accessoris", "menu.label_config": "Configuració", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Ajustos d'interfície", "menu.label_status": "Estat", - "menu.label_ui_settings": "Ajustos d'interfície", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Reiniciar Servidor", "menu.linux.label_shutdown_server": "Apagar Servidor", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Tancar Sessió", "menu.tooltip_restart": "Reiniciar", "menu.tooltip_user_accounts": "Comptes d'usuari", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "El servidor s'apagarà aviat.", "platform.linux.shutdown.title_shutting_down_server": "Apagant el servidor", "platform.version.message_service_restart_required": "ADVERTÈNCIA: Homebridge UI v{{uiVersion}} ha estat instal·lat, però el servei encara segueix executant la v{{serverVersion}}.", - "platform.version.title_service_restart_required": "Reinici del servei obligatori", + "platform.version.title_service_restart_required": "Reinici Obligatori", "plugins.button_api_documentation": "Documentació de l'API", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Instal·lar", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Estàs segur que vols actualitzar {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{ latestVersion }} requereix Node.js v{{ minVersion }} o superior. Actualment estàs executant Node.js v{{ installedVersion }}.", "plugins.node_update.node_version_too_low": "El plugin {{pluginName}} recomana executar-se en Node.js v{{ minVersion }} o superior. Actualment estàs executant Node.js v{{installedVersion}}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Instal·lat", "plugins.status_not_installed": "No instal·lat", "plugins.status_update_available": "Actualització disponible", - "plugins.status_update_beta_available": "Actualització Beta Disponible", "plugins.toast_failed_to_load_plugins": "Error al carregar els plugins", "plugins.tooltip_update_plugin_to": "Actualitzar el plugin a v{{ latestVersion }}", "reset.accessories_will_may_need_to_be_reconfigured": "Després de realitzar aquesta acció, pot ser que sigui necessari configurar de nou alguns accessoris en HomeKit o tornar a afegir-los a les teves automatitzacions.", - "reset.button_reset_homebridge_now": "Restableix Homebridge ara", "reset.message_accessory_config_will_not_be_changed": "La resta de la configuració no serà canviada. Si Homebridge no comença causa d'una mala configuració, un reinici no ho arreglarà.", "reset.message_action_is_irreversible": "Aquesta acció és irreversible. Si us plau, llegeix amb precaució abans de continuar.", "reset.message_all_automations_will_be_reset": "Totes les automatitzacions necessiten ser configurades de nou després de reinici.", diff --git a/ui/src/i18n/cs.json b/ui/src/i18n/cs.json index cd7c78f9a..158c65e4c 100644 --- a/ui/src/i18n/cs.json +++ b/ui/src/i18n/cs.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Most Spárován", "child_bridge.label_bridge_restart_child_bridges": "Restartovat Podřízený Most", "child_bridge.label_bridge_settings": "Nastavení Mostu", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Podřízený Most", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Zrušit", "form.button_close": "Zavřít", "form.button_delete": "Vymazat", + "form.button_disable": "Disable", "form.button_edit": "Editovat", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Uložit", + "form.button_unlock": "Unlock", "login.button_login": "Přihlásit se", "login.label_2fa_code": "Dvoufaktorový kód", "login.label_password": "Heslo", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Spouštěcí skript", "menu.docker.label_terminal": "Terminál", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Příslušenství", "menu.label_config": "Konfigurace", "menu.label_plugins": "Pluginy", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Nastavení UI", "menu.label_status": "Stav", - "menu.label_ui_settings": "Nastavení UI", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Restart serveru", "menu.linux.label_shutdown_server": "Vypnutí serveru", "menu.linux.label_terminal": "Terminál", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Odhlásit", "menu.tooltip_restart": "Restartovat", "menu.tooltip_user_accounts": "Uživatelský účet", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Opravdu chcete aktualizovat plugin {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} vyžaduje pro běh Node.js ve verzi {{minVersion}} nebo vyšší. Vaše aktuálně běžící verze Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Plugin {{ pluginName }} vyžaduje pro běh Node.js ve verzi {{ minVersion }} nebo vyšší. Vaše aktuálně běžící verze Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Instalováno", "plugins.status_not_installed": "Není instalován", "plugins.status_update_available": "Aktualizace k dispozici", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Nepodařilo se načíst pluginy", "plugins.tooltip_update_plugin_to": "Aktualizovat plugin pro v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Po provedení této akce může být nutné některé příslušenství znovu nakonfigurovat v HomeKit nebo znovu přidat do vašich automatizací.", - "reset.button_reset_homebridge_now": "Resetovat Homebridge nyní", "reset.message_accessory_config_will_not_be_changed": "Zbytek konfigurace se nezmění. Pokud se Homebridge nespustí kvůli špatné konfiguraci, reset ji neopraví.", "reset.message_action_is_irreversible": "Tato akce je nevratná. Před pokračováním prosím pečlivě přečtěte.", "reset.message_all_automations_will_be_reset": "Všechny automatizace budete muset po restartování znovu nastavit.", diff --git a/ui/src/i18n/de.json b/ui/src/i18n/de.json index a67926a02..ebda3bbf4 100644 --- a/ui/src/i18n/de.json +++ b/ui/src/i18n/de.json @@ -80,9 +80,10 @@ "child_bridge.label_bridge_paired": "Gekoppelte Bridge", "child_bridge.label_bridge_restart_child_bridges": "Unter-Bridges neustarten", "child_bridge.label_bridge_settings": "Bridge Einstellungen", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Unter-Bridges", - "child_bridge.label_child_start": "Start child bridge", - "child_bridge.label_child_stop": "Stop child bridge", + "child_bridge.label_child_start": "Starte Unter-Bridges", + "child_bridge.label_child_stop": "Stoppe Unter-Bridges", "child_bridge.message_about": "Homebridge erlaubt es dir, die Plattform oder Geräte deiner Plugins als eine isolierten Unter-Bridge zu betreiben. Das kann die allgemeine Reaktionsfähigkeit und Zuverlässigkeit von Homebridge verbessern.", "child_bridge.message_child_bridges_must_be_paired_separately": "Jede Unter-Bridge Plattform oder Gerät muss separat mit HomeKit gekoppelt werden.", "child_bridge.message_must_configure_plugin_first": "Du musst dieses Plugin konfigurieren, bevor du dessen Bridge Einstellungen verwalten kannst.", @@ -114,8 +115,13 @@ "form.button_cancel": "Abbrechen", "form.button_close": "Schließen", "form.button_delete": "Löschen", + "form.button_disable": "Disable", "form.button_edit": "Bearbeiten", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Speichern", + "form.button_unlock": "Unlock", "login.button_login": "Anmeldung", "login.label_2fa_code": "Zwei-Faktor-Authentifizierungs-Code", "login.label_password": "Passwort", @@ -133,18 +139,21 @@ "menu.docker.label_settings": "Einstellungen", "menu.docker.label_startup_script": "Start-Skript", "menu.docker.label_terminal": "Konsole", - "menu.hbrestart.confirm_button": "Restart Homebridge", - "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", - "menu.hbrestart.title": "Restart Homebridge", + "menu.hbrestart.confirm_button": "Homebridge neustarten", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", + "menu.hbrestart.confirmation": "Bist du sicher, dass du Homebridge neustarten möchtest?", + "menu.hbrestart.title": "Homebridge neustarten", "menu.label_accessories": "Geräte", "menu.label_config": "Konfiguration", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI Einstellungen", "menu.label_status": "Status", - "menu.label_ui_settings": "UI Einstellungen", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Server neustarten", "menu.linux.label_shutdown_server": "Server herunterfahren", "menu.linux.label_terminal": "Konsole", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Ausloggen", "menu.tooltip_restart": "Neustart", "menu.tooltip_user_accounts": "Benutzerkonten", @@ -171,7 +180,7 @@ "platform.linux.shutdown.title_shutting_down_server": "Herunterfahren des Servers", "platform.version.message_service_restart_required": "WARNUNG: Homebridge UI v{{ uiVersion }} wurde installiert, aber der Serverdienst läuft immer noch mit v{{ serverVersion }}.", "platform.version.title_service_restart_required": "Dienst-Neustart erforderlich", - "plugins.button_api_documentation": "API Documentation", + "plugins.button_api_documentation": "API-Dokumentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Installieren", "plugins.button_settings": "Einstellungen", @@ -182,10 +191,10 @@ "plugins.donate.message_learn_more": "Erfahre mehr über Spenden-Links bei Plugins", "plugins.donate.tile_donate_to": "An {{ author }} spenden", "plugins.manage.button_restart_now": "Jetzt neustarten", - "plugins.manage.child_bridge_button_restart_now": "Restart Child Bridges", - "plugins.manage.child_bridge_button_restart_now_one": "Restart Child Bridge", - "plugins.manage.child_bridge_restart_failed": "Plugin restart failed, please restart Homebridge manually.", - "plugins.manage.child_bridge_restart_success": "Plugin restart successful.", + "plugins.manage.child_bridge_button_restart_now": "Unter-Bridges neustarten", + "plugins.manage.child_bridge_button_restart_now_one": "Unter-Bridges neustarten", + "plugins.manage.child_bridge_restart_failed": "Plugin-Neustart fehlgeschlagen, bitte starte Homebridge manuell neu.", + "plugins.manage.child_bridge_restart_success": "Plugin-Neustart erfolgreich.", "plugins.manage.disable": "Deaktivieren", "plugins.manage.enable": "Aktivieren", "plugins.manage.json_config": "JSON Konfiguration", @@ -205,13 +214,14 @@ "plugins.manage.message_select_version_to_install": "Zu installierende Version auswählen", "plugins.manage.message_thanks_for_updating": "Vielen Dank für die Installation der {{ targetVersion }} Version von {{ pluginName }}.", "plugins.manage.message_thanks_for_updating_restart": "Bitte starte Homebridge neu, damit die Änderungen wirksam werden.", - "plugins.manage.message_thanks_for_updating_restart_child_bridges": "Please restart the plugin's child bridges for the changes to apply.", + "plugins.manage.message_thanks_for_updating_restart_child_bridges": "Bitte starte die Unter-Bridge des Plugins neu, damit die Änderungen wirksam werden.", "plugins.manage.message_uninstall_remove_config_required": "Stelle sicher, dass wenn du dieses Plugin dauerhaft entfernst, jede Konfiguration für dieses Plugin in der config.json entfernt hast, bevor du Homebridge neu startest.", "plugins.manage.message_uninstall_remove_confirmation": "Bist du sicher, dass du {{ pluginName }} entfernen möchtest?", "plugins.manage.message_uninstall_remove_plugin_config": "Plugin Konfiguration entfernen?", - "plugins.manage.modal_verified_cta": "More Info", - "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", - "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.modal_verified_cta": "Mehr Informationen", + "plugins.manage.modal_verified_message": "Homebridge-Plugins, die als verifiziert gekennzeichnet sind, wurden vom Homebridge-Projektteam überprüft, um sicherzustellen, dass sie verschiedene Anforderungen erfüllen, die Best Practices und eine problemlose Benutzererfahrung fördern.", + "plugins.manage.modal_verified_title": "Verifizierte Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Bist du sicher, dass du {{ pluginName }} updaten möchtest?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} benötigt Node.js v{{minVersion}} oder neuer. Du nutzt derzeit Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Das {{ pluginName }}-Plugin empfiehlt Node.js v{{ minVersion }} oder neuer. Du nutzt derzeit Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Installiert", "plugins.status_not_installed": "Nicht installiert", "plugins.status_update_available": "Aktualisierung verfügbar", - "plugins.status_update_beta_available": "Beta Update verfügbar", "plugins.toast_failed_to_load_plugins": "Fehler beim Laden der Plugins", "plugins.tooltip_update_plugin_to": "Plugin auf v{{latestVersion}} aktualisieren", "reset.accessories_will_may_need_to_be_reconfigured": "Nachdem diese Aktion durchgeführt wurde, müssen eventuell einige HomeKit-Geräte neu eingerichtet oder neu zur Automation hinzugefühgt werden.", - "reset.button_reset_homebridge_now": "Homebridge zurücksetzen", "reset.message_accessory_config_will_not_be_changed": "Die Konfiguration wird nicht geändert. Wenn Homebridge aufgrund einer fehlerhaften Konfiguration nicht gestartet wird, kann ein Reset das Problem nicht beheben.", "reset.message_action_is_irreversible": "Diese Aktion ist nicht umkehrbar. Bitte prüfe sie sorgfältig, bevor du fortfährst.", "reset.message_all_automations_will_be_reset": "Alle Automatisierungen müssen nach einem Reset neu konfiguriert werden.", @@ -343,14 +351,14 @@ "status.widget.label_temperature_units_system_default": "Systemstandard", "status.widget.label_unlock_layout": "Layout entsperren", "status.widget.systeminfo.label_config_path": "Konfigurationspfad", - "status.widget.systeminfo.label_disabled": "Disabled", + "status.widget.systeminfo.label_disabled": "Deaktiviert", "status.widget.systeminfo.label_docker": "Docker", - "status.widget.systeminfo.label_enabled": "Enabled", - "status.widget.systeminfo.label_glibc_warning": "Version is too low for updating Node.js to newer versions - https://homebridge.io/w/JJSun", + "status.widget.systeminfo.label_enabled": "Aktiviert", + "status.widget.systeminfo.label_glibc_warning": "Version ist für die Aktualisierung von Node.js auf neuere Versionen zu niedrig - https://homebridge.io/w/JJSun", "status.widget.systeminfo.label_hostname": "Hostname", "status.widget.systeminfo.label_ipv4": "IPv4", "status.widget.systeminfo.label_ipv6": "IPv6", - "status.widget.systeminfo.label_no": "No", + "status.widget.systeminfo.label_no": "Nein", "status.widget.systeminfo.label_nodejs_path": "Node.js Path", "status.widget.systeminfo.label_nodejs_version": "Node.js Version", "status.widget.systeminfo.label_os": "OS", @@ -358,15 +366,15 @@ "status.widget.systeminfo.label_service_mode": "Service-Modus", "status.widget.systeminfo.label_service_user": "Benutzer", "status.widget.systeminfo.label_storage_path": "Speicherpfad", - "status.widget.systeminfo.label_synology_package": "Synology Package", + "status.widget.systeminfo.label_synology_package": "Synology-Paket", "status.widget.systeminfo.label_timezone": "Zeitzone", - "status.widget.systeminfo.label_yes": "Yes", - "status.widget.systeminfo.modal_glibc_cta": "More Info", - "status.widget.systeminfo.modal_glibc_message": "This message indicates that your operating system does not support newer versions of Node.js. To resolve this and be able to install updated versions of Node.js in the future, you will need to update your operating system to a more recent version.", + "status.widget.systeminfo.label_yes": "Ja", + "status.widget.systeminfo.modal_glibc_cta": "Mehr Informationen", + "status.widget.systeminfo.modal_glibc_message": "Diese Meldung zeigt an, dass Ihr Betriebssystem keine neueren Versionen von Node.js unterstützt. Um dieses Problem zu beheben und in Zukunft aktualisierte Versionen von Node.js installieren zu können, müssen Sie Ihr Betriebssystem auf eine neuere Version aktualisieren.", "status.widget.systeminfo.modal_glibc_title": "OS Update", - "status.widget.systeminfo.modal_servicemode_cta": "More Info", - "status.widget.systeminfo.modal_servicemode_message": "Standalone mode is no longer recommended. Setting up Homebridge and Homebridge UI with hb-service has the same benefits of standalone mode but is much easier to setup and maintain.", - "status.widget.systeminfo.modal_servicemode_title": "Service Mode", + "status.widget.systeminfo.modal_servicemode_cta": "Mehr Informationen", + "status.widget.systeminfo.modal_servicemode_message": "Der Standalone-Modus wird nicht mehr empfohlen. Die Einrichtung von Homebridge und Homebridge UI mit hb-service bietet dieselben Vorteile wie der Standalone-Modus, ist aber viel einfacher einzurichten und zu warten.", + "status.widget.systeminfo.modal_servicemode_title": "Service-Modus", "status.widget.title_manage_widget": "Widget verwalten", "status.widget.uptime.label_process": "Prozess", "status.widget.uptime.label_server": "Server", diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json index 9f68bea6b..5ab6e20a1 100644 --- a/ui/src/i18n/en.json +++ b/ui/src/i18n/en.json @@ -80,9 +80,10 @@ "child_bridge.label_bridge_paired": "Bridge Paired", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge Settings", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridges", - "child_bridge.label_child_start": "Start child bridge", - "child_bridge.label_child_stop": "Stop child bridge", + "child_bridge.label_child_start": "Start Child Bridges", + "child_bridge.label_child_stop": "Stop Child Bridges", "child_bridge.message_about": "Homebridge allows you to run your plugin's platform or accessory as an isolated child bridge. This can improve the general responsiveness and reliability of Homebridge.", "child_bridge.message_child_bridges_must_be_paired_separately": "Each child bridge platform or accessory will need to be paired with HomeKit separately.", "child_bridge.message_must_configure_plugin_first": "You need to configure this plugin before you can manage its bridge settings.", @@ -114,8 +115,13 @@ "form.button_cancel": "Cancel", "form.button_close": "Close", "form.button_delete": "Delete", + "form.button_disable": "Disable", "form.button_edit": "Edit", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Save", + "form.button_unlock": "Unlock", "login.button_login": "Log in", "login.label_2fa_code": "Two Factor Authentication Code", "login.label_password": "Password", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Startup Script", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Accessories", "menu.label_config": "Config", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI Settings", "menu.label_status": "Status", - "menu.label_ui_settings": "UI Settings", "menu.linux.label_logs": "Logs", - "menu.linux.label_restart_server": "Restart Server", - "menu.linux.label_shutdown_server": "Shutdown Server", + "menu.linux.label_restart_server": "Restart OS", + "menu.linux.label_shutdown_server": "Shutdown OS", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart / Shutdown", "menu.tooltip_logout": "Log out", "menu.tooltip_restart": "Restart Homebridge", "menu.tooltip_user_accounts": "User Accounts", @@ -170,11 +179,11 @@ "platform.linux.shutdown.message_server_will_power_down": "The server will power down shortly.", "platform.linux.shutdown.title_shutting_down_server": "Shutting Down Server", "platform.version.message_service_restart_required": "WARNING: Homebridge UI v{{ uiVersion }} has been installed, but the server service is still running v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Service Restart Required", + "platform.version.title_service_restart_required": "Restart Required", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Install", - "plugins.button_settings": "Settings", + "plugins.button_settings": "Config", "plugins.button_uninstall": "Uninstall", "plugins.button_update": "Update", "plugins.button_upgrade": "Upgrade", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Are you sure you want to update {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} requires Node.js v{{minVersion}} or later. You are currently running Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "The {{ pluginName }} plugin recommends running on Node.js v{{ minVersion }} or later. You are currently running Node.js {{ installedVersion }}.", @@ -229,18 +239,16 @@ "plugins.settings.label_open_config_editor": "Open Config Editor", "plugins.settings.message_consult_documentation": "Please consult the plugin documentation for instructions on how to correctly configure this plugin.", "plugins.settings.message_manual_config_required": "This plugin must be configured manually using the Homebridge UI Config Editor.", - "plugins.settings.title_settings": "Settings", + "plugins.settings.title_settings": "Config", "plugins.settings.toast_plugin_config_saved": "Plugin Config Saved", "plugins.settings.toast_restart_required": "Restart Homebridge to apply the changes.", "plugins.status_disabled": "Disabled", "plugins.status_installed": "Installed", "plugins.status_not_installed": "Not Installed", "plugins.status_update_available": "Update Available", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Failed to load plugins", "plugins.tooltip_update_plugin_to": "Update plugin to v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.", - "reset.button_reset_homebridge_now": "Reset Homebridge Now", "reset.message_accessory_config_will_not_be_changed": "The rest of your config will not be changed. If Homebridge is not starting due to a bad config a reset will not fix it.", "reset.message_action_is_irreversible": "This action is irreversible. Please read carefully before proceeding.", "reset.message_all_automations_will_be_reset": "All automations and will need to be reconfigured after a reset.", @@ -267,7 +275,7 @@ "reset.toast_removing_cached_accessory_please_wait": "Removing accessory from cache, please wait…", "restart.label_restart_command_executed": "Restart Command Executed", "restart.message_homebridge_service_ready": "Homebridge Ready", - "restart.message_homebridge_ui_online": "Homebridge UI Online", + "restart.message_homebridge_ui_online": "HB Service & UI Ready", "restart.message_please_wait_while_server_restarts": "Please wait, this page will automatically redirect when Homebridge is back online.", "restart.message_server_is_taking_long_time_to_restart": "Homebridge restart is taking a long time. You may need to bring up the Homebridge service manually.", "restart.title_restart": "Restarting Homebridge", @@ -403,6 +411,6 @@ "users.toast_added_new_user": "Added New User", "users.toast_failed_to_add_user": "Failed to Add User", "users.toast_failed_to_delete_user": "Failed to Delete user", - "users.toast_updated_user": "Updated User", + "users.toast_updated_user": "User Updated", "users.toast_user_deleted": "User Deleted" } diff --git a/ui/src/i18n/es.json b/ui/src/i18n/es.json index a6a6dbc13..131bf2c3a 100644 --- a/ui/src/i18n/es.json +++ b/ui/src/i18n/es.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Puente emparejado", "child_bridge.label_bridge_restart_child_bridges": "Reiniciar Puentes Hijos", "child_bridge.label_bridge_settings": "Ajustes de Puente", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Puentes Hijo", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Cancelar", "form.button_close": "Cerrar", "form.button_delete": "Eliminar", + "form.button_disable": "Disable", "form.button_edit": "Editar", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Guardar", + "form.button_unlock": "Unlock", "login.button_login": "Iniciar sesión", "login.label_2fa_code": "Código de autenticación de dos factores", "login.label_password": "Contraseña", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Script de inicio", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Accesorios", "menu.label_config": "Configuración", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Ajustes de Interfaz", "menu.label_status": "Estado", - "menu.label_ui_settings": "Ajustes de Interfaz", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Reiniciar Servidor", "menu.linux.label_shutdown_server": "Apagar Servidor", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Cerrar Sesión", "menu.tooltip_restart": "Reiniciar", "menu.tooltip_user_accounts": "Cuentas de Usuario", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "El servidor se apagará pronto.", "platform.linux.shutdown.title_shutting_down_server": "Apagando el servidor", "platform.version.message_service_restart_required": "ADVERTENCIA: Homebridge UI v{{ uiVersion }} ha sido instalado, pero el servicio aún sigue ejecutando la v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Reinicio de Servicio Requerido", + "platform.version.title_service_restart_required": "Reinicio Requerido", "plugins.button_api_documentation": "Documentación de la API", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Instalar", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "¿Estás seguro que deseas actualizar {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} requiere Node.js v{{minVersion}} o superior. Actualmente estás ejecutando Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "El plugin {{ pluginName }} recomienda ejecutarse en Node.js v{{ minVersion }} o superior. Actualmente estás ejecutando Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Instalado", "plugins.status_not_installed": "No instalado", "plugins.status_update_available": "Actualización disponible", - "plugins.status_update_beta_available": "Actualización beta disponible", "plugins.toast_failed_to_load_plugins": "Error al cargar los plugins", "plugins.tooltip_update_plugin_to": "Actualizar plugin a la versión {{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Después de realizar esta acción, puede que sea necesario configurar de nuevo algunos accesorios en HomeKit o volver a añadirlos a sus automatizaciones.", - "reset.button_reset_homebridge_now": "Reiniciar Homebrige ahora", "reset.message_accessory_config_will_not_be_changed": "El resto de tu configuración no sufrirá cambios. Si Homebridge no inicia debido a una mala configuración, un reinicio no bastará para repararlo.", "reset.message_action_is_irreversible": "Esta acción es irreversible. Por favor, lee con precaución antes de continuar.", "reset.message_all_automations_will_be_reset": "Todas las automatizaciones necesitarán ser configuradas de nuevo después de reinicio.", diff --git a/ui/src/i18n/fr.json b/ui/src/i18n/fr.json index b79e53389..f460f5105 100644 --- a/ui/src/i18n/fr.json +++ b/ui/src/i18n/fr.json @@ -80,10 +80,11 @@ "child_bridge.label_bridge_paired": "Pont appairé", "child_bridge.label_bridge_restart_child_bridges": "Redémarrer les Ponts secondaires", "child_bridge.label_bridge_settings": "Réglages du Pont", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Ponts secondaires", - "child_bridge.label_child_start": "Start child bridge", - "child_bridge.label_child_stop": "Stop child bridge", - "child_bridge.message_about": "Homebridge vous permet de faire tourner chaque plugin ou accessoire comme un Pont secondaire isolé. Cela peut améliorer la réactivité générale et la fiabilité d'Homebridge.", + "child_bridge.label_child_start": "Démarrer Pont secondaire", + "child_bridge.label_child_stop": "Arrêter Pont secondaire", + "child_bridge.message_about": "Homebridge vous permet de faire fonctionner la plateforme ou l'accessoire géré par votre plugin en tant que pont secondaire isolé. Cela peut améliorer la réactivité et la fiabilité générale d'Homebridge.", "child_bridge.message_child_bridges_must_be_paired_separately": "Chaque plateforme ou accessoire d'un Pont secondaire devra être appairé avec Homebridge de manière séparée.", "child_bridge.message_must_configure_plugin_first": "Vous devez configurer ce plugin avant de pouvoir modifier les réglages de son Pont.", "child_bridge.message_restart_homebridge": "Redémarrer Homebridge pour appliquer les modifications de réglage de ce Pont secondaire.", @@ -114,8 +115,13 @@ "form.button_cancel": "Annuler", "form.button_close": "Fermer", "form.button_delete": "Supprimer", + "form.button_disable": "Désactiver", "form.button_edit": "Modifier", + "form.button_enable": "Activer", + "form.button_lock": "Verrouiller", + "form.button_reset": "Reset", "form.button_save": "Enregistrer", + "form.button_unlock": "Déverrouiller", "login.button_login": "Connexion", "login.label_2fa_code": "Code d'authentification à deux facteurs", "login.label_password": "Mot de passe", @@ -133,23 +139,26 @@ "menu.docker.label_settings": "Réglages", "menu.docker.label_startup_script": "Script de démarrage", "menu.docker.label_terminal": "Terminal", - "menu.hbrestart.confirm_button": "Restart Homebridge", - "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", - "menu.hbrestart.title": "Restart Homebridge", + "menu.hbrestart.confirm_button": "Redémarrer Homebridge", + "menu.hbrestart.confirm_service_button": "Redémarrer HB Service et l'interface utilisateur", + "menu.hbrestart.confirmation": "Etes-vous sûr de vouloir redémarrer Homebridge?", + "menu.hbrestart.title": "Redémarrer Homebridge", "menu.label_accessories": "Accessoires", "menu.label_config": "Config", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Réglages d'Homebridge", + "menu.label_settings_ui": "Réglages de l'interface", "menu.label_status": "Statut", - "menu.label_ui_settings": "Réglages de l'interface", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Redémarrer le Serveur", "menu.linux.label_shutdown_server": "Éteindre le Serveur", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Déconnexion", "menu.tooltip_restart": "Redémarrer", "menu.tooltip_user_accounts": "Comptes utilisateurs", "menu.tooltip_view_logs": "Voir les Logs", - "platform.docker.restart_container.message_run_with_restart_always": "Vérifier d'avoir lancé le container Docker avec --restart=always", + "platform.docker.restart_container.message_run_with_restart_always": "Vérifiez d'avoir lancé le container Docker avec --restart=always", "platform.docker.restart_container.message_server_taking_long_time_to_restart": "Le redémarrage du serveur met beaucoup de temps. Vous aurez peut-être besoin de démarrer le container Docker manuellement.", "platform.docker.restart_container.title_restarting": "Redémarrage du container Docker", "platform.docker.restart_container.toast_container_restarted": "Container Docker redémarré", @@ -171,21 +180,21 @@ "platform.linux.shutdown.title_shutting_down_server": "Arrêt du serveur", "platform.version.message_service_restart_required": "ATTENTION: Homebridge UI v{{ uiVersion }} a été installé, mais le service installé sur le serveur tourne toujours en v{{ serverVersion }}.", "platform.version.title_service_restart_required": "Le redémarrage du service est requis", - "plugins.button_api_documentation": "API Documentation", - "plugins.button_homepage": "Plugin Homepage", + "plugins.button_api_documentation": "Documentation de l'API", + "plugins.button_homepage": "Site du Plugin", "plugins.button_install": "Installer", "plugins.button_settings": "Réglages", "plugins.button_uninstall": "Désinstaller", "plugins.button_update": "Mettre à jour", "plugins.button_upgrade": "Mettre à niveau", "plugins.donate.button_donate": "Faire un don", - "plugins.donate.message_learn_more": "Informations à propos des dons pour les plugins", + "plugins.donate.message_learn_more": "En savoir plus sur les liens de don pour les plugins", "plugins.donate.tile_donate_to": "Faire un don à {{ author }}", "plugins.manage.button_restart_now": "Redémarrer Homebridge", - "plugins.manage.child_bridge_button_restart_now": "Restart Child Bridges", - "plugins.manage.child_bridge_button_restart_now_one": "Restart Child Bridge", - "plugins.manage.child_bridge_restart_failed": "Plugin restart failed, please restart Homebridge manually.", - "plugins.manage.child_bridge_restart_success": "Plugin restart successful.", + "plugins.manage.child_bridge_button_restart_now": "Redémarrer les Ponts Secondaires", + "plugins.manage.child_bridge_button_restart_now_one": "Redémarrer le Pont Secondaire", + "plugins.manage.child_bridge_restart_failed": "Le redémarrage du Plugin a échoué, redémarrez Homebridge manuellement.", + "plugins.manage.child_bridge_restart_success": "Redémarrage du Plugin effectué avec succès.", "plugins.manage.disable": "Désactiver", "plugins.manage.enable": "Activer", "plugins.manage.json_config": "Config JSON", @@ -204,14 +213,15 @@ "plugins.manage.message_install_alternate_version": "Installer une autre Version", "plugins.manage.message_select_version_to_install": "Sélectionner la version à installer", "plugins.manage.message_thanks_for_updating": "Merci d'avoir installé la dernière version d'{{ pluginName }}.", - "plugins.manage.message_thanks_for_updating_restart": "Please restart Homebridge for the changes to apply.", - "plugins.manage.message_thanks_for_updating_restart_child_bridges": "Please restart the plugin's child bridges for the changes to apply.", + "plugins.manage.message_thanks_for_updating_restart": "Redémarrez Homebridge pour appliquer les changements effectués.", + "plugins.manage.message_thanks_for_updating_restart_child_bridges": "Redémarrez les Ponts secondaires des plugins pour appliquer les changements effectués.", "plugins.manage.message_uninstall_remove_config_required": "Si vous désinstallez de manière permanente ce plugin, prenez gare à supprimer toute configuration liée à ce plugin dans config.json avant de redémarrer Homebridge.", "plugins.manage.message_uninstall_remove_confirmation": "Etes-vous sûr de vouloir désinstaller {{ pluginName }} ?", "plugins.manage.message_uninstall_remove_plugin_config": "Supprimer la configuration du Plugin ?", - "plugins.manage.modal_verified_cta": "More Info", - "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", - "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.modal_verified_cta": "Plus d'informations", + "plugins.manage.modal_verified_message": "Les Plugins d'Homebridge indiqués comme vérifiés ont fait l'objet d'une vérification par l'équipe du projet Homebridge afin de s'assurer qu'ils remplissaient différentes exigences encourageant les bonnes pratiques et une expérience utilisateur optimale.", + "plugins.manage.modal_verified_title": "Plugins vérifiés", + "plugins.manage.plugin_logs": "Voir les logs du Plugin", "plugins.node_update.are_you_sure_you_want_to_update": "Etes-vous sûr de vouloir mettre à jour {{ pluginName }} ?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} nécessite Node.js v{{minVersion}} ou ultérieur. La version actuellement installée est Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Le plugin {{ pluginName }} recommande l'utilisation de Node.js v{{ minVersion }} ou ultérieur. La version actuellement installée est Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Installé", "plugins.status_not_installed": "Non installé", "plugins.status_update_available": "Mise à jour disponible", - "plugins.status_update_beta_available": "Mise à jour version Bêta disponible", "plugins.toast_failed_to_load_plugins": "Erreur de chargement des plugins", "plugins.tooltip_update_plugin_to": "Mettre à jour le plugin vers v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Après la réalisation de cette action, certains accessoires devront peut-être être reconfigurés dans HomeKit ou de nouveau ajoutés à vos Automatisations.", - "reset.button_reset_homebridge_now": "Réinitialiser Homebridge maintenant", "reset.message_accessory_config_will_not_be_changed": "Le reste de votre configuration ne sera pas modifié. Si Homebridge ne démarre pas à cause d'une mauvaise configuration, une réinitialisation ne réglera pas le problème.", "reset.message_action_is_irreversible": "Cette action est irréversible. Merci de lire avec attention avant de continuer.", "reset.message_all_automations_will_be_reset": "Toutes les automatisations devront être reconfigurées après une réinitialisation.", @@ -308,7 +316,7 @@ "status.memory.label_available": "Disponible", "status.memory.label_total": "Totale", "status.memory.title_memory": "Mémoire", - "status.message_code_scan_instructions": "Numériser pour ajouter à HomeKit.", + "status.message_code_scan_instructions": "Scannez pour ajouter à HomeKit.", "status.network.label_received_per_second": "Reçu", "status.network.label_sent_per_second": "Envoyé", "status.network.title_network": "Activité Réseau", @@ -343,15 +351,15 @@ "status.widget.label_temperature_units_system_default": "Unité par défaut du Système", "status.widget.label_unlock_layout": "Déverrouiller la Mise en page", "status.widget.systeminfo.label_config_path": "Répertoire de la Config", - "status.widget.systeminfo.label_disabled": "Disabled", + "status.widget.systeminfo.label_disabled": "Désactivé", "status.widget.systeminfo.label_docker": "Docker", - "status.widget.systeminfo.label_enabled": "Enabled", - "status.widget.systeminfo.label_glibc_warning": "Version is too low for updating Node.js to newer versions - https://homebridge.io/w/JJSun", + "status.widget.systeminfo.label_enabled": "Activé", + "status.widget.systeminfo.label_glibc_warning": "La version est trop ancienne pour mettre à jour Node.js à une version plus récente - https://homebridge.io/w/JJSun", "status.widget.systeminfo.label_hostname": "Hostname", "status.widget.systeminfo.label_ipv4": "IPv4", "status.widget.systeminfo.label_ipv6": "IPv6", - "status.widget.systeminfo.label_no": "No", - "status.widget.systeminfo.label_nodejs_path": "Node.js Path", + "status.widget.systeminfo.label_no": "Non", + "status.widget.systeminfo.label_nodejs_path": "Répertoire de Node.js", "status.widget.systeminfo.label_nodejs_version": "Version de Node.js", "status.widget.systeminfo.label_os": "OS", "status.widget.systeminfo.label_plugin_path": "Répertoire des plugins", @@ -360,12 +368,12 @@ "status.widget.systeminfo.label_storage_path": "Répertoire de stockage", "status.widget.systeminfo.label_synology_package": "Paquet Synology", "status.widget.systeminfo.label_timezone": "Fuseau Horaire", - "status.widget.systeminfo.label_yes": "Yes", - "status.widget.systeminfo.modal_glibc_cta": "More Info", - "status.widget.systeminfo.modal_glibc_message": "This message indicates that your operating system does not support newer versions of Node.js. To resolve this and be able to install updated versions of Node.js in the future, you will need to update your operating system to a more recent version.", - "status.widget.systeminfo.modal_glibc_title": "OS Update", - "status.widget.systeminfo.modal_servicemode_cta": "More Info", - "status.widget.systeminfo.modal_servicemode_message": "Standalone mode is no longer recommended. Setting up Homebridge and Homebridge UI with hb-service has the same benefits of standalone mode but is much easier to setup and maintain.", + "status.widget.systeminfo.label_yes": "Oui", + "status.widget.systeminfo.modal_glibc_cta": "Plus d'informations", + "status.widget.systeminfo.modal_glibc_message": "Ce message indique que votre système d'exploitation ne supporte pas les versions récentes de Node.js. Pour résoudre cela et pouvoir installer des versions plus récentes de Node.js dans le futur, vous devrez mettre à jour votre système d'exploitation pour une versions plus récente.", + "status.widget.systeminfo.modal_glibc_title": "Mise à jour de l'OS", + "status.widget.systeminfo.modal_servicemode_cta": "Plus d'informations", + "status.widget.systeminfo.modal_servicemode_message": "Le mode Standalone n'est plus recommandé. La configuration de Homebridge et de Homebridge UI avec hb-service présente les mêmes avantages que le mode Standalone mais est beaucoup plus facile à mettre en place et à maintenir.", "status.widget.systeminfo.modal_servicemode_title": "Service Mode", "status.widget.title_manage_widget": "Gérer le Widget", "status.widget.uptime.label_process": "Process", diff --git a/ui/src/i18n/he.json b/ui/src/i18n/he.json index 675bd583e..af5912660 100644 --- a/ui/src/i18n/he.json +++ b/ui/src/i18n/he.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "מגשר מחובר", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "הגדרות מגשר", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "מגשר ילד", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "בטל", "form.button_close": "סגור", "form.button_delete": "מחק", + "form.button_disable": "Disable", "form.button_edit": "ערוך", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "שמור", + "form.button_unlock": "Unlock", "login.button_login": "התחבר", "login.label_2fa_code": "קוד גישה דו שלבית", "login.label_password": "סיסמא", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Startup Script", "menu.docker.label_terminal": "קונסולה", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "אביזרים", "menu.label_config": "קונפיגורציה", "menu.label_plugins": "תוספים", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "הגדרות ממשק משתמש", "menu.label_status": "סטאטוס", - "menu.label_ui_settings": "הגדרות ממשק משתמש", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "אתחל מחדש שרת", "menu.linux.label_shutdown_server": "כבה שרת", "menu.linux.label_terminal": "קונסולה", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "התנתק", "menu.tooltip_restart": "התחל מחדש", "menu.tooltip_user_accounts": "משתמשים", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "האם אתה בטוח שברצונך לעדכן את {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} requires Node.js v{{minVersion}} or later. You are currently running Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "The {{ pluginName }} plugin recommends running on Node.js v{{ minVersion }} or later. You are currently running Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "מותקן", "plugins.status_not_installed": "לא מותקן", "plugins.status_update_available": "עדכון זמין", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "כשל בהעלאת התוספים", "plugins.tooltip_update_plugin_to": "תוסף עודכן לגרסא v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.", - "reset.button_reset_homebridge_now": "רסט את הומברידג' עכשיו", "reset.message_accessory_config_will_not_be_changed": "The rest of your config will not be changed. If Homebridge is not starting due to a bad config a reset will not fix it.", "reset.message_action_is_irreversible": "פעולה זו לא ניתנת לביטול, נא קרא בזהירות לפני שתמשיך", "reset.message_all_automations_will_be_reset": "All automations and will need to be reconfigured after a reset.", diff --git a/ui/src/i18n/hu.json b/ui/src/i18n/hu.json index 8b829f666..4cf81cd32 100644 --- a/ui/src/i18n/hu.json +++ b/ui/src/i18n/hu.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge Paired", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge Settings", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Mégse", "form.button_close": "Bezár", "form.button_delete": "Törlés", + "form.button_disable": "Disable", "form.button_edit": "Szerkesztés", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Mentés", + "form.button_unlock": "Unlock", "login.button_login": "Bejelentkezés", "login.label_2fa_code": "Two Factor Authentication Code", "login.label_password": "Jelszó", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Startup Script", "menu.docker.label_terminal": "Terminál", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Kiegészítők", "menu.label_config": "Konfigurációk", "menu.label_plugins": "Pluginek", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI Settings", "menu.label_status": "Státusz", - "menu.label_ui_settings": "UI Settings", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Szerver újraindítása", "menu.linux.label_shutdown_server": "Szerver leállítása", "menu.linux.label_terminal": "Terminál", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Kijelentkezés", "menu.tooltip_restart": "Újraindítás", "menu.tooltip_user_accounts": "Felhasználói fiókok", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "A szerver hamarosan leáll.", "platform.linux.shutdown.title_shutting_down_server": "Szerver leállítása", "platform.version.message_service_restart_required": "WARNING: Homebridge UI v{{ uiVersion }} has been installed, but the server service is still running v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Service Restart Required", + "platform.version.title_service_restart_required": "Restart Required", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Telepítés", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Are you sure you want to update {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} requires Node.js v{{minVersion}} or later. You are currently running Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "The {{ pluginName }} plugin recommends running on Node.js v{{ minVersion }} or later. You are currently running Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Telepítve", "plugins.status_not_installed": "Nincs telepítve", "plugins.status_update_available": "Új frissítés érhető el", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Nem sikerült betölteni a plugineket", "plugins.tooltip_update_plugin_to": "Frissítés a v{{latestVersion}} verzióra", "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.", - "reset.button_reset_homebridge_now": "Homebridge resetelése most", "reset.message_accessory_config_will_not_be_changed": "A beállítások nagy része nem lesz változtatva. Ha a Homebridge nem indul el a rossz beállítások miatt, azt a reset nem oldja meg.", "reset.message_action_is_irreversible": "Ez a mávelet visszavonhatatlan. Figyelmesen olvassa el, mielőtt megtenné.", "reset.message_all_automations_will_be_reset": "Minden automatizálást újra kell konfigurálni a reset után.", diff --git a/ui/src/i18n/id.json b/ui/src/i18n/id.json index cef88893b..559350ed3 100644 --- a/ui/src/i18n/id.json +++ b/ui/src/i18n/id.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge Terpasang", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Pengaturan Bridge", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Anak Bridge", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Batal", "form.button_close": "Tutup", "form.button_delete": "Hapus", + "form.button_disable": "Disable", "form.button_edit": "Ubah", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Simpan", + "form.button_unlock": "Unlock", "login.button_login": "Masuk", "login.label_2fa_code": "Kode Otentikasi Dua Faktor (2FA)", "login.label_password": "Kata Sandi", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Skrip Startup", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Aksesoris", "menu.label_config": "Konfigurasi", "menu.label_plugins": "Plugin", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Pengaturan UI", "menu.label_status": "Status", - "menu.label_ui_settings": "Pengaturan UI", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Mengulang Kembali Server", "menu.linux.label_shutdown_server": "Mematikan Server", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Keluar", "menu.tooltip_restart": "Mengulang Kembali", "menu.tooltip_user_accounts": "Akun Pengguna", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Anda yakin ingin memperbarui {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} membutuhkan Node.js v{{minVersion}} atau lebih baru. Saat ini anda menjalankan Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Plugin {{ pluginName }} merekomendasikan Node.js v{{ minVersion }} atau lebih baru. Saat ini anda menjalankan Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Terpasang", "plugins.status_not_installed": "Tidak Terpasang", "plugins.status_update_available": "Pembaruan Tersedia", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Gagal memuat plugin", "plugins.tooltip_update_plugin_to": "Perbarui plugin ke v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Setelah melakukan tindakan ini, beberapa aksesoris mungkin perlu dikonfigurasi ulang di HomeKit atau ditambahkan kembali ke otomasi anda.", - "reset.button_reset_homebridge_now": "Atur Ulang Homebridge Sekarang", "reset.message_accessory_config_will_not_be_changed": "Konfigurasi anda yang lain tidak akan diubah. Jika Homebridge tidak berjalan karena konfigurasi yang buruk, atur ulang tidak akan memperbaikinya.", "reset.message_action_is_irreversible": "Tindakan ini tidak dapat dipulihkan. Harap baca dengan seksama sebelum melanjutkan.", "reset.message_all_automations_will_be_reset": "Semua otomatisasi perlu dikonfigurasi ulang setelah diatur ulang.", diff --git a/ui/src/i18n/it.json b/ui/src/i18n/it.json index 3b5b6c788..6a45fcc37 100644 --- a/ui/src/i18n/it.json +++ b/ui/src/i18n/it.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge abbinato", "child_bridge.label_bridge_restart_child_bridges": "Riavvia bridge figlio", "child_bridge.label_bridge_settings": "Impostazioni del bridge", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Bridge figlio", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Cancella", "form.button_close": "Chiudi", "form.button_delete": "Cancella", + "form.button_disable": "Disable", "form.button_edit": "Modifica", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Salva", + "form.button_unlock": "Unlock", "login.button_login": "Accedi", "login.label_2fa_code": "Codice di autenticazione a 2 fattori", "login.label_password": "Password", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Avvia script", "menu.docker.label_terminal": "Terminale", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Accessori", "menu.label_config": "Configurazione", "menu.label_plugins": "Plugin", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Impostazioni UI", "menu.label_status": "Stato", - "menu.label_ui_settings": "Impostazioni UI", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Riavvia sistema", "menu.linux.label_shutdown_server": "Arresta sistema", "menu.linux.label_terminal": "Terminale", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Scollegati", "menu.tooltip_restart": "Riavvia", "menu.tooltip_user_accounts": "Account utente", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Sei sicuro di voler aggiornare {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} richiede Node.js v{{minVersion}} o successivo. Stai attualmente eseguendo Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Il plugin {{ pluginName }} raccomanda l'esecuzione su Node.js v{{ minVersion }} o successivo. Stai attualmente eseguendo Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Installato", "plugins.status_not_installed": "Non installato", "plugins.status_update_available": "Aggiornamento disponibile", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Impossibile caricare i plugin", "plugins.tooltip_update_plugin_to": "Aggiorna plugin alla versione v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Dopo l'esecuzione di questa operazione potrebbe essere necessario riconfigurare alcuni degli accessori in HomeKit o riaggiungerli alle automazioni.", - "reset.button_reset_homebridge_now": "Reimposta Homebridge ora", "reset.message_accessory_config_will_not_be_changed": "Il resto della tua configurazione non verrà modificato. Se Homebridge non si avvia a causa di una configurazione errata, il ripristino non lo risolverà.", "reset.message_action_is_irreversible": "Questa azione è irreversibile. Si prega di leggere attentamente prima di procedere.", "reset.message_all_automations_will_be_reset": "Tutte le automazioni dovranno essere riconfigurate dopo un ripristino.", diff --git a/ui/src/i18n/ja.json b/ui/src/i18n/ja.json index f837d56bd..2eede8d6c 100644 --- a/ui/src/i18n/ja.json +++ b/ui/src/i18n/ja.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge Paired", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge Settings", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "キャンセル", "form.button_close": "閉じる", "form.button_delete": "削除", + "form.button_disable": "Disable", "form.button_edit": "編集", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "保存", + "form.button_unlock": "Unlock", "login.button_login": "ログイン", "login.label_2fa_code": "二段階認証コード", "login.label_password": "パスワード", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "起動スクリプト", "menu.docker.label_terminal": "ターミナル", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "アクセサリ", "menu.label_config": "コンフィグ", "menu.label_plugins": "プラグイン", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI設定", "menu.label_status": "状態", - "menu.label_ui_settings": "UI設定", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "サーバーを再起動", "menu.linux.label_shutdown_server": "サーバーを終了", "menu.linux.label_terminal": "ターミナル", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "ログアウト", "menu.tooltip_restart": "再起動", "menu.tooltip_user_accounts": "ユーザーアカウント", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "サーバーはまもなく停止します", "platform.linux.shutdown.title_shutting_down_server": "サーバーを終了しています", "platform.version.message_service_restart_required": "警告:Homebridge UI v{{ uiVersion }} がインストールされましたが、, サーバーサービスは依然として v{{ serverVersion }} を実行しています。", - "platform.version.title_service_restart_required": "Service Restart Required", + "platform.version.title_service_restart_required": "Restart Required", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "インストール", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "本当にプラグイン {{ pluginName }} を更新しますか？", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} の稼働にはNode.js v{{minVersion}} 以降が必要です。現在、Node.js {{ installedVersion }} を実行しています。", "plugins.node_update.node_version_too_low": "プラグイン {{ pluginName }} Node.js v{{ minVersion }} 以降での稼働を推奨しています。現在、Node.js {{ installedVersion }} を実行しています。", @@ -236,11 +246,9 @@ "plugins.status_installed": "インストール済", "plugins.status_not_installed": "未インストール", "plugins.status_update_available": "更新が利用可能です", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "プラグインの読み込みに失敗しました", "plugins.tooltip_update_plugin_to": "プラグインをv{{latestVersion}}に更新", "reset.accessories_will_may_need_to_be_reconfigured": "この操作を実行すると、一部のアクセサリをHomeKitで再設定するか、自動化機能に再追加する必要がある可能性があります。", - "reset.button_reset_homebridge_now": "今すぐHomebridgeを初期化", "reset.message_accessory_config_will_not_be_changed": "その他の設定は変更されません。 Homebridgeが不適切なコンフィグが原因で起動していない場合、初期化しても修正されません。", "reset.message_action_is_irreversible": "この操作は元に戻せません。決定する前によくお読みください。", "reset.message_all_automations_will_be_reset": "すべてのオートメーションはリセット後に再設定する必要があります", diff --git a/ui/src/i18n/ko.json b/ui/src/i18n/ko.json index da31ab26e..9be13bc8b 100644 --- a/ui/src/i18n/ko.json +++ b/ui/src/i18n/ko.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge 연결됨", "child_bridge.label_bridge_restart_child_bridges": "하위 Bridge 다시 시작", "child_bridge.label_bridge_settings": "Bridge 설정", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "하위 Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "취소", "form.button_close": "닫기", "form.button_delete": "삭제", + "form.button_disable": "Disable", "form.button_edit": "수정", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "저장", + "form.button_unlock": "Unlock", "login.button_login": "로그인", "login.label_2fa_code": "2차 인증 코드", "login.label_password": "비밀번호", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "시작 스크립트", "menu.docker.label_terminal": "터미널", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "액세서리", "menu.label_config": "구성", "menu.label_plugins": "플러그인", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI 설정", "menu.label_status": "상태", - "menu.label_ui_settings": "UI 설정", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "서버 재시작", "menu.linux.label_shutdown_server": "서버 종료", "menu.linux.label_terminal": "터미널", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "로그아웃", "menu.tooltip_restart": "재시작", "menu.tooltip_user_accounts": "사용자 계정", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "{{ pluginName }} 플러그인을 업데이트하시겠습니까?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} 실행을 위해서는 Node.js v{{minVersion}} 이상이 필요합니다. 현재 실행 중인 Node.js 버전은 {{ installedVersion }} 입니다.", "plugins.node_update.node_version_too_low": "{{ pluginName }} 플러그인은 Node.js v{{ minVersion }} 이상 버전에서 실행이 권장됩니다. 현재 실행 중인 Node.js 버전은 {{ installedVersion }} 입니다.", @@ -236,11 +246,9 @@ "plugins.status_installed": "설치됨", "plugins.status_not_installed": "설치 안됨", "plugins.status_update_available": "업데이트 가능", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "플러그인 로드 실패", "plugins.tooltip_update_plugin_to": "플러그인을 v{{latestVersion}}로 업데이트", "reset.accessories_will_may_need_to_be_reconfigured": "이 작업을 진행한 후에는 HomeKit에서 일부 액세서리를 재구성해야 할 수 있으며, 자동화 작업들을 다시 추가해야할 수 있습니다.", - "reset.button_reset_homebridge_now": "지금 Homebridge 초기화", "reset.message_accessory_config_will_not_be_changed": "나머지 Config 정보는 변경되지 않습니다. 초기화 작업은 잘못된 Config 구성으로 Homebridge가 시작되지 않는 문제를 해결해주지 않습니다.", "reset.message_action_is_irreversible": "이 작업을 진행하면 되돌릴 수 없습니다. 진행하기 전에 주의깊게 읽어보세요.", "reset.message_all_automations_will_be_reset": "초기화 후에는 모든 자동화의 재구성이 필요합니다.", diff --git a/ui/src/i18n/mk.json b/ui/src/i18n/mk.json index 2ffdc6c14..fba204fd8 100644 --- a/ui/src/i18n/mk.json +++ b/ui/src/i18n/mk.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge Paired", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge Settings", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Откажи", "form.button_close": "Затвори", "form.button_delete": "Избриши", + "form.button_disable": "Disable", "form.button_edit": "Измени", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Зачувај", + "form.button_unlock": "Unlock", "login.button_login": "Најави се", "login.label_2fa_code": "Two-Factor автентикациски код", "login.label_password": "Лозинка", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Стартап скрипта", "menu.docker.label_terminal": "Терминал", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Уреди", "menu.label_config": "Конфигурација", "menu.label_plugins": "Плагини", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Поставки на кориснички интерфејс", "menu.label_status": "Статус", - "menu.label_ui_settings": "Поставки на кориснички интерфејс", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Рестартирај сервер", "menu.linux.label_shutdown_server": "Исклучи сервер", "menu.linux.label_terminal": "Терминал", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Одјави се", "menu.tooltip_restart": "Рестартирај", "menu.tooltip_user_accounts": "Корисничка сметка", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Дали сте сигурни дека сакате да го ажурирате {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Node.js v{{minVersion}} или понов e потребен за Homebridge v{{latestVersion}}. Моментално имате Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Плагинот {{ pluginName }} препорачува да се извршува на Node.js v{{ minVersion }} или понов. Моментално имате Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Инсталиран", "plugins.status_not_installed": "Не е инсталиран", "plugins.status_update_available": "Ажурирање достапно", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Грешка при вчитување плагини.", "plugins.tooltip_update_plugin_to": "Ажурирај го плагинот на v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "По извршување на оваа акција, некои уреди можно е да треба да бидат повторно конфигурирано во HomeKit или да се додадат во вашите автоматизации.", - "reset.button_reset_homebridge_now": "Ресетирај го Homebridge", "reset.message_accessory_config_will_not_be_changed": "Остатокот од Вашата конфигурација нема да биде изменет. Ако Homebridge не може да се стартува поради погрешна конфигурација ресетирањето нема да го поправи проблемот.", "reset.message_action_is_irreversible": "Оваа акција е неповратна. Ве молиме внимателно прочитајте пред да продолжите.", "reset.message_all_automations_will_be_reset": "All automations and will need to be reconfigured after a reset.", diff --git a/ui/src/i18n/nl.json b/ui/src/i18n/nl.json index 279bc6a63..96208a8f8 100644 --- a/ui/src/i18n/nl.json +++ b/ui/src/i18n/nl.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge gekoppeld", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge Instellingen", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Annuleren", "form.button_close": "Sluiten", "form.button_delete": "Verwijderen", + "form.button_disable": "Disable", "form.button_edit": "Bewerken", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Opslaan", + "form.button_unlock": "Unlock", "login.button_login": "Inloggen", "login.label_2fa_code": "Twee Factor Authenticatie Code", "login.label_password": "Wachtwoord", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Opstart Script", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Accessoires", "menu.label_config": "Config", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI Instellingen", "menu.label_status": "Status", - "menu.label_ui_settings": "UI Instellingen", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Herstart Server", "menu.linux.label_shutdown_server": "Server Stoppen", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Uitloggen", "menu.tooltip_restart": "Herstart", "menu.tooltip_user_accounts": "Gebruikers Accounts", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "De server zal binnenkort worden uitgeschakeld.", "platform.linux.shutdown.title_shutting_down_server": "Server Afsluiten", "platform.version.message_service_restart_required": "WAARSCHUWING: Homebridge UI v{{ uiVersion }} is geïnstalleerd, maar de server service versie is v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Service herstart vereist", + "platform.version.title_service_restart_required": "Herstart vereist", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Installeer", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Weet je zeker dat je {{ pluginName }} wilt updaten?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} vereist Node.js v{{minVersion}} of nieuwer. Je draait momenteel Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "De {{ pluginName }} plugin adviseert het gebruik van Node.js v{{ minVersion }} of nieuwer. Je draait momenteel Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Geïnstalleerd", "plugins.status_not_installed": "Niet Geïnstalleerd", "plugins.status_update_available": "Update Beschikbaar", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Laden van plug-ins mislukt", "plugins.tooltip_update_plugin_to": "Update plugin naar v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Na het uitvoeren van deze actie kan het zijn dat voor sommmige accessoires de configuratie in HomeKit moet worden aangepast of opnieuw moet worden toegevoegd aan je automatiseringen.", - "reset.button_reset_homebridge_now": "Reset Homebridge Nu", "reset.message_accessory_config_will_not_be_changed": "De rest van je configuratie zal niet worden gewijzigd. Als Homebridge niet start vanwege een slechte configuratie, zal een reset het niet repareren.", "reset.message_action_is_irreversible": "Deze actie is onomkeerbaar. Lees dit aandachtig voordat u doorgaat.", "reset.message_all_automations_will_be_reset": "Alle automatiseringen moeten na een reset opnieuw worden geconfigureerd.", diff --git a/ui/src/i18n/no.json b/ui/src/i18n/no.json index ea32b9915..5123f87d4 100644 --- a/ui/src/i18n/no.json +++ b/ui/src/i18n/no.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge Paired", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge Settings", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Avbryt", "form.button_close": "Lukk", "form.button_delete": "Slett", + "form.button_disable": "Disable", "form.button_edit": "Rediger", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Lagre", + "form.button_unlock": "Unlock", "login.button_login": "Logg inn", "login.label_2fa_code": "Two Factor Authentication Code", "login.label_password": "Passord", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Startscript", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Tilbehør", "menu.label_config": "Config", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI Settings", "menu.label_status": "Status", - "menu.label_ui_settings": "UI Settings", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Restart serveren", "menu.linux.label_shutdown_server": "Slå av serveren", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Logg ut", "menu.tooltip_restart": "Omstart", "menu.tooltip_user_accounts": "Brukerkontoer", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "Serveren slås av innen kort tid.", "platform.linux.shutdown.title_shutting_down_server": "Slå av serveren", "platform.version.message_service_restart_required": "WARNING: Homebridge UI v{{ uiVersion }} has been installed, but the server service is still running v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Service Restart Required", + "platform.version.title_service_restart_required": "Restart Required", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Installere", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Are you sure you want to update {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} requires Node.js v{{minVersion}} or later. You are currently running Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "The {{ pluginName }} plugin recommends running on Node.js v{{ minVersion }} or later. You are currently running Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Installert", "plugins.status_not_installed": "Ikke installert", "plugins.status_update_available": "Oppdatering tilgjengelig", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Kunne ikke laste plugins", "plugins.tooltip_update_plugin_to": "Oppdater plugin til v {{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.", - "reset.button_reset_homebridge_now": "Tilbakestill Homebridge nå", "reset.message_accessory_config_will_not_be_changed": "Resten av din config kommer ikke til å endres. Om Homebridge ikke starter på grunn av en dårlig konfigurering kommer en tilbakestilling ikke til å fikse det.", "reset.message_action_is_irreversible": "Denna handling kan ikke angres. Les nøye før du fortsetter.", "reset.message_all_automations_will_be_reset": "Alle automatiseringer må konfigureres på nytt etter en tilbakestilling.", diff --git a/ui/src/i18n/pl.json b/ui/src/i18n/pl.json index 39c5e54c9..d891122b2 100644 --- a/ui/src/i18n/pl.json +++ b/ui/src/i18n/pl.json @@ -78,8 +78,9 @@ "backup.title_scheduled_backups": "Planowanie kopii zapasowych", "child_bridge.label_bridge_connect_to_homekit": "Połącz z HomeKit", "child_bridge.label_bridge_paired": "Mostek sparowany", - "child_bridge.label_bridge_restart_child_bridges": "Uruchom ponownie mostek podrzędny", + "child_bridge.label_bridge_restart_child_bridges": "Zrestartuj mostek", "child_bridge.label_bridge_settings": "Ustawienia mostka", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Mostki podrzędne", "child_bridge.label_child_start": "Uruchom mostek", "child_bridge.label_child_stop": "Wyłącz mostek", @@ -114,8 +115,13 @@ "form.button_cancel": "Anuluj", "form.button_close": "Zamknij", "form.button_delete": "Usuń", + "form.button_disable": "Disable", "form.button_edit": "Edytuj", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Zapisz", + "form.button_unlock": "Unlock", "login.button_login": "Zaloguj", "login.label_2fa_code": "Kod uwierzytelniania 2FA", "login.label_password": "Hasło", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Skrypt startowy", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Zrestartuj Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Na pewno chcesz zrestartować Homebridge?", "menu.hbrestart.title": "Zrestartuj Homebridge", "menu.label_accessories": "Akcesoria", "menu.label_config": "Konfiguracja", "menu.label_plugins": "Wtyczki", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI Ustawienia", "menu.label_status": "Status", - "menu.label_ui_settings": "UI Ustawienia", "menu.linux.label_logs": "Logi", "menu.linux.label_restart_server": "Zrestartuj serwer", "menu.linux.label_shutdown_server": "Wyłącz serwer", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart / Wyłącz", "menu.tooltip_logout": "Wyloguj", "menu.tooltip_restart": "Zrestartuj Homebridge", "menu.tooltip_user_accounts": "Użytkownicy", @@ -176,7 +185,7 @@ "plugins.button_install": "Instaluj", "plugins.button_settings": "Ustawienia", "plugins.button_uninstall": "Odinstaluj", - "plugins.button_update": "Aktualizuj (update)", + "plugins.button_update": "Aktualizuj", "plugins.button_upgrade": "Aktualizuj (upgrade)", "plugins.donate.button_donate": "Wspomóż", "plugins.donate.message_learn_more": "Przeczytaj więcej o stosowaniu linków wspomagania we wtyczkach", @@ -211,7 +220,8 @@ "plugins.manage.message_uninstall_remove_plugin_config": "Usunąć również konfigurację tej wtyczki?", "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", - "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.modal_verified_title": "Zweryfikowane wtyczki", + "plugins.manage.plugin_logs": "Logi wtyczki", "plugins.node_update.are_you_sure_you_want_to_update": "Jesteś pewny, że chcesz zaktualizować {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} wymaga Node.js w wersji {{minVersion}} lub nowszej. Aktualnie używasz Node.js w wersji {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Wtyczka {{ pluginName }} powinna być instalowana używając Node.js w wersji {{ minVersion }} lub nowszej. Aktualnie używasz Node.js w wersji {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Zainstalowany", "plugins.status_not_installed": "Niezainstalowany", "plugins.status_update_available": "Dostępna aktualizacja", - "plugins.status_update_beta_available": "Dostępna aktualizacja beta", "plugins.toast_failed_to_load_plugins": "Nie udało się załadować wtyczek", "plugins.tooltip_update_plugin_to": "Zaktualizuj wtyczkę do wersji {{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Po wykonaniu tej czynności dla niektórych akcesoriów może być wymagana ponowna ich konfiguracja w HomeKit lub ponowne dodanie do automatyzacji.", - "reset.button_reset_homebridge_now": "Zresetuj teraz", "reset.message_accessory_config_will_not_be_changed": "Reszta twojej konfiguracji nie zostanie zmieniona. Reset nie pomoże, jeżeli powodem, dla którego nie uruchamia się Homebridge jest niepoprawna konfiguracja.", "reset.message_action_is_irreversible": "Ta czynność jest nieodwracalna! Przeczytaj uważnie, zanim przejdziesz dalej.", "reset.message_all_automations_will_be_reset": "Wszystkie automatyzacje będą wymagały rekonfiguracji po zresetowaniu.", diff --git a/ui/src/i18n/pt-BR.json b/ui/src/i18n/pt-BR.json index 4fefaca15..0d8d96737 100644 --- a/ui/src/i18n/pt-BR.json +++ b/ui/src/i18n/pt-BR.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Ponte Pareada", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Configuração da Ponte", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Pontes Filha", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Cancelar", "form.button_close": "Fechar", "form.button_delete": "Apagar", + "form.button_disable": "Disable", "form.button_edit": "Editar", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Salvar", + "form.button_unlock": "Unlock", "login.button_login": "Entrar", "login.label_2fa_code": "Código de Autenticação de Dois Fatores", "login.label_password": "Senha", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Script de Inicialização", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Acessórios", "menu.label_config": "Configurações", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Configurações da Interface", "menu.label_status": "Status", - "menu.label_ui_settings": "Configurações da Interface", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Reiniciar o Servidor", "menu.linux.label_shutdown_server": "Desligar o Servidor", "menu.linux.label_terminal": "Teminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Sair", "menu.tooltip_restart": "Reiniciar", "menu.tooltip_user_accounts": "Contas de Usuários", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "O servidor desligará brevemente.", "platform.linux.shutdown.title_shutting_down_server": "Desligando o Servidor", "platform.version.message_service_restart_required": "ATENÇÃO: Homebridge UI v{{ uiVersion }} foi instalado, mas o serviço do servidor ainda está rodando a versão v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Reinicialização do Servidor Necessária", + "platform.version.title_service_restart_required": "Reinicialização Necessária", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Instalar", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Você tem certeza que deseja atualizar {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "O Homebridge v{{latestVersion}} requer Node.js v{{minVersion}} ou posterior. Você está utilizando o Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "É recomendado executar o plugin {{ pluginName }} na versão do Node.js v{{ minVersion }} ou posterior. Você está utilizando o Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Instalado", "plugins.status_not_installed": "Não Instalado", "plugins.status_update_available": "Atualização Disponível", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Falha ao carregar os plugins", "plugins.tooltip_update_plugin_to": "Atualizar o plugin para a versão v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Após executar esta ação alguns acessórios poderão ter que ser reconfigurados no HomeKit ou readicionados nas automações.", - "reset.button_reset_homebridge_now": "Redefinir o Homebridge Agora", "reset.message_accessory_config_will_not_be_changed": "O resto da configuração não vai ser alterada. Se o Homebridge não iniciar devido a uma má configuração, uma redefinição não irá resolver o problema.", "reset.message_action_is_irreversible": "Está ação é irreversível. Por favor leia com cuidado antes de proceder.", "reset.message_all_automations_will_be_reset": "Irá ser necessário reconfigurar todas as automações após uma redefinição.", diff --git a/ui/src/i18n/pt.json b/ui/src/i18n/pt.json index fb5435294..4807ab5eb 100644 --- a/ui/src/i18n/pt.json +++ b/ui/src/i18n/pt.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Ponte Emparelhada", "child_bridge.label_bridge_restart_child_bridges": "Reiniciar Pontes Secundárias", "child_bridge.label_bridge_settings": "Definições da Ponte", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Pontes Secundárias", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Cancelar", "form.button_close": "Fechar", "form.button_delete": "Apagar", + "form.button_disable": "Disable", "form.button_edit": "Editar", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Gravar", + "form.button_unlock": "Unlock", "login.button_login": "Entrar", "login.label_2fa_code": "Código de Autenticação de Dois Fatores", "login.label_password": "Palavra-passe", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Script de Inicialização", "menu.docker.label_terminal": "Consola", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Acessórios", "menu.label_config": "Configuração", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Definições da Interface", "menu.label_status": "Estado", - "menu.label_ui_settings": "Definições da Interface", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Reiniciar o Servidor", "menu.linux.label_shutdown_server": "Desligar o Servidor", "menu.linux.label_terminal": "Consola", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Terminar Sessão", "menu.tooltip_restart": "Reiniciar", "menu.tooltip_user_accounts": "Contas de Utilizador", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "O servidor irá desligar brevemente.", "platform.linux.shutdown.title_shutting_down_server": "A Desligar o Servidor", "platform.version.message_service_restart_required": "ATENÇÃO: Foi instalada a Homebridge UI v{{ uiVersion }}, no entanto o serviço do servidor ainda está a executar a versão v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Necessário o reinício do Serviço", + "platform.version.title_service_restart_required": "Necessário o reinício", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Instalar", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Tem a certeza que deseja atualizar {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "O Homebridge v{{latestVersion}} requer Node.js v{{minVersion}} ou posterior. Neste momento encontra-se na versão Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "É recomendado executar o plugin {{ pluginName }} na versão do Node.js v{{ minVersion }} ou posterior. Neste momento encontra-se na versão Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Instalado", "plugins.status_not_installed": "Não Instalado", "plugins.status_update_available": "Atualização Disponível", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Falha ao carregar os plugins", "plugins.tooltip_update_plugin_to": "Atualizar o plugin para a versão v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Após executar a reposição alguns acessórios poderão ter que ser repostos no HomeKit ou readicionados nas automações.", - "reset.button_reset_homebridge_now": "Repor o Homebridge Agora", "reset.message_accessory_config_will_not_be_changed": "O resto da configuração não vai ser alterada. Se o Homebridge não iniciar devido a uma má configuração, uma reposição não irá consertar o problema.", "reset.message_action_is_irreversible": "Está ação é irreversível. Por favor leia com cuidado antes de proceder.", "reset.message_all_automations_will_be_reset": "Irá ser necessário reconfigurar todas as automações após uma reposição.", diff --git a/ui/src/i18n/ru.json b/ui/src/i18n/ru.json index 647b6ba6c..ae5bbe837 100644 --- a/ui/src/i18n/ru.json +++ b/ui/src/i18n/ru.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge Paired", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge Settings", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Отмена", "form.button_close": "Закрыть", "form.button_delete": "Удалить", + "form.button_disable": "Disable", "form.button_edit": "Редактировать", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Сохранить", + "form.button_unlock": "Unlock", "login.button_login": "Войти", "login.label_2fa_code": "Код ДФА", "login.label_password": "Пароль", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Скрипт запуска", "menu.docker.label_terminal": "Терминал", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Аксессуары", "menu.label_config": "Конфигурация", "menu.label_plugins": "Плагины", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Настройки интерфейса", "menu.label_status": "Статус", - "menu.label_ui_settings": "Настройки интерфейса", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Перезапустить сервер", "menu.linux.label_shutdown_server": "Завершение работы сервера", "menu.linux.label_terminal": "Терминал", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Выход", "menu.tooltip_restart": "Перезапуск", "menu.tooltip_user_accounts": "Пользователи", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "Сервер скоро отключится.", "platform.linux.shutdown.title_shutting_down_server": "Выключение сервера", "platform.version.message_service_restart_required": "WARNING: Homebridge UI v{{ uiVersion }} has been installed, but the server service is still running v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Service Restart Required", + "platform.version.title_service_restart_required": "Restart Required", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Установить", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Вы уверены, что хотите обновить {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} требуется Node.js v{{minVersion}} или новее. В настоящее время Вы используете Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Плагин {{ pluginName }} рекомендуется запускать используя Node.js v{{ minVersion }} или новее. В настоящее время Вы используете Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Установлен", "plugins.status_not_installed": "Не установлен", "plugins.status_update_available": "Доступно обновление", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Не удалось загрузить плагины", "plugins.tooltip_update_plugin_to": "Обновить плагин до v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "После выполнения этого действия некоторые аксессуары, возможно, потребуется перенастроить в HomeKit или повторно добавить в Вашу автоматизацию.", - "reset.button_reset_homebridge_now": "Сбросить Homebridge прямо сейчас", "reset.message_accessory_config_will_not_be_changed": "Остальная часть Вашего файла конфигурации не будет изменена. Если Homebridge не запускается из-за ошибки файла конфигурации, сброс это не исправит.", "reset.message_action_is_irreversible": "Это действие необратимо. Пожалуйста, внимательно прочитайте, прежде чем продолжить.", "reset.message_all_automations_will_be_reset": "Все автоматизации будут нуждаться в перенастройке после перезагрузки.", diff --git a/ui/src/i18n/sl.json b/ui/src/i18n/sl.json index dbaceb23e..fcb39c7aa 100644 --- a/ui/src/i18n/sl.json +++ b/ui/src/i18n/sl.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Most seznanjen", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Nastavitve mostu", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Otroški mostovi", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Prekini", "form.button_close": "zapri", "form.button_delete": "Izbriši", + "form.button_disable": "Disable", "form.button_edit": "Uredi", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Shrani", + "form.button_unlock": "Unlock", "login.button_login": "Vpiši se", "login.label_2fa_code": "Dvofaktorska koda za preverjanje pristnosti", "login.label_password": "Geslo", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Začetni skript", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Dodatki", "menu.label_config": "Konfigurirajte", "menu.label_plugins": "Vtičniki", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI Nastavitve", "menu.label_status": "Stanje", - "menu.label_ui_settings": "UI Nastavitve", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Znova zaženite strežnik", "menu.linux.label_shutdown_server": "Zaustavi strežnik", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Odjava", "menu.tooltip_restart": "Ponovni zagon", "menu.tooltip_user_accounts": "Uporabniški računi", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Ali ste prepričani, da želite posodobiti {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v {{latestVersion}} zahteva Node.js v {{ minVersion }} ali novejšo. Trenutno izvajate Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "{{ pluginName }} vtičnik zahteva Node.js v{{ minVersion }} ali novejši. Trenutno se izvaja Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Nameščeno", "plugins.status_not_installed": "Ni nameščeno", "plugins.status_update_available": "Posodobitev je na voljo", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Vtičnikov ni bilo mogoče naložiti", "plugins.tooltip_update_plugin_to": "Posodobite vtičnik v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Po izvedbi tega dejanja bo morda treba nekatere dodatke konfigurirati v HomeKitu ali jih ponovno dodati v svoje avtomatizacije.", - "reset.button_reset_homebridge_now": "Ponastavi Homebridge zdaj", "reset.message_accessory_config_will_not_be_changed": "Preostali del konfiguracije se ne bo spremenil. Če se Homebridge ne zažene zaradi slabe konfiguracije, se ponastavitev ne bo odpravila.", "reset.message_action_is_irreversible": "To dejanje je nepovratno. Pred nadaljevanjem natančno preberite navodila.", "reset.message_all_automations_will_be_reset": "Vse avtomatizacije in jih bo treba po ponastavitvi spremeniti.", diff --git a/ui/src/i18n/sv.json b/ui/src/i18n/sv.json index bfb893a33..649a58916 100644 --- a/ui/src/i18n/sv.json +++ b/ui/src/i18n/sv.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Brygga ansluten", "child_bridge.label_bridge_restart_child_bridges": "Starta om underbryggor", "child_bridge.label_bridge_settings": "Brygginställningar", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Underbryggor", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Avbryt", "form.button_close": "Stäng", "form.button_delete": "Radera", + "form.button_disable": "Disable", "form.button_edit": "Redigera", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Spara", + "form.button_unlock": "Unlock", "login.button_login": "Logga in", "login.label_2fa_code": "Tvåfaktorautentiseringskod", "login.label_password": "Lösenord", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Startskript", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Tillbehör", "menu.label_config": "Konfiguration", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Användargränssnitt Inställningar", "menu.label_status": "Status", - "menu.label_ui_settings": "Användargränssnitt Inställningar", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Starta om servern", "menu.linux.label_shutdown_server": "Stäng av server", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Logga ut", "menu.tooltip_restart": "Omstart", "menu.tooltip_user_accounts": "Användarkonton", @@ -170,7 +179,7 @@ "platform.linux.shutdown.message_server_will_power_down": "Servern stängs av inom kort.", "platform.linux.shutdown.title_shutting_down_server": "Stänga av servern", "platform.version.message_service_restart_required": "WARNING: Homebridge UI v{{ uiVersion }} has been installed, but the server service is still running v{{ serverVersion }}.", - "platform.version.title_service_restart_required": "Service Restart Required", + "platform.version.title_service_restart_required": "Restart Required", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Installera", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Är du säker på att du vill uppdatera {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} kräver Node.js v{{minVersion}} eller senare. Du kör just nu Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "{{ pluginName }} plugin rekomenderas att köras med Node.js v{{ minVersion }} eller senare. Du kör just nu Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Installerad", "plugins.status_not_installed": "Inte installerad", "plugins.status_update_available": "Uppdatering tillgänglig", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Det gick inte att ladda plugins", "plugins.tooltip_update_plugin_to": "Uppdatera plugin till v {{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "När du har utfört den här åtgärden kan vissa tillbehör behöva konfigureras om i HomeKit eller läggas till i dina automatiseringar igen.", - "reset.button_reset_homebridge_now": "Återställ Homebridge nu", "reset.message_accessory_config_will_not_be_changed": "Resten av din konfiguration kommer inte att ändras. Om Homebridge inte startar på grund av en dålig konfigurering kommer en återställning inte att fixa det.", "reset.message_action_is_irreversible": "Denna åtgärd går inte att ångra. Läs noga innan du fortsätter.", "reset.message_all_automations_will_be_reset": "Alla automatiseringar och måste konfigureras om efter en återställning.", diff --git a/ui/src/i18n/th.json b/ui/src/i18n/th.json index 03fd768cf..10a71b9fb 100644 --- a/ui/src/i18n/th.json +++ b/ui/src/i18n/th.json @@ -1,5 +1,5 @@ { - "--language": "Thai, Tajski", + "--language": "Thai, ภาษาไทย", "accessories.button_add_room": "เพิ่มห้อง", "accessories.button_create_room": "สร้างห้อง", "accessories.button_toggle_hidden": "ซ่อนการสลับ", @@ -80,9 +80,10 @@ "child_bridge.label_bridge_paired": "Bridge ได้ถูกจับคู่แล้ว", "child_bridge.label_bridge_restart_child_bridges": "รีสตาร์ท Child Bridges", "child_bridge.label_bridge_settings": "การตั้งค่า Bridge", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridge", - "child_bridge.label_child_start": "Start child bridge", - "child_bridge.label_child_stop": "Stop child bridge", + "child_bridge.label_child_start": "เริ่มการทำงาน child bridge", + "child_bridge.label_child_stop": "หยุดการทำงาน child bridge", "child_bridge.message_about": "Homebridge ช่วยให้คุณสามารถเรียกใช้แพลตฟอร์มปลั๊กอินหรืออุปกรณ์เสริมแยกจาก Child Bridge สิ่งนี้สามารถปรับปรุงการตอบสนองทั่วไปและความน่าเชื่อถือของ Homebridge", "child_bridge.message_child_bridges_must_be_paired_separately": "แพลตฟอร์ม Child Bridgeหรืออุปกรณ์เสริมแต่ละตัวจะต้องจับคู่กับ HomeKit แยกกัน.", "child_bridge.message_must_configure_plugin_first": "คุณต้องกำหนดค่าปลั๊กอินนี้ก่อนจึงจะจัดการการตั้งค่า Bridge ได้", @@ -114,8 +115,13 @@ "form.button_cancel": "ยกเลิก", "form.button_close": "ปิด", "form.button_delete": "ลบ", + "form.button_disable": "Disable", "form.button_edit": "แก้ไข", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "บันทึก", + "form.button_unlock": "Unlock", "login.button_login": "เข้าสู่ระบบ", "login.label_2fa_code": "รหัสรับรองความถูกต้องสองปัจจัย", "login.label_password": "รหัสผ่าน", @@ -133,18 +139,21 @@ "menu.docker.label_settings": "การตั้งค่า", "menu.docker.label_startup_script": "สคริปต์เริ่มต้น", "menu.docker.label_terminal": "เทอร์มินอล", - "menu.hbrestart.confirm_button": "Restart Homebridge", - "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", - "menu.hbrestart.title": "Restart Homebridge", + "menu.hbrestart.confirm_button": "รีสตาร์ท Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", + "menu.hbrestart.confirmation": "คุณแน่ใจหรือไม่ว่าต้องการรีสตาร์ท Homebridge?", + "menu.hbrestart.title": "รีสตาร์ท Homebridge", "menu.label_accessories": "อุปกรณ์เสริม", "menu.label_config": "การตั้งค่า", "menu.label_plugins": "ปลั๊กอิน", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "การตั้งค่า UI", "menu.label_status": "สถานะ", - "menu.label_ui_settings": "การตั้งค่า UI", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "รีสตาร์ทเซิร์ฟเวอร์", "menu.linux.label_shutdown_server": "ปิดเซิร์ฟเวอร์", "menu.linux.label_terminal": "เทอร์มินอล", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "ออกจากระบบ", "menu.tooltip_restart": "รีสตาร์ท", "menu.tooltip_user_accounts": "บัญชีผู้ใช้", @@ -171,8 +180,8 @@ "platform.linux.shutdown.title_shutting_down_server": "กำลังปิดเซิร์ฟเวอร์", "platform.version.message_service_restart_required": "คำเตือน: Homebridge UI รุ่น{{ uiVersion }} ได้รับการติดตั้งแล้ว แต่บริการเซิร์ฟเวอร์ยังคงทำงานอยู่ รุ่น{{ serverVersion }}.", "platform.version.title_service_restart_required": "จำเป็นต้องรีสตาร์ทบริการ", - "plugins.button_api_documentation": "API Documentation", - "plugins.button_homepage": "Plugin Homepage", + "plugins.button_api_documentation": "เอกสาร API", + "plugins.button_homepage": "ปลั๊กอิน Homepage", "plugins.button_install": "ติดตั้ง", "plugins.button_settings": "การตั้งค่า", "plugins.button_uninstall": "ถอนการติดตั้ง", @@ -182,10 +191,10 @@ "plugins.donate.message_learn_more": "เรียนรู้เพิ่มเติมเกี่ยวกับลิงก์การบริจาคในปลั๊กอิน", "plugins.donate.tile_donate_to": "บริจาคให้ {{ author }}", "plugins.manage.button_restart_now": "รีสตาร์ท Homebridge ทันที", - "plugins.manage.child_bridge_button_restart_now": "Restart Child Bridges", - "plugins.manage.child_bridge_button_restart_now_one": "Restart Child Bridge", - "plugins.manage.child_bridge_restart_failed": "Plugin restart failed, please restart Homebridge manually.", - "plugins.manage.child_bridge_restart_success": "Plugin restart successful.", + "plugins.manage.child_bridge_button_restart_now": "รีสตาร์ท Child Bridges", + "plugins.manage.child_bridge_button_restart_now_one": "รีสตาร์ท Child Bridge", + "plugins.manage.child_bridge_restart_failed": "การรีสตาร์ทปลั๊กอินล้มเหลว โปรดรีสตาร์ท Homebridge ด้วยตนเอง", + "plugins.manage.child_bridge_restart_success": "รีสตาร์ทปลั๊กอินสำเร็จ", "plugins.manage.disable": "ปิดการใช้งาน", "plugins.manage.enable": "เปิดการใช้งาน", "plugins.manage.json_config": "การกำหนดค่า JSON", @@ -193,8 +202,8 @@ "plugins.manage.label_installed": "ติดตั้งแล้ว", "plugins.manage.label_manual_update_required": "จำเป็นต้องมีการอัปเดตด้วยตนเอง", "plugins.manage.label_online_updates_not_supported_on_windows": "Windows ไม่รองรับการอัปเดตออนไลน์ คุณจะต้องอัปเกรด Homebridge ด้วยตนเองหลังจากหยุดบริการ Homebridge", - "plugins.manage.label_release_notes": "Release Notes", - "plugins.manage.label_release_notes_beta": "Beta Information", + "plugins.manage.label_release_notes": "บันทึกประจำรุ่น", + "plugins.manage.label_release_notes_beta": "ข้อมูลเกี่ยวกับรุ่นเบต้า", "plugins.manage.label_uninstall": "ถอนการติดตั้ง", "plugins.manage.label_uninstalled": "นำออกแล้ว", "plugins.manage.label_update": "อัปเดท", @@ -204,14 +213,15 @@ "plugins.manage.message_install_alternate_version": "ติดตั้งเวอร์ชันก่อนหน้า", "plugins.manage.message_select_version_to_install": "เลือกเวอร์ชันที่จะติดตั้ง", "plugins.manage.message_thanks_for_updating": "ขอบคุณที่ติดตั้ง {{ pluginName }} เวอร์ชันล่าสุด", - "plugins.manage.message_thanks_for_updating_restart": "Please restart Homebridge for the changes to apply.", - "plugins.manage.message_thanks_for_updating_restart_child_bridges": "Please restart the plugin's child bridges for the changes to apply.", + "plugins.manage.message_thanks_for_updating_restart": "โปรดรีสตาร์ท Homebridge เพื่อให้การเปลี่ยนแปลงมีผล", + "plugins.manage.message_thanks_for_updating_restart_child_bridges": "โปรดรีสตาร์ท child bridges ของปลั๊กอินเพื่อให้การเปลี่ยนแปลงมีผล", "plugins.manage.message_uninstall_remove_config_required": "หากคุณกำลังลบปลั๊กอินนี้อย่างถาวรตรวจสอบให้แน่ใจว่าคุณได้ลบการกำหนดค่าใด ๆ สำหรับปลั๊กอินนี้ใน config.json ก่อนที่จะรีสตาร์ท Homebridge", "plugins.manage.message_uninstall_remove_confirmation": "แน่ใจไหมว่าต้องการถอนการติดตั้ง {{ pluginName }}?", "plugins.manage.message_uninstall_remove_plugin_config": "ลบ Plugin Config ด้วยหรือไม่", - "plugins.manage.modal_verified_cta": "More Info", - "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", - "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.modal_verified_cta": "ข้อมูลเพิ่มเติม", + "plugins.manage.modal_verified_message": "ปลั๊กอิน Homebridge ที่ทำเครื่องหมายว่าตรวจสอบแล้วได้รับการตรวจสอบโดยทีมงานโครงการ Homebridge เพื่อให้แน่ใจว่าเป็นไปตามข้อกำหนดต่างๆ ที่ส่งเสริมแนวทางปฏิบัติที่ดีที่สุดและประสบการณ์ผู้ใช้ที่ปราศจากปัญหา", + "plugins.manage.modal_verified_title": "ปลั๊กอินที่ได้รับการตรวจสอบแล้ว", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "แน่ใจไหมว่าต้องการอัปเดต {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge รุ่น{{latestVersion}} ต้องการ Node.js รุ่น{{minVersion}} หรือใหม่กว่า. โดยที่คุณกำลังใช้ Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "{{ pluginName }} ปลั๊กอินแนะนำให้ทำงานบน Node.js รุ่น{{ minVersion }} หรือใหม่กว่า. โดยที่คุณกำลังใช้ Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "ติดตั้งแล้ว", "plugins.status_not_installed": "ไม่ได้ติดตั้ง", "plugins.status_update_available": "มีการอัปเดต", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "โหลดปลั๊กอินไม่สำเร็จ", "plugins.tooltip_update_plugin_to": "อัปเดตปลั๊กอินเป็น รุ่น{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "หลังจากดำเนินการนี้แล้วอุปกรณ์เสริมบางอย่างอาจต้องได้รับการกำหนดค่าใหม่ใน HomeKit หรือเพิ่มเข้าไปใหม่ในระบบอัตโนมัติของคุณ", - "reset.button_reset_homebridge_now": "รีเซ็ต Homebridge ทันที", "reset.message_accessory_config_will_not_be_changed": "ส่วนที่เหลือของการกำหนดค่าของคุณจะไม่เปลี่ยนแปลง หาก Homebridge ไม่เริ่มทำงานเนื่องจากการกำหนดค่าไม่ถูกต้องการรีเซ็ตจะไม่สามารถแก้ไขได้", "reset.message_action_is_irreversible": "การกระทำนี้ไม่สามารถย้อนกลับได้ โปรดอ่านอย่างละเอียดก่อนดำเนินการต่อ", "reset.message_all_automations_will_be_reset": "ระบบอัตโนมัติทั้งหมดและจะต้องได้รับการกำหนดค่าใหม่หลังจากรีเซ็ต", @@ -316,7 +324,7 @@ "status.plugins_out_of_date": "ปลั๊กอินล้าสมัย", "status.services.label_not_running": "ไม่ทำงาน", "status.services.label_running": "กำลังทำงาน", - "status.services.label_running_on_port": "Port: {{port}}", + "status.services.label_running_on_port": "พอร์ต: {{port}}", "status.services.label_starting": "กำลังเริ่มทำงาน…", "status.uptime.title_uptime": "ระยะเวลาเปิดบริการ", "status.widget.accessories.label_choose_accessories_to_display": "เลือกอุปกรณ์เสริมที่จะแสดงในวิดเจ็ตนี้จากแท็บอุปกรณ์เสริม", @@ -343,15 +351,15 @@ "status.widget.label_temperature_units_system_default": "ค่าเริ่มต้นของระบบ", "status.widget.label_unlock_layout": "ปลดล็อกเค้าโครง", "status.widget.systeminfo.label_config_path": "เส้นทางกำหนดค่า", - "status.widget.systeminfo.label_disabled": "Disabled", + "status.widget.systeminfo.label_disabled": "ปิดการใช้", "status.widget.systeminfo.label_docker": "Docker", - "status.widget.systeminfo.label_enabled": "Enabled", - "status.widget.systeminfo.label_glibc_warning": "Version is too low for updating Node.js to newer versions - https://homebridge.io/w/JJSun", + "status.widget.systeminfo.label_enabled": "เปิดใช้", + "status.widget.systeminfo.label_glibc_warning": "เวอร์ชันต่ำเกินไปสำหรับการอัปเดต Node.js เป็นเวอร์ชันที่ใหม่กว่า - https://homebridge.io/w/JJSun", "status.widget.systeminfo.label_hostname": "ชื่อโฮสต์", "status.widget.systeminfo.label_ipv4": "IPv4", "status.widget.systeminfo.label_ipv6": "IPv6", - "status.widget.systeminfo.label_no": "No", - "status.widget.systeminfo.label_nodejs_path": "Node.js Path", + "status.widget.systeminfo.label_no": "ไม่", + "status.widget.systeminfo.label_nodejs_path": "พาธของ Node.js", "status.widget.systeminfo.label_nodejs_version": "รุ่นของ Node.js", "status.widget.systeminfo.label_os": "ระบบปฏิบัติการ", "status.widget.systeminfo.label_plugin_path": "เส้นทางปลั๊กอิน", @@ -360,13 +368,13 @@ "status.widget.systeminfo.label_storage_path": "เส้นทางการจัดเก็บ", "status.widget.systeminfo.label_synology_package": "แพ็คเกจ Synology", "status.widget.systeminfo.label_timezone": "เขตเวลา", - "status.widget.systeminfo.label_yes": "Yes", - "status.widget.systeminfo.modal_glibc_cta": "More Info", - "status.widget.systeminfo.modal_glibc_message": "This message indicates that your operating system does not support newer versions of Node.js. To resolve this and be able to install updated versions of Node.js in the future, you will need to update your operating system to a more recent version.", - "status.widget.systeminfo.modal_glibc_title": "OS Update", - "status.widget.systeminfo.modal_servicemode_cta": "More Info", - "status.widget.systeminfo.modal_servicemode_message": "Standalone mode is no longer recommended. Setting up Homebridge and Homebridge UI with hb-service has the same benefits of standalone mode but is much easier to setup and maintain.", - "status.widget.systeminfo.modal_servicemode_title": "Service Mode", + "status.widget.systeminfo.label_yes": "ใช่", + "status.widget.systeminfo.modal_glibc_cta": "ข้อมูลเพิ่มเติม", + "status.widget.systeminfo.modal_glibc_message": "ข้อความนี้ระบุว่าระบบปฏิบัติการของคุณไม่รองรับ Node.js เวอร์ชันใหม่กว่า เพื่อแก้ไขปัญหานี้และสามารถติดตั้ง Node.js เวอร์ชันอัปเดตได้ในอนาคต คุณจะต้องอัปเดตระบบปฏิบัติการเป็นเวอร์ชันล่าสุด", + "status.widget.systeminfo.modal_glibc_title": "อัพเดตระบบปฏิบัติการ", + "status.widget.systeminfo.modal_servicemode_cta": "ข้อมูลเพิ่มเติม", + "status.widget.systeminfo.modal_servicemode_message": "ไม่แนะนำให้ใช้โหมดสแตนด์อโลนอีกต่อไป การตั้งค่า Homebridge และ Homebridge UI ด้วย hb-service มีข้อดีเหมือนกับโหมดสแตนด์อโลน แต่การตั้งค่าและบำรุงรักษาได้ง่ายกว่ามาก", + "status.widget.systeminfo.modal_servicemode_title": "โหมดบริการ", "status.widget.title_manage_widget": "จัดการวิดเจ็ต", "status.widget.uptime.label_process": "โปรเซส", "status.widget.uptime.label_server": "เซิร์ฟเวอร์", diff --git a/ui/src/i18n/tr.json b/ui/src/i18n/tr.json index 689d44d7e..a47b0d2ad 100644 --- a/ui/src/i18n/tr.json +++ b/ui/src/i18n/tr.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge Paired", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge Settings", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Child Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "İptal Et", "form.button_close": "Kapat", "form.button_delete": "Sil", + "form.button_disable": "Disable", "form.button_edit": "Düzenle", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Kaydet", + "form.button_unlock": "Unlock", "login.button_login": "Oturum Aç", "login.label_2fa_code": "İki Aşamalı Doğrulama Kodu", "login.label_password": "Parola", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Başlangıç Komutu", "menu.docker.label_terminal": "Terminal", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Aksesuarlar", "menu.label_config": "Yapılandır", "menu.label_plugins": "Eklentiler", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Arayüz Ayarları", "menu.label_status": "Durum", - "menu.label_ui_settings": "Arayüz Ayarları", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Sunucuyu Yeniden Başlat", "menu.linux.label_shutdown_server": "Sunucuyu Kapat", "menu.linux.label_terminal": "Terminal", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Çıkış Yap", "menu.tooltip_restart": "Yeniden Başlat", "menu.tooltip_user_accounts": "Kullanıcı Hesapları", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "{{ pluginName }} eklentisini güncellemek istediğinize emin misiniz?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}}, Node.js v{{minVersion}} veya daha üst sürümüne ihtiyaç duyar. Mevcutta Node.js v{{ installedVersion }} çalıştırıyorsunuz.", "plugins.node_update.node_version_too_low": "{{ pluginName }} eklentisi Node.js v{{ minVersion }} veya daha üst sürümünü çalıştırmanızı tavsiye ediyor. Mevutta Node.js v{{ installedVersion }} çalıştırıyorsunuz.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Yüklü", "plugins.status_not_installed": "Yüklü Değil", "plugins.status_update_available": "Güncelleme Mevcut", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Eklentiler yüklenemedi", "plugins.tooltip_update_plugin_to": "Eklentiyi v{{version}} sürümüne güncelleştir", "reset.accessories_will_may_need_to_be_reconfigured": "Bu işlemi gerçekleştirdikten sonra bazı aksesuarların HomeKit içerisinde yeniden yapılandırılması veya mevcut otomasyonlarınıza yeniden eklenmesi gerekebilir.", - "reset.button_reset_homebridge_now": "Homebridge'i Şimdi Sıfırla", "reset.message_accessory_config_will_not_be_changed": "Yapılandırmanızın geri kalanı değişmeyecek. Homebridge kötü bir yapılandırma nedeniyle başlatılamıyorsa, sıfırlama işlemi onu düzeltmez.", "reset.message_action_is_irreversible": "Bu işlem geri alınamaz. Lütfen devam etmeden önce dikkatlice okuyunuz.", "reset.message_all_automations_will_be_reset": "Sıfırlama işleminden sonra tüm otomasyonların yeniden yapılandırılması gerekir.", diff --git a/ui/src/i18n/uk.json b/ui/src/i18n/uk.json index dfd7579fe..ded7084a3 100644 --- a/ui/src/i18n/uk.json +++ b/ui/src/i18n/uk.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Міст спарований", "child_bridge.label_bridge_restart_child_bridges": "Перезавантажити дочірні мости", "child_bridge.label_bridge_settings": "Налаштування мосту", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "Дочірні мости", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "Відмінити", "form.button_close": "Закрити", "form.button_delete": "Видалити", + "form.button_disable": "Disable", "form.button_edit": "Редагувати", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "Зберегти", + "form.button_unlock": "Unlock", "login.button_login": "Увійти", "login.label_2fa_code": "Код ДФА", "login.label_password": "Пароль", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "Скрипт запуску", "menu.docker.label_terminal": "Термінал", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "Аксесуари", "menu.label_config": "Конфігурація", "menu.label_plugins": "Плагіни", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "Налаштування інтерфейсу", "menu.label_status": "Статус", - "menu.label_ui_settings": "Налаштування інтерфейсу", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "Перезавантажити сервер", "menu.linux.label_shutdown_server": "Завершення роботи сервера", "menu.linux.label_terminal": "Термінал", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "Вихід", "menu.tooltip_restart": "Перезапуск", "menu.tooltip_user_accounts": "Користувачі", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "Ви впевнені, що бажаєте оновити {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} потребує Node.js v{{minVersion}} або новіше. На даний час Ви використовуєте Node.js {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Плагін {{ pluginName }} рекомендовано запускати використовуючи Node.js v{{ minVersion }} або новіше. На даний час Ви використовуєте Node.js {{ installedVersion }}.", @@ -236,11 +246,9 @@ "plugins.status_installed": "Встановлено", "plugins.status_not_installed": "Не встановлено", "plugins.status_update_available": "Доступне оновлення", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Не вдалося завантажити плагіни", "plugins.tooltip_update_plugin_to": "Оновити плагін до v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "Після виконання цієї дії деякі аксесуари, можливо, буде потрібно переналаштувати в HomeKit або повторно добавити в Вашу автоматизацію.", - "reset.button_reset_homebridge_now": "Скинути налаштування Homebridge негайно", "reset.message_accessory_config_will_not_be_changed": "Інша частина Вашого файлу конфігурації не буде змінена. Якщо Homebridge не завантоажується через помилку файлу конфігурації, скидання налаштувань цього не виправить.", "reset.message_action_is_irreversible": "Ця дія незворотня. Будь ласка, уважно прочитайте, перш ніж продовжити.", "reset.message_all_automations_will_be_reset": "Всі автоматизації потребуватимуть переналаштувань після перезавантаження.", @@ -252,7 +260,6 @@ "reset.message_reset_will_unpair_from_homekit": "Скидання налаштувань призведе до розриву пари цього інстансу Homebridge та Apple HomeKit.", "reset.message_unpair_bridges_cameras_tv_external_accessories": "Ці дія дозволить розірвати пару з обраними мостами / камерами / телевізорами чи іншими зовнішніми аксесуарами.", "reset.message_your_homebridge_username_will_be_changed": "Ім'я користувача і PIN-код Вашего Homebridge будуть змінені.", - "reset.title_clear_cache": "Очистити кеш", "reset.title_clear_cached_accessories": "Очистити кешовані аксесуари", "reset.title_clear_cached_accessories_single": "Видалити кешований аксесуар", "reset.title_force_restart_hb_service": "Примусово перезавантажити службу", @@ -279,7 +286,6 @@ "rpi.throttled.currently_undervoltage_title": "Виявлено понижену напругу", "rpi.throttled.previously_undervoltage_message": "Цей Raspberry Pi повідомив про подію низької напруги після останнього перезавантаження; будь ласка, перевірте, чи підключено його до відповідного джерела живлення.", "rpi.throttled.previously_undervoltage_title": "Виявлена низька напруга", - "settings.legacy_mdns_option": "Use Legacy mDNS Advertiser", "settings.manage_cache.help": "Якщо аксесуар, якого у Вас більше немає, все ще відображається в HomeKit, можливо, Ви будете змушені видалити його з кешу. Ви можете вибрати видалення одного аксесуару з кешу або видалити всі кешовані аксесуари.", "settings.mdns_advertiser": "mDNS Advertiser", "settings.mdns_advertiser_help": "If you're having trouble connecting to Homebridge, try using one of the alternate mDNS advertisers.", diff --git a/ui/src/i18n/zh-CN.json b/ui/src/i18n/zh-CN.json index 7ece97c35..343069939 100644 --- a/ui/src/i18n/zh-CN.json +++ b/ui/src/i18n/zh-CN.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "网桥已配对", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "网桥设置", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "子网桥", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "取消", "form.button_close": "关闭", "form.button_delete": "删除", + "form.button_disable": "Disable", "form.button_edit": "编辑", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "保存", + "form.button_unlock": "Unlock", "login.button_login": "登录", "login.label_2fa_code": "两步验证代码", "login.label_password": "密码", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "启动脚本", "menu.docker.label_terminal": "终端", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "配件", "menu.label_config": "配置", "menu.label_plugins": "插件", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "用户界面设置", "menu.label_status": "状态", - "menu.label_ui_settings": "用户界面设置", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "重启服务器", "menu.linux.label_shutdown_server": "关闭服务器", "menu.linux.label_terminal": "终端", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "注销", "menu.tooltip_restart": "重启 HomeBridge", "menu.tooltip_user_accounts": "用户帐户", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "您确定要升级 {{ pluginName }} 吗?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge {{latestVersion}} 需要最低 Node.js 版本为 {{minVersion}}。 您现在的 Node.js 版本是 {{ installedVersion }}。", "plugins.node_update.node_version_too_low": "{{ pluginName }} 插件推荐使用 Node.js {{ minVersion }} 或者更新版本。 您现在的 Node.js 版本是 {{ installedVersion }}。", @@ -236,11 +246,9 @@ "plugins.status_installed": "已安装", "plugins.status_not_installed": "未安装", "plugins.status_update_available": "可更新", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "载入插件失败", "plugins.tooltip_update_plugin_to": "更新插件至 v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "执行此操作后某些配件可能需要重新在 HomeKit 中配对或者重新添加到自动化内。", - "reset.button_reset_homebridge_now": "重置 Homebridge", "reset.message_accessory_config_will_not_be_changed": "其他的配置不会更改。如果由于配置错误导致 Homebridge 无法启动，则重置将无法解决问题。", "reset.message_action_is_irreversible": "这一行动不可逆。在继续之前请仔细阅读。", "reset.message_all_automations_will_be_reset": "所有自动化都需要在重置后重新配置。", diff --git a/ui/src/i18n/zh-TW.json b/ui/src/i18n/zh-TW.json index fb70afecd..459219436 100644 --- a/ui/src/i18n/zh-TW.json +++ b/ui/src/i18n/zh-TW.json @@ -80,6 +80,7 @@ "child_bridge.label_bridge_paired": "Bridge 已配對", "child_bridge.label_bridge_restart_child_bridges": "Restart Child Bridges", "child_bridge.label_bridge_settings": "Bridge 設定", + "child_bridge.label_bridge_setup_child_bridges": "Setup Child Bridges", "child_bridge.label_child_bridges": "子 Bridges", "child_bridge.label_child_start": "Start child bridge", "child_bridge.label_child_stop": "Stop child bridge", @@ -114,8 +115,13 @@ "form.button_cancel": "取消", "form.button_close": "關閉", "form.button_delete": "刪除", + "form.button_disable": "Disable", "form.button_edit": "編輯", + "form.button_enable": "Enable", + "form.button_lock": "Lock", + "form.button_reset": "Reset", "form.button_save": "儲存", + "form.button_unlock": "Unlock", "login.button_login": "登錄", "login.label_2fa_code": "雙重驗證碼", "login.label_password": "密碼", @@ -134,17 +140,20 @@ "menu.docker.label_startup_script": "啟動腳本", "menu.docker.label_terminal": "終端", "menu.hbrestart.confirm_button": "Restart Homebridge", + "menu.hbrestart.confirm_service_button": "Restart HB Service & UI", "menu.hbrestart.confirmation": "Are you sure you want to restart Homebridge?", "menu.hbrestart.title": "Restart Homebridge", "menu.label_accessories": "配件", "menu.label_config": "Config", "menu.label_plugins": "Plugins", + "menu.label_settings_hb": "Homebridge Settings", + "menu.label_settings_ui": "UI 設定", "menu.label_status": "狀態", - "menu.label_ui_settings": "UI 設定", "menu.linux.label_logs": "Logs", "menu.linux.label_restart_server": "重新啟動 Homebridge", "menu.linux.label_shutdown_server": "關閉 Homebridge", "menu.linux.label_terminal": "終端機", + "menu.restart.title": "Restart Options", "menu.tooltip_logout": "登出", "menu.tooltip_restart": "重新啟動", "menu.tooltip_user_accounts": "使用者帳號", @@ -212,6 +221,7 @@ "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", "plugins.manage.modal_verified_title": "Verified Plugins", + "plugins.manage.plugin_logs": "View Plugin Logs", "plugins.node_update.are_you_sure_you_want_to_update": "確定要更新 {{ pluginName }}？", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} 需要 Node.js v{{minVersion}} 或更新版本。目前所使用的 Node.js 版本為 {{ installedVersion }}。", "plugins.node_update.node_version_too_low": "{{ pluginName }} Plugin 建議以 Node.js v{{ minVersion }} 或更新版本執行。目前所使用的 Node.js 版本為 {{ installedVersion }}。", @@ -236,11 +246,9 @@ "plugins.status_installed": "已安裝", "plugins.status_not_installed": "未安裝", "plugins.status_update_available": "可用更新", - "plugins.status_update_beta_available": "Beta Update Available", "plugins.toast_failed_to_load_plugins": "Plugins 載入失敗", "plugins.tooltip_update_plugin_to": "更新 Plugin 至 v{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "執行此動作後，部分配件可能必須於 HomeKit 中重新設定或重新加入自動化。", - "reset.button_reset_homebridge_now": "立即重置 Homebridge", "reset.message_accessory_config_will_not_be_changed": "重置並不會對您的 Config 進行任何變更。如果 Homebridge 是因為 Config 錯誤而無法啟動，那重置也無法解決問題。", "reset.message_action_is_irreversible": "此行為是無法取消重來的，請在繼續之前仔細閱讀。", "reset.message_all_automations_will_be_reset": "所有自動化、重置後需要重新 Config。", diff --git a/ui/src/main.ts b/ui/src/main.ts index 0f416eb19..0da3f9e58 100644 --- a/ui/src/main.ts +++ b/ui/src/main.ts @@ -1,6 +1,5 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - import { AppModule } from './app/app.module'; import { environment } from './environments/environment'; @@ -10,5 +9,3 @@ if (environment.production) { platformBrowserDynamic().bootstrapModule(AppModule) .catch(err => console.log(err)); - - diff --git a/ui/src/scss/components/accessories.scss b/ui/src/scss/components/accessories.scss index c08ae0298..0fae6180f 100644 --- a/ui/src/scss/components/accessories.scss +++ b/ui/src/scss/components/accessories.scss @@ -7,12 +7,29 @@ } .switch-on { - background-color: #fff; + background-color: #fff !important; #accessoryIcon { - fill: #1976d2 !important; + fill: #02d700 !important; } } + .light-on { + background-color: #fff !important; + + #accessoryIcon { + fill: #ffcf55 !important; + } + } + .window-on { + background-color: #fff !important; + + #accessoryIcon { + fill: #00acff !important; + } + } + .window-on .st0 { + fill: #00acff !important; + } } .accessory-box { diff --git a/ui/src/scss/themes/themes-dark.scss b/ui/src/scss/themes/themes-dark.scss index ea9429132..7beb1e629 100644 --- a/ui/src/scss/themes/themes-dark.scss +++ b/ui/src/scss/themes/themes-dark.scss @@ -45,6 +45,10 @@ color: $darkModePrimary; } + .notif-dot { + background-color: $darkModePrimary; + } + .dark-mode-highlight { color: $darkModePrimary !important; opacity: 1 !important; @@ -315,7 +319,7 @@ color: $secondaryText; } - .switch-on { + .switch-on, .light-on, .window-on { background-color: #fff; color: #000000; } diff --git a/ui/src/scss/themes/themes-light.scss b/ui/src/scss/themes/themes-light.scss index 46334c49b..575d3e217 100644 --- a/ui/src/scss/themes/themes-light.scss +++ b/ui/src/scss/themes/themes-light.scss @@ -10,6 +10,10 @@ color: $primary; } + .notif-dot { + background-color: $primary; + } + .btn-primary, .btn-default { @extend .btn-#{$name} !optional; @@ -107,6 +111,11 @@ background-color: $primary-dark !important; } + .switch-on, .light-on, .window-on { + background-color: #fff; + color: #000000; + } + @keyframes uix-glow-icon { from { text-shadow: 0 0 5px #fff, 0 0 10px #fff; diff --git a/webpack.config.js b/webpack.config.js index 251471735..b24423fb3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,8 +1,7 @@ /* eslint-disable @typescript-eslint/no-var-requires */ -const webpack = require('webpack'); const path = require('path'); - +const webpack = require('webpack'); const packageJson = require('./package.json'); const externals = {};