mirror
/
funkwhale
kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix embed widget not working

1373-login-form-move-reset-your-password-link
Marcos Peña 2022-06-13 09:53:36 +00:00 zatwierdzone przez Georg Krause
rodzic 86d73067da
commit 95b5b99484
7 zmienionych plików z 18 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
api/config/settings/common.py
Wyświetl plik

@ -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

1
changes/changelog.d/1783.bugfix 100644
Wyświetl plik

@ -0,0 +1 @@
Fixes embed player (#1783) (1783)

3
front/public/embed.html → front/embed.html
Wyświetl plik

@ -6,8 +6,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="generator" content="Funkwhale">
<link rel="icon" href="<%= BASE_URL %>favicon.png">
<link rel="icon" href="/favicon.png">
<title>Funkwhale Widget</title>
<script type="module" src="/src/embed/embed.js"></script>
</head>
<body>

2
front/src/components/library/AlbumBase.vue
Wyświetl plik

@ -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'

7
front/src/EmbedFrame.vue → front/src/embed/EmbedFrame.vue
Wyświetl plik

@ -43,7 +43,7 @@
<img
v-else
height="120"
src="./assets/embed/default-cover.jpeg"
src="@/assets/embed/default-cover.jpeg"
alt="Cover"
>
</aside>
@ -246,7 +246,7 @@
<script>
import axios from 'axios'
import Logo from '@/components/Logo'
import Logo from '@/components/Logo.vue'
import url from '@/utils/url'
import time from '@/utils/time'
@ -259,6 +259,7 @@ function getURLParams () {
const query = window.location.search.substring(1)
while ((match = search.exec(query)) !== null) { urlParams[decode(match[1])] = decode(match[2]) }
return urlParams
}
export default {
@ -529,7 +530,7 @@ export default {
</script>
<style lang="scss">
@import "~plyr/src/sass/plyr.scss";
@import "plyr/src/sass/plyr.scss";
html,
body,

3
front/src/embed.js → front/src/embed/embed.js
Wyświetl plik

@ -1,12 +1,11 @@
import Vue from 'vue'
import EmbedFrame from './EmbedFrame'
import EmbedFrame from './EmbedFrame.vue'
import VuePlyr from 'vue-plyr'
Vue.use(VuePlyr)
Vue.config.productionTip = false
/* eslint-disable no-new */
new Vue({
el: '#app',

8
front/vite.config.js
Wyświetl plik

@ -30,4 +30,12 @@ export default defineConfig({
"@": path.resolve(__dirname, "./src"),
},
},
build: {
rollupOptions: {
input: {
main: path.resolve(__dirname, './index.html'),
embed: path.resolve(__dirname, './embed.html')
}
}
}
})