groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-07-07 09:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts and Add local avatar upload feature for author page

Browse source
This commit is contained in:
江山 2025-10-15 20:10:06 +00:00
parent 03da194953
commit f37d6fa3cd
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/components/covers/AuthorImage.vue
View file

@ -57,6 +57,7 @@ export default {
} }
}, },
methods: { methods: {
<<<<<<< Updated upstream
imageLoaded() { imageLoaded() {
if (this.$refs.img) { if (this.$refs.img) {
var { naturalWidth, naturalHeight } = this.$refs.img var { naturalWidth, naturalHeight } = this.$refs.img
@ -69,6 +70,9 @@ export default {
} }
} }
} }
=======
imageLoaded() {}
>>>>>>> Stashed changes
}, },
mounted() {} mounted() {}
} }

11
client/components/modals/authors/EditModal.vue
View file

@ -16,9 +16,20 @@
</div> </div>
</div> </div>
<div class="grow"> <div class="grow">
<<<<<<< Updated upstream
<form @submit.prevent="submitUploadCover" class="flex grow mb-2 p-2"> <form @submit.prevent="submitUploadCover" class="flex grow mb-2 p-2">
<ui-text-input v-model="imageUrl" :placeholder="$strings.LabelImageURLFromTheWeb" class="h-9 w-full" /> <ui-text-input v-model="imageUrl" :placeholder="$strings.LabelImageURLFromTheWeb" class="h-9 w-full" />
<ui-btn color="bg-success" type="submit" :padding-x="4" :disabled="!imageUrl" class="ml-2 sm:ml-3 w-24 h-9">{{ $strings.ButtonSubmit }}</ui-btn> <ui-btn color="bg-success" type="submit" :padding-x="4" :disabled="!imageUrl" class="ml-2 sm:ml-3 w-24 h-9">{{ $strings.ButtonSubmit }}</ui-btn>
=======
<form @submit.prevent="submitUploadCover" class="flex grow mb-2 p-2 items-center">
<ui-text-input v-model="imageUrl" :placeholder="$strings.LabelImageURLFromTheWeb" class="h-9 w-full" @input="onUrlInput" />
<label class="ml-2 sm:ml-3 w-24 h-9 flex items-center justify-center bg-gray-700 text-white rounded cursor-pointer hover:bg-gray-600">
<input type="file" accept="image/*" class="hidden" @change="onFileChange" />
{{ $strings.ButtonUpload }}
</label>
<ui-btn color="bg-success" type="submit" :padding-x="4" :disabled="!imageUrl && !selectedFile" class="ml-2 sm:ml-3 w-24 h-9">{{ $strings.ButtonSubmit }}</ui-btn>
<ui-btn v-if="selectedFile || previewUrl" type="button" color="bg-error" class="ml-2 sm:ml-3 w-24 h-9" small @click="clearSelection">{{ $strings.ButtonCancel }}</ui-btn>
>>>>>>> Stashed changes
</form> </form>
<form v-if="author" @submit.prevent="submitForm"> <form v-if="author" @submit.prevent="submitForm">