fixes

dysTOS · May 5, 2024 · 58ecf70 · 58ecf70
1 parent da94d69
commit 58ecf70
Show file tree

Hide file tree

Showing 12 changed files with 656 additions and 538 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,4 @@ testem.log
 .DS_Store
 Thumbs.db
 .angular/cache/
+.nx/cache/18.3.4-nx.win32-x64-msvc.node
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,16 +16,16 @@
     "build-css": "sass src/theme/base/mkj/theme-mkj-dark.scss:src/assets/css/theme-dark.css src/theme/base/mkj/theme-mkj-light.scss:src/assets/css/theme-light.css src/theme/base/gmr/theme-gmr-dark.scss:src/configurations/gmr/assets/css/theme-dark.css src/theme/base/gmr/theme-gmr-light.scss:src/configurations/gmr/assets/css/theme-light.css"
   },
   "dependencies": {
-    "@angular/animations": "^17.2.3",
-    "@angular/cdk": "^17.2.1",
-    "@angular/common": "^17.2.3",
-    "@angular/compiler": "^17.2.3",
-    "@angular/core": "^17.2.3",
-    "@angular/forms": "^17.2.3",
-    "@angular/platform-browser": "^17.2.3",
-    "@angular/platform-browser-dynamic": "^17.2.3",
-    "@angular/router": "^17.2.3",
-    "@angular/service-worker": "^17.2.3",
+    "@angular/animations": "^17.3.7",
+    "@angular/cdk": "^17.3.7",
+    "@angular/common": "^17.3.7",
+    "@angular/compiler": "^17.3.7",
+    "@angular/core": "^17.3.7",
+    "@angular/forms": "^17.3.7",
+    "@angular/platform-browser": "^17.3.7",
+    "@angular/platform-browser-dynamic": "^17.3.7",
+    "@angular/router": "^17.3.7",
+    "@angular/service-worker": "^17.3.7",
     "@mdi/font": "^6.6.96",
     "@types/jspdf": "^2.0.0",
     "chart.js": "^3.9.1",
@@ -37,9 +37,9 @@
     "normalize.css": "^8.0.1",
     "primeflex": "3.3",
     "primeicons": "^6.0.1",
-    "primeng": "^17.12.0",
+    "primeng": "^17.16.0",
     "prismjs": "^1.27.0",
-    "rxjs": "^7.4.0",
+    "rxjs": "^7.8.1",
     "subsink": "^1.0.2",
     "tslib": "^2.0.0",
     "zone.js": "^0.14.2"

diff --git a/src/app/components/termine/kalenderabo/kalenderabo.component.html b/src/app/components/termine/kalenderabo/kalenderabo.component.html
@@ -11,10 +11,6 @@
         class="p-button-secondary p-button-rounded p-button-raised"
         (click)="copyToClipboard()"
       ></button>
-      <p>
-        Mit diesem Link kannst du alle Termine mit deinem Mobil-Kalender synchronisieren. Diese Funktion ist noch in der
-        Testphase, sollte aber zumindest auf iPhones bereits tadellos funktionieren.
-      </p>
     </div>
   </div>
   <div class="md:col-6 col-12">
@@ -37,7 +33,7 @@ <h5>Anleitung für Android</h5>
       <ul class="unordered-list">
         <li>Dein Google-Konto muss auf deinem Smartphone aktiviert sein!</li>
         <li>
-          In den Google-Konto Synchronisations-Einstellungen muss der Punk
+          In den Google-Konto Synchronisations-Einstellungen muss der Punkt
           <span class="text-primary"> "Kalender" </span> aktiviert sein!
         </li>
         <li>

diff --git a/src/app/pages/password-reset/password-reset.component.ts b/src/app/pages/password-reset/password-reset.component.ts
@@ -31,7 +31,7 @@ export class PasswordResetComponent implements OnInit {
 
     this.authService.resetPassword(queryParams.token, queryParams.email, this.pwd, this.pwdCheck).subscribe({
       next: (result) => {
-        setTimeout(() => this.infoService.success(result.message), 1000);
+        setTimeout(() => this.infoService.success(result.message), 500);
         this.router.navigate(['login']);
       },
       error: (error) => {

diff --git a/src/app/services/menu.service.ts b/src/app/services/menu.service.ts
@@ -30,7 +30,7 @@ export const MenuLabels = {
   TEST: 20,
 };
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class MenuService implements OnDestroy {
   public readonly MainMenu: MkjMenuItem[] = [
     {

diff --git a/src/app/tools/views/circle-of-fifths/circle-of-fifths.component.scss b/src/app/tools/views/circle-of-fifths/circle-of-fifths.component.scss
@@ -1,18 +1,25 @@
 @use "sass:math";
 
-$size: 95vw; // $window
 $border: 1px solid #efefef;
 
+:host {
+  --size: 95vw;
+
+  @media (orientation: landscape) {
+    --size: 65vh;
+  }
+}
+
 .accidental {
   vertical-align: super;
   font-size: 0.6em;
 }
 
 .circle-of-fifths {
   font-family: "Volkhov";
-  font-size: $size/20;
-  width: $size;
-  height: $size;
+  font-size: calc(var(--size) / 20);
+  width: var(--size);
+  height: var(--size);
   border: $border;
   margin: auto;
   border-radius: 50%;
@@ -22,10 +29,10 @@ $border: 1px solid #efefef;
   color: black;
 
   box-shadow:
-    0 calc($size/40) calc($size/40) rgba(0, 0, 0, 0.25),
-    inset 0 0 0 calc($size/8) white,
-    inset 0 0 0 calc($size/4.8) rgba(0, 0, 0, 0.1),
-    inset 0 0 0 $size white;
+    0 calc(var(--size) / 40) calc(var(--size) / 40) rgba(0, 0, 0, 0.25),
+    inset 0 0 0 calc(var(--size) / 8) white,
+    inset 0 0 0 calc(var(--size) / 4.8) rgba(0, 0, 0, 0.1),
+    inset 0 0 0 var(--size) white;
 
   $inner-size: 30%;
   &::after {
@@ -39,7 +46,7 @@ $border: 1px solid #efefef;
     border-radius: 50%;
     box-sizing: border-box;
     background-color: var(--surface-0);
-    box-shadow: inset 0 calc($size/40) calc($size/40) rgba(0, 0, 0, 0.25);
+    box-shadow: inset 0 calc(var(--size) / 40) calc(var(--size) / 40) rgba(0, 0, 0, 0.25);
   }
 }
 
@@ -78,7 +85,7 @@ $border: 1px solid #efefef;
     position: absolute;
     width: 1px;
     background-color: rgba(0, 0, 0, 0.1);
-    height: $size;
+    height: var(--size);
   }
 
   > * {
@@ -100,25 +107,26 @@ $border: 1px solid #efefef;
 
 @mixin key-pos($key-pos) {
   $a: ($key-pos - 4) * (math.$pi / 6);
-  $dist: $size * 0.33;
+  $dist: calc(var(--size) * 0.33);
 
-  transform: translate(cos($a) * $dist, sin($a) * $dist);
+  transform: translate(calc(cos($a) * $dist), calc(sin($a) * $dist));
 
   > .step {
-    transform: translate(cos($a) * ($size/10), sin($a) * ($size/10)) translate(-50%, -50%);
+    transform: translate(calc(cos($a) * (var(--size) / 10)), calc(sin($a) * (var(--size) / 10))) translate(-50%, -50%);
   }
 
   > .literal {
-    transform: translate(cos($a) * (-$size/12), sin($a) * (-$size/12)) translate(-50%, -50%);
+    transform: translate(calc(cos($a) * (calc(var(--size) * -1) / 12)), calc(sin($a) * (calc(var(--size) * -1) / 12)))
+      translate(-50%, -50%);
   }
 
   > .sig {
     transform: translate(-50%, -50%);
   }
 
   &::before {
-    transform: translate(cos($a) * -$dist, sin($a) * -$dist) translate(0%, -50%) rotate(calc(math.$pi / 12) * 1rad)
-      rotate(calc($a + math.$pi / 2) * 1rad);
+    transform: translate(calc(cos($a) * ($dist * -1)), calc(sin($a) * ($dist * -1))) translate(0%, -50%)
+      rotate(calc(math.$pi / 12) * 1rad) rotate(calc($a + math.$pi / 2) * 1rad);
   }
 }
 

diff --git a/src/app/tools/views/circle-of-fifths/circle-of-fifths.component.ts b/src/app/tools/views/circle-of-fifths/circle-of-fifths.component.ts
@@ -35,6 +35,9 @@ export class CircleOfFifthsComponent extends MusicTool {
   }
 
   public update(): void {
+    if (this.selectedMode === null) {
+      this.selectedTonic = 'C';
+    }
     this.circleSteps = this._keyFactory.getCircleOfFifths(this.selectedTonic, this.selectedMode);
   }
 }
diff --git a/src/app/utilities/mkj-comments/mkj-comments.component.html b/src/app/utilities/mkj-comments/mkj-comments.component.html
@@ -1,6 +1,6 @@
 <mkj-content-loader [loading]="initLoading">
   <div class="flex flex-column gap-2">
-    @for (c of comments; track c) {
+    @for (c of comments; track c.updated_at) {
       <ng-template [ngTemplateOutlet]="commentTemplate" [ngTemplateOutletContext]="{ $implicit: c }"></ng-template>
     }
   </div>
@@ -20,7 +20,7 @@
         ><span class="header-text">
           {{ comment.mitglied_name || 'Gelöschter Kommentar' }}
         </span>
-        @if (isAdmin || comment.mitglied_id === mitgliedId) {
+        @if (isAdmin || (comment.mitglied_id === mitgliedId && comment.mitglied_name)) {
           <i class="pi pi-trash ml-2 cursor-pointer" pTooltip="Kommentar löschen" (click)="deleteComment(comment)"></i>
         }
       </div>
@@ -60,7 +60,7 @@
     }
     @if (comment.subComments?.length > 0) {
       <div class="comment__subcomments">
-        @for (c of comment.subComments; track c) {
+        @for (c of comment.subComments; track c.updated_at) {
           <ng-template [ngTemplateOutlet]="commentTemplate" [ngTemplateOutletContext]="{ $implicit: c }"></ng-template>
         }
       </div>

diff --git a/src/app/utilities/mkj-comments/mkj-comments.component.ts b/src/app/utilities/mkj-comments/mkj-comments.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import { GetListInput } from 'src/app/interfaces/api-middleware';
 import { Kommentar } from 'src/app/models/Kommentar';
@@ -29,7 +29,8 @@ export class MkjCommentsComponent implements OnInit {
   constructor(
     private apiService: KommentarApiService,
     private userService: UserService,
-    private infoService: InfoService
+    private infoService: InfoService,
+    private cd: ChangeDetectorRef
   ) {}
 
   public ngOnInit(): void {
@@ -103,8 +104,10 @@ export class MkjCommentsComponent implements OnInit {
       .confirmDelete('Möchtest du diesen Kommentar wirklich löschen?', () => this.apiService.delete(comment.id))
       .subscribe((res) => {
         if (res?.id) {
-          comment = res;
+          comment = { ...comment, ...res };
           this.comments = [...this.comments];
+          console.log('comment', comment);
+          this.cd.detectChanges();
           return;
         }
         const parent = this.findParentComment(comment, this.comments);

diff --git a/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.ts b/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.ts
@@ -10,6 +10,7 @@ import { SubSink } from 'subsink';
 })
 export class MkjUserNotificationsComponent implements OnInit, OnDestroy {
   public menuItems: MenuItem[] = [];
+  public sidebarVisible = false;
 
   private _subs = new SubSink();
 

diff --git 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.9 - BETA';
 
 export interface MkjAppChangeLog {
   date: string;
@@ -7,6 +7,13 @@ export interface MkjAppChangeLog {
 }
 
 export const MkjAppChangeLog: MkjAppChangeLog[] = [
+  {
+    date: '01.05.2024',
+    version: '0.9.9 - BETA',
+    changes: {
+      Authorisierung: 'Das Passwort kann jetzt per E-Mail zurückgesetzt werden.',
+    },
+  },
   {
     date: '27.03.2024',
     version: '0.9.8 - BETA',