From 49dc5613d206d4e089cc7b882bf37353addbeb54 Mon Sep 17 00:00:00 2001 From: Fuzi_fauzia Date: Wed, 24 Apr 2024 16:35:16 +0700 Subject: [PATCH] perbaikan tampilan monitoring room --- .../hemat-app/device/device.component.ts | 2 - .../add-new-building-room.component.ts | 51 ++-- .../building/building.component.html | 242 +++++++++--------- .../monitoring/building/building.component.ts | 3 +- .../monitoring/detail/detail.component.css | 0 .../monitoring/detail/detail.component.html | 1 + .../detail/detail.component.spec.ts | 23 ++ .../monitoring/detail/detail.component.ts | 10 + .../hemat-app/monitoring/monitoring.module.ts | 14 +- .../monitoring/room/room.component.css | 188 +------------- .../monitoring/room/room.component.html | 208 ++++++--------- .../monitoring/room/room.component.ts | 128 ++------- src/app/login/login.component.ts | 4 +- 13 files changed, 302 insertions(+), 572 deletions(-) create mode 100644 src/app/content/hemat-app/monitoring/detail/detail.component.css create mode 100644 src/app/content/hemat-app/monitoring/detail/detail.component.html create mode 100644 src/app/content/hemat-app/monitoring/detail/detail.component.spec.ts create mode 100644 src/app/content/hemat-app/monitoring/detail/detail.component.ts diff --git a/src/app/content/hemat-app/device/device.component.ts b/src/app/content/hemat-app/device/device.component.ts index 9344d15..c3c22d7 100644 --- a/src/app/content/hemat-app/device/device.component.ts +++ b/src/app/content/hemat-app/device/device.component.ts @@ -97,12 +97,10 @@ export class DeviceComponent implements OnInit { } viewRow(row) { - console.log("View row:", row); this.router.navigate(["/device/view", row.name]); } editRow(row) { - console.log("Edit row:", row); this.router.navigate(["/device/edit", row.name]); } diff --git a/src/app/content/hemat-app/monitoring/add-new-building-room/add-new-building-room.component.ts b/src/app/content/hemat-app/monitoring/add-new-building-room/add-new-building-room.component.ts index 464db08..74a2afa 100644 --- a/src/app/content/hemat-app/monitoring/add-new-building-room/add-new-building-room.component.ts +++ b/src/app/content/hemat-app/monitoring/add-new-building-room/add-new-building-room.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from "@angular/core"; import { FormArray, FormBuilder, FormGroup, Validators } from "@angular/forms"; -import { Router } from "@angular/router"; +import { ActivatedRoute, Router } from "@angular/router"; import { BlockUI, NgBlockUI } from "ng-block-ui"; @Component({ @@ -10,6 +10,7 @@ import { BlockUI, NgBlockUI } from "ng-block-ui"; }) export class AddNewBuildingRoomComponent implements OnInit { public breadcrumb: any; + mode: string; numberTab: FormGroup; stepOneForm: FormGroup; stepTwoForm: FormGroup; @@ -21,11 +22,11 @@ export class AddNewBuildingRoomComponent implements OnInit { public repeatList: FormArray; get repeatFormGroup() { - return this.repeatForm.get('repeatArray') as FormArray; + return this.repeatForm.get("repeatArray") as FormArray; } - @BlockUI('numberTabs') blockUINumberTabs: NgBlockUI; - @BlockUI('iconTabs') blockUIIconTabs: NgBlockUI; + @BlockUI("numberTabs") blockUINumberTabs: NgBlockUI; + @BlockUI("iconTabs") blockUIIconTabs: NgBlockUI; countries = ["Amsterdam", "Berlin", "Frankfurt"]; eventType = ["Banquet", "Fund Raiser", "Dinner Party", "Wedding"]; @@ -43,7 +44,11 @@ export class AddNewBuildingRoomComponent implements OnInit { { id: 5, name: "5st item", idName: "item5" }, ]; - constructor(private formBuilder: FormBuilder, private router: Router,) {} + constructor( + private formBuilder: FormBuilder, + private router: Router, + private route: ActivatedRoute + ) {} ngOnInit() { this.numberTab = this.formBuilder.group({ @@ -53,22 +58,25 @@ export class AddNewBuildingRoomComponent implements OnInit { email: ["", [Validators.required, Validators.email]], address: ["", [Validators.required]], owned: ["", [Validators.required]], - - }); - - this.repeatForm = this.formBuilder.group({ - repeatArray: this.formBuilder.array([this.createRepeat()]) }); - this.repeatList = this.repeatForm.get('repeatArray') as FormArray; + this.repeatForm = this.formBuilder.group({ + repeatArray: this.formBuilder.array([this.createRepeat()]), + }); + + this.repeatList = this.repeatForm.get("repeatArray") as FormArray; + + this.route.data.subscribe((data) => { + this.mode = data.mode; + }); } createRepeat(): FormGroup { return this.formBuilder.group({ - roomName: ['', Validators.required], - room: ['', Validators.required], - floor: ['', Validators.required], - status: ['', Validators.required], + roomName: ["", Validators.required], + room: ["", Validators.required], + floor: ["", Validators.required], + status: ["", Validators.required], }); } @@ -102,15 +110,20 @@ export class AddNewBuildingRoomComponent implements OnInit { } submit() { - window.alert('Form submitted.'); + window.alert("Form submitted."); } cancel() { - this.router.navigate(["/monitoring"]); + if (this.mode === "room") { + this.router.navigate(["/monitoring/monitoring-room"]); + } else { + this.router.navigate(["/monitoring"]); + } + } reloadNumberTabs() { - this.blockUINumberTabs.start('Loading..'); + this.blockUINumberTabs.start("Loading.."); setTimeout(() => { this.blockUINumberTabs.stop(); @@ -118,7 +131,7 @@ export class AddNewBuildingRoomComponent implements OnInit { } reloadIconTabs() { - this.blockUIIconTabs.start('Loading..'); + this.blockUIIconTabs.start("Loading.."); setTimeout(() => { this.blockUIIconTabs.stop(); diff --git a/src/app/content/hemat-app/monitoring/building/building.component.html b/src/app/content/hemat-app/monitoring/building/building.component.html index 3bb1fdb..dec2d6c 100644 --- a/src/app/content/hemat-app/monitoring/building/building.component.html +++ b/src/app/content/hemat-app/monitoring/building/building.component.html @@ -7,16 +7,12 @@
- +
@@ -25,130 +21,132 @@
+
+
+
+

+ Building Name +

+

+ {{ data.build_name }} +

+
+
+
+
-
-
-
-
-

- Building Name -

-

- {{data.build_name}} -

-
-
-
-
-
- - + + -
-

+

+ {{ data.total }} kWh +

+
+
+
+
+ 23% - Lighning - {{data.total}} kWh - -
-
-
-
- 23% - Lighning -
- -
-
-
- 14% - In Progress -
- -
-
-
-
-
- 35% - Remaining -
- -
-
-
- 28% - Started -
- -
-
+
+
- -
- - - +
+ +
+
+
+ 35% - Remaining +
+ +
+
+
+ 28% - Started +
+ +
+
+
+
+ +
+ + +
diff --git a/src/app/content/hemat-app/monitoring/building/building.component.ts b/src/app/content/hemat-app/monitoring/building/building.component.ts index feecfc6..201a10f 100644 --- a/src/app/content/hemat-app/monitoring/building/building.component.ts +++ b/src/app/content/hemat-app/monitoring/building/building.component.ts @@ -1,5 +1,4 @@ import { Component } from "@angular/core"; -import { ChartApiService } from "src/app/_services/chart.api"; @Component({ selector: "app-building", @@ -51,7 +50,7 @@ export class BuildingComponent { }, ]; - constructor(private chartApiservice: ChartApiService) {} + constructor() {} ngOnInit() { this.breadcrumb = { diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.css b/src/app/content/hemat-app/monitoring/detail/detail.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.html b/src/app/content/hemat-app/monitoring/detail/detail.component.html new file mode 100644 index 0000000..fd9463a --- /dev/null +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.html @@ -0,0 +1 @@ +

detail works!

diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.spec.ts b/src/app/content/hemat-app/monitoring/detail/detail.component.spec.ts new file mode 100644 index 0000000..06d5c7e --- /dev/null +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DetailComponent } from './detail.component'; + +describe('DetailComponent', () => { + let component: DetailComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ DetailComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(DetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.ts b/src/app/content/hemat-app/monitoring/detail/detail.component.ts new file mode 100644 index 0000000..8b64639 --- /dev/null +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-detail', + templateUrl: './detail.component.html', + styleUrls: ['./detail.component.css'] +}) +export class DetailComponent { + +} diff --git a/src/app/content/hemat-app/monitoring/monitoring.module.ts b/src/app/content/hemat-app/monitoring/monitoring.module.ts index c9b4e27..25a7017 100644 --- a/src/app/content/hemat-app/monitoring/monitoring.module.ts +++ b/src/app/content/hemat-app/monitoring/monitoring.module.ts @@ -17,12 +17,14 @@ import { RoomComponent } from './room/room.component'; import { BreadcrumbModule } from 'src/app/_layout/breadcrumb/breadcrumb.module'; import { AddNewBuildingRoomComponent } from './add-new-building-room/add-new-building-room.component'; import { ArchwizardModule } from 'angular-archwizard'; +import { DetailComponent } from './detail/detail.component'; @NgModule({ declarations: [ BuildingComponent, RoomComponent, - AddNewBuildingRoomComponent + AddNewBuildingRoomComponent, + DetailComponent ], imports: [ CommonModule, @@ -44,7 +46,7 @@ import { ArchwizardModule } from 'angular-archwizard'; RouterModule.forChild([ { path: '', - component: BuildingComponent + component: BuildingComponent, }, { path: 'monitoring-room', @@ -52,7 +54,13 @@ import { ArchwizardModule } from 'angular-archwizard'; }, { path: 'add-new-room', - component: AddNewBuildingRoomComponent + component: AddNewBuildingRoomComponent, + data: { mode: 'room' } + }, + { + path: 'add-new-building', + component: AddNewBuildingRoomComponent, + data: { mode: 'build' } }, ]) ] diff --git a/src/app/content/hemat-app/monitoring/room/room.component.css b/src/app/content/hemat-app/monitoring/room/room.component.css index bd893c0..41da42e 100644 --- a/src/app/content/hemat-app/monitoring/room/room.component.css +++ b/src/app/content/hemat-app/monitoring/room/room.component.css @@ -1,190 +1,8 @@ -:host ::ng-deep .ngx-datatable.bootstrap .datatable-header .datatable-header-cell .datatable-header-cell-label { - font-family: inherit; - font-size: medium; - font-weight: bold; - color: #6B6F82; -} -:host ::ng-deep .ngx-datatable .datatable-row-center, .ngx-datatable .datatable-row-group, .ngx-datatable .datatable-row-right { - position: relative; - height: 50px !important; -} - -:host ::ng-deep .datatable-icon-right:before { - font-family: 'icofont'; - font-style: normal; -} - -:host ::ng-deep .datatable-icon-skip:before { - font-family: 'icofont'; - font-style: normal; -} - -:host ::ng-deep .datatable-icon-left:before { - font-family: 'icofont'; - font-style: normal; -} - -:host ::ng-deep .datatable-icon-left:before { - content: "\2039"; - font-size: x-large; -} - -:host ::ng-deep .datatable-icon-prev:before { - content: "\00AB"; - font-size: x-large; -} - -:host ::ng-deep .datatable-icon-right:before { - content: "\203A"; - font-size: x-large; -} - -:host ::ng-deep .datatable-icon-skip:before { - content: "\00BB"; - font-size: x-large; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-left, -.ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-right, -.ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-prev { - font-size: 16px; - line-height: 22px; - padding: 0px 09px; - background-color: #d4d2e7; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-right, -.ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-right { - font-size: 16px; - line-height: 22px; - padding: 0px 09px; - background-color: #d4d2e7; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-skip { - font-size: 16px; - line-height: 22px; - padding: 0px 09px; - background-color: #d4d2e7; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-prev { - font-size: 16px; - line-height: 22px; - padding: 0px 09px; - background-color: #d4d2e7; -} - -:host ::ng-deep .datatable-footer .datatable-pager ul li:not(.disabled).active a, -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] ul[_ngcontent-c11] li[_ngcontent-c11]:not(.disabled):hover a[_ngcontent-c11] { - background-color: #d4d2e7; - font-weight: bold; - font-size: larger; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager a { - height: 32px; - min-width: 34px; - line-height: 22px; - padding: 0; - border-radius: 3px; - margin: 0 3px; - text-align: center; - vertical-align: top; - padding-top: 3px; - text-decoration: none; - vertical-align: bottom; - color: #7c8091; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-left, -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-right[_ngcontent-c11], -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-prev[_ngcontent-c11] { - font-size: 14px; - line-height: 9px; - padding: 0px 08px; - background-color: #ffffff; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-left, -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-right[_ngcontent-c11], -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-prev[_ngcontent-c11] { - font-size: 0px; - line-height: 22px; - padding: 0px 09px; - background-color: #ffffff; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-right, -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-right[_ngcontent-c11], -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-prev[_ngcontent-c11] { - font-size: 0px; - line-height: 22px; - padding: 0px 09px; - background-color: #ffffff; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-skip, -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-right[_ngcontent-c11], -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-prev[_ngcontent-c11] { - font-size: 0px; - line-height: 22px; - padding: 0px 09px; - background-color: #ffffff; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager .datatable-icon-prev, -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-right[_ngcontent-c11], -.ngx-datatable.bootstrap[_ngcontent-c11] .datatable-footer[_ngcontent-c11] .datatable-pager[_ngcontent-c11] .datatable-icon-prev[_ngcontent-c11] { - font-size: 0px; - line-height: 22px; - padding: 0px 09px; - background-color: #ffffff; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager ul li:not(.disabled):hover a { - background-color: #545454; - font-weight: bold; - color: white; - -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer .datatable-pager ul li:not(.disabled).active a, -.ngx-datatable.bootstrap .datatable-footer .datatable-pager ul li:not(.disabled):hover a { - background-color: #545454; - font-weight: bold; - color: white; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-footer { - background: #727e8e; - color: #ededed; - margin-top: -1px; - overflow: inherit; -} - -:host ::ng-deep .ngx-datatable.bootstrap .datatable-header { - font-weight: bold; - height: unset !important; - overflow: inherit -} - -:host ::ng-deep .ngx-datatable .datatable-footer .datatable-pager { - flex: 0 0 0%; -} - -:host ::ng-deep .ngx-datatable .datatable-footer .datatable-pager .pager { - display: flex; +:host ::ng-deep .gap_fl_btn { + margin: 0 0.3rem; } :host ::ng-deep .block-ui-wrapper { - background: rgba(255, 249, 249, 0.5) !important; -} -:host ::ng-deep .ngx-datatable .datatable-footer .selected-count .datatable-pager { - flex: 0 0 0%; -} - -:host ::ng-deep .ngx-datatable { - display: -webkit-box; + background: rgba(255, 249, 249, 0.5) !important; } diff --git a/src/app/content/hemat-app/monitoring/room/room.component.html b/src/app/content/hemat-app/monitoring/room/room.component.html index 01634af..8c8127f 100644 --- a/src/app/content/hemat-app/monitoring/room/room.component.html +++ b/src/app/content/hemat-app/monitoring/room/room.component.html @@ -4,143 +4,87 @@
-
-
+
+
+
+ +
+
+ +
+
+
- - Room Table - -
-
- +
+
+
+
+
+
+ Room Name +
+

+ {{ data.product }} +

+
-
- +
+
+
+
+
+

{{ data.value }} kWh

+
Consumtion
+
+
+ +
+
+
+
-
- - - - Room Name - - - {{ value }} - - - - - Category - - - - - - - - - - - Popularity - - - - - - - - - - Amount - - - {{value}} - - - - - - - - - -
- - +
+
+ + +
+
diff --git a/src/app/content/hemat-app/monitoring/room/room.component.ts b/src/app/content/hemat-app/monitoring/room/room.component.ts index 084dde9..04b1035 100644 --- a/src/app/content/hemat-app/monitoring/room/room.component.ts +++ b/src/app/content/hemat-app/monitoring/room/room.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from "@angular/core"; +import { ActivatedRoute } from "@angular/router"; @Component({ selector: "app-room", @@ -7,54 +8,31 @@ import { Component, OnInit } from "@angular/core"; }) export class RoomComponent implements OnInit { public breadcrumb: any; + mode: string; // filteredRows: any[]; searchTerm: string = ""; - firstRow = [ - "../../../assets/images/portrait/small/avatar-s-4.png", - "../../../assets/images/portrait/small/avatar-s-5.png", - "../../../assets/images/portrait/small/avatar-s-6.png", - ]; - secondRow = [ - "../../../assets/images/portrait/small/avatar-s-7.png", - "../../../assets/images/portrait/small/avatar-s-8.png", - ]; - thirdRow = [ - "../../../assets/images/portrait/small/avatar-s-1.png", - "../../../assets/images/portrait/small/avatar-s-2.png", - "../../../assets/images/portrait/small/avatar-s-3.png", - ]; - fourthRow = [ - "../../../assets/images/portrait/small/avatar-s-11.png", - "../../../assets/images/portrait/small/avatar-s-12.png", - ]; - fifthRow = [ - "../../../assets/images/portrait/small/avatar-s-6.png", - "../../../assets/images/portrait/small/avatar-s-4.png", - ]; + ; filteredRows = [ { type: "danger", - value: 100, - product: "iPhone X", - image: this.firstRow, + value: 95, + product: "Ruang Meeting 1", buttonname: "Mobile", amount: "$ 1200.00", bagde: "+8 more", }, { - type: "success", + type: "warning", value: 75, - product: "iPad", - image: this.secondRow, + product: "Ruang Meeting 2", buttonname: "Teblet", amount: "$ 1190.00", bagde: "+5 more", }, { - type: "danger", + type: "success", value: 65, - product: "OnePlus", - image: this.thirdRow, + product: "Ruang Meeting 3", buttonname: "Mobile", amount: "$ 999.00", bagde: "+3 more", @@ -62,111 +40,51 @@ export class RoomComponent implements OnInit { { type: "success", value: 55, - product: "ZenPad", - image: this.fourthRow, + product: "Dapur", buttonname: "Teblet", amount: "$ 1150.00", }, { - type: "danger", + type: "success", value: 45, - product: "Pixel 2", - image: this.fifthRow, + product: "Ruang Musola", buttonname: "Mobile", amount: "$ 1180.00", }, { type: "danger", - value: 100, - product: "iPhone X", - image: this.firstRow, + value: 90, + product: "Ruang Server", buttonname: "Mobile", amount: "$ 1200.00", bagde: "+8 more", }, { - type: "success", + type: "warning", value: 75, - product: "iPad", - image: this.secondRow, + product: "Ruang Kepala Bagian", buttonname: "Teblet", amount: "$ 1190.00", bagde: "+5 more", }, { - type: "danger", + type: "success", value: 65, - product: "OnePlus", - image: this.thirdRow, + product: "Ruang Tengah", buttonname: "Mobile", amount: "$ 999.00", bagde: "+3 more", }, - { - type: "success", - value: 55, - product: "ZenPad", - image: this.fourthRow, - buttonname: "Teblet", - amount: "$ 1150.00", - }, - { - type: "danger", - value: 45, - product: "Pixel 2", - image: this.fifthRow, - buttonname: "Mobile", - amount: "$ 1180.00", - }, - { - type: "danger", - value: 100, - product: "iPhone X", - image: this.firstRow, - buttonname: "Mobile", - amount: "$ 1200.00", - bagde: "+8 more", - }, - { - type: "success", - value: 75, - product: "iPad", - image: this.secondRow, - buttonname: "Teblet", - amount: "$ 1190.00", - bagde: "+5 more", - }, - { - type: "danger", - value: 65, - product: "OnePlus", - image: this.thirdRow, - buttonname: "Mobile", - amount: "$ 999.00", - bagde: "+3 more", - }, - { - type: "success", - value: 55, - product: "ZenPad", - image: this.fourthRow, - buttonname: "Teblet", - amount: "$ 1150.00", - }, - { - type: "danger", - value: 45, - product: "Pixel 2", - image: this.fifthRow, - buttonname: "Mobile", - amount: "$ 1180.00", - }, ]; - constructor() {} + constructor(private route: ActivatedRoute) {} ngOnInit() { + this.route.data.subscribe((data) => { + this.mode = data.mode; + }); + console.log(this.mode); this.breadcrumb = { mainlabel: "Room", links: [ diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index e5e1ad3..1b55a70 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -39,7 +39,7 @@ export class LoginComponent implements OnInit { if (localStorage.getItem('remember')) { this.renderer.removeClass(document.body, 'bg-full-screen-image'); localStorage.removeItem('currentLayoutStyle'); - this.router.navigate(['/dashboard/sales']); + this.router.navigate(['/monitoring']); } else if (localStorage.getItem('currentUser')) { // Force logout on login if not remember me this.authService.doLogout(); @@ -74,7 +74,7 @@ export class LoginComponent implements OnInit { } this.setUserInStorage(res); localStorage.removeItem('currentLayoutStyle'); - let returnUrl = '/dashboard/sales'; + let returnUrl = '/monitoring'; if (this.returnUrl) { returnUrl = this.returnUrl; }