Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue
(cherry picked from commit 675bcb549d5b60bc904c2d2d9f9098bf9b74cd66) # Conflicts: # frontend/src/components/Settings/ProfileImageEditor.vue
This commit is contained in:
parent
f3b8d87204
commit
1f1ee74b74
@ -1,7 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<FileUploader
|
<FileUploader
|
||||||
@success="(file) => setUserImage(file.file_url)"
|
@success="(file) => setUserImage(file.file_url)"
|
||||||
|
<<<<<<< HEAD
|
||||||
:validateFile="validateIsImageFile"
|
:validateFile="validateIsImageFile"
|
||||||
|
=======
|
||||||
|
:validateFile="validateFile"
|
||||||
|
>>>>>>> 675bcb54 (Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue)
|
||||||
>
|
>
|
||||||
<template v-slot="{ file, progress, error, uploading, openFileSelector }">
|
<template v-slot="{ file, progress, error, uploading, openFileSelector }">
|
||||||
<div class="flex flex-col items-center">
|
<div class="flex flex-col items-center">
|
||||||
@ -48,11 +52,24 @@
|
|||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup>
|
||||||
import { FileUploader } from 'frappe-ui'
|
import { FileUploader } from 'frappe-ui'
|
||||||
|
<<<<<<< HEAD
|
||||||
import { validateIsImageFile } from '@/utils';
|
import { validateIsImageFile } from '@/utils';
|
||||||
|
=======
|
||||||
|
>>>>>>> 675bcb54 (Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue)
|
||||||
|
|
||||||
const profile = defineModel()
|
const profile = defineModel()
|
||||||
|
|
||||||
function setUserImage(url) {
|
function setUserImage(url) {
|
||||||
profile.value.user_image = url
|
profile.value.user_image = url
|
||||||
}
|
}
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
function validateFile(file) {
|
||||||
|
let extn = file.name.split('.').pop().toLowerCase()
|
||||||
|
if (!['png', 'jpg'].includes(extn)) {
|
||||||
|
return 'Only PNG and JPG images are allowed'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
>>>>>>> 675bcb54 (Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue)
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user