Skip to content

Commit

Permalink
Merge branch 'development' into feature/PC388-15/dashboard-widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
remko48 committed Oct 23, 2024
2 parents 06e0108 + 57577d3 commit bfcd85e
Show file tree
Hide file tree
Showing 110 changed files with 23,390 additions and 23,417 deletions.
5 changes: 5 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"presets": [
"@babel/preset-env"
]
}
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ module.exports = {
rules: {
'jsdoc/require-jsdoc': 'off',
'vue/first-attribute-linebreak': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@
/tests/.phpunit.cache

/node_modules/
/custom_apps/
/custom-apps/
/js/
Zone.Identifier
30 changes: 26 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
{
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.formatOnSave": true
}
{
"files.autoSave": "afterDelay",
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.formatOnSave": true,
"eslint.format.enable": true,
"cSpell.words": [
"depubliceren",
"Depubliceren",
"gedepubliceerd",
"Matadata",
"nextcloud",
"opencatalogi",
"organisation",
"Organisation",
"organisations",
"Organisations",
"pinia",
"Toegangs"
],
"[javascript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
},
"[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
}
6 changes: 3 additions & 3 deletions DESIGN.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
- only one modal may be active at all times
- modals should be abstract and reachable form anywhere
- modals should be places in te src/modals folder
- modals should be triggerd through the state
- modals should be (er)ussable oudise of the view contect and stered in src/modals/[modal-name]
- modals should be triggered through the state
- modals should be (re)usable outside of the view content and stored in src/modals/[modal-name]

## Views

- vieuws should be centered around a core object
- views should be centered around a core object
- views should consist of a index, list and details page
- view files should be stored onder src/views/[view-name]

Expand Down
18 changes: 18 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
transform: {
'^.+\\.vue$': '@vue/vue2-jest',
'^.+\\.js$': 'babel-jest',
'^.+\\.ts$': 'ts-jest',
'.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
},
moduleFileExtensions: ['js', 'json', 'vue', 'ts'],
testEnvironment: 'jest-environment-jsdom',
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1',
},
coveragePathIgnorePatterns: [
'index.js',
'index.ts',
],
coverageDirectory: '<rootDir>/coverage-frontend/',
}
2 changes: 1 addition & 1 deletion lib/Controller/ZakenController.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ZakenController extends Controller
"omschrijving" => "Zaak 3",
"toelichting" => "string",
"zaaktype" => "0a3a0ffb-dc03-4aae-b207-0ed1502e60da",
"archiefstatus" => "gearchiveerd_procestermijn_onbekend",
"archiefstatus" => "gearchiveerd_procestermijn_onbekend",
"registratiedatum" => "2019-08-24",
"verantwoordelijkeOrganisatie" => "string",
"startdatum" => "2019-08-24",
Expand Down
Loading

0 comments on commit bfcd85e

Please sign in to comment.