From eff7069cae8abd854c545c2a8250ad4287c57cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Fri, 22 Mar 2024 18:36:53 +0100 Subject: [PATCH] Wrap Condition and Action Editor column wise when display too small --- src/app/app.module.ts | 9 ++++++-- .../template-gamesystem-editor.component.html | 1 + .../template-transition-editor.component.html | 9 ++++++++ .../template-transition-editor.component.scss | 12 ++++++++++ ...mplate-transition-editor.component.spec.ts | 23 +++++++++++++++++++ .../template-transition-editor.component.ts | 13 +++++++++++ .../simple-transition-editor.component.scss | 5 ++-- 7 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.html create mode 100644 src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.scss create mode 100644 src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.spec.ts create mode 100644 src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c1e95d8..277acd2 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -82,6 +82,9 @@ import { MatExpansionPanelHeader, MatExpansionPanelTitle } from "@angular/material/expansion"; +import { + TemplateTransitionEditorComponent +} from "./editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component"; // AoT requires an exported function for factories const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader => new TranslateHttpLoader(http, './assets/i18n/', '.json'); @@ -107,7 +110,8 @@ const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader => new Transl CharacterOverviewComponent, CharacterEditorComponent, TemplateGamesystemEditorComponent, - TemplateStateEditorComponent + TemplateStateEditorComponent, + TemplateTransitionEditorComponent ], imports: [ BrowserModule, @@ -172,7 +176,8 @@ const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader => new Transl ], providers: [], exports: [ - ProductGamesystemEditorComponent + ProductGamesystemEditorComponent, + SimpleTransitionEditorComponent ], bootstrap: [AppComponent] }) diff --git a/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-gamesystem-editor.component.html b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-gamesystem-editor.component.html index 052645f..b9939bf 100644 --- a/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-gamesystem-editor.component.html +++ b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-gamesystem-editor.component.html @@ -1,3 +1,4 @@ + diff --git a/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.html b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.html new file mode 100644 index 0000000..6c8ab4c --- /dev/null +++ b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.html @@ -0,0 +1,9 @@ +
+
+ +
+
+ +
+ +
diff --git a/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.scss b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.scss new file mode 100644 index 0000000..faec0b1 --- /dev/null +++ b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.scss @@ -0,0 +1,12 @@ +.parentContainer { + display: flex; +} + +.reference-editor, { + width: 40%; + max-width: 50%; +} + +.template-editor { + +} diff --git a/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.spec.ts b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.spec.ts new file mode 100644 index 0000000..ff2ddee --- /dev/null +++ b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TemplateTransitionEditorComponent } from './template-transition-editor.component'; + +describe('TemplateTransitionEditorComponent', () => { + let component: TemplateTransitionEditorComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TemplateTransitionEditorComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(TemplateTransitionEditorComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.ts b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.ts new file mode 100644 index 0000000..2220553 --- /dev/null +++ b/src/app/editor/gamesystem-editor/template-gamesystem-editor/template-transition-editor/template-transition-editor.component.ts @@ -0,0 +1,13 @@ +import {Component, Input} from '@angular/core'; +import {TemplateGamesystem} from "../../../../project/game-model/gamesystems/TemplateGamesystem"; +import {AppModule} from "../../../../app.module"; + +@Component({ + selector: 'app-template-transition-editor', + templateUrl: './template-transition-editor.component.html', + styleUrl: './template-transition-editor.component.scss' +}) +export class TemplateTransitionEditorComponent { + + @Input() templateGamesystem: TemplateGamesystem | undefined +} diff --git a/src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.scss b/src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.scss index b1e5805..b2a3575 100644 --- a/src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.scss +++ b/src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.scss @@ -64,13 +64,14 @@ tr.example-element-row:not(.example-expanded-row):active { .condition-action-container { display: flex; + flex-wrap: wrap; width: 100% } .condition-container { - width: 45%; + flex: 1; } .action-container { - width: 45%; + flex: 1; }