{{'encounter.detailTitle' | translate}}
+ value="{{detail.strength}} ({{calcMod(detail.strength)}})">
-
+
@@ -50,9 +50,9 @@
{{'encounter.detailTitle' | translate}}
+ value="{{detail.dexterity}} ({{calcMod(detail.dexterity)}})">
-
+
@@ -60,10 +60,12 @@
{{'encounter.detailTitle' | translate}}
+ value="{{detail.constitution}} ({{calcMod(detail.constitution)}})">
-
+
@@ -73,10 +75,12 @@ {{'encounter.detailTitle' | translate}}
+ value="{{detail.intelligence}} ({{calcMod(detail.intelligence)}})">
-
+
@@ -84,9 +88,9 @@
{{'encounter.detailTitle' | translate}}
+ value="{{detail.wisdom}} ({{calcMod(detail.wisdom)}})">
-
+
@@ -94,9 +98,9 @@
{{'encounter.detailTitle' | translate}}
+ value="{{detail.charisma}} ({{calcMod(detail.charisma)}})">
-
+
@@ -118,103 +122,117 @@ {{'encounter.detailTitle' | translate}}
{{ 'encounter.actions' | translate }}
-
+ @for (monster of encounterModel.encounters; track monster) {
-
+
@@ -79,5 +79,5 @@
{{ monster.type }} ({{ monster.size }}
-
+ }
diff --git a/src/REG.Angular/ClientApp/src/app/modules/encounter/encounter.list.component.ts b/src/REG.Angular/ClientApp/src/app/modules/encounter/encounter.list.component.ts
index fcf749d..bd29969 100644
--- a/src/REG.Angular/ClientApp/src/app/modules/encounter/encounter.list.component.ts
+++ b/src/REG.Angular/ClientApp/src/app/modules/encounter/encounter.list.component.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit, ViewChildren, QueryList } from '@angular/core';
-import { EncounterListService } from './encounter.list.service';
+import {Component, OnInit, ViewChildren, QueryList} from '@angular/core';
+import {EncounterListService} from './encounter.list.service';
import {
EncounterOptionModel,
EncounterModel,
@@ -9,11 +9,11 @@ import {
Reaction,
LegendaryAction
} from '../../shared/models/encounter.model';
-import { FormGroup, FormBuilder } from '@angular/forms';
-import { SortEvent, SortableHeaderDirective } from '../../shared/directive/sortable.directive';
-import { faDiceD20 } from '@fortawesome/free-solid-svg-icons';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { EncounterDetailComponent } from './encounter.detail.component';
+import {FormGroup, FormBuilder} from '@angular/forms';
+import {SortEvent, SortableHeaderDirective} from '../../shared/directive/sortable.directive';
+import {faDiceD20} from '@fortawesome/free-solid-svg-icons';
+import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
+import {EncounterDetailComponent} from './encounter.detail.component';
const compare = (
v1: string | number | SpecialAbility[] | Action[] | Reaction[] | LegendaryAction[],
@@ -21,10 +21,10 @@ const compare = (
) => (v1 < v2 ? -1 : v1 > v2 ? 1 : 0);
@Component({
- selector: 'app-encounter',
- templateUrl: './encounter.list.component.html',
- standalone: false,
- providers: [EncounterListService]
+ selector: 'app-encounter',
+ templateUrl: './encounter.list.component.html',
+ standalone: false,
+ providers: [EncounterListService]
})
export class EncounterListComponent implements OnInit {
_monsterTypes!: [];
@@ -32,7 +32,7 @@ export class EncounterListComponent implements OnInit {
difficulties!: [];
partyLevels: number[] = [];
partySizes: number[] = [];
- _orignialDetails: EncounterDetailModel[] = [];
+ _originalDetails: EncounterDetailModel[] = [];
serverError = '';
encounterOptionsForm!: FormGroup;
encounterModel: EncounterModel = new EncounterModel();
@@ -77,8 +77,8 @@ export class EncounterListComponent implements OnInit {
this.encounterListService.generate(JSON.stringify(this.encounterOptionsForm.value)).subscribe({
next: (data) => {
Object.assign(this.encounterModel, data);
- this._orignialDetails = [];
- Object.assign(this._orignialDetails, this.encounterModel.encounters);
+ this._originalDetails = [];
+ Object.assign(this._originalDetails, this.encounterModel.encounters);
},
error: (error) => {
this.serverError = error.error.Message;
@@ -89,7 +89,7 @@ export class EncounterListComponent implements OnInit {
});
}
- onSort({ column, direction }: SortEvent) {
+ onSort({column, direction}: SortEvent) {
this.headers.forEach((header) => {
if (header.sortable !== column) {
header.direction = '';
@@ -97,9 +97,9 @@ export class EncounterListComponent implements OnInit {
});
if (direction === '' || column === '') {
- this.encounterModel.encounters = this._orignialDetails;
+ this.encounterModel.encounters = this._originalDetails;
} else {
- this.encounterModel.encounters = [...this._orignialDetails].sort((a, b) => {
+ this.encounterModel.encounters = [...this._originalDetails].sort((a, b) => {
const res = compare(a[column], b[column]);
return direction === 'asc' ? res : -res;
});
diff --git a/src/REG.Angular/ClientApp/src/app/modules/encounter/encounter.list.service.ts b/src/REG.Angular/ClientApp/src/app/modules/encounter/encounter.list.service.ts
index 1a22adc..5070916 100644
--- a/src/REG.Angular/ClientApp/src/app/modules/encounter/encounter.list.service.ts
+++ b/src/REG.Angular/ClientApp/src/app/modules/encounter/encounter.list.service.ts
@@ -1,14 +1,14 @@
-import { Injectable } from '@angular/core';
-import { EncounterService } from '../../core/http/encounter.service';
-import { Subject } from 'rxjs';
-import { SortDirection } from '../../shared/directive/sortable.directive';
+import {Injectable} from '@angular/core';
+import {EncounterService} from '../../core/http/encounter.service';
+import {Subject} from 'rxjs';
+import {SortDirection} from '../../shared/directive/sortable.directive';
interface State {
sortColumn: string;
sortDirection: SortDirection;
}
-@Injectable({ providedIn: 'root' })
+@Injectable({providedIn: 'root'})
export class EncounterListService {
private _search$ = new Subject
();
private _state: State = {
@@ -16,13 +16,15 @@ export class EncounterListService {
sortDirection: 'asc'
};
- constructor(private service: EncounterService) {}
+ constructor(private service: EncounterService) {
+ }
set sortColumn(sortColumn: string) {
- this._set({ sortColumn });
+ this._set({sortColumn});
}
+
set sortDirection(sortDirection: SortDirection) {
- this._set({ sortDirection });
+ this._set({sortDirection});
}
private _set(patch: Partial) {
diff --git a/src/REG.Angular/ClientApp/src/app/shared/components/app.language.menu.component.html b/src/REG.Angular/ClientApp/src/app/shared/components/app.language.menu.component.html
index 4074017..b4a522f 100644
--- a/src/REG.Angular/ClientApp/src/app/shared/components/app.language.menu.component.html
+++ b/src/REG.Angular/ClientApp/src/app/shared/components/app.language.menu.component.html
@@ -1,11 +1,12 @@
\ No newline at end of file
+
diff --git a/src/REG.Angular/ClientApp/src/app/shared/components/app.language.menu.component.ts b/src/REG.Angular/ClientApp/src/app/shared/components/app.language.menu.component.ts
index 47d2b22..5c7b7e7 100644
--- a/src/REG.Angular/ClientApp/src/app/shared/components/app.language.menu.component.ts
+++ b/src/REG.Angular/ClientApp/src/app/shared/components/app.language.menu.component.ts
@@ -1,7 +1,7 @@
-import { Component } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-import { Router } from '@angular/router';
-import { CookieService } from 'ngx-cookie-service';
+import {Component} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
+import {Router} from '@angular/router';
+import {CookieService} from 'ngx-cookie-service';
@Component({
selector: 'app-language-menu',
@@ -15,9 +15,10 @@ export class AppLanguageMenuComponent {
const lang = cookie.slice(-2);
translate.use(lang);
} else {
- translate.setDefaultLang('en');
+ translate.setFallbackLang('en');
}
}
+
langClick(lang: string) {
this.translate.use(lang);
this.router.navigate(['/']);
diff --git a/src/REG.Angular/ClientApp/src/app/shared/components/app.nav-menu.component.html b/src/REG.Angular/ClientApp/src/app/shared/components/app.nav-menu.component.html
index a53678a..775175b 100644
--- a/src/REG.Angular/ClientApp/src/app/shared/components/app.nav-menu.component.html
+++ b/src/REG.Angular/ClientApp/src/app/shared/components/app.nav-menu.component.html
@@ -2,7 +2,7 @@
-
\ No newline at end of file
+
diff --git a/src/REG.Angular/ClientApp/src/app/shared/components/app.nav-menu.component.ts b/src/REG.Angular/ClientApp/src/app/shared/components/app.nav-menu.component.ts
index ddfeb2c..9291b8f 100644
--- a/src/REG.Angular/ClientApp/src/app/shared/components/app.nav-menu.component.ts
+++ b/src/REG.Angular/ClientApp/src/app/shared/components/app.nav-menu.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'app-nav-menu',
diff --git a/src/REG.Angular/ClientApp/src/app/shared/directive/sortable.directive.ts b/src/REG.Angular/ClientApp/src/app/shared/directive/sortable.directive.ts
index fe6a49e..391a87a 100644
--- a/src/REG.Angular/ClientApp/src/app/shared/directive/sortable.directive.ts
+++ b/src/REG.Angular/ClientApp/src/app/shared/directive/sortable.directive.ts
@@ -1,9 +1,9 @@
-import { Directive, EventEmitter, Input, Output, HostBinding, HostListener } from '@angular/core';
-import { EncounterDetailModel } from '../models/encounter.model';
+import {Directive, EventEmitter, Input, Output, HostBinding, HostListener} from '@angular/core';
+import {EncounterDetailModel} from '../models/encounter.model';
export type SortDirection = 'asc' | 'desc' | '';
export type SortColumn = keyof EncounterDetailModel | '';
-const rotate: { [key: string]: SortDirection } = { asc: 'desc', desc: '', '': 'asc' };
+const rotate: { [key: string]: SortDirection } = {asc: 'desc', desc: '', '': 'asc'};
export interface SortEvent {
column: SortColumn;
@@ -22,12 +22,13 @@ export class SortableHeaderDirective {
@HostBinding('class.asc') get asc() {
return this.direction === 'asc';
}
+
@HostBinding('class.desc') get desc() {
return this.direction === 'desc';
}
@HostListener('click') rotate() {
this.direction = rotate[this.direction];
- this.sort.emit({ column: this.sortable, direction: this.direction });
+ this.sort.emit({column: this.sortable, direction: this.direction});
}
}
diff --git a/src/REG.Angular/ClientApp/src/app/shared/models/encounter.model.ts b/src/REG.Angular/ClientApp/src/app/shared/models/encounter.model.ts
index 123247d..f452e7b 100644
--- a/src/REG.Angular/ClientApp/src/app/shared/models/encounter.model.ts
+++ b/src/REG.Angular/ClientApp/src/app/shared/models/encounter.model.ts
@@ -4,6 +4,7 @@ export class SpecialAbility {
attack_bonus?: number;
damage_dice = '';
}
+
export class Action {
name = '';
desc = '';
@@ -11,17 +12,20 @@ export class Action {
damage_dice = '';
damage_bonus?: number;
}
+
export class LegendaryAction {
name = '';
desc = '';
attack_bonus?: number;
damage_dice = '';
}
+
export class Reaction {
name = '';
desc = '';
attack_bonus?: number;
}
+
export class EncounterDetailModel {
xp = 0;
count = 0;
@@ -60,10 +64,12 @@ export class EncounterDetailModel {
reactions: Reaction[] = [];
legendaryActions: LegendaryAction[] = [];
}
+
export class EncounterModel {
sumXp = 0;
encounters: EncounterDetailModel[] = [];
}
+
export class EncounterOptionModel {
partyLevel = 1;
partySize = 4;
diff --git a/src/REG.Angular/ClientApp/src/app/shared/pipes/saving.throw.pipe.ts b/src/REG.Angular/ClientApp/src/app/shared/pipes/saving.throw.pipe.ts
index 6f1ca9b..895f7bf 100644
--- a/src/REG.Angular/ClientApp/src/app/shared/pipes/saving.throw.pipe.ts
+++ b/src/REG.Angular/ClientApp/src/app/shared/pipes/saving.throw.pipe.ts
@@ -1,4 +1,4 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {Pipe, PipeTransform} from '@angular/core';
@Pipe({standalone: false, name: 'savingThrow'})
export class SavingThrowPipe implements PipeTransform {
diff --git a/src/REG.Angular/ClientApp/src/app/shared/strategies/custom.title.strategy.ts b/src/REG.Angular/ClientApp/src/app/shared/strategies/custom.title.strategy.ts
index 855a864..4ef9fc1 100644
--- a/src/REG.Angular/ClientApp/src/app/shared/strategies/custom.title.strategy.ts
+++ b/src/REG.Angular/ClientApp/src/app/shared/strategies/custom.title.strategy.ts
@@ -1,8 +1,8 @@
-import { Injectable } from '@angular/core';
-import { RouterStateSnapshot, TitleStrategy } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
-import { Title } from '@angular/platform-browser';
-import { Constant } from '../constants/constant';
+import {Injectable} from '@angular/core';
+import {RouterStateSnapshot, TitleStrategy} from '@angular/router';
+import {TranslateService} from '@ngx-translate/core';
+import {Title} from '@angular/platform-browser';
+import {Constant} from '../constants/constant';
@Injectable()
export class CustomTitleStrategy extends TitleStrategy {