Skip to content

Commit 67b3246

Browse files
Update Laravel 7.x
1 parent 9d65e2e commit 67b3246

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
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/material-dashboard-laravel",
66
"keywords": ["Laravel", "Preset", "Material"],
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: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ If you don't already have an Apache local environment with PHP and MySQL, use on
2121
- Mac: https://wpshout.com/quick-guides/how-to-install-mamp-on-your-mac/
2222

2323
Also, you will need to install Composer: https://getcomposer.org/doc/00-intro.md
24-
And Laravel: https://laravel.com/docs/6.x/installation
24+
And Laravel: https://laravel.com/docs/7.x/installation
2525

2626
## Installation
2727

@@ -31,7 +31,7 @@ After initializing a fresh instance of Laravel (and making all the necessary con
3131

3232
1. `Cd` to your Laravel app
3333
2. Install this preset via `composer require laravel-frontend-presets/material-dashboard`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
34-
3. Run `php artisan preset material` 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`
34+
3. Run `php artisan ui material` 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`
3535
(NOTE: If you run this command several times, be sure to clean up the duplicate Auth entries in routes/web.php)
3636
4. In your terminal run `composer dump-autoload`
3737
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
4444
4. Open `composer.json` file
4545
5. Add `"LaravelFrontendPresets\\MaterialPreset\\": "presets/material/src"` to `autoload/psr-4` and to `autoload-dev/psr-4`
4646
6. Add `LaravelFrontendPresets\MaterialPreset\MaterialPresetServiceProvider::class` to `config/app.php` file
47-
7. In your terminal run `composer dump-autoload`
48-
8. Run `php artisan preset material` command to install the Material 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`
47+
7. Type in your terminal: `composer require laravel/ui` and `php artisan ui vue --auth`
48+
8. In your terminal run `composer dump-autoload`
49+
9. Run `php artisan ui material` command to install the Material 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`
4950
(NOTE: If you run this command several times, be sure to clean up the duplicate Auth entries in routes/web.php)
50-
9. Run `php artisan migrate --seed` to create basic users table
51+
10. Run `php artisan migrate --seed` to create basic users table
5152

5253

5354
## Usage

src/MaterialPreset.php

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

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

88
class MaterialPreset extends Preset
99
{

src/MaterialPresetServiceProvider.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 MaterialPresetServiceProvider extends ServiceProvider
911
{
@@ -14,7 +16,7 @@ class MaterialPresetServiceProvider extends ServiceProvider
1416
*/
1517
public function boot()
1618
{
17-
PresetCommand::macro('material', function ($command) {
19+
UiCommand::macro('material', function ($command) {
1820
MaterialPreset::install();
1921

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
<p>{{ __('RTL Support') }}</p>
7878
</a>
7979
</li>
80-
<li class="nav-item active-pro{{ $activePage == 'upgrade' ? ' active' : '' }}">
81-
<a class="nav-link" href="{{ route('upgrade') }}">
80+
<li class="nav-item active-pro{{ $activePage == 'upgrade' ? ' active' : '' }} bg-danger">
81+
<a class="nav-link text-white" href="{{ route('upgrade') }}">
8282
<i class="material-icons">unarchive</i>
8383
<p>{{ __('Upgrade to PRO') }}</p>
8484
</a>

0 commit comments

Comments
 (0)