Merge pull request #215 from nasirkhan/release

v7.9.0
nasirkhan · Aug 22, 2020 · c4ae904 · c4ae904
2 parents b9c44cd + 91f55a7
commit c4ae904
Show file tree

Hide file tree

Showing 15 changed files with 649 additions and 546 deletions.
diff --git a/Modules/Article/Resources/views/backend/categories/index_datatable.blade.php b/Modules/Article/Resources/views/backend/categories/index_datatable.blade.php
@@ -23,10 +23,10 @@
             <div class="col-4">
                 <div class="float-right">
                     <x-buttons.create route='{{ route("backend.$module_name.create") }}' title="{{__('Create')}} {{ ucwords(Str::singular($module_name)) }}"/>
-                    
+
                     <div class="btn-group" role="group" aria-label="Toolbar button groups">
                         <div class="btn-group" role="group">
-                            <button id="btnGroupToolbar" type="button" class="btn btn-secondary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <button id="btnGroupToolbar" type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                 <i class="fas fa-cog"></i>
                             </button>
                             <div class="dropdown-menu" aria-labelledby="btnGroupToolbar">

diff --git a/Modules/Comment/Resources/views/frontend/comments/index.blade.php b/Modules/Comment/Resources/views/frontend/comments/index.blade.php
@@ -1,8 +1,6 @@
 @extends('frontend.layouts.app')
 
-@section('title')
-Comments
-@stop
+@section('title') Comments @endsection
 
 @section('content')
 <div class="page-header page-header-small">
@@ -16,11 +14,11 @@
             </h1>
 
             <div class="text-center">
-                @php $title_text = 'Tags - Mukto Library'; @endphp
+                @php $title_text = 'Tags'; @endphp
 
-                <button class="btn btn-primary btn-icon btn-round" data-sharer="facebook" data-hashtag="MuktoLibrary" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Facebook" data-original-title="Share on Facebook"><i class="fab fa-facebook-square"></i></button>
+                <button class="btn btn-primary btn-icon btn-round" data-sharer="facebook" data-hashtag="LaravelStarter" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Facebook" data-original-title="Share on Facebook"><i class="fab fa-facebook-square"></i></button>
 
-                <button class="btn btn-primary btn-icon btn-round" data-sharer="twitter" data-via="MuktoLibrary" data-title="{{$title_text}}" data-hashtags="MuktoLibrary" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Twitter" data-original-title="Share on Twitter"><i class="fab fa-twitter"></i></button>
+                <button class="btn btn-primary btn-icon btn-round" data-sharer="twitter" data-via="LaravelStarter" data-title="{{$title_text}}" data-hashtags="LaravelStarter" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Twitter" data-original-title="Share on Twitter"><i class="fab fa-twitter"></i></button>
 
                 <button class="btn btn-primary btn-icon btn-round" data-sharer="whatsapp" data-title="{{$title_text}}" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Whatsapp" data-original-title="Share on Whatsapp" data-web=""><i class="fab fa-whatsapp"></i></button>
 
@@ -80,5 +78,4 @@
     </div>
 </div>
 
-
 @endsection
diff --git a/Modules/Comment/Resources/views/frontend/comments/show.blade.php b/Modules/Comment/Resources/views/frontend/comments/show.blade.php
@@ -1,8 +1,6 @@
 @extends('frontend.layouts.app')
 
-@section('title')
-{{$$module_name_singular->name}}
-@stop
+@section('title') {{$$module_name_singular->name}} @endsection
 
 
 @section('content')
@@ -152,5 +150,4 @@
     </div>
 </div>
 
-
 @endsection
diff --git a/Modules/Tag/Resources/views/frontend/tags/index.blade.php b/Modules/Tag/Resources/views/frontend/tags/index.blade.php
@@ -1,9 +1,6 @@
 @extends('frontend.layouts.app')
 
-@section('title')
-Tags
-@stop
-
+@section('title') Tags @endsection
 
 @section('content')
 <div class="page-header page-header-small">
@@ -17,11 +14,11 @@
             </h1>
 
             <div class="text-center">
-                @php $title_text = 'Tags - Mukto Library'; @endphp
+                @php $title_text = 'Tags - LaravelStarter'; @endphp
 
-                <button class="btn btn-primary btn-icon btn-round" data-sharer="facebook" data-hashtag="MuktoLibrary" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Facebook" data-original-title="Share on Facebook"><i class="fab fa-facebook-square"></i></button>
+                <button class="btn btn-primary btn-icon btn-round" data-sharer="facebook" data-hashtag="LaravelStarter" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Facebook" data-original-title="Share on Facebook"><i class="fab fa-facebook-square"></i></button>
 
-                <button class="btn btn-primary btn-icon btn-round" data-sharer="twitter" data-via="MuktoLibrary" data-title="{{$title_text}}" data-hashtags="MuktoLibrary" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Twitter" data-original-title="Share on Twitter"><i class="fab fa-twitter"></i></button>
+                <button class="btn btn-primary btn-icon btn-round" data-sharer="twitter" data-via="LaravelStarter" data-title="{{$title_text}}" data-hashtags="LaravelStarter" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Twitter" data-original-title="Share on Twitter"><i class="fab fa-twitter"></i></button>
 
                 <button class="btn btn-primary btn-icon btn-round" data-sharer="whatsapp" data-title="{{$title_text}}" data-url="{{url()->full()}}" data-toggle="tooltip" title="Share on Whatsapp" data-original-title="Share on Whatsapp" data-web=""><i class="fab fa-whatsapp"></i></button>
 
@@ -81,5 +78,4 @@
     </div>
 </div>
 
-
 @endsection
diff --git a/Modules/Tag/Resources/views/frontend/tags/show.blade.php b/Modules/Tag/Resources/views/frontend/tags/show.blade.php
@@ -1,8 +1,6 @@
 @extends('frontend.layouts.app')
 
-@section('title')
-{{$$module_name_singular->name}}
-@stop
+@section('title') {{$$module_name_singular->name}} @endsection
 
 
 @section('content')

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -27,13 +27,6 @@ class LoginController extends Controller
 
     use AuthenticatesUsers;
 
-    /**
-     * Where to redirect users after login.
-     *
-     * @var string
-     */
-    protected $redirectTo = RouteServiceProvider::HOME;
-
     /**
      * Create a new controller instance.
      *
@@ -44,6 +37,22 @@ public function __construct()
         $this->middleware('guest')->except('logout');
     }
 
+    /**
+     * Where to redirect users after login.
+     *
+     * @var string
+     */
+    public function redirectTo()
+    {
+        $redirectTo = request()->redirectTo;
+
+        if ($redirectTo) {
+            return $redirectTo;
+        } else {
+            return RouteServiceProvider::HOME;
+        }
+    }
+
     /**
      * Redirect the user to the Provider (Facebook, Google, GitHub...) authentication page.
      *

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -5,6 +5,7 @@
 use App\Events\Frontend\UserRegistered;
 use App\Http\Controllers\Controller;
 use App\Models\User;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -24,13 +25,6 @@ class RegisterController extends Controller
 
     use RegistersUsers;
 
-    /**
-     * Where to redirect users after registration.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/';
-
     /**
      * Create a new controller instance.
      *
@@ -41,6 +35,22 @@ public function __construct()
         $this->middleware('guest');
     }
 
+    /**
+     * Where to redirect users after login.
+     *
+     * @var string
+     */
+    public function redirectTo()
+    {
+        $redirectTo = request()->redirectTo;
+
+        if ($redirectTo) {
+            return $redirectTo;
+        } else {
+            return RouteServiceProvider::HOME;
+        }
+    }
+
     /**
      * Get a validator for an incoming registration request.
      *

diff --git a/app/Http/Controllers/Backend/UserController.php b/app/Http/Controllers/Backend/UserController.php
@@ -4,8 +4,8 @@
 
 use App\Authorizable;
 use App\Events\Backend\UserCreated;
-use App\Events\Backend\UserUpdated;
 use App\Events\Backend\UserProfileUpdated;
+use App\Events\Backend\UserUpdated;
 use App\Exceptions\GeneralException;
 use App\Http\Controllers\Controller;
 use App\Models\Permission;

diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -19,7 +19,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/');
+            return redirect()->intended('/');
         }
 
         return $next($request);

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "keywords": ["framework", "laravel", "cms", "starter", "admin"],
     "license": "GPL-3.0-or-later",
     "type": "project",
-    "version": "v7.7.1",
+    "version": "v7.9.0",
     "require": {
         "php": "^7.2.5",
         "alexusmai/laravel-file-manager": "^2.4",