From 1ac78b75503972920f4a20876067065c73856991 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 29 Apr 2018 10:12:27 +0200 Subject: [PATCH] refactor package structure for statistics --- static/src/app/statistic/stats.routing.ts | 8 ++++---- .../war-header.component.css} | 0 .../war-header.component.html} | 0 .../war-header.component.ts} | 6 +++--- .../{ => war}/war-submit/war-submit.component.css | 0 .../{ => war}/war-submit/war-submit.component.html | 0 .../{ => war}/war-submit/war-submit.component.ts | 10 +++++----- 7 files changed, 12 insertions(+), 12 deletions(-) rename static/src/app/statistic/war/{war-detail/war-detail.component.css => war-header/war-header.component.css} (100%) rename static/src/app/statistic/war/{war-detail/war-detail.component.html => war-header/war-header.component.html} (100%) rename static/src/app/statistic/war/{war-detail/war-detail.component.ts => war-header/war-header.component.ts} (93%) rename static/src/app/statistic/{ => war}/war-submit/war-submit.component.css (100%) rename static/src/app/statistic/{ => war}/war-submit/war-submit.component.html (100%) rename static/src/app/statistic/{ => war}/war-submit/war-submit.component.ts (82%) diff --git a/static/src/app/statistic/stats.routing.ts b/static/src/app/statistic/stats.routing.ts index 353a453..1df891c 100644 --- a/static/src/app/statistic/stats.routing.ts +++ b/static/src/app/statistic/stats.routing.ts @@ -6,11 +6,11 @@ import {WarItemComponent} from './war/war-list/war-item.component'; import {ModuleWithProviders} from '@angular/core'; 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 {WarSubmitComponent} from './war/war-submit/war-submit.component'; import {FractionStatsComponent} from './war/fraction-stats/fraction-stats.component'; import {StatisticHighScoreComponent} from './campaign/highscore/highscore.component'; +import {WarHeaderComponent} from "./war/war-header/war-header.component"; export const statsRoutes: Routes = [{ @@ -49,7 +49,7 @@ export const statsRoutes: Routes = [{ }, { path: 'war/:id', - component: WarDetailComponent, + component: WarHeaderComponent, outlet: 'right' }, { @@ -61,6 +61,6 @@ export const statsRoutes: Routes = [{ export const statsRouterModule: ModuleWithProviders = RouterModule.forChild(statsRoutes); export const statsRoutingComponents = [StatisticComponent, StatisticOverviewComponent, StatisticHighScoreComponent, - CampaignSubmitComponent, WarListComponent, WarSubmitComponent, WarDetailComponent, ScoreboardComponent, + CampaignSubmitComponent, WarListComponent, WarSubmitComponent, WarHeaderComponent, ScoreboardComponent, FractionStatsComponent, CampaignPlayerDetailComponent, WarItemComponent]; diff --git a/static/src/app/statistic/war/war-detail/war-detail.component.css b/static/src/app/statistic/war/war-header/war-header.component.css similarity index 100% rename from static/src/app/statistic/war/war-detail/war-detail.component.css rename to static/src/app/statistic/war/war-header/war-header.component.css diff --git a/static/src/app/statistic/war/war-detail/war-detail.component.html b/static/src/app/statistic/war/war-header/war-header.component.html similarity index 100% rename from static/src/app/statistic/war/war-detail/war-detail.component.html rename to static/src/app/statistic/war/war-header/war-header.component.html diff --git a/static/src/app/statistic/war/war-detail/war-detail.component.ts b/static/src/app/statistic/war/war-header/war-header.component.ts similarity index 93% rename from static/src/app/statistic/war/war-detail/war-detail.component.ts rename to static/src/app/statistic/war/war-header/war-header.component.ts index 9344aa1..d4cd8db 100644 --- a/static/src/app/statistic/war/war-detail/war-detail.component.ts +++ b/static/src/app/statistic/war/war-header/war-header.component.ts @@ -10,10 +10,10 @@ 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'] + templateUrl: './war-header.component.html', + styleUrls: ['./war-header.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] }) -export class WarDetailComponent implements OnInit { +export class WarHeaderComponent implements OnInit { readonly fraction = Fraction; diff --git a/static/src/app/statistic/war-submit/war-submit.component.css b/static/src/app/statistic/war/war-submit/war-submit.component.css similarity index 100% rename from static/src/app/statistic/war-submit/war-submit.component.css rename to static/src/app/statistic/war/war-submit/war-submit.component.css diff --git a/static/src/app/statistic/war-submit/war-submit.component.html b/static/src/app/statistic/war/war-submit/war-submit.component.html similarity index 100% rename from static/src/app/statistic/war-submit/war-submit.component.html rename to static/src/app/statistic/war/war-submit/war-submit.component.html diff --git a/static/src/app/statistic/war-submit/war-submit.component.ts b/static/src/app/statistic/war/war-submit/war-submit.component.ts similarity index 82% rename from static/src/app/statistic/war-submit/war-submit.component.ts rename to static/src/app/statistic/war/war-submit/war-submit.component.ts index ed676b3..f1324fe 100644 --- a/static/src/app/statistic/war-submit/war-submit.component.ts +++ b/static/src/app/statistic/war/war-submit/war-submit.component.ts @@ -1,16 +1,16 @@ import {Component, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {NgForm} from '@angular/forms'; -import {WarService} from '../../services/logs/war.service'; -import {War} from '../../models/model-interfaces'; -import {CampaignService} from '../../services/logs/campaign.service'; +import {WarService} from '../../../services/logs/war.service'; +import {War} from '../../../models/model-interfaces'; +import {CampaignService} from '../../../services/logs/campaign.service'; @Component({ selector: 'war-submit', templateUrl: './war-submit.component.html', - styleUrls: ['./war-submit.component.css', '../../style/load-indicator.css', - '../../style/entry-form.css', '../../style/overview.css'] + styleUrls: ['./war-submit.component.css', '../../../style/load-indicator.css', + '../../../style/entry-form.css', '../../../style/overview.css'] }) export class WarSubmitComponent {