From ec32724ed391de54dcdadc40bcc7690ab730bac6 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:53:33 -0800
Subject: [PATCH] fixed 'song' to 'item' in collection view, added see all to
 top songs on artist page

---
 resources/cider-ui-tests/style.less           | 24 +++++++------------
 .../cider-ui-tests/views/pages/artist.ejs     |  9 ++++++-
 .../views/pages/collection-list.ejs           |  4 ++--
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/resources/cider-ui-tests/style.less b/resources/cider-ui-tests/style.less
index 488fda9c..2605ee29 100644
--- a/resources/cider-ui-tests/style.less
+++ b/resources/cider-ui-tests/style.less
@@ -1496,18 +1496,18 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   color: white;
 }
 
+.well {
+  background: rgba(200, 200, 200, 0.05);
+  border-radius: 10px;
+  padding: var(--contentInnerPadding);
+  box-shadow: rgb(0 0 0 / 8%) 0px 0px 0px 1px;
+  margin-top: 16px;
+}
+
 /* Album / Playlist Page */
 .playlist-page {
   padding: 0px;
 
-  .well {
-    background: rgba(200, 200, 200, 0.05);
-    border-radius: 10px;
-    padding: var(--contentInnerPadding);
-    box-shadow: rgb(0 0 0 / 8%) 0px 0px 0px 1px;
-    margin-top: 16px;
-  }
-
   .playlist-body {
     padding: var(--contentInnerPadding);
   }
@@ -1675,14 +1675,6 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
     padding: var(--contentInnerPadding);
   }
 
-  .well {
-    background: rgba(200, 200, 200, 0.05);
-    border-radius: 10px;
-    padding: var(--contentInnerPadding);
-    box-shadow: rgb(0 0 0 / 8%) 0px 0px 0px 1px;
-    margin-top: 16px;
-  }
-
   .showmoreless {
     font-family: inherit;
     font-size: 16px;
diff --git a/resources/cider-ui-tests/views/pages/artist.ejs b/resources/cider-ui-tests/views/pages/artist.ejs
index 043f7c0a..a1b98ec0 100644
--- a/resources/cider-ui-tests/views/pages/artist.ejs
+++ b/resources/cider-ui-tests/views/pages/artist.ejs
@@ -34,7 +34,14 @@
                             </div>
                         </div>
                         <div class="col" v-if="data.views['top-songs']">
-                            <h3>Top Songs</h3>
+                            <div class="row">
+                                <div class="col" style="padding:0px;">
+                                    <h3>Top Songs</h3>
+                                </div>
+                                <div class="col-auto flex-center" v-if="data.views['top-songs'].data.length >= 10" style="padding:0px;">
+                                    <button class="cd-btn-seeall" @click="app.showArtistView(data.id, data.attributes.name + ' - Top Songs', 'top-songs')">See All</button>
+                                </div>
+                            </div>
                             <mediaitem-list-item
                                     v-for="song in data.views['top-songs'].data.limit(topSongsExpanded ? 10 : 5)"
                                     :item="song"></mediaitem-list-item>
diff --git a/resources/cider-ui-tests/views/pages/collection-list.ejs b/resources/cider-ui-tests/views/pages/collection-list.ejs
index fae7cbae..02fd3b99 100644
--- a/resources/cider-ui-tests/views/pages/collection-list.ejs
+++ b/resources/cider-ui-tests/views/pages/collection-list.ejs
@@ -1,7 +1,7 @@
 <script type="text/x-template" id="cider-collection-list">
     <div class="content-inner collection-page">
         <h3 class="header-text">{{ title }}</h3>
-        <div v-if="data['data'] != 'null'">
+        <div v-if="data['data'] != 'null'" class="well">
             <template v-for="item in data.data">
                 <template v-if="item.type == 'artists'">
                     <mediaitem-square-large :item="item"></mediaitem-square-large>
@@ -9,7 +9,7 @@
                 <template v-else>
                     <mediaitem-list-item
                             v-if="item.attributes.playParams.kind == 'song'"
-                            :item="song"></mediaitem-list-item>
+                            :item="item"></mediaitem-list-item>
                     <mediaitem-mvview v-else-if="item.attributes.playParams.kind == 'musicVideo'" :item="item"></mediaitem-mvview>
                     <mediaitem-square-large v-else :item="item"></mediaitem-square-large>
                 </template>