diff --git a/komga-webui/src/plugins/vuetify.ts b/komga-webui/src/plugins/vuetify.ts index d4b2618ab..8ceeffdb2 100644 --- a/komga-webui/src/plugins/vuetify.ts +++ b/komga-webui/src/plugins/vuetify.ts @@ -33,6 +33,7 @@ export default new Vuetify({ secondary: '#fec000', accent: '#ff0335', 'contrast-1': colors.grey.lighten4, + 'contrast-light-2': colors.grey.darken2, }, dark: { base: colors.shades.black, @@ -40,6 +41,7 @@ export default new Vuetify({ secondary: '#fec000', accent: '#ff0335', 'contrast-1': colors.grey.darken4, + 'contrast-light-2': colors.grey.lighten2, }, }, }, diff --git a/komga-webui/src/services/komga-referential.service.ts b/komga-webui/src/services/komga-referential.service.ts index 8b861569b..465a3b763 100644 --- a/komga-webui/src/services/komga-referential.service.ts +++ b/komga-webui/src/services/komga-referential.service.ts @@ -83,18 +83,18 @@ export default class KomgaReferentialService { } } - async getSeriesTags(libraryId?: string, collectionId?: string): Promise { + async getSeriesAndBookTags(libraryId?: string, collectionId?: string): Promise { try { const params = {} as any if (libraryId) params.library_id = libraryId if (collectionId) params.collection_id = collectionId - return (await this.http.get('/api/v1/tags/series', { + return (await this.http.get('/api/v1/tags', { params: params, paramsSerializer: params => qs.stringify(params, {indices: false}), })).data } catch (e) { - let msg = 'An error occurred while trying to retrieve series tags' + let msg = 'An error occurred while trying to retrieve series and book tags' if (e.response.data.message) { msg += `: ${e.response.data.message}` } diff --git a/komga-webui/src/types/komga-series.ts b/komga-webui/src/types/komga-series.ts index eaf8a4166..6fbe49eca 100644 --- a/komga-webui/src/types/komga-series.ts +++ b/komga-webui/src/types/komga-series.ts @@ -46,6 +46,7 @@ export interface SeriesBooksMetadataDto { created: string, lastModified: string authors: AuthorDto[], + tags: string[], releaseDate: string, summary: string, summaryNumber: string, diff --git a/komga-webui/src/views/BrowseCollection.vue b/komga-webui/src/views/BrowseCollection.vue index 1bd60c198..8bd09ae9f 100644 --- a/komga-webui/src/views/BrowseCollection.vue +++ b/komga-webui/src/views/BrowseCollection.vue @@ -288,7 +288,7 @@ export default Vue.extend({ const [genres, tags, publishers, languages, ageRatings, releaseDates] = await Promise.all([ this.$komgaReferential.getGenres(undefined, collectionId), - this.$komgaReferential.getSeriesTags(undefined, collectionId), + this.$komgaReferential.getSeriesAndBookTags(undefined, collectionId), this.$komgaReferential.getPublishers(undefined, collectionId), this.$komgaReferential.getLanguages(undefined, collectionId), this.$komgaReferential.getAgeRatings(undefined, collectionId), diff --git a/komga-webui/src/views/BrowseLibraries.vue b/komga-webui/src/views/BrowseLibraries.vue index f3ba6bab9..f66460bce 100644 --- a/komga-webui/src/views/BrowseLibraries.vue +++ b/komga-webui/src/views/BrowseLibraries.vue @@ -361,7 +361,7 @@ export default Vue.extend({ // load dynamic filters const [genres, tags, publishers, languages, ageRatings, releaseDates] = await Promise.all([ this.$komgaReferential.getGenres(requestLibraryId), - this.$komgaReferential.getSeriesTags(requestLibraryId), + this.$komgaReferential.getSeriesAndBookTags(requestLibraryId), this.$komgaReferential.getPublishers(requestLibraryId), this.$komgaReferential.getLanguages(requestLibraryId), this.$komgaReferential.getAgeRatings(requestLibraryId), diff --git a/komga-webui/src/views/BrowseSeries.vue b/komga-webui/src/views/BrowseSeries.vue index 1524c6e99..615abc23e 100644 --- a/komga-webui/src/views/BrowseSeries.vue +++ b/komga-webui/src/views/BrowseSeries.vue @@ -279,7 +279,8 @@ - + {{ $t('common.tags') }} @@ -294,8 +295,8 @@ mdi-chevron-right - {{ t }} + {{ t }} +