Merge pull request #30 from peerrabe/feature/laravel6-compat

Feature/laravel6 compat

Author: cesaramirez

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "cesaramirez/laravel-tabler",
-  "description": "Laravel 5.5/5.6 Front-end preset for Tabler Bootstrap.",
+  "description": "Laravel 5.*/6.* Front-end preset for Tabler Bootstrap.",
   "keywords": ["laravel", "preset", "tabler", "bootstrap"],
   "license": "MIT",
   "minimum-stability": "stable",
@@ -11,10 +11,7 @@
     }
   ],
   "require": {
-    "laravel/framework": "^5.5"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "~4.5"
+    "laravel/framework": "^5.5||^6.0"
   },
   "autoload": {
     "psr-4": {

src/TablerPreset.php

@@ -39,6 +39,7 @@ protected static function updatePackageArray(array $packages)
     {
         return [
             'bootstrap' => '^4.1.0',
+            'jquery' => '^3.4.1',
             'popper.js' => '^1.14.3',
         ] + Arr::except($packages, ['bootstrap-sass']);
     }

src/tabler-stubs/bootstrap.js

@@ -1,4 +1,4 @@
-window._ = require("lodash");
+window._ = require('lodash');
 
 window.Popper = require("popper.js/dist/umd/popper");
 
@@ -20,7 +20,7 @@ try {
  * CSRF token as a header based on the value of the "XSRF" token cookie.
  */
 
-window.axios = require("axios");
+window.axios = require('axios');
 
 window.axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
 
@@ -46,13 +46,13 @@ if (token) {
  * allows your team to easily build robust real-time web applications.
  */
 
-// import Echo from 'laravel-echo'
+// import Echo from 'laravel-echo';
 
 // window.Pusher = require('pusher-js');
 
 // window.Echo = new Echo({
 //     broadcaster: 'pusher',
-//     key: 'your-pusher-key',
-//     cluster: 'mt1',
-//     encrypted: true
-// });
+//     key: process.env.MIX_PUSHER_APP_KEY,
+//     cluster: process.env.MIX_PUSHER_APP_CLUSTER,
+//     forceTLS: true
+// });

src/tabler-stubs/views/auth/verify.blade.php

@@ -0,0 +1,28 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Verify Your Email Address') }}</div>
+
+                <div class="card-body">
+                    @if (session('resent'))
+                        <div class="alert alert-success" role="alert">
+                            {{ __('A fresh verification link has been sent to your email address.') }}
+                        </div>
+                    @endif
+
+                    {{ __('Before proceeding, please check your email for a verification link.') }}
+                    {{ __('If you did not receive the email') }},
+                    <form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
+                        @csrf
+                        <button type="submit" class="btn btn-link p-0 m-0 align-baseline">{{ __('click here to request another') }}</button>.
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection