From 145491fd2ab25bb43f94389732f5c6b40b410b74 Mon Sep 17 00:00:00 2001 From: Natalia Gawron Date: Sat, 9 Jan 2021 22:12:20 +0100 Subject: [PATCH 1/5] SES-13 implemented getCharacterStats method --- .../player-dashboard.component.ts | 34 ++++++++++++++++--- .../src/services/character.service.ts | 15 ++++++++ .../CharacterStatsViewModel.ts | 13 +++++++ 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/character-viewmodels/CharacterStatsViewModel.ts 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 91157af..89bbe3d 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,14 +1,28 @@ import { Component, OnInit } from '@angular/core'; -import {AbilityViewModel} from "../../../types/viewmodels/ability-viewmodels/AbilityViewModel"; +import { AbilityViewModel } from "../../../types/viewmodels/ability-viewmodels/AbilityViewModel"; +import {AppState} from "../../store/models/app-state.model"; +import {Store} from "@ngrx/store"; +import {first} from "rxjs/operators"; +import {CharacterService} from "../../../services/character.service"; +import {CharacterStatsViewModel} from "../../../types/viewmodels/character-viewmodels/CharacterStatsViewModel"; +import {ErrorResponse} from "../../../types/ErrorResponse"; +import {HttpErrorResponse} from "@angular/common/http"; @Component({ selector: 'app-player-dashboard', templateUrl: './player-dashboard.component.html', styleUrls: ['./player-dashboard.component.css'], }) -export class PlayerDashboardComponent { +export class PlayerDashboardComponent implements OnInit { isExpanded = false; selected = false; + characterStats: CharacterStatsViewModel[]; + + constructor(private store: Store, private characterService: CharacterService) {} + + ngOnInit() { + this.getCharacterStats(); + } ability: AbilityViewModel = { id: 1, @@ -26,11 +40,21 @@ export class PlayerDashboardComponent { ] } - collapse() { - this.isExpanded = false; + getCharacterStats() { + this.store.select( s => s.playerStore.characterId).pipe(first()).subscribe((characterId) => { + this.characterService.getCharacterStats(characterId).pipe(first()).subscribe((characterStats) => { + this.characterStats = characterStats; + }, (error: ErrorResponse | HttpErrorResponse) => { + if (error instanceof HttpErrorResponse) { + error = error.error as ErrorResponse; + } + console.error(error.message); + }); + }) } toggle() { - this.isExpanded = !this.isExpanded; + this.isExpanded = !this.isExpanded; } + } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/services/character.service.ts b/SessionCompanion/SessionCompanion/ClientApp/src/services/character.service.ts index c390a44..db70675 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/services/character.service.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/services/character.service.ts @@ -6,6 +6,7 @@ import {Either} from '../types/Either'; import {CharacterForLoginViewModel} from '../types/viewmodels/character-viewmodels/CharacterForLoginViewModel'; import {switchMap, retry} from 'rxjs/operators'; import {LoggedCharactersViewModel} from '../types/viewmodels/character-viewmodels/LoggedCharactersViewModel'; +import {CharacterStatsViewModel} from "../types/viewmodels/character-viewmodels/CharacterStatsViewModel"; Injectable({ providedIn: 'root' @@ -41,4 +42,18 @@ export class CharacterService { }) ); } + + getCharacterStats(characterId: number): Observable { + const params = new HttpParams().set('characterId', characterId.toString()) + return this.http.get>( this.baseUrl + 'characterStats', {params}).pipe( + switchMap( response => { + if (response.isLeft) { + return of(response.left); + } else { + return throwError(response.right); + } + }) + ); + } + } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/character-viewmodels/CharacterStatsViewModel.ts b/SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/character-viewmodels/CharacterStatsViewModel.ts new file mode 100644 index 0000000..9787b40 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/character-viewmodels/CharacterStatsViewModel.ts @@ -0,0 +1,13 @@ +export interface CharacterStatsViewModel { + id: number; + name: string; + value: number; + modification: number; + savingThrows: number; + canSaveThrows: boolean; + skills: { + name: string; + value: number; + can: boolean; + }; +} -- 2.20.1 From 3627f987da37a5650ad1b94c0dc00a24b2a67ac3 Mon Sep 17 00:00:00 2001 From: Natalia Gawron Date: Sun, 10 Jan 2021 00:01:59 +0100 Subject: [PATCH 2/5] SES-135 connected method with backend, fixed card with stats UI --- .../ClientApp/src/app/app.module.ts | 3 ++ .../abilities/abilities.component.css | 0 .../abilities/abilities.component.html | 6 +++ .../abilities/abilities.component.ts | 38 +++++++++++++ .../ability-card/ability-card.component.css | 44 +++++++++++++-- .../ability-card/ability-card.component.html | 2 +- .../ability-card/ability-card.component.ts | 3 +- .../player-dashboard.component.html | 4 +- .../player-dashboard.component.ts | 54 +++++-------------- .../CharacterStatsViewModel.ts | 4 +- 10 files changed, 107 insertions(+), 51 deletions(-) create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.css create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.html create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 260c784..81032c2 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -35,6 +35,7 @@ import { CharacterService } from '../services/character.service'; import { AbilityCardComponent } from './components/ability-card/ability-card.component'; import { GameMasterSpellsTableComponent } from './components/game-master-spells-table/game-master-spells-table.component'; import { GameMasterArmorsTableComponent } from './components/game-master-armors-table/game-master-armors-table.component'; +import { AbilitiesComponent } from './components/abilities/abilities.component'; @NgModule({ declarations: [ @@ -48,6 +49,7 @@ import { GameMasterArmorsTableComponent } from './components/game-master-armors- AbilityCardComponent, GameMasterSpellsTableComponent, GameMasterArmorsTableComponent, + AbilitiesComponent, ], imports: [ BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), @@ -79,6 +81,7 @@ import { GameMasterArmorsTableComponent } from './components/game-master-armors- entryComponents: [ GameMasterSpellsTableComponent, GameMasterArmorsTableComponent, + AbilitiesComponent, ], }) export class AppModule {} diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.css b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.css new file mode 100644 index 0000000..e69de29 diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.html new file mode 100644 index 0000000..df7c03d --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.html @@ -0,0 +1,6 @@ +
+ + +
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts new file mode 100644 index 0000000..33608b9 --- /dev/null +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts @@ -0,0 +1,38 @@ +import { Component, OnInit } from '@angular/core'; +import {CharacterStatsViewModel} from "../../../types/viewmodels/character-viewmodels/CharacterStatsViewModel"; +import {Store} from "@ngrx/store"; +import {AppState} from "../../store/models/app-state.model"; +import {CharacterService} from "../../../services/character.service"; +import {first} from "rxjs/operators"; +import {ErrorResponse} from "../../../types/ErrorResponse"; +import {HttpErrorResponse} from "@angular/common/http"; + +@Component({ + selector: 'app-abilities', + templateUrl: './abilities.component.html', + styleUrls: ['./abilities.component.css'] +}) +export class AbilitiesComponent implements OnInit { + characterStats: CharacterStatsViewModel[]; + + constructor(private store: Store, private characterService: CharacterService) {} + + ngOnInit() { + this.getCharacterStats(); + } + + getCharacterStats() { + this.store.select( s => s.playerStore.characterId).pipe(first()).subscribe((characterId) => { + this.characterService.getCharacterStats(2).pipe(first()).subscribe((characterStats) => { + console.log(characterStats) + this.characterStats = characterStats; + }, (error: ErrorResponse | HttpErrorResponse) => { + if (error instanceof HttpErrorResponse) { + error = error.error as ErrorResponse; + } + console.error(error.message); + }); + }) + } + +} 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 d728057..9b53a37 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 @@ -1,14 +1,50 @@ +.cardContainerClass { + border: 6px solid white; + border-radius: 10px; + box-shadow: 0 0 10px gold; +} + #main{ width: 480px; - height: 480px; + padding-bottom: 15px; } + +@media (max-width: 468px) { + #main { + width: 340px; + } +} + +@media (min-width: 468px) and (max-width: 768px) { + #main { + width: 420px; + } +} + +@media (min-width: 768px) { + #main { + width: 480px; + } +} + #main>.mat-card{ padding: 0; } .diagonal-line{ width:50px; - background:linear-gradient(45deg,rgb(16 32 40 / 0%) 49%,black,#ffffff00 51%); + background:linear-gradient(45deg,rgb(16 32 40 / 0%) 49%,white,#ffffff00 51%); } + +#ability-card-header { + font-weight: 600; +} + +@media (max-width: 468px) { + #ability-card-header { + font-size: 11px; + } +} + #ability-card-content{ display: flex; flex-wrap: wrap; @@ -17,14 +53,14 @@ padding-bottom: 10px; } #skill-btn{ - border-color: black; + border: 2px solid #9e814d; flex: 1 0 auto; margin-bottom: 10px; margin-left: 10px; margin-right: 10px; } #skill-btn-divider{ - border-left: black 1px solid; + border-left: #9e814d 2px 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 376fea9..99599db 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,5 +1,5 @@
- + {{ability.value}}
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 f525ccd..50a9435 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 @@ -1,5 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { AbilityViewModel } from '../../../types/viewmodels/ability-viewmodels/AbilityViewModel'; +import {CharacterStatsViewModel} from "../../../types/viewmodels/character-viewmodels/CharacterStatsViewModel"; @Component({ selector: 'app-ability-card', @@ -7,7 +8,7 @@ import { AbilityViewModel } from '../../../types/viewmodels/ability-viewmodels/A styleUrls: ['./ability-card.component.css'], }) export class AbilityCardComponent implements OnInit { - @Input() ability: AbilityViewModel; + @Input() ability: CharacterStatsViewModel; @Input() headStyle: { bgColor: string; textColor: string }; @Input() contentStyle: { bgColor: string; textColor: string }; 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 994aab5..8c9cdce 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 @@ -53,7 +53,9 @@ - +
+ +
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 89bbe3d..bf0525e 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,12 +1,6 @@ -import { Component, OnInit } from '@angular/core'; -import { AbilityViewModel } from "../../../types/viewmodels/ability-viewmodels/AbilityViewModel"; -import {AppState} from "../../store/models/app-state.model"; -import {Store} from "@ngrx/store"; -import {first} from "rxjs/operators"; -import {CharacterService} from "../../../services/character.service"; -import {CharacterStatsViewModel} from "../../../types/viewmodels/character-viewmodels/CharacterStatsViewModel"; -import {ErrorResponse} from "../../../types/ErrorResponse"; -import {HttpErrorResponse} from "@angular/common/http"; +import {Component, OnInit} from '@angular/core'; +import {AbilitiesComponent} from "../abilities/abilities.component"; + @Component({ selector: 'app-player-dashboard', @@ -14,47 +8,23 @@ import {HttpErrorResponse} from "@angular/common/http"; styleUrls: ['./player-dashboard.component.css'], }) export class PlayerDashboardComponent implements OnInit { + middleComponent; isExpanded = false; selected = false; - characterStats: CharacterStatsViewModel[]; - - constructor(private store: Store, private characterService: CharacterService) {} ngOnInit() { - this.getCharacterStats(); - } - - ability: AbilityViewModel = { - id: 1, - name: 'Strength', - value: 18, - modification: 2, - canSaveThrows: true, - savingThrows: 1, - skills: [ - { - name: 'Throw', - value: 1, - can: false - } - ] - } - - getCharacterStats() { - this.store.select( s => s.playerStore.characterId).pipe(first()).subscribe((characterId) => { - this.characterService.getCharacterStats(characterId).pipe(first()).subscribe((characterStats) => { - this.characterStats = characterStats; - }, (error: ErrorResponse | HttpErrorResponse) => { - if (error instanceof HttpErrorResponse) { - error = error.error as ErrorResponse; - } - console.error(error.message); - }); - }) + this.SwitchMiddleComponent('AbilitiesComponent'); } toggle() { this.isExpanded = !this.isExpanded; } + SwitchMiddleComponent(componentName: string) { + switch(componentName){ + case 'AbilitiesComponent': + this.middleComponent = AbilitiesComponent; + } + } + } diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/character-viewmodels/CharacterStatsViewModel.ts b/SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/character-viewmodels/CharacterStatsViewModel.ts index 9787b40..aa01f12 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/character-viewmodels/CharacterStatsViewModel.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/character-viewmodels/CharacterStatsViewModel.ts @@ -5,9 +5,9 @@ export interface CharacterStatsViewModel { modification: number; savingThrows: number; canSaveThrows: boolean; - skills: { + skills: [{ name: string; value: number; can: boolean; - }; + }]; } -- 2.20.1 From c805fd2cb3b332a410d466f3d5fa49a6432f15fe Mon Sep 17 00:00:00 2001 From: Natalia Gawron Date: Sun, 10 Jan 2021 14:47:50 +0100 Subject: [PATCH 3/5] SES-140 added CSS --- .../ability-card/ability-card.component.css | 22 +++++++++++++++-- .../ability-card/ability-card.component.html | 6 ++--- .../ability-card/ability-card.component.ts | 24 +++++++++++++++++++ 3 files changed, 47 insertions(+), 5 deletions(-) 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 9b53a37..cc66099 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 @@ -1,7 +1,17 @@ +#ability-value:hover{ + opacity: 0.5; + cursor: pointer; +} + +#ability-saving-throws:hover{ + opacity: 0.5; + cursor: pointer; +} + .cardContainerClass { - border: 6px solid white; + border: 2px solid; border-radius: 10px; - box-shadow: 0 0 10px gold; + box-shadow: 0 0 8px; } #main{ @@ -37,6 +47,7 @@ #ability-card-header { font-weight: 600; + border-radius: 10px 10px 0 0; } @media (max-width: 468px) { @@ -51,6 +62,7 @@ justify-content: space-around; padding-top: 10px; padding-bottom: 10px; + border-radius: 0 0 10px 10px; } #skill-btn{ border: 2px solid #9e814d; @@ -58,7 +70,13 @@ margin-bottom: 10px; margin-left: 10px; margin-right: 10px; + border-radius: 5px; } + +#skill-btn:hover{ + opacity: 0.5; +} + #skill-btn-divider{ border-left: #9e814d 2px solid; padding-right: 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 99599db..065813e 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,14 +1,14 @@
- + - {{ability.value}} +
{{ability.value}}
Mod: {{ability.modification > 0? '+' + ability.modification : '-' + ability.modification}}
{{ability.name}}
- ST: {{ability.savingThrows > 0? '+' + ability.savingThrows : '-' + ability.savingThrows}} +
ST: {{ability.savingThrows > 0? '+' + ability.savingThrows : '-' + ability.savingThrows}}
 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 50a9435..931a167 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 @@ -16,5 +16,29 @@ export class AbilityCardComponent implements OnInit { ngOnInit() { this.ability.skills.sort((a, b) => (a.name > b.name ? 1 : -1)); + this.changeColors(); + } + + changeColors(){ + switch(this.ability.name){ + case 'Charisma': + this.headStyle.bgColor = '#FFEB85'; + break; + case 'Dexterity': + this.headStyle.bgColor = '#4BBE9C'; + break; + case 'Constitution': + this.headStyle.bgColor = 'red'; + break; + case 'Intelligence': + this.headStyle.bgColor = '#5AA9E6'; + break; + case 'Strength': + this.headStyle.bgColor = '#C41E3D'; + break; + case 'Wisdom': + this.headStyle.bgColor = '#9F4BBE'; + break; + } } } -- 2.20.1 From 868c05ef997e1a05823ff46ec557d536b8fdb206 Mon Sep 17 00:00:00 2001 From: Natalia Gawron Date: Sun, 10 Jan 2021 15:29:43 +0100 Subject: [PATCH 4/5] SES-135 deleted unused elements, added style CSS --- .../ClientApp/src/app.routing.ts | 2 +- .../ability-card/ability-card.component.html | 4 ++-- .../player-dashboard.component.html | 19 +++++++------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts index 684f3c4..934f5a4 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts @@ -36,7 +36,7 @@ const routes: Routes = [ path: 'select-character', component: SelectCharacterComponent, pathMatch: 'full' - } + }, ]; export const appRoutingModule = RouterModule.forRoot(routes); 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 065813e..6f53f46 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 @@ -13,10 +13,10 @@ - + {{skill.name}}     - + {{skill.value > 0? '+' + skill.value : '-' + skill.value}} 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 8c9cdce..abbccd2 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 @@ -15,37 +15,32 @@ - - home - Home - - - + query_stats - Statistic and throws + Statistic and throws - + local_mall Equipment - + brightness_4 Spells - + account_circle Profile - + shopping_cart Shop - + exit_to_app Log out -- 2.20.1 From e414e321b6e891879131dfc1416ee5b8be496775 Mon Sep 17 00:00:00 2001 From: Natalia Gawron Date: Sun, 10 Jan 2021 15:32:49 +0100 Subject: [PATCH 5/5] SES-135 changes property characterId --- .../src/app/components/abilities/abilities.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts index 33608b9..13d52ee 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts @@ -23,7 +23,7 @@ export class AbilitiesComponent implements OnInit { getCharacterStats() { this.store.select( s => s.playerStore.characterId).pipe(first()).subscribe((characterId) => { - this.characterService.getCharacterStats(2).pipe(first()).subscribe((characterStats) => { + this.characterService.getCharacterStats(characterId).pipe(first()).subscribe((characterStats) => { console.log(characterStats) this.characterStats = characterStats; }, (error: ErrorResponse | HttpErrorResponse) => { -- 2.20.1