Skip to content

Commit 5f3bf22

Browse files
Merge pull request #9 from creativetimofficial/master
Update to Laravel 8.x
2 parents f010aa4 + 6c49517 commit 5f3bf22

File tree

11 files changed

+23
-14
lines changed

11 files changed

+23
-14
lines changed

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ All notable changes to `Light Bootstrap Dashboard` frontend preset for Laravel w
1515
## Version 1.0.2 - 2020-03-18
1616

1717
- Update to Laravel 7.x
18+
19+
## Version 1.0.3 - 2020-09-23
20+
21+
- Update to Laravel 8.x

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"homepage": "https://github.com/creativetimofficial/light-bootstrap-dashboard-laravel",
66
"keywords": ["Laravel", "Preset", "Light Bootstrap"],
77
"require": {
8-
"laravel/framework": "^7.0"
8+
"laravel/framework": "^8.0",
9+
"laravel/legacy-factories": "^1.0"
910
},
1011
"autoload": {
1112
"psr-4": {

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
![Product Image](https://github.com/creativetimofficial/public-assets/raw/master/light-bootstrap-dashboard-laravel/intro.gif)
88

9-
Speed up your web development with the Bootstrap 4 Admin Dashboard built for Laravel Framework 5.5 and up.
9+
Speed up your web development with the Bootstrap 4 Admin Dashboard built for Laravel Framework 8.x and up.
1010

1111
## Note
1212

src/LightBootstrapPreset.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ protected static function updateAuthViews()
104104
// Add Auth routes in 'routes/web.php'
105105
file_put_contents(
106106
'./routes/web.php',
107-
"Auth::routes();\n\nRoute::get('/home', 'HomeController@index')->name('dashboard');\n\n",
107+
"Auth::routes();\n\nRoute::get('/home', 'App\Http\Controllers\HomeController@index')->name('dashboard');\n\n",
108108
FILE_APPEND
109109
);
110110

@@ -121,7 +121,7 @@ protected static function updateAuthViews()
121121
public static function addUserManagement()
122122
{
123123
// Add seeder, controllers, requests and rules
124-
static::copyDirectory('database/seeds', app_path('../database/seeds'));
124+
static::copyDirectory('database/seeds', app_path('../database/seeders'));
125125

126126
static::copyFile('app/Http/Controllers/UserController.php', app_path('Http/Controllers/UserController.php'));
127127
static::copyFile('app/Http/Controllers/ProfileController.php', app_path('Http/Controllers/ProfileController.php'));
@@ -131,7 +131,7 @@ public static function addUserManagement()
131131
// Add routes
132132
file_put_contents(
133133
'./routes/web.php',
134-
"Route::group(['middleware' => 'auth'], function () {\n\tRoute::resource('user', 'UserController', ['except' => ['show']]);\n\tRoute::get('profile', ['as' => 'profile.edit', 'uses' => 'ProfileController@edit']);\n\tRoute::patch('profile', ['as' => 'profile.update', 'uses' => 'ProfileController@update']);\n\tRoute::patch('profile/password', ['as' => 'profile.password', 'uses' => 'ProfileController@password']);\n});\n\n",
134+
"Route::group(['middleware' => 'auth'], function () {\n\tRoute::resource('user', 'App\Http\Controllers\UserController', ['except' => ['show']]);\n\tRoute::get('profile', ['as' => 'profile.edit', 'uses' => 'App\Http\Controllers\ProfileController@edit']);\n\tRoute::patch('profile', ['as' => 'profile.update', 'uses' => 'App\Http\Controllers\ProfileController@update']);\n\tRoute::patch('profile/password', ['as' => 'profile.password', 'uses' => 'App\Http\Controllers\ProfileController@password']);\n});\n\n",
135135
FILE_APPEND
136136
);
137137

@@ -153,7 +153,7 @@ public static function addPages()
153153
// Add routes
154154
file_put_contents(
155155
'./routes/web.php',
156-
"Route::group(['middleware' => 'auth'], function () {\n\tRoute::get('{page}', ['as' => 'page.index', 'uses' => 'PageController@index']);\n});\n\n",
156+
"Route::group(['middleware' => 'auth'], function () {\n\tRoute::get('{page}', ['as' => 'page.index', 'uses' => 'App\Http\Controllers\PageController@index']);\n});\n\n",
157157
FILE_APPEND
158158
);
159159

src/light-bootstrap-stubs/app/Http/Controllers/UserController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Controllers;
44

5-
use App\User;
5+
use App\Models\User;
66
use App\Http\Requests\UserRequest;
77
use Illuminate\Support\Facades\Hash;
88

@@ -11,7 +11,7 @@ class UserController extends Controller
1111
/**
1212
* Display a listing of the users
1313
*
14-
* @param \App\User $model
14+
* @param \App\Models\User $model
1515
* @return \Illuminate\View\View
1616
*/
1717
public function index(User $model)

src/light-bootstrap-stubs/app/Http/Requests/ProfileRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Requests;
44

5-
use App\User;
5+
use App\Models\User;
66
use Illuminate\Validation\Rule;
77
use Illuminate\Foundation\Http\FormRequest;
88

src/light-bootstrap-stubs/app/Http/Requests/UserRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Requests;
44

5-
use App\User;
5+
use App\Models\User;
66
use Illuminate\Validation\Rule;
77
use Illuminate\Foundation\Http\FormRequest;
88

src/light-bootstrap-stubs/database/seeds/DatabaseSeeder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
2+
namespace Database\Seeders;
23

4+
use Illuminate\Support\Facades\DB;
35
use Illuminate\Database\Seeder;
46

57
class DatabaseSeeder extends Seeder

src/light-bootstrap-stubs/database/seeds/UsersTableSeeder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
2+
namespace Database\Seeders;
23

4+
use Illuminate\Support\Facades\DB;
35
use Illuminate\Database\Seeder;
46
use Illuminate\Support\Facades\Hash;
57

src/light-bootstrap-stubs/resources/views/alerts/migrations_check.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@if (!\Schema::hasTable((new \App\User)->getTable()))
1+
@if (!\Schema::hasTable((new \App\Models\User)->getTable()))
22
<div class="alert alert-danger fade show" role="alert">
33
{{ __('You did not run the migrations and seeders! The login information will not be available!') }}
44
</div>

src/light-bootstrap-stubs/resources/views/users/index.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@
187187
<p>{{ __("Notifications") }}</p>
188188
</a>
189189
</li>
190-
<li class="nav-item active-pro">
191-
<a class="nav-link active" href="{{route('page.index', 'upgrade')}}">
190+
<li class="nav-item">
191+
<a class="nav-link active bg-danger" href="{{route('page.index', 'upgrade')}}">
192192
<i class="nc-icon nc-alien-33"></i>
193193
<p>{{ __("Upgrade to PRO") }}</p>
194194
</a>
@@ -511,4 +511,4 @@
511511
});
512512
});
513513
</script>
514-
</html>
514+
</html>

0 commit comments

Comments
 (0)