diff --git a/api/package.json b/api/package.json index b1c4c3f..b0a7cd2 100644 --- a/api/package.json +++ b/api/package.json @@ -11,20 +11,20 @@ "e2e": "NODE_ENV=test node server.js" }, "dependencies": { - "async": "^2.4.0", + "async": "^2.5.0", "bcryptjs": "^2.4.3", "body-parser": "~1.13.2", - "cors": "^2.8.3", - "cron": "^1.2.1", + "cors": "^2.8.4", + "cron": "^1.3.0", "debug": "~2.2.0", "express": "^4.16.1", "imagemin": "^5.2.2", "imagemin-pngquant": "^5.0.0", "jimp": "^0.2.27", - "jsonwebtoken": "^7.4.0", + "jsonwebtoken": "^7.4.3", "lodash": "^4.17.4", "mkdirp": "^0.5.1", - "mongoose": "^4.11.4", + "mongoose": "^4.12.0", "morgan": "~1.6.1", "multer": "^1.3.0", "node-sha1": "^1.0.1", @@ -34,7 +34,7 @@ "devDependencies": { "chai": "^3.5.0", "chai-http": "^3.0.0", - "mocha": "^3.3.0", - "nodemon": "^1.11.0" + "mocha": "^3.5.3", + "nodemon": "^1.12.1" } } diff --git a/package.json b/package.json index fe735aa..2a33baf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opt-cc", - "version": "1.5.0", + "version": "1.5.1", "license": "MIT", "private": true, "scripts": { @@ -16,7 +16,7 @@ "test-e2e": "npm run e2e --prefix ./static" }, "dependencies": { - "uglify-js": "^3.0.26" + "uglify-js": "^3.1.3" }, "devDependencies": { "concurrently": "^3.4.0", diff --git a/static/package.json b/static/package.json index d26329b..9a885e1 100644 --- a/static/package.json +++ b/static/package.json @@ -11,37 +11,37 @@ "e2e": "ng e2e --serve=false" }, "dependencies": { - "@angular/animations": "^4.3.2", - "@angular/cli": "^1.4.0-rc.2", - "@angular/common": "^4.3.2", - "@angular/compiler": "^4.3.2", - "@angular/compiler-cli": "^4.3.2", - "@angular/core": "^4.3.2", - "@angular/forms": "^4.3.2", - "@angular/http": "^4.3.2", - "@angular/platform-browser": "^4.3.2", - "@angular/platform-browser-dynamic": "^4.3.2", - "@angular/router": "^4.3.2", + "@angular/animations": "^4.4.4", + "@angular/cli": "^1.4.5", + "@angular/common": "^4.4.4", + "@angular/compiler": "^4.4.4", + "@angular/compiler-cli": "^4.4.4", + "@angular/core": "^4.4.4", + "@angular/forms": "^4.4.4", + "@angular/http": "^4.4.4", + "@angular/platform-browser": "^4.4.4", + "@angular/platform-browser-dynamic": "^4.4.4", + "@angular/router": "^4.4.4", "@swimlane/ngx-charts": "^6.0.2", "@swimlane/ngx-datatable": "^10.2.3", "bootstrap": "^3.3.7", "core-js": "^2.4.1", - "d3": "^4.10.0", + "d3": "^4.11.0", "jquery": "^3.1.0", "jquery-ui": "^1.12.0", "jquery-ui-bundle": "^1.11.4", - "ngx-bootstrap": "^1.8.1", - "ngx-clipboard": "^8.0.2", + "ngx-bootstrap": "^1.9.3", + "ngx-clipboard": "^8.1.0", "ngx-cookie-service": "^1.0.9", "rxjs": "^5.2.0", "ts-helpers": "^1.1.1", - "typescript": "^2.3.2", - "webpack": "^3.5.5", - "zone.js": "^0.8.5" + "typescript": "^2.3.4", + "webpack": "^3.6.0", + "zone.js": "^0.8.18" }, "devDependencies": { "@types/jasmine": "2.5.38", - "@types/node": "~6.0.60", + "@types/node": "^6.0.89", "codelyzer": "~2.0.0-beta.1", "jasmine-core": "^2.5.2", "jasmine-spec-reporter": "^3.2.0", diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html index e4e67bf..bb60e51 100644 --- a/static/src/app/app.component.html +++ b/static/src/app/app.component.html @@ -86,7 +86,7 @@ -
+
diff --git a/static/src/app/app.routing.ts b/static/src/app/app.routing.ts index 47e9acd..c9ed43c 100644 --- a/static/src/app/app.routing.ts +++ b/static/src/app/app.routing.ts @@ -1,7 +1,7 @@ import {RouterModule, Routes} from "@angular/router"; import {LoginComponent} from "./login/index"; import {NotFoundComponent} from "./common/not-found/not-found.component"; -import {LoginGuardAdmin, LoginGuardHL, LoginGuardMT, LoginGuardSQL} from "./login/login.guard"; +import {LoginGuardAdmin, LoginGuardHL} from "./login/login.guard"; import {armyRoutes, armyRoutingComponents} from "./army/army.routing"; import {SignupComponent} from "./login/signup.component"; import {RouteConfig} from "./app.config"; diff --git a/static/src/app/army/army.component.html b/static/src/app/army/army.component.html index 6c1809b..43a117b 100644 --- a/static/src/app/army/army.component.html +++ b/static/src/app/army/army.component.html @@ -1,4 +1,4 @@ -
+

Übersicht über alle Spieler, Squads und Armeen

diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.css b/static/src/app/decorations/decoration-list/decoration-list.component.css index b7a28c3..e69de29 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.css +++ b/static/src/app/decorations/decoration-list/decoration-list.component.css @@ -1,8 +0,0 @@ -.search-bar { - padding-top: 20px; - padding-bottom: 20px; -} - -.decoration-list { - width: 100%; -} diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.html b/static/src/app/decorations/decoration-list/decoration-list.component.html index e54319c..7fe14fe 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.html +++ b/static/src/app/decorations/decoration-list/decoration-list.component.html @@ -1,40 +1,36 @@ -
-

Übersicht

-
-
- - - -
- - -
+
+
+ + + +
+ - Neue Auszeichnung hinzufügen + Auszeichnung hinzufügen
-
+
-

Übersicht

-
-
+
+
+
-
+
-

Übersicht

-
-
- - - -
+
+
+ + + - Neues Squad hinzufügen + Squad hinzufügen
diff --git a/static/src/app/squads/squad-list/squad-list.component.ts b/static/src/app/squads/squad-list/squad-list.component.ts index 1c7f435..7128575 100644 --- a/static/src/app/squads/squad-list/squad-list.component.ts +++ b/static/src/app/squads/squad-list/squad-list.component.ts @@ -10,7 +10,7 @@ import {SquadService} from "../../services/squad-service/squad.service"; @Component({ selector: 'squad-list', templateUrl: './squad-list.component.html', - styleUrls: ['./squad-list.component.css'] + styleUrls: ['./squad-list.component.css', '../../style/select-list.css'] }) export class SquadListComponent implements OnInit { diff --git a/static/src/app/squads/squads.component.css b/static/src/app/squads/squads.component.css index d9e6a0b..e69de29 100644 --- a/static/src/app/squads/squads.component.css +++ b/static/src/app/squads/squads.component.css @@ -1,9 +0,0 @@ -#left { - width: 320px; - float: left; - padding-right: 10px; -} - -#right { - overflow: hidden -} diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css index 0332e44..ac2d807 100644 --- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css +++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css @@ -4,10 +4,7 @@ overflow-x: hidden; border-left: thin solid lightgrey; bottom: 20px; - width: 80%; - padding-left: 20px; - padding-right: 5%; - padding-top: 70px; + padding: 70px 1% 0 1%; height: 100vh; } diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html index 9542f3f..c6dd3fb 100644 --- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html +++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html @@ -1,5 +1,4 @@
-

Spielerstatistik - {{campaignPlayer.name}}

{{campaignPlayer.campaign.title}} Kampagne

@@ -163,5 +162,4 @@
-
diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts index 7ccd760..c490c46 100644 --- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts +++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts @@ -9,7 +9,7 @@ import {Location} from '@angular/common'; @Component({ selector: 'campaign-player-detail', templateUrl: './campaign-player-detail.component.html', - styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css'] + styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css'] }) export class CampaignPlayerDetailComponent { diff --git a/static/src/app/statistic/overview/stats-overview.component.css b/static/src/app/statistic/overview/stats-overview.component.css index 7060d89..2666e75 100644 --- a/static/src/app/statistic/overview/stats-overview.component.css +++ b/static/src/app/statistic/overview/stats-overview.component.css @@ -3,7 +3,7 @@ min-width: 880px; height: 650px; margin: auto; - padding-left: 6%; + padding-left: 5%; } :host /deep/ .carousel-indicators { diff --git a/static/src/app/statistic/overview/stats-overview.component.html b/static/src/app/statistic/overview/stats-overview.component.html index 7ab2b59..9c9430f 100644 --- a/static/src/app/statistic/overview/stats-overview.component.html +++ b/static/src/app/statistic/overview/stats-overview.component.html @@ -1,71 +1,32 @@ -

{{title}}

+
+

{{title}}

-
Gesamtpunktzahl +
Gesamtpunktzahl +
+
Punkte je Schlacht +
+
Spielerzahlen +
-
Punkte je Schlacht -
-
Spielerzahlen +
+
+ + +
- - -
-

Gesamtpunktzahl

- - -
- - -
-

Punkte je Schlacht

- > - -
- - -
-

Spielerzahlen

- - -
- - diff --git a/static/src/app/statistic/overview/stats-overview.component.ts b/static/src/app/statistic/overview/stats-overview.component.ts index 0a01419..12f7ec9 100644 --- a/static/src/app/statistic/overview/stats-overview.component.ts +++ b/static/src/app/statistic/overview/stats-overview.component.ts @@ -16,11 +16,12 @@ export class StatisticOverviewComponent { id = ""; title = ""; - activeSlideIndex: number = 0; pointData: any[] = []; pointSumData: any[] = []; playerData: any[] = []; + currentData: any[] = []; + activeSlideIndex; colorScheme = { domain: ['#0000FF', '#B22222'] @@ -33,9 +34,11 @@ export class StatisticOverviewComponent { legendTitle = ''; showXAxisLabel = true; showYAxisLabel = true; + yAxisLabel = ""; autoscale = true; timeline = false; + constructor(private route: ActivatedRoute, private campaignService: CampaignService) { } @@ -63,10 +66,7 @@ export class StatisticOverviewComponent { if (this.id === 'all') { this.title = "Gesamtübersicht"; } else { - this.title = campaign.title - setTimeout(() => { - this.activeSlideIndex = 2; - }, 10) + this.title = campaign.title; } wars = wars.concat(campaign.wars); itemsProcessed++; @@ -77,7 +77,22 @@ export class StatisticOverviewComponent { } goToSlide(index: number) { + switch (index) { + case 0: + this.currentData = this.pointSumData; + this.yAxisLabel = "Gesamtpunkte"; + break; + case 1: + this.currentData = this.pointData; + this.yAxisLabel = "Punkte"; + break; + case 2: + this.currentData = this.playerData; + this.yAxisLabel = "Anzahl Spieler"; + break; + } this.activeSlideIndex = index; + } initChart(wars: any[]) { @@ -130,7 +145,16 @@ export class StatisticOverviewComponent { this.pointData = pointsObj; this.pointSumData = pointsSumObj; this.playerData = playersObj; - Object.assign(this, [this.pointData, this.pointSumData, this.playerData]); + if (this.id != 'all') { + this.goToSlide(0); + } else { + this.goToSlide(1); + } + Object.assign(this, this.currentData); + } + + isActiveSlide(index) { + return this.activeSlideIndex === index ? '#d9edf7':'white' } } diff --git a/static/src/app/statistic/war-detail/war-detail.component.css b/static/src/app/statistic/war-detail/war-detail.component.css index 454c430..83ff550 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.css +++ b/static/src/app/statistic/war-detail/war-detail.component.css @@ -1,13 +1,26 @@ +.vertical-spacer { + height: 100vh; + float: left; + width: 4%; +} + +@media screen and (min-width: 1500px) { + .vertical-spacer { + width: 15%; + } +} + +@media screen and (min-width: 2000px) { + .vertical-spacer { + width: 20%; + } +} + .overview { - position: fixed; overflow-y: scroll; overflow-x: hidden; border-left: thin solid lightgrey; bottom: 20px; - width: 100%; - padding-left: 50px; - padding-top: 70px; - margin-left: 10px; height: 100vh; } diff --git a/static/src/app/statistic/war-detail/war-detail.component.html b/static/src/app/statistic/war-detail/war-detail.component.html index fa69568..fb894eb 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.html +++ b/static/src/app/statistic/war-detail/war-detail.component.html @@ -1,84 +1,87 @@ -
- -
-

{{war.title}} - vom {{war.date | date: 'dd.MM.yyyy'}}

-

-

Endpunktestand:

- NATO {{war.ptBlufor}} - | - {{war.ptOpfor}} CSAT - - -

-

Teilnehmer:

- - - - -
- Logfile - anzeigen -
- - - -
-
+
+
-
+
+
+

{{war.title}} - vom {{war.date | date: 'dd.MM.yyyy'}}

+

+

Endpunktestand:

+ NATO {{war.ptBlufor}} + | + {{war.ptOpfor}} CSAT + - - - +

+

Teilnehmer:

+ + + + +
+ Logfile + anzeigen +
+ + + +
+
+
+
+ + + + {{value}} - - - - - {{value === 'BLUFOR' ? 'NATO' : 'CSAT'}} - - - - - - - - - + + + + + {{value === 'BLUFOR' ? 'NATO' : 'CSAT'}} + + + + + + + + + +
diff --git a/static/src/app/statistic/war-detail/war-detail.component.ts b/static/src/app/statistic/war-detail/war-detail.component.ts index 3695170..e9e8936 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.ts +++ b/static/src/app/statistic/war-detail/war-detail.component.ts @@ -7,7 +7,7 @@ import {War} from "../../models/model-interfaces"; @Component({ selector: 'war-detail', templateUrl: './war-detail.component.html', - styleUrls: ['./war-detail.component.css', '../../style/list-entry.css'] + styleUrls: ['./war-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css'] }) export class WarDetailComponent { diff --git a/static/src/app/statistic/war-list/war-item.component.html b/static/src/app/statistic/war-list/war-item.component.html index dd962b5..85ca722 100644 --- a/static/src/app/statistic/war-list/war-item.component.html +++ b/static/src/app/statistic/war-list/war-item.component.html @@ -3,7 +3,7 @@
- {{war.title}} + {{war.title}}
vom {{war.date | date: 'dd.MM.yyyy'}} diff --git a/static/src/app/statistic/war-list/war-list.component.css b/static/src/app/statistic/war-list/war-list.component.css index 2f7bdfe..a4a0c63 100644 --- a/static/src/app/statistic/war-list/war-list.component.css +++ b/static/src/app/statistic/war-list/war-list.component.css @@ -1,7 +1,3 @@ -.war-list { - padding-top: 30px; -} - :host /deep/ .card-header { background-color: rgba(34, 34, 34, 0.80); cursor: pointer; diff --git a/static/src/app/statistic/war-list/war-list.component.html b/static/src/app/statistic/war-list/war-list.component.html index 5e1d82c..eee2b9f 100644 --- a/static/src/app/statistic/war-list/war-list.component.html +++ b/static/src/app/statistic/war-list/war-list.component.html @@ -1,5 +1,5 @@ -
-
+
+
Schlacht hinzufügen @@ -25,7 +25,7 @@
- Kampagnenübersicht + Kampagnenübersicht
@@ -47,7 +47,7 @@
- Gesamtübersicht + Gesamtübersicht
diff --git a/static/src/app/statistic/war-list/war-list.component.ts b/static/src/app/statistic/war-list/war-list.component.ts index c602849..17d39a3 100644 --- a/static/src/app/statistic/war-list/war-list.component.ts +++ b/static/src/app/statistic/war-list/war-list.component.ts @@ -4,11 +4,12 @@ import {Campaign, War} from "../../models/model-interfaces"; import {WarService} from "../../services/war-service/war.service"; import {LoginService} from "../../services/login-service/login-service"; import {CampaignService} from "../../services/campaign-service/campaign.service"; +import {RouteConfig} from "../../app.config"; @Component({ selector: 'war-list', templateUrl: './war-list.component.html', - styleUrls: ['./war-list.component.css', '../../style/list-entry.css'] + styleUrls: ['./war-list.component.css', '../../style/list-entry.css', '../../style/select-list.css'] }) export class WarListComponent implements OnInit { @@ -25,9 +26,19 @@ export class WarListComponent implements OnInit { ngOnInit() { this.campaignService.getAllCampaigns().subscribe((items) => { + const subPathWar = 'war/'; + const subPathOverview = 'overview/'; this.campaignService.campaigns = items; this.campaigns = items; - this.selectOverview(this.campaigns[0]._id); + + const url = this.router.url; + if (url.endsWith(RouteConfig.statsPath)) { + this.selectOverview(this.campaigns[0]._id); + } else if (url.indexOf(subPathWar) !== -1) { + this.selectedWarId = url.substring(url.lastIndexOf(subPathWar) + subPathWar.length, url.lastIndexOf(")")); + } else if (url.indexOf(subPathOverview) !== -1) { + this.selectedWarId = url.substring(url.lastIndexOf(subPathOverview) + subPathOverview.length, url.lastIndexOf(")")); + } }); } diff --git a/static/src/app/style/hide-scrollbar.css b/static/src/app/style/hide-scrollbar.css new file mode 100644 index 0000000..e7cb272 --- /dev/null +++ b/static/src/app/style/hide-scrollbar.css @@ -0,0 +1,9 @@ +::-webkit-scrollbar { + /*width: 0px; !* remove scrollbar space *!*/ + background: transparent; /* just make scrollbar invisible */ +} + +/* show position indicator in red */ +::-webkit-scrollbar-thumb { + background: rgb(234, 234, 234); +} diff --git a/static/src/app/style/load-indicator.css b/static/src/app/style/load-indicator.css index c35686d..f224632 100644 --- a/static/src/app/style/load-indicator.css +++ b/static/src/app/style/load-indicator.css @@ -1,9 +1,10 @@ .load-indicator { - position:absolute; - top:50%; - left:50%; - transform:translate(-50%, -50%); - width:50%; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 50%; + z-index: 1; } .load-arrow { diff --git a/static/src/app/style/select-list.css b/static/src/app/style/select-list.css new file mode 100644 index 0000000..5f6de97 --- /dev/null +++ b/static/src/app/style/select-list.css @@ -0,0 +1,8 @@ +.select-list { + padding: 20px 2% 0 5%; +} + +.list-header { + width: 100%; + padding-bottom: 20px; +} diff --git a/static/src/app/users/user-list/user-list.component.css b/static/src/app/users/user-list/user-list.component.css index 5f46bf0..e69de29 100644 --- a/static/src/app/users/user-list/user-list.component.css +++ b/static/src/app/users/user-list/user-list.component.css @@ -1,18 +0,0 @@ -.search-bar { - padding-top: 20px; - padding-bottom: 20px; -} - -.user-list { - width: 100%; -} - -.fraction-blufor { - color: mediumblue; - font-weight: bold; -} - -.fraction-opfor { - color: red; - font-weight: bold; -} diff --git a/static/src/app/users/user-list/user-list.component.html b/static/src/app/users/user-list/user-list.component.html index b160437..94e311e 100644 --- a/static/src/app/users/user-list/user-list.component.html +++ b/static/src/app/users/user-list/user-list.component.html @@ -1,39 +1,36 @@ -
-

Übersicht

-
-
- - - -
- -
+
+
+ + + +
+ - Neuen Teilnehmer hinzufügen + Teilnehmer hinzufügen
-
+