From e5c3a01a719808d8b40ff3746f22ba387d7c96ca Mon Sep 17 00:00:00 2001
From: novatorem <anovaec@gmail.com>
Date: Sun, 19 Jul 2020 21:44:38 -0400
Subject: [PATCH] Restyled

---
 api/spotify-playing.py        |   3 +-
 api/templates/preview.html    | 106 ++++++++++++++++++++++++++++++++++
 api/templates/spotify.html.j2 |  64 ++++++++++++--------
 3 files changed, 146 insertions(+), 27 deletions(-)
 create mode 100644 api/templates/preview.html

diff --git a/api/spotify-playing.py b/api/spotify-playing.py
index 57ce848..b6811f2 100644
--- a/api/spotify-playing.py
+++ b/api/spotify-playing.py
@@ -42,7 +42,6 @@ def refresh_token():
 
     response = requests.post(SPOTIFY_URL_REFRESH_TOKEN, data=data, headers=headers)
     repsonse_json = response.json()
-    print(repsonse_json)
     return repsonse_json["access_token"]
 
 
@@ -106,7 +105,7 @@ def make_svg(data):
 
     if data == {}:
         # Get recently play
-        title_text = "Currently playing"
+        title_text = "Last listening to"
         content_bar = ""
 
         recent_plays = get_recently_play()
diff --git a/api/templates/preview.html b/api/templates/preview.html
new file mode 100644
index 0000000..fdb35fc
--- /dev/null
+++ b/api/templates/preview.html
@@ -0,0 +1,106 @@
+<div xmlns="http://www.w3.org/1999/xhtml" class="container">
+    <style>
+        div {
+            font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+        }
+
+        .main {
+            display: flex;
+        }
+
+        .art {
+            float: left;
+            width: 33.33%;
+        }
+
+        .container {
+            background-color: #121212;
+            border-radius: 10px;
+            padding: 10px 10px
+        }
+
+        .playing {
+            font-weight: bold;
+            color: #53b14f;
+            text-align: center;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .not-play {
+            color: #ff1616;
+        }
+
+        .artist {
+            font-weight: bold;
+            font-size: 24px;
+            color: #fff;
+            text-align: left;
+            margin-top: 5px;
+        }
+
+        .song {
+            font-size: 20px;
+            color: #b3b3b3;
+            text-align: left;
+            margin-top: 15px;
+            margin-bottom: 15px;
+        }
+
+        .logo {
+            margin-left: 5px;
+            margin-top: 5px;
+        }
+
+        .cover {
+            border-radius: 5px;
+            margin-top: 9px;
+        }
+
+        #bars {
+            height: 30px;
+            margin: -20px 0 0 0px;
+            position: absolute;
+            width: 40px;
+        }
+
+        .bar {
+            background: #53b14f;
+            bottom: 1px;
+            height: 3px;
+            position: absolute;
+            width: 3px;
+            animation: sound 0ms -800ms linear infinite alternate;
+        }
+
+        @keyframes sound {
+            0% {
+                opacity: .35;
+                height: 3px;
+            }
+
+            100% {
+                opacity: 1;
+                height: 28px;
+            }
+        }
+
+        
+    </style>
+    <div class="main">
+        <a class="art" href="{}" target="_BLANK">
+            <center>
+                    <img src="data:image/png;base64, {{img}}" width="200" height="200" class="cover" />
+            </center>
+        </a>
+
+        <div class="text">
+            <div class="artist">Artist</div>
+            <div class="song">Song</div>
+            <div id="bars"></div>
+        </div>
+    </div>
+    
+
+</div>
\ No newline at end of file
diff --git a/api/templates/spotify.html.j2 b/api/templates/spotify.html.j2
index 789500e..9ca473b 100644
--- a/api/templates/spotify.html.j2
+++ b/api/templates/spotify.html.j2
@@ -6,6 +6,15 @@
                     font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
                 }
 
+                .main {
+                    display: flex;
+                }
+
+                .art {
+                    float: left;
+                    width: 33.33%;
+                }
+
                 .container {
                     background-color: #121212;
                     border-radius: 10px;
@@ -27,17 +36,17 @@
 
                 .artist {
                     font-weight: bold;
-                    font-size: 20px;
+                    font-size: 24px;
                     color: #fff;
-                    text-align: center;
+                    text-align: left;
                     margin-top: 5px;
                 }
 
                 .song {
-                    font-size: 16px;
+                    font-size: 20px;
                     color: #b3b3b3;
-                    text-align: center;
-                    margin-top: 5px;
+                    text-align: left;
+                    margin-top: 15px;
                     margin-bottom: 15px;
                 }
 
@@ -66,7 +75,7 @@
                     width: 3px;
                     animation: sound 0ms -800ms linear infinite alternate;
                 }
-
+                
                 @keyframes sound {
                     0% {
                         opacity: .35;
@@ -84,26 +93,31 @@
 
             {% if song_name %}
 
-            <div class="playing">
-
-                {{title_text}} on
-                <img class="logo"
-                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAE5ElEQVRYR81WS08bVxQ+dzweY48fQCCBllJDmqpRSx6gKizSiAUbILZjA21KVEhF20hNlLb/IKu2m3QRKaqQogIRkAXhYQxFSJGCQqVKrVSBQtpCFqEQkrQhxnb8Yjxzp7oTmdjjsWd4LHIlLzz3PL57zvedexG8Qgu9Qlhg22Bqumr0+/L2VdAMOpBvtdgCoedBnhPvsw/YpcFLg9x2DrklMA19DVajkf4B0dQnAMDkSJgQedwfWot9fevcraBWYJrA1HXX5RUWWG8jhGq1Bk7aiVj8PfGfWOc754uq+aqCOXXT8bFOTw2oBVLb5zmhw9s6fj2XXU4wniFnF6LRF2qJtO6LPPQMN3s/zWafFcxuA0kCwILYO+IZO6sESBHMbrUmWwVwQjw70jLWK9/PAEPIuqfQFtNa+u3acU8wKyd1BhjPqPNXJdVgHkP8WRwiqxGI/RsDLsSBiEXQGXRgKDCAqcQk/RgbA4hS1QXx/WPYPVaTepg0LzJHTBZmcy5wQQ5mL89CeCUMIGqvAQFjLjeD/aQdiqqLsoKLh/nCiTMT68nIaWA8Q45riKY6k5szF2YgEU5oR5HFkn2dhUNfHQLjXmOaBRZw34jHRwaotNLANHtdG6mTdaF3AVZvrwJCCNgyFoqOFIHtgA2MxUbQGXXSdyxg4MM8RJ9EYf2vdfDf80PsaUyxkqSNtd+nzU1+yOXVZ4Ahd429pCzjTiG80MIBeVH4GA/Lk8uw/PMyEL4lV9XFKiiuLt78H/2Hy5u8OEmK8LIyjb2Nbxvz9Qu5eiIKokTcuD8OfISXTk+zNOQV5r0grk6ZuIGFAMxdnpMIf+LHE0Dpqc00XCT+nq9t6l4aGOeNpia9iR6XgyHKuXv1rjYSI5BaWN5QDqUflAJFv0ya7ZBCHLeMfuQbSgPTPnG6LcLH+uVOM+dnIBFRIHGyCDlURgh7+JvDYCo1ZS04qzd3Xm/s/0lTZQJ/B2BxYBHK6sug+Ggx6M16Ge1BahdRHSHvytQKhB6E0pITMLXfKV/4QgK3jLbIKqOFM1vROFHW/NX5zdFw7NtjwL7GZoSIB/mqifaJ+bTKtF5qZfBRTmK14hIBuOccRB5GIPIoAhv+DeDjPDBWBsxvmMFaaQVDviGjaut/rkNgMQAVpyoUwyqqiVg2e11E2pu6l7xFgDtf3gEiVS2LgNv/4X4oPV6qxVx5zhBPz5CjG9FU2vUuiiJMd05LcrRWWKHg3QKwvGkBJv/FHUQkHl4Ow9rsGhAJp86USncl2F32rKCwgG+MeHxtSYO0wVDfVW+zlbABLUfKLlUBFvsW4fEvjyWTg50HJZkrrfDT+J6pz6b8imCk6ow4f0MUen8ngKTuCiIsjS+B3WFXnOAiFueG3WNHUvNkjExHl8PElFCRnYJR83/2MGiZPj8dzgmGbLoGT7bTjC7jJaaWQOs+zwmfe1vHr8ntc7yBXd2IBsW3qtakSnYixgPDbt8Zpb2cTzL3sLOH0qGOnSRP9c0FhNipvg/dN5s6KD3ds1NA2Vqjyhl5YkJq/V40gyhUvVVQRDX+R6HjcrJuuU1yh6b+pgLGSF2hdNRpAKBzAOOxgAejfu5C6hxRO4hqm7IFaLjSYKCL8Fs6HfOO1WK1haKhYCKKF3AA30++3NSSa1bTVgPthv22K7MbyeUx/gfIiuIzZiZJFQAAAABJRU5ErkJggg==" />
-            </div>
-            <div class="artist">{{artist_name}}</div>
-            <div class="song">{{song_name}}</div>
-            <div id='bars'>
-                {{content_bar|safe}}
+            <div class="main">
+                <a class="art" href="{}" target="_BLANK">
+                    <center>
+                            <img src="data:image/png;base64, {{img}}" width="300" height="300" class="cover" />
+                    </center>
+                </a>
+
+                <div class="text">
+                    <div class="playing">
+
+                        {{title_text}} on
+                        <img class="logo"
+                            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAE5ElEQVRYR81WS08bVxQ+dzweY48fQCCBllJDmqpRSx6gKizSiAUbILZjA21KVEhF20hNlLb/IKu2m3QRKaqQogIRkAXhYQxFSJGCQqVKrVSBQtpCFqEQkrQhxnb8Yjxzp7oTmdjjsWd4LHIlLzz3PL57zvedexG8Qgu9Qlhg22Bqumr0+/L2VdAMOpBvtdgCoedBnhPvsw/YpcFLg9x2DrklMA19DVajkf4B0dQnAMDkSJgQedwfWot9fevcraBWYJrA1HXX5RUWWG8jhGq1Bk7aiVj8PfGfWOc754uq+aqCOXXT8bFOTw2oBVLb5zmhw9s6fj2XXU4wniFnF6LRF2qJtO6LPPQMN3s/zWafFcxuA0kCwILYO+IZO6sESBHMbrUmWwVwQjw70jLWK9/PAEPIuqfQFtNa+u3acU8wKyd1BhjPqPNXJdVgHkP8WRwiqxGI/RsDLsSBiEXQGXRgKDCAqcQk/RgbA4hS1QXx/WPYPVaTepg0LzJHTBZmcy5wQQ5mL89CeCUMIGqvAQFjLjeD/aQdiqqLsoKLh/nCiTMT68nIaWA8Q45riKY6k5szF2YgEU5oR5HFkn2dhUNfHQLjXmOaBRZw34jHRwaotNLANHtdG6mTdaF3AVZvrwJCCNgyFoqOFIHtgA2MxUbQGXXSdyxg4MM8RJ9EYf2vdfDf80PsaUyxkqSNtd+nzU1+yOXVZ4Ahd429pCzjTiG80MIBeVH4GA/Lk8uw/PMyEL4lV9XFKiiuLt78H/2Hy5u8OEmK8LIyjb2Nbxvz9Qu5eiIKokTcuD8OfISXTk+zNOQV5r0grk6ZuIGFAMxdnpMIf+LHE0Dpqc00XCT+nq9t6l4aGOeNpia9iR6XgyHKuXv1rjYSI5BaWN5QDqUflAJFv0ya7ZBCHLeMfuQbSgPTPnG6LcLH+uVOM+dnIBFRIHGyCDlURgh7+JvDYCo1ZS04qzd3Xm/s/0lTZQJ/B2BxYBHK6sug+Ggx6M16Ge1BahdRHSHvytQKhB6E0pITMLXfKV/4QgK3jLbIKqOFM1vROFHW/NX5zdFw7NtjwL7GZoSIB/mqifaJ+bTKtF5qZfBRTmK14hIBuOccRB5GIPIoAhv+DeDjPDBWBsxvmMFaaQVDviGjaut/rkNgMQAVpyoUwyqqiVg2e11E2pu6l7xFgDtf3gEiVS2LgNv/4X4oPV6qxVx5zhBPz5CjG9FU2vUuiiJMd05LcrRWWKHg3QKwvGkBJv/FHUQkHl4Ow9rsGhAJp86USncl2F32rKCwgG+MeHxtSYO0wVDfVW+zlbABLUfKLlUBFvsW4fEvjyWTg50HJZkrrfDT+J6pz6b8imCk6ow4f0MUen8ngKTuCiIsjS+B3WFXnOAiFueG3WNHUvNkjExHl8PElFCRnYJR83/2MGiZPj8dzgmGbLoGT7bTjC7jJaaWQOs+zwmfe1vHr8ntc7yBXd2IBsW3qtakSnYixgPDbt8Zpb2cTzL3sLOH0qGOnSRP9c0FhNipvg/dN5s6KD3ds1NA2Vqjyhl5YkJq/V40gyhUvVVQRDX+R6HjcrJuuU1yh6b+pgLGSF2hdNRpAKBzAOOxgAejfu5C6hxRO4hqm7IFaLjSYKCL8Fs6HfOO1WK1haKhYCKKF3AA30++3NSSa1bTVgPthv22K7MbyeUx/gfIiuIzZiZJFQAAAABJRU5ErkJggg==" />
+                    </div>
+                    <div class="artist">{{artist_name}}</div>
+                    <div class="song">{{song_name}}</div>
+                    <div id='bars'>
+                        {{content_bar|safe}}
+                    </div>
+                </div>
+
+                {% else %}
+                    <div class="playing not-play">Nothing playing on Spotify</div>
+                {% endif %}
             </div>
-            <a href="{}" target="_BLANK">
-                <center>
-                        <img src="data:image/png;base64, {{img}}" width="300" height="300" class="cover" />
-                </center>
-            </a>
-
-            {% else %}
-                <div class="playing not-play">Nothing playing on Spotify</div>
-            {% endif %}
 
         </div>
     </foreignObject>