Skip to content

update scaffold with our latest standards #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Oct 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
12c04c4
New models
ricardovanlaarhoven Oct 21, 2020
b1aa9c9
update API implementation and keyConverter
ricardovanlaarhoven Oct 21, 2020
e51e530
rename mainMenu
ricardovanlaarhoven Oct 21, 2020
2e8bbc3
Add sass files
ricardovanlaarhoven Oct 21, 2020
a691ee5
dependencies
ricardovanlaarhoven Oct 21, 2020
f5a7961
Add i18n
ricardovanlaarhoven Oct 21, 2020
4514c3a
Split routes (authorisation/authorised)
ricardovanlaarhoven Oct 21, 2020
e36078f
add new authorisatrion routes
ricardovanlaarhoven Oct 21, 2020
ac9db44
Add fields and more
ricardovanlaarhoven Oct 21, 2020
f596149
wip
ricardovanlaarhoven Oct 21, 2020
99c39bd
update version
ricardovanlaarhoven Oct 22, 2020
f2bfcae
Add Breadcrumbs and remove baseform
ricardovanlaarhoven Oct 22, 2020
edce257
update readme
ricardovanlaarhoven Oct 22, 2020
659e015
hotfix for breadcrumbs
ricardovanlaarhoven Oct 22, 2020
c9ae5c8
remove unused mixin
ricardovanlaarhoven Oct 22, 2020
462df6c
Update generator/templates/Authorisation/src/locales/nl/authorisation…
ricardovanlaarhoven Oct 22, 2020
6a3b719
Update generator/templates/Authorisation/src/views/authorisation/Invi…
ricardovanlaarhoven Oct 22, 2020
38a3226
Update generator/templates/Default/src/components/crud/fields/KTimeFi…
ricardovanlaarhoven Oct 22, 2020
79ab69e
Update generator/templates/Default/src/components/crud/fields/KDateFi…
ricardovanlaarhoven Oct 22, 2020
c43efd0
fix pr comments
ricardovanlaarhoven Oct 22, 2020
6489ec5
Merge remote-tracking branch 'origin/update-scaffold' into update-sca…
ricardovanlaarhoven Oct 22, 2020
43b0f3c
fix pr comments
ricardovanlaarhoven Oct 22, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
25 changes: 13 additions & 12 deletions generator/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand All @@ -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);
}
Expand All @@ -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: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { post } from '../../implementation/app';

export default function (email, password) {
return post('auth/login', {
email: email,
password: password,
email,
password,
});
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { post } from '@/api/implementation/app';

export default function (email) {
return post('password/forgotten', {
email,
});
}
Original file line number Diff line number Diff line change
@@ -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,
});
}
Original file line number Diff line number Diff line change
@@ -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,
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { post } from '../../implementation/app';

export default async function (email, token, password, passwordConfirmation) {
return post('registration', {
Comment on lines 3 to 4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
export default async function (email, token, password, passwordConfirmation) {
return post('registration', {
export default async (email, token, password, passwordConfirmation) => post('registration', { email, token, password, passwordConfirmation });

Volgens mij werkt dit ook 😸

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moet de rest wel weg. Ik kon niet alles selecteren omdat er verwijderde regels in zatten

email: email,
token: token,
password: password,
password_confirmation: passwordConfirmation,
email,
token,
password,
passwordConfirmation,
});
}
41 changes: 0 additions & 41 deletions generator/templates/Authorisation/src/api/endpoints/user.js

This file was deleted.

This file was deleted.

Loading