From 46ee4065ee2d0449a60b89e818bbdffb27314a75 Mon Sep 17 00:00:00 2001 From: "Sams, Roland" Date: Tue, 26 Mar 2024 16:28:54 +0100 Subject: [PATCH] bump master --- src/app/app-routing.module.ts | 4 ---- src/app/app.topbar.component.ts | 4 ++-- src/app/services/api/websocket.service.ts | 18 +++++++++--------- src/app/services/menu.service.ts | 1 - src/configurations/changeLogVersion.ts | 20 ++++++++++---------- 5 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2d06704..c2e04d4 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -289,11 +289,7 @@ import { MetronomeComponent } from './tools/views/metronome/metronome.component' { path: 'tools', component: RouterOutletWrapperComponent, - canActivate: [RouteGuard], title: environment.appTitle + ' - TOOLS', - data: { - permissions: [PermissionKey.USER_DELETE], - }, children: [ { path: 'tuner', diff --git a/src/app/app.topbar.component.ts b/src/app/app.topbar.component.ts index 2b043de..6e0f66e 100644 --- a/src/app/app.topbar.component.ts +++ b/src/app/app.topbar.component.ts @@ -17,9 +17,9 @@ import { MenuService } from './services/menu.service';

{{ AppTitle }}

-
+ diff --git a/src/app/services/api/websocket.service.ts b/src/app/services/api/websocket.service.ts index 1bd733c..09323d9 100644 --- a/src/app/services/api/websocket.service.ts +++ b/src/app/services/api/websocket.service.ts @@ -14,19 +14,19 @@ export class WebsocketService { private httpClient: HttpClient, private userService: UserService ) { - this.init(); + // this.init(); } public getUserNotificationsChannel(): Observable { const subject = new Subject(); - this.userService - .getCurrentUser() - .pipe(first()) - .subscribe((user) => { - this._echo.private('App.Models.User.' + this.userService.getCurrentUserId()).notification((e) => { - subject.next(e); - }); - }); + // this.userService + // .getCurrentUser() + // .pipe(first()) + // .subscribe((user) => { + // this._echo.private('App.Models.User.' + this.userService.getCurrentUserId()).notification((e) => { + // subject.next(e); + // }); + // }); return subject.asObservable(); } diff --git a/src/app/services/menu.service.ts b/src/app/services/menu.service.ts index 17f92d4..c47b571 100644 --- a/src/app/services/menu.service.ts +++ b/src/app/services/menu.service.ts @@ -133,7 +133,6 @@ export class MenuService implements OnDestroy { label: 'Tools', icon: 'mdi mdi-timer-music-outline', enumLabel: MenuLabels.TOOLS, - permission: PermissionKey.USER_DELETE, children: [ { label: 'Stimmgerät', diff --git a/src/configurations/changeLogVersion.ts b/src/configurations/changeLogVersion.ts index 4eeb97b..93f8b66 100644 --- a/src/configurations/changeLogVersion.ts +++ b/src/configurations/changeLogVersion.ts @@ -1,4 +1,4 @@ -export const MkjAppVersion = '0.9.8 - BETA'; +export const MkjAppVersion = '0.9.7 - BETA'; export interface MkjAppChangeLog { date: string; @@ -7,15 +7,15 @@ export interface MkjAppChangeLog { } export const MkjAppChangeLog: MkjAppChangeLog[] = [ - { - date: '30.03.2024', - version: '0.9.8 - BETA', - changes: { - Benachrichtigungen: 'Implementierung von Echtzeit-Benachrichtigungen.', - Bugfixes: 'Diverse Bugfixes und Verbesserungen der Benutzeroberfläche.', - Notenmappen: 'Gesamtdauer hinzugefügt.', - }, - }, + // { + // date: '30.03.2024', + // version: '0.9.8 - BETA', + // changes: { + // Benachrichtigungen: 'Implementierung von Echtzeit-Benachrichtigungen.', + // Bugfixes: 'Diverse Bugfixes und Verbesserungen der Benutzeroberfläche.', + // Notenmappen: 'Gesamtdauer hinzugefügt.', + // }, + // }, { date: '10.03.2024', version: '0.9.7 - BETA',