diff --git a/src/main/webapp/app/entities/army/army-detail-desktop.component.ts b/src/main/webapp/app/entities/army/army-detail-desktop.component.ts
index a8a8c418..691a9499 100644
--- a/src/main/webapp/app/entities/army/army-detail-desktop.component.ts
+++ b/src/main/webapp/app/entities/army/army-detail-desktop.component.ts
@@ -7,7 +7,6 @@ import {JhiDataUtils} from "ng-jhipster";
selector: 'jhi-army-detail-desktop',
templateUrl: './army-detail-desktop.component.html'
})
-// @ts-ignore
export class ArmyDetailDesktopComponent extends ArmyDetailComponent {
constructor(protected dataUtils: JhiDataUtils,
protected activatedRoute: ActivatedRoute) {
diff --git a/src/main/webapp/app/entities/army/army-detail-mobile.component.ts b/src/main/webapp/app/entities/army/army-detail-mobile.component.ts
index aac6a861..d69f3cba 100644
--- a/src/main/webapp/app/entities/army/army-detail-mobile.component.ts
+++ b/src/main/webapp/app/entities/army/army-detail-mobile.component.ts
@@ -7,7 +7,6 @@ import {JhiDataUtils} from "ng-jhipster";
selector: 'jhi-army-detail-mobile',
templateUrl: './army-detail-mobile.html'
})
-// @ts-ignore
export class ArmyDetailMobileComponent extends ArmyDetailComponent {
constructor(protected dataUtils: JhiDataUtils,
protected activatedRoute: ActivatedRoute) {
diff --git a/src/main/webapp/app/entities/force/force-desktop.component.html b/src/main/webapp/app/entities/force/force-desktop.component.html
new file mode 100644
index 00000000..1d7b344a
--- /dev/null
+++ b/src/main/webapp/app/entities/force/force-desktop.component.html
@@ -0,0 +1,225 @@
+
+
+
+
+ UNIT NAME:
+
+
+ {{ unitLocal.unitName }}
+
+
+
+
+ BATTLEFIELD ROLE:
+
+
+ {{unitLocal.battlefieldRole}}
+
+
+
+
+ CRUSADE FACTION:
+
+
+ more information
+
+
+
+
+ SELECTABLE KEYWORDS:
+
+
+ some more information
+
+
+
+
+
+
+
+ UNIT TYPE:
+
+
+ {{unitLocal.unitBookName}}
+
+
+
+
+ EQUIPMENT:
+
+
+ {{ unitLocal.equipment }}
+
+
+
+
+ PSYCHIC POWERS:
+
+
+ {{ unitLocal.psychicPowersTaken }}
+
+
+
+
+ WARLORD TRAITS:
+
+
+ {{ unitLocal.warlordTraits }}
+
+
+
+
+ RELICS:
+
+
+ {{ unitLocal.relics }}
+
+
+
+
+
Entries below should remain blank when the unit is first added to your Order of Battle. Fill these entries out as you play with the unit and when it has earned any Battle Honours or Battle Scars.
+
+
+
+
+ BATTLES PLAYED:
+
+
+ {{ unitLocal.battlesPlayed }}
+
+
+ BATTLES SURVIVED:
+
+
+ {{ unitLocal.battlesSurvived }}
+
+
+
+
+
+
+ ...During this battle:
+
+
+ ...In total:
+
+
+
+
+ Enemy units destroyed:
+
+
+
+
+
+
+ {{ unitLocal.enemyUnitsDestroyed }}
+
+
+
+
+ Enemy units destroyed with psychic powers:
+
+
+
+
+
+
+ {{ unitLocal.enemyPsychicDestroyed }}
+
+
+
+
+ Enemy units destroyed with ranged weapons:
+
+
+
+
+
+
+ {{ unitLocal.enemyRangedDestroyed }}
+
+
+
+
+ Enemy units destroyed with melee weapons:
+
+
+
+
+
+
+ {{ unitLocal.enemyMeleeDestroyed }}
+
+
+
+
+ Agenda 1 tally:
+
+
+
+
+
+
+ {{ unitLocal.agendaOneTally }}
+
+
+
+
+ Agenda 2 tally:
+
+
+
+
+
+
+ {{ unitLocal.agendaTwoTally }}
+
+
+
+
+ Agenda 3 tally:
+
+
+
+
+
+
+ {{ unitLocal.agendaThreeTally }}
+
+
+
+
+
+ {{ unitLocal.rank }}
+
+
+ Unit background and other information
+
+
+ {{ unitLocal.unitDescription }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/app/entities/force/force-desktop.component.ts b/src/main/webapp/app/entities/force/force-desktop.component.ts
new file mode 100644
index 00000000..7ae0b79f
--- /dev/null
+++ b/src/main/webapp/app/entities/force/force-desktop.component.ts
@@ -0,0 +1,15 @@
+import {Component} from "@angular/core";
+import {ForceComponent} from "./force.component";
+import {JhiDataUtils} from "ng-jhipster";
+import {ActivatedRoute} from "@angular/router";
+import {UnitArmyService} from "../unit-army/unit-army.service";
+
+@Component({
+ selector: 'jhi-force-desktop',
+ templateUrl: './force-desktop.component.html'
+})
+export class ForceDesktopComponent extends ForceComponent {
+ constructor(protected dataUtils: JhiDataUtils, protected activatedRoute: ActivatedRoute, protected unitArmyService: UnitArmyService) {
+ super(dataUtils, activatedRoute, unitArmyService);
+ }
+}
diff --git a/src/main/webapp/app/entities/force/force-mobile.component.html b/src/main/webapp/app/entities/force/force-mobile.component.html
new file mode 100644
index 00000000..3c7096f9
--- /dev/null
+++ b/src/main/webapp/app/entities/force/force-mobile.component.html
@@ -0,0 +1,36 @@
+
+
+
{{ unitLocal.unitName }}
+
+
+
+
+
+
+
+
+
+
+
+
Units Destroyed
+
With Psychic
+
With Ranged
+
With Melee
+
Agenda 1
+
Agenda 2
+
Agenda 3
+
+
+
+
diff --git a/src/main/webapp/app/entities/force/force-mobile.component.ts b/src/main/webapp/app/entities/force/force-mobile.component.ts
new file mode 100644
index 00000000..ceb3c789
--- /dev/null
+++ b/src/main/webapp/app/entities/force/force-mobile.component.ts
@@ -0,0 +1,15 @@
+import {Component} from "@angular/core";
+import {ForceComponent} from "./force.component";
+import {JhiDataUtils} from "ng-jhipster";
+import {ActivatedRoute} from "@angular/router";
+import {UnitArmyService} from "../unit-army/unit-army.service";
+
+@Component({
+ selector: 'jhi-force-mobile',
+ templateUrl: './force-mobile.component.html'
+})
+export class ForceMobileComponent extends ForceComponent {
+ constructor(protected dataUtils: JhiDataUtils, protected activatedRoute: ActivatedRoute, protected unitArmyService: UnitArmyService) {
+ super(dataUtils, activatedRoute, unitArmyService);
+ }
+}
diff --git a/src/main/webapp/app/entities/force/force.component.html b/src/main/webapp/app/entities/force/force.component.html
index 5bbb3b5d..ecc08558 100644
--- a/src/main/webapp/app/entities/force/force.component.html
+++ b/src/main/webapp/app/entities/force/force.component.html
@@ -1,225 +1,7 @@
-
-
-
-
- UNIT NAME:
-
-
- {{ unitLocal.unitName }}
-
-
-
-
- BATTLEFIELD ROLE:
-
-
- {{unitLocal.battlefieldRole}}
-
-
-
-
- CRUSADE FACTION:
-
-
- more information
-
-
-
-
- SELECTABLE KEYWORDS:
-
-
- some more information
-
-
-
-
-
-
-
- UNIT TYPE:
-
-
- {{unitLocal.unitBookName}}
-
-
-
-
- EQUIPMENT:
-
-
- {{ unitLocal.equipment }}
-
-
-
-
- PSYCHIC POWERS:
-
-
- {{ unitLocal.psychicPowersTaken }}
-
-
-
-
- WARLORD TRAITS:
-
-
- {{ unitLocal.warlordTraits }}
-
-
-
-
- RELICS:
-
-
- {{ unitLocal.relics }}
-
-
-
-
-
Entries below should remain blank when the unit is first added to your Order of Battle. Fill these entries out as you play with the unit and when it has earned any Battle Honours or Battle Scars.
-
-
-
-
- BATTLES PLAYED:
-
-
- {{ unitLocal.battlesPlayed }}
-
-
- BATTLES SURVIVED:
-
-
- {{ unitLocal.battlesSurvived }}
-
-
-
-
-
-
- ...During this battle:
-
-
- ...In total:
-
-
-
-
- Enemy units destroyed:
-
-
-
-
-
-
- {{ unitLocal.enemyUnitsDestroyed }}
-
-
-
-
- Enemy units destroyed with psychic powers:
-
-
-
-
-
-
- {{ unitLocal.enemyPsychicDestroyed }}
-
-
-
-
- Enemy units destroyed with ranged weapons:
-
-
-
-
-
-
- {{ unitLocal.enemyRangedDestroyed }}
-
-
-
-
- Enemy units destroyed with melee weapons:
-
-
-
-
-
-
- {{ unitLocal.enemyMeleeDestroyed }}
-
-
-
-
- Agenda 1 tally:
-
-
-
-
-
-
- {{ unitLocal.agendaOneTally }}
-
-
-
-
- Agenda 2 tally:
-
-
-
-
-
-
- {{ unitLocal.agendaTwoTally }}
-
-
-
-
- Agenda 3 tally:
-
-
-
-
-
-
- {{ unitLocal.agendaThreeTally }}
-
-
-
-
-
- {{ unitLocal.rank }}
-
-
- Unit background and other information
-
-
- {{ unitLocal.unitDescription }}
-
-
-
-
-
-
-
+
+
-
+
+
+
diff --git a/src/main/webapp/app/entities/force/force.component.ts b/src/main/webapp/app/entities/force/force.component.ts
index 313b54a7..caeb7a33 100644
--- a/src/main/webapp/app/entities/force/force.component.ts
+++ b/src/main/webapp/app/entities/force/force.component.ts
@@ -6,6 +6,7 @@ import { JhiDataUtils } from 'ng-jhipster';
import { LocalStorageService } from 'ngx-webstorage';
import { IUnitArmy, UnitArmy } from '../../shared/model/unit-army.model';
import { UnitArmyService } from '../unit-army/unit-army.service';
+import {ResponsiveService} from "../../responsive.service";
@Component({
selector: 'jhi-force',
@@ -16,11 +17,14 @@ export class ForceComponent implements OnInit {
public forceList: number[];
Iunits?: IUnitArmy[];
units?: UnitArmy[] | null;
+ public isMobileResolution: boolean;
+ responsiveService: ResponsiveService = new ResponsiveService();
localUnits: IUnitArmy[] | [];
constructor(protected dataUtils: JhiDataUtils, protected activatedRoute: ActivatedRoute, protected unitArmyService: UnitArmyService) {
const localStorageList = localStorage.getItem('forceAddedListStored');
this.forceList = localStorageList ? JSON.parse(localStorageList) : [];
+ this.isMobileResolution = this.responsiveService.getMobileStatus();
this.localUnits = [];
}
diff --git a/src/main/webapp/app/entities/force/force.module.ts b/src/main/webapp/app/entities/force/force.module.ts
index 0853473e..1e6b0339 100644
--- a/src/main/webapp/app/entities/force/force.module.ts
+++ b/src/main/webapp/app/entities/force/force.module.ts
@@ -4,9 +4,14 @@ import { RouterModule } from '@angular/router';
import { CrusadetrackerSharedModule } from 'app/shared/shared.module';
import { ForceComponent } from './force.component';
import { forceRoute } from './force.route';
+import {ForceDesktopComponent} from "./force-desktop.component";
+import {ForceMobileComponent} from "./force-mobile.component";
@NgModule({
imports: [CrusadetrackerSharedModule, RouterModule.forChild(forceRoute)],
- declarations: [ForceComponent],
+ declarations: [ForceComponent,
+ ForceDesktopComponent,
+ ForceMobileComponent
+ ]
})
export class CrusadetrackerForceModule {}