From a5c7b17829b73cb11e6e365c0949ccb624e6e0c3 Mon Sep 17 00:00:00 2001 From: Gauthier Roebroeck Date: Wed, 3 Mar 2021 14:08:37 +0800 Subject: [PATCH] fix(webui): rearrange browse series and books views --- .../components/menus/SeriesActionsMenu.vue | 10 - komga-webui/src/locales/en.json | 4 +- komga-webui/src/views/BrowseBook.vue | 265 ++++++------ komga-webui/src/views/BrowseSeries.vue | 398 ++++++++++-------- 4 files changed, 366 insertions(+), 311 deletions(-) diff --git a/komga-webui/src/components/menus/SeriesActionsMenu.vue b/komga-webui/src/components/menus/SeriesActionsMenu.vue index adfe7bc4..db3488fe 100644 --- a/komga-webui/src/components/menus/SeriesActionsMenu.vue +++ b/komga-webui/src/components/menus/SeriesActionsMenu.vue @@ -22,9 +22,6 @@ {{ $t('menu.mark_unread') }} - - {{ $t('menu.download_series') }} - @@ -33,7 +30,6 @@ import {SERIES_CHANGED, seriesToEventSeriesChanged} from '@/types/events' import Vue from 'vue' import {SeriesDto} from "@/types/komga-series"; -import {seriesFileUrl} from "@/functions/urls"; export default Vue.extend({ name: 'SeriesActionsMenu', @@ -61,12 +57,6 @@ export default Vue.extend({ isAdmin (): boolean { return this.$store.getters.meAdmin }, - canDownload (): boolean { - return this.$store.getters.meFileDownload - }, - fileUrl (): string { - return seriesFileUrl(this.series.id) - }, isRead (): boolean { return this.series.booksReadCount === this.series.booksCount }, diff --git a/komga-webui/src/locales/en.json b/komga-webui/src/locales/en.json index 15e6cc62..5bf3db91 100644 --- a/komga-webui/src/locales/en.json +++ b/komga-webui/src/locales/en.json @@ -139,7 +139,9 @@ "series": "Series", "tags": "Tags", "use_filter_panel_to_change_filter": "Use the filter panel to change the active filter", - "year": "year" + "year": "year", + "download": "Download", + "read": "Read" }, "dashboard": { "keep_reading": "Keep Reading", diff --git a/komga-webui/src/views/BrowseBook.vue b/komga-webui/src/views/BrowseBook.vue index 7c12f903..47aea2d8 100644 --- a/komga-webui/src/views/BrowseBook.vue +++ b/komga-webui/src/views/BrowseBook.vue @@ -99,155 +99,174 @@ - - - {{ book.metadata.number }} + + + {{ book.metadata.number }} ยท {{ book.media.pagesCount }} {{ $t('common.pages') }} {{ book.metadata.releaseDate | moment('MMMM DD, YYYY') }} - - - - {{ book.metadata.summary }} - - +
+ + + + mdi-book-open-page-variant + {{ $t('common.read') }} + + + + + mdi-file-download + {{ $t('common.download') }} + + + - - - -
- - {{ $t(`author_roles.${role}`) }} - - - - - - {{ name }} - - + + + {{ book.metadata.summary }}
- - - TAGS - - - - - - {{ t }} - - - - - - - - - - - - +
+ + + + mdi-book-open-page-variant + {{ $t('common.read') }} + + + + + mdi-file-download + {{ $t('common.download') }} + + + + + + + {{ book.metadata.summary }} + + +
+ +
+ + {{ $t(`author_roles.${role}`) }} + + + + + + {{ name }} + + + + +
+ + + TAGS + + + + + + {{ t }} + + + + + + + - - - - mdi-file-download - - - - - mdi-book-open-page-variant - - - - mdi-book-open - {{ book.media.pagesCount }} {{ $t('common.pages') }} - + + {{ $t('browse_book.size') }} + {{ book.size }} - - {{ $t('browse_book.size') }} - {{ book.size }} - - - - {{ $t('browse_book.comment') }} - + + {{ $t('browse_book.comment') }} + {{ book.media.comment }} - - {{ $t('browse_book.format') }} - - {{ format.type }} + + {{ $t('browse_book.format') }} + + {{ format.type }} - - {{ $t('browse_book.file') }} - {{ book.url }} + + {{ $t('browse_book.file') }} + {{ book.url }} @@ -332,7 +351,7 @@ export default Vue.extend({ format(): BookFormat { return getBookFormatFromMediaType(this.book.media.mediaType) }, - authorsByRole (): any { + authorsByRole(): any { return groupAuthorsByRole(this.book.metadata.authors) }, isRead(): boolean { diff --git a/komga-webui/src/views/BrowseSeries.vue b/komga-webui/src/views/BrowseSeries.vue index 7a028827..efce24ab 100644 --- a/komga-webui/src/views/BrowseSeries.vue +++ b/komga-webui/src/views/BrowseSeries.vue @@ -1,5 +1,5 @@