From 92aae736c4a7773c0a86b6f3ec141ea84d26db48 Mon Sep 17 00:00:00 2001 From: Nicholas Wallace Date: Sat, 6 Jul 2024 15:57:20 +0000 Subject: [PATCH 1/3] Add: current pubdate --- client/plugins/version.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/plugins/version.js b/client/plugins/version.js index 75b948c8..593b29a5 100644 --- a/client/plugins/version.js +++ b/client/plugins/version.js @@ -49,11 +49,11 @@ export async function checkForUpdate() { } if (verObj.version == currVerObj.version) { + currVerObj.pubdate = new Date(release.published_at) currVerObj.changelog = release.body } }) } - }) if (!largestVer) { console.error('No valid version tags to compare with') @@ -65,6 +65,8 @@ export async function checkForUpdate() { latestVersion: largestVer.version, githubTagUrl: `https://github.com/advplyr/audiobookshelf/releases/tag/v${largestVer.version}`, currentVersion: currVerObj.version, + currentTagUrl: `https://github.com/advplyr/audiobookshelf/releases/tag/v${currVerObj.version}`, + currentVersionPubDate: currVerObj.pubdate, currentVersionChangelog: currVerObj.changelog } -} \ No newline at end of file +} From 3764ef14a9726d38e9d09c859754e107f90e603c Mon Sep 17 00:00:00 2001 From: Nicholas Wallace Date: Sat, 6 Jul 2024 16:21:06 +0000 Subject: [PATCH 2/3] Add: publish date of current version to modal --- client/components/app/SideRail.vue | 10 ++++++++-- client/components/modals/changelog/ViewModal.vue | 10 +++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/client/components/app/SideRail.vue b/client/components/app/SideRail.vue index 56207526..b3985fc2 100644 --- a/client/components/app/SideRail.vue +++ b/client/components/app/SideRail.vue @@ -121,7 +121,7 @@

{{ Source }}

- + @@ -152,6 +152,9 @@ export default { paramId() { return this.$route.params ? this.$route.params.id || '' : '' }, + dateFormat() { + return this.$store.state.serverSettings.dateFormat + }, currentLibraryId() { return this.$store.state.libraries.currentLibraryId }, @@ -222,6 +225,9 @@ export default { currentVersionChangelog() { return this.versionData.currentVersionChangelog || 'No Changelog Available' }, + currentVersionPubDate() { + return `${this.$formatDate(this.versionData.currentVersionPubDate, this.dateFormat)}` || 'Unknown release date' + }, streamLibraryItem() { return this.$store.state.streamLibraryItem }, @@ -245,4 +251,4 @@ export default { #siderail-buttons-container.player-open { max-height: calc(100vh - 64px - 48px - 160px); } - \ No newline at end of file + diff --git a/client/components/modals/changelog/ViewModal.vue b/client/components/modals/changelog/ViewModal.vue index 98b28b21..05503c43 100644 --- a/client/components/modals/changelog/ViewModal.vue +++ b/client/components/modals/changelog/ViewModal.vue @@ -6,7 +6,7 @@
-

Changelog v{{ currentVersionNumber }}

+

Changelog v{{ currentVersionNumber }} ({{ currentVersionPubDate }})

@@ -19,6 +19,7 @@ export default { props: { value: Boolean, changelog: String, + currentPubDate: String, currentVersion: String }, watch: { @@ -43,6 +44,9 @@ export default { compiledMarkedown() { return marked.parse(this.changelog, { gfm: true, breaks: true }) }, + currentVersionPubDate() { + return this.currentPubDate + }, currentVersionNumber() { return this.currentVersion } @@ -57,7 +61,7 @@ export default { \ No newline at end of file + From 1e5cb09adaf3c1ede63c42f19b604b09ecb4c681 Mon Sep 17 00:00:00 2001 From: advplyr Date: Sat, 6 Jul 2024 16:28:36 -0500 Subject: [PATCH 3/3] Update changelog version to link to release, pass versionData into changelog modal --- client/components/app/SideRail.vue | 11 +----- .../components/modals/changelog/ViewModal.vue | 37 ++++++++++--------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/client/components/app/SideRail.vue b/client/components/app/SideRail.vue index b3985fc2..9720bc6b 100644 --- a/client/components/app/SideRail.vue +++ b/client/components/app/SideRail.vue @@ -121,7 +121,7 @@

{{ Source }}

- + @@ -152,9 +152,6 @@ export default { paramId() { return this.$route.params ? this.$route.params.id || '' : '' }, - dateFormat() { - return this.$store.state.serverSettings.dateFormat - }, currentLibraryId() { return this.$store.state.libraries.currentLibraryId }, @@ -222,12 +219,6 @@ export default { githubTagUrl() { return this.versionData.githubTagUrl }, - currentVersionChangelog() { - return this.versionData.currentVersionChangelog || 'No Changelog Available' - }, - currentVersionPubDate() { - return `${this.$formatDate(this.versionData.currentVersionPubDate, this.dateFormat)}` || 'Unknown release date' - }, streamLibraryItem() { return this.$store.state.streamLibraryItem }, diff --git a/client/components/modals/changelog/ViewModal.vue b/client/components/modals/changelog/ViewModal.vue index 05503c43..a61cc951 100644 --- a/client/components/modals/changelog/ViewModal.vue +++ b/client/components/modals/changelog/ViewModal.vue @@ -6,7 +6,9 @@
-

Changelog v{{ currentVersionNumber }} ({{ currentVersionPubDate }})

+

+ Changelog v{{ currentVersionNumber }} ({{ currentVersionPubDate }}) +

@@ -18,18 +20,9 @@ import { marked } from '@/static/libs/marked/index.js' export default { props: { value: Boolean, - changelog: String, - currentPubDate: String, - currentVersion: String - }, - watch: { - show: { - immediate: true, - handler(newVal) { - if (newVal) { - this.init() - } - } + versionData: { + type: Object, + default: () => {} } }, computed: { @@ -41,19 +34,27 @@ export default { this.$emit('input', val) } }, + dateFormat() { + return this.$store.state.serverSettings.dateFormat + }, + changelog() { + return this.versionData?.currentVersionChangelog || 'No Changelog Available' + }, compiledMarkedown() { return marked.parse(this.changelog, { gfm: true, breaks: true }) }, currentVersionPubDate() { - return this.currentPubDate + if (!this.versionData?.currentVersionPubDate) return 'Unknown release date' + return `${this.$formatDate(this.versionData.currentVersionPubDate, this.dateFormat)}` + }, + currentTagUrl() { + return this.versionData?.currentTagUrl }, currentVersionNumber() { - return this.currentVersion + return this.$config.version } }, - methods: { - init() {} - }, + methods: {}, mounted() {} }