diff --git a/front/src/components/library/Albums.vue b/front/src/components/library/Albums.vue index 1e9d78ffc..955bd2530 100644 --- a/front/src/components/library/Albums.vue +++ b/front/src/components/library/Albums.vue @@ -1,10 +1,10 @@ - - - /front/src/components/library/Albums.vue - - {{ t('components.library.Albums.header.browse') }} - - + {{ t('components.library.Albums.header.browse') }} + - - - - {{ t('components.library.Albums.label.search') }} - - - - - - - - - - {{ t('components.library.Albums.label.tags') }} - - - - {{ t('components.library.Albums.ordering.label') }} - - - {{ sharedLabels.filters[option[1]] }} - - - - - {{ t('components.library.Albums.ordering.direction.label') }} - - - {{ t('components.library.Albums.ordering.direction.ascending') }} - - - {{ t('components.library.Albums.ordering.direction.descending') }} - - - - - {{ t('components.library.Albums.pagination.results') }} - - - {{ opt }} - - - - - - - - - - - - - {{ t('components.library.Albums.empty.noResults') }} - - - - {{ t('components.library.Albums.link.addMusic') }} - - - - - + - - - + + + {{ sharedLabels.filters[option[1]] }} + + + + + {{ t('components.library.Albums.ordering.direction.ascending') }} + + + {{ t('components.library.Albums.ordering.direction.descending') }} + + + + + {{ opt }} + + + + + + + + + + + {{ t('components.library.Albums.empty.noResults') }} + + + + + + + + + + diff --git a/front/src/components/library/Artists.vue b/front/src/components/library/Artists.vue index 93352f5cd..24397ad95 100644 --- a/front/src/components/library/Artists.vue +++ b/front/src/components/library/Artists.vue @@ -25,6 +25,7 @@ import Toggle from '~/components/ui/Toggle.vue' import Alert from '~/components/ui/Alert.vue' import Spacer from '~/components/ui/layout/Spacer.vue' import Pills from '~/components/ui/Pills.vue' +import Loader from '~/components/ui/Loader.vue' import useSharedLabels from '~/composables/locale/useSharedLabels' import useOrdering from '~/composables/navigation/useOrdering' @@ -48,6 +49,11 @@ const page = usePage() const tags = useRouteQuery('tag', []) +const tagList = computed(() => ({ + current: tags.value, + others: [] +})) + const q = useRouteQuery('query', '') const query = ref(q.value) syncRef(q, query, { direction: 'ltr' }) @@ -123,11 +129,6 @@ const labels = computed(() => ({ title: t('components.library.Artists.title') })) -const tagList = computed(() => ({ - current: tags.value, - others: [] -})) - const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value].sort((a, b) => a - b))) @@ -208,20 +209,16 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value] v-if="result && result.results.length > 0" style="display:flex; flex-wrap:wrap; gap: 32px; margin-top:32px;" > - - - + - diff --git a/front/src/components/library/Podcasts.vue b/front/src/components/library/Podcasts.vue index f0fe86c90..20cf9b35e 100644 --- a/front/src/components/library/Podcasts.vue +++ b/front/src/components/library/Podcasts.vue @@ -4,7 +4,7 @@ import type { Artist, BackendResponse } from '~/types' import type { RouteRecordName } from 'vue-router' import type { OrderingField } from '~/store/ui' -import { computed, ref, watch } from 'vue' +import { computed, ref, watch, onMounted } from 'vue' import { useRouteQuery } from '@vueuse/router' import { useI18n } from 'vue-i18n' import { syncRef } from '@vueuse/core' @@ -17,10 +17,13 @@ import TagsSelector from '~/components/library/TagsSelector.vue' import RemoteSearchForm from '~/components/RemoteSearchForm.vue' import Modal from '~/components/ui/Modal.vue' import ArtistCard from '~/components/artist/Card.vue' -import Pagination from '~/components/vui/Pagination.vue' -import Popover from "~/components/ui/Popover.vue" -import PopoverItem from "~/components/ui/popover/PopoverItem.vue" +import Pagination from '~/components/ui/Pagination.vue' +import Layout from '~/components/ui/Layout.vue' import Button from '~/components/ui/Button.vue' +import Input from '~/components/ui/Input.vue' +import Alert from '~/components/ui/Alert.vue' +import Spacer from '~/components/ui/layout/Spacer.vue' +import Pills from '~/components/ui/Pills.vue' import useSharedLabels from '~/composables/locale/useSharedLabels' import useOrdering from '~/composables/navigation/useOrdering' @@ -44,11 +47,16 @@ const page = usePage() const tags = useRouteQuery('tag', []) +const tagList = computed(() => ({ + current: tags.value, + others: [] +})) + const q = useRouteQuery('query', '') const query = ref(q.value) syncRef(q, query, { direction: 'ltr' }) -const result = ref>() +const result = ref>() const showSubscribeModal = ref(false) const orderingOptions: [OrderingField, keyof typeof sharedLabels.filters][] = [ @@ -112,6 +120,8 @@ onOrderingUpdate(() => { fetchData() }) +// onMounted(() => $('.ui.dropdown').dropdown()) + const { t } = useI18n() const labels = computed(() => ({ searchPlaceholder: t('components.library.Podcasts.placeholder.search'), @@ -122,169 +132,141 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value] - - - - {{ t('components.library.Podcasts.header.browse') }} - - - - - - {{ t('components.library.Podcasts.label.search') }} - - - - - - - - - {{ t('components.library.Podcasts.label.tags') }} - - - - {{ t('components.library.Podcasts.ordering.label') }} - - - - {{ sharedLabels.filters[option[1]] }} - - - - - {{ t('components.library.Podcasts.ordering.direction.label') }} - - - {{ t('components.library.Podcasts.ordering.direction.ascending') }} - - - {{ t('components.library.Podcasts.ordering.direction.descending') }} - - - - - {{ t('components.library.Podcasts.pagination.results') }} - - - {{ opt }} - - - - - - - - - - - - - - - - {{ t('components.library.Podcasts.empty.noResults') }} - - - - {{ t('components.library.Podcasts.button.channel') }} - - - - - - {{ t('components.library.Podcasts.button.feed') }} - - - - - - - - - + {{ t('components.library.Podcasts.header.browse') }} + - - - - - - {{ t('components.library.Podcasts.button.cancel') }} + + + + + {{ sharedLabels.filters[option[1]] }} + + + + + {{ t('components.library.Podcasts.ordering.direction.ascending') }} + + + {{ t('components.library.Podcasts.ordering.direction.descending') }} + + + + + {{ opt }} + + + + + + + + + + {{ t('components.library.Podcasts.empty.noResults') }} + + + + {{ t('components.library.Podcasts.button.feed') }} - - {{ t('components.library.Podcasts.button.subscribe') }} + {{ t('components.library.Podcasts.button.channel') }} - - - + + + + + + + + + + + {{ t('components.library.Podcasts.button.cancel') }} + + + + {{ t('components.library.Podcasts.button.subscribe') }} + + + + + + diff --git a/front/src/views/playlists/List.vue b/front/src/views/playlists/List.vue index 328f52a58..b9001b3a0 100644 --- a/front/src/views/playlists/List.vue +++ b/front/src/views/playlists/List.vue @@ -1,7 +1,6 @@