Merge pull request #27 from kingscode/update-scaffold

update scaffold with our latest standards

Author: ricardovanlaarhoven

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
@@ -36,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

generator/index.js

@@ -5,13 +5,14 @@ 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',
+      'vue-i18n': '^8.21.0',
+
     },
   });
   if (options.plugins.includes('fontawesomepro')) {
@@ -28,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);
   }
@@ -51,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: {

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,
   });
 }

generator/templates/Authorisation/src/api/endpoints/authorisation/password.js

@@ -0,0 +1,7 @@
+import { post } from '@/api/implementation/app';
+
+export default function (email) {
+  return post('password/forgotten', {
+    email,
+  });
+}

generator/templates/Authorisation/src/api/endpoints/authorisation/password/forgotten.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,
+    passwordConfirmation,
+  });
+}

generator/templates/Authorisation/src/api/endpoints/authorisation/password/reset.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,
+    passwordConfirmation,
   });
 }
 
-function verify(token, email, password, passwordConfirmation) {
-  return post('registration/verify', {
-    token: token,
-    email: email,
-    password: password,
-    password_confirmation: passwordConfirmation,
+function acceptInvitation(email, token, password, passwordConfirmation) {
+  return post('invitation/accept', {
+    email,
+    password,
+    passwordConfirmation,
+    token,
   });
 }
 
 export {
-  register,
   verify,
+  acceptInvitation,
 };

generator/templates/Authorisation/src/api/endpoints/authorisation/register.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,
   });
 }