From 5a953464ab0aac1338dc0c1c9d0bb6be92f6783b Mon Sep 17 00:00:00 2001 From: advplyr Date: Sun, 18 Jun 2023 14:26:04 -0500 Subject: [PATCH] Update:Remove toast for mark as finished #718 --- components/cards/LazyBookCard.vue | 19 ----------- components/cards/LazyListBookCard.vue | 19 ----------- components/readers/Reader.vue | 4 +-- components/tables/podcast/EpisodeRow.vue | 32 +++++++------------ .../tables/podcast/LatestEpisodeRow.vue | 32 +++++++------------ pages/item/_id/_episode/index.vue | 24 ++++---------- pages/item/_id/index.vue | 27 ++++++---------- 7 files changed, 41 insertions(+), 116 deletions(-) diff --git a/components/cards/LazyBookCard.vue b/components/cards/LazyBookCard.vue index c0118a3e..59d5256b 100644 --- a/components/cards/LazyBookCard.vue +++ b/components/cards/LazyBookCard.vue @@ -469,25 +469,6 @@ export default { editClick() { this.$emit('edit', this.libraryItem) }, - toggleFinished() { - var updatePayload = { - isFinished: !this.itemIsFinished - } - this.isProcessingReadUpdate = true - var toast = this.$toast || this.$nuxt.$toast - var axios = this.$axios || this.$nuxt.$axios - axios - .$patch(`/api/me/progress/${this.libraryItemId}`, updatePayload) - .then(() => { - this.isProcessingReadUpdate = false - toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) - }) - .catch((error) => { - console.error('Failed', error) - this.isProcessingReadUpdate = false - toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) - }) - }, rescan() { this.rescanning = true this.$axios diff --git a/components/cards/LazyListBookCard.vue b/components/cards/LazyListBookCard.vue index 851c89fe..f7363c2c 100644 --- a/components/cards/LazyListBookCard.vue +++ b/components/cards/LazyListBookCard.vue @@ -349,25 +349,6 @@ export default { editClick() { this.$emit('edit', this.libraryItem) }, - toggleFinished() { - var updatePayload = { - isFinished: !this.itemIsFinished - } - this.isProcessingReadUpdate = true - var toast = this.$toast || this.$nuxt.$toast - var axios = this.$axios || this.$nuxt.$axios - axios - .$patch(`/api/me/progress/${this.libraryItemId}`, updatePayload) - .then(() => { - this.isProcessingReadUpdate = false - toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) - }) - .catch((error) => { - console.error('Failed', error) - this.isProcessingReadUpdate = false - toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) - }) - }, rescan() { this.rescanning = true this.$axios diff --git a/components/readers/Reader.vue b/components/readers/Reader.vue index 8b6ffd10..8beb4ce0 100644 --- a/components/readers/Reader.vue +++ b/components/readers/Reader.vue @@ -316,7 +316,7 @@ export default { if (this.touchstartTime && Date.now() - this.touchstartTime < 250) { return } - console.log('touchstart', e) + this.touchstartX = e.touches[0].screenX this.touchstartY = e.touches[0].screenY this.touchstartTime = Date.now() @@ -326,7 +326,7 @@ export default { if (this.touchIdentifier !== e.changedTouches[0].identifier) { return } - console.log('touchend', e) + this.touchendX = e.changedTouches[0].screenX this.touchendY = e.changedTouches[0].screenY this.handleGesture() diff --git a/components/tables/podcast/EpisodeRow.vue b/components/tables/podcast/EpisodeRow.vue index 72328bdb..cdb2530a 100644 --- a/components/tables/podcast/EpisodeRow.vue +++ b/components/tables/podcast/EpisodeRow.vue @@ -265,45 +265,37 @@ export default { }, async toggleFinished() { await this.$hapticsImpact() + this.isProcessingReadUpdate = true if (this.isLocal || this.localEpisode) { - var isFinished = !this.userIsFinished - var localLibraryItemId = this.isLocal ? this.libraryItemId : this.localLibraryItemId - var localEpisodeId = this.isLocal ? this.episode.id : this.localEpisode.id - var payload = await this.$db.updateLocalMediaProgressFinished({ localLibraryItemId, localEpisodeId, isFinished }) + const isFinished = !this.userIsFinished + const localLibraryItemId = this.isLocal ? this.libraryItemId : this.localLibraryItemId + const localEpisodeId = this.isLocal ? this.episode.id : this.localEpisode.id + const payload = await this.$db.updateLocalMediaProgressFinished({ localLibraryItemId, localEpisodeId, isFinished }) console.log('toggleFinished payload', JSON.stringify(payload)) - if (!payload || payload.error) { - var errorMsg = payload ? payload.error : 'Unknown error' - this.$toast.error(errorMsg) + if (payload?.error) { + this.$toast.error(payload?.error || 'Unknown error') } else { - var localMediaProgress = payload.localMediaProgress + const localMediaProgress = payload.localMediaProgress console.log('toggleFinished localMediaProgress', JSON.stringify(localMediaProgress)) if (localMediaProgress) { this.$store.commit('globals/updateLocalMediaProgress', localMediaProgress) } - - if (payload.server) { - this.$toast.success(`Local & Server Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`) - } else { - this.$toast.success(`Local Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`) - } } this.isProcessingReadUpdate = false } else { - var updatePayload = { + const updatePayload = { isFinished: !this.userIsFinished } this.$axios .$patch(`/api/me/progress/${this.libraryItemId}/${this.episode.id}`, updatePayload) - .then(() => { - this.isProcessingReadUpdate = false - this.$toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) - }) .catch((error) => { console.error('Failed', error) - this.isProcessingReadUpdate = false this.$toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) }) + .finally(() => { + this.isProcessingReadUpdate = false + }) } } } diff --git a/components/tables/podcast/LatestEpisodeRow.vue b/components/tables/podcast/LatestEpisodeRow.vue index 722083d8..09fba4c8 100644 --- a/components/tables/podcast/LatestEpisodeRow.vue +++ b/components/tables/podcast/LatestEpisodeRow.vue @@ -271,45 +271,37 @@ export default { }, async toggleFinished() { await this.$hapticsImpact() + this.isProcessingReadUpdate = true if (this.isLocal || this.localEpisode) { - var isFinished = !this.userIsFinished - var localLibraryItemId = this.isLocal ? this.libraryItemId : this.localLibraryItemId - var localEpisodeId = this.isLocal ? this.episode.id : this.localEpisode.id - var payload = await this.$db.updateLocalMediaProgressFinished({ localLibraryItemId, localEpisodeId, isFinished }) + const isFinished = !this.userIsFinished + const localLibraryItemId = this.isLocal ? this.libraryItemId : this.localLibraryItemId + const localEpisodeId = this.isLocal ? this.episode.id : this.localEpisode.id + const payload = await this.$db.updateLocalMediaProgressFinished({ localLibraryItemId, localEpisodeId, isFinished }) console.log('toggleFinished payload', JSON.stringify(payload)) - if (!payload || payload.error) { - var errorMsg = payload ? payload.error : 'Unknown error' - this.$toast.error(errorMsg) + if (payload?.error) { + this.$toast.error(payload?.error || 'Unknown error') } else { - var localMediaProgress = payload.localMediaProgress + const localMediaProgress = payload.localMediaProgress console.log('toggleFinished localMediaProgress', JSON.stringify(localMediaProgress)) if (localMediaProgress) { this.$store.commit('globals/updateLocalMediaProgress', localMediaProgress) } - - if (payload.server) { - this.$toast.success(`Local & Server Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`) - } else { - this.$toast.success(`Local Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`) - } } this.isProcessingReadUpdate = false } else { - var updatePayload = { + const updatePayload = { isFinished: !this.userIsFinished } this.$axios .$patch(`/api/me/progress/${this.libraryItemId}/${this.episode.id}`, updatePayload) - .then(() => { - this.isProcessingReadUpdate = false - this.$toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) - }) .catch((error) => { console.error('Failed', error) - this.isProcessingReadUpdate = false this.$toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) }) + .finally(() => { + this.isProcessingReadUpdate = false + }) } } } diff --git a/pages/item/_id/_episode/index.vue b/pages/item/_id/_episode/index.vue index fbcc0291..0b928882 100644 --- a/pages/item/_id/_episode/index.vue +++ b/pages/item/_id/_episode/index.vue @@ -501,35 +501,23 @@ export default { const payload = await this.$db.updateLocalMediaProgressFinished({ localLibraryItemId, localEpisodeId, isFinished }) console.log('toggleFinished payload', JSON.stringify(payload)) - if (!payload || payload.error) { - var errorMsg = payload ? payload.error : 'Unknown error' - this.$toast.error(errorMsg) + if (payload?.error) { + this.$toast.error(payload?.error || 'Unknown error') } else { const localMediaProgress = payload.localMediaProgress console.log('toggleFinished localMediaProgress', JSON.stringify(localMediaProgress)) if (localMediaProgress) { this.$store.commit('globals/updateLocalMediaProgress', localMediaProgress) } - - if (payload.server) { - this.$toast.success(`Local & Server Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`) - } else { - this.$toast.success(`Local Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`) - } } } else { const updatePayload = { isFinished: !this.userIsFinished } - this.$axios - .$patch(`/api/me/progress/${this.libraryItemId}/${this.episode.id}`, updatePayload) - .then(() => { - this.$toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) - }) - .catch((error) => { - console.error('Failed', error) - this.$toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) - }) + this.$axios.$patch(`/api/me/progress/${this.libraryItemId}/${this.episode.id}`, updatePayload).catch((error) => { + console.error('Failed', error) + this.$toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) + }) } }, async deleteEpisodeFromServerClick() { diff --git a/pages/item/_id/index.vue b/pages/item/_id/index.vue index 24efc1b6..18b00b4f 100644 --- a/pages/item/_id/index.vue +++ b/pages/item/_id/index.vue @@ -751,41 +751,32 @@ export default { this.isProcessingReadUpdate = true if (this.isLocal) { - var isFinished = !this.userIsFinished - var payload = await this.$db.updateLocalMediaProgressFinished({ localLibraryItemId: this.localLibraryItemId, isFinished }) + const isFinished = !this.userIsFinished + const payload = await this.$db.updateLocalMediaProgressFinished({ localLibraryItemId: this.localLibraryItemId, isFinished }) console.log('toggleFinished payload', JSON.stringify(payload)) - if (!payload || payload.error) { - var errorMsg = payload ? payload.error : 'Unknown error' - this.$toast.error(errorMsg) + if (payload?.error) { + this.$toast.error(payload?.error || 'Unknown error') } else { - var localMediaProgress = payload.localMediaProgress + const localMediaProgress = payload.localMediaProgress console.log('toggleFinished localMediaProgress', JSON.stringify(localMediaProgress)) if (localMediaProgress) { this.$store.commit('globals/updateLocalMediaProgress', localMediaProgress) } - - if (payload.server) { - this.$toast.success(`Local & Server Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`) - } else { - this.$toast.success(`Local Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`) - } } this.isProcessingReadUpdate = false } else { - var updatePayload = { + const updatePayload = { isFinished: !this.userIsFinished } this.$axios .$patch(`/api/me/progress/${this.libraryItemId}`, updatePayload) - .then(() => { - this.isProcessingReadUpdate = false - this.$toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) - }) .catch((error) => { console.error('Failed', error) - this.isProcessingReadUpdate = false this.$toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`) }) + .finally(() => { + this.isProcessingReadUpdate = false + }) } }, libraryChanged(libraryId) {