webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

My Account: Updated and started adding to tests

Browse Source 
- 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.
This commit is contained in:
Dan Brown
2023-10-19 14:18:42 +01:00
parent 12946414b0
commit fabc854390
14 changed files with 302 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/users/account/layout.blade.php
View File

@ -12,7 +12,9 @@
<a href="{{ url('/my-account/profile') }}" class="{{ $category === 'profile' ? 'active' : '' }}">@icon('user') {{ trans('preferences.profile') }}</a>
<a href="{{ url('/my-account/auth') }}" class="{{ $category === 'auth' ? 'active' : '' }}">@icon('security') {{ trans('preferences.auth') }}</a>
<a href="{{ url('/my-account/shortcuts') }}" class="{{ $category === 'shortcuts' ? 'active' : '' }}">@icon('shortcuts') {{ trans('preferences.shortcuts_interface') }}</a>
<a href="{{ url('/my-account/notifications') }}" class="{{ $category === 'notifications' ? 'active' : '' }}">@icon('notifications') {{ trans('preferences.notifications') }}</a>
@if(userCan('receive-notifications'))
<a href="{{ url('/my-account/notifications') }}" class="{{ $category === 'notifications' ? 'active' : '' }}">@icon('notifications') {{ trans('preferences.notifications') }}</a>
@endif
</nav>
</div>
</div>

4
resources/views/users/edit.blade.php
View File

@ -89,9 +89,9 @@
<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">Connected</p>
<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">Disconnected</p>
<p class="text-neg bold text-small my-none">{{ trans('settings.users_social_status_disconnected') }}</p>
@endif
</div>
@endforeach