Flaschengeist/flaschengeist-frontend
Flaschengeist
/
flaschengeist-frontend
7
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

release v2.0.0 #4

Merged
crimsen merged 481 commits from develop into master 2024-01-18 15:15:08 +00:00
Conversation 0 Commits 481 Files Changed 156 +11 -9
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc35e2ecec - Show all commits

18
src/plugins/user/components/settings/MainUserSettings.vue
View File

@ -135,7 +135,7 @@ export default defineComponent({
const password = ref(''); const password = ref('');
const newPassword = ref(''); const newPassword = ref('');
const avatar = ref<string[]>([]); const avatar = ref<File | FileList | string[]>();
const userModel = ref(props.user); const userModel = ref(props.user);
const canSetRoles = computed(() => hasPermission('users_set_roles')); const canSetRoles = computed(() => hasPermission('users_set_roles'));
@ -157,7 +157,7 @@ export default defineComponent({
progress: true, progress: true,
actions: [{ icon: 'mdi-close', color: 'white' }], actions: [{ icon: 'mdi-close', color: 'white' }],
}); });
avatar.value = []; avatar.value = undefined;
} }
function save() { function save() {
@ -174,12 +174,14 @@ export default defineComponent({
emit('update:user', changed); emit('update:user', changed);
if (avatar.value && (avatar.value.length > 0 || avatar.value instanceof File)) if (avatar.value)
userStore.uploadAvatar(changed, avatar.value[0]).catch((response: Response) => { userStore
if (response && response.status == 400) { .uploadAvatar(changed, avatar.value instanceof File ? avatar.value : avatar.value[0])
onAvatarRejected(); .catch((response: Response) => {
} if (response && response.status == 400) {
}); onAvatarRejected();
}
});
reset(); reset();
} }

2
src/plugins/user/store.ts
View File

@ -64,7 +64,7 @@ export const useUserStore = defineStore({
return data; return data;
}, },
async uploadAvatar(user: FG.User, file: string) { async uploadAvatar(user: FG.User, file: string | File) {
const formData = new FormData(); const formData = new FormData();
formData.append('file', file); formData.append('file', file);
await api.post(`/users/${user.userid}/avatar`, formData, { await api.post(`/users/${user.userid}/avatar`, formData, {