Merge branch 'development'

rappasoft · Jul 2, 2020 · 886fd7b · 886fd7b
2 parents ae39f20 + 18167e8
commit 886fd7b
Show file tree

Hide file tree

Showing 8 changed files with 604 additions and 583 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [7.0.3] - 2020-07-01
+
+## Changed
+
+- Updated breadcrumbs to be more readable
+- Update link utility to allow slot
+- Add note for Gate::after in AuthServiceProvider if wanted
+- Change title bar delimiter from - to |
+- Update yarn and composer
+
 ## [7.0.2] - 2020-06-28
 
 ## Changed
@@ -201,7 +211,8 @@ Started from scratch with a blank Laravel 7.* installation. This release is not
 - Fix yarn tests
 - Fix: Socially logged in users get assigned the default role
 
-[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.2...development
+[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.3...development
+[7.0.3]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.2...v7.0.3
 [7.0.2]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.1...v7.0.2
 [7.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.0...v7.0.1
 [7.0.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.3...v7.0.0

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -33,5 +33,10 @@ public function boot()
         Gate::before(function ($user) {
             return $user->isAdmin() ? true : null;
         });
+
+        // Learn when to use this instead: https://docs.spatie.be/laravel-permission/v3/basic-usage/super-admin/#gate-after
+//        Gate::after(function ($user) {
+//            return $user->isAdmin();
+//        });
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/resources/views/backend/layouts/app.blade.php b/resources/views/backend/layouts/app.blade.php
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
-    <title>{{ appName() }} - @yield('title')</title>
+    <title>{{ appName() }} | @yield('title')</title>
     <meta name="description" content="@yield('meta_description', appName())">
     <meta name="author" content="@yield('meta_author', 'Anthony Rappa')">
     @yield('meta')

diff --git a/resources/views/components/utils/link.blade.php b/resources/views/components/utils/link.blade.php
@@ -3,11 +3,11 @@
 @if ($permission)
     @if ($logged_in_user->can($permission))
         @if (!$hide)
-            <a {{ $attributes->merge(['href' => '#', 'class' => $active]) }}>@if ($icon)<i class="{{ $icon }}"></i> @endif{{ $text }}</a>
+            <a {{ $attributes->merge(['href' => '#', 'class' => $active]) }}>@if ($icon)<i class="{{ $icon }}"></i> @endif{{ strlen($text) ? $text : $slot }}</a>
         @endif
     @endif
 @else
     @if (!$hide)
-        <a {{ $attributes->merge(['href' => '#', 'class' => $active]) }}>@if ($icon)<i class="{{ $icon }}"></i> @endif{{ $text }}</a>
+        <a {{ $attributes->merge(['href' => '#', 'class' => $active]) }}>@if ($icon)<i class="{{ $icon }}"></i> @endif{{ strlen($text) ? $text : $slot }}</a>
     @endif
 @endif
diff --git a/resources/views/frontend/layouts/app.blade.php b/resources/views/frontend/layouts/app.blade.php
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
-    <title>{{ appName() }} - @yield('title')</title>
+    <title>{{ appName() }} | @yield('title')</title>
     <meta name="description" content="@yield('meta_description', appName())">
     <meta name="author" content="@yield('meta_author', 'Anthony Rappa')">
     @yield('meta')

diff --git a/routes/backend/auth.php b/routes/backend/auth.php
@@ -43,8 +43,8 @@
                 Route::get('edit', [UserController::class, 'edit'])
                     ->name('edit')
                     ->breadcrumbs(function (Trail $trail, User $user) {
-                        $trail->parent('admin.auth.user.index')
-                            ->push(__('Editing :user', ['user' => $user->name]), route('admin.auth.user.edit', $user));
+                        $trail->parent('admin.auth.user.show', $user)
+                            ->push(__('Edit'), route('admin.auth.user.edit', $user));
                     });
 
                 Route::patch('/', [UserController::class, 'update'])->name('update');
@@ -82,7 +82,7 @@
                     ->middleware('permission:access.user.list')
                     ->breadcrumbs(function (Trail $trail, User $user) {
                         $trail->parent('admin.auth.user.index')
-                            ->push(__('Viewing :user', ['user' => $user->name]), route('admin.auth.user.show', $user));
+                            ->push($user->name, route('admin.auth.user.show', $user));
                     });
 
                 Route::patch('mark/{status}', [DeactivatedUserController::class, 'update'])
@@ -98,8 +98,8 @@
                     ->name('change-password')
                     ->middleware('permission:access.user.change-password')
                     ->breadcrumbs(function (Trail $trail, User $user) {
-                        $trail->parent('admin.auth.user.index')
-                            ->push(__('Changing Password for :user', ['user' => $user->name]), route('admin.auth.user.change-password', $user));
+                        $trail->parent('admin.auth.user.show', $user)
+                            ->push(__('Change Password'), route('admin.auth.user.change-password', $user));
                     });
 
                 Route::patch('password/change', [UserPasswordController::class, 'update'])