Mod
None
-
+ @for (mod of mods; track mod) {
+
+ }
Maps will be stored and loaded from the selected mod
diff --git a/webapp/src/app/components/dialogs/settings/settings.component.scss b/webapp/src/app/components/dialogs/settings/settings.component.scss
index 39da5a1b..8675c450 100644
--- a/webapp/src/app/components/dialogs/settings/settings.component.scss
+++ b/webapp/src/app/components/dialogs/settings/settings.component.scss
@@ -22,13 +22,13 @@
}
.icon-undefined {
- color: mat.get-color-from-palette(mat.$blue-palette, 500);
+ color: #2196f3;
}
.icon-valid {
- color: mat.get-color-from-palette(mat.$green-palette, 500);
+ color: #4caf50;
}
.icon-invalid {
- color: mat.get-color-from-palette(mat.$red-palette, 500);
+ color: #f44336;
}
diff --git a/webapp/src/app/components/dialogs/settings/settings.component.ts b/webapp/src/app/components/dialogs/settings/settings.component.ts
index cabf9056..8abfbff4 100644
--- a/webapp/src/app/components/dialogs/settings/settings.component.ts
+++ b/webapp/src/app/components/dialogs/settings/settings.component.ts
@@ -14,10 +14,11 @@ import { OverlayRefControl } from '../overlay/overlay-ref-control';
@Component({
selector: 'app-settings',
templateUrl: './settings.component.html',
- styleUrls: ['./settings.component.scss']
+ styleUrls: ['./settings.component.scss'],
+ standalone: false
})
export class SettingsComponent implements OnInit {
-
+
isElectron = Globals.isElectron;
folderFormControl = new FormControl();
icon = 'help_outline';
@@ -26,19 +27,19 @@ export class SettingsComponent implements OnInit {
mod = '';
settings: AppSettings;
isIncludeVanillaMapsDisabled: boolean;
-
+
cardLight: PropListCard = {
name: 'Light',
imgSrc: 'assets/selection-light.png',
};
-
+
cardDark: PropListCard = {
name: 'Dark',
imgSrc: 'assets/selection-dark.png',
};
-
+
private readonly sharedService: SharedService;
-
+
constructor(
private ref: OverlayRefControl,
private electron: ElectronService,
@@ -52,27 +53,27 @@ export class SettingsComponent implements OnInit {
} else {
this.sharedService = browser;
}
-
+
http.getMods().subscribe(mods => this.mods = mods);
this.mod = this.sharedService.getSelectedMod();
this.isIncludeVanillaMapsDisabled = !this.mod;
this.settings = JSON.parse(JSON.stringify(this.settingsService.getSettings()));
}
-
+
ngOnInit() {
if (this.isElectron) {
this.folderFormControl.setValue(this.electron.getAssetsPath());
this.folderFormControl.valueChanges.subscribe(() => this.resetIcon());
}
-
+
this.check();
}
-
+
private resetIcon() {
this.icon = 'help_outline';
this.iconCss = 'icon-undefined';
}
-
+
private setIcon(valid: boolean) {
if (valid) {
this.icon = 'check';
@@ -82,14 +83,14 @@ export class SettingsComponent implements OnInit {
this.iconCss = 'icon-invalid';
}
}
-
+
select() {
const path = this.electron.selectCcFolder();
if (path) {
this.folderFormControl.setValue(path);
}
}
-
+
check() {
const valid = this.electron.checkAssetsPath(this.folderFormControl.value);
this.setIcon(valid);
@@ -101,11 +102,11 @@ export class SettingsComponent implements OnInit {
});
}
}
-
+
modSelectEvent(selectedMod: string) {
this.isIncludeVanillaMapsDisabled = !selectedMod;
}
-
+
save() {
if (this.isElectron) {
this.electron.saveAssetsPath(this.folderFormControl.value);
@@ -116,12 +117,12 @@ export class SettingsComponent implements OnInit {
const ref = this.snackBar.open('Changing the path requires to restart the editor', 'Restart', {
duration: 6000
});
-
+
ref.onAction().subscribe(() => this.sharedService.relaunch());
}
-
+
close() {
this.ref.close();
}
-
+
}
diff --git a/webapp/src/app/components/editor/editor.component.ts b/webapp/src/app/components/editor/editor.component.ts
index 524854b2..bb2ec31d 100644
--- a/webapp/src/app/components/editor/editor.component.ts
+++ b/webapp/src/app/components/editor/editor.component.ts
@@ -8,14 +8,15 @@ import { JsonLoaderService } from '../../services/json-loader.service';
@Component({
selector: 'app-editor',
templateUrl: './editor.component.html',
- styleUrls: ['./editor.component.scss']
+ styleUrls: ['./editor.component.scss'],
+ standalone: false
})
export class EditorComponent {
@ViewChild('loadmap', {static: true})
- loadmap!: LoadMapComponent;
+ loadmap!: LoadMapComponent;
@ViewChild('sidenavLoadMap', {static: true})
- sidenavLoadMap!: MatSidenav;
+ sidenavLoadMap!: MatSidenav;
constructor(
addEntity: AddEntityMenuService,
diff --git a/webapp/src/app/components/entities/entities.component.html b/webapp/src/app/components/entities/entities.component.html
index 9c9f12f9..0c74583c 100644
--- a/webapp/src/app/components/entities/entities.component.html
+++ b/webapp/src/app/components/entities/entities.component.html
@@ -1,23 +1,29 @@
-
-
{{entity?.details?.type}}
-
+@if (!entity && !hideFilter) {
+
+}
+
{{ entity?.details?.type }}
+
-
+ @if (entity) {
+
+ }
-
-
+ @if (entity) {
+
+ } @if (entity) {
+ >
+}
diff --git a/webapp/src/app/components/entities/entities.component.scss b/webapp/src/app/components/entities/entities.component.scss
index cb3bb297..5ca5a9a5 100644
--- a/webapp/src/app/components/entities/entities.component.scss
+++ b/webapp/src/app/components/entities/entities.component.scss
@@ -1,7 +1,5 @@
@use '@angular/material' as mat;
-$config: mat.define-typography-config();
-
h2 {
margin-left: 14px;
margin-top: 10px;
diff --git a/webapp/src/app/components/entities/entities.component.ts b/webapp/src/app/components/entities/entities.component.ts
index 2a560d8c..15662d36 100644
--- a/webapp/src/app/components/entities/entities.component.ts
+++ b/webapp/src/app/components/entities/entities.component.ts
@@ -11,7 +11,8 @@ import { WidgetRegistryService } from '../widgets/widget-registry.service';
@Component({
selector: 'app-entities',
templateUrl: './entities.component.html',
- styleUrls: ['./entities.component.scss']
+ styleUrls: ['./entities.component.scss'],
+ standalone: false
})
export class EntitiesComponent {
@ViewChild(HostDirective, {static: false}) appHost?: HostDirective;
diff --git a/webapp/src/app/components/json-editor/json-editor.component.scss b/webapp/src/app/components/json-editor/json-editor.component.scss
index fa08f2f7..23014214 100644
--- a/webapp/src/app/components/json-editor/json-editor.component.scss
+++ b/webapp/src/app/components/json-editor/json-editor.component.scss
@@ -1,19 +1,14 @@
-@use '@angular/material' as mat;
-@import "theme";
-$primary: map-get($theme, primary);
-$accent: map-get($theme, accent);
-
.dialog-container {
width: 70vw;
height: 85vh;
}
-.input-container{
+.input-container {
width: 50%;
}
-.button-container{
+.button-container {
margin-top: 16px;
}
@@ -22,5 +17,5 @@ $accent: map-get($theme, accent);
font-family: droid sans mono, consolas, monospace, courier new, courier, sans-serif;
resize: none;
color: white;
- background-color: mat.get-color-from-palette($accent, 700);
+ background-color: var(--gray-700);
}
diff --git a/webapp/src/app/components/json-editor/json-editor.component.ts b/webapp/src/app/components/json-editor/json-editor.component.ts
index b5635088..f077a34e 100644
--- a/webapp/src/app/components/json-editor/json-editor.component.ts
+++ b/webapp/src/app/components/json-editor/json-editor.component.ts
@@ -1,12 +1,13 @@
import { AfterViewInit, Component, ElementRef, Inject, Optional, ViewChild } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import JSONEditor, { JSONEditorOptions } from 'jsoneditor';
import { Globals } from '../../services/globals';
@Component({
selector: 'app-json-editor',
templateUrl: './json-editor.component.html',
- styleUrls: ['./json-editor.component.scss']
+ styleUrls: ['./json-editor.component.scss'],
+ standalone: false
})
export class JsonEditorComponent implements AfterViewInit {
@ViewChild('editor', {static: false}) container?: ElementRef;
@@ -18,7 +19,7 @@ export class JsonEditorComponent implements AfterViewInit {
json = JSON;
constructor(@Optional() @Inject(MAT_DIALOG_DATA) data: { key: string, val: any },
- public ref: MatDialogRef
) {
+ public ref: MatDialogRef) {
this.data = data.val;
this.key = data.key;
ref.afterClosed().subscribe(() => {
diff --git a/webapp/src/app/components/layers/layers.component.html b/webapp/src/app/components/layers/layers.component.html
index 2fe12749..31869c73 100644
--- a/webapp/src/app/components/layers/layers.component.html
+++ b/webapp/src/app/components/layers/layers.component.html
@@ -1,23 +1,25 @@
-
-
-
-
-
-
-
-
{{getDisplayName(layer)}}
+
+ @for (layer of map?.layers; track layer) {
+
+
+
+
+
+
+ {{ getDisplayName(layer) }}
+
+
-
+
+ }
@@ -125,8 +130,11 @@
- {{getTilesetName(tileset)}}
+ @for (tileset of tilesets; track tileset) {
+ {{ getTilesetName(tileset) }}
+
+ }
-
+ @if (gridSettings(); as settings) {
+
settings
-
-
+
+ Size
+
+
+
+
+ Offset
+
+
+
+
+ Visible
+
+
diff --git a/webapp/src/app/components/toolbar/grid-menu/grid-menu.component.ts b/webapp/src/app/components/toolbar/grid-menu/grid-menu.component.ts
index 17243a26..57c45e8b 100644
--- a/webapp/src/app/components/toolbar/grid-menu/grid-menu.component.ts
+++ b/webapp/src/app/components/toolbar/grid-menu/grid-menu.component.ts
@@ -4,9 +4,8 @@ import { MatIconButton } from '@angular/material/button';
import { MatIcon } from '@angular/material/icon';
import { FormsModule } from '@angular/forms';
import { Globals } from '../../../services/globals';
-import { NgIf } from '@angular/common';
+
import { MatFormField, MatLabel } from '@angular/material/form-field';
-import { MatInput } from '@angular/material/input';
import { PointInputComponent } from '../vec-input/point-input.component';
import { Helper } from '../../../services/phaser/helper';
import { Point } from '../../../models/cross-code-map';
@@ -26,7 +25,6 @@ const gridSettingsKey = 'gridSettingsKey';
@Component({
selector: 'app-grid-menu',
- standalone: true,
animations: [
trigger('openClose', [
state('void', style({
@@ -43,9 +41,7 @@ const gridSettingsKey = 'gridSettingsKey';
MatIconButton,
MatIcon,
FormsModule,
- NgIf,
MatFormField,
- MatInput,
MatLabel,
PointInputComponent
],
diff --git a/webapp/src/app/components/toolbar/toolbar-divider/toolbar-divider.component.ts b/webapp/src/app/components/toolbar/toolbar-divider/toolbar-divider.component.ts
index ec4395cb..8e6f2ea4 100644
--- a/webapp/src/app/components/toolbar/toolbar-divider/toolbar-divider.component.ts
+++ b/webapp/src/app/components/toolbar/toolbar-divider/toolbar-divider.component.ts
@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-toolbar-divider',
- standalone: true,
imports: [],
template: '',
styleUrl: './toolbar-divider.component.scss'
diff --git a/webapp/src/app/components/toolbar/toolbar.component.html b/webapp/src/app/components/toolbar/toolbar.component.html
index 5cc37ea2..5ddaa9af 100644
--- a/webapp/src/app/components/toolbar/toolbar.component.html
+++ b/webapp/src/app/components/toolbar/toolbar.component.html
@@ -4,8 +4,11 @@
-
-
+ @if (loaded) {
+
+ } @if (loaded) {
+
+ }
@@ -64,11 +67,16 @@
-
-
- {{ error }}
-
-
+ @if (map) {
+
+ } @if (!loaded) {
+
+ {{ error }}
+ @if (!error) {
+
+ }
+
+ }
diff --git a/webapp/src/app/components/toolbar/toolbar.component.scss b/webapp/src/app/components/toolbar/toolbar.component.scss
index ef38b909..3f6ff1b3 100644
--- a/webapp/src/app/components/toolbar/toolbar.component.scss
+++ b/webapp/src/app/components/toolbar/toolbar.component.scss
@@ -10,5 +10,5 @@ mat-spinner {
}
.load-error {
- color: mat.get-color-from-palette(mat.$red-palette, 500);
+ color: #f44336;
}
diff --git a/webapp/src/app/components/toolbar/toolbar.component.ts b/webapp/src/app/components/toolbar/toolbar.component.ts
index 5949e4b8..34ebf455 100644
--- a/webapp/src/app/components/toolbar/toolbar.component.ts
+++ b/webapp/src/app/components/toolbar/toolbar.component.ts
@@ -1,7 +1,6 @@
import { Overlay } from '@angular/cdk/overlay';
import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
-import { MatSlideToggleChange } from '@angular/material/slide-toggle';
import { Router } from '@angular/router';
import { environment } from '../../../environments/environment';
@@ -18,7 +17,8 @@ import { SettingsComponent } from '../dialogs/settings/settings.component';
@Component({
selector: 'app-toolbar',
templateUrl: './toolbar.component.html',
- styleUrls: ['./toolbar.component.scss']
+ styleUrls: ['./toolbar.component.scss'],
+ standalone: false
})
export class ToolbarComponent implements OnInit {
@@ -52,21 +52,25 @@ export class ToolbarComponent implements OnInit {
// Use this to automatically load a map on startup for faster testing
if (!environment.production) {
+ console.warn('DEBUG: auto load map');
this.events.loadComplete.subscribe(async () => {
// await (await import('rxjs')).firstValueFrom(this.mapLoader.tileMap);
- // this.mapLoader.loadMapByName('autumn/entrance');
+ // this.mapLoader.loadMapByName('arid/river-1');
+ // this.mapLoader.loadMapByName('tests/all-overlays');
+ // this.mapLoader.loadMapByName('tests/rhombus-sqr_beach-sw');
+ this.mapLoader.loadMapByName('autumn-fall/raid/raid-end');
- // automatically opens npc event editor
+ // automatically opens event editor
// console.log('after map load');
// await new Promise(r => setTimeout(r, 500));
// Globals.scene.cameras.main.setZoom(4, 4);
- // Globals.scene.cameras.main.pan(330, 160, 0);
- // const npc = this.map?.entityManager.entities.find(e => e.details.type === 'NPC');
+ // Globals.scene.cameras.main.pan(800, 1460, 0);
+ // const npc = this.map?.entityManager.entities.find(e => e.details.settings['name'] === 'BossGoesBoom');
// this.events.currentView.next(EditorView.Entities);
// await new Promise(r => setTimeout(r, 300));
// this.events.selectedEntity.next(npc);
- // await new Promise(r => setTimeout(r, 400));
- // const el = document.getElementsByTagName('app-npcstates-widget');
+ // await new Promise(r => setTimeout(r, 500));
+ // const el = document.getElementsByTagName('app-event-widget');
// el[0].getElementsByTagName('input')[0].click();
});
}
diff --git a/webapp/src/app/components/toolbar/vec-input/point-input.component.ts b/webapp/src/app/components/toolbar/vec-input/point-input.component.ts
index f9349c65..38866439 100644
--- a/webapp/src/app/components/toolbar/vec-input/point-input.component.ts
+++ b/webapp/src/app/components/toolbar/vec-input/point-input.component.ts
@@ -7,7 +7,6 @@ import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
@Component({
selector: 'app-point-input',
- standalone: true,
imports: [
FormsModule,
ReactiveFormsModule
diff --git a/webapp/src/app/components/widgets/array-widget/array-widget.component.ts b/webapp/src/app/components/widgets/array-widget/array-widget.component.ts
index 3c7eae7f..feb359fd 100644
--- a/webapp/src/app/components/widgets/array-widget/array-widget.component.ts
+++ b/webapp/src/app/components/widgets/array-widget/array-widget.component.ts
@@ -1,15 +1,13 @@
import { Component, OnChanges, Type, ViewChild, ViewContainerRef } from '@angular/core';
import { AbstractWidget } from '../abstract-widget';
import { FlexModule } from '@angular/flex-layout';
-import { MatRipple } from '@angular/material/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatTooltip } from '@angular/material/tooltip';
-import { JsonPipe, NgComponentOutlet, NgIf } from '@angular/common';
+import { NgComponentOutlet } from '@angular/common';
import { AttributeValue } from '../../../services/phaser/entities/cc-entity';
import { WidgetRegistryService } from '../widget-registry.service';
import { MatIconButton } from '@angular/material/button';
import { MatIcon } from '@angular/material/icon';
-import { MatDivider } from '@angular/material/divider';
export interface ArrayWidgetSub {
_type: string;
@@ -32,18 +30,13 @@ interface DynamicComponent {
@Component({
selector: 'app-array-widget',
- standalone: true,
imports: [
FlexModule,
- MatRipple,
ReactiveFormsModule,
MatTooltip,
- NgIf,
- JsonPipe,
NgComponentOutlet,
MatIconButton,
- MatIcon,
- MatDivider
+ MatIcon
],
templateUrl: './array-widget.component.html',
styleUrls: ['./array-widget.component.scss', '../widget.scss']
diff --git a/webapp/src/app/components/widgets/boolean-widget/boolean-widget.component.ts b/webapp/src/app/components/widgets/boolean-widget/boolean-widget.component.ts
index 11a68e9f..7052a5ac 100644
--- a/webapp/src/app/components/widgets/boolean-widget/boolean-widget.component.ts
+++ b/webapp/src/app/components/widgets/boolean-widget/boolean-widget.component.ts
@@ -4,7 +4,8 @@ import { AbstractWidget } from '../abstract-widget';
@Component({
selector: 'app-boolean-widget',
templateUrl: './boolean-widget.component.html',
- styleUrls: ['./boolean-widget.component.scss', '../widget.scss']
+ styleUrls: ['./boolean-widget.component.scss', '../widget.scss'],
+ standalone: false
})
export class BooleanWidgetComponent extends AbstractWidget {
}
diff --git a/webapp/src/app/components/widgets/character-widget/character-widget.component.ts b/webapp/src/app/components/widgets/character-widget/character-widget.component.ts
index cad7bae6..335a61cb 100644
--- a/webapp/src/app/components/widgets/character-widget/character-widget.component.ts
+++ b/webapp/src/app/components/widgets/character-widget/character-widget.component.ts
@@ -11,7 +11,8 @@ import { Helper } from '../../../services/phaser/helper';
@Component({
selector: 'app-character-widget',
templateUrl: './character-widget.component.html',
- styleUrls: ['./character-widget.component.scss', '../widget.scss']
+ styleUrls: ['./character-widget.component.scss', '../widget.scss'],
+ standalone: false
})
export class CharacterWidgetComponent extends OverlayWidget {
diff --git a/webapp/src/app/components/widgets/custom-des-type-widget/custom-des-type-widget.component.ts b/webapp/src/app/components/widgets/custom-des-type-widget/custom-des-type-widget.component.ts
index 3baae6e8..3340b660 100644
--- a/webapp/src/app/components/widgets/custom-des-type-widget/custom-des-type-widget.component.ts
+++ b/webapp/src/app/components/widgets/custom-des-type-widget/custom-des-type-widget.component.ts
@@ -13,7 +13,8 @@ import { PropListCard } from '../shared/image-select-overlay/image-select-card/i
@Component({
selector: 'app-custom-des-type-widget',
templateUrl: './custom-des-type-widget.component.html',
- styleUrls: ['./custom-des-type-widget.component.scss', '../widget.scss']
+ styleUrls: ['./custom-des-type-widget.component.scss', '../widget.scss'],
+ standalone: false
})
export class CustomDesTypeWidgetComponent extends OverlayWidget {
diff --git a/webapp/src/app/components/widgets/enemy-single-type-widget/enemy-single-type-widget.component.ts b/webapp/src/app/components/widgets/enemy-single-type-widget/enemy-single-type-widget.component.ts
index 549ff711..f4c19bac 100644
--- a/webapp/src/app/components/widgets/enemy-single-type-widget/enemy-single-type-widget.component.ts
+++ b/webapp/src/app/components/widgets/enemy-single-type-widget/enemy-single-type-widget.component.ts
@@ -5,12 +5,13 @@ import { HttpClientService } from '../../../services/http-client.service';
import { OverlayService } from '../../dialogs/overlay/overlay.service';
import { Overlay } from '@angular/cdk/overlay';
import { lastValueFrom } from 'rxjs';
-import { EnemyAttributes, EnemyInfo } from '../../../services/phaser/entities/registry/enemy';
+import { EnemyAttributes } from '../../../services/phaser/entities/registry/enemy';
@Component({
selector: 'app-enemy-single-type-widget',
templateUrl: './enemy-single-type-widget.component.html',
- styleUrls: ['./enemy-single-type-widget.component.scss', '../widget.scss']
+ styleUrls: ['./enemy-single-type-widget.component.scss', '../widget.scss'],
+ standalone: false
})
export class EnemySingleTypeWidgetComponent extends OverlayWidget {
diff --git a/webapp/src/app/components/widgets/enemy-type-widget/enemy-type-overlay/enemy-type-overlay.component.html b/webapp/src/app/components/widgets/enemy-type-widget/enemy-type-overlay/enemy-type-overlay.component.html
index 1ace1608..257809f8 100644
--- a/webapp/src/app/components/widgets/enemy-type-widget/enemy-type-overlay/enemy-type-overlay.component.html
+++ b/webapp/src/app/components/widgets/enemy-type-widget/enemy-type-overlay/enemy-type-overlay.component.html
@@ -5,7 +5,7 @@
>
-
diff --git a/webapp/src/app/components/widgets/event-widget/event-editor/detail/event-detail.component.scss b/webapp/src/app/components/widgets/event-widget/event-editor/detail/event-detail.component.scss
index cb1cb64d..33288a18 100644
--- a/webapp/src/app/components/widgets/event-widget/event-editor/detail/event-detail.component.scss
+++ b/webapp/src/app/components/widgets/event-widget/event-editor/detail/event-detail.component.scss
@@ -1,8 +1,3 @@
-@use '@angular/material' as mat;
-@import "theme";
-
-$primary: map-get($theme, primary);
-$accent: map-get($theme, accent);
:host {
min-width: 0;
@@ -15,7 +10,7 @@ $accent: map-get($theme, accent);
width: 300px;
max-height: 78vh;
color: white;
- background-color: mat.get-color-from-palette($accent, 800);
+ background-color: var(--gray-800);
}
.content {
@@ -38,7 +33,7 @@ $accent: map-get($theme, accent);
text-align: center;
padding-top: 10px;
padding-bottom: 10px;
- background-color: mat.get-color-from-palette($accent, 900);
+ background-color: var(--gray-900);
& h2 {
margin-bottom: 0;
diff --git a/webapp/src/app/components/widgets/event-widget/event-editor/detail/event-detail.component.ts b/webapp/src/app/components/widgets/event-widget/event-editor/detail/event-detail.component.ts
index ad045289..5c9d3a72 100644
--- a/webapp/src/app/components/widgets/event-widget/event-editor/detail/event-detail.component.ts
+++ b/webapp/src/app/components/widgets/event-widget/event-editor/detail/event-detail.component.ts
@@ -13,7 +13,8 @@ export type RefreshType = 'Node' | 'Full';
@Component({
selector: 'app-event-detail',
templateUrl: './event-detail.component.html',
- styleUrls: ['./event-detail.component.scss']
+ styleUrls: ['./event-detail.component.scss'],
+ standalone: false
})
export class EventDetailComponent implements OnDestroy {
@ViewChild(HostDirective, {static: true}) appHost!: HostDirective;
@@ -44,7 +45,7 @@ export class EventDetailComponent implements OnDestroy {
}
public loadEvent(event: AbstractEvent) {
- if(this.event !== event) {
+ if (this.event !== event) {
this.event = event;
this.loadSettings();
}
diff --git a/webapp/src/app/components/widgets/event-widget/event-editor/editor/event-editor.component.html b/webapp/src/app/components/widgets/event-widget/event-editor/editor/event-editor.component.html
index 194b7b08..46cf4875 100644
--- a/webapp/src/app/components/widgets/event-widget/event-editor/editor/event-editor.component.html
+++ b/webapp/src/app/components/widgets/event-widget/event-editor/editor/event-editor.component.html
@@ -7,7 +7,7 @@
[(base)]="base"
>
-
@@ -44,7 +44,7 @@
-
+
diff --git a/webapp/src/app/components/widgets/event-widget/event-editor/editor/event-editor.component.ts b/webapp/src/app/components/widgets/event-widget/event-editor/editor/event-editor.component.ts
index 932a4956..f7868947 100644
--- a/webapp/src/app/components/widgets/event-widget/event-editor/editor/event-editor.component.ts
+++ b/webapp/src/app/components/widgets/event-widget/event-editor/editor/event-editor.component.ts
@@ -16,7 +16,8 @@ import { EventHistory } from './event-history';
selector: 'app-event-editor',
templateUrl: './event-editor.component.html',
styleUrls: ['./event-editor.component.scss'],
- changeDetection: ChangeDetectionStrategy.OnPush
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ standalone: false
})
export class EventEditorComponent implements OnChanges, OnInit {
private static globalBase = 0;
@@ -33,6 +34,7 @@ export class EventEditorComponent implements OnChanges, OnInit {
get base() {
return EventEditorComponent.globalBase;
}
+
set base(value: number) {
EventEditorComponent.globalBase = value;
}
@@ -172,46 +174,46 @@ export class EventEditorComponent implements OnChanges, OnInit {
if (event.cancelable) {
event.preventDefault();
}
-
+
switch (event.code) {
- case 'ArrowUp':
- case 'ArrowLeft':
- this.selectUp();
- return;
- case 'ArrowDown':
- case 'ArrowRight':
- this.selectDown();
- return;
- case 'Enter':
- this.openAddMenu(event, null);
- return;
- case 'Delete':
- this.delete();
- return;
- case 'Escape':
- this.deselect();
- return;
- }
-
- if (event.ctrlKey) {
- switch (event.key.toLowerCase()) {
- case 'c':
- this.copy();
+ case 'ArrowUp':
+ case 'ArrowLeft':
+ this.selectUp();
return;
- case 'x':
- this.copy();
- this.delete();
+ case 'ArrowDown':
+ case 'ArrowRight':
+ this.selectDown();
return;
- case 'v':
- this.paste();
+ case 'Enter':
+ this.openAddMenu(event, null);
return;
- case 'z':
- if (event.shiftKey) {
- this.redo();
- } else {
- this.undo();
- }
+ case 'Delete':
+ this.delete();
return;
+ case 'Escape':
+ this.deselect();
+ return;
+ }
+
+ if (event.ctrlKey) {
+ switch (event.key.toLowerCase()) {
+ case 'c':
+ this.copy();
+ return;
+ case 'x':
+ this.copy();
+ this.delete();
+ return;
+ case 'v':
+ this.paste();
+ return;
+ case 'z':
+ if (event.shiftKey) {
+ this.redo();
+ } else {
+ this.undo();
+ }
+ return;
}
}
}
diff --git a/webapp/src/app/components/widgets/event-widget/event-editor/row-text/row-text.component.scss b/webapp/src/app/components/widgets/event-widget/event-editor/row-text/row-text.component.scss
index 38316916..2257c9e3 100644
--- a/webapp/src/app/components/widgets/event-widget/event-editor/row-text/row-text.component.scss
+++ b/webapp/src/app/components/widgets/event-widget/event-editor/row-text/row-text.component.scss
@@ -1,10 +1,6 @@
@use '@angular/material' as mat;
-@import "theme";
-$primary: map-get($theme, primary);
-$accent: map-get($theme, accent);
-
-$config: mat.define-typography-config();
+$config: mat.m2-define-typography-config();
.no-click {
user-select: none;
@@ -70,9 +66,9 @@ button {
width: 100%;
text-transform: none;
$font-type: subtitle-1;
- font-family: mat.font-family($config);
- font-size: mat.font-size($config, $font-type);
- font-weight: mat.font-weight($config, $font-type);
+ font-family: mat.m2-font-family($config);
+ font-size: mat.m2-font-size($config, $font-type);
+ font-weight: mat.m2-font-weight($config, $font-type);
background: none;
color: white;
border: none;
diff --git a/webapp/src/app/components/widgets/event-widget/event-editor/row-text/row-text.component.ts b/webapp/src/app/components/widgets/event-widget/event-editor/row-text/row-text.component.ts
index 11e38e87..1c750cf8 100644
--- a/webapp/src/app/components/widgets/event-widget/event-editor/row-text/row-text.component.ts
+++ b/webapp/src/app/components/widgets/event-widget/event-editor/row-text/row-text.component.ts
@@ -5,15 +5,17 @@ import { EventDisplay } from '../event-display.model';
selector: 'app-row-text',
templateUrl: './row-text.component.html',
styleUrls: ['./row-text.component.scss'],
- changeDetection: ChangeDetectionStrategy.OnPush
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ standalone: false
})
export class RowTextComponent implements OnInit {
@Input() display!: EventDisplay;
-
+
constructor(
private ref: ChangeDetectorRef,
- ) {}
-
+ ) {
+ }
+
ngOnInit(): void {
this.display.changeDetector = this.ref;
}
diff --git a/webapp/src/app/components/widgets/event-widget/event-widget.component.ts b/webapp/src/app/components/widgets/event-widget/event-widget.component.ts
index d07fd9eb..ec3fe574 100644
--- a/webapp/src/app/components/widgets/event-widget/event-widget.component.ts
+++ b/webapp/src/app/components/widgets/event-widget/event-widget.component.ts
@@ -10,7 +10,8 @@ import { EventWindowComponent } from './event-window/event-window.component';
@Component({
selector: 'app-event-widget',
templateUrl: './event-widget.component.html',
- styleUrls: ['./event-widget.component.scss', '../widget.scss']
+ styleUrls: ['./event-widget.component.scss', '../widget.scss'],
+ standalone: false
})
export class EventWidgetComponent extends AbstractWidget implements OnChanges {
diff --git a/webapp/src/app/components/widgets/event-widget/event-window/event-window.component.ts b/webapp/src/app/components/widgets/event-widget/event-window/event-window.component.ts
index 2d924dbf..ff54ec63 100644
--- a/webapp/src/app/components/widgets/event-widget/event-window/event-window.component.ts
+++ b/webapp/src/app/components/widgets/event-widget/event-window/event-window.component.ts
@@ -7,25 +7,26 @@ import { EventHelperService } from '../event-editor/event-helper.service';
selector: 'app-event-window',
templateUrl: './event-window.component.html',
styleUrls: ['./event-window.component.scss', '../../widget.scss'],
+ standalone: false
})
export class EventWindowComponent {
-
- @ViewChild('eventEditor', { static: false }) eventEditor!: EventEditorComponent;
-
+
+ @ViewChild('eventEditor', {static: false}) eventEditor!: EventEditorComponent;
+
@Input() event: EventArray | unknown = [];
@Input() actionStep = false;
@Output() exit = new EventEmitter
();
-
+
constructor(
private helper: EventHelperService
) {
}
-
+
save() {
this.exit.emit(this.eventEditor.export());
this.helper.selectedEvent.next(null);
}
-
+
cancel() {
this.exit.error('cancel');
this.helper.selectedEvent.next(null);
diff --git a/webapp/src/app/components/widgets/inputs/input-with-button/input-with-button.component.ts b/webapp/src/app/components/widgets/inputs/input-with-button/input-with-button.component.ts
index b90a2907..46436efc 100644
--- a/webapp/src/app/components/widgets/inputs/input-with-button/input-with-button.component.ts
+++ b/webapp/src/app/components/widgets/inputs/input-with-button/input-with-button.component.ts
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { CommonModule } from '@angular/common';
+
import { MatTooltipModule } from '@angular/material/tooltip';
import { FormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
@@ -7,8 +7,7 @@ import { MatIconModule } from '@angular/material/icon';
@Component({
selector: 'app-input-with-button',
- standalone: true,
- imports: [CommonModule, MatTooltipModule, FormsModule, MatButtonModule, MatIconModule],
+ imports: [MatTooltipModule, FormsModule, MatButtonModule, MatIconModule],
templateUrl: './input-with-button.component.html',
styleUrls: ['./input-with-button.component.scss', '../../widget.scss']
})
diff --git a/webapp/src/app/components/widgets/json-widget/json-widget.component.html b/webapp/src/app/components/widgets/json-widget/json-widget.component.html
index 5e5a32a5..37c99e53 100644
--- a/webapp/src/app/components/widgets/json-widget/json-widget.component.html
+++ b/webapp/src/app/components/widgets/json-widget/json-widget.component.html
@@ -1,5 +1,7 @@
-
+ @if (!noPropName) {
+
+ }
+
+
+
+
-
-
-
-
-