Skip to content

Commit

Permalink
Update Laravel 7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreiDecuseara committed Mar 17, 2020
1 parent 5916d59 commit 52469ce
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -19,4 +19,4 @@
]
}
}
}
}
11 changes: 6 additions & 5 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/PaperPreset.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 3 additions & 1 deletion src/PaperPresetServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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.');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
<p>{{ __('Typography') }}</p>
</a>
</li>
<li class="active-pro {{ $elementActive == 'upgrade' ? 'active' : '' }}">
<li class="active-pro {{ $elementActive == 'upgrade' ? 'active' : '' }} bg-danger">
<a href="{{ route('page.index', 'upgrade') }}">
<i class="nc-icon nc-spaceship"></i>
<p>{{ __('Upgrade to PRO') }}</p>
<i class="nc-icon nc-spaceship text-white"></i>
<p class="text-white">{{ __('Upgrade to PRO') }}</p>
</a>
</li>
</ul>
Expand Down

0 comments on commit 52469ce

Please sign in to comment.