Skip to content

Commit c4ae904

Browse files
nasirkhannasirkhan
authored
Merge pull request #215 from nasirkhan/release
v7.9.0
2 parents b9c44cd + 91f55a7 commit c4ae904

File tree

15 files changed

+649
-546
lines changed

15 files changed

+649
-546
lines changed

‎Modules/Article/Resources/views/backend/categories/index_datatable.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<div class="col-4">
2424
<div class="float-right">
2525
<x-buttons.create route='{{ route("backend.$module_name.create") }}' title="{{__('Create')}} {{ ucwords(Str::singular($module_name)) }}"/>
26-
26+
2727
<div class="btn-group" role="group" aria-label="Toolbar button groups">
2828
<div class="btn-group" role="group">
29-
<button id="btnGroupToolbar" type="button" class="btn btn-secondary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
29+
<button id="btnGroupToolbar" type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
3030
<i class="fas fa-cog"></i>
3131
</button>
3232
<div class="dropdown-menu" aria-labelledby="btnGroupToolbar">

‎Modules/Comment/Resources/views/frontend/comments/index.blade.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@extends('frontend.layouts.app')
22

3-
@section('title')
4-
Comments
5-
@stop
3+
@section('title') Comments @endsection
64

75
@section('content')
86
<div class="page-header page-header-small">
@@ -16,11 +14,11 @@
1614
</h1>
1715

1816
<div class="text-center">
19-
@php $title_text = 'Tags - Mukto Library'; @endphp
17+
@php $title_text = 'Tags'; @endphp
2018

21-
<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>
19+
<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>
2220

23-
<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>
21+
<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>
2422

2523
<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>
2624

@@ -80,5 +78,4 @@
8078
</div>
8179
</div>
8280

83-
8481
@endsection

‎Modules/Comment/Resources/views/frontend/comments/show.blade.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@extends('frontend.layouts.app')
22

3-
@section('title')
4-
{{$$module_name_singular->name}}
5-
@stop
3+
@section('title') {{$$module_name_singular->name}} @endsection
64

75

86
@section('content')
@@ -152,5 +150,4 @@
152150
</div>
153151
</div>
154152

155-
156153
@endsection

‎Modules/Tag/Resources/views/frontend/tags/index.blade.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
@extends('frontend.layouts.app')
22

3-
@section('title')
4-
Tags
5-
@stop
6-
3+
@section('title') Tags @endsection
74

85
@section('content')
96
<div class="page-header page-header-small">
@@ -17,11 +14,11 @@
1714
</h1>
1815

1916
<div class="text-center">
20-
@php $title_text = 'Tags - Mukto Library'; @endphp
17+
@php $title_text = 'Tags - LaravelStarter'; @endphp
2118

22-
<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>
19+
<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>
2320

24-
<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>
21+
<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>
2522

2623
<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>
2724

@@ -81,5 +78,4 @@
8178
</div>
8279
</div>
8380

84-
8581
@endsection

‎Modules/Tag/Resources/views/frontend/tags/show.blade.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@extends('frontend.layouts.app')
22

3-
@section('title')
4-
{{$$module_name_singular->name}}
5-
@stop
3+
@section('title') {{$$module_name_singular->name}} @endsection
64

75

86
@section('content')

‎app/Http/Controllers/Auth/LoginController.php

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ class LoginController extends Controller
2727

2828
use AuthenticatesUsers;
2929

30-
/**
31-
* Where to redirect users after login.
32-
*
33-
* @var string
34-
*/
35-
protected $redirectTo = RouteServiceProvider::HOME;
36-
3730
/**
3831
* Create a new controller instance.
3932
*
@@ -44,6 +37,22 @@ public function __construct()
4437
$this->middleware('guest')->except('logout');
4538
}
4639

40+
/**
41+
* Where to redirect users after login.
42+
*
43+
* @var string
44+
*/
45+
public function redirectTo()
46+
{
47+
$redirectTo = request()->redirectTo;
48+
49+
if ($redirectTo) {
50+
return $redirectTo;
51+
} else {
52+
return RouteServiceProvider::HOME;
53+
}
54+
}
55+
4756
/**
4857
* Redirect the user to the Provider (Facebook, Google, GitHub...) authentication page.
4958
*

‎app/Http/Controllers/Auth/RegisterController.php

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Events\Frontend\UserRegistered;
66
use App\Http\Controllers\Controller;
77
use App\Models\User;
8+
use App\Providers\RouteServiceProvider;
89
use Illuminate\Foundation\Auth\RegistersUsers;
910
use Illuminate\Support\Facades\Hash;
1011
use Illuminate\Support\Facades\Validator;
@@ -24,13 +25,6 @@ class RegisterController extends Controller
2425

2526
use RegistersUsers;
2627

27-
/**
28-
* Where to redirect users after registration.
29-
*
30-
* @var string
31-
*/
32-
protected $redirectTo = '/';
33-
3428
/**
3529
* Create a new controller instance.
3630
*
@@ -41,6 +35,22 @@ public function __construct()
4135
$this->middleware('guest');
4236
}
4337

38+
/**
39+
* Where to redirect users after login.
40+
*
41+
* @var string
42+
*/
43+
public function redirectTo()
44+
{
45+
$redirectTo = request()->redirectTo;
46+
47+
if ($redirectTo) {
48+
return $redirectTo;
49+
} else {
50+
return RouteServiceProvider::HOME;
51+
}
52+
}
53+
4454
/**
4555
* Get a validator for an incoming registration request.
4656
*

‎app/Http/Controllers/Backend/UserController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
use App\Authorizable;
66
use App\Events\Backend\UserCreated;
7-
use App\Events\Backend\UserUpdated;
87
use App\Events\Backend\UserProfileUpdated;
8+
use App\Events\Backend\UserUpdated;
99
use App\Exceptions\GeneralException;
1010
use App\Http\Controllers\Controller;
1111
use App\Models\Permission;

‎app/Http/Middleware/RedirectIfAuthenticated.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class RedirectIfAuthenticated
1919
public function handle($request, Closure $next, $guard = null)
2020
{
2121
if (Auth::guard($guard)->check()) {
22-
return redirect('/');
22+
return redirect()->intended('/');
2323
}
2424

2525
return $next($request);

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"keywords": ["framework", "laravel", "cms", "starter", "admin"],
55
"license": "GPL-3.0-or-later",
66
"type": "project",
7-
"version": "v7.7.1",
7+
"version": "v7.9.0",
88
"require": {
99
"php": "^7.2.5",
1010
"alexusmai/laravel-file-manager": "^2.4",

0 commit comments

Comments
 (0)