Merge branch 'task/lazy-loading' of hardi/opt-cc into master
hardi
HardiReady
commit
a77c24de2a
|
|
@ -4,12 +4,12 @@
|
|||
cd $(dirname $0)
|
||||
|
||||
# array of files to minify
|
||||
FILES=(inline main polyfills scripts styles vendor)
|
||||
FILES=(inline.bundle main.bundle polyfills.bundle scripts.bundle styles.bundle vendor.bundle 0.chunk 1.chunk 2.chunk 3.chunk 4.chunk 5.chunk 6.chunk 7.chunk)
|
||||
OPTIONS="-c toplevel,dead_code=true,unused=true"
|
||||
|
||||
for i in "${FILES[@]}"
|
||||
do
|
||||
echo "minify ${i} ..."
|
||||
$(npm bin)/uglifyjs public/${i}.bundle.js ${OPTIONS} -o public/${i}.bundle.js
|
||||
rm -f public/${i}.bundle.js.map
|
||||
$(npm bin)/uglifyjs public/${i}.js ${OPTIONS} -o public/${i}.js
|
||||
rm -f public/${i}.js.map
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "opt-cc",
|
||||
"version": "1.3.2",
|
||||
"version": "1.4.0",
|
||||
"license": "MIT",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import {browser, element, by} from 'protractor';
|
||||
import {browser, by, element} from 'protractor';
|
||||
|
||||
|
||||
describe('Main Page Access', function () {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
"devDependencies": {
|
||||
"@types/jasmine": "2.5.38",
|
||||
"@types/node": "~6.0.60",
|
||||
"@types/systemjs": "^0.20.4",
|
||||
"codelyzer": "~2.0.0-beta.1",
|
||||
"jasmine-core": "^2.5.2",
|
||||
"jasmine-spec-reporter": "^3.2.0",
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@ exports.config = {
|
|||
jasmineNodeOpts: {
|
||||
showColors: true,
|
||||
defaultTimeoutInterval: 30000,
|
||||
print: function() {}
|
||||
print: function () {
|
||||
}
|
||||
},
|
||||
useAllAngular2AppRoots: true,
|
||||
beforeLaunch: function () {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ exports.config= {
|
|||
jasmineNodeOpts: {
|
||||
showColors: true,
|
||||
defaultTimeoutInterval: 30000,
|
||||
print: function() {}
|
||||
print: function () {
|
||||
}
|
||||
},
|
||||
beforeLaunch: function () {
|
||||
require('ts-node').register({
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
import {NgModule} from "@angular/core";
|
||||
import {AdminComponent} from "./admin.component";
|
||||
import {SharedModule} from "../shared.module";
|
||||
import {AppUserStore} from "../services/stores/app-user.store";
|
||||
import {AppUserService} from "../services/app-user-service/app-user.service";
|
||||
import {CommonModule} from "@angular/common";
|
||||
import {RouterModule} from "@angular/router";
|
||||
|
||||
@NgModule({
|
||||
declarations: [AdminComponent],
|
||||
imports: [CommonModule, SharedModule, RouterModule.forChild([{path: '', component: AdminComponent}])],
|
||||
providers: [AppUserStore, AppUserService]
|
||||
})
|
||||
export class AdminModule {
|
||||
}
|
||||
|
|
@ -47,11 +47,19 @@ unprocessed-child:hover {
|
|||
|
||||
/* Safari 4.0 - 8.0 */
|
||||
@-webkit-keyframes color-blink {
|
||||
from {background-color: #222222;}
|
||||
to {background-color: orange;}
|
||||
from {
|
||||
background-color: #222222;
|
||||
}
|
||||
to {
|
||||
background-color: orange;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes color-blink {
|
||||
from {background-color: #222222;}
|
||||
to {background-color: orange;}
|
||||
from {
|
||||
background-color: #222222;
|
||||
}
|
||||
to {
|
||||
background-color: orange;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,25 +45,29 @@
|
|||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a routerLink="{{config.requestPromotionPath}}">Beförderung</a>
|
||||
<a routerLink="{{config.request}}/{{config.requestPromotionPath}}">Beförderung</a>
|
||||
</li>
|
||||
<li>
|
||||
<a routerLink="{{config.requestAwardPath}}">Orden/ Auszeichnung</a>
|
||||
<a routerLink="{{config.request}}/{{config.requestAwardPath}}">Orden/ Auszeichnung</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li *ngIf="loginService.hasPermission(2) && loginService.hasSquad()" class="dropdown">
|
||||
<a href="#" [ngClass]="{'unprocessed': promotionService.hasUnprocessedPromotion || awardingService.hasUnprocessedAwards}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
|
||||
<a href="#"
|
||||
[ngClass]="{'unprocessed': promotionService.hasUnprocessedPromotion || awardingService.hasUnprocessedAwards}"
|
||||
class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
Anträge
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a [ngClass]="{'unprocessed-child': promotionService.hasUnprocessedPromotion}" routerLink="{{config.confirmPromotionPath}}">Beförderung</a>
|
||||
<a [ngClass]="{'unprocessed-child': promotionService.hasUnprocessedPromotion}"
|
||||
routerLink="{{config.request}}/{{config.confirmPromotionPath}}">Beförderung</a>
|
||||
</li>
|
||||
<li>
|
||||
<a [ngClass]="{'unprocessed-child': awardingService.hasUnprocessedAwards}" routerLink="{{config.confirmAwardPath}}">Orden/ Auszeichnung</a>
|
||||
<a [ngClass]="{'unprocessed-child': awardingService.hasUnprocessedAwards}"
|
||||
routerLink="{{config.request}}/{{config.confirmAwardPath}}">Orden/ Auszeichnung</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
@ -73,8 +77,8 @@
|
|||
<li *ngIf="loginService.hasPermission(4)" routerLinkActive="active">
|
||||
<a routerLink='{{config.adminPanelPath}}' class="link">Admin Panel</a>
|
||||
</li>
|
||||
<li *ngIf="authEnabled" class="link" style="cursor: pointer">
|
||||
<a *ngIf="loginService.isLoggedIn()" (click)="logout()">Abmelden</a>
|
||||
<li *ngIf="loginService.isLoggedIn()" class="link" style="cursor: pointer">
|
||||
<a (click)="logout()">Abmelden</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import {Component, Inject, Optional} from '@angular/core';
|
||||
import {Component} from '@angular/core';
|
||||
import {Router} from '@angular/router';
|
||||
import {LoginService} from './services/login-service/login-service';
|
||||
import {AUTH_ENABLED} from './app.tokens';
|
||||
import {PromotionService} from "./services/promotion-service/promotion.service";
|
||||
import {AwardingService} from "./services/awarding-service/awarding.service";
|
||||
import {RouteConfig} from "./app.config";
|
||||
|
|
@ -15,8 +14,7 @@ export class AppComponent {
|
|||
|
||||
config = RouteConfig;
|
||||
|
||||
constructor(@Optional() @Inject(AUTH_ENABLED) public authEnabled,
|
||||
private loginService: LoginService,
|
||||
constructor(private loginService: LoginService,
|
||||
private promotionService: PromotionService,
|
||||
private awardingService: AwardingService,
|
||||
private router: Router) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
export class AppConfig {
|
||||
|
||||
public readonly apiUrl = '/api';
|
||||
|
|
@ -28,8 +27,9 @@ export const RouteConfig = {
|
|||
statsPath: 'stats',
|
||||
userPath: 'users',
|
||||
overviewPath: 'overview',
|
||||
requestAwardPath: 'request-award',
|
||||
requestPromotionPath: 'request-promotion',
|
||||
request: 'request',
|
||||
requestAwardPath: 'award',
|
||||
requestPromotionPath: 'promotion',
|
||||
confirmAwardPath: 'confirm-award',
|
||||
confirmPromotionPath: 'confirm-promotion'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,56 +1,38 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {Title, BrowserModule} from "@angular/platform-browser";
|
||||
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
|
||||
import {BrowserModule} from "@angular/platform-browser";
|
||||
import {HttpModule} from '@angular/http';
|
||||
import {AppComponent} from './app.component';
|
||||
import {LoginService} from "./services/login-service/login-service";
|
||||
import {UserStore} from "./services/stores/user.store";
|
||||
import {ShowErrorComponent} from './common/show-error/show-error.component';
|
||||
import {APPLICATION_VALIDATORS} from './models/app-validators';
|
||||
import {appRouting, routingComponents, routingProviders} from './app.routing';
|
||||
import {AUTH_ENABLED} from './app.tokens';
|
||||
import {UserService} from "./services/user-service/user.service";
|
||||
import {UserItemComponent} from "./users/user-list/user-item.component";
|
||||
import {SquadService} from "./services/squad-service/squad.service";
|
||||
import {SquadStore} from "./services/stores/squad.store";
|
||||
import {DecorationStore} from "./services/stores/decoration.store";
|
||||
import {DecorationService} from "./services/decoration-service/decoration.service";
|
||||
import {SquadItemComponent} from "./squads/squad-list/squad-item.component";
|
||||
import {DecorationComponent} from "./decorations/decoration.component";
|
||||
import {RankItemComponent} from "./ranks/rank-list/rank-item.component";
|
||||
import {RankStore} from "./services/stores/rank.store";
|
||||
import {RankService} from "./services/rank-service/rank.service";
|
||||
import {DecorationItemComponent} from "./decorations/decoration-list/decoration-item.component";
|
||||
import {AppConfig} from "./app.config";
|
||||
import {LoginGuardAdmin, LoginGuardHL, LoginGuardSQL} from "./login/login.guard";
|
||||
import {AwardingService} from "./services/awarding-service/awarding.service";
|
||||
import {HttpClient} from "./services/http-client";
|
||||
import {ArmyService} from "./services/army-service/army.service";
|
||||
import {ClipboardModule} from 'ngx-clipboard';
|
||||
import {AppUserService} from "./services/app-user-service/app-user.service";
|
||||
import {AppUserStore} from "./services/stores/app-user.store";
|
||||
import {PromotionService} from "./services/promotion-service/promotion.service";
|
||||
import {FilterRankPipe} from "./filter/filter.pipe";
|
||||
import {WarService} from "./services/war-service/war.service";
|
||||
import {DataTableModule} from "angular2-datatable";
|
||||
import {NgxChartsModule} from "@swimlane/ngx-charts";
|
||||
import {SharedModule} from "./shared.module";
|
||||
import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
|
||||
import {AccordionModule, CarouselModule} from "ngx-bootstrap";
|
||||
import {UserService} from "./services/user-service/user.service";
|
||||
import {UserStore} from "./services/stores/user.store";
|
||||
|
||||
@NgModule({
|
||||
imports: [BrowserModule, FormsModule, ReactiveFormsModule, appRouting, HttpModule, ClipboardModule, DataTableModule,
|
||||
BrowserAnimationsModule, NgxChartsModule, AccordionModule.forRoot(), CarouselModule.forRoot()],
|
||||
imports: [SharedModule, BrowserModule, BrowserAnimationsModule, appRouting, HttpModule, ClipboardModule],
|
||||
providers: [
|
||||
HttpClient,
|
||||
LoginService,
|
||||
LoginGuardSQL,
|
||||
LoginGuardHL,
|
||||
LoginGuardAdmin,
|
||||
ArmyService,
|
||||
AppUserService,
|
||||
AppUserStore,
|
||||
UserService,
|
||||
UserStore,
|
||||
ArmyService,
|
||||
SquadService,
|
||||
SquadStore,
|
||||
DecorationService,
|
||||
|
|
@ -59,23 +41,12 @@ import {AccordionModule, CarouselModule} from "ngx-bootstrap";
|
|||
RankStore,
|
||||
AwardingService,
|
||||
PromotionService,
|
||||
WarService,
|
||||
AppConfig,
|
||||
Title,
|
||||
routingProviders,
|
||||
{provide: AUTH_ENABLED, useValue: true}
|
||||
],
|
||||
declarations: [
|
||||
AppComponent,
|
||||
routingComponents,
|
||||
DecorationComponent,
|
||||
DecorationItemComponent,
|
||||
RankItemComponent,
|
||||
FilterRankPipe,
|
||||
UserItemComponent,
|
||||
SquadItemComponent,
|
||||
ShowErrorComponent,
|
||||
APPLICATION_VALIDATORS],
|
||||
routingComponents],
|
||||
bootstrap: [AppComponent]
|
||||
})
|
||||
export class AppModule {
|
||||
|
|
|
|||
|
|
@ -2,51 +2,74 @@ 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 {usersRoutes, usersRoutingComponents} from "./users/users.routing";
|
||||
import {squadsRoutes, squadsRoutingComponents} from "./squads/squads.routing";
|
||||
import {decorationsRoutes, decorationsRoutingComponents} from "./decorations/decoration.routing";
|
||||
import {ranksRoutes, ranksRoutingComponents} from "./ranks/ranks.routing";
|
||||
import {armyRoutes, armyRoutingComponents} from "./army/army.routing";
|
||||
import {SignupComponent} from "./login/signup.component";
|
||||
import {AdminComponent} from "./admin/admin.component";
|
||||
import {RequestAwardComponent} from "./request/award/req-award.component";
|
||||
import {RequestPromotionComponent} from "./request/promotion/req-promotion.component";
|
||||
import {ConfirmPromotionComponent} from "./request/confirm-promotion/confirm-promotion.component";
|
||||
import {ConfirmAwardComponent} from "./request/confirm-award/confirm-award.component";
|
||||
import {RouteConfig} from "./app.config";
|
||||
import {statsRoutes, statsRoutingComponents} from "./statistic/stats.routing";
|
||||
|
||||
export const appRoutes: Routes = [
|
||||
{
|
||||
path: RouteConfig.overviewPath,
|
||||
children: armyRoutes
|
||||
},
|
||||
{
|
||||
path: '', redirectTo: RouteConfig.overviewPath,
|
||||
pathMatch: 'full'
|
||||
},
|
||||
{
|
||||
path: RouteConfig.statsPath,
|
||||
loadChildren: './statistic/stats.module#StatsModule'
|
||||
},
|
||||
{
|
||||
path: RouteConfig.loginPath,
|
||||
component: LoginComponent
|
||||
},
|
||||
{
|
||||
path: RouteConfig.signUpPath,
|
||||
component: SignupComponent
|
||||
},
|
||||
{
|
||||
path: RouteConfig.request,
|
||||
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',
|
||||
canActivate: [LoginGuardHL]
|
||||
},
|
||||
{
|
||||
path: RouteConfig.adminPanelPath,
|
||||
loadChildren: './admin/admin.module#AdminModule',
|
||||
canActivate: [LoginGuardAdmin]
|
||||
},
|
||||
|
||||
{path: RouteConfig.overviewPath, children: armyRoutes},
|
||||
{path: '', redirectTo: RouteConfig.overviewPath, pathMatch: 'full'},
|
||||
|
||||
{path: RouteConfig.statsPath, children: statsRoutes},
|
||||
|
||||
{path: RouteConfig.loginPath, component: LoginComponent},
|
||||
{path: RouteConfig.signUpPath, component: SignupComponent},
|
||||
|
||||
{path: RouteConfig.requestAwardPath, component: RequestAwardComponent, canActivate: [LoginGuardSQL]},
|
||||
{path: RouteConfig.requestPromotionPath, component: RequestPromotionComponent, canActivate: [LoginGuardSQL]},
|
||||
{path: RouteConfig.confirmAwardPath, component: ConfirmAwardComponent, canActivate: [LoginGuardHL]},
|
||||
{path: RouteConfig.confirmPromotionPath, component: ConfirmPromotionComponent, canActivate: [LoginGuardHL]},
|
||||
|
||||
{path: RouteConfig.userPath, children: usersRoutes, canActivate: [LoginGuardHL]},
|
||||
{path: RouteConfig.squadPath, children: squadsRoutes, canActivate: [LoginGuardHL]},
|
||||
{path: RouteConfig.decorationPath, children: decorationsRoutes, canActivate: [LoginGuardHL]},
|
||||
{path: RouteConfig.rankPath, children: ranksRoutes, canActivate: [LoginGuardHL]},
|
||||
|
||||
{path: RouteConfig.adminPanelPath, component: AdminComponent, canActivate: [LoginGuardAdmin]},
|
||||
|
||||
/** Redirect Konfigurationen **/
|
||||
{path: '404', component: NotFoundComponent},
|
||||
{path: '**', redirectTo: '/404'}, // immer als letztes konfigurieren - erste Route die matched wird angesteuert
|
||||
/** Redirect Configuration **/
|
||||
{
|
||||
path: '404',
|
||||
component: NotFoundComponent
|
||||
},
|
||||
{
|
||||
path: '**',
|
||||
redirectTo: '/404'
|
||||
} // always configure this last - first matching route gets processed
|
||||
];
|
||||
|
||||
export const appRouting = RouterModule.forRoot(appRoutes);
|
||||
|
||||
export const routingComponents = [LoginComponent, SignupComponent, RequestAwardComponent, RequestPromotionComponent, ConfirmAwardComponent,
|
||||
ConfirmPromotionComponent, AdminComponent, ...armyRoutingComponents, NotFoundComponent, ...usersRoutingComponents,
|
||||
...squadsRoutingComponents, ...decorationsRoutingComponents, ...ranksRoutingComponents, ...statsRoutingComponents];
|
||||
export const routingComponents = [LoginComponent, SignupComponent, ...armyRoutingComponents, NotFoundComponent];
|
||||
|
||||
export const routingProviders = [LoginGuardSQL, LoginGuardHL, LoginGuardMT, LoginGuardAdmin];
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
import {OpaqueToken} from '@angular/core';
|
||||
|
||||
export const AUTH_ENABLED = new OpaqueToken('AUTH_ENABLED');
|
||||
|
||||
export const SOCKET_IO = new OpaqueToken('socket-io');
|
||||
|
||||
|
|
@ -3,7 +3,7 @@ import {User} from "../models/model-interfaces";
|
|||
import {ActivatedRoute, Router} from "@angular/router";
|
||||
import {UserService} from "../services/user-service/user.service";
|
||||
import {Subscription} from "rxjs/Subscription";
|
||||
import {AppConfig, RouteConfig} from "../app.config";
|
||||
import {RouteConfig} from "../app.config";
|
||||
|
||||
|
||||
@Component({
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@
|
|||
</div>
|
||||
<div class=" div-table-row" style="padding-left: 8px">
|
||||
<div *ngFor="let member of squad.members">
|
||||
<div class="member-link text-blufor" (click)="select(member._id)">{{member.rank}} {{member.username}}</div>
|
||||
<div class="member-link text-blufor" (click)="select(member._id)">{{member.rank}} {{member.username}}
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<br>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import {Component, Input, Optional} from '@angular/core';
|
||||
import {NgForm, FormGroup} from '@angular/forms';
|
||||
import {Component, Input} from '@angular/core';
|
||||
import {FormGroup, NgForm} from '@angular/forms';
|
||||
|
||||
@Component({
|
||||
selector: 'show-error',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
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/decoration-service/decoration.service";
|
||||
import {NgModule} from "@angular/core";
|
||||
|
||||
@NgModule({
|
||||
declarations: decorationsRoutingComponents,
|
||||
imports: [CommonModule, SharedModule, decorationRoutesModule],
|
||||
providers: [DecorationStore, DecorationService]
|
||||
})
|
||||
export class DecorationsModule {
|
||||
static routes = decorationRoutesModule;
|
||||
}
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
import {Routes} from "@angular/router";
|
||||
import {RouterModule, Routes} from "@angular/router";
|
||||
import {DecorationComponent} from "./decoration.component";
|
||||
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";
|
||||
|
||||
export const decorationsRoutes: Routes = [{
|
||||
path: '', component: DecorationComponent,
|
||||
|
|
@ -23,5 +25,7 @@ export const decorationsRoutes: Routes = [{
|
|||
outlet: 'right'
|
||||
}];
|
||||
|
||||
export const decorationsRoutingComponents = [DecorationComponent, DecorationListComponent, EditDecorationComponent];
|
||||
export const decorationRoutesModule: ModuleWithProviders = RouterModule.forChild(decorationsRoutes);
|
||||
|
||||
export const decorationsRoutingComponents = [DecorationItemComponent, DecorationComponent, DecorationListComponent, EditDecorationComponent];
|
||||
|
||||
|
|
|
|||
|
|
@ -79,6 +79,10 @@
|
|||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% { transform: rotate(0deg); }
|
||||
100% { transform: rotate(360deg); }
|
||||
0% {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import {Injectable} from '@angular/core';
|
||||
import {Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
|
||||
import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from '@angular/router';
|
||||
|
||||
@Injectable()
|
||||
export class LoginGuardSQL implements CanActivate {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
import {Directive, forwardRef} from '@angular/core';
|
||||
import {
|
||||
FormControl,
|
||||
AbstractControl,
|
||||
NG_VALIDATORS, NG_ASYNC_VALIDATORS
|
||||
} from '@angular/forms';
|
||||
import {AbstractControl, FormControl, NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '@angular/forms';
|
||||
import {UserService} from "../services/user-service/user.service";
|
||||
import {Observable} from "rxjs";
|
||||
|
||||
export function asyncIfNotBacklogThenAssignee(control): Promise<any> {
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
|
|
|
|||
|
|
@ -28,11 +28,13 @@ export interface Player {
|
|||
respawn?: number;
|
||||
flagTouch?: number;
|
||||
}
|
||||
|
||||
export interface Campaign {
|
||||
_id?: string;
|
||||
title?: string;
|
||||
wars?: War[];
|
||||
}
|
||||
|
||||
export interface War {
|
||||
_id?: string;
|
||||
title?: string;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
import {NgModule} from "@angular/core";
|
||||
import {rankRouterModule, ranksRoutingComponents} from "./ranks.routing";
|
||||
import {SharedModule} from "../shared.module";
|
||||
import {CommonModule} from "@angular/common";
|
||||
import {RankService} from "../services/rank-service/rank.service";
|
||||
import {RankStore} from "../services/stores/rank.store";
|
||||
|
||||
@NgModule({
|
||||
declarations: ranksRoutingComponents,
|
||||
imports: [CommonModule, SharedModule, rankRouterModule],
|
||||
providers: [RankStore, RankService]
|
||||
})
|
||||
export class RanksModule {
|
||||
static routes = rankRouterModule;
|
||||
}
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
import {Routes} from "@angular/router";
|
||||
import {RouterModule, Routes} from "@angular/router";
|
||||
import {RankComponent} from "./ranks.component";
|
||||
import {RankListComponent} from "./rank-list/rank-list.component";
|
||||
import {EditRankComponent} from "./edit-rank/edit-rank.component";
|
||||
import {RankItemComponent} from "./rank-list/rank-item.component";
|
||||
import {ModuleWithProviders} from "@angular/core";
|
||||
|
||||
|
||||
export const ranksRoutes: Routes = [{
|
||||
|
|
@ -24,5 +26,7 @@ export const ranksRoutes: Routes = [{
|
|||
outlet: 'right'
|
||||
}];
|
||||
|
||||
export const ranksRoutingComponents = [RankComponent, RankListComponent, EditRankComponent];
|
||||
export const rankRouterModule: ModuleWithProviders = RouterModule.forChild(ranksRoutes);
|
||||
|
||||
export const ranksRoutingComponents = [RankComponent, RankItemComponent, RankListComponent, EditRankComponent];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import {Component} from "@angular/core";
|
||||
import {ActivatedRoute, Router} from "@angular/router";
|
||||
import {Promotion, Rank} from "../../models/model-interfaces";
|
||||
import {RankService} from "../../services/rank-service/rank.service";
|
||||
import {PromotionService} from "../../services/promotion-service/promotion.service";
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
<router-outlet></router-outlet>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import {Component} from "@angular/core";
|
||||
|
||||
@Component({
|
||||
selector: 'request',
|
||||
templateUrl: 'request.component.html',
|
||||
styleUrls: ['request.component.css']
|
||||
})
|
||||
export class RequestComponent {
|
||||
constructor() {
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
import {CommonModule} from "@angular/common";
|
||||
import {SharedModule} from "../shared.module";
|
||||
import {requestRouterModule} from "./request.routing";
|
||||
import {NgModule} from "@angular/core";
|
||||
import {FilterRankPipe} from "../filter/filter.pipe";
|
||||
import {RequestComponent} from "./request.component";
|
||||
import {ConfirmAwardComponent} from "./confirm-award/confirm-award.component";
|
||||
import {ConfirmPromotionComponent} from "./confirm-promotion/confirm-promotion.component";
|
||||
import {RequestAwardComponent} from "./award/req-award.component";
|
||||
import {RequestPromotionComponent} from "./promotion/req-promotion.component";
|
||||
import {UserService} from "../services/user-service/user.service";
|
||||
import {UserStore} from "../services/stores/user.store";
|
||||
|
||||
@NgModule({
|
||||
declarations: [RequestComponent, RequestPromotionComponent, RequestAwardComponent, ConfirmPromotionComponent,
|
||||
ConfirmAwardComponent, FilterRankPipe],
|
||||
imports: [CommonModule, SharedModule, requestRouterModule]
|
||||
})
|
||||
export class RequestModule {
|
||||
static routes = requestRouterModule;
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
import {RouterModule, Routes} from "@angular/router";
|
||||
import {ModuleWithProviders} from "@angular/core";
|
||||
import {ConfirmAwardComponent} from "./confirm-award/confirm-award.component";
|
||||
import {ConfirmPromotionComponent} from "./confirm-promotion/confirm-promotion.component";
|
||||
import {RequestAwardComponent} from "./award/req-award.component";
|
||||
import {RequestPromotionComponent} from "./promotion/req-promotion.component";
|
||||
|
||||
import {RequestComponent} from "./request.component";
|
||||
import {RouteConfig} from "../app.config";
|
||||
import {LoginGuardHL, LoginGuardSQL} from "../login/login.guard";
|
||||
|
||||
|
||||
export const requestRoutes: Routes = [{
|
||||
path: '', component: RequestComponent
|
||||
},
|
||||
{
|
||||
path: RouteConfig.requestAwardPath,
|
||||
component: RequestAwardComponent,
|
||||
canActivate: [LoginGuardSQL]
|
||||
},
|
||||
{
|
||||
path: RouteConfig.requestPromotionPath,
|
||||
component: RequestPromotionComponent,
|
||||
canActivate: [LoginGuardSQL]
|
||||
},
|
||||
{
|
||||
path: RouteConfig.confirmAwardPath,
|
||||
component: ConfirmAwardComponent,
|
||||
canActivate: [LoginGuardHL]
|
||||
},
|
||||
{
|
||||
path: RouteConfig.confirmPromotionPath,
|
||||
component: ConfirmPromotionComponent,
|
||||
canActivate: [LoginGuardHL]
|
||||
}
|
||||
];
|
||||
|
||||
export const requestRouterModule: ModuleWithProviders = RouterModule.forChild(requestRoutes);
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
import {Injectable} from "@angular/core";
|
||||
import {AppUser, User} from "../../models/model-interfaces";
|
||||
import {URLSearchParams} from "@angular/http";
|
||||
import {AppUser} from "../../models/model-interfaces";
|
||||
import {Observable} from "rxjs/Observable";
|
||||
import {ADD, EDIT, LOAD, REMOVE} from "../stores/user.store";
|
||||
import {EDIT, LOAD, REMOVE} from "../stores/user.store";
|
||||
import {AppConfig} from "../../app.config";
|
||||
import {HttpClient} from "../http-client";
|
||||
import {AppUserStore} from "../stores/app-user.store";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import {Injectable} from "@angular/core";
|
||||
import {Headers, Http, RequestMethod} from "@angular/http";
|
||||
import {Router} from "@angular/router";
|
||||
import {LoginService} from "./login-service/login-service";
|
||||
|
||||
@Injectable()
|
||||
export class HttpClient {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
import {Inject, Injectable, Optional} from "@angular/core";
|
||||
import {Injectable} from "@angular/core";
|
||||
import {Http, Response} from "@angular/http";
|
||||
import "rxjs/add/operator/map";
|
||||
|
||||
import {AppConfig} from "../../app.config";
|
||||
import {AUTH_ENABLED} from "../../app.tokens";
|
||||
import {AppUser} from "../../models/model-interfaces";
|
||||
import {AwardingService} from "../awarding-service/awarding.service";
|
||||
import {PromotionService} from "../promotion-service/promotion.service";
|
||||
|
||||
@Injectable()
|
||||
export class LoginService {
|
||||
constructor(@Optional() @Inject(AUTH_ENABLED) public authEnabled = false,
|
||||
private http: Http,
|
||||
constructor(private http: Http,
|
||||
private config: AppConfig,
|
||||
private awardingService: AwardingService,
|
||||
private promotionService: PromotionService) {
|
||||
|
|
@ -47,7 +45,7 @@ export class LoginService {
|
|||
}
|
||||
|
||||
isLoggedIn() {
|
||||
return !this.authEnabled || localStorage.getItem('currentUser') != null;
|
||||
return localStorage.getItem('currentUser') != null;
|
||||
}
|
||||
|
||||
hasPermission(level: number) {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import {Squad} from "../../models/model-interfaces";
|
|||
import {RequestMethod, RequestOptions, URLSearchParams} from "@angular/http";
|
||||
import {Observable} from "rxjs/Observable";
|
||||
|
||||
import {SquadStore, ADD, EDIT, LOAD, REMOVE} from "../stores/squad.store";
|
||||
import {ADD, EDIT, LOAD, REMOVE, SquadStore} from "../stores/squad.store";
|
||||
import {AppConfig} from "../../app.config";
|
||||
import {HttpClient} from "../http-client";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import {BehaviorSubject} from "rxjs/BehaviorSubject";
|
||||
import {AppUser, User} from "../../models/model-interfaces";
|
||||
import {AppUser} from "../../models/model-interfaces";
|
||||
|
||||
export const LOAD = 'LOAD';
|
||||
export const ADD = 'ADD';
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ export const REMOVE = 'REMOVE';
|
|||
|
||||
|
||||
type Id = string | number;
|
||||
|
||||
interface Identifiable {
|
||||
id?: Id;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
|
||||
import {ShowErrorComponent} from "./common/show-error/show-error.component";
|
||||
import {CommonModule} from "@angular/common";
|
||||
|
||||
@NgModule({
|
||||
declarations: [ShowErrorComponent],
|
||||
imports: [CommonModule, FormsModule, ReactiveFormsModule],
|
||||
exports: [FormsModule, ReactiveFormsModule, ShowErrorComponent]
|
||||
})
|
||||
export class SharedModule {
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
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/squad-service/squad.service";
|
||||
|
||||
@NgModule({
|
||||
declarations: squadsRoutingComponents,
|
||||
imports: [CommonModule, SharedModule, squadRouterModule],
|
||||
providers: [SquadStore, SquadService]
|
||||
})
|
||||
export class SquadsModule {
|
||||
static routes = squadRouterModule;
|
||||
}
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
import {Routes} from "@angular/router";
|
||||
import {RouterModule, Routes} from "@angular/router";
|
||||
import {SquadComponent} from "./squads.component";
|
||||
import {SquadListComponent} from "./squad-list/squad-list.component";
|
||||
import {EditSquadComponent} from "./edit-squad/edit-squad.component";
|
||||
import {ModuleWithProviders} from "@angular/core";
|
||||
import {SquadItemComponent} from "./squad-list/squad-item.component";
|
||||
|
||||
export const squadsRoutes: Routes = [{
|
||||
path: '', component: SquadComponent,
|
||||
|
|
@ -23,5 +25,7 @@ export const squadsRoutes: Routes = [{
|
|||
outlet: 'right'
|
||||
}];
|
||||
|
||||
export const squadsRoutingComponents = [SquadComponent, SquadListComponent, EditSquadComponent];
|
||||
export const squadRouterModule: ModuleWithProviders = RouterModule.forChild(squadsRoutes);
|
||||
|
||||
export const squadsRoutingComponents = [SquadComponent, SquadItemComponent, SquadListComponent, EditSquadComponent];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from "@angular/common";
|
||||
import {SharedModule} from "../shared.module";
|
||||
import {statsRouterModule, statsRoutingComponents} from "./stats.routing";
|
||||
import {WarService} from "../services/war-service/war.service";
|
||||
import {DataTableModule} from "angular2-datatable";
|
||||
import {LineChartModule, PieChartModule} from "@swimlane/ngx-charts";
|
||||
import {AccordionModule, CarouselModule} from "ngx-bootstrap";
|
||||
|
||||
@NgModule({
|
||||
declarations: statsRoutingComponents,
|
||||
imports: [CommonModule, SharedModule, statsRouterModule, LineChartModule, PieChartModule,
|
||||
AccordionModule.forRoot(), CarouselModule.forRoot(), DataTableModule],
|
||||
providers: [WarService]
|
||||
})
|
||||
export class StatsModule {
|
||||
static routes = statsRouterModule;
|
||||
}
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
import {Routes} from "@angular/router";
|
||||
import {RouterModule, Routes} from "@angular/router";
|
||||
import {StatisticComponent} from "./stats.component";
|
||||
import {WarDetailComponent} from "./war-detail/war-detail.component";
|
||||
import {WarSubmitComponent} from "./war-submit/war-submit.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 {ModuleWithProviders} from "@angular/core";
|
||||
|
||||
|
||||
export const statsRoutes: Routes = [{
|
||||
|
|
@ -32,6 +33,8 @@ export const statsRoutes: Routes = [{
|
|||
outlet: 'right'
|
||||
}];
|
||||
|
||||
export const statsRouterModule: ModuleWithProviders = RouterModule.forChild(statsRoutes);
|
||||
|
||||
export const statsRoutingComponents = [StatisticComponent, StatisticOverviewComponent, WarListComponent,
|
||||
WarSubmitComponent, WarDetailComponent, WarItemComponent];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import {Component} from "@angular/core";
|
||||
import {ActivatedRoute, Router} from "@angular/router";
|
||||
import {ActivatedRoute} from "@angular/router";
|
||||
import {WarService} from "../../services/war-service/war.service";
|
||||
import {LoginService} from "../../services/login-service/login-service";
|
||||
import {Player, War} from "../../models/model-interfaces";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@
|
|||
</div>
|
||||
|
||||
<div class="col-xs-3">
|
||||
<span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash" *ngIf="loginService.hasPermission(3)"></span>
|
||||
<span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash"
|
||||
*ngIf="loginService.hasPermission(3)"></span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@
|
|||
</div>
|
||||
|
||||
<div class="col-sm-4">
|
||||
<span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash pull-right"></span>
|
||||
<span (click)="delete(); $event.stopPropagation()" title="Löschen"
|
||||
class="glyphicon glyphicon-trash trash pull-right"></span>
|
||||
<span (click)="award(); $event.stopPropagation()" title="Auszeichnungen" class="icon-award pull-right"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {routes, usersRoutingComponents} from './users.routing';
|
||||
import {UserStore} from "../services/stores/user.store";
|
||||
import {UserService} from "../services/user-service/user.service";
|
||||
import {CommonModule} from "@angular/common";
|
||||
import {SharedModule} from "../shared.module";
|
||||
|
||||
@NgModule({
|
||||
declarations: usersRoutingComponents,
|
||||
imports: [CommonModule, SharedModule, routes],
|
||||
})
|
||||
export class UsersModule {
|
||||
static routes = routes;
|
||||
}
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
import {Routes} from "@angular/router";
|
||||
import {RouterModule, Routes} from "@angular/router";
|
||||
import {UsersComponent} from "./users.component";
|
||||
import {EditUserComponent} from "./edit-user/edit-user.component";
|
||||
import {UserListComponent} from "./user-list/user-list.component";
|
||||
import {AwardUserComponent} from "./award-user/award-user.component";
|
||||
import {ModuleWithProviders} from "@angular/core";
|
||||
import {UserItemComponent} from "./user-list/user-item.component";
|
||||
|
||||
export const usersRoutes: Routes = [{
|
||||
path: '', component: UsersComponent,
|
||||
|
|
@ -30,4 +32,6 @@ export const usersRoutes: Routes = [{
|
|||
}
|
||||
];
|
||||
|
||||
export const usersRoutingComponents = [UsersComponent, UserListComponent, EditUserComponent, AwardUserComponent];
|
||||
export const routes: ModuleWithProviders = RouterModule.forChild(usersRoutes);
|
||||
|
||||
export const usersRoutingComponents = [UserItemComponent, UsersComponent, UserListComponent, EditUserComponent, AwardUserComponent];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
export const environment = {
|
||||
production: false,
|
||||
e2eMode: true
|
||||
|
|
|
|||
|
|
@ -13,11 +13,9 @@
|
|||
*
|
||||
* Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
|
||||
*/
|
||||
|
||||
/***************************************************************************************************
|
||||
* BROWSER POLYFILLS
|
||||
*/
|
||||
|
||||
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
|
||||
// import 'core-js/es6/symbol';
|
||||
// import 'core-js/es6/object';
|
||||
|
|
@ -32,31 +30,21 @@
|
|||
// import 'core-js/es6/regexp';
|
||||
// import 'core-js/es6/map';
|
||||
// import 'core-js/es6/set';
|
||||
|
||||
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
|
||||
// import 'classlist.js'; // Run `npm install --save classlist.js`.
|
||||
|
||||
/** IE10 and IE11 requires the following to support `@angular/animation`. */
|
||||
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
|
||||
|
||||
|
||||
/** Evergreen browsers require these. **/
|
||||
import 'core-js/es6/reflect';
|
||||
import 'core-js/es7/reflect';
|
||||
|
||||
|
||||
/** ALL Firefox browsers require the following to support `@angular/animation`. **/
|
||||
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
|
||||
|
||||
|
||||
|
||||
/***************************************************************************************************
|
||||
* Zone JS is required by Angular itself.
|
||||
*/
|
||||
import 'zone.js/dist/zone'; // Included with Angular CLI.
|
||||
|
||||
|
||||
|
||||
/***************************************************************************************************
|
||||
* APPLICATION IMPORTS
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ form {
|
|||
padding-right: 10px;
|
||||
|
||||
}
|
||||
|
||||
#right {
|
||||
overflow: hidden;
|
||||
padding-left: 4%;
|
||||
|
|
|
|||
|
|
@ -10,17 +10,15 @@ import 'zone.js/dist/fake-async-test';
|
|||
import 'rxjs/Rx';
|
||||
|
||||
import {getTestBed} from '@angular/core/testing';
|
||||
import {
|
||||
BrowserDynamicTestingModule,
|
||||
platformBrowserDynamicTesting
|
||||
} from '@angular/platform-browser-dynamic/testing';
|
||||
import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
|
||||
|
||||
// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
|
||||
declare var __karma__: any;
|
||||
declare var require: any;
|
||||
|
||||
// Prevent Karma from running prematurely.
|
||||
__karma__.loaded = function () {};
|
||||
__karma__.loaded = function () {
|
||||
};
|
||||
|
||||
// First, initialize the Angular testing environment.
|
||||
getTestBed().initTestEnvironment(
|
||||
|
|
|
|||
|
|
@ -12,7 +12,10 @@
|
|||
"curly": true,
|
||||
"eofline": true,
|
||||
"forin": true,
|
||||
"import-blacklist": [true, "rxjs"],
|
||||
"import-blacklist": [
|
||||
true,
|
||||
"rxjs"
|
||||
],
|
||||
"import-spacing": true,
|
||||
"indent": [
|
||||
true,
|
||||
|
|
@ -97,9 +100,18 @@
|
|||
"check-separator",
|
||||
"check-type"
|
||||
],
|
||||
|
||||
"directive-selector": [true, "attribute", "app", "camelCase"],
|
||||
"component-selector": [true, "element", "app", "kebab-case"],
|
||||
"directive-selector": [
|
||||
true,
|
||||
"attribute",
|
||||
"app",
|
||||
"camelCase"
|
||||
],
|
||||
"component-selector": [
|
||||
true,
|
||||
"element",
|
||||
"app",
|
||||
"kebab-case"
|
||||
],
|
||||
"use-input-property-decorator": true,
|
||||
"use-output-property-decorator": true,
|
||||
"use-host-property-decorator": true,
|
||||
|
|
|
|||
Loading…
Reference in New Issue