diff --git a/angular.json b/angular.json index 408a516..1779d21 100644 --- a/angular.json +++ b/angular.json @@ -35,7 +35,7 @@ "with": "src/environments/environment.prod.ts" } ], - "optimization": false, + "optimization": true, "outputHashing": "all", "sourceMap": false, "extractCss": true, @@ -47,8 +47,8 @@ "budgets": [ { "type": "initial", - "maximumWarning": "2mb", - "maximumError": "5mb" + "maximumWarning": "20mb", + "maximumError": "50mb" } ] } diff --git a/src/app/components/modal/modals/remove-tower/remove-tower.component.html b/src/app/components/modal/modals/remove-tower/remove-tower.component.html index 639b547..83fdc83 100644 --- a/src/app/components/modal/modals/remove-tower/remove-tower.component.html +++ b/src/app/components/modal/modals/remove-tower/remove-tower.component.html @@ -6,9 +6,7 @@
You are trying to remove - {{ - modalService.active.input.name ? modalService.active.input.name : 'an unnamed tower' - }}{{ tower.name ? tower.name : 'an unnamed tower' }}.
diff --git a/src/app/components/modal/modals/remove-tower/remove-tower.component.ts b/src/app/components/modal/modals/remove-tower/remove-tower.component.ts index 45a3113..5444702 100644 --- a/src/app/components/modal/modals/remove-tower/remove-tower.component.ts +++ b/src/app/components/modal/modals/remove-tower/remove-tower.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { ModalService } from '../../../../services/modal.service'; +import { Tower } from '../../../../model/tower'; @Component({ selector: 'app-remove-tower', @@ -8,4 +9,6 @@ import { ModalService } from '../../../../services/modal.service'; }) export class RemoveTowerComponent { constructor(public modalService: ModalService) {} + + tower: Tower = this.modalService.active.input; } diff --git a/src/app/components/modal/modals/settings/settings.component.html b/src/app/components/modal/modals/settings/settings.component.html index e3714aa..3d893ae 100644 --- a/src/app/components/modal/modals/settings/settings.component.html +++ b/src/app/components/modal/modals/settings/settings.component.html @@ -9,11 +9,11 @@ [beforeText]="'Hide create tower button'" [afterText]="'Show create tower button'" [default]="!page.userData.hideCreateTowerButton" - (value)="page?.setHideCreateTowerButton(!$event)" + (value)="page.setHideCreateTowerButton(!$event)" > -There can be a maximum of 5 towers on each page.
+There can be a maximum of 5 towers on each page.
diff --git a/src/app/components/modal/modals/settings/settings.component.ts b/src/app/components/modal/modals/settings/settings.component.ts index 5fcfe8c..09e470c 100644 --- a/src/app/components/modal/modals/settings/settings.component.ts +++ b/src/app/components/modal/modals/settings/settings.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { ModalService } from '../../../../services/modal.service'; import { DataService } from '../../../../services/data.service'; import { Page } from '../../../../model/page'; @@ -8,8 +8,10 @@ import { Page } from '../../../../model/page'; templateUrl: './settings.component.html', styleUrls: ['./settings.component.scss'] }) -export class SettingsComponent { - constructor(public modalService: ModalService, public dataService: DataService) { +export class SettingsComponent implements OnInit { + constructor(public modalService: ModalService, public dataService: DataService) {} + + ngOnInit() { this.modalService.active.input.subscribe(p => (this.page = p)); } diff --git a/src/app/components/pages/page/page.component.html b/src/app/components/pages/page/page.component.html index 0a94a08..1697354 100644 --- a/src/app/components/pages/page/page.component.html +++ b/src/app/components/pages/page/page.component.html @@ -1,21 +1,21 @@ - -
{{ tasks.length == 0 ? '' : tasks.length }}
diff --git a/src/app/components/pages/page/tower/tower.component.html b/src/app/components/pages/page/tower/tower.component.html
index de6bcaf..3bcad7e 100644
--- a/src/app/components/pages/page/tower/tower.component.html
+++ b/src/app/components/pages/page/tower/tower.component.html
@@ -1,14 +1,20 @@
-