-
+
diff --git a/static/src/app/app.module.ts b/static/src/app/app.module.ts
index f057a2a..4f58c5c 100644
--- a/static/src/app/app.module.ts
+++ b/static/src/app/app.module.ts
@@ -23,9 +23,11 @@ import {UserService} from './services/army-management/user.service';
import {UserStore} from './services/stores/user.store';
import {CookieService} from 'ngx-cookie-service';
import {SnackBarService} from './services/user-interface/snack-bar/snack-bar.service';
+import {MaterialComponentsModule} from './material-components.module';
@NgModule({
- imports: [SharedModule, BrowserModule, BrowserAnimationsModule, appRouting, HttpModule, ClipboardModule],
+ imports: [SharedModule, BrowserModule, BrowserAnimationsModule, appRouting, HttpModule, ClipboardModule,
+ MaterialComponentsModule],
providers: [
HttpClient,
LoginService,
diff --git a/static/src/app/army/army-member.component.ts b/static/src/app/army/army-member.component.ts
index 46fa54f..bd559df 100644
--- a/static/src/app/army/army-member.component.ts
+++ b/static/src/app/army/army-member.component.ts
@@ -7,7 +7,7 @@ import {RouteConfig} from '../app.config';
import {AwardingService} from '../services/army-management/awarding.service';
import {Fraction} from '../utils/fraction.enum';
import {DOCUMENT} from '@angular/common';
-import {CSSHelpers} from '../global.helpers';
+import {CSSHelpers} from '../utils/global.helpers';
@Component({
diff --git a/static/src/app/army/army.component.ts b/static/src/app/army/army.component.ts
index cb51b89..d0cf1c4 100644
--- a/static/src/app/army/army.component.ts
+++ b/static/src/app/army/army.component.ts
@@ -5,7 +5,7 @@ import {ActivatedRoute, Router} from '@angular/router';
import {Fraction} from '../utils/fraction.enum';
import {DOCUMENT} from '@angular/common';
import {RouteConfig} from '../app.config';
-import {CSSHelpers} from '../global.helpers';
+import {CSSHelpers} from '../utils/global.helpers';
@Component({
diff --git a/static/src/app/common/modules/material-components.module.ts b/static/src/app/common/modules/material-components.module.ts
deleted file mode 100644
index 3ace341..0000000
--- a/static/src/app/common/modules/material-components.module.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Angular material imports
- */
-
-import { NgModule } from '@angular/core';
-import {
- MatSidenavModule,
- MatFormFieldModule,
- MatInputModule,
- MatButtonModule,
- MatCheckboxModule,
- MatTableModule,
- MatPaginatorModule,
- MatSortModule,
- MatIconModule,
- MatSnackBarModule,
- MatToolbarModule,
- MatExpansionModule
-} from '@angular/material';
-
-@NgModule({
- imports: [
- MatSidenavModule,
- MatFormFieldModule,
- MatInputModule,
- MatButtonModule,
- MatCheckboxModule,
- MatTableModule,
- MatPaginatorModule,
- MatSortModule,
- MatIconModule,
- MatSnackBarModule,
- MatToolbarModule,
- MatExpansionModule
- ],
- exports: [
- MatSidenavModule,
- MatFormFieldModule,
- MatInputModule,
- MatButtonModule,
- MatCheckboxModule,
- MatTableModule,
- MatPaginatorModule,
- MatSortModule,
- MatIconModule,
- MatSnackBarModule,
- MatToolbarModule,
- MatExpansionModule
- ]
-})
-
-export class MaterialComponentsModule {}
diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.html b/static/src/app/decorations/edit-decoration/edit-decoration.component.html
index 3852ca3..ee704d0 100644
--- a/static/src/app/decorations/edit-decoration/edit-decoration.component.html
+++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.html
@@ -75,11 +75,4 @@
[disabled]="!form.valid">
Bestätigen
-
-
- Erfolgreich gespeichert
-
-
diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts
index acca0de..11df1c1 100644
--- a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts
+++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts
@@ -5,6 +5,8 @@ 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';
@Component({
templateUrl: './edit-decoration.component.html',
@@ -22,15 +24,14 @@ export class EditDecorationComponent implements OnInit, OnDestroy {
imagePreviewSrc;
- showSuccessLabel = false;
-
@ViewChild(NgForm) form: NgForm;
readonly fraction = Fraction;
constructor(private route: ActivatedRoute,
private router: Router,
- private decorationService: DecorationService) {
+ private decorationService: DecorationService,
+ private snackBarService: SnackBarService) {
}
ngOnInit() {
@@ -81,10 +82,7 @@ export class EditDecorationComponent implements OnInit, OnDestroy {
this.imagePreviewSrc = 'resource/decoration/' + this.decoration._id + '.png?' + Date.now();
}, 300);
fileInput.value = '';
- this.showSuccessLabel = true;
- setTimeout(() => {
- this.showSuccessLabel = false;
- }, 2000);
+ this.snackBarService.showSuccess(Message.SUCCESS_SAVE);
});
}
}
diff --git a/static/src/app/i18n/de.messages.ts b/static/src/app/i18n/de.messages.ts
new file mode 100644
index 0000000..fcff963
--- /dev/null
+++ b/static/src/app/i18n/de.messages.ts
@@ -0,0 +1,5 @@
+export enum Message {
+ SIGN_UP_SUCCESS = 'Account erfolgreich erstellt',
+ SUCCESS_SAVE = 'Erfolgreich gespeichert',
+ DUPLICATED_NAME_ERR = 'Benutzername existiert bereits',
+}
diff --git a/static/src/app/login/signup.component.html b/static/src/app/login/signup.component.html
index e2b0e7d..7986a8b 100644
--- a/static/src/app/login/signup.component.html
+++ b/static/src/app/login/signup.component.html
@@ -21,28 +21,12 @@
-
-
-
- Account erfolgreich erstellt
-
-
-
- {{error}}
-
-
-
-
-
diff --git a/static/src/app/login/signup.component.ts b/static/src/app/login/signup.component.ts
index a20008e..6e04a8c 100644
--- a/static/src/app/login/signup.component.ts
+++ b/static/src/app/login/signup.component.ts
@@ -2,6 +2,8 @@ import {Component, OnInit} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import {LoginService} from '../services/app-user-service/login-service';
import {RouteConfig} from '../app.config';
+import {Message} from '../i18n/de.messages';
+import {SnackBarService} from '../services/user-interface/snack-bar/snack-bar.service';
@Component({
@@ -12,19 +14,14 @@ import {RouteConfig} from '../app.config';
export class SignupComponent implements OnInit {
- showErrorLabel = false;
-
- showSuccessLabel = false;
-
- error: string;
-
loading = false;
returnUrl: string;
constructor(private route: ActivatedRoute,
private router: Router,
- private loginService: LoginService) {
+ private loginService: LoginService,
+ private snackBarService: SnackBarService) {
}
ngOnInit() {
@@ -41,15 +38,11 @@ export class SignupComponent implements OnInit {
.subscribe(
data => {
this.loading = false;
- this.showSuccessLabel = true;
+ this.snackBarService.showSuccess(Message.SIGN_UP_SUCCESS);
},
error => {
- this.error = error;
- this.showErrorLabel = true;
- setTimeout(() => {
- this.showErrorLabel = false;
- }, 4000);
this.loading = false;
+ this.snackBarService.showError(error, 10000);
});
}
}
diff --git a/static/src/app/material-components.module.ts b/static/src/app/material-components.module.ts
new file mode 100644
index 0000000..f8e26c9
--- /dev/null
+++ b/static/src/app/material-components.module.ts
@@ -0,0 +1,55 @@
+/**
+ * Angular material imports
+ */
+
+import { NgModule } from '@angular/core';
+import {
+ MatSidenavModule,
+ MatFormFieldModule,
+ MatInputModule,
+ MatButtonModule,
+ MatCheckboxModule,
+ MatTableModule,
+ MatPaginatorModule,
+ MatSortModule,
+ MatIconModule,
+ MatSnackBarModule,
+ MatToolbarModule,
+ MatExpansionModule,
+ MatProgressSpinnerModule
+} from '@angular/material';
+
+@NgModule({
+ imports: [
+ // MatSidenavModule,
+ // MatFormFieldModule,
+ // MatInputModule,
+ // MatButtonModule,
+ // MatCheckboxModule,
+ // MatTableModule,
+ // MatPaginatorModule,
+ // MatSortModule,
+ // MatIconModule,
+ MatSnackBarModule,
+ MatProgressSpinnerModule,
+ // MatToolbarModule,
+ // MatExpansionModule
+ ],
+ exports: [
+ // MatSidenavModule,
+ // MatFormFieldModule,
+ // MatInputModule,
+ // MatButtonModule,
+ // MatCheckboxModule,
+ // MatTableModule,
+ // MatPaginatorModule,
+ // MatSortModule,
+ // MatIconModule,
+ MatSnackBarModule,
+ MatProgressSpinnerModule,
+ // MatToolbarModule,
+ // MatExpansionModule
+ ]
+})
+
+export class MaterialComponentsModule {}
diff --git a/static/src/app/pub/decoration-overview/decoration-overview.component.ts b/static/src/app/pub/decoration-overview/decoration-overview.component.ts
index 2c546dc..4dcb68b 100644
--- a/static/src/app/pub/decoration-overview/decoration-overview.component.ts
+++ b/static/src/app/pub/decoration-overview/decoration-overview.component.ts
@@ -3,7 +3,7 @@ import {ActivatedRoute, Router} from '@angular/router';
import {DOCUMENT} from '@angular/common';
import {Fraction} from '../../utils/fraction.enum';
-import {CSSHelpers} from '../../global.helpers';
+import {CSSHelpers} from '../../utils/global.helpers';
import {RouteConfig} from '../../app.config';
import {Decoration} from '../../models/model-interfaces';
import {DecorationService} from '../../services/army-management/decoration.service';
diff --git a/static/src/app/pub/rank-overview/rank-overview.component.ts b/static/src/app/pub/rank-overview/rank-overview.component.ts
index 26c39cd..bb4abfe 100644
--- a/static/src/app/pub/rank-overview/rank-overview.component.ts
+++ b/static/src/app/pub/rank-overview/rank-overview.component.ts
@@ -3,7 +3,7 @@ import {ActivatedRoute, Router} from '@angular/router';
import {DOCUMENT} from '@angular/common';
import {Fraction} from '../../utils/fraction.enum';
-import {CSSHelpers} from '../../global.helpers';
+import {CSSHelpers} from '../../utils/global.helpers';
import {RouteConfig} from '../../app.config';
import {Rank} from '../../models/model-interfaces';
import {RankService} from '../../services/army-management/rank.service';
diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.html b/static/src/app/ranks/edit-rank/edit-rank.component.html
index eee7a19..7efdfda 100644
--- a/static/src/app/ranks/edit-rank/edit-rank.component.html
+++ b/static/src/app/ranks/edit-rank/edit-rank.component.html
@@ -56,11 +56,4 @@
[disabled]="!form.valid">
Bestätigen
-
-