From b8484c6eb2bd2e7e8b89a0e85f07add74c4f60f1 Mon Sep 17 00:00:00 2001 From: Donavan Becker Date: Sat, 11 Nov 2023 08:10:52 -0600 Subject: [PATCH 01/34] trigger attach-artifacts --- .github/workflows/Attach Artifacts.yml | 2 ++ .github/workflows/release.yml | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Attach Artifacts.yml b/.github/workflows/Attach Artifacts.yml index 7f0203286..1fd752f94 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: 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 From c1734bb85cf74a2cfbb4fb82ce44d43e74e68347 Mon Sep 17 00:00:00 2001 From: Suthep Yonphimai Date: Sat, 11 Nov 2023 21:57:05 +0700 Subject: [PATCH 02/34] Update th.json (#1688) --- ui/src/i18n/th.json | 66 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/ui/src/i18n/th.json b/ui/src/i18n/th.json index 03fd768cf..9df306b8b 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": "ซ่อนการสลับ", @@ -81,8 +81,8 @@ "child_bridge.label_bridge_restart_child_bridges": "รีสตาร์ท Child Bridges", "child_bridge.label_bridge_settings": "การตั้งค่า Bridge", "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 ได้", @@ -133,9 +133,9 @@ "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.confirmation": "คุณแน่ใจหรือไม่ว่าต้องการรีสตาร์ท Homebridge?", + "menu.hbrestart.title": "รีสตาร์ท Homebridge", "menu.label_accessories": "อุปกรณ์เสริม", "menu.label_config": "การตั้งค่า", "menu.label_plugins": "ปลั๊กอิน", @@ -171,8 +171,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 +182,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 +193,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 +204,14 @@ "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.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,7 +236,7 @@ "plugins.status_installed": "ติดตั้งแล้ว", "plugins.status_not_installed": "ไม่ได้ติดตั้ง", "plugins.status_update_available": "มีการอัปเดต", - "plugins.status_update_beta_available": "Beta Update Available", + "plugins.status_update_beta_available": "มีการอัปเดตรุ่นเบต้า", "plugins.toast_failed_to_load_plugins": "โหลดปลั๊กอินไม่สำเร็จ", "plugins.tooltip_update_plugin_to": "อัปเดตปลั๊กอินเป็น รุ่น{{latestVersion}}", "reset.accessories_will_may_need_to_be_reconfigured": "หลังจากดำเนินการนี้แล้วอุปกรณ์เสริมบางอย่างอาจต้องได้รับการกำหนดค่าใหม่ใน HomeKit หรือเพิ่มเข้าไปใหม่ในระบบอัตโนมัติของคุณ", @@ -316,7 +316,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 +343,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 +360,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": "เซิร์ฟเวอร์", From a8dceaef1a12c52e16b10cac548cf835ce9953fd Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sat, 11 Nov 2023 18:00:50 +0000 Subject: [PATCH 03/34] test plugin logs --- ui/package-lock.json | 7 +++ ui/package.json | 1 + ui/src/app/core/log.service.ts | 18 +++++- .../manage-plugins/manage-plugins.module.ts | 2 + .../plugin-log-modal.component.html | 16 +++++ .../plugin-log-modal.component.scss | 0 .../plugin-log-modal.component.ts | 62 +++++++++++++++++++ .../plugin-card/plugin-card.component.html | 4 ++ .../plugin-card/plugin-card.component.ts | 10 +++ ui/src/i18n/th.json | 2 +- 10 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html create mode 100644 ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.scss create mode 100644 ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts diff --git a/ui/package-lock.json b/ui/package-lock.json index 32bc42d15..d150443b0 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -66,6 +66,7 @@ "@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/node": "^18.18.9", "@types/qrcode": "^1.5.5", "@types/semver": "^7.5.5", @@ -3616,6 +3617,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", diff --git a/ui/package.json b/ui/package.json index ef080dffb..b8c9c566b 100644 --- a/ui/package.json +++ b/ui/package.json @@ -68,6 +68,7 @@ "@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/node": "^18.18.9", "@types/qrcode": "^1.5.5", "@types/semver": "^7.5.5", diff --git a/ui/src/app/core/log.service.ts b/ui/src/app/core/log.service.ts index 8d2ef4f46..fffd652e9 100644 --- a/ui/src/app/core/log.service.ts +++ b/ui/src/app/core/log.service.ts @@ -18,6 +18,7 @@ export class LogService { private webLinksAddon: WebLinksAddon; private resize: Subject; private elementResize: Subject | undefined; + private pluginName: string; constructor( private $ws: WsService, @@ -26,7 +27,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 +79,16 @@ 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 regexPattern = new RegExp(`\\[.+?\] \\[(${pluginName})\].+?\\n`, 'g'); + (data.match(regexPattern) || []).forEach((line: string) => { + this.term.write(line + '\r'); + console.log(line); + }); + } else { + this.term.write(data); + } }); // handle resize events from the client 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..2a55597a2 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins.module.ts +++ b/ui/src/app/core/manage-plugins/manage-plugins.module.ts @@ -17,6 +17,7 @@ import { NodeUpdateRequiredModalComponent } from './node-update-required-modal/n import { ManualPluginConfigModalComponent } from './manual-plugin-config-modal/manual-plugin-config-modal.component'; import { SelectPreviousVersionComponent } from './select-previous-version/select-previous-version.component'; import { BridgePluginsModalComponent } from './bridge-plugins-modal/bridge-plugins-modal.component'; +import { PluginLogModalComponent } from '@/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component'; @NgModule({ declarations: [ @@ -28,6 +29,7 @@ import { BridgePluginsModalComponent } from './bridge-plugins-modal/bridge-plugi ManualPluginConfigModalComponent, SelectPreviousVersionComponent, BridgePluginsModalComponent, + PluginLogModalComponent, ], imports: [ CommonModule, 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..3426bcd74 --- /dev/null +++ b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html @@ -0,0 +1,16 @@ +
+
+
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..a32eb9389 --- /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 { ToastrService } from 'ngx-toastr'; + +import { ApiService } from '@/app/core/api.service'; +import { TranslateService } from '@ngx-translate/core'; +import { LogService } from '@/app/core/log.service'; +import { Subject } from 'rxjs'; + +@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(event) { + this.resizeEvent.next(undefined); + } + + getPluginLog() { + // Get the plugin name as configured in the config file + this.$api.get(`/config-editor/plugin/${this.plugin.name}`).subscribe( + (result) => { + const logAlias = this.plugin.name === 'homebridge-config-ui-x' ? 'Homebridge UI' : result[0].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/modules/plugins/plugin-card/plugin-card.component.html b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html index 58bee0e16..1ffaa8896 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 @@ -112,6 +112,10 @@

{{ 'plugins.manage.message_install_alternate_version' | translate }} + -
+
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 1ffaa8896..746db2274 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 @@ -99,7 +99,7 @@

- + @@ -113,19 +113,18 @@

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

-
+
    diff --git a/ui/src/app/modules/settings/settings.component.ts b/ui/src/app/modules/settings/settings.component.ts index f89ccb240..cf5570d60 100644 --- a/ui/src/app/modules/settings/settings.component.ts +++ b/ui/src/app/modules/settings/settings.component.ts @@ -1,11 +1,9 @@ import { Component, OnInit } from '@angular/core'; -import { UntypedFormBuilder, UntypedFormControl, FormGroup, FormControl } from '@angular/forms'; +import { UntypedFormControl, FormGroup, FormControl } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; -import { ActivatedRoute, Router } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; +import { Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { debounceTime } from 'rxjs/operators'; -import * as semver from 'semver'; import { SettingsService } from '@/app/core/settings.service'; import { ApiService } from '@/app/core/api.service'; @@ -38,7 +36,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 +45,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() { @@ -119,26 +113,16 @@ export class SettingsComponent implements OnInit { 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 +177,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/shared/layout/layout.component.html b/ui/src/app/shared/layout/layout.component.html index 213763ff7..f84bbacee 100644 --- a/ui/src/app/shared/layout/layout.component.html +++ b/ui/src/app/shared/layout/layout.component.html @@ -62,7 +62,7 @@ *ngIf="$settings.env.enableTerminalAccess && $auth.user.admin" routerLink="/platform-tools/terminal"> {{ 'menu.linux.label_terminal' | translate }} - + {{ 'menu.linux.label_logs' | translate }}
    @@ -81,9 +81,6 @@ {{'menu.tooltip_user_accounts' | translate}}
    - - {{ 'menu.tooltip_restart' | translate }} - {{ 'menu.docker.label_startup_script' | translate }} @@ -100,7 +97,10 @@ *ngIf="$settings.env.canShutdownRestartHost && $auth.user.admin" (click)="shutdownServer()"> {{ 'menu.linux.label_shutdown_server' | translate }} -
    + + {{ 'menu.tooltip_restart' | translate }} + +
    {{ 'menu.tooltip_logout' | translate }} - {{ $auth.user.username }} diff --git a/ui/src/i18n/bg.json b/ui/src/i18n/bg.json index d2d363807..bd324427f 100644 --- a/ui/src/i18n/bg.json +++ b/ui/src/i18n/bg.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/ca.json b/ui/src/i18n/ca.json index 0b2930acd..26286ecf5 100644 --- a/ui/src/i18n/ca.json +++ b/ui/src/i18n/ca.json @@ -212,6 +212,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}}.", diff --git a/ui/src/i18n/cs.json b/ui/src/i18n/cs.json index cd7c78f9a..0dd5533c4 100644 --- a/ui/src/i18n/cs.json +++ b/ui/src/i18n/cs.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/de.json b/ui/src/i18n/de.json index 52b714805..362a525bf 100644 --- a/ui/src/i18n/de.json +++ b/ui/src/i18n/de.json @@ -212,6 +212,7 @@ "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 }}.", diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json index 9f68bea6b..ac10cc355 100644 --- a/ui/src/i18n/en.json +++ b/ui/src/i18n/en.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/es.json b/ui/src/i18n/es.json index a6a6dbc13..1bef83487 100644 --- a/ui/src/i18n/es.json +++ b/ui/src/i18n/es.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/fr.json b/ui/src/i18n/fr.json index b79e53389..aa2144b8b 100644 --- a/ui/src/i18n/fr.json +++ b/ui/src/i18n/fr.json @@ -212,6 +212,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": "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 }}.", diff --git a/ui/src/i18n/he.json b/ui/src/i18n/he.json index 675bd583e..d207a020f 100644 --- a/ui/src/i18n/he.json +++ b/ui/src/i18n/he.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/hu.json b/ui/src/i18n/hu.json index 8b829f666..a067fcb6e 100644 --- a/ui/src/i18n/hu.json +++ b/ui/src/i18n/hu.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/id.json b/ui/src/i18n/id.json index cef88893b..59a371c09 100644 --- a/ui/src/i18n/id.json +++ b/ui/src/i18n/id.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/it.json b/ui/src/i18n/it.json index 3b5b6c788..05466bcde 100644 --- a/ui/src/i18n/it.json +++ b/ui/src/i18n/it.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/ja.json b/ui/src/i18n/ja.json index f837d56bd..95a39f572 100644 --- a/ui/src/i18n/ja.json +++ b/ui/src/i18n/ja.json @@ -212,6 +212,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 }} を実行しています。", diff --git a/ui/src/i18n/ko.json b/ui/src/i18n/ko.json index da31ab26e..4890d2599 100644 --- a/ui/src/i18n/ko.json +++ b/ui/src/i18n/ko.json @@ -212,6 +212,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 }} 입니다.", diff --git a/ui/src/i18n/mk.json b/ui/src/i18n/mk.json index 2ffdc6c14..906528041 100644 --- a/ui/src/i18n/mk.json +++ b/ui/src/i18n/mk.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/nl.json b/ui/src/i18n/nl.json index 279bc6a63..6edb45e26 100644 --- a/ui/src/i18n/nl.json +++ b/ui/src/i18n/nl.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/no.json b/ui/src/i18n/no.json index ea32b9915..757af9641 100644 --- a/ui/src/i18n/no.json +++ b/ui/src/i18n/no.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/pl.json b/ui/src/i18n/pl.json index 39c5e54c9..297375ab1 100644 --- a/ui/src/i18n/pl.json +++ b/ui/src/i18n/pl.json @@ -212,6 +212,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": "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 }}.", diff --git a/ui/src/i18n/pt-BR.json b/ui/src/i18n/pt-BR.json index 4fefaca15..0d3feafb1 100644 --- a/ui/src/i18n/pt-BR.json +++ b/ui/src/i18n/pt-BR.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/pt.json b/ui/src/i18n/pt.json index fb5435294..d78168374 100644 --- a/ui/src/i18n/pt.json +++ b/ui/src/i18n/pt.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/ru.json b/ui/src/i18n/ru.json index 647b6ba6c..b609a3ad4 100644 --- a/ui/src/i18n/ru.json +++ b/ui/src/i18n/ru.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/sl.json b/ui/src/i18n/sl.json index dbaceb23e..77ac1b16c 100644 --- a/ui/src/i18n/sl.json +++ b/ui/src/i18n/sl.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/sv.json b/ui/src/i18n/sv.json index bfb893a33..304124d23 100644 --- a/ui/src/i18n/sv.json +++ b/ui/src/i18n/sv.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/th.json b/ui/src/i18n/th.json index b6deb4b13..ea87f20cc 100644 --- a/ui/src/i18n/th.json +++ b/ui/src/i18n/th.json @@ -212,6 +212,7 @@ "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 }}.", diff --git a/ui/src/i18n/tr.json b/ui/src/i18n/tr.json index 689d44d7e..c356f7c3c 100644 --- a/ui/src/i18n/tr.json +++ b/ui/src/i18n/tr.json @@ -212,6 +212,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.", diff --git a/ui/src/i18n/uk.json b/ui/src/i18n/uk.json index dfd7579fe..8c7051e02 100644 --- a/ui/src/i18n/uk.json +++ b/ui/src/i18n/uk.json @@ -212,6 +212,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 }}.", diff --git a/ui/src/i18n/zh-CN.json b/ui/src/i18n/zh-CN.json index 7ece97c35..4fc36becc 100644 --- a/ui/src/i18n/zh-CN.json +++ b/ui/src/i18n/zh-CN.json @@ -212,6 +212,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 }}。", diff --git a/ui/src/i18n/zh-TW.json b/ui/src/i18n/zh-TW.json index fb70afecd..d857b6eb9 100644 --- a/ui/src/i18n/zh-TW.json +++ b/ui/src/i18n/zh-TW.json @@ -212,6 +212,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 }}。", From 382e206e705ad5bf71bf5a3edd6c06a25efa6bb9 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sun, 12 Nov 2023 13:20:50 +0000 Subject: [PATCH 22/34] reset xterm, fix labels --- index.js | 26 +++++++++++++++++ ui/package-lock.json | 28 +++++++++---------- ui/package.json | 6 ++-- .../plugin-card/plugin-card.component.html | 4 +-- 4 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 index.js diff --git a/index.js b/index.js new file mode 100644 index 000000000..f4a8ef962 --- /dev/null +++ b/index.js @@ -0,0 +1,26 @@ +const data = '\u001b[37m[11/11/2023, 21:35:35] \u001b[39m\u001b[36m[Govee]\u001b[39m [Desk Lamp]\n\r'; + +const pluginName = 'Goveer'; + +const readLines = () => { + const lines = data.split('\n'); + let includeNextLine = false; + + lines.forEach((line) => { + if (includeNextLine) { + if (line.match(/ \u001b\[39m\u001b\[36m\[.*?]\u001b\[39m /)) { + includeNextLine = false; + } else { + console.log(line); + return; + } + } + + if (line.includes(` \u001b[39m\u001b[36m[${pluginName}]\u001b[39m `)) { + console.log(line); + includeNextLine = true; + } + }); +}; + +readLines(); diff --git a/ui/package-lock.json b/ui/package-lock.json index 2d50e3c1f..ecf82a358 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -49,9 +49,9 @@ "semver": "7.5.4", "socket.io-client": "2.5.0", "tslib": "2.6.2", - "xterm": "5.0.0", - "xterm-addon-fit": "0.8.0", - "xterm-addon-web-links": "0.9.0", + "xterm": "4.19.0", + "xterm-addon-fit": "0.5.0", + "xterm-addon-web-links": "0.6.0", "zone.js": "0.12.0" }, "devDependencies": { @@ -15221,24 +15221,24 @@ } }, "node_modules/xterm": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.0.0.tgz", - "integrity": "sha512-tmVsKzZovAYNDIaUinfz+VDclraQpPUnAME+JawosgWRMphInDded/PuY0xmU5dOhyeYZsI0nz5yd8dPYsdLTA==" + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.19.0.tgz", + "integrity": "sha512-c3Cp4eOVsYY5Q839dR5IejghRPpxciGmLWWaP9g+ppfMeBChMeLa1DCA+pmX/jyDZ+zxFOmlJL/82qVdayVoGQ==" }, "node_modules/xterm-addon-fit": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz", - "integrity": "sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz", + "integrity": "sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ==", "peerDependencies": { - "xterm": "^5.0.0" + "xterm": "^4.0.0" } }, "node_modules/xterm-addon-web-links": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/xterm-addon-web-links/-/xterm-addon-web-links-0.9.0.tgz", - "integrity": "sha512-LIzi4jBbPlrKMZF3ihoyqayWyTXAwGfu4yprz1aK2p71e9UKXN6RRzVONR0L+Zd+Ik5tPVI9bwp9e8fDTQh49Q==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/xterm-addon-web-links/-/xterm-addon-web-links-0.6.0.tgz", + "integrity": "sha512-H6XzjWWZu8FBo+fnYpxdPk9w5M6drbsvwPEJZGRS38MihiQaVFpKlCMKdfRgDbKGE530tw1yH54rhpZfHgt2/A==", "peerDependencies": { - "xterm": "^5.0.0" + "xterm": "^4.0.0" } }, "node_modules/y18n": { diff --git a/ui/package.json b/ui/package.json index c2ddf87a9..08221e920 100644 --- a/ui/package.json +++ b/ui/package.json @@ -51,9 +51,9 @@ "semver": "7.5.4", "socket.io-client": "2.5.0", "tslib": "2.6.2", - "xterm": "5.0.0", - "xterm-addon-fit": "0.8.0", - "xterm-addon-web-links": "0.9.0", + "xterm": "4.19.0", + "xterm-addon-fit": "0.5.0", + "xterm-addon-web-links": "0.6.0", "zone.js": "0.12.0" }, "devDependencies": { 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 746db2274..533af0da6 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 @@ -113,11 +113,11 @@

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

diff --git a/ui/src/app/shared/layout/layout.component.html b/ui/src/app/shared/layout/layout.component.html index f84bbacee..cec49543a 100644 --- a/ui/src/app/shared/layout/layout.component.html +++ b/ui/src/app/shared/layout/layout.component.html @@ -65,6 +65,9 @@ {{ 'menu.linux.label_logs' | translate }} + + Restart Options +
Homebridge {{ 'menu.docker.label_settings' | translate }} @@ -80,26 +83,6 @@ {{'menu.tooltip_user_accounts' | 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_restart' | 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..a21dee452 100644 --- a/ui/src/app/shared/layout/layout.component.ts +++ b/ui/src/app/shared/layout/layout.component.ts @@ -14,6 +14,7 @@ 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 { RestartOptionsModalComponent } from '@/app/shared/layout/restart-options-modal/restart-options-modal-component'; @Component({ selector: 'app-layout', @@ -88,49 +89,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() { + const ref = this.$modal.open(RestartOptionsModalComponent); } async compareServerUiVersion() { 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..d16727c5a --- /dev/null +++ b/ui/src/app/shared/layout/restart-options-modal/restart-options-modal-component.ts @@ -0,0 +1,44 @@ +import { Component, OnInit } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { SettingsService } from '@/app/core/settings.service'; +import { Router } from '@angular/router'; + +@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 $router: Router, + public $settings: SettingsService, + ) { } + + ngOnInit() {} + + restartHomebridge() { + this.$router.navigate(['/restart']); + this.activeModal.close(); + } + + 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/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..b3a388012 --- /dev/null +++ b/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.html @@ -0,0 +1,36 @@ +
+
+
Restart Options
+ +
+
+

+ +

+

+ +

+

+ +

+

+ +

+

+ +

+
+
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 From 43d856401625dce61b0ab1fec24b1a29c8e42e3c Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sun, 12 Nov 2023 14:44:44 +0000 Subject: [PATCH 25/34] fix --- index.js | 26 ------------------- ui/src/app/app.module.ts | 2 +- ui/src/app/shared/layout/layout.component.ts | 2 +- ....ts => restart-options-modal.component.ts} | 0 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 index.js rename ui/src/app/shared/layout/restart-options-modal/{restart-options-modal-component.ts => restart-options-modal.component.ts} (100%) diff --git a/index.js b/index.js deleted file mode 100644 index f4a8ef962..000000000 --- a/index.js +++ /dev/null @@ -1,26 +0,0 @@ -const data = '\u001b[37m[11/11/2023, 21:35:35] \u001b[39m\u001b[36m[Govee]\u001b[39m [Desk Lamp]\n\r'; - -const pluginName = 'Goveer'; - -const readLines = () => { - const lines = data.split('\n'); - let includeNextLine = false; - - lines.forEach((line) => { - if (includeNextLine) { - if (line.match(/ \u001b\[39m\u001b\[36m\[.*?]\u001b\[39m /)) { - includeNextLine = false; - } else { - console.log(line); - return; - } - } - - if (line.includes(` \u001b[39m\u001b[36m[${pluginName}]\u001b[39m `)) { - console.log(line); - includeNextLine = true; - } - }); -}; - -readLines(); diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 6e57db77a..de649d6a5 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -19,7 +19,7 @@ import { LayoutComponent } from './shared/layout/layout.component'; import { RestartModule } from './modules/restart/restart.module'; import { StatusModule } from './modules/status/status.module'; import { LoginModule } from './modules/login/login.module'; -import { RestartOptionsModalComponent } from '@/app/shared/layout/restart-options-modal/restart-options-modal-component'; +import { RestartOptionsModalComponent } from '@/app/shared/layout/restart-options-modal/restart-options-modal.component'; @NgModule({ declarations: [ diff --git a/ui/src/app/shared/layout/layout.component.ts b/ui/src/app/shared/layout/layout.component.ts index a21dee452..a0da1d895 100644 --- a/ui/src/app/shared/layout/layout.component.ts +++ b/ui/src/app/shared/layout/layout.component.ts @@ -14,7 +14,7 @@ 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 { RestartOptionsModalComponent } from '@/app/shared/layout/restart-options-modal/restart-options-modal-component'; +import { RestartOptionsModalComponent } from '@/app/shared/layout/restart-options-modal/restart-options-modal.component'; @Component({ selector: 'app-layout', 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 similarity index 100% rename from ui/src/app/shared/layout/restart-options-modal/restart-options-modal-component.ts rename to ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.ts From 824ef9c25b9e2869d0f9349057785f3a1d20825d Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sun, 12 Nov 2023 15:38:45 +0000 Subject: [PATCH 26/34] restart child bridge after save setting custom ui --- .../custom-plugins.component.html | 29 +++++++-- .../custom-plugins.component.ts | 60 ++++++++++++++++--- .../plugin-log-modal.component.html | 3 +- ui/src/i18n/en.json | 2 +- 4 files changed, 80 insertions(+), 14 deletions(-) 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..1c44f4036 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 @@ -7,7 +7,30 @@
{{ plugin.displayName || plugin.name }}
-
+
+

+ Restart Required +

+

+ Please restart Homebridge for the changes to apply. +

+

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

+
+ + +
+
+ +
@@ -45,7 +68,7 @@
{{ 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..d0bc87665 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 @@ -9,6 +9,7 @@ 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 { Router } from '@angular/router'; @Component({ selector: 'app-custom-plugins', @@ -29,8 +30,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; @@ -57,6 +60,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 +406,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 +432,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 +451,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/plugin-log-modal/plugin-log-modal.component.html b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html index be638a437..81ff6bed0 100644 --- 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 @@ -7,7 +7,6 @@
Logs: {{ plugin.displayName || plugin.name }}
-
- +
diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json index ac10cc355..6ee58837f 100644 --- a/ui/src/i18n/en.json +++ b/ui/src/i18n/en.json @@ -170,7 +170,7 @@ "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": "Homebridge Restart Required", "plugins.button_api_documentation": "API Documentation", "plugins.button_homepage": "Plugin Homepage", "plugins.button_install": "Install", From 71ad624427433a83fb098103dd40e3e3e555b513 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sun, 12 Nov 2023 18:32:04 +0000 Subject: [PATCH 27/34] consistent modal footers --- ui/.eslintrc.json | 7 ++ ui/package-lock.json | 42 +++++++++++ ui/package.json | 5 +- ui/src/app/app-routing.module.ts | 9 ++- ui/src/app/app.component.ts | 9 +-- ui/src/app/app.module.ts | 24 +++---- .../core/accessories/accessories.module.ts | 70 +++++++++---------- .../core/accessories/accessories.service.ts | 8 +-- .../accessory-tile.component.ts | 1 - .../info-modal/info-modal.component.html | 12 +++- .../info-modal/info-modal.component.ts | 2 +- .../airpurifier/airpurifier.component.ts | 3 +- .../airpurifier.manage.component.html | 4 +- .../airpurifier.manage.component.ts | 5 +- .../airqualitysensor.component.ts | 2 +- .../batteryservice.component.ts | 2 +- .../contactsensor/contactsensor.component.ts | 2 +- .../accessories/types/door/door.component.ts | 3 +- .../types/door/door.manage.component.html | 2 +- .../types/door/door.manage.component.ts | 5 +- .../accessories/types/fan/fan.component.ts | 3 +- .../types/fan/fan.manage.component.html | 4 +- .../types/fan/fan.manage.component.ts | 5 +- .../types/fanv2/fanv2.component.ts | 3 +- .../types/fanv2/fanv2.manage.component.html | 4 +- .../types/fanv2/fanv2.manage.component.ts | 5 +- .../garagedooropener.component.ts | 2 +- .../heatercooler/heatercooler.component.ts | 3 +- .../heatercooler.manage.component.html | 4 +- .../heatercooler.manage.component.ts | 5 +- .../humidifierdehumidifier.component.ts | 3 +- ...midifierdehumidifier.manage.component.html | 4 +- ...humidifierdehumidifier.manage.component.ts | 5 +- .../humiditysensor.component.ts | 2 +- .../types/leaksensor/leaksensor.component.ts | 2 +- .../types/lightbulb/lightbulb.component.ts | 3 +- .../lightbulb/lightbulb.manage.component.html | 4 +- .../lightbulb/lightbulb.manage.component.ts | 5 +- .../lightsensor/lightsensor.component.ts | 2 +- .../lockmechanism/lockmechanism.component.ts | 2 +- .../motionsensor/motionsensor.component.ts | 2 +- .../occupancysensor.component.ts | 2 +- .../types/outlet/outlet.component.ts | 2 +- .../securitysystem.component.ts | 3 +- .../securitysystem.manage.component.html | 4 +- .../securitysystem.manage.component.ts | 2 +- .../smokesensor/smokesensor.component.ts | 2 +- .../types/speaker/speaker.component.ts | 3 +- .../speaker/speaker.manage.component.html | 4 +- .../types/speaker/speaker.manage.component.ts | 5 +- .../statelessprogrammableswitch.component.ts | 2 +- .../types/switch/switch.component.ts | 2 +- .../types/television/television.component.ts | 2 +- .../temperaturesensor.component.ts | 2 +- .../types/thermostat/thermostat.component.ts | 3 +- .../thermostat.manage.component.html | 4 +- .../thermostat/thermostat.manage.component.ts | 5 +- .../types/unknown/unknown.component.ts | 2 +- .../types/valve/valve.component.ts | 12 ++-- .../types/valve/valve.manage.component.html | 4 +- .../types/valve/valve.manage.component.ts | 4 +- .../types/window/window.component.ts | 3 +- .../types/window/window.manage.component.html | 2 +- .../types/window/window.manage.component.ts | 5 +- .../windowcovering.component.ts | 3 +- .../windowcovering.manage.component.html | 4 +- .../windowcovering.manage.component.ts | 5 +- ui/src/app/core/api.service.ts | 5 +- ui/src/app/core/auth/admin.guard.ts | 10 ++- ui/src/app/core/auth/auth.guard.ts | 10 ++- ui/src/app/core/auth/auth.module.ts | 17 ++--- ui/src/app/core/auth/auth.service.ts | 3 +- .../backup-restore.component.html | 32 ++++++--- .../backup-restore.component.ts | 12 ++-- .../scheduled-backups.component.html | 26 +++---- .../scheduled-backups.component.ts | 3 +- .../components/confirm/confirm.component.html | 28 ++++---- .../components/confirm/confirm.component.ts | 9 +-- .../information/information.component.html | 25 ++++--- .../components/qrcode/qrcode.component.ts | 8 ++- .../schema-form/schema-form.component.ts | 7 +- ui/src/app/core/core.module.ts | 19 +++-- .../json-schema-form-patch.directive.ts | 12 +++- .../core/directives/longclick.directive.ts | 9 ++- ui/src/app/core/directives/rtl.directive.ts | 7 +- ui/src/app/core/locales.ts | 37 +++++----- ui/src/app/core/log.service.ts | 11 ++- .../bridge-plugins-modal.component.html | 24 +++---- .../bridge-plugins-modal.component.ts | 3 +- .../custom-plugins.component.html | 31 ++++---- .../custom-plugins.component.ts | 16 +++-- .../custom-plugins/custom-plugins.module.ts | 10 ++- .../custom-plugins/custom-plugins.service.ts | 3 +- .../homebridge-deconz.component.ts | 3 +- ...homebridge-google-smarthome.component.html | 2 +- .../homebridge-google-smarthome.component.ts | 12 ++-- .../homebridge-hue.component.ts | 3 +- .../manage-plugins-modal.component.html | 17 +++-- .../manage-plugins-modal.component.ts | 12 ++-- .../manage-plugins/manage-plugins.module.ts | 17 +++-- .../manage-plugins/manage-plugins.service.ts | 15 ++-- .../manual-plugin-config-modal.component.html | 20 +++--- .../manual-plugin-config-modal.component.ts | 5 +- .../node-update-required-modal.component.html | 34 +++++---- .../node-update-required-modal.component.ts | 5 +- .../plugin-log-modal.component.html | 2 +- .../plugin-log-modal.component.ts | 5 +- .../select-previous-version.component.html | 25 +++---- .../select-previous-version.component.ts | 3 +- .../settings-plugins-modal.component.html | 15 ++-- .../settings-plugins-modal.component.ts | 7 +- .../uninstall-plugins-modal.component.html | 24 ++++--- .../uninstall-plugins-modal.component.ts | 3 +- ui/src/app/core/mobile-detect.service.ts | 1 - ui/src/app/core/pipes/convert-temp.pipe.ts | 1 - ui/src/app/core/settings.service.ts | 5 +- ui/src/app/core/terminal.service.ts | 11 ++- ui/src/app/core/ws.service.ts | 3 +- .../accessories/accessories-routing.module.ts | 2 +- .../accessories/accessories.component.scss | 5 +- .../accessories/accessories.component.ts | 11 ++- .../modules/accessories/accessories.module.ts | 15 ++-- .../add-room-modal.component.html | 28 +++++--- .../add-room-modal.component.ts | 2 +- .../config-editor-routing.module.ts | 2 +- .../config-editor/config-editor.component.ts | 15 ++-- .../config-editor/config-editor.module.ts | 7 +- .../config-editor/config-editor.resolver.ts | 8 ++- .../config.restore-backup.component.html | 20 ++++-- .../config.restore-backup.component.ts | 3 +- ui/src/app/modules/login/login.component.ts | 7 +- ui/src/app/modules/login/login.guard.ts | 8 ++- ui/src/app/modules/login/login.module.ts | 3 +- .../app/modules/logs/logs-routing.module.ts | 2 +- ui/src/app/modules/logs/logs.component.ts | 20 ++++-- ui/src/app/modules/logs/logs.module.ts | 3 +- .../container-restart.component.ts | 5 +- .../docker/docker-routing.module.ts | 4 +- .../platform-tools/docker/docker.module.ts | 7 +- .../startup-script.component.ts | 7 +- .../startup-script/startup-script.resolver.ts | 8 ++- .../linux/linux-routing.module.ts | 2 +- .../platform-tools/linux/linux.module.ts | 3 +- .../restart-linux/restart-linux.component.ts | 5 +- .../shutdown-linux.component.ts | 5 +- .../platform-tools-routing.module.ts | 2 +- .../platform-tools/platform-tools.module.ts | 3 +- .../terminal/terminal-routing.module.ts | 2 +- .../terminal/terminal.component.ts | 10 ++- .../terminal/terminal.module.ts | 3 +- .../donate-modal/donate-modal.component.html | 30 +++++--- .../donate-modal/donate-modal.component.ts | 7 +- .../plugin-card/plugin-card.component.ts | 13 ++-- .../modules/plugins/plugins-routing.module.ts | 2 +- .../app/modules/plugins/plugins.component.ts | 11 ++- ui/src/app/modules/plugins/plugins.module.ts | 13 ++-- .../app/modules/restart/restart.component.ts | 7 +- ui/src/app/modules/restart/restart.module.ts | 5 +- ...ll-cached-accessories-modal.component.html | 24 ++++--- ...ngle-cached-accessory-modal.component.html | 16 +++-- ...single-cached-accessory-modal.component.ts | 2 +- .../reset-homebridge-modal.component.html | 21 ++++-- .../reset-homebridge-modal.component.ts | 4 +- .../select-network-interfaces.component.html | 24 ++++--- .../settings/settings-routing.module.ts | 5 +- .../modules/settings/settings.component.ts | 22 +++--- .../app/modules/settings/settings.module.ts | 17 ++--- .../unpair-accessory-modal.component.html | 16 +++-- .../unpair-accessory-modal.component.ts | 2 +- .../setup-wizard-routing.module.ts | 1 - .../setup-wizard/setup-wizard.component.ts | 14 ++-- .../setup-wizard/setup-wizard.guard.ts | 9 ++- .../setup-wizard/setup-wizard.module.ts | 7 +- ui/src/app/modules/status/status.component.ts | 13 ++-- ui/src/app/modules/status/status.module.ts | 34 +++++---- .../widget-add/widget-add.component.html | 38 +++++----- .../status/widget-add/widget-add.component.ts | 3 +- .../widget-control.component.html | 23 +++--- .../widget-control.component.ts | 12 +++- .../accessories-widget.component.ts | 12 ++-- .../child-bridge-widget.component.ts | 8 ++- .../clock-widget/clock-widget.component.ts | 7 +- .../cpu-widget/cpu-widget.component.ts | 16 +++-- .../hap-qrcode-widget.component.ts | 9 ++- .../homebridge-logs-widget.component.ts | 10 ++- .../homebridge-status-widget.component.ts | 7 +- .../memory-widget/memory-widget.component.ts | 15 ++-- .../network-widget.component.ts | 15 ++-- .../system-info-widget.component.ts | 7 +- .../terminal-widget.component.ts | 10 ++- .../uptime-widget/uptime-widget.component.ts | 7 +- .../weather-widget.component.ts | 12 ++-- .../status/widgets/widgets.component.ts | 28 +++++--- .../users/users-add/users-add.component.ts | 3 +- .../users-disable2fa.component.html | 26 ++++--- .../users-disable2fa.component.ts | 5 +- .../users/users-edit/users-edit.component.ts | 5 +- .../app/modules/users/users-routing.module.ts | 2 +- .../users-setup2fa.component.html | 23 +++--- .../users-setup2fa.component.ts | 13 ++-- ui/src/app/modules/users/users.component.ts | 9 ++- ui/src/app/modules/users/users.module.ts | 15 ++-- ui/src/app/modules/users/users.resolver.ts | 8 ++- ui/src/app/shared/layout/layout.component.ts | 23 +++--- .../restart-options-modal.component.html | 41 +++++++---- .../restart-options-modal.component.ts | 2 +- ui/src/i18n/bg.json | 2 + ui/src/i18n/ca.json | 2 + ui/src/i18n/cs.json | 2 + ui/src/i18n/de.json | 2 + ui/src/i18n/en.json | 2 + ui/src/i18n/es.json | 2 + ui/src/i18n/fr.json | 2 + ui/src/i18n/he.json | 2 + ui/src/i18n/hu.json | 2 + ui/src/i18n/id.json | 2 + ui/src/i18n/it.json | 2 + ui/src/i18n/ja.json | 2 + ui/src/i18n/ko.json | 2 + ui/src/i18n/mk.json | 2 + ui/src/i18n/nl.json | 2 + ui/src/i18n/no.json | 2 + ui/src/i18n/pl.json | 2 + ui/src/i18n/pt-BR.json | 2 + ui/src/i18n/pt.json | 2 + ui/src/i18n/ru.json | 2 + ui/src/i18n/sl.json | 2 + ui/src/i18n/sv.json | 2 + ui/src/i18n/th.json | 2 + ui/src/i18n/tr.json | 2 + ui/src/i18n/uk.json | 2 + ui/src/i18n/zh-CN.json | 2 + ui/src/i18n/zh-TW.json | 2 + ui/src/main.ts | 3 - 234 files changed, 1144 insertions(+), 880 deletions(-) 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 ecf82a358..7245e387d 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -67,6 +67,7 @@ "@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", @@ -77,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" } @@ -3650,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", @@ -7384,6 +7402,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", @@ -7479,6 +7512,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", diff --git a/ui/package.json b/ui/package.json index 08221e920..07b36e2ae 100644 --- a/ui/package.json +++ b/ui/package.json @@ -7,7 +7,7 @@ "ng": "ng", "start": "ng serve", "build": "ng build --configuration production --output-path=../public --source-map=false --aot=true", - "lint": "ng lint" + "lint": "ng lint --fix" }, "private": true, "dependencies": { @@ -69,6 +69,7 @@ "@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", @@ -79,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..004cdd256 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({ @@ -57,11 +56,7 @@ export class AppComponent { // 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 de649d6a5..efbc158dd 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -1,24 +1,22 @@ +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({ 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..f1bd00451 100644 --- a/ui/src/app/core/accessories/accessories.service.ts +++ b/ui/src/app/core/accessories/accessories.service.ts @@ -1,12 +1,11 @@ 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 { AuthService } from '../auth/auth.service'; +import { IoNamespace, WsService } from '../ws.service'; import { ServiceTypeX } from './accessories.interfaces'; import { InfoModalComponent } from './info-modal/info-modal.component'; @@ -320,5 +319,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..cf54515bd 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,11 @@
{{ 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.ts b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts index fca9bcf1d..1d59eecea 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({ 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..999cd0836 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,7 +2,7 @@
@@ -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.ts b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts index 73ab97218..53ed63999 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({ 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..6efd3dcde 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,7 +2,7 @@
@@ -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..ec49c40c1 100644 --- a/ui/src/app/core/components/confirm/confirm.component.html +++ b/ui/src/app/core/components/confirm/confirm.component.html @@ -1,20 +1,24 @@ -
+
{{ 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 a84fb794a..63441b70a 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', @@ -11,16 +10,10 @@ export class ConfirmComponent implements OnInit { @Input() title: string; @Input() message: string; @Input() confirmButtonLabel: string; - @Input() cancelButtonLabel: string; 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..df850db26 100644 --- a/ui/src/app/core/components/information/information.component.html +++ b/ui/src/app/core/components/information/information.component.html @@ -1,17 +1,24 @@ -
+
{{ title }}
-
-
-

{{ message }}

+
+

{{ message }}

-
- - {{ ctaButtonLabel }} - +
+
+ +
+
+
+ + {{ ctaButtonLabel }} + +
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/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..b413a5668 100644 --- a/ui/src/app/core/core.module.ts +++ b/ui/src/app/core/core.module.ts @@ -1,21 +1,20 @@ -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'; @NgModule({ 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 95894daf2..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', 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..8692cab5a 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,8 +4,7 @@
{{ 'child_bridge.label_bridge_settings' | translate }}: {{ plugin.displayName || plugin.name }}
-
@@ -111,24 +110,21 @@
-
- +
+
- -
+
+ class="pr-3 manage-plugin-config-external-icons dark-mode-highlight"> + class="manage-plugin-config-external-icons dark-mode-highlight">
- -
- -
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..e781c4b82 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 @@ -2,10 +2,9 @@ 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 { SettingsService } from '@/app/core/settings.service'; import { NotificationService } from '@/app/core/notification.service'; +import { SettingsService } from '@/app/core/settings.service'; @Component({ selector: 'app-bridge-plugins-modal', 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 1c44f4036..fa6bed04d 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,8 +1,10 @@
-
{{ plugin.displayName || plugin.name }}
-
@@ -69,29 +71,28 @@

-
- +
+
- -
+
- -
- +
+
+
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 d0bc87665..65a21d3a1 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,15 +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 { Router } from '@angular/router'; +import { WsService } from '@/app/core/ws.service'; +import { environment } from '@/environments/environment'; @Component({ selector: 'app-custom-plugins', 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..8646591ec 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 @@ -56,10 +56,17 @@

{{ 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..1edce20c7 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,19 @@ -import { Component, OnInit, Input, OnDestroy } from '@angular/core'; +import { + Component, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; import { Router } from '@angular/router'; -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 { Terminal } from 'xterm'; import { FitAddon } from 'xterm-addon-fit'; - import { ApiService } from '@/app/core/api.service'; +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', 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 2a55597a2..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,21 @@ -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({ 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..488f27e43 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 @@ -2,13 +2,12 @@ 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 * as JSON5 from 'json5'; - +import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; -import { SettingsService } from '@/app/core/settings.service'; 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', 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 index 81ff6bed0..0970989bf 100644 --- 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 @@ -2,7 +2,7 @@
Logs: {{ plugin.displayName || plugin.name }}
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 index 664772ea3..638dec239 100644 --- 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 @@ -8,12 +8,11 @@ import { 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 { TranslateService } from '@ngx-translate/core'; import { LogService } from '@/app/core/log.service'; -import { Subject } from 'rxjs'; @Component({ selector: 'app-plugin-log-modal', 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..13e67ea5e 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 }}
-
@@ -23,16 +22,18 @@
{{'plugins.manage.label_install' | translate}}: {{ plugi
-
-
- - +
+
+ +
+
+
+ +
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..f08093aa6 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,8 +4,7 @@
{{'plugins.settings.title_settings' | translate}}: {{ plugin.displayName || plugin.name }}
-
@@ -56,12 +55,11 @@
{{ block.name }}
-
- +
+
- -
+
{{ 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..182710103 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,11 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; +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 { 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; 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..01bcac9a7 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,8 +1,7 @@
{{'plugins.manage.label_uninstall' | translate}}: {{ plugin.displayName || plugin.name }}
-
@@ -28,15 +27,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..fcfae9299 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) => { 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..e2c446d4d 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 { diff --git a/ui/src/app/core/terminal.service.ts b/ui/src/app/core/terminal.service.ts index 763a1728f..0c4fd7c69 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 { FitAddon } from 'xterm-addon-fit'; -import { WebLinksAddon } from 'xterm-addon-web-links'; +import { ElementRef, Injectable } from '@angular/core'; import { Subject, Subscription } 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', diff --git a/ui/src/app/core/ws.service.ts b/ui/src/app/core/ws.service.ts index cafa8d93d..c0d260727 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; 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.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..147f535db 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 { 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 { NotificationService } from '@/app/core/notification.service'; +import { SettingsService } from '@/app/core/settings.service'; @Component({ selector: 'app-config', 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..e4470d485 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,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/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..b18409fac 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({ diff --git a/ui/src/app/modules/login/login.component.ts b/ui/src/app/modules/login/login.component.ts index 70c869033..a214fe603 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', diff --git a/ui/src/app/modules/login/login.guard.ts b/ui/src/app/modules/login/login.guard.ts index 2bfd48161..2d3a1fbe1 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'; 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..ff750cc8e 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', 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..1a5ecb4f3 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.ts b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts index 64652f274..154d79847 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,16 +2,15 @@ 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 { ApiService } from '@/app/core/api.service'; -import { WsService } from '@/app/core/ws.service'; -import { NotificationService } from '@/app/core/notification.service'; -import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; -import { MobileDetectService } from '@/app/core/mobile-detect.service'; import { ConfirmComponent } from '@/app/core/components/confirm/confirm.component'; -import { DonateModalComponent } from '@/app/modules/plugins/donate-modal/donate-modal.component'; import { InformationComponent } from '@/app/core/components/information/information.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 { NotificationService } from '@/app/core/notification.service'; +import { WsService } from '@/app/core/ws.service'; +import { DonateModalComponent } from '@/app/modules/plugins/donate-modal/donate-modal.component'; @Component({ selector: 'app-plugin-card', @@ -83,7 +82,6 @@ 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.result.then(async () => { try { @@ -113,7 +111,6 @@ 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.result.then(async () => { 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.ts b/ui/src/app/modules/plugins/plugins.component.ts index 37b58273c..8388c5494 100644 --- a/ui/src/app/modules/plugins/plugins.component.ts +++ b/ui/src/app/modules/plugins/plugins.component.ts @@ -1,15 +1,14 @@ -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 { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; +import { Subscription } from 'rxjs'; import { take } from 'rxjs/operators'; - -import { SettingsService } from '@/app/core/settings.service'; import { ApiService } from '@/app/core/api.service'; -import { WsService } from '@/app/core/ws.service'; import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; -import { Subscription } from 'rxjs'; +import { SettingsService } from '@/app/core/settings.service'; +import { WsService } from '@/app/core/ws.service'; @Component({ selector: 'app-plugins', 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..829478c75 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', diff --git a/ui/src/app/modules/restart/restart.module.ts b/ui/src/app/modules/restart/restart.module.ts index 0dd56a29e..deb269b21 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: [ 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-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..86cc21504 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({ 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..14f0cde06 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..3e7962f99 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'; 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/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.ts b/ui/src/app/modules/settings/settings.component.ts index cf5570d60..2a5597d5f 100644 --- a/ui/src/app/modules/settings/settings.component.ts +++ b/ui/src/app/modules/settings/settings.component.ts @@ -1,23 +1,17 @@ import { Component, OnInit } from '@angular/core'; -import { UntypedFormControl, FormGroup, FormControl } from '@angular/forms'; -import { ToastrService } from 'ngx-toastr'; +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 { 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', 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..b63128f95 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({ 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..5f274e9d3 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,20 @@ 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 { Router } from '@angular/router'; 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', 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..9abb824c0 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,11 @@ -import { SettingsService } from '@/app/core/settings.service'; import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; +import { + ActivatedRouteSnapshot, + CanActivate, + Router, + RouterStateSnapshot, +} from '@angular/router'; +import { SettingsService } from '@/app/core/settings.service'; @Injectable({ providedIn: 'root', 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.ts b/ui/src/app/modules/status/status.component.ts index 56144e9f7..4c7604129 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', 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..c3e1dc55e 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..0ba08cf30 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({ 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..bcf83e516 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({ 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.ts b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts index d2eb4c3dc..82caec6fd 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', 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.ts b/ui/src/app/modules/users/users-add/users-add.component.ts index a20ad5848..dfb58f8b3 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({ 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..d285aaf26 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({ 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..083eb5f45 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'; 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..124044cdd 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({ diff --git a/ui/src/app/modules/users/users.component.ts b/ui/src/app/modules/users/users.component.ts index 49e9991b5..66b6116b8 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', 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..2885c5da9 100644 --- a/ui/src/app/modules/users/users.resolver.ts +++ b/ui/src/app/modules/users/users.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/shared/layout/layout.component.ts b/ui/src/app/shared/layout/layout.component.ts index a0da1d895..0c5d091ea 100644 --- a/ui/src/app/shared/layout/layout.component.ts +++ b/ui/src/app/shared/layout/layout.component.ts @@ -1,20 +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', 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 index b3a388012..7dc3337c8 100644 --- 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 @@ -1,36 +1,49 @@ -
    +
    Restart Options
    -
    -
    -

    -

    -

    -

    -

    -

    -

    -

    -

    -

    +
    +
    +
    + +
    +
    +
    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 index d16727c5a..8bf6ad6ff 100644 --- 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 @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { SettingsService } from '@/app/core/settings.service'; -import { Router } from '@angular/router'; @Component({ selector: 'app-confirm', diff --git a/ui/src/i18n/bg.json b/ui/src/i18n/bg.json index bd324427f..3e1fd0cf2 100644 --- a/ui/src/i18n/bg.json +++ b/ui/src/i18n/bg.json @@ -114,7 +114,9 @@ "form.button_cancel": "Отказ", "form.button_close": "Затвори", "form.button_delete": "Изтрий", + "form.button_disable": "Disable", "form.button_edit": "Промени", + "form.button_enable": "Enable", "form.button_save": "Запази", "login.button_login": "Вписване", "login.label_2fa_code": "Two Factor Authentication Code", diff --git a/ui/src/i18n/ca.json b/ui/src/i18n/ca.json index 26286ecf5..340ca713e 100644 --- a/ui/src/i18n/ca.json +++ b/ui/src/i18n/ca.json @@ -114,7 +114,9 @@ "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_save": "Guardar", "login.button_login": "Iniciar Sesión", "login.label_2fa_code": "Codi 2FA", diff --git a/ui/src/i18n/cs.json b/ui/src/i18n/cs.json index 0dd5533c4..d134994b6 100644 --- a/ui/src/i18n/cs.json +++ b/ui/src/i18n/cs.json @@ -114,7 +114,9 @@ "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_save": "Uložit", "login.button_login": "Přihlásit se", "login.label_2fa_code": "Dvoufaktorový kód", diff --git a/ui/src/i18n/de.json b/ui/src/i18n/de.json index 362a525bf..9fefeaa0e 100644 --- a/ui/src/i18n/de.json +++ b/ui/src/i18n/de.json @@ -114,7 +114,9 @@ "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_save": "Speichern", "login.button_login": "Anmeldung", "login.label_2fa_code": "Zwei-Faktor-Authentifizierungs-Code", diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json index 6ee58837f..ce8679991 100644 --- a/ui/src/i18n/en.json +++ b/ui/src/i18n/en.json @@ -114,7 +114,9 @@ "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_save": "Save", "login.button_login": "Log in", "login.label_2fa_code": "Two Factor Authentication Code", diff --git a/ui/src/i18n/es.json b/ui/src/i18n/es.json index 1bef83487..c8b8944e6 100644 --- a/ui/src/i18n/es.json +++ b/ui/src/i18n/es.json @@ -114,7 +114,9 @@ "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_save": "Guardar", "login.button_login": "Iniciar sesión", "login.label_2fa_code": "Código de autenticación de dos factores", diff --git a/ui/src/i18n/fr.json b/ui/src/i18n/fr.json index aa2144b8b..e9af37ba2 100644 --- a/ui/src/i18n/fr.json +++ b/ui/src/i18n/fr.json @@ -114,7 +114,9 @@ "form.button_cancel": "Annuler", "form.button_close": "Fermer", "form.button_delete": "Supprimer", + "form.button_disable": "Disable", "form.button_edit": "Modifier", + "form.button_enable": "Enable", "form.button_save": "Enregistrer", "login.button_login": "Connexion", "login.label_2fa_code": "Code d'authentification à deux facteurs", diff --git a/ui/src/i18n/he.json b/ui/src/i18n/he.json index d207a020f..7714ef125 100644 --- a/ui/src/i18n/he.json +++ b/ui/src/i18n/he.json @@ -114,7 +114,9 @@ "form.button_cancel": "בטל", "form.button_close": "סגור", "form.button_delete": "מחק", + "form.button_disable": "Disable", "form.button_edit": "ערוך", + "form.button_enable": "Enable", "form.button_save": "שמור", "login.button_login": "התחבר", "login.label_2fa_code": "קוד גישה דו שלבית", diff --git a/ui/src/i18n/hu.json b/ui/src/i18n/hu.json index a067fcb6e..7e19f2ce4 100644 --- a/ui/src/i18n/hu.json +++ b/ui/src/i18n/hu.json @@ -114,7 +114,9 @@ "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_save": "Mentés", "login.button_login": "Bejelentkezés", "login.label_2fa_code": "Two Factor Authentication Code", diff --git a/ui/src/i18n/id.json b/ui/src/i18n/id.json index 59a371c09..8426abf4b 100644 --- a/ui/src/i18n/id.json +++ b/ui/src/i18n/id.json @@ -114,7 +114,9 @@ "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_save": "Simpan", "login.button_login": "Masuk", "login.label_2fa_code": "Kode Otentikasi Dua Faktor (2FA)", diff --git a/ui/src/i18n/it.json b/ui/src/i18n/it.json index 05466bcde..71231a3f1 100644 --- a/ui/src/i18n/it.json +++ b/ui/src/i18n/it.json @@ -114,7 +114,9 @@ "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_save": "Salva", "login.button_login": "Accedi", "login.label_2fa_code": "Codice di autenticazione a 2 fattori", diff --git a/ui/src/i18n/ja.json b/ui/src/i18n/ja.json index 95a39f572..9b20cbefb 100644 --- a/ui/src/i18n/ja.json +++ b/ui/src/i18n/ja.json @@ -114,7 +114,9 @@ "form.button_cancel": "キャンセル", "form.button_close": "閉じる", "form.button_delete": "削除", + "form.button_disable": "Disable", "form.button_edit": "編集", + "form.button_enable": "Enable", "form.button_save": "保存", "login.button_login": "ログイン", "login.label_2fa_code": "二段階認証コード", diff --git a/ui/src/i18n/ko.json b/ui/src/i18n/ko.json index 4890d2599..bf48c40b0 100644 --- a/ui/src/i18n/ko.json +++ b/ui/src/i18n/ko.json @@ -114,7 +114,9 @@ "form.button_cancel": "취소", "form.button_close": "닫기", "form.button_delete": "삭제", + "form.button_disable": "Disable", "form.button_edit": "수정", + "form.button_enable": "Enable", "form.button_save": "저장", "login.button_login": "로그인", "login.label_2fa_code": "2차 인증 코드", diff --git a/ui/src/i18n/mk.json b/ui/src/i18n/mk.json index 906528041..2455449bf 100644 --- a/ui/src/i18n/mk.json +++ b/ui/src/i18n/mk.json @@ -114,7 +114,9 @@ "form.button_cancel": "Откажи", "form.button_close": "Затвори", "form.button_delete": "Избриши", + "form.button_disable": "Disable", "form.button_edit": "Измени", + "form.button_enable": "Enable", "form.button_save": "Зачувај", "login.button_login": "Најави се", "login.label_2fa_code": "Two-Factor автентикациски код", diff --git a/ui/src/i18n/nl.json b/ui/src/i18n/nl.json index 6edb45e26..c842429df 100644 --- a/ui/src/i18n/nl.json +++ b/ui/src/i18n/nl.json @@ -114,7 +114,9 @@ "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_save": "Opslaan", "login.button_login": "Inloggen", "login.label_2fa_code": "Twee Factor Authenticatie Code", diff --git a/ui/src/i18n/no.json b/ui/src/i18n/no.json index 757af9641..12ec56b1b 100644 --- a/ui/src/i18n/no.json +++ b/ui/src/i18n/no.json @@ -114,7 +114,9 @@ "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_save": "Lagre", "login.button_login": "Logg inn", "login.label_2fa_code": "Two Factor Authentication Code", diff --git a/ui/src/i18n/pl.json b/ui/src/i18n/pl.json index 297375ab1..a9b23dc94 100644 --- a/ui/src/i18n/pl.json +++ b/ui/src/i18n/pl.json @@ -114,7 +114,9 @@ "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_save": "Zapisz", "login.button_login": "Zaloguj", "login.label_2fa_code": "Kod uwierzytelniania 2FA", diff --git a/ui/src/i18n/pt-BR.json b/ui/src/i18n/pt-BR.json index 0d3feafb1..0fb4a0abc 100644 --- a/ui/src/i18n/pt-BR.json +++ b/ui/src/i18n/pt-BR.json @@ -114,7 +114,9 @@ "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_save": "Salvar", "login.button_login": "Entrar", "login.label_2fa_code": "Código de Autenticação de Dois Fatores", diff --git a/ui/src/i18n/pt.json b/ui/src/i18n/pt.json index d78168374..b436fed62 100644 --- a/ui/src/i18n/pt.json +++ b/ui/src/i18n/pt.json @@ -114,7 +114,9 @@ "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_save": "Gravar", "login.button_login": "Entrar", "login.label_2fa_code": "Código de Autenticação de Dois Fatores", diff --git a/ui/src/i18n/ru.json b/ui/src/i18n/ru.json index b609a3ad4..d0a5c1e99 100644 --- a/ui/src/i18n/ru.json +++ b/ui/src/i18n/ru.json @@ -114,7 +114,9 @@ "form.button_cancel": "Отмена", "form.button_close": "Закрыть", "form.button_delete": "Удалить", + "form.button_disable": "Disable", "form.button_edit": "Редактировать", + "form.button_enable": "Enable", "form.button_save": "Сохранить", "login.button_login": "Войти", "login.label_2fa_code": "Код ДФА", diff --git a/ui/src/i18n/sl.json b/ui/src/i18n/sl.json index 77ac1b16c..238fd37e3 100644 --- a/ui/src/i18n/sl.json +++ b/ui/src/i18n/sl.json @@ -114,7 +114,9 @@ "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_save": "Shrani", "login.button_login": "Vpiši se", "login.label_2fa_code": "Dvofaktorska koda za preverjanje pristnosti", diff --git a/ui/src/i18n/sv.json b/ui/src/i18n/sv.json index 304124d23..30ebfaf07 100644 --- a/ui/src/i18n/sv.json +++ b/ui/src/i18n/sv.json @@ -114,7 +114,9 @@ "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_save": "Spara", "login.button_login": "Logga in", "login.label_2fa_code": "Tvåfaktorautentiseringskod", diff --git a/ui/src/i18n/th.json b/ui/src/i18n/th.json index ea87f20cc..55a1fa58c 100644 --- a/ui/src/i18n/th.json +++ b/ui/src/i18n/th.json @@ -114,7 +114,9 @@ "form.button_cancel": "ยกเลิก", "form.button_close": "ปิด", "form.button_delete": "ลบ", + "form.button_disable": "Disable", "form.button_edit": "แก้ไข", + "form.button_enable": "Enable", "form.button_save": "บันทึก", "login.button_login": "เข้าสู่ระบบ", "login.label_2fa_code": "รหัสรับรองความถูกต้องสองปัจจัย", diff --git a/ui/src/i18n/tr.json b/ui/src/i18n/tr.json index c356f7c3c..88703bdb1 100644 --- a/ui/src/i18n/tr.json +++ b/ui/src/i18n/tr.json @@ -114,7 +114,9 @@ "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_save": "Kaydet", "login.button_login": "Oturum Aç", "login.label_2fa_code": "İki Aşamalı Doğrulama Kodu", diff --git a/ui/src/i18n/uk.json b/ui/src/i18n/uk.json index 8c7051e02..58b7c34d4 100644 --- a/ui/src/i18n/uk.json +++ b/ui/src/i18n/uk.json @@ -114,7 +114,9 @@ "form.button_cancel": "Відмінити", "form.button_close": "Закрити", "form.button_delete": "Видалити", + "form.button_disable": "Disable", "form.button_edit": "Редагувати", + "form.button_enable": "Enable", "form.button_save": "Зберегти", "login.button_login": "Увійти", "login.label_2fa_code": "Код ДФА", diff --git a/ui/src/i18n/zh-CN.json b/ui/src/i18n/zh-CN.json index 4fc36becc..d61bb8954 100644 --- a/ui/src/i18n/zh-CN.json +++ b/ui/src/i18n/zh-CN.json @@ -114,7 +114,9 @@ "form.button_cancel": "取消", "form.button_close": "关闭", "form.button_delete": "删除", + "form.button_disable": "Disable", "form.button_edit": "编辑", + "form.button_enable": "Enable", "form.button_save": "保存", "login.button_login": "登录", "login.label_2fa_code": "两步验证代码", diff --git a/ui/src/i18n/zh-TW.json b/ui/src/i18n/zh-TW.json index d857b6eb9..83cc193b6 100644 --- a/ui/src/i18n/zh-TW.json +++ b/ui/src/i18n/zh-TW.json @@ -114,7 +114,9 @@ "form.button_cancel": "取消", "form.button_close": "關閉", "form.button_delete": "刪除", + "form.button_disable": "Disable", "form.button_edit": "編輯", + "form.button_enable": "Enable", "form.button_save": "儲存", "login.button_login": "登錄", "login.label_2fa_code": "雙重驗證碼", 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)); - - From f4a67b788a0c93e3cc6acaf015e42dcf95303646 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sun, 12 Nov 2023 19:13:52 +0000 Subject: [PATCH 28/34] quick fixes --- scripts/lang-sync.ts | 14 +++++++++++-- .../widget-add/widget-add.component.html | 6 +++--- .../app/shared/layout/layout.component.html | 6 +++--- .../restart-options-modal.component.html | 20 +++++++++---------- ui/src/i18n/bg.json | 7 ++++++- ui/src/i18n/ca.json | 7 ++++++- ui/src/i18n/cs.json | 7 ++++++- ui/src/i18n/de.json | 7 ++++++- ui/src/i18n/en.json | 11 +++++++--- ui/src/i18n/es.json | 7 ++++++- ui/src/i18n/fr.json | 7 ++++++- ui/src/i18n/he.json | 7 ++++++- ui/src/i18n/hu.json | 7 ++++++- ui/src/i18n/id.json | 7 ++++++- ui/src/i18n/it.json | 7 ++++++- ui/src/i18n/ja.json | 7 ++++++- ui/src/i18n/ko.json | 7 ++++++- ui/src/i18n/mk.json | 7 ++++++- ui/src/i18n/nl.json | 7 ++++++- ui/src/i18n/no.json | 7 ++++++- ui/src/i18n/pl.json | 7 ++++++- ui/src/i18n/pt-BR.json | 7 ++++++- ui/src/i18n/pt.json | 7 ++++++- ui/src/i18n/ru.json | 7 ++++++- ui/src/i18n/sl.json | 7 ++++++- ui/src/i18n/sv.json | 7 ++++++- ui/src/i18n/th.json | 7 ++++++- ui/src/i18n/tr.json | 7 ++++++- ui/src/i18n/uk.json | 9 ++++++--- ui/src/i18n/zh-CN.json | 7 ++++++- ui/src/i18n/zh-TW.json | 7 ++++++- 31 files changed, 192 insertions(+), 49 deletions(-) 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/ui/src/app/modules/status/widget-add/widget-add.component.html b/ui/src/app/modules/status/widget-add/widget-add.component.html index c3e1dc55e..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 @@ -26,15 +26,15 @@

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

    diff --git a/ui/src/app/shared/layout/layout.component.html b/ui/src/app/shared/layout/layout.component.html index cec49543a..3f7cba09b 100644 --- a/ui/src/app/shared/layout/layout.component.html +++ b/ui/src/app/shared/layout/layout.component.html @@ -66,15 +66,15 @@ {{ 'menu.linux.label_logs' | translate }} - Restart Options + {{ 'menu.restart.title' | translate }}
    - Homebridge {{ 'menu.docker.label_settings' | translate }} + {{ 'menu.label_settings_hb' | translate }} - {{ 'menu.label_ui_settings' | translate }} + {{ 'menu.label_settings_ui' | translate }} 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 index 7dc3337c8..e24b5f983 100644 --- 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 @@ -1,6 +1,6 @@
    -
    Restart Options
    +
    {{ 'menu.restart.title' | translate }}
    @@ -11,33 +11,33 @@
    Restart Options
    -

    +

    -

    +

    -

    +

    -

    +

    -

    +

    -
    +
    -
    +
    +

    {{ message }}

    diff --git a/ui/src/app/core/components/confirm/confirm.component.ts b/ui/src/app/core/components/confirm/confirm.component.ts index 63441b70a..3d6c18c88 100644 --- a/ui/src/app/core/components/confirm/confirm.component.ts +++ b/ui/src/app/core/components/confirm/confirm.component.ts @@ -10,6 +10,7 @@ export class ConfirmComponent implements OnInit { @Input() title: string; @Input() message: string; @Input() confirmButtonLabel: string; + @Input() faIconClass: string|undefined; constructor( public activeModal: NgbActiveModal, diff --git a/ui/src/app/core/components/information/information.component.html b/ui/src/app/core/components/information/information.component.html index df850db26..1732df2fe 100644 --- a/ui/src/app/core/components/information/information.component.html +++ b/ui/src/app/core/components/information/information.component.html @@ -6,11 +6,12 @@
    {{ title }}
    +

    {{ message }}

    -
    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/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 8692cab5a..b22f531e1 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 @@ -53,8 +53,8 @@
    - -

    + +

    {{ 'child_bridge.label_bridge_paired' | translate }}

    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 13e67ea5e..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 @@ -12,8 +12,8 @@
    {{'plugins.manage.label_install' | translate}}: {{ plugi
    - -

    + +

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

    Username
    -
    -
    @@ -40,18 +41,23 @@
    - -
    +
    - -
    - +
    +
    +
    +
    - - - -
    +
    +
    + +
    +
    +
    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/shared/layout/restart-options-modal/restart-options-modal.component.html b/ui/src/app/shared/layout/restart-options-modal/restart-options-modal.component.html index e24b5f983..97e0a40a2 100644 --- 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 @@ -8,7 +8,7 @@
    {{ 'menu.restart.title' | translate }}
    - +

    diff --git a/ui/src/i18n/bg.json b/ui/src/i18n/bg.json index 655291079..16528ac7c 100644 --- a/ui/src/i18n/bg.json +++ b/ui/src/i18n/bg.json @@ -248,7 +248,6 @@ "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 2e3a214b2..c980a5bdc 100644 --- a/ui/src/i18n/ca.json +++ b/ui/src/i18n/ca.json @@ -248,7 +248,6 @@ "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 055f178bb..5758f7efd 100644 --- a/ui/src/i18n/cs.json +++ b/ui/src/i18n/cs.json @@ -248,7 +248,6 @@ "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 7ed54293a..5c9ee1b1b 100644 --- a/ui/src/i18n/de.json +++ b/ui/src/i18n/de.json @@ -248,7 +248,6 @@ "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.", diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json index 8797360e5..4ccec7072 100644 --- a/ui/src/i18n/en.json +++ b/ui/src/i18n/en.json @@ -248,7 +248,6 @@ "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.", @@ -411,6 +410,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 bd1bdf8a6..9c7082732 100644 --- a/ui/src/i18n/es.json +++ b/ui/src/i18n/es.json @@ -248,7 +248,6 @@ "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 84e51b6a7..f89f21772 100644 --- a/ui/src/i18n/fr.json +++ b/ui/src/i18n/fr.json @@ -248,7 +248,6 @@ "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.", diff --git a/ui/src/i18n/he.json b/ui/src/i18n/he.json index 522f292a2..ce22c295e 100644 --- a/ui/src/i18n/he.json +++ b/ui/src/i18n/he.json @@ -248,7 +248,6 @@ "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 39070d003..0e0aa0a54 100644 --- a/ui/src/i18n/hu.json +++ b/ui/src/i18n/hu.json @@ -248,7 +248,6 @@ "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 383a8e606..b795a345e 100644 --- a/ui/src/i18n/id.json +++ b/ui/src/i18n/id.json @@ -248,7 +248,6 @@ "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 875426ba2..fdaa2ed66 100644 --- a/ui/src/i18n/it.json +++ b/ui/src/i18n/it.json @@ -248,7 +248,6 @@ "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 a7a0dbcca..b02034498 100644 --- a/ui/src/i18n/ja.json +++ b/ui/src/i18n/ja.json @@ -248,7 +248,6 @@ "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 bd3810740..112ced757 100644 --- a/ui/src/i18n/ko.json +++ b/ui/src/i18n/ko.json @@ -248,7 +248,6 @@ "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 9302688ec..bdbd2efc9 100644 --- a/ui/src/i18n/mk.json +++ b/ui/src/i18n/mk.json @@ -248,7 +248,6 @@ "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 df7a27023..1b50f4d02 100644 --- a/ui/src/i18n/nl.json +++ b/ui/src/i18n/nl.json @@ -248,7 +248,6 @@ "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 f81517be6..38d4ab359 100644 --- a/ui/src/i18n/no.json +++ b/ui/src/i18n/no.json @@ -248,7 +248,6 @@ "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 8db20af4c..90a9ffef9 100644 --- a/ui/src/i18n/pl.json +++ b/ui/src/i18n/pl.json @@ -248,7 +248,6 @@ "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 419277406..145b8da28 100644 --- a/ui/src/i18n/pt-BR.json +++ b/ui/src/i18n/pt-BR.json @@ -248,7 +248,6 @@ "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 45c8002db..bbd535032 100644 --- a/ui/src/i18n/pt.json +++ b/ui/src/i18n/pt.json @@ -248,7 +248,6 @@ "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 2e8c7f705..f6dbbad6a 100644 --- a/ui/src/i18n/ru.json +++ b/ui/src/i18n/ru.json @@ -248,7 +248,6 @@ "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 c68df256d..cdeb0e9f4 100644 --- a/ui/src/i18n/sl.json +++ b/ui/src/i18n/sl.json @@ -248,7 +248,6 @@ "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 d138522ae..2eabd4372 100644 --- a/ui/src/i18n/sv.json +++ b/ui/src/i18n/sv.json @@ -248,7 +248,6 @@ "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 2260e91fe..2eefb435f 100644 --- a/ui/src/i18n/th.json +++ b/ui/src/i18n/th.json @@ -248,7 +248,6 @@ "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": "ระบบอัตโนมัติทั้งหมดและจะต้องได้รับการกำหนดค่าใหม่หลังจากรีเซ็ต", diff --git a/ui/src/i18n/tr.json b/ui/src/i18n/tr.json index d5cd94734..8dce88c0e 100644 --- a/ui/src/i18n/tr.json +++ b/ui/src/i18n/tr.json @@ -248,7 +248,6 @@ "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 0c4640e96..79c916fe7 100644 --- a/ui/src/i18n/uk.json +++ b/ui/src/i18n/uk.json @@ -248,7 +248,6 @@ "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-CN.json b/ui/src/i18n/zh-CN.json index 8b3831a04..47abf25d9 100644 --- a/ui/src/i18n/zh-CN.json +++ b/ui/src/i18n/zh-CN.json @@ -248,7 +248,6 @@ "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 4700e1327..027b3bf9b 100644 --- a/ui/src/i18n/zh-TW.json +++ b/ui/src/i18n/zh-TW.json @@ -248,7 +248,6 @@ "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。", From 80c737dd6ea26c5efe8d57aef86db98b9f7e70af Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sun, 12 Nov 2023 21:12:19 +0000 Subject: [PATCH 30/34] updates --- extract-plugin-alias.js | 2 +- ui/src/app/app.component.ts | 4 +- .../info-modal/info-modal.component.html | 2 + .../manage-plugins-modal.component.html | 8 +++- .../config-editor/config-editor.component.ts | 48 +++++++++---------- .../config-editor/config-editor.resolver.ts | 25 ++++------ .../config.restore-backup.component.ts | 4 +- ui/src/app/modules/login/login.component.ts | 8 ++-- ui/src/app/modules/login/login.guard.ts | 2 +- ui/src/app/modules/logs/logs.component.ts | 15 ++---- .../plugin-card/plugin-card.component.html | 5 +- .../app/modules/restart/restart.component.ts | 1 - ui/src/app/modules/restart/restart.module.ts | 1 + ...-all-cached-accessories-modal.component.ts | 4 +- ...single-cached-accessory-modal.component.ts | 6 +-- .../reset-homebridge-modal.component.ts | 4 +- .../select-network-interfaces.component.ts | 2 +- .../modules/settings/settings.component.ts | 2 +- .../unpair-accessory-modal.component.ts | 7 ++- .../setup-wizard/setup-wizard.component.ts | 2 - .../setup-wizard/setup-wizard.guard.ts | 13 +---- .../app/modules/status/status.component.html | 20 ++++---- ui/src/app/modules/status/status.component.ts | 7 ++- .../status/widget-add/widget-add.component.ts | 6 +-- .../widget-control.component.ts | 6 +-- .../users/users-add/users-add.component.ts | 4 +- .../users-disable2fa.component.ts | 4 +- .../users/users-edit/users-edit.component.ts | 6 +-- .../users-setup2fa.component.ts | 10 ++-- ui/src/app/modules/users/users.component.ts | 10 ++-- ui/src/app/modules/users/users.resolver.ts | 23 ++++----- .../app/shared/layout/layout.component.html | 10 ++-- ui/src/app/shared/layout/layout.component.ts | 10 ++-- .../restart-options-modal.component.html | 5 ++ .../restart-options-modal.component.ts | 16 +++++++ ui/src/i18n/bg.json | 3 +- ui/src/i18n/ca.json | 3 +- ui/src/i18n/cs.json | 1 + ui/src/i18n/de.json | 1 + ui/src/i18n/en.json | 5 +- ui/src/i18n/es.json | 3 +- ui/src/i18n/fr.json | 3 +- ui/src/i18n/he.json | 1 + ui/src/i18n/hu.json | 3 +- ui/src/i18n/id.json | 1 + ui/src/i18n/it.json | 1 + ui/src/i18n/ja.json | 3 +- ui/src/i18n/ko.json | 1 + ui/src/i18n/mk.json | 1 + ui/src/i18n/nl.json | 3 +- ui/src/i18n/no.json | 3 +- ui/src/i18n/pl.json | 1 + ui/src/i18n/pt-BR.json | 3 +- ui/src/i18n/pt.json | 3 +- ui/src/i18n/ru.json | 3 +- ui/src/i18n/sl.json | 1 + ui/src/i18n/sv.json | 3 +- ui/src/i18n/th.json | 1 + ui/src/i18n/tr.json | 1 + ui/src/i18n/uk.json | 1 + ui/src/i18n/zh-CN.json | 1 + ui/src/i18n/zh-TW.json | 1 + webpack.config.js | 3 +- 63 files changed, 187 insertions(+), 173 deletions(-) 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/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index 004cdd256..f37287512 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -8,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, @@ -49,7 +47,7 @@ export class AppComponent { 'he', ]; - // which langs should use RTL + // which languages should use RTL const rtlLanguages = [ 'he', ]; 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 cf54515bd..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 @@ -71,10 +71,12 @@

    {{ service.customName || service.serviceName }}
    +
    +
    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 8646591ec..9018e9e04 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 @@ -58,11 +58,15 @@
    {{ release.name }}
    - +
    +
    +
    -
    diff --git a/ui/src/app/modules/status/status.component.ts b/ui/src/app/modules/status/status.component.ts index 4c7604129..16ff4d47c 100644 --- a/ui/src/app/modules/status/status.component.ts +++ b/ui/src/app/modules/status/status.component.ts @@ -86,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(); @@ -169,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); } @@ -245,7 +245,7 @@ export class StatusComponent implements OnInit, OnDestroy { }); } - manageWidget(item) { + manageWidget(item: any) { const ref = this.$modal.open(WidgetControlComponent); ref.componentInstance.widget = item; @@ -267,5 +267,4 @@ export class StatusComponent implements OnInit, OnDestroy { this.io.end(); this.saveWidgetsEvent.complete(); } - } 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 0ba08cf30..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 @@ -9,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; @@ -135,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.ts b/ui/src/app/modules/status/widget-control/widget-control.component.ts index bcf83e516..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 @@ -25,7 +25,7 @@ export class WidgetControlComponent implements OnInit { private $http: HttpClient, private $translate: TranslateService, ) { } - @Input() widget; + @Input() widget: any; // weather public searching: boolean; @@ -77,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([]); })), @@ -112,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/users/users-add/users-add.component.ts b/ui/src/app/modules/users/users-add/users-add.component.ts index dfb58f8b3..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 @@ -46,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.ts b/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.ts index d285aaf26..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 @@ -32,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.ts b/ui/src/app/modules/users/users-edit/users-edit.component.ts index 083eb5f45..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 @@ -12,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]), @@ -53,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-setup2fa/users-setup2fa.component.ts b/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.ts index 124044cdd..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 @@ -18,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; @@ -47,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; @@ -65,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 66b6116b8..d31a6dfeb 100644 --- a/ui/src/app/modules/users/users.component.ts +++ b/ui/src/app/modules/users/users.component.ts @@ -51,7 +51,7 @@ export class UsersComponent implements OnInit { }); } - openEditUser(user) { + openEditUser(user: any) { const ref = this.modalService.open(UsersEditComponent, { size: 'lg', }); @@ -62,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(); }, @@ -77,7 +77,7 @@ export class UsersComponent implements OnInit { ); } - setup2fa(user) { + setup2fa(user: any) { const ref = this.modalService.open(UsersSetup2faComponent, { size: 'lg', backdrop: 'static', @@ -89,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.resolver.ts b/ui/src/app/modules/users/users.resolver.ts index 2885c5da9..4df3c7a9c 100644 --- a/ui/src/app/modules/users/users.resolver.ts +++ b/ui/src/app/modules/users/users.resolver.ts @@ -1,10 +1,5 @@ import { Injectable } from '@angular/core'; -import { - ActivatedRouteSnapshot, - Resolve, - Router, - RouterStateSnapshot, -} from '@angular/router'; +import { Resolve, Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @@ -16,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 3f7cba09b..63eb65abe 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 }">
      • diff --git a/ui/src/app/shared/layout/layout.component.ts b/ui/src/app/shared/layout/layout.component.ts index 0c5d091ea..1d1e61a14 100644 --- a/ui/src/app/shared/layout/layout.component.ts +++ b/ui/src/app/shared/layout/layout.component.ts @@ -27,8 +27,8 @@ import { environment } from '@/environments/environment'; 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; @@ -67,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; } }); @@ -93,7 +93,7 @@ export class LayoutComponent implements OnInit { } openRestartOptionsModal() { - const ref = this.$modal.open(RestartOptionsModalComponent); + this.$modal.open(RestartOptionsModalComponent); } async compareServerUiVersion() { 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 index 97e0a40a2..e7ba332da 100644 --- 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 @@ -16,6 +16,11 @@
      {{ 'menu.restart.title' | translate }}
      {{ 'menu.hbrestart.confirm_button' | translate }}

      +

      + +

    -
    -

    - Restart Required -

    +
    +

    Please restart Homebridge for the changes to apply. 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 65a21d3a1..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 @@ -52,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; 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 f08093aa6..1d3c273ff 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 @@ -8,7 +8,7 @@

    -
    +
    @@ -54,7 +54,27 @@
    {{ 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. +

    +
    + + +
    +
    +
    @@ -81,4 +101,5 @@
    {{ 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 182710103..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,4 +1,5 @@ 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'; @@ -29,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, ) { } @@ -84,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, @@ -131,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/mobile-detect.service.ts b/ui/src/app/core/mobile-detect.service.ts index fcfae9299..49f281098 100644 --- a/ui/src/app/core/mobile-detect.service.ts +++ b/ui/src/app/core/mobile-detect.service.ts @@ -9,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/settings.service.ts b/ui/src/app/core/settings.service.ts index e2c446d4d..43ff55608 100644 --- a/ui/src/app/core/settings.service.ts +++ b/ui/src/app/core/settings.service.ts @@ -33,13 +33,6 @@ interface EnvInterface { recommendChildBridges: boolean; } -interface AppSettingsInterface { - env: EnvInterface; - formAuth: boolean; - theme: string; - serverTimestamp: string; -} - @Injectable({ providedIn: 'root', }) @@ -67,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) { @@ -112,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 0c4fd7c69..808a8c5d9 100644 --- a/ui/src/app/core/terminal.service.ts +++ b/ui/src/app/core/terminal.service.ts @@ -1,5 +1,5 @@ import { ElementRef, Injectable } from '@angular/core'; -import { Subject, Subscription } from 'rxjs'; +import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; import { ITerminalOptions, Terminal } from 'xterm'; import { FitAddon } from 'xterm-addon-fit'; @@ -79,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 c0d260727..f637f7084 100644 --- a/ui/src/app/core/ws.service.ts +++ b/ui/src/app/core/ws.service.ts @@ -33,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); @@ -58,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); }); @@ -92,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 { From b47a7625f61eeda2aa2012df8f077f2b2e7c1f4a Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Mon, 13 Nov 2023 06:11:57 +0000 Subject: [PATCH 32/34] fix (revert) extractNodejs tar extract --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- src/bin/hb-service.ts | 4 ++-- ui/package-lock.json | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72f0b2b9d..6b536b78f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -93,7 +93,7 @@ "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", @@ -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": { @@ -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" } @@ -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" diff --git a/package.json b/package.json index 6cdf8fd27..a042277cf 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "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", diff --git a/src/bin/hb-service.ts b/src/bin/hb-service.ts index 804818abb..9b601fe58 100644 --- a/src/bin/hb-service.ts +++ b/src/bin/hb-service.ts @@ -1212,11 +1212,11 @@ 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 { - tar.x(extractConfig); + await tar.x(extractConfig); spinner.succeed(`Installed Node.js ${targetVersion}`); } catch (e) { spinner.fail(e.message); diff --git a/ui/package-lock.json b/ui/package-lock.json index 7245e387d..fca297f61 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -8177,9 +8177,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", @@ -8187,7 +8187,7 @@ "rimraf": "^3.0.2" }, "engines": { - "node": ">=12.0.0" + "node": "^10.12.0 || >=12.0.0" } }, "node_modules/flatted": { From 0e5769366a13d3375e29e1c3905c34af1f28c972 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Mon, 13 Nov 2023 07:48:37 +0000 Subject: [PATCH 33/34] up --- .../manage-plugins-modal.component.html | 4 +-- .../plugin-card/plugin-card.component.html | 33 ++++++------------- .../plugin-card/plugin-card.component.ts | 4 +-- ui/src/i18n/bg.json | 1 - ui/src/i18n/ca.json | 1 - ui/src/i18n/cs.json | 1 - ui/src/i18n/de.json | 1 - ui/src/i18n/en.json | 3 +- ui/src/i18n/es.json | 1 - ui/src/i18n/fr.json | 1 - ui/src/i18n/he.json | 1 - ui/src/i18n/hu.json | 1 - ui/src/i18n/id.json | 1 - ui/src/i18n/it.json | 1 - ui/src/i18n/ja.json | 1 - ui/src/i18n/ko.json | 1 - ui/src/i18n/mk.json | 1 - ui/src/i18n/nl.json | 1 - ui/src/i18n/no.json | 1 - ui/src/i18n/pl.json | 1 - ui/src/i18n/pt-BR.json | 1 - ui/src/i18n/pt.json | 1 - ui/src/i18n/ru.json | 1 - ui/src/i18n/sl.json | 1 - ui/src/i18n/sv.json | 1 - ui/src/i18n/th.json | 1 - ui/src/i18n/tr.json | 1 - ui/src/i18n/uk.json | 1 - ui/src/i18n/zh-CN.json | 1 - ui/src/i18n/zh-TW.json | 1 - 30 files changed, 15 insertions(+), 55 deletions(-) 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 9018e9e04..24da41e84 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 @@ -58,12 +58,12 @@
    {{ release.name }}
    -
    -
    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 6b6f26dad..435472223 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 @@ -9,12 +9,9 @@

    {{ 'plugins.status_not_installed' | translate }}

    -

    +

    {{ 'plugins.status_update_available' | translate }}

    -

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

    {{ 'plugins.status_disabled' | translate }}

    @@ -54,18 +51,6 @@

    - - - - - - - - - - + +
    @@ -107,6 +89,11 @@

    +