diff --git a/matsen-tool/src/app/app-routing.module.ts b/matsen-tool/src/app/app-routing.module.ts
index 8575d07..9dbbfc7 100644
--- a/matsen-tool/src/app/app-routing.module.ts
+++ b/matsen-tool/src/app/app-routing.module.ts
@@ -20,7 +20,7 @@ const routes: Routes = [
{path: 'users', loadChildren: usersModule, canActivate: [AuthGuard]},
{path: 'account', loadChildren: accountModule},
{
- path: 'customers',
+ path: 'customer',
component: TwoColumnComponent,
canActivate: [AuthGuard],
children: [
@@ -29,12 +29,12 @@ const routes: Routes = [
]
},
{
- path: 'suppliers',
+ path: 'supplier',
component: TwoColumnComponent,
canActivate: [AuthGuard],
children: [
{path: '', component: PartnersComponent, data: {dataType: 'supplier'}},
- {path: 'detail', component: PartnersDetailComponent, data: {dataType: 'supplier-detail'}},
+ {path: ':id', component: PartnersDetailComponent, data: {dataType: 'supplier-detail'}},
]
},
{
@@ -43,7 +43,7 @@ const routes: Routes = [
canActivate: [AuthGuard],
children: [
{path: '', component: PartnersComponent, data: {dataType: 'service'}},
- {path: 'detail', component: PartnersDetailComponent, data: {dataType: 'service-detail'}},
+ {path: ':id', component: PartnersDetailComponent, data: {dataType: 'service-detail'}},
]
},
{
diff --git a/matsen-tool/src/app/app.component.html b/matsen-tool/src/app/app.component.html
index e82dcdb..ed8eb5c 100644
--- a/matsen-tool/src/app/app.component.html
+++ b/matsen-tool/src/app/app.component.html
@@ -7,6 +7,7 @@
+
Benachrichtigungen
99+
diff --git a/matsen-tool/src/app/app.component.ts b/matsen-tool/src/app/app.component.ts
index 39c4c4b..edc1bac 100644
--- a/matsen-tool/src/app/app.component.ts
+++ b/matsen-tool/src/app/app.component.ts
@@ -2,8 +2,7 @@
import {AccountService} from './_services';
import {User} from './_models';
-import {Subscription} from "rxjs";
-import {PostJsonld, PostService} from "@app/core/api/v1";
+import {PostService} from "@app/core/api/v1";
import {TranslateService} from "@ngx-translate/core";
@Component({
@@ -14,7 +13,6 @@ import {TranslateService} from "@ngx-translate/core";
export class AppComponent implements OnInit {
user?: User | null;
-
constructor(private postService: PostService, private accountService: AccountService, translate: TranslateService) {
translate.setDefaultLang('de');
translate.use('de');
@@ -28,4 +26,13 @@ export class AppComponent implements OnInit {
logout() {
this.accountService.logout();
}
+
+ copyTokenToClipboard() {
+ const el = document.createElement('textarea');
+ el.value = this.user?.token !== undefined ? this.user.token : "";
+ document.body.appendChild(el);
+ el.select();
+ document.execCommand('copy');
+ document.body.removeChild(el);
+ }
}
diff --git a/matsen-tool/src/app/home/home.component.html b/matsen-tool/src/app/home/home.component.html
index 15706cf..8b104d1 100644
--- a/matsen-tool/src/app/home/home.component.html
+++ b/matsen-tool/src/app/home/home.component.html
@@ -2,7 +2,6 @@
@@ -10,14 +9,14 @@
-
+
Dienstleister
diff --git a/matsen-tool/src/app/home/home.component.ts b/matsen-tool/src/app/home/home.component.ts
index 16c4800..a6b30b0 100644
--- a/matsen-tool/src/app/home/home.component.ts
+++ b/matsen-tool/src/app/home/home.component.ts
@@ -1,16 +1,15 @@
import {Component, OnInit} from '@angular/core';
-import { User } from '@app/_models';
-import { AccountService } from '@app/_services';
-import {MatCardModule} from "@angular/material/card";
+import {User} from '@app/_models';
+import {AccountService} from '@app/_services';
import {Subscription} from "rxjs";
import {PostJsonld, PostService, UserJsonld, UserService} from "@app/core/api/v1";
@Component({
- templateUrl: 'home.component.html',
- styleUrl: 'home.component.scss'
+ templateUrl: 'home.component.html',
+ styleUrl: 'home.component.scss'
})
-export class HomeComponent implements OnInit{
+export class HomeComponent implements OnInit {
user: User | null;
protected postSub: Subscription;
protected posts: Array;
@@ -45,14 +44,4 @@ export class HomeComponent implements OnInit{
}
);
}
-
- copyTokenToClipboard()
- {
- const el = document.createElement('textarea');
- el.value = this.user?.token !== undefined ? this.user.token : "";
- document.body.appendChild(el);
- el.select();
- document.execCommand('copy');
- document.body.removeChild(el);
- }
}
diff --git a/matsen-tool/src/app/layout/two-column/two-column.component.html b/matsen-tool/src/app/layout/two-column/two-column.component.html
index 1176afa..19c0050 100644
--- a/matsen-tool/src/app/layout/two-column/two-column.component.html
+++ b/matsen-tool/src/app/layout/two-column/two-column.component.html
@@ -2,14 +2,14 @@