Merge pull request #3125 from nichwall/changelog_link

Changelog Pub Date
This commit is contained in:
advplyr 2024-07-06 16:28:22 -05:00 committed by GitHub
commit 9074e9ed88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 29 additions and 25 deletions

View File

@ -121,7 +121,7 @@
<p v-else class="text-xxs text-gray-400 leading-3 text-center italic">{{ Source }}</p> <p v-else class="text-xxs text-gray-400 leading-3 text-center italic">{{ Source }}</p>
</div> </div>
<modals-changelog-view-modal v-model="showChangelogModal" :changelog="currentVersionChangelog" :currentVersion="$config.version" /> <modals-changelog-view-modal v-model="showChangelogModal" :versionData="versionData" />
</div> </div>
</template> </template>
@ -219,9 +219,6 @@ export default {
githubTagUrl() { githubTagUrl() {
return this.versionData.githubTagUrl return this.versionData.githubTagUrl
}, },
currentVersionChangelog() {
return this.versionData.currentVersionChangelog || 'No Changelog Available'
},
streamLibraryItem() { streamLibraryItem() {
return this.$store.state.streamLibraryItem return this.$store.state.streamLibraryItem
}, },
@ -245,4 +242,4 @@ export default {
#siderail-buttons-container.player-open { #siderail-buttons-container.player-open {
max-height: calc(100vh - 64px - 48px - 160px); max-height: calc(100vh - 64px - 48px - 160px);
} }
</style> </style>

View File

@ -6,7 +6,9 @@
</div> </div>
</template> </template>
<div class="px-8 py-6 w-full rounded-lg bg-bg shadow-lg border border-black-300 relative overflow-y-scroll" style="max-height: 80vh"> <div class="px-8 py-6 w-full rounded-lg bg-bg shadow-lg border border-black-300 relative overflow-y-scroll" style="max-height: 80vh">
<p class="text-xl font-bold pb-4">Changelog v{{ currentVersionNumber }}</p> <p class="text-xl font-bold pb-4">
Changelog <a :href="currentTagUrl" target="_blank" class="hover:underline">v{{ currentVersionNumber }}</a> ({{ currentVersionPubDate }})
</p>
<div class="custom-text" v-html="compiledMarkedown" /> <div class="custom-text" v-html="compiledMarkedown" />
</div> </div>
</modals-modal> </modals-modal>
@ -18,17 +20,9 @@ import { marked } from '@/static/libs/marked/index.js'
export default { export default {
props: { props: {
value: Boolean, value: Boolean,
changelog: String, versionData: {
currentVersion: String type: Object,
}, default: () => {}
watch: {
show: {
immediate: true,
handler(newVal) {
if (newVal) {
this.init()
}
}
} }
}, },
computed: { computed: {
@ -40,16 +34,27 @@ export default {
this.$emit('input', val) this.$emit('input', val)
} }
}, },
dateFormat() {
return this.$store.state.serverSettings.dateFormat
},
changelog() {
return this.versionData?.currentVersionChangelog || 'No Changelog Available'
},
compiledMarkedown() { compiledMarkedown() {
return marked.parse(this.changelog, { gfm: true, breaks: true }) return marked.parse(this.changelog, { gfm: true, breaks: true })
}, },
currentVersionPubDate() {
if (!this.versionData?.currentVersionPubDate) return 'Unknown release date'
return `${this.$formatDate(this.versionData.currentVersionPubDate, this.dateFormat)}`
},
currentTagUrl() {
return this.versionData?.currentTagUrl
},
currentVersionNumber() { currentVersionNumber() {
return this.currentVersion return this.$config.version
} }
}, },
methods: { methods: {},
init() {}
},
mounted() {} mounted() {}
} }
</script> </script>
@ -57,7 +62,7 @@ export default {
<style scoped> <style scoped>
/* /*
1. we need to manually define styles to apply to the parsed markdown elements, 1. we need to manually define styles to apply to the parsed markdown elements,
since we don't have access to the actual elements in this component since we don't have access to the actual elements in this component
2. v-deep allows these to take effect on the content passed in to the v-html in the div above 2. v-deep allows these to take effect on the content passed in to the v-html in the div above
*/ */
@ -70,4 +75,4 @@ since we don't have access to the actual elements in this component
.custom-text ::v-deep > ul { .custom-text ::v-deep > ul {
@apply list-disc list-inside pb-4; @apply list-disc list-inside pb-4;
} }
</style> </style>

View File

@ -49,11 +49,11 @@ export async function checkForUpdate() {
} }
if (verObj.version == currVerObj.version) { if (verObj.version == currVerObj.version) {
currVerObj.pubdate = new Date(release.published_at)
currVerObj.changelog = release.body currVerObj.changelog = release.body
} }
}) })
} }
}) })
if (!largestVer) { if (!largestVer) {
console.error('No valid version tags to compare with') console.error('No valid version tags to compare with')
@ -65,6 +65,8 @@ export async function checkForUpdate() {
latestVersion: largestVer.version, latestVersion: largestVer.version,
githubTagUrl: `https://github.com/advplyr/audiobookshelf/releases/tag/v${largestVer.version}`, githubTagUrl: `https://github.com/advplyr/audiobookshelf/releases/tag/v${largestVer.version}`,
currentVersion: currVerObj.version, currentVersion: currVerObj.version,
currentTagUrl: `https://github.com/advplyr/audiobookshelf/releases/tag/v${currVerObj.version}`,
currentVersionPubDate: currVerObj.pubdate,
currentVersionChangelog: currVerObj.changelog currentVersionChangelog: currVerObj.changelog
} }
} }