s426135/session-companion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SES-135 abilities card #63

Merged
s426134 merged 6 commits from SES-135 into dev 2021-01-10 16:02:20 +01:00
Conversation 0 Commits 6 Files Changed 12 +107 -51
10 changed files with 107 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3627f987da - Show all commits

3
SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts
View File

@ -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 {}

0
SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.css Normal file
View File

6
SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.html Normal file
View File

@ -0,0 +1,6 @@
<div *ngFor="let ability of characterStats">
<app-ability-card [ability]="ability"
[headStyle]="{bgColor: '#e9cca7', textColor: '#102028'}"
[contentStyle]="{bgColor: '#102028', textColor: 'white'}">
</app-ability-card>
</div>

38
SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts Normal file
View File

@ -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<AppState>, 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);
});
})
}
}

44
SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.css
View File

@ -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;

2
SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.html
View File

@ -1,5 +1,5 @@
<div *ngIf="ability" id="main">
<mat-card>
<mat-card class="cardContainerClass">
<mat-card-header id="ability-card-header" [style.background]="headStyle.bgColor" [style.color]="headStyle.textColor">
{{ability.value}}
<div class="diagonal-line"></div>

3
SessionCompanion/SessionCompanion/ClientApp/src/app/components/ability-card/ability-card.component.ts
View File

@ -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 };

4
SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.html
View File

@ -53,7 +53,9 @@
</mat-nav-list>
</mat-sidenav>
<mat-sidenav-content class="content">
<app-ability-card class="ability_card_container" [ability]="ability" [contentStyle]="{bgColor: 'red', textColor: 'white'}" [headStyle]="{bgColor: 'red', textColor: 'white'}"></app-ability-card>
<div class="ability_card_container">
<ng-container *ngComponentOutlet="middleComponent"></ng-container>
</div>
</mat-sidenav-content>
</mat-sidenav-container>
</div>

52
SessionCompanion/SessionCompanion/ClientApp/src/app/components/player-dashboard/player-dashboard.component.ts
View File

@ -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 {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<AppState>, 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;
}
}
}

4
SessionCompanion/SessionCompanion/ClientApp/src/types/viewmodels/character-viewmodels/CharacterStatsViewModel.ts
View File

@ -5,9 +5,9 @@ export interface CharacterStatsViewModel {
modification: number;
savingThrows: number;
canSaveThrows: boolean;
skills: {
skills: [{
name: string;
value: number;
can: boolean;
};
}];
}