From 95b5b99484b7db990b412b91b86c942e73b6b273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Pe=C3=B1a?= Date: Mon, 13 Jun 2022 09:53:36 +0000 Subject: [PATCH] Fix embed widget not working --- api/config/settings/common.py | 2 +- changes/changelog.d/1783.bugfix | 1 + front/{public => }/embed.html | 3 ++- front/src/components/library/AlbumBase.vue | 2 +- front/src/{ => embed}/EmbedFrame.vue | 7 ++++--- front/src/{ => embed}/embed.js | 3 +-- front/vite.config.js | 8 ++++++++ 7 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 changes/changelog.d/1783.bugfix rename front/{public => }/embed.html (84%) rename front/src/{ => embed}/EmbedFrame.vue (99%) rename front/src/{ => embed}/embed.js (84%) diff --git a/api/config/settings/common.py b/api/config/settings/common.py index 33fbceda2..3fe52fdfb 100644 --- a/api/config/settings/common.py +++ b/api/config/settings/common.py @@ -162,7 +162,7 @@ FUNKWHALE_SPA_HTML_CACHE_DURATION = env.int( "FUNKWHALE_SPA_HTML_CACHE_DURATION", default=60 * 15 ) FUNKWHALE_EMBED_URL = env( - "FUNKWHALE_EMBED_URL", default=FUNKWHALE_URL + "/front/embed.html" + "FUNKWHALE_EMBED_URL", default=FUNKWHALE_URL + "/front/embed/" ) FUNKWHALE_SPA_REWRITE_MANIFEST = env.bool( "FUNKWHALE_SPA_REWRITE_MANIFEST", default=True diff --git a/changes/changelog.d/1783.bugfix b/changes/changelog.d/1783.bugfix new file mode 100644 index 000000000..c2e650a03 --- /dev/null +++ b/changes/changelog.d/1783.bugfix @@ -0,0 +1 @@ +Fixes embed player (#1783) (1783) diff --git a/front/public/embed.html b/front/embed.html similarity index 84% rename from front/public/embed.html rename to front/embed.html index 3f1aa22e5..1f7f6c51a 100644 --- a/front/public/embed.html +++ b/front/embed.html @@ -6,8 +6,9 @@ - + Funkwhale Widget + diff --git a/front/src/components/library/AlbumBase.vue b/front/src/components/library/AlbumBase.vue index 1373e0d6e..948f01c25 100644 --- a/front/src/components/library/AlbumBase.vue +++ b/front/src/components/library/AlbumBase.vue @@ -292,7 +292,7 @@ export default { return this.object.tracks_count }, isChannel () { - return this.object.artist.channel !== null + return !!this.object.artist.channel }, isSerie () { return this.object.artist.content_category === 'podcast' diff --git a/front/src/EmbedFrame.vue b/front/src/embed/EmbedFrame.vue similarity index 99% rename from front/src/EmbedFrame.vue rename to front/src/embed/EmbedFrame.vue index 039cc6578..6da9f99f6 100644 --- a/front/src/EmbedFrame.vue +++ b/front/src/embed/EmbedFrame.vue @@ -43,7 +43,7 @@ Cover @@ -246,7 +246,7 @@