diff --git a/frontend/vue/components/Admin/Logs.vue b/frontend/vue/components/Admin/Logs.vue index 2cc97e2e6..96eb8882c 100644 --- a/frontend/vue/components/Admin/Logs.vue +++ b/frontend/vue/components/Admin/Logs.vue @@ -26,21 +26,19 @@ - diff --git a/frontend/vue/components/Admin/Shoutcast.vue b/frontend/vue/components/Admin/Shoutcast.vue index ba688668c..1f410415d 100644 --- a/frontend/vue/components/Admin/Shoutcast.vue +++ b/frontend/vue/components/Admin/Shoutcast.vue @@ -70,40 +70,39 @@ - diff --git a/frontend/vue/components/Admin/StereoTool.vue b/frontend/vue/components/Admin/StereoTool.vue index 205d31064..5f2fec2f0 100644 --- a/frontend/vue/components/Admin/StereoTool.vue +++ b/frontend/vue/components/Admin/StereoTool.vue @@ -77,43 +77,46 @@ - diff --git a/frontend/vue/components/Form/BFormMarkup.vue b/frontend/vue/components/Form/BFormMarkup.vue index 8c38c986d..a629ed664 100644 --- a/frontend/vue/components/Form/BFormMarkup.vue +++ b/frontend/vue/components/Form/BFormMarkup.vue @@ -13,34 +13,21 @@ - - diff --git a/frontend/vue/components/Form/BWrappedFormCheckbox.vue b/frontend/vue/components/Form/BWrappedFormCheckbox.vue index d6e76999c..24186d2c6 100644 --- a/frontend/vue/components/Form/BWrappedFormCheckbox.vue +++ b/frontend/vue/components/Form/BWrappedFormCheckbox.vue @@ -23,56 +23,49 @@ - - diff --git a/frontend/vue/components/Form/BWrappedFormGroup.vue b/frontend/vue/components/Form/BWrappedFormGroup.vue index b182005f1..9c4b31de4 100644 --- a/frontend/vue/components/Form/BWrappedFormGroup.vue +++ b/frontend/vue/components/Form/BWrappedFormGroup.vue @@ -29,98 +29,96 @@ - - diff --git a/frontend/vue/components/Form/VuelidateError.vue b/frontend/vue/components/Form/VuelidateError.vue index c2fa91c0c..bce5303f9 100644 --- a/frontend/vue/components/Form/VuelidateError.vue +++ b/frontend/vue/components/Form/VuelidateError.vue @@ -6,76 +6,79 @@ - diff --git a/frontend/vue/components/Public/FullPlayer.vue b/frontend/vue/components/Public/FullPlayer.vue index 78fb16f95..ac64680d0 100644 --- a/frontend/vue/components/Public/FullPlayer.vue +++ b/frontend/vue/components/Public/FullPlayer.vue @@ -26,7 +26,7 @@ - + @@ -64,12 +64,9 @@ const props = defineProps({ } }); -const history_modal = ref(); // Template ref -const isMounted = useMounted(); +const history = ref({}); const onNowPlayingUpdate = (newNowPlaying) => { - if (isMounted.value) { - history_modal.value.updateHistory(newNowPlaying); - } + history.value = newNowPlaying?.song_history; } diff --git a/frontend/vue/components/Public/FullPlayer/RequestModal.vue b/frontend/vue/components/Public/FullPlayer/RequestModal.vue index 364154ad3..a5baecd5d 100644 --- a/frontend/vue/components/Public/FullPlayer/RequestModal.vue +++ b/frontend/vue/components/Public/FullPlayer/RequestModal.vue @@ -1,44 +1,33 @@ - diff --git a/frontend/vue/components/Public/FullPlayer/SongHistory.vue b/frontend/vue/components/Public/FullPlayer/SongHistory.vue index 4645f204b..25e7add01 100644 --- a/frontend/vue/components/Public/FullPlayer/SongHistory.vue +++ b/frontend/vue/components/Public/FullPlayer/SongHistory.vue @@ -1,6 +1,6 @@ - diff --git a/frontend/vue/components/Stations/Mounts.vue b/frontend/vue/components/Stations/Mounts.vue index 00115e526..c59796d8a 100644 --- a/frontend/vue/components/Stations/Mounts.vue +++ b/frontend/vue/components/Stations/Mounts.vue @@ -54,72 +54,87 @@ - - + diff --git a/frontend/vue/components/Stations/Remotes.vue b/frontend/vue/components/Stations/Remotes.vue index df52abc17..65a08f64c 100644 --- a/frontend/vue/components/Stations/Remotes.vue +++ b/frontend/vue/components/Stations/Remotes.vue @@ -48,71 +48,83 @@ - - diff --git a/frontend/vue/components/Stations/StereoToolConfig.vue b/frontend/vue/components/Stations/StereoToolConfig.vue index b341926ec..098ee3d5f 100644 --- a/frontend/vue/components/Stations/StereoToolConfig.vue +++ b/frontend/vue/components/Stations/StereoToolConfig.vue @@ -28,7 +28,7 @@ }} - @@ -56,42 +56,42 @@ - diff --git a/frontend/vue/functions/useSlotsExcept.js b/frontend/vue/functions/useSlotsExcept.js new file mode 100644 index 000000000..6bba66544 --- /dev/null +++ b/frontend/vue/functions/useSlotsExcept.js @@ -0,0 +1,12 @@ +import {filter, includes} from "lodash"; +import {computed, useSlots} from "vue"; + +export default function useSlotsExcept(except) { + const slots = useSlots(); + + return computed(() => { + return filter(slots, (slot, name) => { + return !includes(except, name); + }); + }); +};