From 12c04c41745f2de7fb8cfb3ec9b339f900d257e6 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 10:24:27 +0200
Subject: [PATCH 01/21] New models

---
 .../Default/src/application/models/model.js   | 43 ++++++-------------
 .../Default/src/application/util/url.js       |  2 +-
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/generator/templates/Default/src/application/models/model.js b/generator/templates/Default/src/application/models/model.js
index ed45054..262d4e6 100644
--- a/generator/templates/Default/src/application/models/model.js
+++ b/generator/templates/Default/src/application/models/model.js
@@ -29,48 +29,29 @@ class Model {
         const value = assignable[key];
         const type = typeof value;
 
-        if (typeof data[key] === type) {
-          assignable[key] = data[key];
+        if (typeof data === 'undefined') {
+          assignable[key] = value;
           return;
         }
 
-        const defaultValue = this.getDefaultValueFromType(type, value);
-
-        assignable[key] = data[key] || defaultValue;
-      });
-
-    Object.keys(data)
-      .forEach(key => {
-        if (typeof assignable[key] === 'undefined') {
-          assignable[key] = data[key];
-        }
+        const apiValue = data[key];
+        assignable[key] = this.convertByType(type, value, apiValue);
       });
 
     return assignable;
   }
 
-  /**
-   * @private
-   * @param type
-   * @param defaultModelValue
-   * @return {*}
-   */
-  getDefaultValueFromType(type, defaultModelValue) {
-    let defaultValue;
-
-    if (type === 'string') {
-      defaultValue = defaultModelValue || '';
+  convertByType(type, currentValue, apiValue) {
+    if (type === 'object' && currentValue && typeof currentValue.mapResponse === 'function') {
+      return currentValue.mapResponse(apiValue);
+    } else if (type === 'string') {
+      return apiValue ? String(apiValue) : '';
     } else if (type === 'boolean') {
-      defaultValue = defaultModelValue || false;
+      return Boolean(apiValue);
     } else if (type === 'number') {
-      defaultValue = defaultModelValue || 0;
-    } else if (Array.isArray(defaultModelValue)) {
-      defaultValue = defaultModelValue || [];
-    } else {
-      defaultValue = defaultModelValue || null;
+      return parseFloat(apiValue);
     }
-
-    return defaultValue;
+    return apiValue || currentValue;
   }
 }
 
diff --git a/generator/templates/Default/src/application/util/url.js b/generator/templates/Default/src/application/util/url.js
index 4c606b9..59801b5 100644
--- a/generator/templates/Default/src/application/util/url.js
+++ b/generator/templates/Default/src/application/util/url.js
@@ -1,6 +1,6 @@
 function getFragment(key, defaultValue = '') {
   const fragmentRegExp = new RegExp(`[\\#&]${key}=([^&#]*)`);
-  const result = fragmentRegExp.exec(location.hash);
+  const result = fragmentRegExp.exec(window.location.hash);
 
   if (result && result.length >= 2) {
     return decodeURIComponent(result[1]);

From b1aa9c9cb89adb61a9caab44a204678a630ffb8d Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 10:24:46 +0200
Subject: [PATCH 02/21] update API implementation and keyConverter

---
 .../src/api/implementation/app/index.js       |  8 +++---
 .../src/api/implementation/app/interceptor.js | 27 +++++++++++++------
 .../src/api/implementation/app/transformer.js | 12 ++++++---
 .../src/api/implementation/app/wrapper.js     | 12 +++++----
 .../Default/src/api/util/keyConverter.js      | 22 ++++++++-------
 .../Default/src/api/util/response.js          |  2 +-
 6 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/generator/templates/Default/src/api/implementation/app/index.js b/generator/templates/Default/src/api/implementation/app/index.js
index 57da027..e6f32e6 100644
--- a/generator/templates/Default/src/api/implementation/app/index.js
+++ b/generator/templates/Default/src/api/implementation/app/index.js
@@ -7,7 +7,6 @@ import {
   onResponseRejected,
 } from './interceptor';
 import { transformParams, transformRequest, transformResponse } from './transformer';
-import { getPaginated } from './wrapper';
 
 /**
  * Returns an axios instance
@@ -32,13 +31,12 @@ const instance = axios.create(config);
 instance.interceptors.request.use(onRequestFulFilled, onRequestRejected);
 instance.interceptors.response.use(onResponseFulFilled, onResponseRejected);
 
-const get = instance.get;
-const post = instance.post;
+const { get } = instance;
+const { post } = instance;
 const destroy = instance.delete;
-const put = instance.put;
+const { put } = instance;
 
 export {
-  getPaginated,
   get,
   post,
   destroy,
diff --git a/generator/templates/Default/src/api/implementation/app/interceptor.js b/generator/templates/Default/src/api/implementation/app/interceptor.js
index 696c42c..26a843e 100644
--- a/generator/templates/Default/src/api/implementation/app/interceptor.js
+++ b/generator/templates/Default/src/api/implementation/app/interceptor.js
@@ -1,4 +1,5 @@
-import store from '../../../store';
+import router from '@/router';
+import store from '@/store';
 
 /**
  * @param request {AxiosRequestConfig}
@@ -9,14 +10,14 @@ function onRequestFulFilled(request) {
     if (request.data instanceof FormData) {
       request.data.append('_method', 'put');
     } else {
-      request.data['_method'] = 'put';
+      request.data._method = 'put';
     }
   }
 
   const computedHeaders = computeHeaders();
 
   Object.keys(computedHeaders)
-    .forEach(header => {
+    .forEach((header) => {
       Object.assign(request.headers.common, {
         [header]: computedHeaders[header],
       });
@@ -51,17 +52,27 @@ function onResponseFulFilled(response) {
  * @param error {AxiosError}
  */
 function onResponseRejected(error) {
-  const response = error.response;
+  const { response } = error;
 
   if (!response) return Promise.reject(error); // network error, not axios related
 
-  const status = response.status;
-  const errors = response.data.errors;
+  const { status } = response;
+  const { errors } = response.data;
+
+  if (status === 401) {
+    store.dispatch('authorisation/logout');
+    router.push({ name: 'login' });
+    return;
+  } else if (status === 403) {
+    router.push({ name: '403' });
+  } else if (status === 404) {
+    router.push({ name: '404' });
+  }
 
   if (errors && status === 422) {
     Object.keys(errors)
-      .forEach(key => store.commit('error/add', {
-        key: key,
+      .forEach((key) => store.commit('error/add', {
+        key,
         message: errors[key][0],
       }));
   }
diff --git a/generator/templates/Default/src/api/implementation/app/transformer.js b/generator/templates/Default/src/api/implementation/app/transformer.js
index d7d647c..b71cbcc 100644
--- a/generator/templates/Default/src/api/implementation/app/transformer.js
+++ b/generator/templates/Default/src/api/implementation/app/transformer.js
@@ -1,7 +1,7 @@
 import Qs from 'qs';
-import Model from '../../../application/models/model.js';
+import Model from '../../../application/models/model';
 import { camelToSnake, snakeToCamel } from '../../util/keyConverter';
-import objectToFormData from '../../util/objectToFormDataConverter.js';
+import objectToFormData from '../../util/objectToFormDataConverter';
 
 /**
  * @param response
@@ -9,8 +9,12 @@ import objectToFormData from '../../util/objectToFormDataConverter.js';
  */
 function transformResponse(response) {
   if (typeof response === 'string' && response.length > 0) {
-    const result = JSON.parse(response);
-    return snakeToCamel(result);
+    try {
+      const result = JSON.parse(response);
+      return snakeToCamel(result);
+    } catch (e) {
+      return response;
+    }
   }
 
   if (!response) {
diff --git a/generator/templates/Default/src/api/implementation/app/wrapper.js b/generator/templates/Default/src/api/implementation/app/wrapper.js
index 9456dbf..c067a9d 100644
--- a/generator/templates/Default/src/api/implementation/app/wrapper.js
+++ b/generator/templates/Default/src/api/implementation/app/wrapper.js
@@ -1,4 +1,5 @@
-import handle from './index';
+import { get } from '@/api/implementation/app';
+import { convertCamelToSnake } from '@/api/util/keyConverter.js';
 
 /**
  * @param url
@@ -14,17 +15,18 @@ function getPaginated(url, page = 1, perPage = 10, search, sortBy, descending, p
   if (search) {
     params.search = search;
   }
+
   if (sortBy) {
-    params.sortBy = sortBy;
+    params.sortBy = convertCamelToSnake(sortBy);
   }
   if (typeof descending !== 'undefined') {
     params.desc = descending ? '1' : '0';
   }
 
-  return handle.get(url, {
+  return get(url, {
     params: {
-      page: page,
-      perPage: perPage,
+      page,
+      perPage,
       ...params,
     },
   });
diff --git a/generator/templates/Default/src/api/util/keyConverter.js b/generator/templates/Default/src/api/util/keyConverter.js
index 54338a0..775b9c4 100644
--- a/generator/templates/Default/src/api/util/keyConverter.js
+++ b/generator/templates/Default/src/api/util/keyConverter.js
@@ -6,9 +6,11 @@ function camelToSnake(data) {
   const target = Array.isArray(data) ? [] : {};
 
   Object.keys(data)
-    .forEach(key => {
+    .forEach((key) => {
       Object.assign(target, {
-        [convertCamelToSnake(key)]: isIterableObject(data[key]) ? camelToSnake(data[key]) : data[key],
+        [convertCamelToSnake(key)]: isIterableObject(data[key])
+          ? camelToSnake(data[key])
+          : data[key],
       });
     });
 
@@ -16,9 +18,7 @@ function camelToSnake(data) {
 }
 
 function convertCamelToSnake(key) {
-  return key.replace(/[A-Z]/g, value => {
-    return '_' + value[0].toLowerCase();
-  });
+  return key.replace(/[A-Z]/g, (value) => `_${value[0].toLowerCase()}`);
 }
 
 function snakeToCamel(data) {
@@ -29,9 +29,11 @@ function snakeToCamel(data) {
   const target = Array.isArray(data) ? [] : {};
 
   Object.keys(data)
-    .forEach(key => {
+    .forEach((key) => {
       Object.assign(target, {
-        [convertSnakeToCamel(key)]: isIterableObject(data[key]) ? snakeToCamel(data[key]) : data[key],
+        [convertSnakeToCamel(key)]: isIterableObject(data[key])
+          ? snakeToCamel(data[key])
+          : data[key],
       });
     });
 
@@ -39,9 +41,7 @@ function snakeToCamel(data) {
 }
 
 function convertSnakeToCamel(key) {
-  return key.replace(/_\w/g, value => {
-    return value[1].toUpperCase();
-  });
+  return key.replace(/_\w/g, (value) => value[1].toUpperCase());
 }
 
 function isIterableObject(target) {
@@ -51,4 +51,6 @@ function isIterableObject(target) {
 export {
   snakeToCamel,
   camelToSnake,
+  convertCamelToSnake,
+  convertSnakeToCamel,
 };
diff --git a/generator/templates/Default/src/api/util/response.js b/generator/templates/Default/src/api/util/response.js
index 3b3c370..b3f8a8e 100644
--- a/generator/templates/Default/src/api/util/response.js
+++ b/generator/templates/Default/src/api/util/response.js
@@ -1,4 +1,4 @@
-import dayjs from '../../plugins/dayJs.js';
+import dayjs from '../../plugins/dayJs';
 
 function getRateLimitMinutes(response, defaultMinutes = 15) {
   const remainingMilliseconds = (+response.headers['retry-after']) * 1000;

From e51e5305b49f543b350de84505016a5f8a5482a2 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 10:24:55 +0200
Subject: [PATCH 03/21] rename mainMenu

---
 .../src/components/menu/{MainMenu.vue => TheMainMenu.vue}   | 2 +-
 generator/templates/Default/src/templates/Default.vue       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename generator/templates/Default/src/components/menu/{MainMenu.vue => TheMainMenu.vue} (91%)

diff --git a/generator/templates/Default/src/components/menu/MainMenu.vue b/generator/templates/Default/src/components/menu/TheMainMenu.vue
similarity index 91%
rename from generator/templates/Default/src/components/menu/MainMenu.vue
rename to generator/templates/Default/src/components/menu/TheMainMenu.vue
index fbddc96..c2073a2 100644
--- a/generator/templates/Default/src/components/menu/MainMenu.vue
+++ b/generator/templates/Default/src/components/menu/TheMainMenu.vue
@@ -2,7 +2,7 @@
 import Menu from './Menu.vue';
 
 export default {
-  name: 'MainMenu',
+  name: 'TheMainMenu',
   extends: Menu,
   computed: {
     items: () => [
diff --git a/generator/templates/Default/src/templates/Default.vue b/generator/templates/Default/src/templates/Default.vue
index cf83c88..5fbda4b 100644
--- a/generator/templates/Default/src/templates/Default.vue
+++ b/generator/templates/Default/src/templates/Default.vue
@@ -9,7 +9,7 @@
         <img :src="require('../assets/logo.png')" class="logo">
       </router-link>
       <v-divider class="mt-10"/>
-      <MainMenu/>
+      <TheMainMenu/>
     </v-navigation-drawer>
     <v-app-bar app color="primary" dark mfixed>
       <v-app-bar-nav-icon @click.stop="isMenuOpen = !isMenuOpen"></v-app-bar-nav-icon>
@@ -29,13 +29,13 @@
 <script>
 import { mapGetters } from 'vuex';
 import AppBarMenu from '../components/AppBarMenu.vue';
-import MainMenu from './../components/menu/MainMenu.vue';
+import TheMainMenu from 'generator/templates/Default/src/components/menu/TheMainMenu.vue';
 
 export default {
   name: 'Default',
   components: {
     AppBarMenu,
-    MainMenu,
+    TheMainMenu,
   },
   data() {
     return {

From 2e8bbc3a7fdb463d21bcf59c96c4277ad35aefb1 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 10:49:41 +0200
Subject: [PATCH 04/21] Add sass files

---
 .../templates/Default/src/plugins/vuetify.js  |  4 ---
 .../templates/Default/src/scss/main.scss      | 30 +++++++++++++++++++
 .../templates/Default/src/scss/variables.scss |  0
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 generator/templates/Default/src/scss/main.scss
 create mode 100644 generator/templates/Default/src/scss/variables.scss

diff --git a/generator/templates/Default/src/plugins/vuetify.js b/generator/templates/Default/src/plugins/vuetify.js
index d451cb1..c1d7f50 100644
--- a/generator/templates/Default/src/plugins/vuetify.js
+++ b/generator/templates/Default/src/plugins/vuetify.js
@@ -32,15 +32,11 @@ export default new Vuetify({
         },
 <%_ } _%>
     },
-    customProperties: true,
     lang: {
         locales: {nl},
         current: 'nl',
     },
     theme: {
-        options: {
-            customProperties: true,
-        },
         themes: {
             light: {
                 primary: '#002F4E',
diff --git a/generator/templates/Default/src/scss/main.scss b/generator/templates/Default/src/scss/main.scss
new file mode 100644
index 0000000..be80a8b
--- /dev/null
+++ b/generator/templates/Default/src/scss/main.scss
@@ -0,0 +1,30 @@
+@import "~vuetify/src/styles/styles.sass";
+
+@include theme(v-application) using($material) {
+  .text-color-theme {
+    color: map-deep-get($material, "text", "theme")
+  }
+  .text-color-primary {
+    color: map-deep-get($material, "text", "primary")
+  }
+  .text-color-secondary {
+    color: map-deep-get($material, "text", "secondary")
+  }
+  .text-color-disabled {
+    color: map-deep-get($material, "text", "disabled")
+  }
+  .text-color-link {
+    color: map-deep-get($material, "text", "link")
+  }
+  .surface-background {
+    background-color: map-get($material, "surface");
+  }
+}
+
+/**
+ * Hotfix, hope vuetify fixes this one day
+ * https://github.com/vuetifyjs/vuetify/issues/8541
+ */
+.v-icon.fas, .v-icon.fal, .v-icon.far {
+  width: 20px;
+}
diff --git a/generator/templates/Default/src/scss/variables.scss b/generator/templates/Default/src/scss/variables.scss
new file mode 100644
index 0000000..e69de29

From a691ee5af4daa2986771cd3c1385da776cbafdd5 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 10:52:58 +0200
Subject: [PATCH 05/21] dependencies

---
 generator/index.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/generator/index.js b/generator/index.js
index fc8b7ae..9aaf323 100644
--- a/generator/index.js
+++ b/generator/index.js
@@ -5,10 +5,9 @@ module.exports = (api, options) => {
   api.extendPackage({
     dependencies: {
       'axios': '^0.19.2',
-      'dayjs': '^1.8.19',
-      'vuex': '^3.1.2',
+      'dayjs': '^1.8.34',
+      'vuex': '^3.4.0',
       'vuex-persistedstate': '^2.5.4',
-      'lodash.clonedeep': '^4.5.0',
       'css-vars-ponyfill': '^2.1.2',
       'qs': '^6.9.4',
       'vue-router': '3.3.4',

From f5a79611b4cb83a8ecc8892101fe5d4e5215ea36 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 10:59:45 +0200
Subject: [PATCH 06/21] Add i18n

---
 generator/index.js                            |  2 +
 .../Default/src/locales/nl/actions.json       | 15 ++++++++
 .../Default/src/locales/nl/authorisation.json | 38 +++++++++++++++++++
 .../Default/src/locales/nl/errors.json        |  4 ++
 .../Default/src/locales/nl/validation.json    |  4 ++
 .../templates/Default/src/plugins/i18n.js     | 26 +++++++++++++
 prompts.js                                    |  2 +-
 7 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 generator/templates/Default/src/locales/nl/actions.json
 create mode 100644 generator/templates/Default/src/locales/nl/authorisation.json
 create mode 100644 generator/templates/Default/src/locales/nl/errors.json
 create mode 100644 generator/templates/Default/src/locales/nl/validation.json
 create mode 100644 generator/templates/Default/src/plugins/i18n.js

diff --git a/generator/index.js b/generator/index.js
index 9aaf323..06030ac 100644
--- a/generator/index.js
+++ b/generator/index.js
@@ -11,6 +11,8 @@ module.exports = (api, options) => {
       'css-vars-ponyfill': '^2.1.2',
       'qs': '^6.9.4',
       'vue-router': '3.3.4',
+      'vue-i18n': '^8.21.0',
+
     },
   });
   if (options.plugins.includes('fontawesomepro')) {
diff --git a/generator/templates/Default/src/locales/nl/actions.json b/generator/templates/Default/src/locales/nl/actions.json
new file mode 100644
index 0000000..003319e
--- /dev/null
+++ b/generator/templates/Default/src/locales/nl/actions.json
@@ -0,0 +1,15 @@
+{
+    "cancel": "annuleren",
+    "continue": "doorgaan",
+    "save": "opslaan",
+    "create": "aanmaken",
+    "remove": "verwijderen",
+    "back": "terug",
+    "loadMore": "Meer laden",
+    "createResource": "{resource} aanmaken",
+    "updateResource": "{resource} bewerken",
+    "deleteConfirmation": {
+        "title": "Weet je het zeker?",
+        "body": "Je staat op het punt om dit {resource} te verwijderen, weet je zeker dat je door wilt gaan?"
+    }
+}
diff --git a/generator/templates/Default/src/locales/nl/authorisation.json b/generator/templates/Default/src/locales/nl/authorisation.json
new file mode 100644
index 0000000..cb5a868
--- /dev/null
+++ b/generator/templates/Default/src/locales/nl/authorisation.json
@@ -0,0 +1,38 @@
+{
+    "login": {
+        "title": "Inloggen",
+        "successMessage": "Je bent ingelogd, we sturen je nu door."
+    },
+    "registrationVerify": {
+        "title": "Registratie afronden",
+        "successMessage": "Je registratie is voltooid, je kunt nu inloggen.",
+        "errorMessage": "Er is iets misgegaan. Waarschijnlijk is de registratie link uit je mail verlopen."
+    },
+    "passwordForgotten": {
+        "title": "Wachtwoord vergeten",
+        "successMessage": "Er is een wachtwoord vergeten mail verstuurd mits er een account bestaat met het gegeven email adres.",
+        "request": "Wachtwoord aanvragen"
+    },
+    "passwordReset": {
+        "title": "Wachtwoord opnieuw instellen",
+        "successMessage": "Je wachtwoord is veranderd, je kunt nu inloggen.",
+        "errorMessage": "Er is iets misgegaan. Waarschijnlijk is de wachtwoord reset link uit je mail verlopen.",
+        "request": "Wachtwoord aanvragen"
+    },
+    "invitationAccept": {
+        "title": "Uitnodiging accepteren",
+        "request": "Uitnodiging accepteren",
+        "successMessage": "Je account is geactiveerd, je kunt nu inloggen.",
+        "errorMessage": "Er is iets misgegaan. Waarschijnlijk is de uitnodigings link uit je mail verlopen."
+    },
+    "fields": {
+        "email": "E-mail",
+        "password": "Wachtwoord",
+        "passwordConfirmation": "Wachtwoord herhalen"
+    },
+    "actions": {
+        "login": "Inloggen",
+        "passwordForgotten": "Wachtwoord vergeten",
+        "logOff": "Uitloggen"
+    }
+}
diff --git a/generator/templates/Default/src/locales/nl/errors.json b/generator/templates/Default/src/locales/nl/errors.json
new file mode 100644
index 0000000..b37c163
--- /dev/null
+++ b/generator/templates/Default/src/locales/nl/errors.json
@@ -0,0 +1,4 @@
+{
+    "422": "De ingevulde gegevens kloppen niet.",
+    "429": "Je hebt te veel foutieve pogingen gedaan. Probeer het over {minutes} minuten opnieuw"
+}
diff --git a/generator/templates/Default/src/locales/nl/validation.json b/generator/templates/Default/src/locales/nl/validation.json
new file mode 100644
index 0000000..c73a12d
--- /dev/null
+++ b/generator/templates/Default/src/locales/nl/validation.json
@@ -0,0 +1,4 @@
+{
+    "validationError": "Niet alle velden zijn juist ingevuld. Pas de rood gemarkeerde velden aan.",
+    "required": "{field} is verplicht"
+}
diff --git a/generator/templates/Default/src/plugins/i18n.js b/generator/templates/Default/src/plugins/i18n.js
new file mode 100644
index 0000000..d7d2615
--- /dev/null
+++ b/generator/templates/Default/src/plugins/i18n.js
@@ -0,0 +1,26 @@
+import Vue from 'vue';
+import VueI18n from 'vue-i18n';
+
+const locales = { nl: require.context('@/locales/nl', true, /[A-Za-z0-9-_,\s]+\.json$/i) };
+Vue.use(VueI18n);
+
+function loadLocaleMessages() {
+  const messages = {};
+  Object.keys(locales).forEach((locale) => {
+    messages[locale] = {};
+    const components = locales[locale];
+
+    components.keys().forEach(component => {
+      const matched = component.match(/([A-Za-z0-9-_]+)\./i);
+      const componentName = matched[1];
+      messages[locale][componentName] = components(component);
+    });
+  });
+  return messages;
+}
+
+export default new VueI18n({
+  locale: 'nl' || navigator.language.split('-')[0],
+  fallbackLocale: 'nl',
+  messages: loadLocaleMessages(),
+});
diff --git a/prompts.js b/prompts.js
index c1d8c73..ef21f2c 100644
--- a/prompts.js
+++ b/prompts.js
@@ -2,7 +2,7 @@ module.exports = [
     {
         name: 'useCrud',
         type: 'confirm',
-        message: 'Do you want to use a crud system?',
+        message: 'Do you want to use a crud system? (with the package vuetify-resource)',
         default: true,
     },
     {

From 4514c3a7c84430e73d4157d34746af298487bb79 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 11:28:23 +0200
Subject: [PATCH 07/21] Split routes  (authorisation/authorised) Added
 translations to them

---
 .../components/Authorisation/LoginCard.vue    |  81 +++++---
 .../Authorisation/PasswordForgottenCard.vue   |  51 +++--
 .../Authorisation/PasswordResetCard.vue       |  86 +++++----
 .../components/Authorisation/RegisterCard.vue |  14 +-
 .../src/locales/nl/authorisation.json         |   0
 .../{ => routes}/guards/AuthorisationGuard.js |   2 +-
 .../src/views/AuthorisationCallback.vue       |  18 +-
 .../src/views/InvitationAccept.vue            | 181 +++++++++---------
 .../Authorisation/src/views/Login.vue         |   7 +-
 .../src/views/PasswordForgotten.vue           |   4 +-
 .../Authorisation/src/views/PasswordReset.vue |   4 +-
 .../src/views/RegistrationVerify.vue          | 111 +++++++++++
 .../Authorisation/src/views/Verify.vue        | 116 -----------
 .../Crud/src/router/routes/authorised.js      |  18 ++
 .../src/router/guards/AuthorisationGuard.js   |   4 +
 .../templates/Default/src/router/index.js     | 102 ++--------
 .../Default/src/router/routes/authorised.js   |  14 ++
 17 files changed, 424 insertions(+), 389 deletions(-)
 rename generator/templates/{Default => Authorisation}/src/locales/nl/authorisation.json (100%)
 rename generator/templates/Authorisation/src/{ => routes}/guards/AuthorisationGuard.js (84%)
 create mode 100644 generator/templates/Authorisation/src/views/RegistrationVerify.vue
 delete mode 100644 generator/templates/Authorisation/src/views/Verify.vue
 create mode 100644 generator/templates/Crud/src/router/routes/authorised.js
 create mode 100644 generator/templates/Default/src/router/guards/AuthorisationGuard.js
 create mode 100644 generator/templates/Default/src/router/routes/authorised.js

diff --git a/generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue b/generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue
index 34d2764..3210ca0 100644
--- a/generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue
+++ b/generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue
@@ -1,7 +1,7 @@
 <template>
   <v-card height="100%">
     <v-form @submit.prevent="handleLogin()" ref="form" v-model="isValid">
-      <v-card-title class="title">Ik wil inloggen</v-card-title>
+      <VCardTitle class="title" v-text="$t('authorisation.login.title')"/>
       <v-card-text>
         <v-alert :value="!!errorMessage.length"
                  class="mb-10"
@@ -10,43 +10,59 @@
         >
           {{ errorMessage }}
         </v-alert>
-        <VTextField
-            :rules="[(v) => !!v || 'E-Mail is verplicht']"
-            label="E-Mail"
-            tabindex="1"
-            v-model="form.email"
-        />
-        <VTextField
-            :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
-            :rules="[(v) => !!v || 'Wachtwoord is verplicht']"
-            :type="showPassword ? 'text' : 'password'"
-            @click:append="showPassword = !showPassword"
-            label="Wachtwoord"
-            tabindex="2"
-            v-model="form.password"
-        />
+        <k-field-group language-prefix="authorisation.fields">
+          <KTextField field="email"
+                      autofocus
+                      tabindex="1"
+                      v-model="form.email"
+                      autocomplete="username"
+          />
+          <KTextField :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
+                      :type="showPassword ? 'text' : 'password'"
+                      @click:append="showPassword = !showPassword"
+                      field="password"
+                      autocomplete="current-password"
+                      tabindex="2"
+                      v-model="form.password"
+          />
+        </k-field-group>
       </v-card-text>
       <v-card-actions>
         <VSpacer/>
-        <v-btn :to="{name: 'password.forgotten'}" color="primary" tabindex="4" text>Wachtwoord vergeten</v-btn>
-        <v-btn :loading="isLoading" color="primary" tabindex="3" type="submit">Inloggen</v-btn>
+        <VBtn :to="{name: 'password.forgotten'}"
+              color="primary"
+              tabindex="4"
+              text
+              v-text="$t('authorisation.actions.passwordForgotten')"/>
+        <VBtn :loading="isLoading"
+              color="primary"
+              tabindex="3"
+              type="submit"
+              v-text="$t('authorisation.actions.login')"/>
       </v-card-actions>
     </v-form>
 
     <v-overlay class="text-center" v-model="isRedirecting">
       <VProgressCircular indeterminate size="64"/>
-      <div class="mt-5">Je bent ingelogd, we sturen je nu door.</div>
+      <div class="mt-5" v-text="$t('authorisation.login.successMessage')"></div>
     </v-overlay>
   </v-card>
 </template>
 
 <script>
+import { getRateLimitMinutes } from '@/api/util/response';
+import { getOrganisationFromUrl } from '@/application/util/url.js';
+import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
+import KTextField from '@/components/crud/fields/KTextField.vue';
 import { mapGetters } from 'vuex';
 import LoginRequest from '../../api/endpoints/authorisation/login';
-import { getRateLimitMinutes } from '../../api/util/response.js';
 
 export default {
   name: 'LoginCard',
+  components: {
+    KFieldGroup,
+    KTextField,
+  },
   data() {
     return {
       errorMessage: '',
@@ -69,33 +85,33 @@ export default {
     handleLogin() {
       this.isLoading = true;
       LoginRequest(this.form.email, this.form.password)
-          .then(res => {
+          .then((res) => {
             this.isRedirecting = true;
             this.redirectToAuthDispense(res.data.data.token);
           })
-          .catch(err => {
-            const response = err.response;
-            const status = response.status;
+          .catch((err) => {
+            const { response } = err;
+            const { status } = response;
 
             if (status === 429) {
-              this.errorMessage =
-                  `Je hebt te veel foutieve inlog pogingen gedaan.
-                             Probeer het over ${getRateLimitMinutes(response, 15)} minuten opnieuw`;
+              this.errorMessage = this.$t('errors.429', { minutes: getRateLimitMinutes(response) });
             } else {
               this.errorMessage = this.findError('email');
             }
           })
-          .finally(() => this.isLoading = false);
+          .finally(() => {
+            this.isLoading = false;
+          });
     },
     redirectToAuthDispense(token) {
       const form = document.createElement('form');
 
       form.method = 'POST';
-      form.action = process.env.VUE_APP_ROOT_API + '/auth/dispense';
+      form.action = `${process.env.VUE_APP_ROOT_API}/auth/dispense`;
 
       const redirectUriElement = document.createElement('input');
       redirectUriElement.name = 'redirect_uri';
-      redirectUriElement.value = 'home';
+      redirectUriElement.value = 'dashboard';
       form.appendChild(redirectUriElement);
 
       const emailElement = document.createElement('input');
@@ -108,6 +124,11 @@ export default {
       tokenElement.value = token;
       form.appendChild(tokenElement);
 
+      const organisationElement = document.createElement('input');
+      organisationElement.name = 'organisation';
+      organisationElement.value = getOrganisationFromUrl();
+      form.appendChild(organisationElement);
+
       document.body.appendChild(form);
       form.submit();
     },
diff --git a/generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue b/generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue
index 7091b6b..0798fdd 100644
--- a/generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue
+++ b/generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue
@@ -1,7 +1,7 @@
 <template>
   <v-card height="100%">
-    <v-form @submit.prevent="handleRegister()" ref="form" v-model="isValid">
-      <v-card-title class="title">Ik wil een account aanvragen</v-card-title>
+    <v-form ref="form" v-model="isValid" @submit.prevent="handleRegister()">
+      <VCardTitle class="title" v-text="$t('authorisation.passwordForgotten.title')"/>
       <v-card-text>
         <v-alert
             :type="alertType"
@@ -11,26 +11,45 @@
         >
           {{ alertMessage }}
         </v-alert>
-        <VTextField
-            :rules="[(v) => !!v || 'E-Mail is verplicht']"
-            label="E-Mail"
-            tabindex="11"
-            v-model="form.email"
-        />
+        <k-field-group language-prefix="authorisation.fields">
+          <KTextField
+              v-model="form.email"
+              autocomplete="username"
+              autofocus
+              field="email"
+              tabindex="1"
+          />
+        </k-field-group>
       </v-card-text>
       <v-card-actions>
         <VSpacer/>
-        <v-btn :loading="isLoading" color="primary" tabindex="12" type="submit">Wachtwoord aanvragen</v-btn>
+        <VBtn
+            :to="{name:'login'}"
+            color="primary"
+            text
+            v-text="$t('actions.back')"/>
+        <VBtn :loading="isLoading"
+              color="primary"
+              tabindex="2"
+              type="submit"
+              v-text="$t('authorisation.passwordForgotten.request')"/>
       </v-card-actions>
     </v-form>
   </v-card>
 </template>
 
 <script>
-import ForgottenRequest from '../../api/endpoints/password/forgotten.js';
+import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
+import KTextField from '@/components/crud/fields/KTextField.vue';
+import ForgottenRequest from '../../api/endpoints/authorisation/password/forgotten';
+import { getOrganisationFromUrl } from '../../application/util/url.js';
 
 export default {
   name: 'PasswordForgottenCard',
+  components: {
+    KFieldGroup,
+    KTextField,
+  },
   data() {
     return {
       alertType: 'success',
@@ -52,13 +71,17 @@ export default {
       this.alertMessage = '';
       this.alertType = 'error';
 
-      ForgottenRequest(this.form.email)
+      ForgottenRequest(this.form.email, getOrganisationFromUrl())
           .then(() => {
-            this.alertMessage = 'Er is een wachtwoord vergeten mail verstuurd mits er een account bestaat met het gegeven email adres.';
+            this.alertMessage = this.$t('authorisation.passwordForgotten.successMessage');
             this.alertType = 'success';
           })
-          .catch(() => this.alertMessage = 'De ingevulde gegevens kloppen niet.')
-          .finally(() => this.isLoading = false);
+          .catch(() => {
+            this.alertMessage = this.$t('errors.422');
+          })
+          .finally(() => {
+            this.isLoading = false;
+          });
     },
   },
 };
diff --git a/generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue b/generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue
index 201a888..cc506ba 100644
--- a/generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue
+++ b/generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue
@@ -1,7 +1,7 @@
 <template>
   <v-card height="100%">
     <v-form @submit.prevent="handleRegister()" ref="form" v-model="isValid">
-      <v-card-title class="title">Ik wil een account aanvragen</v-card-title>
+      <VCardTitle class="title" v-text="$t('authorisation.passwordReset.title')"/>
       <v-card-text>
         <v-alert
             :type="alertType"
@@ -11,45 +11,51 @@
         >
           {{ alertMessage }}
         </v-alert>
-        <VTextField
-            :rules="[(v) => !!v || 'E-Mail is verplicht']"
-            label="E-Mail"
-            tabindex="1"
-            v-model="form.email"
-        />
-        <VTextField
-            :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
-            :rules="[(v) => !!v || 'Wachtwoord is verplicht']"
-            :type="showPassword ? 'text' : 'password'"
-            @click:append="showPassword = !showPassword"
-            label="Wachtwoord"
-            tabindex="2"
-            v-model="form.password"
-        />
-        <VTextField
-            :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
-            :rules="[(v) => !!v || 'Wachtwoord is verplicht']"
-            :type="showPassword ? 'text' : 'password'"
-            @click:append="showPassword = !showPassword"
-            label="Wachtwoord"
-            tabindex="3"
-            v-model="form.passwordConfirmation"
-        />
+        <k-field-group language-prefix="authorisation.fields">
+          <KTextField
+              field="email"
+              tabindex="1"
+              v-model="form.email"
+          />
+          <KTextField
+              :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
+              :type="showPassword ? 'text' : 'password'"
+              @click:append="showPassword = !showPassword"
+              field="password"
+              tabindex="2"
+              v-model="form.password"
+          />
+          <KTextField
+              :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
+              :type="showPassword ? 'text' : 'password'"
+              @click:append="showPassword = !showPassword"
+              field="password"
+              tabindex="3"
+              v-model="form.passwordConfirmation"
+          />
+        </k-field-group>
       </v-card-text>
       <v-card-actions>
         <VSpacer/>
-        <v-btn :loading="isLoading" color="primary" tabindex="4" type="submit">Wachtwoord aanvragen</v-btn>
+        <VBtn :loading="isLoading" color="primary" tabindex="4" type="submit" v-text="$t('actions.save')"/>
       </v-card-actions>
     </v-form>
   </v-card>
 </template>
 
 <script>
-import resetRequest from '../../api/endpoints/password/reset.js';
-import { getRateLimitMinutes } from '../../api/util/response.js';
+import { getRateLimitMinutes } from '@/api/util/response.js';
+import { getOrganisationFromUrl } from '@/application/util/url.js';
+import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
+import KTextField from '@/components/crud/fields/KTextField.vue';
+import resetRequest from '../../api/endpoints/authorisation/password/reset';
 
 export default {
   name: 'PasswordResetCard',
+  components: {
+    KTextField,
+    KFieldGroup,
+  },
   props: {
     token: {
       type: String,
@@ -70,6 +76,9 @@ export default {
       showPassword: false,
     };
   },
+  created() {
+    this.form.email = this.$route.query.email;
+  },
   methods: {
     handleRegister() {
       this.$refs.form.validate();
@@ -80,26 +89,27 @@ export default {
       this.alertType = 'error';
       this.errorMessage = '';
 
-      resetRequest(this.form.email, this.token, this.form.password, this.form.passwordConfirmation)
+      resetRequest(this.form.email, this.token, this.form.password, this.form.passwordConfirmation, getOrganisationFromUrl())
           .then(() => {
             this.alertType = 'success';
-            this.alertMessage = 'Je wachtwoord is opnieuw ingesteld, je kan nu inloggen.';
+            this.alertMessage = this.$t('authorisation.passwordReset.successMessage');
           })
-          .catch(error => {
-            const response = error.response;
-            const status = response.status;
+          .catch((error) => {
+            this.alertType = 'error';
+            const { response } = error;
+            const { status } = response;
 
             if (status === 429) {
-              this.alertMessage =
-                  `Je hebt tevaak een foutieve login poging gedaan. Probeer het over ${getRateLimitMinutes(response, 15)} minuten opnieuw`;
+              this.alertMessage = this.$t('errors.429', { minutes: getRateLimitMinutes(response) });
             } else if (status === 400) {
-              this.alertMessage =
-                  'Deze wachtwoord reset pagina is verlopen, vraag opnieuw een wachtwoord aan via de wachtwoord vergeten optie';
+              this.alertMessage = this.$t('authorisation.passwordReset.errorMessage');
             }
 
             this.$refs.form.validate();
           })
-          .finally(() => this.isLoading = false);
+          .finally(() => {
+            this.isLoading = false;
+          });
     },
   },
 };
diff --git a/generator/templates/Authorisation/src/components/Authorisation/RegisterCard.vue b/generator/templates/Authorisation/src/components/Authorisation/RegisterCard.vue
index f2944da..a4b73bb 100644
--- a/generator/templates/Authorisation/src/components/Authorisation/RegisterCard.vue
+++ b/generator/templates/Authorisation/src/components/Authorisation/RegisterCard.vue
@@ -4,36 +4,36 @@
       <v-card-title class="title">Ik wil een account aanvragen</v-card-title>
       <v-card-text>
         <v-alert
-            :type="alertType"
             :value="!!alertMessage.length"
             class="mb-10"
             transition="fade-transition"
+            :type="alertType"
         >
           {{ alertMessage }}
         </v-alert>
         <VTextField
             :rules="[(v) => !!v || 'Naam is verplicht']"
             label="Naam"
-            tabindex="10"
             v-model="form.name"
+            tabindex="10"
         />
         <VTextField
             :rules="[(v) => !!v || 'E-Mail is verplicht']"
             label="E-Mail"
-            tabindex="11"
             v-model="form.email"
+            tabindex="11"
         />
       </v-card-text>
       <v-card-actions>
         <VSpacer/>
-        <v-btn :loading="isLoading" color="primary" tabindex="12" type="submit">Registreren</v-btn>
+        <v-btn tabindex="12" type="submit" color="primary" :loading="isLoading">Registreren</v-btn>
       </v-card-actions>
     </v-form>
   </v-card>
 </template>
 
 <script>
-import { register } from '../../api/endpoints/authorisation/register.js';
+import { register } from '../../api/endpoints/authorisation/register';
 
 export default {
   name: 'RegisterCard',
@@ -68,7 +68,9 @@ export default {
             this.alertType = 'error';
             this.alertMessage = 'De ingevulde gegevens kloppen niet.';
           })
-          .finally(() => this.isLoading = false);
+          .finally(() => {
+            this.isLoading = false;
+          });
     },
   },
 };
diff --git a/generator/templates/Default/src/locales/nl/authorisation.json b/generator/templates/Authorisation/src/locales/nl/authorisation.json
similarity index 100%
rename from generator/templates/Default/src/locales/nl/authorisation.json
rename to generator/templates/Authorisation/src/locales/nl/authorisation.json
diff --git a/generator/templates/Authorisation/src/guards/AuthorisationGuard.js b/generator/templates/Authorisation/src/routes/guards/AuthorisationGuard.js
similarity index 84%
rename from generator/templates/Authorisation/src/guards/AuthorisationGuard.js
rename to generator/templates/Authorisation/src/routes/guards/AuthorisationGuard.js
index fc2856d..86f12da 100644
--- a/generator/templates/Authorisation/src/guards/AuthorisationGuard.js
+++ b/generator/templates/Authorisation/src/routes/guards/AuthorisationGuard.js
@@ -1,4 +1,4 @@
-import store from '../store';
+import store from '@/store';
 
 export default function (to, from, next) {
   if (!store.getters['authorisation/isLoggedIn']) {
diff --git a/generator/templates/Authorisation/src/views/AuthorisationCallback.vue b/generator/templates/Authorisation/src/views/AuthorisationCallback.vue
index a36cdb1..770685e 100644
--- a/generator/templates/Authorisation/src/views/AuthorisationCallback.vue
+++ b/generator/templates/Authorisation/src/views/AuthorisationCallback.vue
@@ -5,8 +5,9 @@
 </template>
 
 <script lang="js">
-import { mapMutations } from 'vuex';
-import { getFragment } from '../application/util/url.js';
+import { getFragment } from '@/application/util/url';
+import admin from '@/router/routes/admin.js';
+import { mapActions, mapMutations, mapState } from 'vuex';
 
 export default {
   name: 'AuthorisationCallback',
@@ -14,14 +15,25 @@ export default {
     ...mapMutations({
       setAuthorisationToken: 'authorisation/setAuthorisationToken',
     }),
+    ...mapActions({
+      fetchProfile: 'authorisation/fetchProfile',
+    }),
+  },
+  computed: {
+    ...mapState('authorisation', ['isAdmin']),
   },
-  created() {
+  async created() {
     const redirectUri = this.$route.query.redirect_uri;
+
     const token = getFragment('token');
 
     if (!token) throw new Error('AuthorisationCallback::created token hash not found');
 
     this.setAuthorisationToken(token);
+    await this.fetchProfile();
+    if (this.isAdmin) {
+      this.$router.addRoutes([admin]);
+    }
     this.$router.push({ name: redirectUri });
   },
 };
diff --git a/generator/templates/Authorisation/src/views/InvitationAccept.vue b/generator/templates/Authorisation/src/views/InvitationAccept.vue
index 55c196b..d45f107 100644
--- a/generator/templates/Authorisation/src/views/InvitationAccept.vue
+++ b/generator/templates/Authorisation/src/views/InvitationAccept.vue
@@ -1,126 +1,129 @@
 <template>
-  <v-form @submit.prevent="handleAccept()" ref="form">
-    <v-card>
-      <v-card-text>
-        <img :src="require('../assets/logo.png')" class="logo">
-        <div v-if="!isLoading">
-          <v-alert
-              :value="!!firstValidGlobalError.length"
-              class="mb-10"
-              transition="fade-transition"
-              type="error"
-          >
-            {{ firstValidGlobalError }}
-          </v-alert>
-          <VTextField
-              :rules="[(v) => !!v || 'E-Mail is verplicht']"
-              label="E-Mail"
-              v-model="email"
-          />
-          <VTextField
-              :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
-              :rules="[(v) => !!v || 'Wachtwoord is verplicht', () => serverError('password')]"
-              :type="showPassword ? 'text' : 'password'"
-              @click:append="showPassword = !showPassword"
-              label="Wachtwoord"
-              v-model="password"
-          />
-          <VTextField
-              :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
-              :rules="[(v) => !!v || 'Wachtwoord is verplicht']"
-              :type="showPassword ? 'text' : 'password'"
-              @click:append="showPassword = !showPassword"
-              label="Wachtwoord"
-              v-model="passwordConfirmation"
-          />
-        </div>
-        <div class="text-center" v-else>
-          <VProgressCircular
-              :size="70"
-              :width="7"
-              color="accent"
-              indeterminate
-          />
-        </div>
-      </v-card-text>
-      <v-card-actions>
-        <VSpacer/>
-        <v-btn color="accent" type="submit">Uitnodiging accepteren</v-btn>
-      </v-card-actions>
-    </v-card>
-  </v-form>
+
+  <v-row align="stretch" justify-md="center">
+    <v-col md="3">
+      <v-form @submit.prevent="handleAccept()" ref="form" v-model="isValid">
+        <v-card>
+          <VCardTitle class="title" v-text="$t('authorisation.invitationAccept.title')"/>
+          <v-card-text>
+            <v-alert
+                :value="!!alertMessage.length"
+                class="mb-10"
+                transition="fade-transition"
+                :type="alertType"
+            >
+              {{ alertMessage }}
+            </v-alert>
+
+            <k-field-group language-prefix="authorisation.fields">
+              <KTextField
+                  autocomplete="username"
+                  autofocus
+                  disabled
+                  field="email"
+                  tabindex="1"
+                  v-model="email"
+              />
+              <KTextField
+                  autocomplete="new-password"
+                  autofocus
+                  field="password"
+                  tabindex="1"
+                  type="password"
+                  v-model="password"
+              />
+              <KTextField
+                  autocomplete="new-password"
+                  field="passwordConfirmation"
+                  tabindex="1"
+                  type="password"
+                  v-model="passwordConfirmation"
+              />
+            </k-field-group>
+          </v-card-text>
+          <v-card-actions>
+            <VSpacer/>
+            <v-btn :loading="isLoading" color="primary" type="submit">{{
+                $t('authorisation.invitationAccept.request')
+              }}
+            </v-btn>
+          </v-card-actions>
+        </v-card>
+      </v-form>
+    </v-col>
+  </v-row>
 </template>
 
 <script lang="js">
+import { acceptInvitation } from '@/api/endpoints/authorisation/register.js';
+import { getRateLimitMinutes } from '@/api/util/response.js';
+import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
+import KTextField from '@/components/crud/fields/KTextField.vue';
 import { mapGetters } from 'vuex';
-import axios from '../api/implementation/app';
+import { getOrganisationFromUrl } from '../../application/util/url.js';
 
 export default {
   name: 'InvitationAccept',
+  components: {
+    KFieldGroup,
+    KTextField,
+  },
   data() {
     return {
+      alertType: 'success',
+      alertMessage: '',
       isLoading: false,
-      email: '',
+      email: this.$route.query.email,
       password: '',
       passwordConfirmation: '',
-      errorMessage: '',
-      showPassword: false,
-      errors: {},
+      isValid: false,
     };
   },
   computed: {
     ...mapGetters({
       isLoggedIn: 'authorisation/isLoggedIn',
       firstError: 'error/first',
-      findError: 'error/find',
     }),
-    firstValidGlobalError: vm => vm.errorMessage || vm.firstError,
   },
   created() {
     if (this.isLoggedIn) {
       this.$router.push({
-        name: 'home',
+        name: 'dashboard',
+      });
+    }
+
+    if (!this.$route.query.email) {
+      this.$router.push({
+        name: 'login',
       });
+
+      throw new Error('InvitationAccept::created no email present');
     }
-    this.email = this.$route.query.email || '';
   },
   methods: {
     handleAccept() {
-      this.$refs.form.validate();
-
       this.isLoading = true;
-
-      axios.post('invitation/accept', {
-            email: this.email,
-            password: this.password,
-            password_confirmation: this.passwordConfirmation,
-            token: this.$route.params.token,
+      acceptInvitation(this.email, this.$route.params.token, this.password, this.passwordConfirmation)
+          .then(() => {
+            this.alertType = 'success';
+            this.alertMessage = this.$t('authorisation.invitationAccept.successMessage');
           })
-          .then(() => this.$router.push({
-                name: 'login',
-              }),
-          )
-          .catch(error => {
-            const response = error.response;
-            const data = response.data;
+          .catch((error) => {
+            this.alertType = 'error';
+            const { response } = error;
+            const { status } = response;
 
-            if (response.status === 422) {
-              this.errors = data.errors || [];
-              process.nextTick(() => {
-                this.$refs.form.validate();
-              });
-            } else {
-              if (data.message) {
-                this.errorMessage = data.message;
-              } else {
-                this.errorMessage = 'Er ging iets mis';
-              }
+            if (status === 429) {
+              this.alertMessage = this.$t('errors.429', { minutes: getRateLimitMinutes(response) });
+            } else if (status === 400) {
+              this.alertMessage = this.$t('authorisation.invitationAccept.errorMessage');
             }
+
+            this.$refs.form.validate();
           })
-          .finally(() => this.isLoading = false);
-    },
-    serverError(name) {
-      return this.findError(name) || true;
+          .finally(() => {
+            this.isLoading = false;
+          });
     },
   },
 };
diff --git a/generator/templates/Authorisation/src/views/Login.vue b/generator/templates/Authorisation/src/views/Login.vue
index 691d904..93e9c57 100644
--- a/generator/templates/Authorisation/src/views/Login.vue
+++ b/generator/templates/Authorisation/src/views/Login.vue
@@ -3,20 +3,15 @@
     <v-col md="3">
       <LoginCard/>
     </v-col>
-    <v-col md="3">
-      <RegisterCard/>
-    </v-col>
   </v-row>
 </template>
 
 <script lang="js">
-import LoginCard from '../components/Authorisation/LoginCard.vue';
-import RegisterCard from '../components/Authorisation/RegisterCard.vue';
+import LoginCard from '@/components/authorisation/LoginCard.vue';
 
 export default {
   name: 'Login',
   components: {
-    RegisterCard,
     LoginCard,
   },
 };
diff --git a/generator/templates/Authorisation/src/views/PasswordForgotten.vue b/generator/templates/Authorisation/src/views/PasswordForgotten.vue
index e2b8c13..fbad0f1 100644
--- a/generator/templates/Authorisation/src/views/PasswordForgotten.vue
+++ b/generator/templates/Authorisation/src/views/PasswordForgotten.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-row align="stretch" justify-md="center">
+  <v-row justify-md="center" align="stretch">
     <v-col md="3">
       <PasswordForgottenCard/>
     </v-col>
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import PasswordForgottenCard from '../components/Authorisation/PasswordForgottenCard.vue';
+import PasswordForgottenCard from '@/components/authorisation/PasswordForgottenCard.vue';
 
 export default {
   name: 'PasswordForgotten',
diff --git a/generator/templates/Authorisation/src/views/PasswordReset.vue b/generator/templates/Authorisation/src/views/PasswordReset.vue
index 559e8bc..581c6f1 100644
--- a/generator/templates/Authorisation/src/views/PasswordReset.vue
+++ b/generator/templates/Authorisation/src/views/PasswordReset.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-row align="stretch" justify-md="center">
+  <v-row justify-md="center" align="stretch">
     <v-col md="3">
       <PasswordResetCard :token="$route.params.token"/>
     </v-col>
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="js">
-import PasswordResetCard from '../components/Authorisation/PasswordResetCard.vue';
+import PasswordResetCard from '@/components/authorisation/PasswordResetCard.vue';
 
 export default {
   name: 'PasswordReset',
diff --git a/generator/templates/Authorisation/src/views/RegistrationVerify.vue b/generator/templates/Authorisation/src/views/RegistrationVerify.vue
new file mode 100644
index 0000000..6e9e356
--- /dev/null
+++ b/generator/templates/Authorisation/src/views/RegistrationVerify.vue
@@ -0,0 +1,111 @@
+<template>
+  <v-row align="stretch" justify-md="center">
+    <v-col md="3">
+      <v-card height="100%">
+        <v-form @submit.prevent="onFormSubmit()" ref="form">
+          <VCardTitle class="title" v-text="$t('authorisation.registrationVerify.title')"/>
+          <v-card-text>
+            <v-alert
+                :type="alertType"
+                :value="!!alertMessage.length"
+                text
+                transition="fade-transition"
+            >
+              {{ alertMessage }}
+            </v-alert>
+
+            <k-field-group language-prefix="authorisation.fields">
+              <KTextField
+                  field="email"
+                  tabindex="0"
+                  v-model="form.email"
+              />
+              <KTextField
+                  :append-icon="showPassword ? 'far fa-eye-slash' : 'far fa-eye'"
+                  :type="showPassword ? 'text' : 'password'"
+                  @click:append="showPassword = !showPassword"
+                  field="password"
+                  tabindex="1"
+                  v-model="form.password"
+              />
+              <KTextField
+                  :append-icon="showPassword ? 'far fa-eye-slash' : 'far fa-eye'"
+                  :type="showPassword ? 'text' : 'password'"
+                  @click:append="showPassword = !showPassword"
+                  field="password"
+                  tabindex="2"
+                  v-model="form.passwordConfirmation"
+              />
+            </k-field-group>
+          </v-card-text>
+          <v-card-actions>
+            <VSpacer/>
+            <VBtn :loading="isLoading" color="primary" tabindex="12" type="submit" v-text="$t('actions.save')"/>
+          </v-card-actions>
+        </v-form>
+      </v-card>
+    </v-col>
+  </v-row>
+</template>
+
+<script>
+import { verify } from '@/api/endpoints/authorisation/register';
+import { getRateLimitMinutes } from '@/api/util/response';
+import { getFragment } from '@/application/util/url';
+import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
+import KTextField from '@/components/crud/fields/KTextField.vue';
+
+export default {
+  name: 'Verify',
+  components: {
+    KTextField,
+    KFieldGroup,
+  },
+  data() {
+    return {
+      form: {
+        email: '',
+      },
+      isLoading: false,
+      alertType: 'success',
+      alertMessage: '',
+      valid: true,
+      showPassword: false,
+    };
+  },
+  created() {
+    this.form.email = getFragment('email');
+  },
+  methods: {
+    onFormSubmit() {
+      const token = getFragment('token');
+
+      // TODO: what to do?
+      if (!token) return;
+
+      this.isLoading = true;
+
+      verify(token, this.form.email, this.form.password, this.form.passwordConfirmation)
+          .then(() => {
+            this.alertMessage = this.$t('authorisation.registrationVerify.successMessage');
+            this.alertType = 'success';
+          })
+          .catch((error) => {
+            const { response } = error;
+            const { status } = response;
+
+            this.alertType = 'error';
+            if (status === 429) {
+              this.alertMessage = this.$t('errors.429', { minutes: getRateLimitMinutes(response) });
+            } else if (status === 400) {
+              this.alertMessage = this.$t('authorisation.registrationVerify.errorMessage');
+            }
+            this.validate();
+          })
+          .finally(() => {
+            this.isLoading = false;
+          });
+    },
+  },
+};
+</script>
diff --git a/generator/templates/Authorisation/src/views/Verify.vue b/generator/templates/Authorisation/src/views/Verify.vue
deleted file mode 100644
index f3fcb48..0000000
--- a/generator/templates/Authorisation/src/views/Verify.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <v-row align="stretch" justify-md="center">
-    <v-col md="3">
-      <v-card height="100%">
-        <v-form @submit.prevent="onFormSubmit()" ref="form" v-model="isValid">
-          <v-card-title class="title">Ik wil een account aanvragen</v-card-title>
-          <v-card-text>
-            <v-alert
-                :type="alertType"
-                :value="!!alertMessage.length"
-                text
-                transition="fade-transition"
-            >
-              {{ alertMessage }}
-            </v-alert>
-            <VTextField
-                :rules="[(v) => !!v || 'E-mailadres is verplicht', () => serverError('email')]"
-                filled
-                label="E-mailadres"
-                tabindex="0"
-                v-model="form.email"
-            />
-            <VTextField
-                :append-icon="showPassword ? 'far fa-eye-slash' : 'far fa-eye'"
-                :rules="[(v) => !!v || 'Wachtwoord is verplicht', () => serverError('password')]"
-                :type="showPassword ? 'text' : 'password'"
-                @click:append="showPassword = !showPassword"
-                filled
-                label="Wachtwoord"
-                tabindex="1"
-                v-model="form.password"
-            />
-            <VTextField
-                :append-icon="showPassword ? 'far fa-eye-slash' : 'far fa-eye'"
-                :rules="[(v) => !!v || 'Wachtwoord is verplicht', (v) => v === form.password || 'Wachtwoorden komen niet overeen', () => serverError('passwordConfirmation')]"
-                :type="showPassword ? 'text' : 'password'"
-                @click:append="showPassword = !showPassword"
-                filled
-                label="Wachtwoord nogmaals"
-                tabindex="2"
-                v-model="form.passwordConfirmation"
-            />
-          </v-card-text>
-          <v-card-actions>
-            <VSpacer/>
-            <v-btn :loading="isLoading" color="primary" tabindex="12" type="submit">Instellen</v-btn>
-          </v-card-actions>
-        </v-form>
-      </v-card>
-    </v-col>
-  </v-row>
-</template>
-
-<script>
-import { verify } from '../api/endpoints/authorisation/register.js';
-import { getRateLimitMinutes } from '../api/util/response.js';
-import { getFragment } from '../application/util/url.js';
-import BaseForm from '../components/BaseForm.vue';
-
-export default {
-  name: 'Verify',
-  extends: BaseForm,
-  data() {
-    return {
-      form: {
-        email: '',
-      },
-      isLoading: false,
-      alertType: 'success',
-      alertMessage: '',
-      valid: true,
-      showPassword: false,
-    };
-  },
-  created() {
-    this.form.email = getFragment('email');
-  },
-  methods: {
-    onFormSubmit() {
-      const token = getFragment('token');
-
-      if (!token) return; // what to do?
-
-      this.isLoading = true;
-
-      verify(token, this.form.email, this.form.password, this.form.passwordConfirmation)
-          .then(() => {
-            this.alertMessage = 'Je account is geactiveerd, je kunt nu inloggen.';
-            this.alertType = 'success';
-          })
-          .catch(error => {
-            const response = error.response;
-            const status = response.status;
-
-            if (status === 429) {
-              this.alertMessage = `Je hebt te vaak een foutieve activatie poging gedaan.
-                         Probeer het over ${getRateLimitMinutes(response)} minuten opnieuw`;
-              this.alertType = 'error';
-              return;
-            } else if (status === 400) {
-              this.alertMessage = 'De verificatie is verlopen, vraag opnieuw een wachtwoord aan via de wachtwoord vergeten optie.';
-              this.alertType = 'error';
-              return;
-            }
-            this.alertMessage = 'Niet alle velden zijn juist ingevuld';
-            this.alertType = 'error';
-            this.validate();
-          })
-          .finally(() => {
-            this.isLoading = false;
-          });
-    },
-  },
-};
-</script>
-=
diff --git a/generator/templates/Crud/src/router/routes/authorised.js b/generator/templates/Crud/src/router/routes/authorised.js
new file mode 100644
index 0000000..cfa1439
--- /dev/null
+++ b/generator/templates/Crud/src/router/routes/authorised.js
@@ -0,0 +1,18 @@
+import AuthorisationGuard from '@/router/guards/AuthorisationGuard.js';
+
+export default {
+  path: '',
+  beforeEnter: AuthorisationGuard,
+  component: () => import('@/templates/Default'),
+  children: [
+    {
+      path: '',
+      name: 'home',
+      component: () => import('@/views/Home'),
+    },{
+      path: '/users',
+      name: 'users',
+      component: () => import('@/views/UserResource.vue')
+    },
+  ]
+}
diff --git a/generator/templates/Default/src/router/guards/AuthorisationGuard.js b/generator/templates/Default/src/router/guards/AuthorisationGuard.js
new file mode 100644
index 0000000..e4a8746
--- /dev/null
+++ b/generator/templates/Default/src/router/guards/AuthorisationGuard.js
@@ -0,0 +1,4 @@
+export default function (to, from, next) {
+  // @TODO place your guard here
+  next();
+}
diff --git a/generator/templates/Default/src/router/index.js b/generator/templates/Default/src/router/index.js
index 5ec4d1d..36cf412 100644
--- a/generator/templates/Default/src/router/index.js
+++ b/generator/templates/Default/src/router/index.js
@@ -1,91 +1,29 @@
 import Vue from 'vue';
 import Router from 'vue-router';
 <%_ if (options.useAuthorisation) { _%>
-import AuthorisationGuard from '../guards/AuthorisationGuard';
+import authorisation from './routes/authorisation.js';
 <%_ } _%>
+import authorised from './routes/authorised.js';
 
 Vue.use(Router);
 
+const routes = [
+<%_ if (options.useAuthorisation) { _%>
+  authorisation,
+<%_ } _%>
+  authorised,
+];
+
+
+routes.push(
+  {
+    path: '*',
+    redirect: '404',
+  },
+);
+
 export default new Router({
-    mode: 'history',
-    base: process.env.BASE_URL,
-    routes: [
-        {
-            path: '',
-            redirect: {name: 'home'},
-        },
-        <%_ if (options.useAuthorisation) { _%>
-        {
-            path: '',
-            component: () => import('@/templates/Authorisation'),
-            children: [
-                {
-                    path: '/login',
-                    name: 'login',
-                    component: () => import('@/views/Login'),
-                },
-                {
-                    path: '/auth/callback',
-                    name: 'auth.callback',
-                    component: () => import('@/views/AuthorisationCallback'),
-                },
-                {
-                    path: '/password/forgotten',
-                    name: 'password.forgotten',
-                    component: () => import('@/views/PasswordForgotten.vue'),
-                },
-                {
-                    path: '/password/reset/:token',
-                    name: 'password.reset',
-                    component: () => import('@/views/PasswordReset.vue'),
-                },
-                {
-                    path: '/invitation/accept/:token',
-                    name: 'invitation.accept',
-                    component: () => import('@/views/InvitationAccept.vue'),
-                },
-                {
-                    path: '/registration/verify',
-                    name: 'registration.verify',
-                    component: () => import('@/views/Verify.vue'),
-                },
-            ]
-        },
-         <%_ } _%>
-        {
-            path: '',
-            <%_ if (options.useAuthorisation) { _%>
-            beforeEnter: AuthorisationGuard,
-            <%_ } _%>
-            component: () => import('@/templates/Default'),
-            children: [
-                {
-                    path: '/',
-                    name: 'home',
-                    component: () => import('@/views/Home'),
-                },
-                 <%_ if (options.useCrud) { _%>
-                {
-                    path: '/users',
-                    name: 'users',
-                    component: () => import('@/views/UserResource.vue')
-                },
-                  <%_ } _%>
-                {
-                    path: '/404',
-                    name: '404',
-                    component: () => import('@/views/PageNotFound.vue'),
-                },
-                {
-                    path: '/403',
-                    name: '403',
-                    component: () => import('@/views/PageForbidden.vue'),
-                },
-                {
-                    path: '*',
-                    redirect: '/404'
-                },
-            ],
-        },
-    ],
+  mode: 'history',
+  base: process.env.BASE_URL,
+  routes: routes,
 });
diff --git a/generator/templates/Default/src/router/routes/authorised.js b/generator/templates/Default/src/router/routes/authorised.js
new file mode 100644
index 0000000..a83f8ac
--- /dev/null
+++ b/generator/templates/Default/src/router/routes/authorised.js
@@ -0,0 +1,14 @@
+import AuthorisationGuard from '@/router/guards/AuthorisationGuard.js';
+
+export default {
+  path: '',
+  beforeEnter: AuthorisationGuard,
+  component: () => import('@/templates/Default'),
+  children: [
+    {
+      path: '',
+      name: 'home',
+      component: () => import('@/views/Home'),
+    },
+  ]
+}

From e36078f3cdef9a8879e64719da53d996b4f0e29b Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 12:08:19 +0200
Subject: [PATCH 08/21] add new authorisatrion routes

---
 README.md                                     |  9 +++--
 .../src/api/endpoints/authorisation/login.js  |  4 +--
 .../api/endpoints/authorisation/password.js   |  8 ++---
 .../authorisation/password/forgotten.js       |  7 ++++
 .../endpoints/authorisation/password/reset.js | 10 ++++++
 .../api/endpoints/authorisation/register.js   | 16 +++++----
 .../components/Authorisation/LoginCard.vue    |  6 ----
 .../Authorisation/PasswordForgottenCard.vue   |  3 +-
 .../Authorisation/PasswordResetCard.vue       |  3 +-
 .../src/routes/routes/authorisation.js        | 36 +++++++++++++++++++
 .../AuthorisationCallback.vue                 |  0
 .../{ => authorisation}/InvitationAccept.vue  |  1 -
 .../src/views/{ => authorisation}/Login.vue   |  0
 .../{ => authorisation}/PasswordForgotten.vue |  0
 .../{ => authorisation}/PasswordReset.vue     |  0
 .../RegistrationVerify.vue                    |  0
 .../Default/src/templates/Default.vue         |  4 +--
 17 files changed, 76 insertions(+), 31 deletions(-)
 create mode 100644 generator/templates/Authorisation/src/api/endpoints/authorisation/password/forgotten.js
 create mode 100644 generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.js
 create mode 100644 generator/templates/Authorisation/src/routes/routes/authorisation.js
 rename generator/templates/Authorisation/src/views/{ => authorisation}/AuthorisationCallback.vue (100%)
 rename generator/templates/Authorisation/src/views/{ => authorisation}/InvitationAccept.vue (98%)
 rename generator/templates/Authorisation/src/views/{ => authorisation}/Login.vue (100%)
 rename generator/templates/Authorisation/src/views/{ => authorisation}/PasswordForgotten.vue (100%)
 rename generator/templates/Authorisation/src/views/{ => authorisation}/PasswordReset.vue (100%)
 rename generator/templates/Authorisation/src/views/{ => authorisation}/RegistrationVerify.vue (100%)

diff --git a/README.md b/README.md
index 3bd7e5a..3b55e54 100644
--- a/README.md
+++ b/README.md
@@ -10,15 +10,14 @@ vue add kingscode-scaffold
 npm run serve
 ```
 
-Mind that some of the choices you make in the `vue create my-app` and 
-later in the `vue add vuetify` will be overwritten by vuetify or the kings code scaffold.
+Mind that some choices you make in the `vue create my-app` and 
+later in the `vue add vuetify` will be overwritten by vuetify, or the kings code scaffold.
 
 
 ## Configuration
 
-```
-Notice: it does not matter which choice you make with options that are not documented.
- ```
+> Notice: it does not matter which choice you make with options that are not documented.
+
 
 ### Vue:
 We'd recommend you to choose
diff --git a/generator/templates/Authorisation/src/api/endpoints/authorisation/login.js b/generator/templates/Authorisation/src/api/endpoints/authorisation/login.js
index 90bdfed..628d706 100644
--- a/generator/templates/Authorisation/src/api/endpoints/authorisation/login.js
+++ b/generator/templates/Authorisation/src/api/endpoints/authorisation/login.js
@@ -2,7 +2,7 @@ import { post } from '../../implementation/app';
 
 export default function (email, password) {
   return post('auth/login', {
-    email: email,
-    password: password,
+    email,
+    password,
   });
 }
diff --git a/generator/templates/Authorisation/src/api/endpoints/authorisation/password.js b/generator/templates/Authorisation/src/api/endpoints/authorisation/password.js
index c64d13c..4c4a188 100644
--- a/generator/templates/Authorisation/src/api/endpoints/authorisation/password.js
+++ b/generator/templates/Authorisation/src/api/endpoints/authorisation/password.js
@@ -2,15 +2,15 @@ import { post } from '../../implementation/app';
 
 function passwordForgotten(email) {
   return post('password/forgotten', {
-    email: email,
+    email,
   });
 }
 
 function passwordReset(token, email, password, passwordConfirmation) {
   return post('password/reset', {
-    token: token,
-    email: email,
-    password: password,
+    token,
+    email,
+    password,
     password_confirmation: passwordConfirmation,
   });
 }
diff --git a/generator/templates/Authorisation/src/api/endpoints/authorisation/password/forgotten.js b/generator/templates/Authorisation/src/api/endpoints/authorisation/password/forgotten.js
new file mode 100644
index 0000000..f3c75c5
--- /dev/null
+++ b/generator/templates/Authorisation/src/api/endpoints/authorisation/password/forgotten.js
@@ -0,0 +1,7 @@
+import { post } from '@/api/implementation/app';
+
+export default function (email) {
+  return post('password/forgotten', {
+    email,
+  });
+}
diff --git a/generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.js b/generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.js
new file mode 100644
index 0000000..803ce62
--- /dev/null
+++ b/generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.js
@@ -0,0 +1,10 @@
+import { post } from '@/api/implementation/app';
+
+export default async function (email, token, password, passwordConfirmation) {
+  return post('password/reset', {
+    email,
+    token,
+    password,
+    password_confirmation: passwordConfirmation,
+  });
+}
diff --git a/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js b/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js
index 65259aa..3ba48ef 100644
--- a/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js
+++ b/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js
@@ -1,22 +1,24 @@
 import { post } from '../../implementation/app';
 
-function register(email, name) {
-  return post('registration', {
+function verify(token, email, password, passwordConfirmation) {
+  return post('registration/verify', {
+    token,
     email,
-    name,
+    password,
+    password_confirmation: passwordConfirmation,
   });
 }
 
-function verify(token, email, password, passwordConfirmation) {
-  return post('registration/verify', {
-    token: token,
+function acceptInvitation(email, token, password, passwordConfirmation) {
+  return post('invitation/accept', {
     email: email,
     password: password,
     password_confirmation: passwordConfirmation,
+    token: token,
   });
 }
 
 export {
-  register,
   verify,
+  acceptInvitation,
 };
diff --git a/generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue b/generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue
index 3210ca0..8e22197 100644
--- a/generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue
+++ b/generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue
@@ -51,7 +51,6 @@
 
 <script>
 import { getRateLimitMinutes } from '@/api/util/response';
-import { getOrganisationFromUrl } from '@/application/util/url.js';
 import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
 import KTextField from '@/components/crud/fields/KTextField.vue';
 import { mapGetters } from 'vuex';
@@ -124,11 +123,6 @@ export default {
       tokenElement.value = token;
       form.appendChild(tokenElement);
 
-      const organisationElement = document.createElement('input');
-      organisationElement.name = 'organisation';
-      organisationElement.value = getOrganisationFromUrl();
-      form.appendChild(organisationElement);
-
       document.body.appendChild(form);
       form.submit();
     },
diff --git a/generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue b/generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue
index 0798fdd..d74e38a 100644
--- a/generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue
+++ b/generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue
@@ -42,7 +42,6 @@
 import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
 import KTextField from '@/components/crud/fields/KTextField.vue';
 import ForgottenRequest from '../../api/endpoints/authorisation/password/forgotten';
-import { getOrganisationFromUrl } from '../../application/util/url.js';
 
 export default {
   name: 'PasswordForgottenCard',
@@ -71,7 +70,7 @@ export default {
       this.alertMessage = '';
       this.alertType = 'error';
 
-      ForgottenRequest(this.form.email, getOrganisationFromUrl())
+      ForgottenRequest(this.form.email)
           .then(() => {
             this.alertMessage = this.$t('authorisation.passwordForgotten.successMessage');
             this.alertType = 'success';
diff --git a/generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue b/generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue
index cc506ba..f4c040a 100644
--- a/generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue
+++ b/generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue
@@ -45,7 +45,6 @@
 
 <script>
 import { getRateLimitMinutes } from '@/api/util/response.js';
-import { getOrganisationFromUrl } from '@/application/util/url.js';
 import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
 import KTextField from '@/components/crud/fields/KTextField.vue';
 import resetRequest from '../../api/endpoints/authorisation/password/reset';
@@ -89,7 +88,7 @@ export default {
       this.alertType = 'error';
       this.errorMessage = '';
 
-      resetRequest(this.form.email, this.token, this.form.password, this.form.passwordConfirmation, getOrganisationFromUrl())
+      resetRequest(this.form.email, this.token, this.form.password, this.form.passwordConfirmation)
           .then(() => {
             this.alertType = 'success';
             this.alertMessage = this.$t('authorisation.passwordReset.successMessage');
diff --git a/generator/templates/Authorisation/src/routes/routes/authorisation.js b/generator/templates/Authorisation/src/routes/routes/authorisation.js
new file mode 100644
index 0000000..26f1dee
--- /dev/null
+++ b/generator/templates/Authorisation/src/routes/routes/authorisation.js
@@ -0,0 +1,36 @@
+export default {
+  path: '',
+  component: () => import('@/templates/Authorisation'),
+  children: [
+    {
+      path: 'login',
+      name: 'login',
+      component: () => import('@/views/authorisation/Login.vue'),
+    },
+    {
+      path: 'auth/callback',
+      name: 'auth.callback',
+      component: () => import('@/views/authorisation/AuthorisationCallback.vue'),
+    },
+    {
+      path: 'password/forgotten',
+      name: 'password.forgotten',
+      component: () => import('@/views/authorisation/PasswordForgotten.vue'),
+    },
+    {
+      path: 'password/reset/:token',
+      name: 'password.reset',
+      component: () => import('@/views/authorisation/PasswordReset.vue'),
+    },
+    {
+      path: 'invitation/accept/:token',
+      name: 'invitation.accept',
+      component: () => import('@/views/authorisation/InvitationAccept.vue'),
+    },
+    {
+      path: 'registration/verify',
+      name: 'registration.verify',
+      component: () => import('@/views/authorisation/RegistrationVerify.vue'),
+    },
+  ],
+};
diff --git a/generator/templates/Authorisation/src/views/AuthorisationCallback.vue b/generator/templates/Authorisation/src/views/authorisation/AuthorisationCallback.vue
similarity index 100%
rename from generator/templates/Authorisation/src/views/AuthorisationCallback.vue
rename to generator/templates/Authorisation/src/views/authorisation/AuthorisationCallback.vue
diff --git a/generator/templates/Authorisation/src/views/InvitationAccept.vue b/generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue
similarity index 98%
rename from generator/templates/Authorisation/src/views/InvitationAccept.vue
rename to generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue
index d45f107..ff5c3c0 100644
--- a/generator/templates/Authorisation/src/views/InvitationAccept.vue
+++ b/generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue
@@ -60,7 +60,6 @@ import { getRateLimitMinutes } from '@/api/util/response.js';
 import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
 import KTextField from '@/components/crud/fields/KTextField.vue';
 import { mapGetters } from 'vuex';
-import { getOrganisationFromUrl } from '../../application/util/url.js';
 
 export default {
   name: 'InvitationAccept',
diff --git a/generator/templates/Authorisation/src/views/Login.vue b/generator/templates/Authorisation/src/views/authorisation/Login.vue
similarity index 100%
rename from generator/templates/Authorisation/src/views/Login.vue
rename to generator/templates/Authorisation/src/views/authorisation/Login.vue
diff --git a/generator/templates/Authorisation/src/views/PasswordForgotten.vue b/generator/templates/Authorisation/src/views/authorisation/PasswordForgotten.vue
similarity index 100%
rename from generator/templates/Authorisation/src/views/PasswordForgotten.vue
rename to generator/templates/Authorisation/src/views/authorisation/PasswordForgotten.vue
diff --git a/generator/templates/Authorisation/src/views/PasswordReset.vue b/generator/templates/Authorisation/src/views/authorisation/PasswordReset.vue
similarity index 100%
rename from generator/templates/Authorisation/src/views/PasswordReset.vue
rename to generator/templates/Authorisation/src/views/authorisation/PasswordReset.vue
diff --git a/generator/templates/Authorisation/src/views/RegistrationVerify.vue b/generator/templates/Authorisation/src/views/authorisation/RegistrationVerify.vue
similarity index 100%
rename from generator/templates/Authorisation/src/views/RegistrationVerify.vue
rename to generator/templates/Authorisation/src/views/authorisation/RegistrationVerify.vue
diff --git a/generator/templates/Default/src/templates/Default.vue b/generator/templates/Default/src/templates/Default.vue
index 5fbda4b..fba544f 100644
--- a/generator/templates/Default/src/templates/Default.vue
+++ b/generator/templates/Default/src/templates/Default.vue
@@ -28,8 +28,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import AppBarMenu from '../components/AppBarMenu.vue';
-import TheMainMenu from 'generator/templates/Default/src/components/menu/TheMainMenu.vue';
+import AppBarMenu from '@/components/AppBarMenu.vue';
+import TheMainMenu from '@/components/menu/TheMainMenu.vue';
 
 export default {
   name: 'Default',

From ac9db44a34923fc061636eb124d43bcdac89bcc2 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 16:31:57 +0200
Subject: [PATCH 09/21] Add fields and more

---
 generator/index.js                            |  18 +--
 .../Authorisation/src/api/endpoints/user.js   |  41 ------
 .../LoginCard.vue                             |   0
 .../PasswordForgottenCard.vue                 |   0
 .../PasswordResetCard.vue                     |   0
 .../RegisterCard.vue                          |   0
 .../guards/AuthorisationGuard.js              |   0
 .../routes/authorisation.js                   |   0
 .../authorisation/AuthorisationCallback.vue   |  13 +-
 .../templates/Crud/src/api/endpoints/user.js  |  30 ++++
 .../templates/Crud/src/views/UserResource.vue |   4 +-
 .../src/application/util/translation.js       |  20 +++
 .../src/components/crud/fields/FieldMixin.vue |  90 ++++++++++++
 .../components/crud/fields/KAutocomplete.vue  |  21 +++
 .../src/components/crud/fields/KDateField.vue |  96 +++++++++++++
 .../components/crud/fields/KFieldGroup.vue    |  38 ++++++
 .../src/components/crud/fields/KFileField.vue |  97 +++++++++++++
 .../crud/fields/KPaginatedAutocomplete.vue    | 129 ++++++++++++++++++
 .../components/crud/fields/KRadioGroup.vue    |  34 +++++
 .../src/components/crud/fields/KSelect.vue    |  21 +++
 .../src/components/crud/fields/KTextField.vue |  21 +++
 .../src/components/crud/fields/KTextarea.vue  |  17 +++
 .../src/components/crud/fields/KTimeField.vue |  87 ++++++++++++
 generator/templates/Default/src/newmain.js    |   3 +-
 .../templates/Default/src/plugins/index.js    |   6 +-
 .../templates/Default/src/router/index.js     |   4 +
 .../Default/src/store/modules/error.js        |  19 +--
 27 files changed, 735 insertions(+), 74 deletions(-)
 delete mode 100644 generator/templates/Authorisation/src/api/endpoints/user.js
 rename generator/templates/Authorisation/src/components/{Authorisation => authorisation}/LoginCard.vue (100%)
 rename generator/templates/Authorisation/src/components/{Authorisation => authorisation}/PasswordForgottenCard.vue (100%)
 rename generator/templates/Authorisation/src/components/{Authorisation => authorisation}/PasswordResetCard.vue (100%)
 rename generator/templates/Authorisation/src/components/{Authorisation => authorisation}/RegisterCard.vue (100%)
 rename generator/templates/Authorisation/src/{routes => router}/guards/AuthorisationGuard.js (100%)
 rename generator/templates/Authorisation/src/{routes => router}/routes/authorisation.js (100%)
 create mode 100644 generator/templates/Crud/src/api/endpoints/user.js
 create mode 100644 generator/templates/Default/src/application/util/translation.js
 create mode 100644 generator/templates/Default/src/components/crud/fields/FieldMixin.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KAutocomplete.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KDateField.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KFieldGroup.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KFileField.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KPaginatedAutocomplete.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KRadioGroup.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KSelect.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KTextField.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KTextarea.vue
 create mode 100644 generator/templates/Default/src/components/crud/fields/KTimeField.vue

diff --git a/generator/index.js b/generator/index.js
index 06030ac..1256f10 100644
--- a/generator/index.js
+++ b/generator/index.js
@@ -29,15 +29,6 @@ module.exports = (api, options) => {
     });
   }
 
-  if (options.useCrud) {
-    api.extendPackage({
-      dependencies: {
-        '@kingscode/vuetify-resource': '^2.0.3',
-      },
-    });
-    api.render('./templates/Crud', options);
-  }
-
   if (options.useGithubDeployments) {
     api.render('./templates/Deployment', options);
   }
@@ -52,6 +43,15 @@ module.exports = (api, options) => {
     api.render('./templates/Authorisation', options);
   }
 
+  if (options.useCrud) {
+    api.extendPackage({
+      dependencies: {
+        '@kingscode/vuetify-resource': '^2.0.3',
+      },
+    });
+    api.render('./templates/Crud', options);
+  }
+
   if (options.plugins.includes('sentry')) {
     api.extendPackage({
       dependencies: {
diff --git a/generator/templates/Authorisation/src/api/endpoints/user.js b/generator/templates/Authorisation/src/api/endpoints/user.js
deleted file mode 100644
index c54a7f3..0000000
--- a/generator/templates/Authorisation/src/api/endpoints/user.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import axios, { getPaginated } from '../implementation/app';
-
-function index(page, perPage, search, sortBy, descending, params) {
-  return getPaginated('user', page, perPage, search, sortBy, descending, params);
-}
-
-/**
- * @param id {number}
- */
-function show(id) {
-  return axios.get(`user/${id}`);
-}
-
-/**
- * @param user {User}
- */
-function create(user) {
-  return axios.post('user', user);
-}
-
-/**
- * @param user {User}
- */
-function update(user) {
-  return axios.put(`user/${user.id}`, user);
-}
-
-/**
- * @param userId {number}
- */
-function destroy(userId) {
-  return axios.delete(`user/${userId}`);
-}
-
-export {
-  index,
-  show,
-  create,
-  update,
-  destroy,
-};
diff --git a/generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue b/generator/templates/Authorisation/src/components/authorisation/LoginCard.vue
similarity index 100%
rename from generator/templates/Authorisation/src/components/Authorisation/LoginCard.vue
rename to generator/templates/Authorisation/src/components/authorisation/LoginCard.vue
diff --git a/generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue b/generator/templates/Authorisation/src/components/authorisation/PasswordForgottenCard.vue
similarity index 100%
rename from generator/templates/Authorisation/src/components/Authorisation/PasswordForgottenCard.vue
rename to generator/templates/Authorisation/src/components/authorisation/PasswordForgottenCard.vue
diff --git a/generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue b/generator/templates/Authorisation/src/components/authorisation/PasswordResetCard.vue
similarity index 100%
rename from generator/templates/Authorisation/src/components/Authorisation/PasswordResetCard.vue
rename to generator/templates/Authorisation/src/components/authorisation/PasswordResetCard.vue
diff --git a/generator/templates/Authorisation/src/components/Authorisation/RegisterCard.vue b/generator/templates/Authorisation/src/components/authorisation/RegisterCard.vue
similarity index 100%
rename from generator/templates/Authorisation/src/components/Authorisation/RegisterCard.vue
rename to generator/templates/Authorisation/src/components/authorisation/RegisterCard.vue
diff --git a/generator/templates/Authorisation/src/routes/guards/AuthorisationGuard.js b/generator/templates/Authorisation/src/router/guards/AuthorisationGuard.js
similarity index 100%
rename from generator/templates/Authorisation/src/routes/guards/AuthorisationGuard.js
rename to generator/templates/Authorisation/src/router/guards/AuthorisationGuard.js
diff --git a/generator/templates/Authorisation/src/routes/routes/authorisation.js b/generator/templates/Authorisation/src/router/routes/authorisation.js
similarity index 100%
rename from generator/templates/Authorisation/src/routes/routes/authorisation.js
rename to generator/templates/Authorisation/src/router/routes/authorisation.js
diff --git a/generator/templates/Authorisation/src/views/authorisation/AuthorisationCallback.vue b/generator/templates/Authorisation/src/views/authorisation/AuthorisationCallback.vue
index 770685e..6ae7dd9 100644
--- a/generator/templates/Authorisation/src/views/authorisation/AuthorisationCallback.vue
+++ b/generator/templates/Authorisation/src/views/authorisation/AuthorisationCallback.vue
@@ -6,8 +6,7 @@
 
 <script lang="js">
 import { getFragment } from '@/application/util/url';
-import admin from '@/router/routes/admin.js';
-import { mapActions, mapMutations, mapState } from 'vuex';
+import { mapMutations } from 'vuex';
 
 export default {
   name: 'AuthorisationCallback',
@@ -15,12 +14,6 @@ export default {
     ...mapMutations({
       setAuthorisationToken: 'authorisation/setAuthorisationToken',
     }),
-    ...mapActions({
-      fetchProfile: 'authorisation/fetchProfile',
-    }),
-  },
-  computed: {
-    ...mapState('authorisation', ['isAdmin']),
   },
   async created() {
     const redirectUri = this.$route.query.redirect_uri;
@@ -30,10 +23,6 @@ export default {
     if (!token) throw new Error('AuthorisationCallback::created token hash not found');
 
     this.setAuthorisationToken(token);
-    await this.fetchProfile();
-    if (this.isAdmin) {
-      this.$router.addRoutes([admin]);
-    }
     this.$router.push({ name: redirectUri });
   },
 };
diff --git a/generator/templates/Crud/src/api/endpoints/user.js b/generator/templates/Crud/src/api/endpoints/user.js
new file mode 100644
index 0000000..f909e11
--- /dev/null
+++ b/generator/templates/Crud/src/api/endpoints/user.js
@@ -0,0 +1,30 @@
+import { getPaginated } from '@/api/implementation/app/wrapper.js';
+import { destroy, get, post, put } from '@/api/implementation/app';
+
+function index(page, perPage, search, sortBy, descending, params) {
+  return getPaginated('user', page, perPage, search, sortBy, descending, params);
+}
+
+function show(id) {
+  return get(`user/${id}`);
+}
+
+function create(user) {
+  return post('user', user);
+}
+
+function update(user) {
+  return put(`user/${user.id}`, user);
+}
+
+function remove(userId) {
+  return destroy(`user/${userId}`);
+}
+
+export {
+  index,
+  show,
+  create,
+  update,
+  remove,
+};
diff --git a/generator/templates/Crud/src/views/UserResource.vue b/generator/templates/Crud/src/views/UserResource.vue
index 73e47ac..50e46eb 100644
--- a/generator/templates/Crud/src/views/UserResource.vue
+++ b/generator/templates/Crud/src/views/UserResource.vue
@@ -16,7 +16,7 @@
 
 <script lang="js">
 import Resource from '@/components/Resource.vue';
-import { create, destroy, index, show, update } from '../api/endpoints/user.js';
+import { create, remove, index, show, update } from '../api/endpoints/user.js';
 import User from '../application/models/user.js';
 
 export default {
@@ -28,7 +28,7 @@ export default {
     indexHandler: () => index,
     showHandler: () => show,
     updateHandler: () => update,
-    deleteHandler: () => destroy,
+    deleteHandler: () => remove,
     createHandler: () => create,
     modelType: () => User,
     tableContent: () => [
diff --git a/generator/templates/Default/src/application/util/translation.js b/generator/templates/Default/src/application/util/translation.js
new file mode 100644
index 0000000..ffee3b5
--- /dev/null
+++ b/generator/templates/Default/src/application/util/translation.js
@@ -0,0 +1,20 @@
+import i18n from '@/plugins/i18n.js';
+
+function translateField(field, translationPrefix) {
+  if (translationPrefix) {
+    const translationKey = `${translationPrefix}.${field}`;
+    if (translationPrefix && i18n.te(translationKey)) {
+      return i18n.t(translationKey);
+    }
+
+    if (i18n.te(field)) {
+      return i18n.t(field);
+    }
+
+    return i18n.t(translationKey);
+  }
+}
+
+export {
+  translateField,
+};
diff --git a/generator/templates/Default/src/components/crud/fields/FieldMixin.vue b/generator/templates/Default/src/components/crud/fields/FieldMixin.vue
new file mode 100644
index 0000000..9f22f69
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/FieldMixin.vue
@@ -0,0 +1,90 @@
+<script>
+import { translateField } from '@/application/util/translation.js';
+
+export default {
+  name: 'BaseField',
+  inject: {
+    fieldGroup: {
+      default: undefined,
+    },
+  },
+  props: {
+    field: {
+      required: true,
+      type: String,
+    },
+    validationField: {
+      type: String,
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+    rules: {
+      type: Array,
+      default: () => [],
+    },
+    required: {
+      type: Boolean,
+      default: false,
+    },
+    tabindex: {
+      type: [String, Number],
+    },
+    grid: {
+      type: [Object, String],
+    },
+  },
+  computed: {
+    translatedLabel() {
+      if (this.required) {
+        return `${this.computedLabel} *`;
+      }
+      return this.computedLabel;
+    },
+    computedLabel() {
+      if (this.label) {
+        return this.label;
+      }
+      if (this.fieldGroup && this.fieldGroup.languagePrefix) {
+        return translateField(this.field, this.fieldGroup.languagePrefix);
+      }
+      return this.label || this.field;
+    },
+    computedRules() {
+      const rules = [...this.rules, () => this.getServerError()];
+      if (this.required) {
+        rules.push((v) => !!v || this.$t('validation.required', { field: this.computedLabel }));
+      }
+      return rules;
+    },
+    fieldProps() {
+      if (this.fieldGroup && this.fieldGroup.computedFieldProps) {
+        return { ...this.fieldGroup.computedFieldProps, ...this.$attrs };
+      }
+      return { ...this.$attrs };
+    },
+
+  },
+  methods: {
+    getServerError() {
+      const error = this.$store.getters['error/find'](this.validationField || this.field);
+      if (error) {
+        this.removeServerError(this.field);
+        return error;
+      }
+
+      return true;
+    },
+    removeServerError(key) {
+      this.$store.commit('error/remove', key);
+    },
+  },
+};
+</script>
+<style>
+.k-field-wrapper {
+  padding: 0;
+  width:   100%;
+}
+</style>
diff --git a/generator/templates/Default/src/components/crud/fields/KAutocomplete.vue b/generator/templates/Default/src/components/crud/fields/KAutocomplete.vue
new file mode 100644
index 0000000..c5c959a
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KAutocomplete.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="k-field-wrapper" :class="this.grid">
+    <v-autocomplete :label="translatedLabel"
+                    :rules="computedRules"
+                    v-bind="fieldProps"
+                    v-on="$listeners">
+      <template v-for="(index, name) in $slots" v-slot:[name]>
+        <slot :name="name"/>
+      </template>
+    </v-autocomplete>
+  </div>
+</template>
+
+<script>
+import Field from '@/components/crud/fields/FieldMixin.vue';
+
+export default {
+  mixins: [Field],
+  name: 'KAutocomplete',
+};
+</script>
diff --git a/generator/templates/Default/src/components/crud/fields/KDateField.vue b/generator/templates/Default/src/components/crud/fields/KDateField.vue
new file mode 100644
index 0000000..d37a94d
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KDateField.vue
@@ -0,0 +1,96 @@
+<template>
+  <div :class="this.grid" class="k-field-wrapper">
+    <v-menu
+        ref="menu"
+        v-model="menu"
+        :close-on-content-click="false"
+        :return-value.sync="date"
+        min-width="290px"
+        offset-y
+        transition="scale-transition"
+    >
+      <template #activator="{ on }">
+        <v-text-field
+            ref="field"
+            v-bind="fieldProps"
+            v-on="on"
+            :label="translatedLabel"
+            :rules="computedRules"
+            :value="formattedDate"
+            readonly
+        ></v-text-field>
+      </template>
+      <v-date-picker ref="picker"
+                     :type="type"
+                     v-model="datePickerDate"
+                     no-title
+                     scrollable
+                     @change="$emit('input', $event)">
+        <v-spacer></v-spacer>
+        <v-btn color="primary" text @click="menu = false">{{ $t('actions.cancel') }}</v-btn>
+        <v-btn color="primary" text @click="$refs.menu.save(datePickerDate);$refs.field.validate()">
+          {{ $t('actions.continue') }}
+        </v-btn>
+      </v-date-picker>
+    </v-menu>
+  </div>
+</template>
+
+<script>
+import Field from '@/components/crud/fields/FieldMixin.vue';
+import dayjs from 'dayjs';
+
+export default {
+  name: 'KDateField',
+  mixins: [Field],
+  data: () => ({
+    menu: false,
+    date: '',
+    datePickerDate: '',
+  }),
+  props: {
+    value: {
+      type: String,
+    },
+    yearFirst: {
+      type: Boolean,
+      default: false,
+    },
+    type: {
+      type: String,
+    },
+    format: {
+      type: String,
+      default: 'D MMMM YYYY',
+    },
+  },
+  watch: {
+    date() {
+      this.$emit('input', this.date);
+    },
+    value() {
+      this.date = this.value;
+      this.datePickerDate = this.value;
+    },
+    menu(val) {
+      if (!this.yearFirst) return;
+      val && setTimeout(() => (this.$refs.picker.activePicker = 'YEAR'));
+    },
+  },
+  created() {
+    if (this.type === 'month') {
+      return this.date = this.value || dayjs().format('MMM YYYY');
+    }
+    this.date = this.value || dayjs().format('YYYY-MM-DD');
+  },
+  computed: {
+    formattedDate() {
+      if (!this.date) {
+        return '';
+      }
+      return dayjs(this.date).format(this.format);
+    },
+  },
+};
+</script>
+
diff --git a/generator/templates/Default/src/components/crud/fields/KFieldGroup.vue b/generator/templates/Default/src/components/crud/fields/KFieldGroup.vue
new file mode 100644
index 0000000..6a57fc6
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KFieldGroup.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="fieldgroup">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'KFieldGroup',
+  props: {
+    languagePrefix: {
+      required: false,
+      type: String,
+      default: '',
+    },
+    fieldProps: {
+      required: false,
+      type: Object,
+      default: () => {
+      },
+    },
+  },
+  provide() {
+    return {
+      fieldGroup: this,
+    };
+  },
+  computed: {
+    computedFieldProps() {
+      return {
+        filled: true,
+        validateOnBlur: true,
+        ...this.fieldProps,
+      };
+    },
+  },
+};
+</script>
diff --git a/generator/templates/Default/src/components/crud/fields/KFileField.vue b/generator/templates/Default/src/components/crud/fields/KFileField.vue
new file mode 100644
index 0000000..5420be1
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KFileField.vue
@@ -0,0 +1,97 @@
+<template>
+  <v-row :class="this.grid" class="k-field-wrapper ma-0">
+    <VFileInput
+        v-bind="fieldProps"
+        v-on="$listeners"
+        :label="translatedLabel"
+        :rules="computedRules"
+        :value="value"
+        class="pr-2"
+    />
+    <div class="file-preview d-flex justify-center mb-2">
+      <v-icon v-if="!preview" :size="40">{{ icon }}</v-icon>
+      <VImg v-else :src="preview"/>
+    </div>
+  </v-row>
+</template>
+
+<script>
+import Field from '@/components/crud/fields/FieldMixin.vue';
+
+export default {
+  name: 'KFileField',
+  mixins: [Field],
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    value: {
+      type: [Object, File],
+    },
+  },
+  data: () => ({
+    preview: '',
+    previewType: '',
+  }),
+  watch: {
+    value: {
+      immediate: true,
+      handler(value) {
+        this.fetchPreview(value);
+      },
+    },
+  },
+  computed: {
+    icon() {
+      if (!this.previewType) {
+        return 'fa-upload';
+      }
+      return this.getIconByType(this.previewType);
+    },
+  },
+  methods: {
+    fetchPreview(file) {
+      if (!file || !file.type) {
+        this.preview = '';
+        this.previewType = '';
+        return;
+      }
+      if (file.type.match('image.*')) {
+        if (file instanceof Blob) {
+          const reader = new FileReader();
+          reader.addEventListener('load', () => {
+            this.preview = reader.result;
+            this.previewType = '';
+          }, false);
+          reader.readAsDataURL(file);
+          return;
+        }
+        this.preview = file.url;
+        return;
+      }
+      this.preview = '';
+      this.previewType = file.type;
+    },
+    getIconByType(type) {
+      if (type.match('video/*')) {
+        return 'fa-file-video';
+      } else if (type === 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' || type === 'application/msword') {
+        return 'fa-file-word';
+      } else if (type === 'application/pdf') {
+        return 'fa-file-pdf';
+      }
+      return 'fa-file';
+    },
+  },
+};
+</script>
+
+<style scoped>
+.file-preview {
+  border:   1px solid;
+  height:   100px;
+  overflow: hidden;
+  width:    100px;
+}
+</style>
diff --git a/generator/templates/Default/src/components/crud/fields/KPaginatedAutocomplete.vue b/generator/templates/Default/src/components/crud/fields/KPaginatedAutocomplete.vue
new file mode 100644
index 0000000..34a8fe9
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KPaginatedAutocomplete.vue
@@ -0,0 +1,129 @@
+<template>
+  <k-autocomplete v-bind="computedAttributes"
+                  v-on="$listeners"
+                  :field="field"
+                  :items="items"
+                  :loading="isLoading"
+                  :search-input.sync="search"
+                  :value="value"
+                  no-filter
+                  return-object
+  >
+    <template v-if="lastPage > page" #append-item>
+      <v-list-item>
+        <v-btn text @click="loadMore">{{ $t('actions.loadMore') }}</v-btn>
+      </v-list-item>
+    </template>
+    <template #no-data>
+      <v-list-item v-if="isLoading">
+        {{ $vuetify.lang.t('$vuetify.dataIterator.loadingText') }}
+      </v-list-item>
+      <v-list-item v-else>
+        {{ $vuetify.lang.t('$vuetify.dataIterator.noResultsText') }}
+      </v-list-item>
+    </template>
+  </k-autocomplete>
+</template>
+
+<script>
+import KAutocomplete from '@/components/crud/fields/KAutocomplete.vue';
+
+/**
+ * @TODO at this moment filtering is turned off, when this is activated vuetify filteres based on the item text.
+ * But then the result is double filtered and items witch advanced filtering from the API won't appear.
+ * When it is enabled (which can't be done) vuetify doesn't show selected items that don't correspond to the search term.
+ * When we would remove these from the items, they are no longer visible as a value in the autocomplete itself
+ * The only thing we could do is create a custom filter that excludes items that are already selected, but then all
+ * selected items are hidden including the ones which do correspond to the filter.
+ */
+export default {
+  name: 'KPaginatedAutocomplete',
+  components: { KAutocomplete },
+  props: {
+    field: {
+      type: String,
+      required: true,
+    },
+    paginator: {
+      type: Function,
+      required: true,
+    },
+    value: {
+      type: [Array, Object],
+      required: false,
+    },
+  },
+  watch: {
+    search() {
+      this.handleInitialFetch();
+    },
+  },
+  data() {
+    return {
+      items: [],
+      page: 1,
+      lastPage: 1,
+      perPage: 25,
+      search: '', //autocomplete search value
+      searchParameter: '', //the value that will be send to the API
+      timeout: 0,
+      isLoading: false,
+    };
+  },
+  created() {
+    this.handleInitialFetch();
+  },
+  computed: {
+    /**
+     * All attribute that need to be passed to the KAutocomplete.
+     * All the values inside this object are overwriteable so only add props here that may be overwritten!
+     * @returns Object
+     */
+    computedAttributes() {
+      return {
+        itemText: 'name',
+        chips: !!this.$attrs.multiple,
+        deletableChips: !!this.$attrs.multiple,
+        ...this.$attrs,
+      };
+    },
+    valuesAsArray() {
+      if (!this.value) {
+        return [];
+      }
+      return Array.isArray(this.value) ? this.value : [this.value];
+    },
+  },
+  methods: {
+    async getPaginator() {
+      const excludeIds = this.valuesAsArray.map((item) => item.id);
+      this.isLoading = true;
+      const result = await this.paginator(this.page, this.perPage, this.searchParameter, undefined, undefined, { exclude: excludeIds });
+      this.lastPage = result.data.meta.lastPage;
+      this.isLoading = false;
+      return result.data.data;
+    },
+    async loadMore() {
+      this.page++;
+      const result = await this.getPaginator();
+      this.items = [...this.items, ...result];
+    },
+    async handleInitialFetch() {
+      clearTimeout(this.timeout);
+      this.timeout = setTimeout(async () => {
+        if (this.value && this.search === this.value[this.computedAttributes.itemText]) {
+          return;
+        }
+        this.searchParameter = this.search;
+        this.page = 1;
+        this.items = [...this.valuesAsArray];
+        const result = await this.getPaginator();
+        this.items = [...this.items, ...result];
+      }, 200);
+    },
+    refresh() {
+      this.handleInitialFetch();
+    },
+  },
+};
+</script>
diff --git a/generator/templates/Default/src/components/crud/fields/KRadioGroup.vue b/generator/templates/Default/src/components/crud/fields/KRadioGroup.vue
new file mode 100644
index 0000000..d1cf11a
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KRadioGroup.vue
@@ -0,0 +1,34 @@
+<template>
+  <div :class="this.grid" class="k-field-wrapper">
+    <v-radio-group v-bind="fieldProps"
+                   v-on="$listeners"
+                   :label="translatedLabel"
+                   :rules="computedRules">
+      <VRadio
+          v-for="(radio, index) in items"
+          :key="index"
+          :label="radio.text"
+          :value="radio.value"
+      />
+    </v-radio-group>
+  </div>
+</template>
+
+<script>
+import Field from '@/components/crud/fields/FieldMixin.vue';
+
+export default {
+  name: 'KRadioGroup',
+  mixins: [Field],
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    items: {
+      type: Array,
+      default: () => [],
+    },
+  },
+};
+</script>
diff --git a/generator/templates/Default/src/components/crud/fields/KSelect.vue b/generator/templates/Default/src/components/crud/fields/KSelect.vue
new file mode 100644
index 0000000..15d3f9b
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KSelect.vue
@@ -0,0 +1,21 @@
+<template>
+  <div :class="this.grid" class="k-field-wrapper">
+    <v-select :label="translatedLabel"
+              :rules="computedRules"
+              v-bind="fieldProps"
+              v-on="$listeners">
+      <template v-for="(_, name) in $slots" v-slot:[name]>
+        <slot :name="name"/>
+      </template>
+    </v-select>
+  </div>
+</template>
+
+<script>
+import Field from '@/components/crud/fields/FieldMixin.vue';
+
+export default {
+  name: 'KSelect',
+  mixins: [Field],
+};
+</script>
diff --git a/generator/templates/Default/src/components/crud/fields/KTextField.vue b/generator/templates/Default/src/components/crud/fields/KTextField.vue
new file mode 100644
index 0000000..0302bb8
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KTextField.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="k-field-wrapper" :class="this.grid">
+    <v-text-field :label="translatedLabel"
+                  :rules="computedRules"
+                  v-bind="fieldProps"
+                  v-on="$listeners">
+      <template v-for="(_, name) in $slots" v-slot:[name]>
+        <slot :name="name"/>
+      </template>
+    </v-text-field>
+  </div>
+</template>
+
+<script>
+import Field from '@/components/crud/fields/FieldMixin.vue';
+
+export default {
+  mixins: [Field],
+  name: 'KTextField',
+};
+</script>
diff --git a/generator/templates/Default/src/components/crud/fields/KTextarea.vue b/generator/templates/Default/src/components/crud/fields/KTextarea.vue
new file mode 100644
index 0000000..4893ef4
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KTextarea.vue
@@ -0,0 +1,17 @@
+<template>
+  <div class="k-field-wrapper" :class="this.grid">
+    <VTextarea :label="translatedLabel"
+               :rules="computedRules"
+               v-bind="fieldProps"
+               v-on="$listeners"/>
+  </div>
+</template>
+
+<script>
+import Field from '@/components/crud/fields/FieldMixin.vue';
+
+export default {
+  mixins: [Field],
+  name: 'KTextarea',
+};
+</script>
diff --git a/generator/templates/Default/src/components/crud/fields/KTimeField.vue b/generator/templates/Default/src/components/crud/fields/KTimeField.vue
new file mode 100644
index 0000000..6f06f11
--- /dev/null
+++ b/generator/templates/Default/src/components/crud/fields/KTimeField.vue
@@ -0,0 +1,87 @@
+<template>
+  <div :class="this.grid" class="k-field-wrapper">
+    <v-menu
+        ref="menu"
+        v-model="menu"
+        :close-on-content-click="false"
+        :return-value.sync="time"
+        max-width="290px"
+        min-width="290px"
+        offset-y
+        transition="scale-transition"
+    >
+      <template #activator="{ on }">
+        <v-text-field
+            ref="field"
+            v-bind="fieldProps"
+            v-on="on"
+            :label="translatedLabel"
+            :rules="computedRules"
+            :value="formattedTime"
+            readonly
+        ></v-text-field>
+      </template>
+      <v-time-picker
+          format="24hr"
+          scrollable
+          no-title
+          v-if="menu"
+          v-model="timePickerTime"
+          @change="$emit('input', $event)"
+          max-width="290px"
+          min-width="290px"
+      >
+        <v-spacer></v-spacer>
+        <v-btn color="primary" text @click="menu = false">{{ $t('actions.cancel') }}</v-btn>
+        <v-btn color="primary" text @click="$refs.menu.save(timePickerTime);$refs.field.validate()">
+          {{ $t('actions.continue') }}
+        </v-btn>
+      </v-time-picker>
+    </v-menu>
+  </div>
+</template>
+
+<script>
+import Field from '@/components/crud/fields/FieldMixin.vue';
+import dayjs from 'dayjs';
+
+export default {
+  name: 'KTimeField',
+  mixins: [Field],
+  data: () => ({
+    menu: false,
+    time: '',
+    timePickerTime: '',
+  }),
+  props: {
+    value: {
+      type: String,
+      default: dayjs().format('HH:mm'),
+    },
+    format: {
+      type: String,
+      default: 'HH:MM',
+    },
+  },
+  watch: {
+    time() {
+      this.$emit('input', this.time);
+    },
+    value() {
+      this.time = this.value;
+      this.timePickerTime = this.value;
+    },
+  },
+  created() {
+    this.time = this.value || dayjs().format('HH:mm');
+  },
+  computed: {
+    formattedTime() {
+      if (!this.time) {
+        return '';
+      }
+      return dayjs(`1970-00-00T${this.time}`).format(this.format);
+    },
+  },
+};
+</script>
diff --git a/generator/templates/Default/src/newmain.js b/generator/templates/Default/src/newmain.js
index 93eb674..24bdd62 100644
--- a/generator/templates/Default/src/newmain.js
+++ b/generator/templates/Default/src/newmain.js
@@ -1,6 +1,6 @@
 import '@babel/polyfill'
 import Vue from 'vue'
-import {vuetify} from './plugins';
+import { i18n, vuetify } from './plugins';
 <%_ if (options.useCrud) { _%>
 import VuetifyResource from '@kingscode/vuetify-resource';
 <%_ } _%>
@@ -22,6 +22,7 @@ Vue.config.productionTip = false;
 new Vue({
     router,
     vuetify,
+    i18n,
 <%_ if (options.useAuthorisation) { _%>
     store,
 <%_ } _%>
diff --git a/generator/templates/Default/src/plugins/index.js b/generator/templates/Default/src/plugins/index.js
index 0932732..4d6d2d3 100644
--- a/generator/templates/Default/src/plugins/index.js
+++ b/generator/templates/Default/src/plugins/index.js
@@ -5,8 +5,12 @@ import './analytics';
 <%_ if (options.plugins.includes('sentry')) { _%>
 import './sentry';
 <%_ } _%>
+import i18n from './i18n';
 import vuetify from './vuetify';
 
 cssVars();
 
-export {vuetify};
+export {
+  i18n, vuetify,
+};
+
diff --git a/generator/templates/Default/src/router/index.js b/generator/templates/Default/src/router/index.js
index 36cf412..64a1553 100644
--- a/generator/templates/Default/src/router/index.js
+++ b/generator/templates/Default/src/router/index.js
@@ -8,6 +8,10 @@ import authorised from './routes/authorised.js';
 Vue.use(Router);
 
 const routes = [
+  {
+    path: '',
+    redirect: { name: 'home' },
+  },
 <%_ if (options.useAuthorisation) { _%>
   authorisation,
 <%_ } _%>
diff --git a/generator/templates/Default/src/store/modules/error.js b/generator/templates/Default/src/store/modules/error.js
index d7e8a96..2dec0f9 100644
--- a/generator/templates/Default/src/store/modules/error.js
+++ b/generator/templates/Default/src/store/modules/error.js
@@ -4,28 +4,31 @@ export default {
     errors: [],
   },
   mutations: {
-    remove: (state, key) => state.errors.splice(state.errors.findIndex(x => x.key === key), 1),
-    clear: state => state.errors = [],
+    remove: (state, key) => state.errors.splice(state.errors.findIndex((x) => x.key === key), 1),
+    clear: (state) => {
+      state.errors = [];
+    },
     add: (state, { message, key }) => {
-      const target = state.errors.find(x => x.key === key);
+      const target = state.errors.find((x) => x.key === key);
 
       if (!target) {
         return state.errors.push({
-          key: key,
-          message: message,
+          key,
+          message,
         });
       }
 
       target.message = message;
+      return state.errors;
     },
   },
   getters: {
-    find: state => key => {
-      const error = state.errors.find(x => x.key === key);
+    find: (state) => (key) => {
+      const error = state.errors.find((x) => x.key === key);
 
       return error ? error.message : '';
     },
-    first: state => {
+    first: (state) => {
       if (!state.errors.length) {
         return '';
       }

From f596149327768e810e41ccc226d1f82c3a0dfd74 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Wed, 21 Oct 2020 17:21:23 +0200
Subject: [PATCH 10/21] wip

---
 .../Crud/src/components/forms/UserForm.vue    | 50 +++++++++----------
 .../templates/Crud/src/locales/nl/user.json   |  7 +++
 .../templates/Crud/src/views/UserResource.vue | 34 +++++++------
 .../components/crud/fields/KFieldGroup.vue    |  1 -
 .../Default/src/components/menu/Menu.vue      |  2 +-
 5 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 generator/templates/Crud/src/locales/nl/user.json

diff --git a/generator/templates/Crud/src/components/forms/UserForm.vue b/generator/templates/Crud/src/components/forms/UserForm.vue
index c0dcbef..63bb285 100644
--- a/generator/templates/Crud/src/components/forms/UserForm.vue
+++ b/generator/templates/Crud/src/components/forms/UserForm.vue
@@ -1,37 +1,33 @@
 <template>
-    <v-container>
-        <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>
-                    <v-card-text>
-                        <VTextField
-                            :counter="100"
-                            :rules="[(v) => !!v || 'Naam is verplicht', () => serverError('name'), (v) => !!v && v.length <= 100 || 'de naam mag maximaal 100 tekens bevatten']"
-                            label="Naam"
-                            v-model="values.name"/>
-                        <VTextField
-                            :counter="150"
-                            :rules="[(v) => !!v || 'E-mail is verplicht', () => serverError('email'), (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"
-                            v-model="values.email"/>
-                    </v-card-text>
-                </v-card>
-            </v-col>
-        </v-form>
-    </v-container>
+  <v-container>
+    <v-form ref="form" v-model="valid" class="mt-5">
+      <k-field-group language-prefix="user.fields">
+        <v-col cols="12" lg="6" md="8" offset-lg="3" offset-md="2" offset-sm="1" sm="10">
+          <v-subheader class="pa-0">Gebruiker</v-subheader>
+          <v-card>
+            <v-card-text>
+              <KTextField v-model="values.name" field="name" required/>
+              <KTextField v-model="values.email" field="email" required/>
+            </v-card-text>
+          </v-card>
+        </v-col>
+      </k-field-group>
+    </v-form>
+  </v-container>
 </template>
 
 <script lang="js">
+import KFieldGroup from '@/components/crud/fields/KFieldGroup.vue';
+import KTextField from '@/components/crud/fields/KTextField.vue';
 import Form from '@/components/VuetifyResourceBaseForm.vue';
 import User from '../../application/models/user.js';
 
 export default {
-    name: 'UserForm',
-    extends: Form,
-    data: () => ({
-        values: new User(),
-    }),
+  name: 'UserForm',
+  components: { KTextField, KFieldGroup },
+  extends: Form,
+  data: () => ({
+    values: new User(),
+  }),
 };
 </script>
diff --git a/generator/templates/Crud/src/locales/nl/user.json b/generator/templates/Crud/src/locales/nl/user.json
new file mode 100644
index 0000000..14108fe
--- /dev/null
+++ b/generator/templates/Crud/src/locales/nl/user.json
@@ -0,0 +1,7 @@
+{
+    "title": "Gebruiker|Gebruikers",
+    "fields": {
+        "name": "Naam",
+        "email": "E-mail"
+    }
+}
diff --git a/generator/templates/Crud/src/views/UserResource.vue b/generator/templates/Crud/src/views/UserResource.vue
index 50e46eb..0cadacc 100644
--- a/generator/templates/Crud/src/views/UserResource.vue
+++ b/generator/templates/Crud/src/views/UserResource.vue
@@ -5,7 +5,7 @@
         :delete-request="deleteHandler"
         :form-component="() => import('../components/forms/UserForm.vue')"
         :index-request="indexHandler"
-        :meta="{name: 'gebruiker', namePlural: 'gebruikers'}"
+        :meta="{name: $tc('user.title', 1), namePlural: $tc('user.title', 2)}"
         :model-type="modelType"
         :show-request="showHandler"
         :table-content="tableContent"
@@ -16,7 +16,7 @@
 
 <script lang="js">
 import Resource from '@/components/Resource.vue';
-import { create, remove, index, show, update } from '../api/endpoints/user.js';
+import { create, index, remove, show, update } from '../api/endpoints/user.js';
 import User from '../application/models/user.js';
 
 export default {
@@ -31,20 +31,22 @@ export default {
     deleteHandler: () => remove,
     createHandler: () => create,
     modelType: () => User,
-    tableContent: () => [
-      {
-        text: 'Naam',
-        align: 'left',
-        sortable: true,
-        value: 'name',
-      },
-      {
-        text: 'E-mail',
-        align: 'left',
-        sortable: true,
-        value: 'email',
-      },
-    ],
+    tableContent() {
+      return [
+        {
+          text: this.$t('user.fields.name'),
+          align: 'left',
+          sortable: true,
+          value: 'name',
+        },
+        {
+          text: this.$t('user.fields.email'),
+          align: 'left',
+          sortable: true,
+          value: 'email',
+        },
+      ];
+    },
   },
 };
 </script>
diff --git a/generator/templates/Default/src/components/crud/fields/KFieldGroup.vue b/generator/templates/Default/src/components/crud/fields/KFieldGroup.vue
index 6a57fc6..ef4f203 100644
--- a/generator/templates/Default/src/components/crud/fields/KFieldGroup.vue
+++ b/generator/templates/Default/src/components/crud/fields/KFieldGroup.vue
@@ -28,7 +28,6 @@ export default {
   computed: {
     computedFieldProps() {
       return {
-        filled: true,
         validateOnBlur: true,
         ...this.fieldProps,
       };
diff --git a/generator/templates/Default/src/components/menu/Menu.vue b/generator/templates/Default/src/components/menu/Menu.vue
index 74fd5c0..d8ede5a 100644
--- a/generator/templates/Default/src/components/menu/Menu.vue
+++ b/generator/templates/Default/src/components/menu/Menu.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-list>
+  <v-list nav>
     <div :key="item.title" v-for="item in items">
       <v-list-item-group
           :disabled="item.disabled"

From 99c39bddc41a8644629aa215a6ed5045c4be3443 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 10:31:34 +0200
Subject: [PATCH 11/21] update version

---
 generator/templates/Crud/src/components/forms/UserForm.vue | 5 ++++-
 package.json                                               | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/generator/templates/Crud/src/components/forms/UserForm.vue b/generator/templates/Crud/src/components/forms/UserForm.vue
index 63bb285..d20dfa1 100644
--- a/generator/templates/Crud/src/components/forms/UserForm.vue
+++ b/generator/templates/Crud/src/components/forms/UserForm.vue
@@ -24,7 +24,10 @@ import User from '../../application/models/user.js';
 
 export default {
   name: 'UserForm',
-  components: { KTextField, KFieldGroup },
+  components: {
+    KTextField,
+    KFieldGroup,
+  },
   extends: Form,
   data: () => ({
     values: new User(),
diff --git a/package.json b/package.json
index 4c01e1d..616f9dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vue-cli-plugin-kingscode-scaffold",
-    "version": "0.9.0",
+    "version": "0.10.0",
     "description": "",
     "main": "index.js",
     "scripts": {

From f2bfcae6efcaff4deca0505107caab240fa93d05 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 11:14:22 +0200
Subject: [PATCH 12/21] Add Breadcrumbs and remove baseform

---
 .../Crud/src/components/Resource.vue          |  70 +++++----
 .../components/VuetifyResourceBaseForm.vue    |   2 -
 .../templates/Crud/src/views/UserResource.vue |  15 ++
 .../Default/src/components/BaseForm.vue       |  58 --------
 .../Default/src/components/Breadcrumbs.vue    |  27 ++++
 .../src/components/PaginatedAutocomplete.vue  | 138 ------------------
 generator/templates/Default/src/eventBus.js   |   4 +
 .../Default/src/locales/nl/global.json        |   3 +
 .../Default/src/templates/Default.vue         |   7 +-
 .../templates/Default/src/views/Home.vue      |  15 +-
 10 files changed, 101 insertions(+), 238 deletions(-)
 delete mode 100644 generator/templates/Default/src/components/BaseForm.vue
 create mode 100644 generator/templates/Default/src/components/Breadcrumbs.vue
 delete mode 100644 generator/templates/Default/src/components/PaginatedAutocomplete.vue
 create mode 100644 generator/templates/Default/src/eventBus.js
 create mode 100644 generator/templates/Default/src/locales/nl/global.json

diff --git a/generator/templates/Crud/src/components/Resource.vue b/generator/templates/Crud/src/components/Resource.vue
index 7f04c5d..da89953 100644
--- a/generator/templates/Crud/src/components/Resource.vue
+++ b/generator/templates/Crud/src/components/Resource.vue
@@ -1,40 +1,38 @@
 <template>
-  <v-container fluid>
-    <vuetify-resource
-        :beforeCreateCallback="beforeOpenCreateHandler"
-        :beforeUpdateCallback="beforeOpenUpdateHandler"
-        :createCallback="handleCreateRequest"
-        :deleteCallback="handleDeleteRequest"
-        :getDataCallback="handleIndexRequest"
-        :getItemCallback="handleShowRequest"
-        :meta="meta"
-        :tableContent="tableContent"
-        :texts="require('../VuetifyResourceTexts.js').default"
-        :updateCallback="handleUpdateRequest"
-        @row-click="onRowClick"
-        ref="resourceList"
-        v-bind="$attrs"
-        v-model="selected"
-    >
-      <div slot="createContent">
-        <component :errors="errors"
-                   :is="formComponent"
-                   :is-update-form="false"
-                   ref="createForm"
-                   v-model="createForm"/>
-      </div>
-      <div slot="updateContent">
-        <component :errors="errors"
-                   :is="formComponent"
-                   :is-update-form="true"
-                   ref="updateForm"
-                   v-model="updateForm"/>
-      </div>
-      <template v-slot:crudActionsAfter="slotProps">
-        <slot name="crudActionsAfter" v-bind="slotProps"></slot>
-      </template>
-    </vuetify-resource>
-  </v-container>
+  <vuetify-resource
+      ref="resourceList"
+      v-model="selected"
+      v-bind="$attrs"
+      :beforeCreateCallback="beforeOpenCreateHandler"
+      :beforeUpdateCallback="beforeOpenUpdateHandler"
+      :createCallback="handleCreateRequest"
+      :deleteCallback="handleDeleteRequest"
+      :getDataCallback="handleIndexRequest"
+      :getItemCallback="handleShowRequest"
+      :meta="meta"
+      :tableContent="tableContent"
+      :texts="require('../VuetifyResourceTexts.js').default"
+      :updateCallback="handleUpdateRequest"
+      @row-click="onRowClick"
+  >
+    <div slot="createContent">
+      <component :is="formComponent"
+                 ref="createForm"
+                 v-model="createForm"
+                 :errors="errors"
+                 :is-update-form="false"/>
+    </div>
+    <div slot="updateContent">
+      <component :is="formComponent"
+                 ref="updateForm"
+                 v-model="updateForm"
+                 :errors="errors"
+                 :is-update-form="true"/>
+    </div>
+    <template v-slot:crudActionsAfter="slotProps">
+      <slot v-bind="slotProps" name="crudActionsAfter"></slot>
+    </template>
+  </vuetify-resource>
 </template>
 
 <script>
diff --git a/generator/templates/Crud/src/components/VuetifyResourceBaseForm.vue b/generator/templates/Crud/src/components/VuetifyResourceBaseForm.vue
index 8f67d1f..5e3c0cf 100644
--- a/generator/templates/Crud/src/components/VuetifyResourceBaseForm.vue
+++ b/generator/templates/Crud/src/components/VuetifyResourceBaseForm.vue
@@ -1,9 +1,7 @@
 <script>
-import BaseForm from '@/components/BaseForm.vue';
 
 export default {
   name: 'Form',
-  extends: BaseForm,
   props: {
     value: {
       default() {
diff --git a/generator/templates/Crud/src/views/UserResource.vue b/generator/templates/Crud/src/views/UserResource.vue
index 0cadacc..811bea5 100644
--- a/generator/templates/Crud/src/views/UserResource.vue
+++ b/generator/templates/Crud/src/views/UserResource.vue
@@ -16,6 +16,7 @@
 
 <script lang="js">
 import Resource from '@/components/Resource.vue';
+import eventBus from '@/eventBus.js';
 import { create, index, remove, show, update } from '../api/endpoints/user.js';
 import User from '../application/models/user.js';
 
@@ -48,5 +49,19 @@ export default {
       ];
     },
   },
+  created() {
+    eventBus.$emit('setBreadcrumbs', [
+      {
+        exact: true,
+        to: { name: 'home' },
+        text: this.$t('global.dashboard'),
+      },
+      {
+        exact: true,
+        to: { name: 'users' },
+        text: this.$tc('user.title', 2),
+      },
+    ]);
+  }
 };
 </script>
diff --git a/generator/templates/Default/src/components/BaseForm.vue b/generator/templates/Default/src/components/BaseForm.vue
deleted file mode 100644
index 87beb3f..0000000
--- a/generator/templates/Default/src/components/BaseForm.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<script>
-import { mapGetters, mapMutations } from 'vuex';
-
-export default {
-  name: 'Form',
-  props: {
-    errors: {
-      default: () => {
-      },
-      type: Object,
-    },
-  },
-  computed: {
-    ...mapGetters({
-      findError: 'error/find',
-    }),
-  },
-  watch: {
-    errors: {
-      handler() {
-        this.validate();
-      },
-      deep: true,
-    },
-  },
-  data() {
-    return {
-      valid: false,
-    };
-  },
-  methods: {
-    ...mapMutations({
-      removeError: 'error/remove',
-    }),
-    validate() {
-      this.$refs.form.validate();
-    },
-    clear() {
-      this.$refs.form.reset();
-    },
-    /* Should only be used for Vuetify rules */
-    serverError(key) {
-      const error = this.findError(key);
-
-      if (error) {
-        this.removeServerError(key);
-
-        return error;
-      }
-
-      return true;
-    },
-    removeServerError(key) {
-      this.removeError(key);
-    },
-  },
-};
-</script>
diff --git a/generator/templates/Default/src/components/Breadcrumbs.vue b/generator/templates/Default/src/components/Breadcrumbs.vue
new file mode 100644
index 0000000..0a290bb
--- /dev/null
+++ b/generator/templates/Default/src/components/Breadcrumbs.vue
@@ -0,0 +1,27 @@
+<template>
+  <VBreadcrumbs :class="breadcrumbsClass" :items="breadcrumbs" class="py-1 pl-0"/>
+</template>
+
+<script>
+import eventBus from '../eventBus';
+
+export default {
+  name: 'Breadcrumbs',
+  data() {
+    return {
+      breadcrumbs: [],
+      placeholders: {},
+    };
+  },
+  computed: {
+    breadcrumbsClass() {
+      return this.$vuetify.theme.dark ? 'dark' : 'light';
+    },
+  },
+  created() {
+    eventBus.$on('setBreadcrumbs', (breadcrumbs) => {
+      this.breadcrumbs = breadcrumbs;
+    });
+  },
+};
+</script>
diff --git a/generator/templates/Default/src/components/PaginatedAutocomplete.vue b/generator/templates/Default/src/components/PaginatedAutocomplete.vue
deleted file mode 100644
index 1dc3ed3..0000000
--- a/generator/templates/Default/src/components/PaginatedAutocomplete.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <v-autocomplete :items="items"
-                  :loading="isLoading"
-                  :search-input.sync="searchInput"
-                  :value="$attrs.value"
-                  @change="handleChange"
-                  v-bind="$attrs"
-                  v-if="enabled"
-  >
-    <template v-slot:append-item>
-      <v-flex class="text-center" v-if="canLoadMoreItems">
-        <v-btn @click="getItemsFromApi(page + 1)" color="accent">Meer laden</v-btn>
-      </v-flex>
-    </template>
-  </v-autocomplete>
-</template>
-
-<script lang="js">
-import axios from '../api/implementation/app';
-
-export default {
-  name: 'PaginatedAutocomplete',
-  data() {
-    return {
-      items: [],
-      page: 1,
-      lastPage: 1,
-      searchInput: '',
-      isLoading: true,
-    };
-  },
-  props: {
-    pagination: {
-      type: Object,
-      default() {
-        return {
-          url: '',
-          perPage: 15,
-        };
-      },
-    },
-  },
-  watch: {
-    searchInput() {
-      const selectedItemsText = this.items.filter(item => item.id === this.$attrs.value)[0][this.$attrs['item-text']];
-
-      if (selectedItemsText !== this.searchInput) {
-        this.getItemsFromApi(this.page, this.searchInput);
-      }
-    },
-    '$attrs.value': {
-      handler() {
-        this.loadSelectedItemsIfTheyNotExist();
-      },
-      deep: false,
-    },
-  },
-  computed: {
-    canLoadMoreItems: vm => vm.page < vm.lastPage,
-    selectedIds: vm => {
-      const value = vm.$attrs.value;
-
-      if (!value) return [];
-
-      return Array.isArray(value) ? value : [value];
-    },
-  },
-  created() {
-    this.reload();
-  },
-  methods: {
-    getItemsFromApi(page, searchInput) {
-      this.isLoading = true;
-
-      axios.get(`${this.pagination.url}?perPage=${this.pagination.perPage}page=${page}&q=${searchInput}`)
-          .then(response => {
-            const axiosData = response.data;
-
-            axiosData.data = response.data.data.map(obj => this.mapItems(obj));
-            this.items = [...this.items, ...axiosData.data];
-
-            const meta = axiosData.meta;
-            this.page = meta.currentPage;
-            this.lastPage = meta.lastPage;
-          })
-          .finally(() => this.isLoading = false);
-    },
-    getSelectedItems() {
-      const ids = this.selectedIds;
-
-      if (!ids.length) return;
-
-      this.isLoading = true;
-
-      axios.get(`${this.pagination.url}?only=${ids.join()}&perPage=${ids.length}`)
-          .then(response => {
-            const axiosData = response.data;
-
-            axiosData.data = axiosData.data.map(obj => this.mapItems(obj));
-            this.items = [...this.items, ...axiosData.data];
-          })
-          .finally(() => this.isLoading = false);
-    },
-    handleChange(value) {
-      this.$emit('input', value);
-    },
-    mapItems(obj) {
-      const itemText = this.$attrs['item-text'];
-      const itemValue = this.$attrs['item-value'];
-
-      return {
-        [itemText]: obj[itemText],
-        [itemValue]: obj[itemValue],
-      };
-    },
-    reload() {
-      this.items = [];
-      this.getSelectedItems();
-      this.getItemsFromApi(1);
-    },
-    loadSelectedItemsIfTheyNotExist() {
-      const ids = this.selectedIds;
-
-      if (!ids.length) return;
-
-      ids.forEach(value => {
-        const item = this.items.find(item => item.id === value);
-
-        if (!item) this.getSelectedItems();
-      });
-    },
-  },
-};
-</script>
-
-<style scoped>
-
-</style>
diff --git a/generator/templates/Default/src/eventBus.js b/generator/templates/Default/src/eventBus.js
new file mode 100644
index 0000000..1866700
--- /dev/null
+++ b/generator/templates/Default/src/eventBus.js
@@ -0,0 +1,4 @@
+import Vue from 'vue';
+
+const EventBus = new Vue();
+export default EventBus;
diff --git a/generator/templates/Default/src/locales/nl/global.json b/generator/templates/Default/src/locales/nl/global.json
new file mode 100644
index 0000000..83a774c
--- /dev/null
+++ b/generator/templates/Default/src/locales/nl/global.json
@@ -0,0 +1,3 @@
+{
+    "dashboard": "Dashboard"
+}
diff --git a/generator/templates/Default/src/templates/Default.vue b/generator/templates/Default/src/templates/Default.vue
index fba544f..9e6727f 100644
--- a/generator/templates/Default/src/templates/Default.vue
+++ b/generator/templates/Default/src/templates/Default.vue
@@ -1,9 +1,9 @@
 <template>
   <div v-if="isLoggedIn">
     <v-navigation-drawer
+        v-model="isMenuOpen"
         app
         fixed
-        v-model="isMenuOpen"
     >
       <router-link :to="{name: 'home'}">
         <img :src="require('../assets/logo.png')" class="logo">
@@ -18,6 +18,9 @@
       <AppBarMenu/>
     </v-app-bar>
     <v-main>
+      <v-row class="ma-3 mb-0">
+        <Breadcrumbs class="breadcrumbs"/>
+      </v-row>
       <router-view/>
     </v-main>
     <v-footer app color="primary" inset>
@@ -27,9 +30,9 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
 import AppBarMenu from '@/components/AppBarMenu.vue';
 import TheMainMenu from '@/components/menu/TheMainMenu.vue';
+import { mapGetters } from 'vuex';
 
 export default {
   name: 'Default',
diff --git a/generator/templates/Default/src/views/Home.vue b/generator/templates/Default/src/views/Home.vue
index 3ab6210..f0807a3 100644
--- a/generator/templates/Default/src/views/Home.vue
+++ b/generator/templates/Default/src/views/Home.vue
@@ -1,12 +1,23 @@
 <template>
-  <div>
+  <v-container>
     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>
+  </v-container>
 </template>
 
 <script lang="js">
+import eventBus from '@/eventBus.js';
+
 export default {
   name: 'Home',
+  created() {
+    eventBus.$emit('setBreadcrumbs', [
+      {
+        exact: true,
+        to: { name: 'home' },
+        text: this.$t('global.dashboard'),
+      },
+    ]);
+  },
 };
 </script>

From edce257f368bc8032a346ad5248443db83df1595 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 11:30:30 +0200
Subject: [PATCH 13/21] update readme

---
 README.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3b55e54..554532c 100644
--- a/README.md
+++ b/README.md
@@ -35,12 +35,7 @@ And then:
 The rest doesn't matter.
 
 ### Vuetify
-Configure:
-- Pre made templates will be overwritten, so keep it default
-- Custom properties
-- Font awesome 5 (this will be overwritten with font awesome pro)
-- Use a-la-carte components
-- Locale will be overwritten to dutch as default
+Choose recommended
 
 ### Kingscode scaffold
 This is our own scaffold, which you can use with our laravel API you can answer the questions

From 659e01518bcde91777df6586a06b5b584d9dc48d Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 11:30:40 +0200
Subject: [PATCH 14/21] hotfix for breadcrumbs

---
 generator/templates/Default/src/templates/Default.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/generator/templates/Default/src/templates/Default.vue b/generator/templates/Default/src/templates/Default.vue
index 9e6727f..a0a9fb1 100644
--- a/generator/templates/Default/src/templates/Default.vue
+++ b/generator/templates/Default/src/templates/Default.vue
@@ -33,10 +33,12 @@
 import AppBarMenu from '@/components/AppBarMenu.vue';
 import TheMainMenu from '@/components/menu/TheMainMenu.vue';
 import { mapGetters } from 'vuex';
+import Breadcrumbs from '@/components/Breadcrumbs.vue';
 
 export default {
   name: 'Default',
   components: {
+    Breadcrumbs,
     AppBarMenu,
     TheMainMenu,
   },

From c9ae5c8bf28189bfc877fa104223c47e0b05351a Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 11:30:46 +0200
Subject: [PATCH 15/21] remove unused mixin

---
 .../templates/Crud/src/mixins/formDataValues.js | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 generator/templates/Crud/src/mixins/formDataValues.js

diff --git a/generator/templates/Crud/src/mixins/formDataValues.js b/generator/templates/Crud/src/mixins/formDataValues.js
deleted file mode 100644
index 4376d0a..0000000
--- a/generator/templates/Crud/src/mixins/formDataValues.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export default {
-  methods: {
-    appendFormData(form_data, values, startKey = '') {
-      if (typeof values === 'object') {
-        for (const key in values) {
-          const currentKey = startKey.length ? startKey + '[' + key + ']' : key;
-
-          if (typeof values[key] === 'object' && !(values[key] instanceof File)) {
-            this.appendFormData(form_data, values[key], currentKey);
-          } else if (typeof values[key] !== 'undefined') {
-            form_data.append(currentKey, values[key]);
-          }
-        }
-      }
-    },
-  },
-};

From 462df6c475c26c6eb6acb2db507af3cf44c2acdf Mon Sep 17 00:00:00 2001
From: Ricardo van Laarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 11:35:16 +0200
Subject: [PATCH 16/21] Update
 generator/templates/Authorisation/src/locales/nl/authorisation.json

Co-authored-by: Martijn Zentjens <martijn@kingscode.nl>
---
 .../templates/Authorisation/src/locales/nl/authorisation.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generator/templates/Authorisation/src/locales/nl/authorisation.json b/generator/templates/Authorisation/src/locales/nl/authorisation.json
index cb5a868..a827868 100644
--- a/generator/templates/Authorisation/src/locales/nl/authorisation.json
+++ b/generator/templates/Authorisation/src/locales/nl/authorisation.json
@@ -33,6 +33,6 @@
     "actions": {
         "login": "Inloggen",
         "passwordForgotten": "Wachtwoord vergeten",
-        "logOff": "Uitloggen"
+        "logout": "Uitloggen"
     }
 }

From 6a3b719c277eaef8d4223aee4c9c363ae807d654 Mon Sep 17 00:00:00 2001
From: Ricardo van Laarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 11:38:38 +0200
Subject: [PATCH 17/21] Update
 generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue

Co-authored-by: Martijn Zentjens <martijn@kingscode.nl>
---
 .../Authorisation/src/views/authorisation/InvitationAccept.vue   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue b/generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue
index ff5c3c0..d3b5163 100644
--- a/generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue
+++ b/generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue
@@ -1,5 +1,4 @@
 <template>
-
   <v-row align="stretch" justify-md="center">
     <v-col md="3">
       <v-form @submit.prevent="handleAccept()" ref="form" v-model="isValid">

From 38a32262dc4289fe687ecfcd12e501f93cfadfa9 Mon Sep 17 00:00:00 2001
From: Ricardo van Laarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 11:46:06 +0200
Subject: [PATCH 18/21] Update
 generator/templates/Default/src/components/crud/fields/KTimeField.vue

Co-authored-by: Martijn Zentjens <martijn@kingscode.nl>
---
 .../templates/Default/src/components/crud/fields/KTimeField.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generator/templates/Default/src/components/crud/fields/KTimeField.vue b/generator/templates/Default/src/components/crud/fields/KTimeField.vue
index 6f06f11..7b7737e 100644
--- a/generator/templates/Default/src/components/crud/fields/KTimeField.vue
+++ b/generator/templates/Default/src/components/crud/fields/KTimeField.vue
@@ -43,7 +43,7 @@
 
 <script>
 import Field from '@/components/crud/fields/FieldMixin.vue';
-import dayjs from 'dayjs';
+import dayjs from '@/plugins/dayjs';
 
 export default {
   name: 'KTimeField',

From 79ab69e45fcb6088349d7a594c5d6cd0cd38f6a7 Mon Sep 17 00:00:00 2001
From: Ricardo van Laarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 11:46:29 +0200
Subject: [PATCH 19/21] Update
 generator/templates/Default/src/components/crud/fields/KDateField.vue

Co-authored-by: Martijn Zentjens <martijn@kingscode.nl>
---
 .../Default/src/components/crud/fields/KDateField.vue          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/generator/templates/Default/src/components/crud/fields/KDateField.vue b/generator/templates/Default/src/components/crud/fields/KDateField.vue
index d37a94d..161fe93 100644
--- a/generator/templates/Default/src/components/crud/fields/KDateField.vue
+++ b/generator/templates/Default/src/components/crud/fields/KDateField.vue
@@ -38,7 +38,7 @@
 
 <script>
 import Field from '@/components/crud/fields/FieldMixin.vue';
-import dayjs from 'dayjs';
+import dayjs from '@/plugins/dayjs';
 
 export default {
   name: 'KDateField',
@@ -93,4 +93,3 @@ export default {
   },
 };
 </script>
-

From c43efd0a18c9de90fc64648cda630300a71d06f3 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 12:14:49 +0200
Subject: [PATCH 20/21] fix pr comments

---
 .../api/endpoints/authorisation/password.js   | 21 -------------------
 .../endpoints/authorisation/password/reset.js |  2 +-
 .../api/endpoints/authorisation/register.js   |  4 ++--
 .../authorisation/RegistrationVerify.vue      |  3 +--
 .../src/api/implementation/app/index.js       |  5 ++---
 .../src/api/implementation/app/transformer.js |  2 +-
 6 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 generator/templates/Authorisation/src/api/endpoints/authorisation/password.js

diff --git a/generator/templates/Authorisation/src/api/endpoints/authorisation/password.js b/generator/templates/Authorisation/src/api/endpoints/authorisation/password.js
deleted file mode 100644
index 4c4a188..0000000
--- a/generator/templates/Authorisation/src/api/endpoints/authorisation/password.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { post } from '../../implementation/app';
-
-function passwordForgotten(email) {
-  return post('password/forgotten', {
-    email,
-  });
-}
-
-function passwordReset(token, email, password, passwordConfirmation) {
-  return post('password/reset', {
-    token,
-    email,
-    password,
-    password_confirmation: passwordConfirmation,
-  });
-}
-
-export {
-  passwordForgotten,
-  passwordReset,
-};
diff --git a/generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.js b/generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.js
index 803ce62..f3578d0 100644
--- a/generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.js
+++ b/generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.js
@@ -5,6 +5,6 @@ export default async function (email, token, password, passwordConfirmation) {
     email,
     token,
     password,
-    password_confirmation: passwordConfirmation,
+    passwordConfirmation,
   });
 }
diff --git a/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js b/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js
index 3ba48ef..1102479 100644
--- a/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js
+++ b/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js
@@ -5,7 +5,7 @@ function verify(token, email, password, passwordConfirmation) {
     token,
     email,
     password,
-    password_confirmation: passwordConfirmation,
+    passwordConfirmation,
   });
 }
 
@@ -13,7 +13,7 @@ function acceptInvitation(email, token, password, passwordConfirmation) {
   return post('invitation/accept', {
     email: email,
     password: password,
-    password_confirmation: passwordConfirmation,
+    passwordConfirmation,
     token: token,
   });
 }
diff --git a/generator/templates/Authorisation/src/views/authorisation/RegistrationVerify.vue b/generator/templates/Authorisation/src/views/authorisation/RegistrationVerify.vue
index 6e9e356..5d67555 100644
--- a/generator/templates/Authorisation/src/views/authorisation/RegistrationVerify.vue
+++ b/generator/templates/Authorisation/src/views/authorisation/RegistrationVerify.vue
@@ -80,7 +80,6 @@ export default {
     onFormSubmit() {
       const token = getFragment('token');
 
-      // TODO: what to do?
       if (!token) return;
 
       this.isLoading = true;
@@ -100,7 +99,7 @@ export default {
             } else if (status === 400) {
               this.alertMessage = this.$t('authorisation.registrationVerify.errorMessage');
             }
-            this.validate();
+            this.$refs.form.validate();
           })
           .finally(() => {
             this.isLoading = false;
diff --git a/generator/templates/Default/src/api/implementation/app/index.js b/generator/templates/Default/src/api/implementation/app/index.js
index e6f32e6..a680a82 100644
--- a/generator/templates/Default/src/api/implementation/app/index.js
+++ b/generator/templates/Default/src/api/implementation/app/index.js
@@ -31,10 +31,9 @@ const instance = axios.create(config);
 instance.interceptors.request.use(onRequestFulFilled, onRequestRejected);
 instance.interceptors.response.use(onResponseFulFilled, onResponseRejected);
 
-const { get } = instance;
-const { post } = instance;
+const { get, post, put } = instance;
 const destroy = instance.delete;
-const { put } = instance;
+
 
 export {
   get,
diff --git a/generator/templates/Default/src/api/implementation/app/transformer.js b/generator/templates/Default/src/api/implementation/app/transformer.js
index b71cbcc..64cac2a 100644
--- a/generator/templates/Default/src/api/implementation/app/transformer.js
+++ b/generator/templates/Default/src/api/implementation/app/transformer.js
@@ -1,5 +1,5 @@
 import Qs from 'qs';
-import Model from '../../../application/models/model';
+import Model from '@/application/models/model';
 import { camelToSnake, snakeToCamel } from '../../util/keyConverter';
 import objectToFormData from '../../util/objectToFormDataConverter';
 

From 43b0f3cbfdde575e10fb9dcd7d877b49b0d9f068 Mon Sep 17 00:00:00 2001
From: ricardovanlaarhoven <ricardo1994@gmail.com>
Date: Thu, 22 Oct 2020 13:38:01 +0200
Subject: [PATCH 21/21] fix pr comments

---
 .../src/api/endpoints/authorisation/register.js           | 6 +++---
 .../Authorisation/src/api/endpoints/password/reset.js     | 8 ++++----
 .../templates/Crud/src/components/forms/UserForm.vue      | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js b/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js
index 1102479..de2560e 100644
--- a/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js
+++ b/generator/templates/Authorisation/src/api/endpoints/authorisation/register.js
@@ -11,10 +11,10 @@ function verify(token, email, password, passwordConfirmation) {
 
 function acceptInvitation(email, token, password, passwordConfirmation) {
   return post('invitation/accept', {
-    email: email,
-    password: password,
+    email,
+    password,
     passwordConfirmation,
-    token: token,
+    token,
   });
 }
 
diff --git a/generator/templates/Authorisation/src/api/endpoints/password/reset.js b/generator/templates/Authorisation/src/api/endpoints/password/reset.js
index 6897a25..54e65fa 100644
--- a/generator/templates/Authorisation/src/api/endpoints/password/reset.js
+++ b/generator/templates/Authorisation/src/api/endpoints/password/reset.js
@@ -2,9 +2,9 @@ import { post } from '../../implementation/app';
 
 export default async function (email, token, password, passwordConfirmation) {
   return post('registration', {
-    email: email,
-    token: token,
-    password: password,
-    password_confirmation: passwordConfirmation,
+    email,
+    token,
+    password,
+    passwordConfirmation,
   });
 }
diff --git a/generator/templates/Crud/src/components/forms/UserForm.vue b/generator/templates/Crud/src/components/forms/UserForm.vue
index d20dfa1..1b4c7ef 100644
--- a/generator/templates/Crud/src/components/forms/UserForm.vue
+++ b/generator/templates/Crud/src/components/forms/UserForm.vue
@@ -24,11 +24,11 @@ import User from '../../application/models/user.js';
 
 export default {
   name: 'UserForm',
+  extends: Form,
   components: {
     KTextField,
     KFieldGroup,
   },
-  extends: Form,
   data: () => ({
     values: new User(),
   }),