Skip to content

Commit 886fd7b

Browse files
committed
Merge branch 'development'
2 parents ae39f20 + 18167e8 commit 886fd7b

File tree

8 files changed

+604
-583
lines changed

8 files changed

+604
-583
lines changed

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
33

44
## [Unreleased]
55

6+
## [7.0.3] - 2020-07-01
7+
8+
## Changed
9+
10+
- Updated breadcrumbs to be more readable
11+
- Update link utility to allow slot
12+
- Add note for Gate::after in AuthServiceProvider if wanted
13+
- Change title bar delimiter from - to |
14+
- Update yarn and composer
15+
616
## [7.0.2] - 2020-06-28
717

818
## Changed
@@ -201,7 +211,8 @@ Started from scratch with a blank Laravel 7.* installation. This release is not
201211
- Fix yarn tests
202212
- Fix: Socially logged in users get assigned the default role
203213

204-
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.2...development
214+
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.3...development
215+
[7.0.3]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.2...v7.0.3
205216
[7.0.2]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.1...v7.0.2
206217
[7.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.0...v7.0.1
207218
[7.0.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.3...v7.0.0

app/Providers/AuthServiceProvider.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,10 @@ public function boot()
3333
Gate::before(function ($user) {
3434
return $user->isAdmin() ? true : null;
3535
});
36+
37+
// Learn when to use this instead: https://docs.spatie.be/laravel-permission/v3/basic-usage/super-admin/#gate-after
38+
// Gate::after(function ($user) {
39+
// return $user->isAdmin();
40+
// });
3641
}
3742
}

composer.lock

Lines changed: 23 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/views/backend/layouts/app.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<meta name="csrf-token" content="{{ csrf_token() }}">
7-
<title>{{ appName() }} - @yield('title')</title>
7+
<title>{{ appName() }} | @yield('title')</title>
88
<meta name="description" content="@yield('meta_description', appName())">
99
<meta name="author" content="@yield('meta_author', 'Anthony Rappa')">
1010
@yield('meta')

resources/views/components/utils/link.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
@if ($permission)
44
@if ($logged_in_user->can($permission))
55
@if (!$hide)
6-
<a {{ $attributes->merge(['href' => '#', 'class' => $active]) }}>@if ($icon)<i class="{{ $icon }}"></i> @endif{{ $text }}</a>
6+
<a {{ $attributes->merge(['href' => '#', 'class' => $active]) }}>@if ($icon)<i class="{{ $icon }}"></i> @endif{{ strlen($text) ? $text : $slot }}</a>
77
@endif
88
@endif
99
@else
1010
@if (!$hide)
11-
<a {{ $attributes->merge(['href' => '#', 'class' => $active]) }}>@if ($icon)<i class="{{ $icon }}"></i> @endif{{ $text }}</a>
11+
<a {{ $attributes->merge(['href' => '#', 'class' => $active]) }}>@if ($icon)<i class="{{ $icon }}"></i> @endif{{ strlen($text) ? $text : $slot }}</a>
1212
@endif
1313
@endif

resources/views/frontend/layouts/app.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<meta name="csrf-token" content="{{ csrf_token() }}">
7-
<title>{{ appName() }} - @yield('title')</title>
7+
<title>{{ appName() }} | @yield('title')</title>
88
<meta name="description" content="@yield('meta_description', appName())">
99
<meta name="author" content="@yield('meta_author', 'Anthony Rappa')">
1010
@yield('meta')

routes/backend/auth.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
Route::get('edit', [UserController::class, 'edit'])
4444
->name('edit')
4545
->breadcrumbs(function (Trail $trail, User $user) {
46-
$trail->parent('admin.auth.user.index')
47-
->push(__('Editing :user', ['user' => $user->name]), route('admin.auth.user.edit', $user));
46+
$trail->parent('admin.auth.user.show', $user)
47+
->push(__('Edit'), route('admin.auth.user.edit', $user));
4848
});
4949

5050
Route::patch('/', [UserController::class, 'update'])->name('update');
@@ -82,7 +82,7 @@
8282
->middleware('permission:access.user.list')
8383
->breadcrumbs(function (Trail $trail, User $user) {
8484
$trail->parent('admin.auth.user.index')
85-
->push(__('Viewing :user', ['user' => $user->name]), route('admin.auth.user.show', $user));
85+
->push($user->name, route('admin.auth.user.show', $user));
8686
});
8787

8888
Route::patch('mark/{status}', [DeactivatedUserController::class, 'update'])
@@ -98,8 +98,8 @@
9898
->name('change-password')
9999
->middleware('permission:access.user.change-password')
100100
->breadcrumbs(function (Trail $trail, User $user) {
101-
$trail->parent('admin.auth.user.index')
102-
->push(__('Changing Password for :user', ['user' => $user->name]), route('admin.auth.user.change-password', $user));
101+
$trail->parent('admin.auth.user.show', $user)
102+
->push(__('Change Password'), route('admin.auth.user.change-password', $user));
103103
});
104104

105105
Route::patch('password/change', [UserPasswordController::class, 'update'])

0 commit comments

Comments
 (0)