mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-11-23 23:49:37 +00:00
fabc854390
- Updated existing tests now affected by my-account changes. - Updated some existing tests to more accuractly check the scenario. - Updated some code styling in SocialController. - Fixed redirects for social account flows to fit my-account. - Added test for social account attaching. - Added test for api token redirect handling.
107 lines
5.2 KiB
PHP
107 lines
5.2 KiB
PHP
@extends('layouts.simple')
|
|
|
|
@section('body')
|
|
<div class="container small">
|
|
|
|
@include('settings.parts.navbar', ['selected' => 'users'])
|
|
|
|
<section class="card content-wrap">
|
|
<h1 class="list-heading">{{ $user->id === user()->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>
|
|
<form action="{{ url("/settings/users/{$user->id}") }}" method="post" enctype="multipart/form-data">
|
|
{!! csrf_field() !!}
|
|
<input type="hidden" name="_method" value="PUT">
|
|
|
|
<div class="setting-list">
|
|
@include('users.parts.form', ['model' => $user, 'authMethod' => $authMethod])
|
|
|
|
<div class="grid half gap-xl">
|
|
<div>
|
|
<label for="user-avatar"
|
|
class="setting-list-label">{{ trans('settings.users_avatar') }}</label>
|
|
<p class="small">{{ trans('settings.users_avatar_desc') }}</p>
|
|
</div>
|
|
<div>
|
|
@include('form.image-picker', [
|
|
'resizeHeight' => '512',
|
|
'resizeWidth' => '512',
|
|
'showRemove' => false,
|
|
'defaultImage' => url('/user_avatar.png'),
|
|
'currentImage' => $user->getAvatar(80),
|
|
'currentId' => $user->image_id,
|
|
'name' => 'profile_image',
|
|
'imageClass' => 'avatar large'
|
|
])
|
|
</div>
|
|
</div>
|
|
|
|
@include('users.parts.language-option-row', ['value' => old('language') ?? $user->getLocale()->appLocale()])
|
|
</div>
|
|
|
|
<div class="text-right">
|
|
<a href="{{ url("/settings/users") }}"
|
|
class="button outline">{{ trans('common.cancel') }}</a>
|
|
@if($authMethod !== 'system')
|
|
<a href="{{ url("/settings/users/{$user->id}/delete") }}"
|
|
class="button outline">{{ trans('settings.users_delete') }}</a>
|
|
@endif
|
|
<button class="button" type="submit">{{ trans('common.save') }}</button>
|
|
</div>
|
|
</form>
|
|
</section>
|
|
|
|
<section class="card content-wrap auto-height">
|
|
<h2 class="list-heading">{{ trans('settings.users_mfa') }}</h2>
|
|
<p class="text-small">{{ trans('settings.users_mfa_desc') }}</p>
|
|
<div class="grid half gap-xl v-center pb-s">
|
|
<div>
|
|
@if ($mfaMethods->count() > 0)
|
|
<span class="text-pos">@icon('check-circle')</span>
|
|
@else
|
|
<span class="text-neg">@icon('cancel')</span>
|
|
@endif
|
|
{{ trans_choice('settings.users_mfa_x_methods', $mfaMethods->count()) }}
|
|
</div>
|
|
<div class="text-m-right">
|
|
@if($user->id === user()->id)
|
|
<a href="{{ url('/mfa/setup') }}"
|
|
class="button outline">{{ trans('settings.users_mfa_configure') }}</a>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
|
|
</section>
|
|
|
|
@if(count($activeSocialDrivers) > 0)
|
|
<section class="card content-wrap auto-height">
|
|
<div class="flex-container-row items-center justify-space-between wrap">
|
|
<h2 class="list-heading">{{ trans('settings.users_social_accounts') }}</h2>
|
|
<div>
|
|
@if(user()->id === $user->id)
|
|
<a class="button outline" href="{{ url('/my-account/auth#social-accounts') }}">{{ trans('common.manage') }}</a>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
<p class="text-muted text-small">{{ trans('settings.users_social_accounts_desc') }}</p>
|
|
<div class="container">
|
|
<div class="grid third">
|
|
@foreach($activeSocialDrivers as $driver => $driverName)
|
|
<div class="text-center mb-m">
|
|
<div role="presentation">@icon('auth/'. $driver, ['style' => 'width: 56px;height: 56px;'])</div>
|
|
<p class="my-none bold">{{ $driverName }}</p>
|
|
@if($user->hasSocialAccount($driver))
|
|
<p class="text-pos bold text-small my-none">{{ trans('settings.users_social_status_connected') }}</p>
|
|
@else
|
|
<p class="text-neg bold text-small my-none">{{ trans('settings.users_social_status_disconnected') }}</p>
|
|
@endif
|
|
</div>
|
|
@endforeach
|
|
</div>
|
|
</div>
|
|
</section>
|
|
@endif
|
|
|
|
@include('users.api-tokens.parts.list', ['user' => $user, 'context' => 'settings'])
|
|
</div>
|
|
|
|
@stop
|