diff --git a/composer.json b/composer.json
index 29b5c08..e669211 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"homepage": "https://github.com/creativetimofficial/paper-dashboard-laravel",
"keywords": ["Laravel", "Preset", "Paper"],
"require": {
- "laravel/framework": "^5.5 || ^6.0"
+ "laravel/framework": "^7.0"
},
"autoload": {
"psr-4": {
@@ -19,4 +19,4 @@
]
}
}
-}
+}
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 35182b5..3b1c678 100644
--- a/readme.md
+++ b/readme.md
@@ -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
@@ -31,7 +31,7 @@ After initializing a fresh instance of Laravel (and making all the necessary con
1. `Cd` to your Laravel app
2. Install this preset via `composer require laravel-frontend-presets/paper`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
-3. Run `php artisan preset paper` command to install the Argon 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`
+3. Run `php artisan ui paper` command to install the Argon 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
@@ -44,10 +44,11 @@ After initializing a fresh instance of Laravel (and making all the necessary con
4. Open `composer.json` file
5. Add `"LaravelFrontendPresets\\PaperPreset\\": "presets/paper/src"` to `autoload/psr-4` and to `autoload-dev/psr-4`
6. Add `LaravelFrontendPresets\PaperPreset\PaperPresetServiceProvider::class,` to `config/app.php` file
-7. In your terminal run `composer dump-autoload`
-8. Run `php artisan preset paper` command to install the Paper Dashboard 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 paper` command to install the Paper Dashboard 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
diff --git a/src/PaperPreset.php b/src/PaperPreset.php
index 1ad1c0e..f424f1c 100644
--- a/src/PaperPreset.php
+++ b/src/PaperPreset.php
@@ -3,7 +3,7 @@
namespace LaravelFrontendPresets\PaperPreset;
use Illuminate\Filesystem\Filesystem;
-use Illuminate\Foundation\Console\Presets\Preset;
+use Laravel\Ui\Presets\Preset;
class PaperPreset extends Preset
{
diff --git a/src/PaperPresetServiceProvider.php b/src/PaperPresetServiceProvider.php
index 27d534c..3c25330 100644
--- a/src/PaperPresetServiceProvider.php
+++ b/src/PaperPresetServiceProvider.php
@@ -4,6 +4,8 @@
use Illuminate\Support\ServiceProvider;
use Illuminate\Foundation\Console\PresetCommand;
+use Laravel\Ui\UiCommand;
+use Laravel\Ui\AuthCommand;
class PaperPresetServiceProvider extends ServiceProvider
{
@@ -14,7 +16,7 @@ class PaperPresetServiceProvider extends ServiceProvider
*/
public function boot()
{
- PresetCommand::macro('paper', function ($command) {
+ UiCommand::macro('paper', function ($command) {
PaperPreset::install();
$command->info('Paper dashboard scaffolding installed successfully.');
diff --git a/src/paper-dashboard-stubs/resources/views/layouts/navbars/auth.blade.php b/src/paper-dashboard-stubs/resources/views/layouts/navbars/auth.blade.php
index 32f08c0..5983d5f 100644
--- a/src/paper-dashboard-stubs/resources/views/layouts/navbars/auth.blade.php
+++ b/src/paper-dashboard-stubs/resources/views/layouts/navbars/auth.blade.php
@@ -72,10 +72,10 @@