diff --git a/front/config/prod.env.js b/front/config/prod.env.js index decfe361..773d263d 100644 --- a/front/config/prod.env.js +++ b/front/config/prod.env.js @@ -1,4 +1,3 @@ module.exports = { - NODE_ENV: '"production"', - BACKEND_URL: '"/"' + NODE_ENV: '"production"' } diff --git a/front/src/App.vue b/front/src/App.vue index 73e46328..56dbe0aa 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -39,7 +39,13 @@ {{ $t('Issue tracker') }} - {{ $t('Use another instance') }} + + {{ $t('Use another instance') }} + +
diff --git a/front/src/audio/backend.js b/front/src/audio/backend.js index 619f3cef..5a82719a 100644 --- a/front/src/audio/backend.js +++ b/front/src/audio/backend.js @@ -1,5 +1,3 @@ -import config from '@/config' - var Album = { clean (album) { // we manually rebind the album and artist to each child track @@ -21,21 +19,6 @@ var Artist = { } } export default { - absoluteUrl (url) { - if (url.startsWith('http')) { - return url - } - if (url.startsWith('/')) { - let rootUrl = ( - window.location.protocol + '//' + window.location.hostname + - (window.location.port ? ':' + window.location.port : '') - ) - return rootUrl + url - } else { - return config.BACKEND_URL + url - } - }, Artist: Artist, Album: Album - } diff --git a/front/src/audio/track.js b/front/src/audio/track.js deleted file mode 100644 index 9873b74e..00000000 --- a/front/src/audio/track.js +++ /dev/null @@ -1,7 +0,0 @@ -import backend from './backend' - -export default { - getCover (track) { - return backend.absoluteUrl(track.album.cover) - } -} diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue index 87c374a3..de018907 100644 --- a/front/src/components/Sidebar.vue +++ b/front/src/components/Sidebar.vue @@ -125,7 +125,7 @@ {{ index + 1}} - + diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue index 3c922e14..1cc27970 100644 --- a/front/src/components/audio/Player.vue +++ b/front/src/components/audio/Player.vue @@ -14,7 +14,7 @@
- +
@@ -143,7 +143,6 @@ import {mapState, mapGetters, mapActions} from 'vuex' import GlobalEvents from '@/components/utils/global-events' import ColorThief from '@/vendor/color-thief' -import Track from '@/audio/track' import AudioTrack from '@/components/audio/Track' import TrackFavoriteIcon from '@/components/favorites/TrackFavoriteIcon' import TrackPlaylistIcon from '@/components/playlists/TrackPlaylistIcon' @@ -162,7 +161,6 @@ export default { isShuffling: false, renderAudio: true, sliderVolume: this.volume, - Track: Track, defaultAmbiantColors: defaultAmbiantColors, ambiantColors: defaultAmbiantColors } diff --git a/front/src/components/audio/SearchBar.vue b/front/src/components/audio/SearchBar.vue index 99896d04..9b6dc50e 100644 --- a/front/src/components/audio/SearchBar.vue +++ b/front/src/components/audio/SearchBar.vue @@ -11,11 +11,8 @@