Merge branch 'master' into contests

LittleBigRefresh · May 6, 2024 · 1b6e134 · 1b6e134
2 parents da399dc + 3c8addb
commit 1b6e134
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/src/app/api/token-storage.service.ts b/src/app/api/token-storage.service.ts
@@ -37,7 +37,12 @@ export class TokenStorageService {
         const str = localStorage.getItem(this.UserKey);
         if (!str) return null;
 
-        return JSON.parse(str);
+        try {
+            return JSON.parse(str);
+        } catch (e) {
+            console.error("Stored user is null");
+            return null;
+        }
     }
 
     public SetStoredUser(user: ExtendedUser): void {

diff --git a/src/app/components/level-preview/level-preview.component.html b/src/app/components/level-preview/level-preview.component.html
@@ -10,12 +10,12 @@
         <fa-icon [icon]="faCircleCheck" class="pr-1"></fa-icon>
       </tooltip>
       <level-statistics [level]="_level" class="text-sm"></level-statistics>
-      <p-gentle>by <user-link [user]="_level.publisher" class="pl-0.5" *ngIf="_level.publisher"
+      <p-gentle>by <tooltip [active]="_level.isReUpload"
+          [text]="'This level is a re-upload, originally published by ' + (_level.originalPublisher === null ? 'an unknown publisher' : _level.originalPublisher) + '.'"><user-link [user]="_level.publisher" class="pl-0.5" *ngIf="_level.publisher"
                                                        [ngClass]="_level.isReUpload ? 'line-through' : ''"></user-link>
-          <tooltip class="pl-0.5"
-              [text]="'This level is a re-upload, originally created by ' + _level.originalPublisher + '.'">
-              <span>{{ _level.originalPublisher }}</span>
-          </tooltip></p-gentle>
+
+              <span class="pl-0.5">{{ _level.originalPublisher }}</span>
+      </tooltip></p-gentle>
       <p-gentle>Created in {{getGameVersion(_level.gameVersion)}} <date [date]="_level.publishDate"></date></p-gentle>
     </div>
   </div>

diff --git a/src/app/components/tooltip/tooltip.component.html b/src/app/components/tooltip/tooltip.component.html
@@ -5,7 +5,7 @@
   py-2.5 px-5 bg-backdrop flex items-center justify-center
   transition-opacity duration-300
   not-italic text-foreground font-normal text-base whitespace-nowrap
-  rounded drop-shadow-lg">
+  rounded drop-shadow-lg" *ngIf="_active">
     {{_text}}
   </span>
 </div>
diff --git a/src/app/components/tooltip/tooltip.component.ts b/src/app/components/tooltip/tooltip.component.ts
@@ -6,9 +6,15 @@ import {Component, Input} from '@angular/core';
 })
 export class TooltipComponent {
     _text: string = "";
+    _active: boolean = true;
 
     @Input()
     set text(text: string) {
         this._text = text;
     }
+
+    @Input()
+    set active(active: boolean) {
+        this._active = active;
+    }
 }
diff --git a/src/app/pages/level/level.component.html b/src/app/pages/level/level.component.html
@@ -11,11 +11,12 @@
 
                 <div class="inline-block text-sm font-normal">
                     <span-gentle>by
+                        <tooltip [active]="level.isReUpload"
+                                            [text]="'This level is a re-upload, originally published by ' + (level.originalPublisher === null ? 'an unknown publisher' : level.originalPublisher) + '.'">
                         <user-link [user]="level.publisher" class="pl-1" *ngIf="level.publisher"
                                    [ngClass]="level.isReUpload ? 'line-through' : ''"></user-link>
-                        <tooltip *ngIf="level.isReUpload" class="pl-1"
-                            [text]="'This level is a re-upload, originally created by ' + level.originalPublisher + '.'">
-                            <span>{{ level.originalPublisher }}</span>
+
+                            <span class="pl-1">{{ level.originalPublisher }}</span>
                         </tooltip>
                     </span-gentle>
                 </div>