From 27ab4c870dd4f4b3bec5eb92c5f181ac00c17c55 Mon Sep 17 00:00:00 2001
From: adb-sh <git@adb.sh>
Date: Wed, 19 Oct 2022 10:52:30 +0200
Subject: [PATCH] implement embed mode; add MePage

---
 src/Api.ts                                 | 19 ++++-
 src/App.vue                                |  5 +-
 src/components/CurrentlyPlayingCompact.vue | 25 ++++++
 src/components/PromiseResolver.vue         |  1 +
 src/router/index.ts                        | 14 +++-
 src/views/AuthCallbackPage.vue             |  1 -
 src/views/MePage.vue                       | 39 +++++++++
 src/views/UserPage.vue                     | 97 +++++++++++++---------
 8 files changed, 157 insertions(+), 44 deletions(-)
 create mode 100644 src/components/CurrentlyPlayingCompact.vue
 create mode 100644 src/views/MePage.vue

diff --git a/src/Api.ts b/src/Api.ts
index fb021e5..1c38917 100644
--- a/src/Api.ts
+++ b/src/Api.ts
@@ -21,7 +21,11 @@ export class Api {
     this.baseURL = baseURL;
     this.authBaseURL = authBaseURL;
     this.publicBaseURL = publicBaseURL;
-    this.accessToken = accessToken ?? localStorage.getItem("access-token");
+    try{
+      this.accessToken = accessToken ?? localStorage?.getItem("access-token");
+    } catch (e) {
+      this.accessToken = null;
+    }
     this.axios = axios.create({ baseURL });
     this.axios.interceptors.request.use(({ headers = {}, ...config }) => ({
       ...config,
@@ -63,11 +67,20 @@ export class Api {
     return (await this.axiosPublic.get(`/users/${userId}/info`))?.data;
   }
 
+  async getSession() {
+    return (await this.axios.get(`/session`))?.data;
+  }
+  async createSession() {
+    return (await this.axios.post(`/session`))?.data;
+  }
+  async deleteSession() {
+    return (await this.axios.delete(`/session`))?.data;
+  }
   async joinSession(hostId: string) {
     return (await this.axios.post(`/session/join`, { hostId }))?.data;
   }
-  async leaveSession(hostId: string) {
-    return (await this.axios.post(`/session/session`, { hostId }))?.data;
+  async leaveSession() {
+    return (await this.axios.post(`/session/leave`))?.data;
   }
 }
 
diff --git a/src/App.vue b/src/App.vue
index a7a3ad8..beadaf7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,8 @@
 <template>
-  <div>
+  <div v-if="$route.meta.allowEmbed && $route.query.embed === 'true'" class="p-2">
+    <router-view />
+  </div>
+  <div v-else>
     <div class="bg-secondary shadow">
       <nav class="navbar px-2 container">
         <router-link class="d-flex btn" to="/">
diff --git a/src/components/CurrentlyPlayingCompact.vue b/src/components/CurrentlyPlayingCompact.vue
new file mode 100644
index 0000000..c6716ff
--- /dev/null
+++ b/src/components/CurrentlyPlayingCompact.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import { defineProps } from "vue";
+
+defineProps({
+  currentlyPlaying: Object,
+});
+</script>
+
+<template>
+  <div class="card">
+    <div class="card-body">
+      <div class="row">
+        <div class="col-3 col-md-2">
+          <img :src="currentlyPlaying.item.album.images[0].url" alt="album cover" class="card-img">
+        </div>
+        <div class="col">
+          <b>{{ currentlyPlaying?.item.name }}</b>
+          <div>
+            {{ currentlyPlaying?.item.artists.map(artist => artist.name).join(', ') }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/src/components/PromiseResolver.vue b/src/components/PromiseResolver.vue
index e35dc6e..0c1d469 100644
--- a/src/components/PromiseResolver.vue
+++ b/src/components/PromiseResolver.vue
@@ -59,6 +59,7 @@ const update = async (promise: Promise | unknown) => {
       : promise);
   } catch (e) {
     error.value = e;
+    console.error('PR', e);
   } finally {
     loading.value = false;
     showThrobber.value = false;
diff --git a/src/router/index.ts b/src/router/index.ts
index dc1ae0f..67e308d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -17,9 +17,21 @@ const routes: Array<RouteRecordRaw> = [
       requireAuth: true,
     },
   },
+  {
+    path: "/me",
+    name: "me",
+    component: () =>
+      import(/* webpackChunkName: "me" */ "../views/MePage.vue"),
+    meta: {
+      requireAuth: false,
+    },
+  },
   {
     path: "/user/:id",
     name: "user",
+    meta: {
+      allowEmbed: true,
+    },
     component: () =>
       import(/* webpackChunkName: "user" */ "../views/UserPage.vue"),
   },
@@ -33,7 +45,7 @@ const routes: Array<RouteRecordRaw> = [
     path: "/auth/callback",
     name: "authCallback",
     component: () =>
-      import(/* webpackChunkName: "auth" */ "../views/AuthCallbackPage.vue"),
+      import(/* webpackChunkName: "authCallback" */ "../views/AuthCallbackPage.vue"),
   },
 ];
 
diff --git a/src/views/AuthCallbackPage.vue b/src/views/AuthCallbackPage.vue
index b636bbc..6511965 100644
--- a/src/views/AuthCallbackPage.vue
+++ b/src/views/AuthCallbackPage.vue
@@ -14,7 +14,6 @@ const route = useRoute();
           code: route.query.code,
           state: route.query.state,
         })">
-          {{ $route.query }}
           <div class="alert alert-success">
             Authorization completed
           </div>
diff --git a/src/views/MePage.vue b/src/views/MePage.vue
new file mode 100644
index 0000000..26480f3
--- /dev/null
+++ b/src/views/MePage.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div>
+    <h1>Me</h1>
+    <PromiseResolver
+      :promise="$api.getSession()"
+      v-slot="slot"
+    >
+      <div class="card">
+        <div class="card-header">
+          Your session
+        </div>
+        <div class="card-body">
+          <p>
+            {{ slot }}
+          </p>
+          <b>Clients</b>
+        </div>
+        <div class="card-footer">
+          <button
+            class="btn btn-danger mx-1"
+            @click="$api.leaveSession().then(() => update($api.getSession()))"
+          >
+            leave Session
+          </button>
+          <button
+            class="btn btn-danger mx-1"
+            @click="$api.deleteSession().then(() => update($api.getSession()))"
+          >
+            delete Session
+          </button>
+        </div>
+      </div>
+    </PromiseResolver>
+  </div>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/UserPage.vue b/src/views/UserPage.vue
index f453f6b..1d1e496 100644
--- a/src/views/UserPage.vue
+++ b/src/views/UserPage.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import PromiseResolver from "@/components/PromiseResolver.vue";
 import CurrentlyPlaying from "@/components/CurrentlyPlaying.vue";
+import CurrentlyPlayingCompact from "@/components/CurrentlyPlayingCompact.vue";
 import { useRoute } from "vue-router";
 import { onBeforeUnmount, ref } from "vue";
 import { useApi } from "@/Api";
@@ -20,46 +21,66 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <h1>User</h1>
-  <PromiseResolver
-    :promise="userInfo"
-    v-slot="{ data: { user, currentlyPlaying } }"
-    class="row"
-  >
-    <div class="col-md-4">
-      <div class="card">
-        <div class="card-header">
-          {{ user.displayName }}
-        </div>
-        <div class="card-body">
-          <div class="row">
-            <div class="col-4">
-              <img :src="user.images[0].url" alt="user image" class="card-img">
-            </div>
-            <div class="col">
-              <p>{{ user.totalFollowers }} followers on Spotify</p>
+  <div v-if="$route.query.embed === 'true'">
+    <PromiseResolver
+      :promise="userInfo"
+      v-slot="{ data: { currentlyPlaying } }"
+    >
+      <CurrentlyPlayingCompact
+        v-if="currentlyPlaying?.item"
+        :currentlyPlaying="currentlyPlaying"
+        :compact="true"
+      />
+      <p v-else class="alert alert-info">
+        User is not listening to music.
+      </p>
+    </PromiseResolver>
+  </div>
+  <div v-else>
+    <h1>User</h1>
+    <PromiseResolver
+      :promise="userInfo"
+      v-slot="{ data: { user, currentlyPlaying } }"
+      class="row"
+    >
+      <div v-if="$route.query.embed === 'true'">
+
+      </div>
+      <div v-else class="col-md-4">
+        <div class="card">
+          <div class="card-header">
+            {{ user.displayName }}
+          </div>
+          <div class="card-body">
+            <div class="row">
+              <div class="col-4">
+                <img :src="user.images[0].url" alt="user image" class="card-img">
+              </div>
+              <div class="col">
+                <p>{{ user.totalFollowers }} followers on Spotify</p>
+              </div>
             </div>
           </div>
         </div>
+        <button
+          v-if="$api.isAuthorized()"
+          @click="$api.joinSession($route.params.id)"
+          class="btn btn-primary my-2"
+        >
+          Join Session
+        </button>
+        <router-link
+          v-else
+          to="/auth"
+          class="btn btn-primary my-2"
+        >
+          login with Spotify and join session
+        </router-link>
+      </div>
+      <div class="col">
+        <h2>Currently listening to:</h2>
+        <CurrentlyPlaying v-if="currentlyPlaying?.item" :currently-playing="currentlyPlaying" />
       </div>
-      <button
-        v-if="$api.isAuthorized()"
-        @click="$api.joinSession($route.params.id)"
-        class="btn btn-primary my-2"
-      >
-        Join Session
-      </button>
-      <router-link
-        v-else
-        to="/auth"
-        class="btn btn-primary my-2"
-      >
-        login with Spotify and join session
-      </router-link>
-    </div>
-    <div class="col">
-      <h2>Currently listening to:</h2>
-      <CurrentlyPlaying v-if="currentlyPlaying?.item" :currently-playing="currentlyPlaying" />
-    </div>
-  </PromiseResolver>
+    </PromiseResolver>
+  </div>
 </template>