diff --git a/api/routes/users.js b/api/routes/users.js index b5db459..f83864f 100644 --- a/api/routes/users.js +++ b/api/routes/users.js @@ -148,6 +148,7 @@ users.route('/:id') res.locals.items = item; } else { err.status = codes.wrongrequest; + console.log(err); err.message += ' in fields: ' + Object.getOwnPropertyNames(err.errors); } diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html index d333959..26f443a 100644 --- a/static/src/app/app.component.html +++ b/static/src/app/app.component.html @@ -21,7 +21,7 @@ Ränge - +
  • Statistiken @@ -92,20 +92,32 @@ - - -
    - -
    + + +
    + +
    + + + + diff --git a/static/src/app/app.component.ts b/static/src/app/app.component.ts index 5e2b202..011f354 100644 --- a/static/src/app/app.component.ts +++ b/static/src/app/app.component.ts @@ -21,6 +21,8 @@ export class AppComponent implements OnInit { loading = false; + sidebarOpen = true; + scrollTopVisible = false; scrollBtnVisibleVal = 100; @@ -44,6 +46,10 @@ export class AppComponent implements OnInit { sanitizer.bypassSecurityTrustResourceUrl('../assets/icon/twotone-delete-24px.svg')); this.iconRegistry.addSvgIcon('stats-detail', sanitizer.bypassSecurityTrustResourceUrl('../assets/icon/round-assessment-24px.svg')); + this.iconRegistry.addSvgIcon('chevron-left', + sanitizer.bypassSecurityTrustResourceUrl('../assets/icon/baseline-chevron_left-24px.svg')); + this.iconRegistry.addSvgIcon('chevron-right', + sanitizer.bypassSecurityTrustResourceUrl('../assets/icon/baseline-chevron_right-24px.svg')); router.events.subscribe(event => { if (event instanceof NavigationStart) { @@ -65,6 +71,9 @@ export class AppComponent implements OnInit { || document.documentElement.scrollTop > this.scrollBtnVisibleVal; } + toggleSidebar() { + this.sidebarOpen = !this.sidebarOpen; + } ngOnInit() { if (this.loginService.hasPermission(2)) { diff --git a/static/src/app/material-components.module.ts b/static/src/app/material-components.module.ts index f8e26c9..b21a508 100644 --- a/static/src/app/material-components.module.ts +++ b/static/src/app/material-components.module.ts @@ -2,54 +2,19 @@ * 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'; +import {NgModule} from '@angular/core'; +import {MatProgressSpinnerModule, MatSnackBarModule} 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 {} +export class MaterialComponentsModule { +} diff --git a/static/src/app/style/load-indicator.css b/static/src/app/style/load-indicator.css index 1b573ce..526fcaf 100644 --- a/static/src/app/style/load-indicator.css +++ b/static/src/app/style/load-indicator.css @@ -1,7 +1,7 @@ .load-indicator { position: absolute; top: 50%; - z-index: 1; + z-index: 10000; } @media only screen and (max-width: 1199px) { .load-indicator { diff --git a/static/src/app/users/edit-user/edit-user.component.ts b/static/src/app/users/edit-user/edit-user.component.ts index f49ca7d..4cc5803 100644 --- a/static/src/app/users/edit-user/edit-user.component.ts +++ b/static/src/app/users/edit-user/edit-user.component.ts @@ -106,14 +106,14 @@ export class EditUserComponent implements OnInit { this.userService.submitUser(updateObject) .subscribe(user => { this.router.navigate(['..'], {relativeTo: this.route}); + this.snackBarService.showSuccess(Message.SUCCESS_SAVE); return true; }, error => { // duplicated user error message - if (error._body.includes('duplicate')) { - this.snackBarService.showError(Message.DUPLICATED_NAME_ERR, 10000); - } - }); + const errorMessage = error._body.includes('duplicate') ? Message.DUPLICATED_NAME_ERR : error._body; + this.snackBarService.showError(errorMessage, 10000); + }) } } diff --git a/static/src/assets/icon/baseline-chevron_left-24px.svg b/static/src/assets/icon/baseline-chevron_left-24px.svg new file mode 100644 index 0000000..050d378 --- /dev/null +++ b/static/src/assets/icon/baseline-chevron_left-24px.svg @@ -0,0 +1,4 @@ + + + + diff --git a/static/src/assets/icon/baseline-chevron_right-24px.svg b/static/src/assets/icon/baseline-chevron_right-24px.svg new file mode 100644 index 0000000..22c6db1 --- /dev/null +++ b/static/src/assets/icon/baseline-chevron_right-24px.svg @@ -0,0 +1,4 @@ + + + + diff --git a/static/src/styles.css b/static/src/styles.css index 1262d2c..c969b80 100644 --- a/static/src/styles.css +++ b/static/src/styles.css @@ -45,7 +45,7 @@ form { min-width: 350px; max-width: 450px; float: left; - background: #ececec; + background: #f9f9f9; box-shadow: 2px 1px 5px grey; } @@ -69,13 +69,13 @@ form { } .custom-snack-bar > simple-snack-bar { - display: block; + display: flex; } .snack-bar-button button { - color: white; - border: 2px solid; - padding: 3px 10px; + color: #ffffff; + border: 1px solid; + margin-left: 10px; } /* Icon theme */