From 994c077d5040befd8c4f1c699c29036b9a70a74c Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 11:31:25 -0700 Subject: [PATCH 01/19] Updated to laravel 6.0 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 621c3f5..b55d010 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,8 @@ "keywords": ["laravel", "preset", "vuetify"], "license": "MIT", "require": { - "laravel/framework": "^5.7", - "laravel/passport": "^7.0" + "laravel/framework": "^6.0", + "laravel/passport": "^8.0" }, "autoload": { "psr-4": { From b2d3411f68523fbd2d303dfbc5712f862213b66e Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 12:23:39 -0700 Subject: [PATCH 02/19] Updated to latest versions --- src/VuetifyPreset.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/VuetifyPreset.php b/src/VuetifyPreset.php index 2488947..727ee5b 100644 --- a/src/VuetifyPreset.php +++ b/src/VuetifyPreset.php @@ -43,9 +43,11 @@ public static function install($withAuth = false) protected static function updatePackageArray(array $packages) { return array_merge([ - 'vuetify' => '^1.0', + 'vuetify' => '^2.1.13', 'gravatar' => '^1.0', - 'vuex' => '^3.0', + "vue": "^2.6.10", + "vue-template-compiler": "^2.6.10", + "vuex": "^3.1.2" ], Arr::except($packages, [ 'bootstrap', 'bootstrap-sass', From ee791ae3505ef14411a1ea7312f70b42cba66126 Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 12:27:51 -0700 Subject: [PATCH 03/19] Update VuetifyPreset.php --- src/VuetifyPreset.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/VuetifyPreset.php b/src/VuetifyPreset.php index 727ee5b..27d3bb5 100644 --- a/src/VuetifyPreset.php +++ b/src/VuetifyPreset.php @@ -45,9 +45,9 @@ protected static function updatePackageArray(array $packages) return array_merge([ 'vuetify' => '^2.1.13', 'gravatar' => '^1.0', - "vue": "^2.6.10", - "vue-template-compiler": "^2.6.10", - "vuex": "^3.1.2" + 'vue': '^2.6.10', + 'vue-template-compiler': '^2.6.10', + 'vuex': "^3.1.2", ], Arr::except($packages, [ 'bootstrap', 'bootstrap-sass', From 971ca29a393c0b62e9027d672ae3137f96b70ca7 Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 12:28:27 -0700 Subject: [PATCH 04/19] Update VuetifyPreset.php --- src/VuetifyPreset.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/VuetifyPreset.php b/src/VuetifyPreset.php index 27d3bb5..a76d72d 100644 --- a/src/VuetifyPreset.php +++ b/src/VuetifyPreset.php @@ -45,9 +45,9 @@ protected static function updatePackageArray(array $packages) return array_merge([ 'vuetify' => '^2.1.13', 'gravatar' => '^1.0', - 'vue': '^2.6.10', - 'vue-template-compiler': '^2.6.10', - 'vuex': "^3.1.2", + 'vue' => '^2.6.10', + 'vue-template-compiler' => '^2.6.10', + 'vuex' => "^3.1.2", ], Arr::except($packages, [ 'bootstrap', 'bootstrap-sass', From 639805e577a05fc36ec0da0fae7ccd35eec03643 Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 12:48:30 -0700 Subject: [PATCH 05/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84aab8c..485b421 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Sorry no time to mantain this package: if anyone is interested to mantain it please email me at sergiturbadenas at gmail.com -# Laravel 5.5+ Frontend preset for Vuetify with Vuex +# Laravel 6.0+ Frontend preset for Vuetify with Vuex A Laravel front-end scaffolding preset for [Vuetify](https://vuetifyjs.com/en/) - a Material Design Component Framework with Vue and Vuex. From 649e086d93309b91119272099275ff671202e75f Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 12:50:28 -0700 Subject: [PATCH 06/19] Proper init of Vuetify Needed import and init, as well as changing of components to .default as per laravel 6.0 guidelines --- src/vuetify-stubs/js/app.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/vuetify-stubs/js/app.js b/src/vuetify-stubs/js/app.js index eb35ac6..947b155 100644 --- a/src/vuetify-stubs/js/app.js +++ b/src/vuetify-stubs/js/app.js @@ -1,4 +1,4 @@ - +import Vuetify from 'vuetify' /** * First we will load all of this project's JavaScript dependencies which * includes Vue and other libraries. It is a great starting point when @@ -15,9 +15,9 @@ window.Vue = require('vue'); * or customize the JavaScript scaffolding to fit your unique needs. */ -Vue.component('login-button', require('./components/LoginButtonComponent.vue')); -Vue.component('register-button', require('./components/RegisterButtonComponent.vue')); -Vue.component('snackbar', require('./components/SnackBarComponent.vue')); +Vue.component('login-button', require('./components/LoginButtonComponent.vue').default); +Vue.component('register-button', require('./components/RegisterButtonComponent.vue').default); +Vue.component('snackbar', require('./components/SnackBarComponent.vue').default); window.Vuetify = require('vuetify'); Vue.use(Vuetify) @@ -35,5 +35,6 @@ if (window.user ) { const app = new Vue({ el: '#app', - store + store, + vuetify: new Vuetify() }); From 7c62bc629fa2d51518c4deb531fdd8947bec6e5f Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 12:52:05 -0700 Subject: [PATCH 07/19] Import correct vuetify css from npm install --- src/vuetify-stubs/resources/sass/app.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vuetify-stubs/resources/sass/app.scss b/src/vuetify-stubs/resources/sass/app.scss index fee0ed5..7b9974c 100644 --- a/src/vuetify-stubs/resources/sass/app.scss +++ b/src/vuetify-stubs/resources/sass/app.scss @@ -21,4 +21,6 @@ .pace .pace-activity { border-top-color: #0D47A1; border-left-color: #0D47A1; -} \ No newline at end of file +} + +@import '~vuetify/dist/vuetify.min.css'; From aa4dfa4506fc93e83ce181edc817dd0ad6c4c290 Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 12:55:14 -0700 Subject: [PATCH 08/19] Updated vuetify components / laravel imports --- .../resources/views/layouts/app.blade.php | 371 ++++++++++-------- 1 file changed, 209 insertions(+), 162 deletions(-) diff --git a/src/vuetify-stubs/resources/views/layouts/app.blade.php b/src/vuetify-stubs/resources/views/layouts/app.blade.php index 5f200be..57b7b6c 100644 --- a/src/vuetify-stubs/resources/views/layouts/app.blade.php +++ b/src/vuetify-stubs/resources/views/layouts/app.blade.php @@ -1,176 +1,223 @@ + {{ config('app.name') }} - - + - - - {{ config('app.name', 'Laravel') }} - - - + + - +
+ - - - - - - - - - {{ config('app.shortname', 'Laravel') }} - -
- - notifications - - - - -
+ + {{ config('app.name') }} + @if (Route::has('login') && ! Auth::check() ) + + + + + + @endif - - - - - - - - -

@{{ user.name }}

- Change Avatar - - - - - - - - - - - - - - save - Guardar - - - edit - Edit - - - exit_to_app - Logout - - - - - Change Password - - - - - Change Avatar - - - - - @yield('content') +
+ + + Vuetify.js +

Parallax Template

+
Powered by Vuetify
+ + Get Started + + + +
+ +
+ + +
+

The best way to start developing

+ + Cras facilisis mi vitae nunc + +
+ + + + + + + + color_lens + + +
Material Design
+ + + Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare. + Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. + Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti. + + + + + + + flash_on + + +
Fast development
+ + + Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare. + Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. + Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti. + + + + + + + build + + +
Completely Open Sourced
+ + + Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare. + Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. + Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti. + + + + + + + +
+ +
+ + +
Web development has never been easier
+ Kick-start your application today + + Get Started + + + +
+ +
+ + + + + +
Company info
+ + + Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare. + Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. + Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti. + + + + + + +
Contact us
+ + + Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare. + + + + + phone + + + 777-867-5309 + + + + + place + + + Chicago, US + + + + + email + + + john@vuetifyjs.com + + + + + + + +
+ + + + +
+ Made with + favorite + by Vuetify + and Costa Huang +
+ + + - -@stack('beforeScripts') - - -@stack('afterScripts') + +
+ From 3f4dbc5d806e913bbd5319c3b346770fb9c5f559 Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 12:57:53 -0700 Subject: [PATCH 09/19] Proper vuetify init, .default components laravel 6 --- src/vuetify-stubs/resources/js/app.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/vuetify-stubs/resources/js/app.js b/src/vuetify-stubs/resources/js/app.js index daec62d..c412429 100644 --- a/src/vuetify-stubs/resources/js/app.js +++ b/src/vuetify-stubs/resources/js/app.js @@ -1,4 +1,4 @@ - +import Vuetify from 'vuetify' /** * First we will load all of this project's JavaScript dependencies which * includes Vue and other libraries. It is a great starting point when @@ -15,12 +15,12 @@ window.Vue = require('vue'); * or customize the JavaScript scaffolding to fit your unique needs. */ -Vue.component('login-button', require('./components/LoginButtonComponent.vue')); -Vue.component('register-button', require('./components/RegisterButtonComponent.vue')); -Vue.component('remember-password', require('./components/RememberPasswordComponent.vue')); -Vue.component('reset-password', require('./components/ResetPasswordComponent.vue')); -Vue.component('snackbar', require('./components/SnackBarComponent.vue')); -Vue.component('gravatar', require('./components/GravatarComponent.vue')); +Vue.component('login-button', require('./components/LoginButtonComponent.vue').default); +Vue.component('register-button', require('./components/RegisterButtonComponent.vue').default); +Vue.component('remember-password', require('./components/RememberPasswordComponent.vue').default); +Vue.component('reset-password', require('./components/ResetPasswordComponent.vue').default); +Vue.component('snackbar', require('./components/SnackBarComponent.vue').default); +Vue.component('gravatar', require('./components/GravatarComponent.vue').default); window.Vuetify = require('vuetify'); Vue.use(Vuetify) @@ -40,6 +40,7 @@ if (window.user) { const app = new Vue({ el: '#app', store, + vuetify: new Vuetify(), mixins: [ withSnackbar ], data: () => ({ drawer: null, From 8510952bd525a0da3e457995f3f36c01ae059bbf Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 13:14:50 -0700 Subject: [PATCH 10/19] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b55d010..18613f6 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "license": "MIT", "require": { "laravel/framework": "^6.0", - "laravel/passport": "^8.0" + "laravel/passport": "^8.0.2" }, "autoload": { "psr-4": { From eea0f7a5d31bbfb3301308a0ca37b20c9f9a3b87 Mon Sep 17 00:00:00 2001 From: Josh <4635851+KronemeyerJoshua@users.noreply.github.com> Date: Mon, 9 Dec 2019 14:23:05 -0700 Subject: [PATCH 11/19] Updated depreciated vuetify stuff --- .../resources/js/components/LoginButtonComponent.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vuetify-stubs/resources/js/components/LoginButtonComponent.vue b/src/vuetify-stubs/resources/js/components/LoginButtonComponent.vue index 36a3d6e..54e7236 100644 --- a/src/vuetify-stubs/resources/js/components/LoginButtonComponent.vue +++ b/src/vuetify-stubs/resources/js/components/LoginButtonComponent.vue @@ -4,7 +4,10 @@ v-model="showLogin" persistent max-width="500px" :fullscreen="$vuetify.breakpoint.xsOnly"> - Login + + @@ -68,7 +71,8 @@ - +