diff --git a/build.sh b/build.sh new file mode 100755 index 00000000..61a514e6 --- /dev/null +++ b/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash +./mvnw -ntp clean -P-webpack +./mvnw -ntp checkstyle:check +./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v12.16.1 -DnpmVersion=6.14.5 +./mvnw -ntp com.github.eirslett:frontend-maven-plugin:npm +./mvnw test +./mvnw -ntp verify -P-webpack -Pprod -DskipTests +docker-compose build +#docker login -u \$doApi -p \$doApi registry.digitalocean.com +docker push registry.digitalocean.com/nerdfortress/crusadetracker diff --git a/src/main/java/com/warhammer/domain/Army.java b/src/main/java/com/warhammer/domain/Army.java index 6b07ae1a..c0b567f5 100644 --- a/src/main/java/com/warhammer/domain/Army.java +++ b/src/main/java/com/warhammer/domain/Army.java @@ -35,14 +35,14 @@ public class Army implements Serializable { @Column(name = "army_power_level") private Long armyPowerLevel; - @Column(name = "army_race") - private String armyRace; +// @Column(name = "army_race") +// private String armyRace; @Column(name = "army_points") private Long armyPoints; - @Column(name = "codex_specific_points") - private Long codexSpecificPoints; +// @Column(name = "codex_specific_points") +// private Long codexSpecificPoints; @Column(name = "army_points_or_pl") private Boolean armyPointsOrPL; @@ -230,21 +230,21 @@ public class Army implements Serializable { this.battlesWon = battlesWon; } - public Long getCodexSpecificPoints() { - return codexSpecificPoints; - } - - public void setCodexSpecificPoints(Long codexSpecificPoints) { - this.codexSpecificPoints = codexSpecificPoints; - } - - public String getArmyRace() { - return armyRace; - } - - public void setArmyRace(String armyRace) { - this.armyRace = armyRace; - } +// public Long getCodexSpecificPoints() { +// return codexSpecificPoints; +// } +// +// public void setCodexSpecificPoints(Long codexSpecificPoints) { +// this.codexSpecificPoints = codexSpecificPoints; +// } +// +// public String getArmyRace() { +// return armyRace; +// } +// +// public void setArmyRace(String armyRace) { +// this.armyRace = armyRace; +// } @Override public boolean equals(Object o) { @@ -270,12 +270,12 @@ public class Army implements Serializable { ", armyDescription='" + getArmyDescription() + "'" + ", armyName='" + getArmyName() + "'" + ", armyFaction='" + getArmyFaction() + "'" + - ", armyRace='" + getArmyRace() + "'" + +// ", armyRace='" + getArmyRace() + "'" + ", armyPowerLevel=" + getArmyPowerLevel() + ", armyPoints=" + getArmyPoints() + ", armyPointsOrPL='" + isArmyPointsOrPL() + "'" + ", requisition=" + getRequisition() + - ", armyCodexSpecificPoints=" + getCodexSpecificPoints() + +// ", armyCodexSpecificPoints=" + getCodexSpecificPoints() + ", battleTally=" + getBattleTally() + ", battlesWon=" + getBattlesWon() + "}"; diff --git a/src/main/webapp/app/entities/army/army-update.component.ts b/src/main/webapp/app/entities/army/army-update.component.ts index 675d54f0..97e7c9fc 100644 --- a/src/main/webapp/app/entities/army/army-update.component.ts +++ b/src/main/webapp/app/entities/army/army-update.component.ts @@ -29,7 +29,7 @@ export class ArmyUpdateComponent implements OnInit { armyPoints: [], armyPointsOrPL: [], requisition: [], - armyCodexSpecificPoints: [], + // armyCodexSpecificPoints: [], battleTally: [], battlesWon: [], ownerId: [null, Validators.required], @@ -62,7 +62,7 @@ export class ArmyUpdateComponent implements OnInit { armyPoints: army.armyPoints, armyPointsOrPL: army.armyPointsOrPL, requisition: army.requisition, - armyCodexSpecificPoints: army.armyCodexSpecificPoints, + // armyCodexSpecificPoints: army.armyCodexSpecificPoints, battleTally: army.battleTally, battlesWon: army.battlesWon, ownerId: army.ownerId, @@ -106,12 +106,12 @@ export class ArmyUpdateComponent implements OnInit { armyDescription: this.editForm.get(['armyDescription'])!.value, armyName: this.editForm.get(['armyName'])!.value, armyFaction: this.editForm.get(['armyFaction'])!.value, - armyRace: this.editForm.get(['armyRace'])!.value, + // armyRace: this.editForm.get(['armyRace'])!.value, armyPowerLevel: this.editForm.get(['armyPowerLevel'])!.value, armyPoints: this.editForm.get(['armyPoints'])!.value, armyPointsOrPL: this.editForm.get(['armyPointsOrPL'])!.value, requisition: this.editForm.get(['requisition'])!.value, - armyCodexSpecificPoints: this.editForm.get(['armyCodexSpecificPoints'])!.value, + // armyCodexSpecificPoints: this.editForm.get(['armyCodexSpecificPoints'])!.value, battleTally: this.editForm.get(['battleTally'])!.value, battlesWon: this.editForm.get(['battlesWon'])!.value, ownerId: this.editForm.get(['ownerId'])!.value, diff --git a/src/main/webapp/app/shared/model/army.model.ts b/src/main/webapp/app/shared/model/army.model.ts index 1f1c4bf2..ca46d6f6 100644 --- a/src/main/webapp/app/shared/model/army.model.ts +++ b/src/main/webapp/app/shared/model/army.model.ts @@ -5,12 +5,12 @@ export interface IArmy { armyDescription?: any; armyName?: string; armyFaction?: string; - armyRace?: string; + // armyRace?: string; armyPowerLevel?: number; armyPoints?: number; armyPointsOrPL?: boolean; requisition?: number; - armyCodexSpecificPoints?: number; + // armyCodexSpecificPoints?: number; battleTally?: number; battlesWon?: number; ownerLogin?: string; @@ -24,14 +24,14 @@ export class Army implements IArmy { public armyDescription?: any, public armyName?: string, public armyFaction?: string, - public armyRace?: string, + // public armyRace?: string, public armyPowerLevel?: number, public armyPoints?: number, public armyPointsOrPL?: boolean, public ownerId?: number, public ownerLogin?: string, public requisition?: number, - public armyCodexSpecificPoints?: number, + // public armyCodexSpecificPoints?: number, public battleTally?: number, public battlesWon?: number, public units?: IUnitArmy[]