Skip to content

Commit 6eab39d

Browse files
Merge pull request #5 from creativetimofficial/master
Update Laravel 7.x
2 parents d750168 + 727e2c9 commit 6eab39d

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"homepage": "https://github.com/creativetimofficial/black-dashboard-laravel",
66
"keywords": ["Laravel", "Preset", "Black"],
77
"require": {
8-
"laravel/framework": "^5.5 || ^6.0"
8+
"laravel/framework": "^7.0"
99
},
1010
"autoload": {
1111
"psr-4": {
@@ -19,4 +19,4 @@
1919
]
2020
}
2121
}
22-
}
22+
}

readme.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ If you don't already have an Apache local environment with PHP and MySQL, use on
2222

2323
Also, you will need to install Composer: https://getcomposer.org/doc/00-intro.md
2424

25-
And Laravel: https://laravel.com/docs/6.x/installation
25+
And Laravel: https://laravel.com/docs/7.x/installation
2626

2727
## Installation
2828

@@ -31,8 +31,9 @@ After initializing a fresh instance of Laravel (and making all the necessary con
3131
### Via composer
3232

3333
1. `Cd` to your Laravel app
34+
2. Type in your terminal: `composer require laravel/ui` and `php artisan ui vue --auth`
3435
2. Install this preset via `composer require laravel-frontend-presets/black-dashboard`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
35-
3. Run `php artisan preset black` 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`
36+
3. Run `php artisan ui black` 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`
3637
(NOTE: If you run this command several times, be sure to clean up the duplicate Auth entries in routes/web.php)
3738
4. In your terminal run `composer dump-autoload`
3839
5. Run `php artisan migrate --seed` to create basic users table
@@ -45,10 +46,11 @@ After initializing a fresh instance of Laravel (and making all the necessary con
4546
4. Open `composer.json` file
4647
5. Add `"LaravelFrontendPresets\\BlackPreset\\": "presets/black/src"` to `autoload/psr-4` and to `autoload-dev/psr-4`
4748
6. Add `LaravelFrontendPresets\BlackPreset\BlackPresetServiceProvider::class` to `config/app.php` file
48-
7. In your terminal run `composer dump-autoload`
49-
8. Run `php artisan preset black` command to install the Black 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`
49+
7. Type in your terminal: `composer require laravel/ui` and `php artisan ui vue --auth`
50+
8. In your terminal run `composer dump-autoload`
51+
9. Run `php artisan ui black` command to install the Black 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`
5052
(NOTE: If you run this command several times, be sure to clean up the duplicate Auth entries in routes/web.php)
51-
9. Run `php artisan migrate --seed` to create basic users table
53+
10. Run `php artisan migrate --seed` to create basic users table
5254

5355

5456
## Usage

src/BlackPreset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace LaravelFrontendPresets\BlackPreset;
44

55
use Illuminate\Filesystem\Filesystem;
6-
use Illuminate\Foundation\Console\Presets\Preset;
6+
use Laravel\Ui\Presets\Preset;
77

88
class BlackPreset extends Preset
99
{

src/BlackPresetServiceProvider.php

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

55
use Illuminate\Support\ServiceProvider;
66
use Illuminate\Foundation\Console\PresetCommand;
7+
use Laravel\Ui\UiCommand;
8+
use Laravel\Ui\AuthCommand;
79

810
class BlackPresetServiceProvider extends ServiceProvider
911
{
@@ -14,7 +16,7 @@ class BlackPresetServiceProvider extends ServiceProvider
1416
*/
1517
public function boot()
1618
{
17-
PresetCommand::macro('black', function ($command) {
19+
UiCommand::macro('black', function ($command) {
1820
BlackPreset::install();
1921

2022
$command->info('Black Dashboard scaffolding installed successfully.');

src/black-stubs/resources/views/layouts/navbars/sidebar.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<p>{{ __('RTL Support') }}</p>
7272
</a>
7373
</li>
74-
<li class=" {{ $pageSlug == 'upgrade' ? 'active' : '' }}">
74+
<li class=" {{ $pageSlug == 'upgrade' ? 'active' : '' }} bg-info">
7575
<a href="{{ route('pages.upgrade') }}">
7676
<i class="tim-icons icon-spaceship"></i>
7777
<p>{{ __('Upgrade to PRO') }}</p>

0 commit comments

Comments
 (0)