From 5f1686c64ef838e24cc1d55e4bc48f671cf8b7e4 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 29 Apr 2018 10:07:20 +0200 Subject: [PATCH] refactor package structure for statistics --- .../campaign-player-detail.component.css | 0 .../campaign-player-detail.component.html | 0 .../campaign-player-detail.component.ts | 10 +++++----- .../campaign-submit.component.css | 0 .../campaign-submit.component.html | 0 .../campaign-submit.component.ts | 6 +++--- .../highscore/highscore.component.css | 0 .../highscore/highscore.component.html | 0 .../highscore/highscore.component.ts | 10 +++++----- .../overview/stats-overview.component.css | 0 .../overview/stats-overview.component.html | 0 .../overview/stats-overview.component.ts | 8 ++++---- static/src/app/statistic/stats.routing.ts | 18 +++++++++--------- .../fraction-stats.component.css | 0 .../fraction-stats.component.html | 0 .../fraction-stats/fraction-stats.component.ts | 0 .../scoreboard/scoreboard.component.css | 0 .../scoreboard/scoreboard.component.html | 0 .../scoreboard/scoreboard.component.ts | 0 .../war-detail/war-detail.component.css | 0 .../war-detail/war-detail.component.html | 0 .../war-detail/war-detail.component.ts | 14 +++++++------- .../{ => war}/war-list/war-item.component.css | 0 .../{ => war}/war-list/war-item.component.html | 0 .../{ => war}/war-list/war-item.component.ts | 6 +++--- .../{ => war}/war-list/war-list.component.css | 0 .../{ => war}/war-list/war-list.component.html | 0 .../{ => war}/war-list/war-list.component.ts | 12 ++++++------ 28 files changed, 42 insertions(+), 42 deletions(-) rename static/src/app/statistic/{ => campaign}/campaign-player-detail/campaign-player-detail.component.css (100%) rename static/src/app/statistic/{ => campaign}/campaign-player-detail/campaign-player-detail.component.html (100%) rename static/src/app/statistic/{ => campaign}/campaign-player-detail/campaign-player-detail.component.ts (90%) rename static/src/app/statistic/{ => campaign}/campaign-submit/campaign-submit.component.css (100%) rename static/src/app/statistic/{ => campaign}/campaign-submit/campaign-submit.component.html (100%) rename static/src/app/statistic/{ => campaign}/campaign-submit/campaign-submit.component.ts (85%) rename static/src/app/statistic/{ => campaign}/highscore/highscore.component.css (100%) rename static/src/app/statistic/{ => campaign}/highscore/highscore.component.html (100%) rename static/src/app/statistic/{ => campaign}/highscore/highscore.component.ts (89%) rename static/src/app/statistic/{ => campaign}/overview/stats-overview.component.css (100%) rename static/src/app/statistic/{ => campaign}/overview/stats-overview.component.html (100%) rename static/src/app/statistic/{ => campaign}/overview/stats-overview.component.ts (93%) rename static/src/app/statistic/{war-detail => war}/fraction-stats/fraction-stats.component.css (100%) rename static/src/app/statistic/{war-detail => war}/fraction-stats/fraction-stats.component.html (100%) rename static/src/app/statistic/{war-detail => war}/fraction-stats/fraction-stats.component.ts (100%) rename static/src/app/statistic/{war-detail => war}/scoreboard/scoreboard.component.css (100%) rename static/src/app/statistic/{war-detail => war}/scoreboard/scoreboard.component.html (100%) rename static/src/app/statistic/{war-detail => war}/scoreboard/scoreboard.component.ts (100%) rename static/src/app/statistic/{ => war}/war-detail/war-detail.component.css (100%) rename static/src/app/statistic/{ => war}/war-detail/war-detail.component.html (100%) rename static/src/app/statistic/{ => war}/war-detail/war-detail.component.ts (80%) rename static/src/app/statistic/{ => war}/war-list/war-item.component.css (100%) rename static/src/app/statistic/{ => war}/war-list/war-item.component.html (100%) rename static/src/app/statistic/{ => war}/war-list/war-item.component.ts (75%) rename static/src/app/statistic/{ => war}/war-list/war-list.component.css (100%) rename static/src/app/statistic/{ => war}/war-list/war-list.component.html (100%) rename static/src/app/statistic/{ => war}/war-list/war-list.component.ts (88%) diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.css similarity index 100% rename from static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css rename to static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.css diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.html similarity index 100% rename from static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html rename to static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.html diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts similarity index 90% rename from static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts rename to static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts index d4f112d..a84c77f 100644 --- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts +++ b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts @@ -1,14 +1,14 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {CampaignPlayer} from '../../models/model-interfaces'; -import {PlayerService} from '../../services/logs/player.service'; -import {ChartUtils} from '../../utils/chart-utils'; +import {CampaignPlayer} from '../../../models/model-interfaces'; +import {PlayerService} from '../../../services/logs/player.service'; +import {ChartUtils} from '../../../utils/chart-utils'; @Component({ selector: 'campaign-player-detail', templateUrl: './campaign-player-detail.component.html', - styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css', - '../../style/hide-scrollbar.css', '../../style/overview.css'] + styleUrls: ['./campaign-player-detail.component.css', '../../../style/list-entry.css', + '../../../style/hide-scrollbar.css', '../../../style/overview.css'] }) export class CampaignPlayerDetailComponent implements OnInit { diff --git a/static/src/app/statistic/campaign-submit/campaign-submit.component.css b/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.css similarity index 100% rename from static/src/app/statistic/campaign-submit/campaign-submit.component.css rename to static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.css diff --git a/static/src/app/statistic/campaign-submit/campaign-submit.component.html b/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.html similarity index 100% rename from static/src/app/statistic/campaign-submit/campaign-submit.component.html rename to static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.html diff --git a/static/src/app/statistic/campaign-submit/campaign-submit.component.ts b/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.ts similarity index 85% rename from static/src/app/statistic/campaign-submit/campaign-submit.component.ts rename to static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.ts index eeadc00..5609e4c 100644 --- a/static/src/app/statistic/campaign-submit/campaign-submit.component.ts +++ b/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.ts @@ -2,14 +2,14 @@ import {Component, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {NgForm} from '@angular/forms'; import {Subscription} from 'rxjs/Subscription'; -import {Campaign} from '../../models/model-interfaces'; -import {CampaignService} from '../../services/logs/campaign.service'; +import {Campaign} from '../../../models/model-interfaces'; +import {CampaignService} from '../../../services/logs/campaign.service'; @Component({ selector: 'campaign-submit', templateUrl: './campaign-submit.component.html', - styleUrls: ['./campaign-submit.component.css', '../../style/entry-form.css', '../../style/overview.css'] + styleUrls: ['./campaign-submit.component.css', '../../../style/entry-form.css', '../../../style/overview.css'] }) export class CampaignSubmitComponent { diff --git a/static/src/app/statistic/highscore/highscore.component.css b/static/src/app/statistic/campaign/highscore/highscore.component.css similarity index 100% rename from static/src/app/statistic/highscore/highscore.component.css rename to static/src/app/statistic/campaign/highscore/highscore.component.css diff --git a/static/src/app/statistic/highscore/highscore.component.html b/static/src/app/statistic/campaign/highscore/highscore.component.html similarity index 100% rename from static/src/app/statistic/highscore/highscore.component.html rename to static/src/app/statistic/campaign/highscore/highscore.component.html diff --git a/static/src/app/statistic/highscore/highscore.component.ts b/static/src/app/statistic/campaign/highscore/highscore.component.ts similarity index 89% rename from static/src/app/statistic/highscore/highscore.component.ts rename to static/src/app/statistic/campaign/highscore/highscore.component.ts index 353139c..32a3d82 100644 --- a/static/src/app/statistic/highscore/highscore.component.ts +++ b/static/src/app/statistic/campaign/highscore/highscore.component.ts @@ -1,17 +1,17 @@ import {Component, Input, OnInit} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; -import {PlayerService} from '../../services/logs/player.service'; -import {CampaignService} from '../../services/logs/campaign.service'; -import {Fraction} from '../../utils/fraction.enum'; +import {PlayerService} from '../../../services/logs/player.service'; +import {CampaignService} from '../../../services/logs/campaign.service'; +import {Fraction} from '../../../utils/fraction.enum'; import {FormControl} from '@angular/forms'; import {Observable} from 'rxjs/Observable'; -import {Player} from '../../models/model-interfaces'; +import {Player} from '../../../models/model-interfaces'; @Component({ selector: 'stats-highscore', templateUrl: './highscore.component.html', - styleUrls: ['./highscore.component.css', '../../style/list-entry.css', '../../style/overview.css'] + styleUrls: ['./highscore.component.css', '../../../style/list-entry.css', '../../../style/overview.css'] }) export class StatisticHighScoreComponent implements OnInit { diff --git a/static/src/app/statistic/overview/stats-overview.component.css b/static/src/app/statistic/campaign/overview/stats-overview.component.css similarity index 100% rename from static/src/app/statistic/overview/stats-overview.component.css rename to static/src/app/statistic/campaign/overview/stats-overview.component.css diff --git a/static/src/app/statistic/overview/stats-overview.component.html b/static/src/app/statistic/campaign/overview/stats-overview.component.html similarity index 100% rename from static/src/app/statistic/overview/stats-overview.component.html rename to static/src/app/statistic/campaign/overview/stats-overview.component.html diff --git a/static/src/app/statistic/overview/stats-overview.component.ts b/static/src/app/statistic/campaign/overview/stats-overview.component.ts similarity index 93% rename from static/src/app/statistic/overview/stats-overview.component.ts rename to static/src/app/statistic/campaign/overview/stats-overview.component.ts index 0359ba1..5aec41e 100644 --- a/static/src/app/statistic/overview/stats-overview.component.ts +++ b/static/src/app/statistic/campaign/overview/stats-overview.component.ts @@ -1,14 +1,14 @@ import {Component, Input, OnInit} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; -import {CampaignService} from '../../services/logs/campaign.service'; -import {ChartUtils} from '../../utils/chart-utils'; -import {Fraction} from '../../utils/fraction.enum'; +import {CampaignService} from '../../../services/logs/campaign.service'; +import {ChartUtils} from '../../../utils/chart-utils'; +import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'stats-overview', templateUrl: './stats-overview.component.html', - styleUrls: ['./stats-overview.component.css', '../../style/list-entry.css', '../../style/overview.css'] + styleUrls: ['./stats-overview.component.css', '../../../style/list-entry.css', '../../../style/overview.css'] }) export class StatisticOverviewComponent implements OnInit { diff --git a/static/src/app/statistic/stats.routing.ts b/static/src/app/statistic/stats.routing.ts index 8e1823c..353a453 100644 --- a/static/src/app/statistic/stats.routing.ts +++ b/static/src/app/statistic/stats.routing.ts @@ -1,16 +1,16 @@ import {RouterModule, Routes} from '@angular/router'; import {StatisticComponent} from './stats.component'; -import {WarListComponent} from './war-list/war-list.component'; -import {StatisticOverviewComponent} from './overview/stats-overview.component'; -import {WarItemComponent} from './war-list/war-item.component'; +import {WarListComponent} from './war/war-list/war-list.component'; +import {StatisticOverviewComponent} from './campaign/overview/stats-overview.component'; +import {WarItemComponent} from './war/war-list/war-item.component'; import {ModuleWithProviders} from '@angular/core'; -import {CampaignSubmitComponent} from './campaign-submit/campaign-submit.component'; -import {CampaignPlayerDetailComponent} from './campaign-player-detail/campaign-player-detail.component'; -import {WarDetailComponent} from './war-detail/war-detail.component'; -import {ScoreboardComponent} from './war-detail/scoreboard/scoreboard.component'; +import {CampaignSubmitComponent} from './campaign/campaign-submit/campaign-submit.component'; +import {CampaignPlayerDetailComponent} from './campaign/campaign-player-detail/campaign-player-detail.component'; +import {WarDetailComponent} from './war/war-detail/war-detail.component'; +import {ScoreboardComponent} from './war/scoreboard/scoreboard.component'; import {WarSubmitComponent} from './war-submit/war-submit.component'; -import {FractionStatsComponent} from './war-detail/fraction-stats/fraction-stats.component'; -import {StatisticHighScoreComponent} from './highscore/highscore.component'; +import {FractionStatsComponent} from './war/fraction-stats/fraction-stats.component'; +import {StatisticHighScoreComponent} from './campaign/highscore/highscore.component'; export const statsRoutes: Routes = [{ diff --git a/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.css b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.css similarity index 100% rename from static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.css rename to static/src/app/statistic/war/fraction-stats/fraction-stats.component.css diff --git a/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.html b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.html similarity index 100% rename from static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.html rename to static/src/app/statistic/war/fraction-stats/fraction-stats.component.html diff --git a/static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts similarity index 100% rename from static/src/app/statistic/war-detail/fraction-stats/fraction-stats.component.ts rename to static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css b/static/src/app/statistic/war/scoreboard/scoreboard.component.css similarity index 100% rename from static/src/app/statistic/war-detail/scoreboard/scoreboard.component.css rename to static/src/app/statistic/war/scoreboard/scoreboard.component.css diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html b/static/src/app/statistic/war/scoreboard/scoreboard.component.html similarity index 100% rename from static/src/app/statistic/war-detail/scoreboard/scoreboard.component.html rename to static/src/app/statistic/war/scoreboard/scoreboard.component.html diff --git a/static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts b/static/src/app/statistic/war/scoreboard/scoreboard.component.ts similarity index 100% rename from static/src/app/statistic/war-detail/scoreboard/scoreboard.component.ts rename to static/src/app/statistic/war/scoreboard/scoreboard.component.ts diff --git a/static/src/app/statistic/war-detail/war-detail.component.css b/static/src/app/statistic/war/war-detail/war-detail.component.css similarity index 100% rename from static/src/app/statistic/war-detail/war-detail.component.css rename to static/src/app/statistic/war/war-detail/war-detail.component.css diff --git a/static/src/app/statistic/war-detail/war-detail.component.html b/static/src/app/statistic/war/war-detail/war-detail.component.html similarity index 100% rename from static/src/app/statistic/war-detail/war-detail.component.html rename to static/src/app/statistic/war/war-detail/war-detail.component.html diff --git a/static/src/app/statistic/war-detail/war-detail.component.ts b/static/src/app/statistic/war/war-detail/war-detail.component.ts similarity index 80% rename from static/src/app/statistic/war-detail/war-detail.component.ts rename to static/src/app/statistic/war/war-detail/war-detail.component.ts index 688a2a6..9344aa1 100644 --- a/static/src/app/statistic/war-detail/war-detail.component.ts +++ b/static/src/app/statistic/war/war-detail/war-detail.component.ts @@ -1,17 +1,17 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; -import {WarService} from '../../services/logs/war.service'; -import {War} from '../../models/model-interfaces'; -import {ChartUtils} from '../../utils/chart-utils'; -import {Fraction} from '../../utils/fraction.enum'; -import {LogsService} from '../../services/logs/logs.service'; -import {ScoreboardComponent} from './scoreboard/scoreboard.component'; +import {WarService} from '../../../services/logs/war.service'; +import {War} from '../../../models/model-interfaces'; +import {ChartUtils} from '../../../utils/chart-utils'; +import {Fraction} from '../../../utils/fraction.enum'; +import {LogsService} from '../../../services/logs/logs.service'; +import {ScoreboardComponent} from '../scoreboard/scoreboard.component'; @Component({ selector: 'war-detail', templateUrl: './war-detail.component.html', - styleUrls: ['./war-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css'] + styleUrls: ['./war-detail.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] }) export class WarDetailComponent implements OnInit { diff --git a/static/src/app/statistic/war-list/war-item.component.css b/static/src/app/statistic/war/war-list/war-item.component.css similarity index 100% rename from static/src/app/statistic/war-list/war-item.component.css rename to static/src/app/statistic/war/war-list/war-item.component.css diff --git a/static/src/app/statistic/war-list/war-item.component.html b/static/src/app/statistic/war/war-list/war-item.component.html similarity index 100% rename from static/src/app/statistic/war-list/war-item.component.html rename to static/src/app/statistic/war/war-list/war-item.component.html diff --git a/static/src/app/statistic/war-list/war-item.component.ts b/static/src/app/statistic/war/war-list/war-item.component.ts similarity index 75% rename from static/src/app/statistic/war-list/war-item.component.ts rename to static/src/app/statistic/war/war-list/war-item.component.ts index 84890c9..20c874b 100644 --- a/static/src/app/statistic/war-list/war-item.component.ts +++ b/static/src/app/statistic/war/war-list/war-item.component.ts @@ -1,11 +1,11 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {War} from '../../models/model-interfaces'; -import {LoginService} from '../../services/app-user-service/login-service'; +import {War} from '../../../models/model-interfaces'; +import {LoginService} from '../../../services/app-user-service/login-service'; @Component({ selector: 'pjm-war-item', templateUrl: './war-item.component.html', - styleUrls: ['./war-item.component.css', '../../style/list-entry.css'], + styleUrls: ['./war-item.component.css', '../../../style/list-entry.css'], changeDetection: ChangeDetectionStrategy.OnPush }) export class WarItemComponent implements OnInit { diff --git a/static/src/app/statistic/war-list/war-list.component.css b/static/src/app/statistic/war/war-list/war-list.component.css similarity index 100% rename from static/src/app/statistic/war-list/war-list.component.css rename to static/src/app/statistic/war/war-list/war-list.component.css diff --git a/static/src/app/statistic/war-list/war-list.component.html b/static/src/app/statistic/war/war-list/war-list.component.html similarity index 100% rename from static/src/app/statistic/war-list/war-list.component.html rename to static/src/app/statistic/war/war-list/war-list.component.html diff --git a/static/src/app/statistic/war-list/war-list.component.ts b/static/src/app/statistic/war/war-list/war-list.component.ts similarity index 88% rename from static/src/app/statistic/war-list/war-list.component.ts rename to static/src/app/statistic/war/war-list/war-list.component.ts index fb4ebba..75d92cc 100644 --- a/static/src/app/statistic/war-list/war-list.component.ts +++ b/static/src/app/statistic/war/war-list/war-list.component.ts @@ -1,15 +1,15 @@ import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; -import {Campaign, War} from '../../models/model-interfaces'; -import {WarService} from '../../services/logs/war.service'; -import {LoginService} from '../../services/app-user-service/login-service'; -import {CampaignService} from '../../services/logs/campaign.service'; -import {RouteConfig} from '../../app.config'; +import {Campaign, War} from '../../../models/model-interfaces'; +import {WarService} from '../../../services/logs/war.service'; +import {LoginService} from '../../../services/app-user-service/login-service'; +import {CampaignService} from '../../../services/logs/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', '../../style/select-list.css'] + styleUrls: ['./war-list.component.css', '../../../style/list-entry.css', '../../../style/select-list.css'] }) export class WarListComponent implements OnInit {