diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html index 0b1739d..dfe872a 100644 --- a/static/src/app/app.component.html +++ b/static/src/app/app.component.html @@ -35,16 +35,16 @@
diff --git a/static/src/app/app.config.ts b/static/src/app/app.config.ts index ca816f2..bf7f7ae 100644 --- a/static/src/app/app.config.ts +++ b/static/src/app/app.config.ts @@ -21,13 +21,14 @@ export class AppConfig { export const RouteConfig = { adminPanelPath: 'admin-panel', - decorationPath: 'decorations', + managePath: 'manage', + manageDecorationPath: 'manage/decorations', + manageRankPath: 'manage/ranks', + manageSquadPath: 'manage/squads', + manageUserPath: 'manage/users', loginPath: 'login', signUpPath: 'signup', - rankPath: 'ranks', - squadPath: 'squads', statsPath: 'stats', - userPath: 'users', overviewPath: 'overview', request: 'request', requestAwardPath: 'award', @@ -36,6 +37,8 @@ export const RouteConfig = { confirmPromotionPath: 'confirm-promotion', sqlDashboardPath: 'sql-dashboard', publicPath: 'public', + decorationPath: 'decorations', + rankPath: 'ranks', rankOverviewPath: 'public/ranks', decorationOverviewPath: 'public/decorations', }; diff --git a/static/src/app/app.routing.ts b/static/src/app/app.routing.ts index a1fa2c3..bc8468e 100644 --- a/static/src/app/app.routing.ts +++ b/static/src/app/app.routing.ts @@ -23,23 +23,8 @@ export const appRoutes: Routes = [ loadChildren: './request/request.module#RequestModule' }, { - path: RouteConfig.userPath, - loadChildren: './users/users.module#UsersModule', - canActivate: [LoginGuardHL] - }, - { - path: RouteConfig.squadPath, - loadChildren: './squads/squads.module#SquadsModule', - canActivate: [LoginGuardHL] - }, - { - path: RouteConfig.decorationPath, - loadChildren: './decorations/decoration.module#DecorationsModule', - canActivate: [LoginGuardHL] - }, - { - path: RouteConfig.rankPath, - loadChildren: './ranks/ranks.module#RanksModule', + path: RouteConfig.managePath, + loadChildren: './manage/manage.module#ManageModule', canActivate: [LoginGuardHL] }, { diff --git a/static/src/app/decorations/decoration.module.ts b/static/src/app/decorations/decoration.module.ts deleted file mode 100644 index d45452d..0000000 --- a/static/src/app/decorations/decoration.module.ts +++ /dev/null @@ -1,39 +0,0 @@ -import {decorationRoutesModule, decorationsRoutingComponents} from './decoration.routing'; -import {SharedModule} from '../shared.module'; -import {CommonModule} from '@angular/common'; -import {DecorationStore} from '../services/stores/decoration.store'; -import {DecorationService} from '../services/army-management/decoration.service'; -import {NgModule} from '@angular/core'; -import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; -import {HttpClient} from '@angular/common/http'; -import {TranslateHttpLoader} from '@ngx-translate/http-loader'; - -export function createTranslateLoader(http: HttpClient) { - return new TranslateHttpLoader(http, './assets/i18n/decorations/', '.json'); -} - -@NgModule({ - declarations: decorationsRoutingComponents, - - imports: [ - CommonModule, - SharedModule, - decorationRoutesModule, - - TranslateModule.forChild({ - loader: { - provide: TranslateLoader, - useFactory: (createTranslateLoader), - deps: [HttpClient] - }, - isolate: true - })], - - providers: [ - DecorationStore, - DecorationService - ] -}) -export class DecorationsModule { - static routes = decorationRoutesModule; -} diff --git a/static/src/app/decorations/decoration.routing.ts b/static/src/app/decorations/decoration.routing.ts deleted file mode 100644 index 2199822..0000000 --- a/static/src/app/decorations/decoration.routing.ts +++ /dev/null @@ -1,33 +0,0 @@ -import {RouterModule, Routes} from '@angular/router'; -import {DecorationListComponent} from './decoration-list/decoration-list.component'; -import {EditDecorationComponent} from './edit-decoration/edit-decoration.component'; -import {ModuleWithProviders} from '@angular/core'; -import {DecorationItemComponent} from './decoration-list/decoration-item.component'; -import {DecorationsComponent} from './decorations.component'; - -export const decorationsRoutes: Routes = [ - { - path: '', - component: DecorationsComponent, - }, - { - path: '', - component: DecorationListComponent, - outlet: 'left' - }, - { - path: 'new', - component: EditDecorationComponent, - outlet: 'right' - }, - { - path: 'edit/:id', - component: EditDecorationComponent, - outlet: 'right' - }]; - -export const decorationRoutesModule: ModuleWithProviders = RouterModule.forChild(decorationsRoutes); - -export const decorationsRoutingComponents = [DecorationsComponent, DecorationItemComponent, DecorationListComponent, - EditDecorationComponent]; - diff --git a/static/src/app/decorations/decorations.component.ts b/static/src/app/decorations/decorations.component.ts deleted file mode 100644 index f51f3ef..0000000 --- a/static/src/app/decorations/decorations.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component } from '@angular/core'; -import {TranslateService} from '@ngx-translate/core'; - -@Component({ - selector: 'cc-decorations-root', - templateUrl: './decorations.component.html', - styleUrls: ['./decorations.component.scss'] -}) -export class DecorationsComponent { - - constructor(private translate: TranslateService) { - translate.setDefaultLang('de'); - } -} diff --git a/static/src/app/decorations/decoration-list/decoration-item.component.css b/static/src/app/manage/decorations/decoration-list/decoration-item.component.css similarity index 100% rename from static/src/app/decorations/decoration-list/decoration-item.component.css rename to static/src/app/manage/decorations/decoration-list/decoration-item.component.css diff --git a/static/src/app/decorations/decoration-list/decoration-item.component.html b/static/src/app/manage/decorations/decoration-list/decoration-item.component.html similarity index 100% rename from static/src/app/decorations/decoration-list/decoration-item.component.html rename to static/src/app/manage/decorations/decoration-list/decoration-item.component.html diff --git a/static/src/app/decorations/decoration-list/decoration-item.component.ts b/static/src/app/manage/decorations/decoration-list/decoration-item.component.ts similarity index 84% rename from static/src/app/decorations/decoration-list/decoration-item.component.ts rename to static/src/app/manage/decorations/decoration-list/decoration-item.component.ts index edaf472..7254b1a 100644 --- a/static/src/app/decorations/decoration-list/decoration-item.component.ts +++ b/static/src/app/manage/decorations/decoration-list/decoration-item.component.ts @@ -1,11 +1,11 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {Decoration} from '../../models/model-interfaces'; -import {Fraction} from '../../utils/fraction.enum'; +import {Decoration} from '../../../models/model-interfaces'; +import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'decoration-item', templateUrl: './decoration-item.component.html', - styleUrls: ['./decoration-item.component.css', '../../style/list-entry.css'], + styleUrls: ['./decoration-item.component.css', '../../../style/list-entry.css'], changeDetection: ChangeDetectionStrategy.OnPush }) export class DecorationItemComponent implements OnInit { diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.css b/static/src/app/manage/decorations/decoration-list/decoration-list.component.css similarity index 100% rename from static/src/app/decorations/decoration-list/decoration-list.component.css rename to static/src/app/manage/decorations/decoration-list/decoration-list.component.css diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.html b/static/src/app/manage/decorations/decoration-list/decoration-list.component.html similarity index 100% rename from static/src/app/decorations/decoration-list/decoration-list.component.html rename to static/src/app/manage/decorations/decoration-list/decoration-list.component.html diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.ts b/static/src/app/manage/decorations/decoration-list/decoration-list.component.ts similarity index 87% rename from static/src/app/decorations/decoration-list/decoration-list.component.ts rename to static/src/app/manage/decorations/decoration-list/decoration-list.component.ts index fc2edff..9455526 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.ts +++ b/static/src/app/manage/decorations/decoration-list/decoration-list.component.ts @@ -3,17 +3,17 @@ import {Component, OnInit} from '@angular/core'; import {FormControl} from '@angular/forms'; import {ActivatedRoute, Router} from '@angular/router'; import {Observable} from 'rxjs/Observable'; -import {Decoration} from '../../models/model-interfaces'; -import {DecorationService} from '../../services/army-management/decoration.service'; -import {Fraction} from '../../utils/fraction.enum'; +import {Decoration} from '../../../models/model-interfaces'; +import {DecorationService} from '../../../services/army-management/decoration.service'; +import {Fraction} from '../../../utils/fraction.enum'; import {MatButtonToggleGroup} from '@angular/material'; -import {UIHelpers} from '../../utils/global.helpers'; +import {UIHelpers} from '../../../utils/global.helpers'; import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'cc-decoration-list', templateUrl: './decoration-list.component.html', - styleUrls: ['./decoration-list.component.css', '../../style/select-list.css'] + styleUrls: ['./decoration-list.component.css', '../../../style/select-list.css'] }) export class DecorationListComponent implements OnInit { diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.css b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.css similarity index 100% rename from static/src/app/decorations/edit-decoration/edit-decoration.component.css rename to static/src/app/manage/decorations/edit-decoration/edit-decoration.component.css diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.html b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.html similarity index 100% rename from static/src/app/decorations/edit-decoration/edit-decoration.component.html rename to static/src/app/manage/decorations/edit-decoration/edit-decoration.component.html diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.ts similarity index 86% rename from static/src/app/decorations/edit-decoration/edit-decoration.component.ts rename to static/src/app/manage/decorations/edit-decoration/edit-decoration.component.ts index c183653..351942c 100644 --- a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts +++ b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.ts @@ -1,17 +1,17 @@ import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {NgForm} from '@angular/forms'; -import {Decoration} from '../../models/model-interfaces'; -import {DecorationService} from '../../services/army-management/decoration.service'; +import {Decoration} from '../../../models/model-interfaces'; +import {DecorationService} from '../../../services/army-management/decoration.service'; import {Subscription} from 'rxjs/Subscription'; -import {Fraction} from '../../utils/fraction.enum'; -import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar.service'; -import {Message} from '../../i18n/de.messages'; +import {Fraction} from '../../../utils/fraction.enum'; +import {SnackBarService} from '../../../services/user-interface/snack-bar/snack-bar.service'; +import {Message} from '../../../i18n/de.messages'; import {TranslateService} from '@ngx-translate/core'; @Component({ templateUrl: './edit-decoration.component.html', - styleUrls: ['./edit-decoration.component.css', '../../style/entry-form.css', '../../style/overview.css'] + styleUrls: ['./edit-decoration.component.css', '../../../style/entry-form.css', '../../../style/overview.css'] }) export class EditDecorationComponent implements OnInit, OnDestroy { diff --git a/static/src/app/decorations/decorations.component.html b/static/src/app/manage/manage.component.html similarity index 100% rename from static/src/app/decorations/decorations.component.html rename to static/src/app/manage/manage.component.html diff --git a/static/src/app/decorations/decorations.component.scss b/static/src/app/manage/manage.component.scss similarity index 100% rename from static/src/app/decorations/decorations.component.scss rename to static/src/app/manage/manage.component.scss diff --git a/static/src/app/users/users.component.ts b/static/src/app/manage/manage.component.ts similarity index 59% rename from static/src/app/users/users.component.ts rename to static/src/app/manage/manage.component.ts index 01a16bf..90e2776 100644 --- a/static/src/app/users/users.component.ts +++ b/static/src/app/manage/manage.component.ts @@ -2,12 +2,11 @@ import {Component} from '@angular/core'; import {TranslateService} from '@ngx-translate/core'; @Component({ - selector: 'cc-users-root', - templateUrl: './users.component.html', - styleUrls: ['./users.component.scss'] + selector: 'cc-manage-root', + templateUrl: './manage.component.html', + styleUrls: ['./manage.component.scss'] }) -export class UsersComponent { - +export class ManageComponent { constructor(private translate: TranslateService) { this.translate.setDefaultLang('de'); } diff --git a/static/src/app/squads/squads.module.ts b/static/src/app/manage/manage.module.ts similarity index 53% rename from static/src/app/squads/squads.module.ts rename to static/src/app/manage/manage.module.ts index 07a747e..6106680 100644 --- a/static/src/app/squads/squads.module.ts +++ b/static/src/app/manage/manage.module.ts @@ -1,24 +1,31 @@ import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; import {SharedModule} from '../shared.module'; -import {squadRouterModule, squadsRoutingComponents} from './squads.routing'; -import {SquadStore} from '../services/stores/squad.store'; -import {SquadService} from '../services/army-management/squad.service'; +import {CommonModule} from '@angular/common'; +import {RankService} from '../services/army-management/rank.service'; +import {DecorationService} from '../services/army-management/decoration.service'; + +import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; import {HttpClient} from '@angular/common/http'; import {TranslateHttpLoader} from '@ngx-translate/http-loader'; -import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; +import {manageRouterModule, manageRoutingComponents} from './manage.routing'; +import {InfiniteScrollModule} from 'ngx-infinite-scroll'; +import {DecorationStore} from '../services/stores/decoration.store'; +import {RankStore} from '../services/stores/rank.store'; +import {SquadStore} from '../services/stores/squad.store'; +import {SquadService} from '../services/army-management/squad.service'; export function createTranslateLoader(http: HttpClient) { - return new TranslateHttpLoader(http, './assets/i18n/squads/', '.json'); + return new TranslateHttpLoader(http, './assets/i18n/manage/', '.json'); } @NgModule({ - declarations: squadsRoutingComponents, + declarations: manageRoutingComponents, imports: [ + manageRouterModule, CommonModule, SharedModule, - squadRouterModule, + InfiniteScrollModule, TranslateModule.forChild({ loader: { @@ -31,10 +38,14 @@ export function createTranslateLoader(http: HttpClient) { ], providers: [ + RankStore, + RankService, + DecorationStore, + DecorationService, SquadStore, SquadService ] }) -export class SquadsModule { - static routes = squadRouterModule; +export class ManageModule { + static routes = manageRouterModule; } diff --git a/static/src/app/manage/manage.routing.ts b/static/src/app/manage/manage.routing.ts new file mode 100644 index 0000000..fcc9888 --- /dev/null +++ b/static/src/app/manage/manage.routing.ts @@ -0,0 +1,131 @@ +import {RouterModule, Routes} from '@angular/router'; +import {ModuleWithProviders} from '@angular/core'; +import {ManageComponent} from './manage.component'; +import {UserListComponent} from './users/user-list/user-list.component'; +import {EditUserComponent} from './users/edit-user/edit-user.component'; +import {AwardUserComponent} from './users/award-user/award-user.component'; +import {RankListComponent} from './ranks/rank-list/rank-list.component'; +import {EditRankComponent} from './ranks/edit-rank/edit-rank.component'; +import {DecorationListComponent} from './decorations/decoration-list/decoration-list.component'; +import {EditDecorationComponent} from './decorations/edit-decoration/edit-decoration.component'; +import {SquadListComponent} from './squads/squad-list/squad-list.component'; +import {EditSquadComponent} from './squads/edit-squad/edit-squad.component'; +import {DecorationItemComponent} from './decorations/decoration-list/decoration-item.component'; +import {RankItemComponent} from './ranks/rank-list/rank-item.component'; +import {SquadItemComponent} from './squads/squad-list/squad-item.component'; +import {UserItemComponent} from './users/user-list/user-item.component'; + + +export const publicRoutes: Routes = [ + { + path: 'decorations', + children: [ + { + path: '', + component: ManageComponent, + outlet: 'left', + children: [{ + path: '', + component: DecorationListComponent + }] + }, + { + path: 'new', + component: EditDecorationComponent, + outlet: 'right' + }, + { + path: 'edit/:id', + component: EditDecorationComponent, + outlet: 'right' + } + ] + }, + { + path: 'ranks', + children: [ + { + path: '', + component: ManageComponent, + outlet: 'left', + children: [{ + path: '', + component: RankListComponent + }] + }, + { + path: 'new', + component: EditRankComponent, + outlet: 'right' + }, + { + path: 'edit/:id', + component: EditRankComponent, + outlet: 'right' + } + ] + }, + { + path: 'squads', + children: [ + { + path: '', + component: ManageComponent, + outlet: 'left', + children: [{ + path: '', + component: SquadListComponent, + }] + }, + { + path: 'new', + component: EditSquadComponent, + outlet: 'right' + }, + { + path: 'edit/:id', + component: EditSquadComponent, + outlet: 'right' + } + ] + }, + { + path: 'users', + children: [ + { + path: '', + component: ManageComponent, + outlet: 'left', + children: [{ + path: '', + component: UserListComponent + }] + }, + { + path: 'new', + component: EditUserComponent, + outlet: 'right' + }, + { + path: 'edit/:id', + component: EditUserComponent, + outlet: 'right' + }, + { + path: 'award/:id', + component: AwardUserComponent, + outlet: 'right' + } + ] + } +]; + +export const manageRouterModule: ModuleWithProviders = RouterModule.forChild(publicRoutes); + +export const manageRoutingComponents = [ + ManageComponent, + DecorationListComponent, DecorationItemComponent, EditDecorationComponent, + RankListComponent, RankItemComponent, EditRankComponent, + SquadListComponent, SquadItemComponent, EditSquadComponent, + UserListComponent, UserItemComponent, EditUserComponent, AwardUserComponent +]; diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.css b/static/src/app/manage/ranks/edit-rank/edit-rank.component.css similarity index 100% rename from static/src/app/ranks/edit-rank/edit-rank.component.css rename to static/src/app/manage/ranks/edit-rank/edit-rank.component.css diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.html b/static/src/app/manage/ranks/edit-rank/edit-rank.component.html similarity index 100% rename from static/src/app/ranks/edit-rank/edit-rank.component.html rename to static/src/app/manage/ranks/edit-rank/edit-rank.component.html diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.ts b/static/src/app/manage/ranks/edit-rank/edit-rank.component.ts similarity index 86% rename from static/src/app/ranks/edit-rank/edit-rank.component.ts rename to static/src/app/manage/ranks/edit-rank/edit-rank.component.ts index 3a566b1..028d834 100644 --- a/static/src/app/ranks/edit-rank/edit-rank.component.ts +++ b/static/src/app/manage/ranks/edit-rank/edit-rank.component.ts @@ -1,18 +1,18 @@ import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {NgForm} from '@angular/forms'; -import {Rank} from '../../models/model-interfaces'; -import {RankService} from '../../services/army-management/rank.service'; +import {Rank} from '../../../models/model-interfaces'; +import {RankService} from '../../../services/army-management/rank.service'; import {Subscription} from 'rxjs/Subscription'; -import {Fraction} from '../../utils/fraction.enum'; -import {Message} from '../../i18n/de.messages'; -import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar.service'; +import {Fraction} from '../../../utils/fraction.enum'; +import {Message} from '../../../i18n/de.messages'; +import {SnackBarService} from '../../../services/user-interface/snack-bar/snack-bar.service'; import {TranslateService} from '@ngx-translate/core'; @Component({ templateUrl: './edit-rank.component.html', - styleUrls: ['./edit-rank.component.css', '../../style/entry-form.css', '../../style/overview.css'] + styleUrls: ['./edit-rank.component.css', '../../../style/entry-form.css', '../../../style/overview.css'] }) export class EditRankComponent implements OnInit, OnDestroy { diff --git a/static/src/app/ranks/rank-list/rank-item.component.css b/static/src/app/manage/ranks/rank-list/rank-item.component.css similarity index 100% rename from static/src/app/ranks/rank-list/rank-item.component.css rename to static/src/app/manage/ranks/rank-list/rank-item.component.css diff --git a/static/src/app/ranks/rank-list/rank-item.component.html b/static/src/app/manage/ranks/rank-list/rank-item.component.html similarity index 100% rename from static/src/app/ranks/rank-list/rank-item.component.html rename to static/src/app/manage/ranks/rank-list/rank-item.component.html diff --git a/static/src/app/ranks/rank-list/rank-item.component.ts b/static/src/app/manage/ranks/rank-list/rank-item.component.ts similarity index 79% rename from static/src/app/ranks/rank-list/rank-item.component.ts rename to static/src/app/manage/ranks/rank-list/rank-item.component.ts index 80fb37a..44b3ea3 100644 --- a/static/src/app/ranks/rank-list/rank-item.component.ts +++ b/static/src/app/manage/ranks/rank-list/rank-item.component.ts @@ -1,11 +1,11 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {Rank} from '../../models/model-interfaces'; -import {Fraction} from '../../utils/fraction.enum'; +import {Rank} from '../../../models/model-interfaces'; +import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'pjm-rank-item', templateUrl: './rank-item.component.html', - styleUrls: ['./rank-item.component.css', '../../style/list-entry.css'], + styleUrls: ['./rank-item.component.css', '../../../style/list-entry.css'], changeDetection: ChangeDetectionStrategy.OnPush }) export class RankItemComponent implements OnInit { diff --git a/static/src/app/ranks/rank-list/rank-list.component.css b/static/src/app/manage/ranks/rank-list/rank-list.component.css similarity index 100% rename from static/src/app/ranks/rank-list/rank-list.component.css rename to static/src/app/manage/ranks/rank-list/rank-list.component.css diff --git a/static/src/app/ranks/rank-list/rank-list.component.html b/static/src/app/manage/ranks/rank-list/rank-list.component.html similarity index 100% rename from static/src/app/ranks/rank-list/rank-list.component.html rename to static/src/app/manage/ranks/rank-list/rank-list.component.html diff --git a/static/src/app/ranks/rank-list/rank-list.component.ts b/static/src/app/manage/ranks/rank-list/rank-list.component.ts similarity index 86% rename from static/src/app/ranks/rank-list/rank-list.component.ts rename to static/src/app/manage/ranks/rank-list/rank-list.component.ts index 52ef347..6577504 100644 --- a/static/src/app/ranks/rank-list/rank-list.component.ts +++ b/static/src/app/manage/ranks/rank-list/rank-list.component.ts @@ -3,17 +3,17 @@ import {Component, OnInit} from '@angular/core'; import {FormControl} from '@angular/forms'; import {ActivatedRoute, Router} from '@angular/router'; import {Observable} from 'rxjs/Observable'; -import {Rank} from '../../models/model-interfaces'; -import {RankService} from '../../services/army-management/rank.service'; -import {Fraction} from '../../utils/fraction.enum'; -import {UIHelpers} from '../../utils/global.helpers'; +import {Rank} from '../../../models/model-interfaces'; +import {RankService} from '../../../services/army-management/rank.service'; +import {Fraction} from '../../../utils/fraction.enum'; +import {UIHelpers} from '../../../utils/global.helpers'; import {MatButtonToggleGroup} from '@angular/material'; import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'cc-rank-list', templateUrl: './rank-list.component.html', - styleUrls: ['./rank-list.component.css', '../../style/select-list.css'] + styleUrls: ['./rank-list.component.css', '../../../style/select-list.css'] }) export class RankListComponent implements OnInit { diff --git a/static/src/app/squads/edit-squad/edit-squad.component.css b/static/src/app/manage/squads/edit-squad/edit-squad.component.css similarity index 100% rename from static/src/app/squads/edit-squad/edit-squad.component.css rename to static/src/app/manage/squads/edit-squad/edit-squad.component.css diff --git a/static/src/app/squads/edit-squad/edit-squad.component.html b/static/src/app/manage/squads/edit-squad/edit-squad.component.html similarity index 100% rename from static/src/app/squads/edit-squad/edit-squad.component.html rename to static/src/app/manage/squads/edit-squad/edit-squad.component.html diff --git a/static/src/app/squads/edit-squad/edit-squad.component.ts b/static/src/app/manage/squads/edit-squad/edit-squad.component.ts similarity index 86% rename from static/src/app/squads/edit-squad/edit-squad.component.ts rename to static/src/app/manage/squads/edit-squad/edit-squad.component.ts index 1a0a22a..4ef158e 100644 --- a/static/src/app/squads/edit-squad/edit-squad.component.ts +++ b/static/src/app/manage/squads/edit-squad/edit-squad.component.ts @@ -1,18 +1,18 @@ import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {NgForm} from '@angular/forms'; -import {Squad} from '../../models/model-interfaces'; -import {SquadService} from '../../services/army-management/squad.service'; +import {Squad} from '../../../models/model-interfaces'; +import {SquadService} from '../../../services/army-management/squad.service'; import {Subscription} from 'rxjs/Subscription'; -import {Fraction} from '../../utils/fraction.enum'; -import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar.service'; -import {Message} from '../../i18n/de.messages'; +import {Fraction} from '../../../utils/fraction.enum'; +import {SnackBarService} from '../../../services/user-interface/snack-bar/snack-bar.service'; +import {Message} from '../../../i18n/de.messages'; import {TranslateService} from '@ngx-translate/core'; @Component({ templateUrl: './edit-squad.component.html', - styleUrls: ['./edit-squad.component.css', '../../style/entry-form.css', '../../style/overview.css'] + styleUrls: ['./edit-squad.component.css', '../../../style/entry-form.css', '../../../style/overview.css'] }) export class EditSquadComponent implements OnInit, OnDestroy { diff --git a/static/src/app/squads/squad-list/squad-item.component.css b/static/src/app/manage/squads/squad-list/squad-item.component.css similarity index 100% rename from static/src/app/squads/squad-list/squad-item.component.css rename to static/src/app/manage/squads/squad-list/squad-item.component.css diff --git a/static/src/app/squads/squad-list/squad-item.component.html b/static/src/app/manage/squads/squad-list/squad-item.component.html similarity index 100% rename from static/src/app/squads/squad-list/squad-item.component.html rename to static/src/app/manage/squads/squad-list/squad-item.component.html diff --git a/static/src/app/squads/squad-list/squad-item.component.ts b/static/src/app/manage/squads/squad-list/squad-item.component.ts similarity index 79% rename from static/src/app/squads/squad-list/squad-item.component.ts rename to static/src/app/manage/squads/squad-list/squad-item.component.ts index 02851a6..b877f98 100644 --- a/static/src/app/squads/squad-list/squad-item.component.ts +++ b/static/src/app/manage/squads/squad-list/squad-item.component.ts @@ -1,11 +1,11 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {Squad} from '../../models/model-interfaces'; -import {Fraction} from '../../utils/fraction.enum'; +import {Squad} from '../../../models/model-interfaces'; +import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'pjm-squad-item', templateUrl: './squad-item.component.html', - styleUrls: ['./squad-item.component.css', '../../style/list-entry.css'], + styleUrls: ['./squad-item.component.css', '../../../style/list-entry.css'], changeDetection: ChangeDetectionStrategy.OnPush }) export class SquadItemComponent implements OnInit { diff --git a/static/src/app/squads/squad-list/squad-list.component.css b/static/src/app/manage/squads/squad-list/squad-list.component.css similarity index 100% rename from static/src/app/squads/squad-list/squad-list.component.css rename to static/src/app/manage/squads/squad-list/squad-list.component.css diff --git a/static/src/app/squads/squad-list/squad-list.component.html b/static/src/app/manage/squads/squad-list/squad-list.component.html similarity index 100% rename from static/src/app/squads/squad-list/squad-list.component.html rename to static/src/app/manage/squads/squad-list/squad-list.component.html diff --git a/static/src/app/squads/squad-list/squad-list.component.ts b/static/src/app/manage/squads/squad-list/squad-list.component.ts similarity index 86% rename from static/src/app/squads/squad-list/squad-list.component.ts rename to static/src/app/manage/squads/squad-list/squad-list.component.ts index a6e0edb..c4b876f 100644 --- a/static/src/app/squads/squad-list/squad-list.component.ts +++ b/static/src/app/manage/squads/squad-list/squad-list.component.ts @@ -3,17 +3,17 @@ import {Component, OnInit} from '@angular/core'; import {FormControl} from '@angular/forms'; import {ActivatedRoute, Router} from '@angular/router'; import {Observable} from 'rxjs/Observable'; -import {Squad} from '../../models/model-interfaces'; -import {SquadService} from '../../services/army-management/squad.service'; -import {Fraction} from '../../utils/fraction.enum'; -import {UIHelpers} from '../../utils/global.helpers'; +import {Squad} from '../../../models/model-interfaces'; +import {SquadService} from '../../../services/army-management/squad.service'; +import {Fraction} from '../../../utils/fraction.enum'; +import {UIHelpers} from '../../../utils/global.helpers'; import {MatButtonToggleGroup} from '@angular/material'; import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'cc-squad-list', templateUrl: './squad-list.component.html', - styleUrls: ['./squad-list.component.css', '../../style/select-list.css'] + styleUrls: ['./squad-list.component.css', '../../../style/select-list.css'] }) export class SquadListComponent implements OnInit { diff --git a/static/src/app/users/award-user/award-user.component.css b/static/src/app/manage/users/award-user/award-user.component.css similarity index 100% rename from static/src/app/users/award-user/award-user.component.css rename to static/src/app/manage/users/award-user/award-user.component.css diff --git a/static/src/app/users/award-user/award-user.component.html b/static/src/app/manage/users/award-user/award-user.component.html similarity index 100% rename from static/src/app/users/award-user/award-user.component.html rename to static/src/app/manage/users/award-user/award-user.component.html diff --git a/static/src/app/users/award-user/award-user.component.ts b/static/src/app/manage/users/award-user/award-user.component.ts similarity index 86% rename from static/src/app/users/award-user/award-user.component.ts rename to static/src/app/manage/users/award-user/award-user.component.ts index 1a50c17..1cb71c9 100644 --- a/static/src/app/users/award-user/award-user.component.ts +++ b/static/src/app/manage/users/award-user/award-user.component.ts @@ -1,18 +1,18 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; -import {Award, Decoration} from '../../models/model-interfaces'; +import {Award, Decoration} from '../../../models/model-interfaces'; import {NgForm} from '@angular/forms'; -import {AwardingService} from '../../services/army-management/awarding.service'; -import {DecorationService} from '../../services/army-management/decoration.service'; -import {Fraction} from '../../utils/fraction.enum'; -import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar.service'; -import {Message} from '../../i18n/de.messages'; +import {AwardingService} from '../../../services/army-management/awarding.service'; +import {DecorationService} from '../../../services/army-management/decoration.service'; +import {Fraction} from '../../../utils/fraction.enum'; +import {SnackBarService} from '../../../services/user-interface/snack-bar/snack-bar.service'; +import {Message} from '../../../i18n/de.messages'; import {TranslateService} from '@ngx-translate/core'; @Component({ templateUrl: './award-user.component.html', - styleUrls: ['./award-user.component.css', '../../style/overview.css', '../../style/hide-scrollbar.css'], + styleUrls: ['./award-user.component.css', '../../../style/overview.css', '../../../style/hide-scrollbar.css'], }) export class AwardUserComponent implements OnInit { diff --git a/static/src/app/users/edit-user/edit-user.component.css b/static/src/app/manage/users/edit-user/edit-user.component.css similarity index 100% rename from static/src/app/users/edit-user/edit-user.component.css rename to static/src/app/manage/users/edit-user/edit-user.component.css diff --git a/static/src/app/users/edit-user/edit-user.component.html b/static/src/app/manage/users/edit-user/edit-user.component.html similarity index 100% rename from static/src/app/users/edit-user/edit-user.component.html rename to static/src/app/manage/users/edit-user/edit-user.component.html diff --git a/static/src/app/users/edit-user/edit-user.component.ts b/static/src/app/manage/users/edit-user/edit-user.component.ts similarity index 85% rename from static/src/app/users/edit-user/edit-user.component.ts rename to static/src/app/manage/users/edit-user/edit-user.component.ts index 702e375..4bbd071 100644 --- a/static/src/app/users/edit-user/edit-user.component.ts +++ b/static/src/app/manage/users/edit-user/edit-user.component.ts @@ -1,19 +1,19 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; -import {Rank, Squad, User} from '../../models/model-interfaces'; -import {UserService} from '../../services/army-management/user.service'; -import {SquadService} from '../../services/army-management/squad.service'; -import {RankService} from '../../services/army-management/rank.service'; +import {Rank, Squad, User} from '../../../models/model-interfaces'; +import {UserService} from '../../../services/army-management/user.service'; +import {SquadService} from '../../../services/army-management/squad.service'; +import {RankService} from '../../../services/army-management/rank.service'; import {Subscription} from 'rxjs/Subscription'; import {NgForm} from '@angular/forms'; -import {Fraction} from '../../utils/fraction.enum'; -import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar.service'; -import {Message} from '../../i18n/de.messages'; +import {Fraction} from '../../../utils/fraction.enum'; +import {SnackBarService} from '../../../services/user-interface/snack-bar/snack-bar.service'; +import {Message} from '../../../i18n/de.messages'; @Component({ templateUrl: './edit-user.component.html', - styleUrls: ['./edit-user.component.css', '../../style/entry-form.css', '../../style/overview.css'], + styleUrls: ['./edit-user.component.css', '../../../style/entry-form.css', '../../../style/overview.css'], }) export class EditUserComponent implements OnInit { diff --git a/static/src/app/users/user-list/user-item.component.css b/static/src/app/manage/users/user-list/user-item.component.css similarity index 100% rename from static/src/app/users/user-list/user-item.component.css rename to static/src/app/manage/users/user-list/user-item.component.css diff --git a/static/src/app/users/user-list/user-item.component.html b/static/src/app/manage/users/user-list/user-item.component.html similarity index 100% rename from static/src/app/users/user-list/user-item.component.html rename to static/src/app/manage/users/user-list/user-item.component.html diff --git a/static/src/app/users/user-list/user-item.component.ts b/static/src/app/manage/users/user-list/user-item.component.ts similarity index 78% rename from static/src/app/users/user-list/user-item.component.ts rename to static/src/app/manage/users/user-list/user-item.component.ts index 9da5bb6..9887618 100644 --- a/static/src/app/users/user-list/user-item.component.ts +++ b/static/src/app/manage/users/user-list/user-item.component.ts @@ -1,11 +1,11 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core'; -import {User} from '../../models/model-interfaces'; -import {Fraction} from '../../utils/fraction.enum'; +import {User} from '../../../models/model-interfaces'; +import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'pjm-user-item', templateUrl: './user-item.component.html', - styleUrls: ['./user-item.component.css', '../../style/list-entry.css'], + styleUrls: ['./user-item.component.css', '../../../style/list-entry.css'], changeDetection: ChangeDetectionStrategy.OnPush }) export class UserItemComponent { diff --git a/static/src/app/users/user-list/user-list.component.css b/static/src/app/manage/users/user-list/user-list.component.css similarity index 100% rename from static/src/app/users/user-list/user-list.component.css rename to static/src/app/manage/users/user-list/user-list.component.css diff --git a/static/src/app/users/user-list/user-list.component.html b/static/src/app/manage/users/user-list/user-list.component.html similarity index 100% rename from static/src/app/users/user-list/user-list.component.html rename to static/src/app/manage/users/user-list/user-list.component.html diff --git a/static/src/app/users/user-list/user-list.component.ts b/static/src/app/manage/users/user-list/user-list.component.ts similarity index 84% rename from static/src/app/users/user-list/user-list.component.ts rename to static/src/app/manage/users/user-list/user-list.component.ts index 9d32075..b1e614b 100644 --- a/static/src/app/users/user-list/user-list.component.ts +++ b/static/src/app/manage/users/user-list/user-list.component.ts @@ -3,18 +3,18 @@ import {Component, OnInit} from '@angular/core'; import {FormControl} from '@angular/forms'; import {ActivatedRoute, Router} from '@angular/router'; import {Observable} from 'rxjs/Observable'; -import {UserService} from '../../services/army-management/user.service'; -import {User} from '../../models/model-interfaces'; -import {ADD, LOAD} from '../../services/stores/user.store'; -import {Fraction} from '../../utils/fraction.enum'; +import {UserService} from '../../../services/army-management/user.service'; +import {User} from '../../../models/model-interfaces'; +import {ADD, LOAD} from '../../../services/stores/user.store'; +import {Fraction} from '../../../utils/fraction.enum'; import {MatButtonToggleGroup} from '@angular/material'; -import {UIHelpers} from '../../utils/global.helpers'; +import {UIHelpers} from '../../../utils/global.helpers'; import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'cc-user-list', templateUrl: './user-list.component.html', - styleUrls: ['./user-list.component.css', '../../style/select-list.css'] + styleUrls: ['./user-list.component.css', '../../../style/select-list.css'] }) export class UserListComponent implements OnInit { @@ -69,7 +69,7 @@ export class UserListComponent implements OnInit { } deleteUser(user: User) { - this.translate.get('squad.list.delete.confirm', {name: user.username}).subscribe((confirmQuestion) => { + this.translate.get('users.list.delete.confirm', {name: user.username}).subscribe((confirmQuestion) => { if (confirm(confirmQuestion)) { this.userService.deleteUser(user) .subscribe((res) => { diff --git a/static/src/app/ranks/ranks.component.html b/static/src/app/ranks/ranks.component.html deleted file mode 100644 index 0680b43..0000000 --- a/static/src/app/ranks/ranks.component.html +++ /dev/null @@ -1 +0,0 @@ -