Skip to content

Commit

Permalink
bump master
Browse files Browse the repository at this point in the history
  • Loading branch information
Sams, Roland authored and Sams, Roland committed Mar 26, 2024
1 parent 3691ac5 commit 46ee406
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 26 deletions.
4 changes: 0 additions & 4 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/app/app.topbar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import { MenuService } from './services/menu.service';
<h3>{{ AppTitle }}</h3>
</div>
<div class="inline-block flex h-full align-items-center mr-4" style="float: inline-end">
<!-- <div class="inline-block flex h-full align-items-center mr-4" style="float: inline-end">
<mkj-user-notifications></mkj-user-notifications>
</div>
</div> -->
<a id="topbar-menu-button" href="#" (click)="appMain.onTopbarMenuButtonClick($event)">
<i class="pi pi-bars" style="font-size: 25px"></i>
Expand Down
18 changes: 9 additions & 9 deletions src/app/services/api/websocket.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ export class WebsocketService {
private httpClient: HttpClient,
private userService: UserService
) {
this.init();
// this.init();
}

public getUserNotificationsChannel(): Observable<Notification> {
const subject = new Subject<Notification>();
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();
}
Expand Down
1 change: 0 additions & 1 deletion src/app/services/menu.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
20 changes: 10 additions & 10 deletions src/configurations/changeLogVersion.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const MkjAppVersion = '0.9.8 - BETA';
export const MkjAppVersion = '0.9.7 - BETA';

export interface MkjAppChangeLog {
date: string;
Expand All @@ -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',
Expand Down

0 comments on commit 46ee406

Please sign in to comment.