From 9296e1713bb7e626a9ba7a8b5cd478b894d00462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20G=C3=B3reczny?= Date: Sat, 2 Jan 2021 19:53:03 +0100 Subject: [PATCH] SES-124 Created ability cards --- .../ability-card/ability-card.component.css | 26 ++++++++++++++++--- .../ability-card/ability-card.component.html | 21 +++++++++------ .../ability-card.component.spec.ts | 25 ------------------ .../ability-card/ability-card.component.ts | 6 ++++- .../player-dashboard.component.html | 6 +---- .../player-dashboard.component.ts | 13 +--------- .../SessionCompanion/ClientApp/src/styles.css | 2 +- 7 files changed, 44 insertions(+), 55 deletions(-) delete mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.spec.ts diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.css index 9f85d1b..d728057 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.css +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.css @@ -3,9 +3,29 @@ height: 480px; } #main>.mat-card{ - padding: 0px; + padding: 0; } .diagonal-line{ - width:100px; - background:linear-gradient(45deg,#ffffff 49%,#aaa 50%,#ffffff 51%); + width:50px; + background:linear-gradient(45deg,rgb(16 32 40 / 0%) 49%,black,#ffffff00 51%); +} +#ability-card-content{ + display: flex; + flex-wrap: wrap; + justify-content: space-around; + padding-top: 10px; + padding-bottom: 10px; +} +#skill-btn{ + border-color: black; + flex: 1 0 auto; + margin-bottom: 10px; + margin-left: 10px; + margin-right: 10px; +} +#skill-btn-divider{ + border-left: black 1px solid; + padding-right: 10px; + padding-top: 10px; + padding-bottom: 10px; } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.html index 5daac83..c214590 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.html @@ -1,19 +1,24 @@
- + {{ability.value}}
- {{ability.modification}} + Mod: {{ability.modification > 0? '+' + ability.modification : '-' + ability.modification}}
{{ability.name}} -
-
- {{ability.savingthrows}} +
+
+ ST: {{ability.savingthrows > 0? '+' + ability.savingthrows : '-' + ability.savingthrows}}
- - - + + + + {{skill.name}} +     + + {{skill.value > 0? '+' + skill.value : '-' + skill.value}} +
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.spec.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.spec.ts deleted file mode 100644 index f8de036..0000000 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AbilityCardComponent } from './ability-card.component'; - -describe('StatisticCardComponent', () => { - let component: AbilityCardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AbilityCardComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(AbilityCardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.ts index 2f8e4f5..f525ccd 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.ts @@ -8,8 +8,12 @@ import { AbilityViewModel } from '../../../types/viewmodels/ability-viewmodels/A }) export class AbilityCardComponent implements OnInit { @Input() ability: AbilityViewModel; + @Input() headStyle: { bgColor: string; textColor: string }; + @Input() contentStyle: { bgColor: string; textColor: string }; constructor() {} - ngOnInit() {} + ngOnInit() { + this.ability.skills.sort((a, b) => (a.name > b.name ? 1 : -1)); + } } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html index a9dd20f..8b13789 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html @@ -1,5 +1 @@ -

-

-

-

- + diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts index 2c99938..7f89e9f 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts @@ -1,5 +1,4 @@ -import { Component, OnInit } from '@angular/core'; -import { AbilityViewModel } from '../../../types/viewmodels/ability-viewmodels/AbilityViewModel'; +import { Component } from '@angular/core'; @Component({ selector: 'app-player-dashboard', @@ -9,16 +8,6 @@ import { AbilityViewModel } from '../../../types/viewmodels/ability-viewmodels/A export class PlayerDashboardComponent { isExpanded = false; - test: AbilityViewModel = { - id: 1, - name: 'Dexterity', - value: 20, - modification: 3, - savingthrows: 1, - canSaveThrows: false, - skills: [], - }; - collapse() { this.isExpanded = false; } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/styles.css b/SessionCompanion/SessionCompanion/ClientApp/src/styles.css index 311e04a..cbfb6da 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/styles.css +++ b/SessionCompanion/SessionCompanion/ClientApp/src/styles.css @@ -70,7 +70,7 @@ } mat-divider { - border-top-color: #e9cca7 !important; + border-top-color: #e9cca7; } .arrow-select {