merge

Author: mariusconstantin2503

changelog.md

@@ -11,3 +11,11 @@ All notable changes to `Light Bootstrap Dashboard` frontend preset for Laravel w
 ## Version 1.0.1 - 2019-09-23
 
 - Update to Laravel 6.x
+
+## Version 1.0.2 - 2020-03-18
+
+- Update to Laravel 7.x
+
+## Version 1.0.3 - 2020-09-23
+
+- Update to Laravel 8.x

composer.json

@@ -5,7 +5,8 @@
     "homepage": "https://github.com/creativetimofficial/light-bootstrap-dashboard-laravel",
     "keywords": ["Laravel", "Preset", "Light Bootstrap"],
     "require": {
-        "laravel/framework": "^5.5 || ^6.0"
+        "laravel/framework": "^8.0",
+        "laravel/legacy-factories": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -19,4 +20,4 @@
             ]
         }
     }
-}
+}

readme.md

@@ -6,7 +6,7 @@
 
 ![Product Image](https://github.com/creativetimofficial/public-assets/raw/master/light-bootstrap-dashboard-laravel/intro.gif)
 
-Speed up your web development with the Bootstrap 4 Admin Dashboard built for Laravel Framework 5.5 and up.
+Speed up your web development with the Bootstrap 4 Admin Dashboard built for Laravel Framework 8.x and up.
 
 ## Note
 
@@ -21,7 +21,7 @@ If you don't already have an Apache local environment with PHP and MySQL, use on
  - Mac: https://wpshout.com/quick-guides/how-to-install-mamp-on-your-mac/
 
 Also, you will need to install Composer: https://getcomposer.org/doc/00-intro.md   
-And Laravel: https://laravel.com/docs/6.x/installation
+And Laravel: https://laravel.com/docs/7.x/installation
 
 ## Installation
 
@@ -30,11 +30,12 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 ### Via composer
 
 1. `Cd` to your Laravel app  
-2. Install this preset via `composer require laravel-frontend-presets/light-bootstrap`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
-3. Run `php artisan preset light-bootstrap` command to install the Light Bootstrap preset. This will install all the necessary assets and also the custom auth views, it will also add the auth route in `routes/web.php`
+2. Type in your terminal: `composer require laravel/ui` and `php artisan ui vue --auth`
+3. Install this preset via `composer require laravel-frontend-presets/light-bootstrap`. No need to register the service provider. Laravel 8.x can auto detect the package.
+4. Run `php artisan ui light-bootstrap` command to install the Light Bootstrap preset. This will install all the necessary assets and also the custom auth views, it will also add the auth route in `routes/web.php`
 (NOTE: If you run this command several times, be sure to clean up the duplicate Auth entries in routes/web.php)
-4. In your terminal run `composer dump-autoload`
-5. Run `php artisan migrate --seed` to create basic users table
+5. In your terminal run `composer dump-autoload`
+6. Run `php artisan migrate --seed` to create basic users table
 
 ### By using the archive
 
@@ -44,17 +45,18 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 4. Open `composer.json` file 
 5. Add `"LaravelFrontendPresets\\LightBootstrapPreset\\": "presets/light-bootstrap/src"` to `autoload/psr-4` and to `autoload-dev/psr-4`
 6. Add `LaravelFrontendPresets\LightBootstrapPreset\LightBootstrapPresetServiceProvider::class` to `config/app.php` file
-7. In your terminal run `composer dump-autoload`
-8. Run `php artisan preset light-bootstrap` command to install the Light Bootstrap preset. This will install all the necessary assets and also the custom auth views, it will also add the auth route in `routes/web.php`
+7. Type in your terminal: `composer require laravel/ui` and `php artisan ui vue --auth`
+8. In your terminal run `composer dump-autoload`
+9. Run `php artisan ui light-bootstrap` command to install the Light Bootstrap preset. This will install all the necessary assets and also the custom auth views, it will also add the auth route in `routes/web.php`
 (NOTE: If you run this command several times, be sure to clean up the duplicate Auth entries in routes/web.php)
-9. Run `php artisan migrate --seed` to create basic users table
+10. Run `php artisan migrate --seed` to create basic users table
 
 
 ## Usage
 
 Register a user or login using **admin@lightbp.com** and **secret** and start testing the preset (make sure to run the migrations and seeders for these credentials to be available).
 
-Besides the dashboard and the auth pages this preset also has a user management example and an edit profile page. All the necessary files (controllers, requests, views) are installed out of the box and all the needed routes are added to `routes/web.php`. Keep in mind that all of the features can be viewed once you login using the credentials provided above or by registering your own user. 
+Besides the dashboard and the auth pages this preset also has an edit profile page. All the necessary files (controllers, requests, views) are installed out of the box and all the needed routes are added to `routes/web.php`. Keep in mind that all of the features can be viewed once you login using the credentials provided above or by registering your own user. 
 
 ### Dashboard
 
@@ -87,54 +89,6 @@ public function rules()
     ];
 }
 ```
-
-### User management
-
-The preset comes with a user management option out of the box. To access this click the "**User Management**" link in the left sidebar or add **/user** to the url.
-The first thing you will see is the listing of the existing users. You can add new ones by clicking the "**Add user**" button (above the table on the right). On the Add user page you will see the form that allows you to do this. All pages are generate using blade templates:
-
-```
-<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}">
-    <label class="form-control-label" for="input-name">
-        <i class="w3-xxlarge fa fa-user"></i>{{ __('Name') }}
-    </label>
-    <input type="text" name="name" id="input-name" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" placeholder="{{ __('Name') }}" value="{{ old('name') }}" required autofocus>
-
-    @include('alerts.feedback', ['field' => 'name'])
-</div>
-```
-
-Also validation rules were added so you will know exactely what to enter in the form fields (see `App\Http\Requests\UserRequest`). Note that these validation rules also apply for the user edit option.
-
-```
-public function rules()
-{
-    return [
-        'name' => [
-            'required', 'min:3'
-        ],
-        'email' => [
-            'required', 'email', Rule::unique((new User)->getTable())->ignore($this->route()->user->id ?? null)
-        ],
-        'password' => [
-            $this->route()->user ? 'nullable' : 'required', 'confirmed', 'min:6'
-        ]
-    ];
-}
-```
-
-Once you add more users, the list will get bigger and for every user you will have edit and delete options (access these options by clicking the three dotted menu that appears at the end of every line). 
-
-All the sample code for the user management can be found in `App\Http\Controllers\UserController`. See store method example bellow:
-
-```
-public function store(UserRequest $request, User $model)
-{
-    $model->create($request->merge(['password' => Hash::make($request->get('password'))])->all());
-
-    return redirect()->route('user.index')->withStatus(__('User successfully created.'));
-}
-```
 ## Table of Contents
 
 * [Versions](#versions)
@@ -387,8 +341,6 @@ The documentation for the Light Bootstrap Dashboard Laravel is hosted at our [we
 │       ├── profile
 │       │   └── edit.blade.php
 │       ├── users
-│       │   ├── create.blade.php
-│       │   ├── edit.blade.php
 │       │   └── index.blade.php
 │       └── welcome.blade.php
 ├── routes
@@ -413,38 +365,6 @@ The documentation for the Light Bootstrap Dashboard Laravel is hosted at our [we
 │   │   │   └── bDASqge6ugwwnupCJQxc6UpeCzU5mWnlBf3OtHbV
 │   │   ├── testing
 │   │   └── views
-│   │       ├── 04b958597ac91af5b8ebb75038df5d900297b6a7.php
-│   │       ├── 05829f4c1315a44d2904e84933b90d416144f630.php
-│   │       ├── 05c5b9d007a38fc4b785152d465481de7a93bed6.php
-│   │       ├── 0634ddc2d2d29656d3f4576c6d7b623791e2518c.php
-│   │       ├── 24f1083e9b186b7f55cc8c6649c5dbdd3dacdc62.php
-│   │       ├── 27934ff5ea17b73d8fa6e99667900193091d90a1.php
-│   │       ├── 3165176f58ae96f4f02e42be6b4515eebfdfb36f.php
-│   │       ├── 57323755d2658f87f735b891a73af859f3b26e47.php
-│   │       ├── 59ef904b35dc7837736542c9700d1ee72a871dba.php
-│   │       ├── 5c19801a059c8b15432eed2cbbc1a15cb266275a.php
-│   │       ├── 5de1492ae4c3ed70b23edf4e796ae22e1e8a1714.php
-│   │       ├── 617582690557c899eb5cfe5c3358d722ae038c37.php
-│   │       ├── 63779ff629d693180563c0b4d1c4c0734b517c9c.php
-│   │       ├── 642c59cb17d565e1fd038dd4268ec2642d9a2ccf.php
-│   │       ├── 709415e6e1f3c7c40434b424285d28e7565ba8e1.php
-│   │       ├── 7446704d3fce78ba7e3fc792f8c9ffbbf5c71897.php
-│   │       ├── 7a7c0c219ee4d45946f89ad299f9445cdaaa53d8.php
-│   │       ├── 7d0fb617fee39e1a3352563d6ab5daeebf8c4bc6.php
-│   │       ├── 8faacd4a293449e932d4c5af9a503d69d45fcd0b.php
-│   │       ├── a4190e3cd4cb63dce221782d8d14f0385da2d90f.php
-│   │       ├── a72b165d948d61cf2e235be6154470a8937a3bfc.php
-│   │       ├── bc28b536048dacbd265d18e8f2cd044f55bd7cbd.php
-│   │       ├── bd791cb3de118fb816e39a0e7c83ab29633d81b4.php
-│   │       ├── cd6ad60026b669d0ebdbdfb8483dc28be06ecdce.php
-│   │       ├── d0bc6a520831ef96fb30a18c8be7139451677793.php
-│   │       ├── d495b8de2860ebdac0f385d83d6c9d6d76c09718.php
-│   │       ├── d52af56743543221251745c688e164f2e81259fe.php
-│   │       ├── d530924a1a223139a7890de97017614e8ce1247b.php
-│   │       ├── df19ac7c63550101893f8c4b5adbabe5fbe75b2f.php
-│   │       ├── e480cadcf735d470f8aee77b42d1b5f734adf1b0.php
-│   │       ├── e95e32fec19936a599650d431a2eccc2f77e7bfa.php
-│   │       └── f28fc2172870340ba966e4550a16b92964e9cd93.php
 │   └── logs
 │       ├── laravel-2019-08-07.log
 │       ├── laravel-2019-08-08.log

src/LightBootstrapPreset.php

@@ -3,7 +3,7 @@
 namespace LaravelFrontendPresets\LightBootstrapPreset;
 
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Foundation\Console\Presets\Preset;
+use Laravel\Ui\Presets\Preset;
 
 class LightBootstrapPreset extends Preset
 {
@@ -104,7 +104,7 @@ protected static function updateAuthViews()
         // Add Auth routes in 'routes/web.php'
         file_put_contents(
             './routes/web.php', 
-            "Auth::routes();\n\nRoute::get('/home', 'HomeController@index')->name('dashboard');\n\n", 
+            "Auth::routes();\n\nRoute::get('/home', 'App\Http\Controllers\HomeController@index')->name('dashboard');\n\n", 
             FILE_APPEND
         );
 
@@ -121,7 +121,7 @@ protected static function updateAuthViews()
     public static function addUserManagement()
     {
         // Add seeder, controllers, requests and rules
-        static::copyDirectory('database/seeds', app_path('../database/seeds'));
+        static::copyDirectory('database/seeds', app_path('../database/seeders'));
 
         static::copyFile('app/Http/Controllers/UserController.php', app_path('Http/Controllers/UserController.php'));
         static::copyFile('app/Http/Controllers/ProfileController.php', app_path('Http/Controllers/ProfileController.php'));
@@ -131,7 +131,7 @@ public static function addUserManagement()
         // Add routes
         file_put_contents(
             './routes/web.php', 
-            "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", 
+            "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", 
             FILE_APPEND
         );
 
@@ -153,7 +153,7 @@ public static function addPages()
         // Add routes
         file_put_contents(
             './routes/web.php', 
-            "Route::group(['middleware' => 'auth'], function () {\n\tRoute::get('{page}', ['as' => 'page.index', 'uses' => 'PageController@index']);\n});\n\n", 
+            "Route::group(['middleware' => 'auth'], function () {\n\tRoute::get('{page}', ['as' => 'page.index', 'uses' => 'App\Http\Controllers\PageController@index']);\n});\n\n", 
             FILE_APPEND
         );
 

src/LightBootstrapPresetServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Foundation\Console\PresetCommand;
+use Laravel\Ui\UiCommand; use Laravel\Ui\AuthCommand;
 
 class LightBootstrapPresetServiceProvider extends ServiceProvider
 {
@@ -14,7 +15,7 @@ class LightBootstrapPresetServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        PresetCommand::macro('light-bootstrap', function ($command) {
+        UiCommand::macro('light-bootstrap', function ($command) {
             LightBootstrapPreset::install();
 
             $command->info('Light Bootstrap scaffolding installed successfully.');

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
+use App\Models\User;
 use App\Http\Requests\UserRequest;
 use Illuminate\Support\Facades\Hash;
 
@@ -11,76 +11,11 @@ class UserController extends Controller
     /**
      * Display a listing of the users
      *
-     * @param  \App\User  $model
+     * @param  \App\Models\User  $model
      * @return \Illuminate\View\View
      */
     public function index(User $model)
     {
         return view('users.index', ['users' => $model->paginate(15)]);
     }
-
-    /**
-     * Show the form for creating a new user
-     *
-     * @return \Illuminate\View\View
-     */
-    public function create()
-    {
-        return view('users.create');
-    }
-
-    /**
-     * Store a newly created user in storage
-     *
-     * @param  \App\Http\Requests\UserRequest  $request
-     * @param  \App\User  $model
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function store(UserRequest $request, User $model)
-    {
-        $model->create($request->merge(['password' => Hash::make($request->get('password'))])->all());
-
-        return redirect()->route('user.index')->withStatus(__('User successfully created.'));
-    }
-
-    /**
-     * Show the form for editing the specified user
-     *
-     * @param  \App\User  $user
-     * @return \Illuminate\View\View
-     */
-    public function edit(User $user)
-    {
-        return view('users.edit', compact('user'));
-    }
-
-    /**
-     * Update the specified user in storage
-     *
-     * @param  \App\Http\Requests\UserRequest  $request
-     * @param  \App\User  $user
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(UserRequest $request, User  $user)
-    {
-        $user->update(
-            $request->merge(['password' => Hash::make($request->get('password'))])
-                ->except([$request->get('password') ? '' : 'password']
-        ));
-
-        return redirect()->route('user.index')->withStatus(__('User successfully updated.'));
-    }
-
-    /**
-     * Remove the specified user from storage
-     *
-     * @param  \App\User  $user
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function destroy(User  $user)
-    {
-        $user->delete();
-
-        return redirect()->route('user.index')->withStatus(__('User successfully deleted.'));
-    }
 }

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
 

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
 

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

@@ -1,5 +1,7 @@
 <?php
+namespace Database\Seeders;
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder

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

@@ -1,5 +1,7 @@
 <?php
+namespace Database\Seeders;
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Hash;
 

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

@@ -1,4 +1,4 @@
-@if (!\Schema::hasTable((new \App\User)->getTable()))
+@if (!\Schema::hasTable((new \App\Models\User)->getTable()))
     <div class="alert alert-danger fade show" role="alert">
         {{ __('You did not run the migrations and seeders! The login information will not be available!') }}
     </div>

src/light-bootstrap-stubs/resources/views/auth/verify.blade.php

@@ -15,7 +15,11 @@
                     @endif
 
                     {{ __('Before proceeding, please check your email for a verification link.') }}
-                    {{ __('If you did not receive the email') }}, <a href="{{ route('verification.resend') }}">{{ __('click here to request another') }}</a>.
+                    {{ __('If you did not receive the email') }}, 
+                    <form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
+                        @csrf
+                        <button type="submit" class="btn btn-link p-0 m-0 align-baseline">{{ __('click here to request another') }}</button>.
+                    </form>
                 </div>
             </div>
         </div>