add vuetify 2.0 support

ricardovanlaarhoven · ricardovanlaarhoven · commit 9735f7aa55cd · 2019-10-23T16:25:58.000+02:00
diff --git a/generator/templates/Authorisation/src/store/modules/Authorization.js b/generator/templates/Authorisation/src/store/modules/Authorization.js
@@ -12,7 +12,7 @@ export default {
     actions: {
         login(context, data) {
             return new Promise((resolve, reject) => {
-                $http.post('oauth/token',
+                window.$http.post('oauth/token',
                     {
                         grant_type: 'password',
                         client_id: process.env.VUE_APP_OAUTH_CLIENT_ID,
diff --git a/generator/templates/Authorisation/src/views/InvitationAccept.vue b/generator/templates/Authorisation/src/views/InvitationAccept.vue
@@ -34,7 +34,7 @@
                         v-model="password_confirmation"
                     ></v-text-field>
                 </template>
-                <div class="text-xs-center" v-else>
+                <div class="text-center" v-else>
                     <v-progress-circular
                         :size="70"
                         :width="7"
@@ -105,7 +105,7 @@
             },
             handleLogin() {
                 this.$router.push({name: 'login'});
-            }, serverError(name, v) {
+            }, serverError(name) {
                 if (this.errors !== null && typeof this.errors[name] !== 'undefined') {
                     return this.errors[name][0];
                 }
diff --git a/generator/templates/Authorisation/src/views/Login.vue b/generator/templates/Authorisation/src/views/Login.vue
@@ -28,7 +28,7 @@
                         tabindex="2"
                     ></v-text-field>
                 </template>
-                <div class="text-xs-center" v-else>
+                <div class="text-center" v-else>
                     <v-progress-circular
                         :size="70"
                         :width="7"
diff --git a/generator/templates/Authorisation/src/views/PasswordForgotten.vue b/generator/templates/Authorisation/src/views/PasswordForgotten.vue
@@ -18,7 +18,7 @@
                         v-model="email"
                     ></v-text-field>
                 </template>
-                <div class="text-xs-center" v-else>
+                <div class="text-center" v-else>
                     <v-progress-circular
                         :size="70"
                         :width="7"
diff --git a/generator/templates/Authorisation/src/views/PasswordReset.vue b/generator/templates/Authorisation/src/views/PasswordReset.vue
@@ -34,7 +34,7 @@
                         v-model="password_confirmation"
                     ></v-text-field>
                 </template>
-                <div class="text-xs-center" v-else>
+                <div class="text-center" v-else>
                     <v-progress-circular
                         :size="70"
                         :width="7"
@@ -105,7 +105,7 @@
             },
             handleLogin() {
                 this.$router.push({name: 'login'});
-            }, serverError(name, v) {
+            }, serverError(name) {
                 if (this.errors !== null && typeof this.errors[name] !== 'undefined') {
                     return this.errors[name][0];
                 }
diff --git a/generator/templates/Authorisation/src/views/Profile.vue b/generator/templates/Authorisation/src/views/Profile.vue
@@ -5,7 +5,7 @@
                 <v-form @submit.prevent="updateProfile" ref="profileForm">
                     <v-subheader class="pa-0">Profiel</v-subheader>
                     <v-card class="themed-color">
-                        <div class="text-xs-center pa-12"
+                        <div class="text-center pa-12"
                              v-if="profileFormLoading">
                             <v-progress-circular
                                 :width="3"
@@ -46,7 +46,7 @@
                 <v-form  @submit.prevent="updatePassword" ref="passwordForm">
                     <v-subheader class="pa-0">Wachtwoord</v-subheader>
                     <v-card class="themed-color">
-                        <div class="text-xs-center pa-12"
+                        <div class="text-center pa-12"
                              v-if="passwordFormLoading">
                             <v-progress-circular
                                 :width="3"
@@ -145,7 +145,7 @@
                     });
                 });
             },
-            serverError(name, v) {
+            serverError(name) {
                 if (this.errors !== null && typeof this.errors[name] !== 'undefined') {
                     return this.errors[name][0];
                 }
diff --git a/generator/templates/Crud/src/components/BaseForm.vue b/generator/templates/Crud/src/components/BaseForm.vue
@@ -62,7 +62,7 @@
             clear() {
                 this.$refs.form.reset();
             },
-            serverError(name, v) {
+            serverError(name) {
                 if (this.errors !== null && typeof this.errors[name] !== 'undefined') {
                     return this.errors[name][0];
                 }
diff --git a/generator/templates/Default/_env.development.local b/generator/templates/Default/_env.development.local
@@ -1,6 +1,7 @@
 NODE_ENV=development
 VUE_APP_ROOT_API=<%= options.rootUrl %>
+VUE_APP_PUBLIC_PATH=
 <%_ if (options.useAuthorisation) { _%>
 VUE_APP_OAUTH_CLIENT_ID=<%= options.oauthClientId %>
 VUE_APP_OAUTH_CLIENT_SECRET=<%= options.oauthSecret %>
-<%_ } _%>
+<%_ } _%>
diff --git a/generator/templates/Default/_env.example b/generator/templates/Default/_env.example
@@ -1,5 +1,6 @@
 NODE_ENV=development
 VUE_APP_ROOT_API=//url.local/api
+VUE_APP_PUBLIC_PATH=
 <%_ if (options.useAuthorisation) { _%>
 VUE_APP_OAUTH_CLIENT_SECRET=
 VUE_APP_OAUTH_CLIENT_ID=
diff --git a/generator/templates/Default/src/components/PaginatedAutocomplete.vue b/generator/templates/Default/src/components/PaginatedAutocomplete.vue
@@ -8,7 +8,7 @@
                     v-if="enabled"
     >
         <template v-slot:append-item>
-            <v-flex v-if="canLoadMoreItems" class="text-xs-center">
+            <v-flex v-if="canLoadMoreItems" class="text-center">
                 <v-btn color="accent" @click="getItemsFromApi(page + 1)">Meer laden</v-btn>
             </v-flex>
         </template>
diff --git a/generator/templates/Default/src/components/ProfileMenu.vue b/generator/templates/Default/src/components/ProfileMenu.vue
@@ -5,11 +5,13 @@
         offset-y
         transition="slide-y-transition"
     >
-        <v-btn class="mr-6" fab icon slot="activator">
-            <v-avatar class="accent" size="48" title>
-                <v-icon>fa-user</v-icon>
-            </v-avatar>
-        </v-btn>
+        <template v-slot:activator="{ on }">
+            <v-btn class="mr-6" fab icon v-on="on">
+                <v-avatar class="accent" size="48" title>
+                    <v-icon>fa-user</v-icon>
+                </v-avatar>
+            </v-btn>
+        </template>
         <v-list>
             <v-list-item @click="routeTo('profile')">
                 <v-list-item-title>Profiel</v-list-item-title>
diff --git a/generator/templates/Default/src/newmain.js b/generator/templates/Default/src/newmain.js
@@ -22,6 +22,7 @@ Vue.config.productionTip = false
 
 new Vue({
     router,
+    vuetify,
 <%_ if (options.useAuthorisation) { _%>
     store,
 <%_ } _%>
diff --git a/generator/templates/Default/src/views/Home.vue b/generator/templates/Default/src/views/Home.vue
@@ -1,5 +1,8 @@
 <template>
-
+    <div>
+        You now can remove this and create your own homepage, or in the router.js create a redirect to one of the other
+        views, so that becomes the homepage
+    </div>
 </template>
 
 <script>
@@ -21,4 +24,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>
diff --git a/generator/templates/TemplateLoader/src/templates/Authorisation.vue b/generator/templates/TemplateLoader/src/templates/Authorisation.vue
@@ -2,7 +2,7 @@
     <div id="app">
         <v-app class="primary" id="inspire">
             <v-content>
-                <v-container fill-height fluid justify-center>
+                <v-container fill-height fluid justify-center class="primary">
                     <v-flex lg4 md6 xl3 xs12>
                         <router-view/>
                     </v-flex>
@@ -31,4 +31,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>
diff --git a/generator/templates/TemplateLoader/src/templates/Default.vue b/generator/templates/TemplateLoader/src/templates/Default.vue
@@ -10,17 +10,17 @@
                 <v-divider class="mt-10"/>
                 <main-menu/>
             </v-navigation-drawer>
-            <v-toolbar app color="primary" dark mfixed>
-                <v-toolbar-side-icon @click.stop="menu = !menu"></v-toolbar-side-icon>
+            <v-app-bar app color="primary" dark mfixed>
+                <v-app-bar-nav-icon @click.stop="menu = !menu"></v-app-bar-nav-icon>
                 <v-toolbar-title>Beheer</v-toolbar-title>
                 <v-spacer/>
                 <profile-menu></profile-menu>
-            </v-toolbar>
+            </v-app-bar>
             <v-content>
                 <router-view/>
             </v-content>
             <v-footer app color="primary" inset>
-                <span class="white--text pl-6">Created by Kings Code</span>
+                <span class="white--text">Created by Kings Code</span>
             </v-footer>
         </v-app>
     </div>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export default {`
`12`	`12`	`actions: {`
`13`	`13`	`login(context, data) {`
`14`	`14`	`return new Promise((resolve, reject) => {`
`15`		`- $http.post('oauth/token',`
	`15`	`+ window.$http.post('oauth/token',`
`16`	`16`	`{`
`17`	`17`	`grant_type: 'password',`
`18`	`18`	`client_id: process.env.VUE_APP_OAUTH_CLIENT_ID,`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@`
`62`	`62`	`clear() {`
`63`	`63`	`this.$refs.form.reset();`
`64`	`64`	`},`
`65`		`- serverError(name, v) {`
	`65`	`+ serverError(name) {`
`66`	`66`	`if (this.errors !== null && typeof this.errors[name] !== 'undefined') {`
`67`	`67`	`return this.errors[name][0];`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`v-if="enabled"`
`9`	`9`	`>`
`10`	`10`	`<template v-slot:append-item>`
`11`		`- <v-flex v-if="canLoadMoreItems" class="text-xs-center">`
	`11`	`+ <v-flex v-if="canLoadMoreItems" class="text-center">`
`12`	`12`	`<v-btn color="accent" @click="getItemsFromApi(page + 1)">Meer laden</v-btn>`
`13`	`13`	`</v-flex>`
`14`	`14`	`</template>`