From 451135e8205a8a6edf1c878ee0adba5a81d2a62b Mon Sep 17 00:00:00 2001
From: Ryan Zembrodt <ryan.zembrodt@gmail.com>
Date: Thu, 9 Dec 2021 17:28:07 -0500
Subject: [PATCH] Fixed Spotify code not loading if set to fixed color
 initially

---
 README.md                                                     | 2 +-
 src/app/components/album-display/album-display.component.html | 2 +-
 src/app/components/album-display/album-display.component.ts   | 2 +-
 src/app/components/color-picker/color-picker.component.ts     | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7085d8f..18d867f 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,4 @@ Angular web application used to display your currently playing Spotify track wit
 
 Can interface with an external API to hide Spotify client secret. See https://github.com/zembrodt/showtunes-api for an implementation in Go.
 
-Application deployed to https://music.zembrodt.com
+Application deployed to https://showtunes.app
diff --git a/src/app/components/album-display/album-display.component.html b/src/app/components/album-display/album-display.component.html
index 0435e88..98db918 100644
--- a/src/app/components/album-display/album-display.component.html
+++ b/src/app/components/album-display/album-display.component.html
@@ -18,7 +18,7 @@
       </div>
     </div>
   </ng-template>
-  <div *ngIf="(showSpotifyCode$ | async) && (!spotifyCodeUrl || !smartBackgroundColor || !smartBarColor); else spotifyCode">
+  <div *ngIf="(showSpotifyCode$ | async) && !spotifyCodeUrl; else spotifyCode">
     <div class="qr-code-image">
       <div class="qr-code-placeholder" [ngClass.lt-md]="'qr-code-placeholder-sm'"
            fxLayout="column"
diff --git a/src/app/components/album-display/album-display.component.ts b/src/app/components/album-display/album-display.component.ts
index 103eb6b..52bffdd 100644
--- a/src/app/components/album-display/album-display.component.ts
+++ b/src/app/components/album-display/album-display.component.ts
@@ -116,7 +116,7 @@ export class AlbumDisplayComponent implements OnInit, OnDestroy {
   }
 
   private createSpotifyCodeUrl(backgroundColor, barColor: string): string {
-    if (this.track && this.track.uri) {
+    if (backgroundColor && barColor && this.track && this.track.uri) {
       return SPOTIFY_CODES_URL + '?uri='
         + encodeURIComponent('jpeg/'
           + backgroundColor + '/'
diff --git a/src/app/components/color-picker/color-picker.component.ts b/src/app/components/color-picker/color-picker.component.ts
index 387eecc..d876f72 100644
--- a/src/app/components/color-picker/color-picker.component.ts
+++ b/src/app/components/color-picker/color-picker.component.ts
@@ -57,7 +57,6 @@ export class ColorPickerComponent implements OnInit, OnDestroy {
   }
 
   onPresetColorSelect(presetColor: string): void {
-    console.log('Preset color selected: \'' + presetColor + '\'');
     this.setColorChange(presetColor);
   }