Merge branch 'master' of https://github.com/creativetimofficial/material-dashboard-laravel

Author: AndreiDecuseara

changelog.md

@@ -18,3 +18,6 @@ All notable changes to `Material Dashboard` frontend preset for Laravel will be
 
 ## Version 1.0.6 - 2019-09-23
 - Update to Laravel 6.x
+
+## Version 1.0.7 - 2020-03-18
+- Update to Laravel 7.x

readme.md

@@ -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/material-dashboard`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
-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`
+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/material-dashboard`. No need to register the service provider. Laravel 5.5 & up can auto detect the package.
+4. 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`
 (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
 

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

@@ -77,12 +77,12 @@
           <p>{{ __('RTL Support') }}</p>
         </a>
       </li>
-      <li class="nav-item active-pro{{ $activePage == 'upgrade' ? ' active' : '' }} bg-danger">
-        <a class="nav-link text-white" href="{{ route('upgrade') }}">
-          <i class="material-icons">unarchive</i>
+      <li class="nav-item active-pro{{ $activePage == 'upgrade' ? ' active' : '' }}">
+        <a class="nav-link text-white bg-danger" href="{{ route('upgrade') }}">
+          <i class="material-icons text-white">unarchive</i>
           <p>{{ __('Upgrade to PRO') }}</p>
         </a>
       </li>
     </ul>
   </div>
-</div>
+</div>

src/material-stubs/resources/views/users/index.blade.php

@@ -148,9 +148,9 @@
                       <p>{{ __('RTL Support') }}</p>
                     </a>
                   </li>
-                  <li class="nav-item active-pro">
-                    <a class="nav-link" href="{{ route('upgrade') }}">
-                      <i class="material-icons">unarchive</i>
+                  <li class="nav-item active-pro{{ $activePage == 'upgrade' ? ' active' : '' }}">
+                    <a class="nav-link text-white bg-danger" href="{{ route('upgrade') }}">
+                      <i class="material-icons text-white">unarchive</i>
                       <p>{{ __('Upgrade to PRO') }}</p>
                     </a>
                   </li>
@@ -474,4 +474,4 @@
         </noscript>
         @stack('js')
     </body>
-</html>
+</html>