kingscode · ricardovanlaarhoven · Oct 24, 2019 · Oct 2, 2019 · Oct 23, 2019 · Oct 23, 2019
diff --git a/generator/index.js b/generator/index.js
@@ -14,7 +14,7 @@ module.exports = (api, options) => {
     if (options.useCrud) {
         api.extendPackage({
             dependencies: {
-                '@kingscode/vuetify-resource': '^1.0.0',
+                '@kingscode/vuetify-resource': '^1.1.0',
             },
         });
         api.render('./templates/Crud', {

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
@@ -6,7 +6,7 @@
                 <template v-if="!loading">
                     <v-alert
                         :value="errorMessage !== null"
-                        class="mb-4"
+                        class="mb-10"
                         transition="fade-transition"
                         type="error"
                     >
@@ -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
@@ -6,7 +6,7 @@
                     <img :src="require('../assets/logo.png')" class="logo">
                     <v-alert
                         :value="errorMessage !== null"
-                        class="mb-4"
+                        class="mb-10"
                         transition="fade-transition"
                         type="error"
                     >
@@ -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"
@@ -39,7 +39,7 @@
             </v-card-text>
             <v-card-actions>
                 <v-spacer></v-spacer>
-                <v-btn @click="handlePasswordForgotten()" color="accent" flat>Wachtwoord vergeten</v-btn>
+                <v-btn @click="handlePasswordForgotten()" color="accent" text>Wachtwoord vergeten</v-btn>
                 <v-btn @click="handleLogin()" tabindex="3" type="submit" color="accent">Inloggen</v-btn>
             </v-card-actions>
         </v-card>

diff --git a/generator/templates/Authorisation/src/views/PasswordForgotten.vue b/generator/templates/Authorisation/src/views/PasswordForgotten.vue
@@ -6,7 +6,7 @@
                     <img :src="require('../assets/logo.png')" class="logo">
                     <v-alert
                         :value="successMessage !== null"
-                        class="mb-4"
+                        class="mb-10"
                         transition="fade-transition"
                         type="success"
                     >
@@ -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"
@@ -29,7 +29,7 @@
             </v-card-text>
             <v-card-actions>
                 <v-spacer></v-spacer>
-                <v-btn @click="handleLogin()" color="accent" flat>inloggen</v-btn>
+                <v-btn @click="handleLogin()" color="accent" text>inloggen</v-btn>
                 <v-btn @click="handlePasswordForgotten()" type="submit" color="accent">Wachtwoord aanvragen</v-btn>
             </v-card-actions>
         </v-card>
@@ -81,4 +81,4 @@
         display: block;
         margin: 0 auto;
     }
-</style>
+</style>
diff --git a/generator/templates/Authorisation/src/views/PasswordReset.vue b/generator/templates/Authorisation/src/views/PasswordReset.vue
@@ -6,7 +6,7 @@
                 <template v-if="!loading">
                     <v-alert
                         :value="errorMessage !== null"
-                        class="mb-4"
+                        class="mb-10"
                         transition="fade-transition"
                         type="error"
                     >
@@ -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
@@ -1,11 +1,11 @@
 <template>
     <v-container>
-        <v-layout align-center justify-center mt-5>
+        <v-layout align-center justify-center mt-12>
             <v-flex xs12 sm10 md8 lg6 xl4>
                 <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-5"
+                        <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-5"
+                        <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/Crud/src/components/forms/User.vue b/generator/templates/Crud/src/components/forms/User.vue
@@ -1,29 +1,27 @@
 <template>
     <v-container>
-        <v-layout align-center justify-center mt-5>
-            <v-flex lg6 md8 sm10 xl4 xs12>
-                <v-form ref="form" v-model="valid">
-                    <v-subheader class="pa-0">Gebruiker</v-subheader>
-                    <v-card class="themed-color">
-                        <v-card-text>
-                            <v-text-field
-                                :counter="100"
-                                :rules="[(v) => !!v || 'Naam is verplicht', v => serverError('name', v), (v) => !!v && v.length <= 100 || 'de naam mag maximaal 100 tekens bevatten']"
-                                label="Naam"
-                                class="required"
-                                v-model="values.name"></v-text-field>
-                            <v-text-field
-                                :counter="150"
-                                :rules="[(v) => !!v || 'E-mail is verplicht', v => serverError('email', v), (v) => !!v && v.length <= 100 || 'het e-mailadres mag maximaal 150 tekens bevatten']"
-                                label="E-mail"
-                                hint="Het e-mailadres waarmee de gebruiker gaat inloggen en waarnaar een mail verzonden wordt met instructies om een wachtwoord aan te maken"
-                                class="required"
-                                v-model="values.email"></v-text-field>
-                        </v-card-text>
-                    </v-card>
-                </v-form>
-            </v-flex>
-        </v-layout>
+        <v-form ref="form" v-model="valid" class="mt-5">
+            <v-col cols="12" sm="10" offset-sm="1" md="8" offset-md="2" lg="6" offset-lg="3">
+                <v-subheader class="pa-0">Gebruiker</v-subheader>
+                <v-card class="themed-color">
+                    <v-card-text>
+                        <v-text-field
+                            :counter="100"
+                            :rules="[(v) => !!v || 'Naam is verplicht', v => serverError('name', v), (v) => !!v && v.length <= 100 || 'de naam mag maximaal 100 tekens bevatten']"
+                            label="Naam"
+                            class="required"
+                            v-model="values.name"></v-text-field>
+                        <v-text-field
+                            :counter="150"
+                            :rules="[(v) => !!v || 'E-mail is verplicht', v => serverError('email', v), (v) => !!v && v.length <= 100 || 'het e-mailadres mag maximaal 150 tekens bevatten']"
+                            label="E-mail"
+                            hint="Het e-mailadres waarmee de gebruiker gaat inloggen en waarnaar een mail verzonden wordt met instructies om een wachtwoord aan te maken"
+                            class="required"
+                            v-model="values.email"></v-text-field>
+                    </v-card-text>
+                </v-card>
+            </v-col>
+        </v-form>
     </v-container>
 </template>
 

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/public/.htaccess → generator/templates/Default/public/_htaccess b/generator/templates/Default/public/.htaccess → generator/templates/Default/public/_htaccess
diff --git a/generator/templates/Default/src/App.vue b/generator/templates/Default/src/App.vue
@@ -7,7 +7,7 @@
                 v-model="menu"
             >
                 <img :src="require('../assets/logo.png')" @click="$router.push({name: 'home'})" class="logo">
-                <v-divider class="mt-4"/>
+                <v-divider class="mt-10"/>
                 <main-menu/>
             </v-navigation-drawer>
             <v-toolbar app color="primary" dark mfixed>
@@ -20,7 +20,7 @@
                 <router-view/>
             </v-content>
             <v-footer app color="primary" inset>
-                <span class="white--text pl-3">Created by Kings Code</span>
+                <span class="white--text pl-6">Created by Kings Code</span>
             </v-footer>
         </v-app>
     </div>
@@ -59,4 +59,4 @@
     .v-dialog--fullscreen > .v-card.v-sheet.theme--light {
         background: rgb(248, 249, 250);
     }
-</style>
+</style>
diff --git a/generator/templates/Default/src/Views/PageForbidden.vue b/generator/templates/Default/src/Views/PageForbidden.vue
@@ -1,9 +1,9 @@
 <template>
-    <div class="text-xs-center">
+    <div class="text-center">
         <h1>
             Onjuiste autorisatie
         </h1>
-        <div class="my-5 title">Je hebt niet voldoende rechten om deze actie uit te mogen voeren</div>
+        <div class="my-12 title">Je hebt niet voldoende rechten om deze actie uit te mogen voeren</div>
         <v-btn color="primary" @click="home">Terug naar de homepage</v-btn>
     </div>
 </template>
@@ -25,4 +25,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>
diff --git a/generator/templates/Default/src/Views/PageNotFound.vue b/generator/templates/Default/src/Views/PageNotFound.vue
@@ -1,9 +1,9 @@
 <template>
-    <div class="text-xs-center">
+    <div class="text-center">
         <h1>
             Pagina niet gevonden
         </h1>
-        <div class="my-5 title">De pagina die u probeert te bereiken is niet gevonden</div>
+        <div class="my-12 title">De pagina die u probeert te bereiken is niet gevonden</div>
         <v-btn color="primary" @click="home">Terug naar de startpagina</v-btn>
     </div>
 </template>
@@ -25,4 +25,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>