diff --git a/package-lock.json b/package-lock.json index 288abaf66..4f99b1382 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4965,9 +4965,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.583", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.583.tgz", - "integrity": "sha512-93y1gcONABZ7uqYe/JWDVQP/Pj/sQSunF0HVAPdlg/pfBnOyBMLlQUxWvkqcljJg1+W6cjvPuYD+r1Th9Tn8mA==", + "version": "1.4.585", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.585.tgz", + "integrity": "sha512-B4yBlX0azdA3rVMxpYwLQfDpdwOgcnLCkpvSOd68iFmeedo+WYjaBJS3/W58LVD8CB2nf+o7C4K9xz1l09RkWg==", "dev": true }, "node_modules/emittery": { @@ -6835,9 +6835,9 @@ ] }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", "dev": true, "engines": { "node": ">= 4" @@ -10361,9 +10361,9 @@ } }, "node_modules/pino": { - "version": "8.16.1", - "resolved": "https://registry.npmjs.org/pino/-/pino-8.16.1.tgz", - "integrity": "sha512-3bKsVhBmgPjGV9pyn4fO/8RtoVDR8ssW1ev819FsRXlRNgW8gR/9Kx+gCK4UPWd4JjrRDLWpzd/pb1AyWm3MGA==", + "version": "8.16.2", + "resolved": "https://registry.npmjs.org/pino/-/pino-8.16.2.tgz", + "integrity": "sha512-2advCDGVEvkKu9TTVSa/kWW7Z3htI/sBKEZpqiHk6ive0i/7f5b1rsU8jn0aimxqfnSz5bj/nOYkwhBUn5xxvg==", "dependencies": { "atomic-sleep": "^1.0.0", "fast-redact": "^3.1.1", diff --git a/ui/package-lock.json b/ui/package-lock.json index a2813b064..4ae6589ce 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -5921,9 +5921,9 @@ } }, "node_modules/copy-webpack-plugin/node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", "dev": true, "engines": { "node": ">= 4" @@ -6586,9 +6586,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.583", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.583.tgz", - "integrity": "sha512-93y1gcONABZ7uqYe/JWDVQP/Pj/sQSunF0HVAPdlg/pfBnOyBMLlQUxWvkqcljJg1+W6cjvPuYD+r1Th9Tn8mA==" + "version": "1.4.585", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.585.tgz", + "integrity": "sha512-B4yBlX0azdA3rVMxpYwLQfDpdwOgcnLCkpvSOd68iFmeedo+WYjaBJS3/W58LVD8CB2nf+o7C4K9xz1l09RkWg==" }, "node_modules/emoji-regex": { "version": "8.0.0", diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html index 9f8735667..37553f096 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html @@ -1,4 +1,4 @@ -
@@ -8,4 +8,4 @@
{{ service.values.Brightness }}%
- \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts index 1d59eecea..a3488e03b 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts @@ -29,7 +29,7 @@ export class LightbulbComponent implements OnInit { onLongClick() { if ('Brightness' in this.service.values) { const ref = this.modalService.open(LightbulbManageComponent, { - size: 'sm', + size: 'md', }); ref.componentInstance.service = this.service; } diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html index 999cd0836..c3d391da6 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html @@ -6,7 +6,7 @@
-
+
diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss index 9f06a9bdd..54e602b2b 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss @@ -3,4 +3,8 @@ font-size: 1.4rem; text-transform: initial; } -} \ No newline at end of file +} + +.st0 { +fill: #2ccff9 !important; +} 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 53ed63999..6b1312d7a 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts @@ -27,7 +27,7 @@ export class WindowcoveringComponent implements OnInit { onLongClick() { const ref = this.modalService.open(WindowcoveringManageComponent, { - size: 'sm', + size: 'md', }); ref.componentInstance.service = this.service; } diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html index 6efd3dcde..e0adf6bd7 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html @@ -6,7 +6,7 @@
-
+
diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html new file mode 100644 index 000000000..d1a31b112 --- /dev/null +++ b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html @@ -0,0 +1,25 @@ +
+
+
{{ 'platform.version.title_service_restart_required' | translate }}
+ +
+
+ +

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

+
+
+
+ +
+
+
+ +
+
+
diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.scss b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.ts b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.ts new file mode 100644 index 000000000..b494dace5 --- /dev/null +++ b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.ts @@ -0,0 +1,22 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'app-confirm', + templateUrl: './restart-homebridge.component.html', + styleUrls: ['./restart-homebridge.component.scss'], +}) +export class RestartHomebridgeComponent implements OnInit { + constructor( + public activeModal: NgbActiveModal, + private $router: Router, + ) { } + + ngOnInit() {} + + public onRestartHomebridgeClick() { + this.$router.navigate(['/restart']); + this.activeModal.close(); + } +} diff --git a/ui/src/app/core/core.module.ts b/ui/src/app/core/core.module.ts index b413a5668..d4f79b05c 100644 --- a/ui/src/app/core/core.module.ts +++ b/ui/src/app/core/core.module.ts @@ -16,6 +16,7 @@ import { ConvertTempPipe } from './pipes/convert-temp.pipe'; import { ExternalLinkIconPipe } from './pipes/external-link-icon.pipe'; import { ReplacePipe } from './pipes/replace.pipe'; import { InformationComponent } from '@/app/core/components/information/information.component'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; @NgModule({ declarations: [ @@ -32,6 +33,7 @@ import { InformationComponent } from '@/app/core/components/information/informat ScheduledBackupsComponent, ConfirmComponent, InformationComponent, + RestartHomebridgeComponent, QrcodeComponent, ], imports: [ 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 022c0f4a8..f86c756a2 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 @@ -109,8 +109,7 @@
-
@@ -122,16 +121,15 @@
-
- -
+
+
-
\ No newline at end of file + 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 e781c4b82..ec6825037 100644 --- a/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts +++ b/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts @@ -1,9 +1,11 @@ import { Component, Input, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { Router } from '@angular/router'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; -import { NotificationService } from '@/app/core/notification.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; +import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; import { SettingsService } from '@/app/core/settings.service'; @Component({ @@ -27,8 +29,10 @@ export class BridgePluginsModalComponent implements OnInit { constructor( public activeModal: NgbActiveModal, public $settings: SettingsService, - private $notification: NotificationService, private $api: ApiService, + private $modal: NgbModal, + private $plugins: ManagePluginsService, + private $router: Router, private $toastr: ToastrService, private $translate: TranslateService, ) { } @@ -95,8 +99,8 @@ export class BridgePluginsModalComponent implements OnInit { try { await this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, this.configBlocks).toPromise(); - this.$notification.configUpdated.next(undefined); this.activeModal.close(); + this.$modal.open(RestartHomebridgeComponent); } catch (err) { this.$toastr.error( this.$translate.instant('config.toast_failed_to_save_config') + ': ' + err.error?.message, @@ -107,6 +111,18 @@ export class BridgePluginsModalComponent implements OnInit { } } + openPluginConfig() { + // Close the existing modal + this.activeModal.close(); + + // Open the plugin config modal + this.$plugins.settings({ + name: this.plugin.name, + settingsSchema: true, + links: {}, + }); + } + async restartChildBridge(username: string) { this.restartInProgress[username] = true; try { @@ -144,4 +160,8 @@ export class BridgePluginsModalComponent implements OnInit { return username; } + openFullConfigEditor() { + this.$router.navigate(['/config']); + this.activeModal.close(); + } } diff --git a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html index 3e266f356..57b994aae 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html +++ b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html @@ -19,15 +19,6 @@
[translate]="'plugins.manage.message_thanks_for_updating_restart_child_bridges'"> Please restart the plugin's child bridges for the changes to apply.

-
- - -
@@ -92,5 +83,22 @@
-
+
+
+ +
+
+
+ + +
+
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 38f411d7e..5ea907129 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html +++ b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html @@ -18,16 +18,6 @@

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

-
- - -
-
@@ -50,7 +40,6 @@

{{ 'plugins.manage.label_release_notes' | translate }} ({{ release.name }})
@@ -61,12 +50,12 @@
{{ 'plugins.manage.label_release_notes_beta' | translat
-
-
@@ -74,6 +63,14 @@
{{ 'plugins.manage.label_release_notes_beta' | translat + +
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 1edce20c7..4fc1e3a88 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts +++ b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts @@ -5,12 +5,13 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import {NgbActiveModal, NgbModal} from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; import { Terminal } from 'xterm'; import { FitAddon } from 'xterm-addon-fit'; import { ApiService } from '@/app/core/api.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { NotificationService } from '@/app/core/notification.service'; import { SettingsService } from '@/app/core/settings.service'; import { WsService } from '@/app/core/ws.service'; @@ -53,6 +54,7 @@ export class ManagePluginsModalComponent implements OnInit, OnDestroy { private $translate: TranslateService, public $settings: SettingsService, private $api: ApiService, + private $modal: NgbModal, private $ws: WsService, private $notification: NotificationService, private $router: Router, @@ -140,9 +142,8 @@ export class ManagePluginsModalComponent implements OnInit, OnDestroy { termRows: this.term.rows, }).subscribe( () => { - this.activeModal.close(); this.$router.navigate(['/plugins']); - this.$toastr.success(`${this.pastTenseVerb} ${this.pluginName}`, this.toastSuccess); + this.$modal.open(RestartHomebridgeComponent); }, (err) => { this.actionFailed = true; diff --git a/ui/src/app/core/manage-plugins/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 488f27e43..8e6581d98 100644 --- a/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts +++ b/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts @@ -1,12 +1,12 @@ import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import * as JSON5 from 'json5'; import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; -import { NotificationService } from '@/app/core/notification.service'; import { SettingsService } from '@/app/core/settings.service'; @Component({ @@ -39,8 +39,8 @@ export class ManualPluginConfigModalComponent implements OnInit { constructor( public activeModal: NgbActiveModal, private $api: ApiService, + private $modal: NgbModal, private $settings: SettingsService, - private $notification: NotificationService, private $toastr: ToastrService, private translate: TranslateService, private $router: Router, @@ -215,12 +215,8 @@ export class ManualPluginConfigModalComponent implements OnInit { try { await this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, this.pluginConfig) .toPromise(); - this.$toastr.success( - this.translate.instant('plugins.settings.toast_restart_required'), - this.translate.instant('plugins.settings.toast_plugin_config_saved')); - - this.$notification.configUpdated.next(undefined); this.activeModal.close(); + this.$modal.open(RestartHomebridgeComponent); } catch { this.$toastr.error(this.translate.instant('config.toast_failed_to_save_config'), this.translate.instant('toast.title_error')); this.saveInProgress = false; diff --git a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html index 1d3c273ff..4ecea89df 100644 --- a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html +++ b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html @@ -64,15 +64,6 @@

{{ block.name }}
[translate]="'plugins.manage.message_thanks_for_updating_restart_child_bridges'"> Please restart the plugin's child bridges for the changes to apply.

-
- - -
@@ -92,8 +83,8 @@
{{ block.name }}
Add {{ schema.pluginType }}
-
+
+
+ +
+
+
+ + +
+
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 82ee4c204..ed6dbd53e 100644 --- a/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.html +++ b/ui/src/app/core/manage-plugins/uninstall-plugins-modal/uninstall-plugins-modal.component.html @@ -6,11 +6,9 @@
{{'plugins.manage.label_uninstall' | translate}}: {{ plu
-
-

{{'plugins.manage.label_uninstall' | translate}}: {{ plu

diff --git a/ui/src/app/modules/accessories/accessories.component.scss b/ui/src/app/modules/accessories/accessories.component.scss index 5ea4dd349..f38c94c75 100644 --- a/ui/src/app/modules/accessories/accessories.component.scss +++ b/ui/src/app/modules/accessories/accessories.component.scss @@ -25,3 +25,18 @@ a:hover { text-decoration: none !important; } + +// switch / outlet +.accessory-widget-box .switch-on #accessoryIcon, .accessory-tab .switch-on #accessoryIcon { +fill: #fff555 !important; +} + +// lightbulb +.accessory-widget-box .light-on #accessoryIcon, .accessory-tab .light-on #accessoryIcon { +fill: #ffd555 !important; +} + +// window covering +.st0 { +fill: #2ccff9 !important; +} 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 36ddc82e9..990dbf9c1 100644 --- a/ui/src/app/modules/config-editor/config-editor.component.ts +++ b/ui/src/app/modules/config-editor/config-editor.component.ts @@ -7,9 +7,9 @@ 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 { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; import { MonacoEditorService } from '@/app/core/monaco-editor.service'; -import { NotificationService } from '@/app/core/notification.service'; import { SettingsService } from '@/app/core/settings.service'; @Component({ @@ -39,8 +39,8 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { private $settings: SettingsService, private $api: ApiService, private $md: MobileDetectService, + private $modal: NgbModal, private $monacoEditor: MonacoEditorService, - private $notification: NotificationService, public $toastr: ToastrService, private $route: ActivatedRoute, private translate: TranslateService, @@ -207,9 +207,8 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { try { const data = await this.$api.post('/config-editor', config) .toPromise(); - this.$notification.configUpdated.next(undefined); - this.$toastr.success(this.translate.instant('config.toast_config_saved'), this.translate.instant('toast.title_success')); this.homebridgeConfig = JSON.stringify(data, null, 4); + this.$modal.open(RestartHomebridgeComponent); } catch { this.$toastr.error(this.translate.instant('config.toast_failed_to_save_config'), this.translate.instant('toast.title_error')); } 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 c40846a01..38222e033 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 @@ -86,18 +86,6 @@

style="right:0px; top:0px;">
- - - - -
- - +
+ + + + + +
- {{ 'plugins.button_api_documentation' | translate }} diff --git a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts index 2cf538c39..a0f8b10ca 100644 --- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts +++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts @@ -5,10 +5,10 @@ import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; import { ConfirmComponent } from '@/app/core/components/confirm/confirm.component'; import { InformationComponent } from '@/app/core/components/information/information.component'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; import { PluginLogModalComponent } from '@/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; -import { NotificationService } from '@/app/core/notification.service'; import { SettingsService } from '@/app/core/settings.service'; import { WsService } from '@/app/core/ws.service'; import { DonateModalComponent } from '@/app/modules/plugins/donate-modal/donate-modal.component'; @@ -37,7 +37,6 @@ export class PluginCardComponent implements OnInit { public $plugin: ManagePluginsService, private $api: ApiService, private $ws: WsService, - private $notification: NotificationService, private $translate: TranslateService, private $modal: NgbModal, private $toastr: ToastrService, @@ -113,11 +112,7 @@ export class PluginCardComponent implements OnInit { if (this.hasChildBridges) { await this.doChildBridgeAction('stop'); } - this.$toastr.success( - this.$translate.instant('plugins.settings.toast_restart_required'), - this.$translate.instant('toast.title_success'), - ); - this.$notification.configUpdated.next(undefined); + this.$modal.open(RestartHomebridgeComponent); } catch (err) { this.$toastr.error(`Failed to disable plugin: ${err.message}`, this.$translate.instant('toast.title_error')); } @@ -143,11 +138,7 @@ export class PluginCardComponent implements OnInit { if (this.hasChildBridges) { await this.doChildBridgeAction('start'); } - this.$toastr.success( - this.$translate.instant('plugins.settings.toast_restart_required'), - this.$translate.instant('toast.title_success'), - ); - this.$notification.configUpdated.next(undefined); + this.$modal.open(RestartHomebridgeComponent); } catch (err) { this.$toastr.error(`Failed to enable plugin: ${err.message}`, this.$translate.instant('toast.title_error')); } diff --git a/ui/src/app/modules/status/status.component.html b/ui/src/app/modules/status/status.component.html index 4f32acfbb..04a8e673d 100644 --- a/ui/src/app/modules/status/status.component.html +++ b/ui/src/app/modules/status/status.component.html @@ -38,12 +38,10 @@ © 2023 · - Homebridge v{{ $settings.env.homebridgeVersion }} - + Homebridge v{{ $settings.env.homebridgeVersion }} · - UI v{{ $settings.env.packageVersion }} - + UI v{{ $settings.env.packageVersion }} · UI developed by oznu diff --git a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html index f2fc53491..0a5d09ed4 100644 --- a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html +++ b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.html @@ -87,13 +87,10 @@ Yes - + Service Mode - - {{ 'status.widget.systeminfo.label_enabled' | translate }} - - + {{ 'status.widget.systeminfo.label_disabled' | translate }} diff --git a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts index 82caec6fd..dd27d1dc0 100644 --- a/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts +++ b/ui/src/app/modules/status/widgets/system-info-widget/system-info-widget.component.ts @@ -48,6 +48,7 @@ export class SystemInfoWidgetComponent implements OnInit { ref.componentInstance.title = this.$translate.instant('status.widget.systeminfo.modal_glibc_title'); ref.componentInstance.message = this.$translate.instant('status.widget.systeminfo.modal_glibc_message'); ref.componentInstance.ctaButtonLabel = this.$translate.instant('status.widget.systeminfo.modal_glibc_cta'); + ref.componentInstance.faIconClass = 'fab fa-fw fa-node-js primary-text'; // eslint-disable-next-line max-len ref.componentInstance.ctaButtonLink = 'https://github.com/homebridge/homebridge-config-ui-x/wiki/Troubleshooting/#error---update-node---your-version-of-linux-does-not-meet-the-glibc-version'; @@ -58,6 +59,7 @@ export class SystemInfoWidgetComponent implements OnInit { ref.componentInstance.title = this.$translate.instant('status.widget.systeminfo.modal_servicemode_title'); ref.componentInstance.message = this.$translate.instant('status.widget.systeminfo.modal_servicemode_message'); ref.componentInstance.ctaButtonLabel = this.$translate.instant('status.widget.systeminfo.modal_servicemode_cta'); + ref.componentInstance.faIconClass = 'fas fa-fw fa-circle-exclamation primary-text'; // eslint-disable-next-line max-len ref.componentInstance.ctaButtonLink = 'https://github.com/homebridge/homebridge-config-ui-x/wiki/How-To-Swap-From-Standalone-Mode-to-Service-Mode'; diff --git a/ui/src/assets/hap-icons/light.svg b/ui/src/assets/hap-icons/light.svg index c6c09c4a5..320a08c8f 100644 --- a/ui/src/assets/hap-icons/light.svg +++ b/ui/src/assets/hap-icons/light.svg @@ -5,7 +5,7 @@ width="140.000000pt" height="140.000000pt" viewBox="0 0 140.000000 140.000000" preserveAspectRatio="xMidYMid meet"> - diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json index fe05fccf5..5ab6e20a1 100644 --- a/ui/src/i18n/en.json +++ b/ui/src/i18n/en.json @@ -153,7 +153,7 @@ "menu.linux.label_restart_server": "Restart OS", "menu.linux.label_shutdown_server": "Shutdown OS", "menu.linux.label_terminal": "Terminal", - "menu.restart.title": "Restart Options", + "menu.restart.title": "Restart / Shutdown", "menu.tooltip_logout": "Log out", "menu.tooltip_restart": "Restart Homebridge", "menu.tooltip_user_accounts": "User Accounts", diff --git a/ui/src/i18n/pl.json b/ui/src/i18n/pl.json index d6b846b31..a94fdbe4a 100644 --- a/ui/src/i18n/pl.json +++ b/ui/src/i18n/pl.json @@ -78,7 +78,7 @@ "backup.title_scheduled_backups": "Planowanie kopii zapasowych", "child_bridge.label_bridge_connect_to_homekit": "Połącz z HomeKit", "child_bridge.label_bridge_paired": "Mostek sparowany", - "child_bridge.label_bridge_restart_child_bridges": "Uruchom ponownie mostek podrzędny", + "child_bridge.label_bridge_restart_child_bridges": "Zrestartuj mostek", "child_bridge.label_bridge_settings": "Ustawienia mostka", "child_bridge.label_child_bridges": "Mostki podrzędne", "child_bridge.label_child_start": "Uruchom mostek", @@ -152,7 +152,7 @@ "menu.linux.label_restart_server": "Zrestartuj serwer", "menu.linux.label_shutdown_server": "Wyłącz serwer", "menu.linux.label_terminal": "Terminal", - "menu.restart.title": "Restart Options", + "menu.restart.title": "Restart / Wyłącz", "menu.tooltip_logout": "Wyloguj", "menu.tooltip_restart": "Zrestartuj Homebridge", "menu.tooltip_user_accounts": "Użytkownicy", @@ -219,8 +219,8 @@ "plugins.manage.message_uninstall_remove_plugin_config": "Usunąć również konfigurację tej wtyczki?", "plugins.manage.modal_verified_cta": "More Info", "plugins.manage.modal_verified_message": "Homebridge plugins that are marked as verified have been reviewed by the Homebridge project team to ensure they meet various requirements that encourage best practices and a trouble-free user experience.", - "plugins.manage.modal_verified_title": "Verified Plugins", - "plugins.manage.plugin_logs": "View Plugin Logs", + "plugins.manage.modal_verified_title": "Zweryfikowane wtyczki", + "plugins.manage.plugin_logs": "Logi wtyczki", "plugins.node_update.are_you_sure_you_want_to_update": "Jesteś pewny, że chcesz zaktualizować {{ pluginName }}?", "plugins.node_update.homebridge_node_version_too_low": "Homebridge v{{latestVersion}} wymaga Node.js w wersji {{minVersion}} lub nowszej. Aktualnie używasz Node.js w wersji {{ installedVersion }}.", "plugins.node_update.node_version_too_low": "Wtyczka {{ pluginName }} powinna być instalowana używając Node.js w wersji {{ minVersion }} lub nowszej. Aktualnie używasz Node.js w wersji {{ installedVersion }}.", diff --git a/ui/src/scss/components/accessories.scss b/ui/src/scss/components/accessories.scss index c08ae0298..70234994b 100644 --- a/ui/src/scss/components/accessories.scss +++ b/ui/src/scss/components/accessories.scss @@ -13,6 +13,13 @@ fill: #1976d2 !important; } } + .light-on { + background-color: #fff; + + #accessoryIcon { + fill: #ffd555 !important; + } + } } .accessory-box { diff --git a/ui/src/scss/themes/themes-dark.scss b/ui/src/scss/themes/themes-dark.scss index ea9429132..da3ffd475 100644 --- a/ui/src/scss/themes/themes-dark.scss +++ b/ui/src/scss/themes/themes-dark.scss @@ -315,7 +315,7 @@ color: $secondaryText; } - .switch-on { + .switch-on, .light-on { background-color: #fff; color: #000000; } diff --git a/ui/src/scss/themes/themes-light.scss b/ui/src/scss/themes/themes-light.scss index 46334c49b..ccda6a6bb 100644 --- a/ui/src/scss/themes/themes-light.scss +++ b/ui/src/scss/themes/themes-light.scss @@ -107,6 +107,11 @@ background-color: $primary-dark !important; } + .switch-on, .light-on { + background-color: #fff; + color: #000000; + } + @keyframes uix-glow-icon { from { text-shadow: 0 0 5px #fff, 0 0 10px #fff;