From fb4f94fb73a16f63ca8c815d178aa977279e6dad Mon Sep 17 00:00:00 2001 From: wvffle Date: Sat, 3 Sep 2022 14:51:20 +0000 Subject: [PATCH] Fix search and dynamic ordering (#1567) --- front/package.json | 1 + front/src/components/audio/ChannelForm.vue | 4 +- front/src/components/auth/Authorize.vue | 2 +- .../channels/UploadMetadataForm.vue | 12 +- front/src/components/favorites/List.vue | 56 +++--- front/src/components/library/Albums.vue | 92 +++++----- front/src/components/library/Artists.vue | 94 +++++----- front/src/components/library/FileUpload.vue | 5 +- front/src/components/library/Library.vue | 2 +- front/src/components/library/Podcasts.vue | 95 +++++------ front/src/components/library/Radios.vue | 85 +++++----- front/src/components/library/TagsSelector.vue | 4 +- front/src/components/manage/ChannelsTable.vue | 23 +-- .../components/manage/library/AlbumsTable.vue | 23 +-- .../manage/library/ArtistsTable.vue | 23 +-- .../manage/library/EditsCardList.vue | 23 +-- .../manage/library/LibrariesTable.vue | 23 +-- .../components/manage/library/TagsTable.vue | 23 +-- .../components/manage/library/TracksTable.vue | 23 +-- .../manage/library/UploadsTable.vue | 23 +-- .../manage/moderation/AccountsTable.vue | 23 +-- .../manage/moderation/DomainsTable.vue | 17 +- .../manage/users/InvitationsTable.vue | 17 +- .../components/manage/users/UsersTable.vue | 14 +- front/src/components/vui/Pagination.vue | 10 +- .../src/composables/navigation/useOrdering.ts | 73 ++++++++ front/src/composables/navigation/usePage.ts | 16 ++ .../{ => navigation}/useSmartSearch.ts | 14 +- front/src/composables/useErrorHandler.ts | 4 + front/src/composables/useOrdering.ts | 44 ----- front/src/init/axios.ts | 6 +- front/src/router/routes/index.ts | 8 +- front/src/router/routes/library.ts | 114 ++++--------- front/src/router/routes/manage.ts | 8 +- front/src/shims-vue-router.d.ts | 9 + front/src/shims-vue.d.ts | 2 +- front/src/store/ui.ts | 160 +----------------- front/src/types.ts | 1 + front/src/views/Search.vue | 94 +++++----- front/src/views/admin/CommonList.vue | 18 +- front/src/views/admin/library/EditsList.vue | 1 - .../views/admin/moderation/DomainsList.vue | 5 +- .../views/admin/moderation/ReportsList.vue | 32 ++-- .../views/admin/moderation/RequestsList.vue | 32 ++-- front/src/views/content/libraries/Files.vue | 5 +- .../views/content/libraries/FilesTable.vue | 34 ++-- front/src/views/library/Edit.vue | 5 +- front/src/views/playlists/List.vue | 88 +++++----- front/yarn.lock | 8 + 49 files changed, 685 insertions(+), 813 deletions(-) create mode 100644 front/src/composables/navigation/useOrdering.ts create mode 100644 front/src/composables/navigation/usePage.ts rename front/src/composables/{ => navigation}/useSmartSearch.ts (85%) delete mode 100644 front/src/composables/useOrdering.ts create mode 100644 front/src/shims-vue-router.d.ts diff --git a/front/package.json b/front/package.json index bb6d8392e..8d48dad6c 100644 --- a/front/package.json +++ b/front/package.json @@ -24,6 +24,7 @@ "@vue/runtime-core": "3.2.38", "@vueuse/core": "9.1.1", "@vueuse/integrations": "9.1.1", + "@vueuse/router": "9.1.1", "axios": "0.27.2", "axios-auth-refresh": "3.3.3", "diff": "5.1.0", diff --git a/front/src/components/audio/ChannelForm.vue b/front/src/components/audio/ChannelForm.vue index 1964543eb..e46ce1037 100644 --- a/front/src/components/audio/ChannelForm.vue +++ b/front/src/components/audio/ChannelForm.vue @@ -1,5 +1,5 @@