Merge pull request #398 from pixelfed/frontend-ui-refactor
Frontend ui refactor
This commit is contained in:
commit
84c10e3d13
|
@ -44,29 +44,33 @@ class SettingsController extends Controller
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
$profile = $user->profile;
|
$profile = $user->profile;
|
||||||
|
|
||||||
|
$validate = config('pixelfed.enforce_email_verification');
|
||||||
|
|
||||||
if($user->email != $email) {
|
if($user->email != $email) {
|
||||||
$changes = true;
|
$changes = true;
|
||||||
$user->email = $email;
|
$user->email = $email;
|
||||||
$user->email_verified_at = null;
|
|
||||||
// Prevent old verifications from working
|
if($validate) {
|
||||||
EmailVerification::whereUserId($user->id)->delete();
|
$user->email_verified_at = null;
|
||||||
|
// Prevent old verifications from working
|
||||||
|
EmailVerification::whereUserId($user->id)->delete();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only allow email to be updated if not yet verified
|
// Only allow email to be updated if not yet verified
|
||||||
if(!$changes && $user->email_verified_at) {
|
if(!$validate || !$changes && $user->email_verified_at) {
|
||||||
if($profile->name != $name) {
|
if($profile->name != $name) {
|
||||||
$changes = true;
|
$changes = true;
|
||||||
$user->name = $name;
|
$user->name = $name;
|
||||||
$profile->name = $name;
|
$profile->name = $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($profile->website != $website) {
|
if(!$profile->website || $profile->website != $website) {
|
||||||
$changes = true;
|
$changes = true;
|
||||||
$profile->website = $website;
|
$profile->website = $website;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($profile->bio != $bio) {
|
if(!$profile->bio || !$profile->bio != $bio) {
|
||||||
$changes = true;
|
$changes = true;
|
||||||
$profile->bio = $bio;
|
$profile->bio = $bio;
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,13 +70,14 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p class="lead">
|
<p class="lead mb-0">
|
||||||
<span class="font-weight-bold">{{$user->name}}</span>
|
<span class="font-weight-bold">{{$user->name}}</span>
|
||||||
@if($user->remote_url)
|
@if($user->remote_url)
|
||||||
<span class="badge badge-info">REMOTE PROFILE</span>
|
<span class="badge badge-info">REMOTE PROFILE</span>
|
||||||
@endif
|
@endif
|
||||||
{{$user->bio}}
|
|
||||||
</p>
|
</p>
|
||||||
|
<p class="mb-0 lead">{{$user->bio}}</p>
|
||||||
|
<p class="mb-0"><a href="{{$user->website}}" class="font-weight-bold" rel="external nofollow noopener" target="_blank">{{str_limit($user->website, 30)}}</a></p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue