From 20dec1e4eb2b6a4d53ab93b36ca2cc74286573e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20G=C3=B3reczny?= Date: Thu, 21 Jan 2021 18:19:24 +0100 Subject: [PATCH] get all shopkeepers --- .../ClientApp/src/app/app.module.ts | 2 + .../game-master-dashboard.component.ts | 1 + ...me-master-shopkeepers-table.component.html | 10 +--- ...game-master-shopkeepers-table.component.ts | 60 ++++++++++++------- .../src/services/shopkeeper.service.ts | 34 +++++++++++ .../ShopkeeperViewModel.ts | 5 ++ .../Controllers/ShopkeeperController.cs | 2 +- 7 files changed, 83 insertions(+), 31 deletions(-) create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/services/shopkeeper.service.ts create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/shopkeeper-viewmodels/ShopkeeperViewModel.ts diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts index 85aee6f..978514c 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts @@ -53,6 +53,7 @@ import { GameMasterShopkeepersTableComponent } from './components/game-master-sh import { GameMasterTurntrackerComponent } from './components/game-master-turntracker/game-master-turntracker.component'; import { DragDropModule } from '@angular/cdk/drag-drop'; import { ChooseMonsterDialogComponent } from './components/choose-monster-dialog/choose-monster-dialog.component'; +import { ShopkeeperService } from '../services/shopkeeper.service'; @NgModule({ declarations: [ @@ -113,6 +114,7 @@ import { ChooseMonsterDialogComponent } from './components/choose-monster-dialog ArmorService, OtherEquipmentService, MonsterService, + ShopkeeperService, ], bootstrap: [AppComponent], entryComponents: [ diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts index 78f106c..11044af 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts @@ -97,6 +97,7 @@ export class GameMasterDashboardComponent implements OnInit, OnDestroy { ngOnInit() { this.signalRService.Login(); + this.UpdateCharactersList(); } UpdateSidenavStatus(sidenav: string, newValue: boolean) { diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-shopkeepers-table/game-master-shopkeepers-table.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-shopkeepers-table/game-master-shopkeepers-table.component.html index 2d8e425..9d7b8bf 100644 --- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-shopkeepers-table/game-master-shopkeepers-table.component.html +++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-shopkeepers-table/game-master-shopkeepers-table.component.html @@ -11,20 +11,16 @@ {{row.name}} - - Items Count - {{row.itemsCount}} - - Actions -