Sync

acacha · acacha · commit f83e2dc5a2b2 · 2018-04-13T14:40:06.000+02:00
diff --git a/src/VuetifyPreset.php b/src/VuetifyPreset.php
@@ -38,6 +38,7 @@ protected static function updatePackageArray(array $packages)
     {
         return array_merge([
             'vuetify' => '^1.0',
+            'gravatar' => '^1.0',
         ], Arr::except($packages, [
             'bootstrap',
             'bootstrap-sass',
diff --git a/src/vuetify-stubs/js/app.js b/src/vuetify-stubs/js/app.js
@@ -17,10 +17,23 @@ window.Vue = require('vue');
 
 Vue.component('login-button', require('./components/LoginButtonComponent.vue'));
 Vue.component('register-button', require('./components/RegisterButtonComponent.vue'));
+Vue.component('snackbar', require('./components/SnackBarComponent.vue'));
 
 window.Vuetify = require('vuetify');
 Vue.use(Vuetify)
 
+import store from './store'
+import * as actions from './store/action-types'
+import * as mutations from './store/mutation-types'
+
+import { mapGetters } from 'vuex'
+
+if (window.user ) {
+  store.commit(mutations.USER,  user)
+  store.commit(mutations.LOGGED, true)
+}
+
 const app = new Vue({
-    el: '#app'
+    el: '#app',
+    store
 });
diff --git a/src/vuetify-stubs/views/welcome.blade.php b/src/vuetify-stubs/views/welcome.blade.php
@@ -24,16 +24,14 @@
 <body>
 <div id="app">
     <v-app light v-cloak>
+        <snackbar></snackbar>
         <v-toolbar class="white">
             <v-toolbar-title>{{ config('app.name') }}</v-toolbar-title>
-
             @if (Route::has('login'))
                 <v-spacer></v-spacer>
-                <login-button></login-button>
-                <register-button></register-button>
+                <login-button action="{{ $action or null }}"></login-button>
+                <register-button action="{{ $action or null }}"></register-button>
             @endif
-
-
         </v-toolbar>
         <v-content>
             <section>

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ protected static function updatePackageArray(array $packages)`
`38`	`38`	`{`
`39`	`39`	`return array_merge([`
`40`	`40`	`'vuetify' => '^1.0',`
	`41`	`+ 'gravatar' => '^1.0',`
`41`	`42`	`], Arr::except($packages, [`
`42`	`43`	`'bootstrap',`
`43`	`44`	`'bootstrap-sass',`