mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-20 12:03:16 +00:00
Merge pull request #706 from pixelfed/frontend-ui-refactor
Update Settings view, fix avatar upload bug
This commit is contained in:
commit
1fde81ceec
1 changed files with 22 additions and 50 deletions
|
@ -6,18 +6,30 @@
|
||||||
<h3 class="font-weight-bold">Account Settings</h3>
|
<h3 class="font-weight-bold">Account Settings</h3>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<form method="post">
|
<div class="form-group row">
|
||||||
@csrf
|
<div class="col-sm-3">
|
||||||
<div class="form-group row">
|
<img src="{{Auth::user()->profile->avatarUrl()}}" width="38px" height="38px" class="rounded-circle float-right">
|
||||||
<div class="col-sm-3">
|
</div>
|
||||||
<img src="{{Auth::user()->profile->avatarUrl()}}" width="38px" height="38px" class="rounded-circle float-right">
|
<div class="col-sm-9">
|
||||||
</div>
|
<p class="lead font-weight-bold mb-0">{{Auth::user()->username}}</p>
|
||||||
<div class="col-sm-9">
|
<p><a href="#" class="font-weight-bold change-profile-photo" data-toggle="collapse" data-target="#avatarCollapse" aria-expanded="false" aria-controls="avatarCollapse">Change Profile Photo</a></p>
|
||||||
<p class="lead font-weight-bold mb-0">{{Auth::user()->username}}</p>
|
<div class="collapse" id="avatarCollapse">
|
||||||
<p class="mb-0"><a href="#" class="font-weight-bold change-profile-photo">Change Profile Photo</a></p>
|
<form method="post" action="/settings/avatar" enctype="multipart/form-data">
|
||||||
<p><span class="small font-weight-bold">Max avatar size: <span id="maxAvatarSize"></span></span></p>
|
@csrf
|
||||||
|
<div class="card card-body">
|
||||||
|
<div class="custom-file mb-1">
|
||||||
|
<input type="file" name="avatar" class="custom-file-input" id="avatarInput">
|
||||||
|
<label class="custom-file-label" for="avatarInput">Select a profile photo</label>
|
||||||
|
</div>
|
||||||
|
<p><span class="small font-weight-bold">Must be a jpeg or png. Max avatar size: <span id="maxAvatarSize"></span></span></p>
|
||||||
|
<p class="mb-0"><button type="submit" class="btn btn-primary px-4 py-0 font-weight-bold">Upload</button></p>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<form method="post">
|
||||||
|
@csrf
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label for="name" class="col-sm-3 col-form-label font-weight-bold text-right">Name</label>
|
<label for="name" class="col-sm-3 col-form-label font-weight-bold text-right">Name</label>
|
||||||
<div class="col-sm-9">
|
<div class="col-sm-9">
|
||||||
|
@ -118,45 +130,5 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#maxAvatarSize').text(filesize({{config('pixelfed.max_avatar_size') * 1024}}, {round: 0}));
|
$('#maxAvatarSize').text(filesize({{config('pixelfed.max_avatar_size') * 1024}}, {round: 0}));
|
||||||
|
|
||||||
$(document).on('click', '.change-profile-photo', function(e) {
|
|
||||||
e.preventDefault();
|
|
||||||
swal({
|
|
||||||
title: 'Upload Photo',
|
|
||||||
content: {
|
|
||||||
element: 'input',
|
|
||||||
attributes: {
|
|
||||||
placeholder: 'Upload your photo.',
|
|
||||||
type: 'file',
|
|
||||||
name: 'photoUpload',
|
|
||||||
id: 'photoUploadInput'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
buttons: {
|
|
||||||
confirm: {
|
|
||||||
text: 'Upload'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).then((res) => {
|
|
||||||
if(!res) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const input = $('#photoUploadInput')[0];
|
|
||||||
const photo = input.files[0];
|
|
||||||
const form = new FormData();
|
|
||||||
form.append("upload", photo);
|
|
||||||
|
|
||||||
axios.post('/api/v1/avatar/update', form, {
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'multipart/form-data'
|
|
||||||
}
|
|
||||||
}).then((res) => {
|
|
||||||
swal('Success', 'Your photo has been successfully updated! It may take a few minutes to update across the site.', 'success');
|
|
||||||
}).catch((res) => {
|
|
||||||
let msg = res.response.data.errors.upload[0];
|
|
||||||
swal('Something went wrong', msg, 'error');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
@endpush
|
@endpush
|
||||||
|
|
Loading…
Reference in a new issue