diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 36c361c3..959856ff 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -52,6 +52,7 @@ export class BrowserWindow {
"pages/plugins-github",
"pages/replay",
"pages/audiolabs",
+ "pages/zoo",
"components/mediaitem-artwork",
"components/artwork-material",
"components/menu-panel",
@@ -80,9 +81,15 @@ export class BrowserWindow {
"components/lyrics-view",
"components/fullscreen",
"components/miniplayer",
- "components/castmenu"
+ "components/castmenu",
+ "components/artist-chip",
],
appRoutes: [
+ {
+ page: "zoo",
+ component: "",
+ condition: "page == 'zoo'"
+ },
{
page: "podcasts",
component: ``,
diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index 54126356..afed7b74 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -1703,6 +1703,65 @@ input[type=checkbox][switch]:checked:active::before {
align-items: center;
}
+.artist-chip {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ margin: 4px 0px;
+ border-radius: 4px;
+ color: white;
+ font-size: 1em;
+ font-weight: 500;
+ cursor: pointer;
+ padding: 8px;
+
+ &:hover {
+ background: var(--selected);
+ }
+
+ .artist-chip__follow {
+ appearance: none;
+ border: 0;
+ height: 32px;
+ width: 32px;
+ background: #ffffff0f;
+ margin: 0px 0px 0px 10px;
+ font-weight: bold;
+ color: white;
+ border-radius: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 12px;
+ cursor: pointer;
+ flex: 0 0 32px;
+
+ &:hover {
+ background: var(--selected);
+ }
+ }
+
+ .artist-chip__image {
+ width: 32px;
+ height: 32px;
+ background-size: contain;
+ background-position: center;
+ background-repeat: no-repeat;
+ border-radius: 100%;
+ overflow: hidden;
+ margin: 0px 12px 0px 0px;
+ pointer-events: none;
+ flex: 0 0 32px;
+
+ .mediaitem-artwork {
+ border-radius: inherit;
+ }
+ }
+ .artist-chip__name {
+ pointer-events: none;
+ }
+}
+
.search-panel {
background: rgb(0 0 0 / 50%);
}
diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index 5a4b4397..41fc5ea4 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -376,7 +376,7 @@
.playlist-name {
font-weight: 700;
font-size: 1.6rem;
- margin-bottom: 6px;
+ //margin-bottom: 6px;
margin-right: 6px;
flex-shrink: unset;
}
diff --git a/src/renderer/views/components/artist-chip.ejs b/src/renderer/views/components/artist-chip.ejs
new file mode 100644
index 00000000..fade83b4
--- /dev/null
+++ b/src/renderer/views/components/artist-chip.ejs
@@ -0,0 +1,50 @@
+
+
+
\ No newline at end of file
diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index 902fcadb..83af37e7 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -39,10 +39,11 @@
@change="editPlaylist"
@keydown.enter="editPlaylist"/>
{{getArtistName(data)}}
+
@@ -198,7 +199,8 @@
app: this.$root,
itemBadges: [],
badgesRequested: false,
- headerVisible: true
+ headerVisible: true,
+ useArtistChip: false
}
},
mounted: function () {
@@ -248,10 +250,11 @@
setTimeout(() => this.confirm = false, 3000);
},
getArtistName(data) {
- console.log(data.attributes)
if (data.attributes.artistName) {
+ this.useArtistChip = true
return data.attributes.artistName
} else if (data.attributes.artist) {
+ this.useArtistChip = true
return data.attributes.artist.attributes.name
} else if (data.attributes.curatorName) {
return data.attributes.curatorName
diff --git a/src/renderer/views/pages/zoo.ejs b/src/renderer/views/pages/zoo.ejs
index 6b065883..e36155e6 100644
--- a/src/renderer/views/pages/zoo.ejs
+++ b/src/renderer/views/pages/zoo.ejs
@@ -1,9 +1,33 @@
-
+
+
\ No newline at end of file