Squashed commit of the following: commit 820ed9b501f6fe14357dc0d1e9133b7a16a257c5 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 30 13:11:55 2021 +0200 fixed conflicts commit c42a985cb8b7cea5f0e891e70d706d8d3cbff619 Merge: e358b596b0ac72Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 30 13:05:22 2021 +0200 Merge branch 'develop' into TV-286-avrop-filtertaggar # Conflicts: # apps/dafa-web/src/app/app.module.ts # apps/dafa-web/src/app/pages/avrop/avrop.component.html # apps/dafa-web/src/app/pages/avrop/avrop.module.ts # apps/dafa-web/src/app/shared/models/multiselect-filter-option.ts # apps/dafa-web/src/app/shared/services/api/avrop-api.service.ts commit e358b59360186a8dcb972fae331126b0ae572436 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 30 11:56:48 2021 +0200 fix linting and scss __ commit 6a688c4740ff7e2575ae2f218174ce9012db8d6c Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 30 11:50:24 2021 +0200 refactor commit 90bf83119f8f1eec4b2e63f15840fa1a943d64a4 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 30 11:39:13 2021 +0200 !== commit 7b06dec881c6876bbae6f37fbe462e32ae43575f Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 30 11:32:14 2021 +0200 move to component folder commit d449edf11e88a492a2446ac8e7fda93a0836e5c7 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 30 11:26:17 2021 +0200 Update avrop.component.html commit 0ca49c7248186c6e56cadf1c5a92298612a4ad49 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 30 11:11:54 2021 +0200 . commit ec084d7b45d36bdeaec16671cb2bcbc94f7ebb70 Merge: 1b20328c06452dAuthor: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 30 08:57:18 2021 +0200 Merge branch 'develop' into TV-286-avrop-filtertaggar # Conflicts: # apps/dafa-web/src/app/pages/avrop/avrop-filters/temporary-filter/temporary-filter.component.ts commit 1b203287dc18d178753c72cd3025dfd70eb56d6f Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 29 12:10:38 2021 +0200 fix unit tests commit 320784bd3d3fbd6a7e0b8e6eb338eaec64151748 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 29 11:36:03 2021 +0200 add unit tests and loading-spinners commit 7ebb5ffaddcf6e3b68263eaad6a3d3de3e69811d Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 28 17:01:02 2021 +0200 enhetstest commit dc02e6cc17999adcaa07c6e385ed69860c0b4f97 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 28 15:15:13 2021 +0200 Fix reset to step 1 commit e4759c0a59ebd090248f9765d23fdf3c5f8aea03 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 28 13:52:03 2021 +0200 Clicking tags will remove selection commit 0acdff3c137477b2422b2c8aba9f895990a37fc9 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 28 13:48:07 2021 +0200 wip commit 4e7a87134edb95c9d522514140dcf8ff8b5c9bfa Merge: c586d676f97f51Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 28 09:12:35 2021 +0200 Merge branch 'develop' into refactor/stricter-eslint # Conflicts: # apps/dafa-web/src/app/pages/administration/pages/employee-form/employee-form.component.ts commit c586d675ced7a0dd4bd88599f62dd7a72fe39723 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 23 16:24:37 2021 +0200 Fix linting of avrop commit 70aa93e06c7677ce6b2e5068c74709ef5f9feecc Merge: ace99504afe9b5Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 23 16:12:30 2021 +0200 Merge branch 'develop' into refactor/stricter-eslint # Conflicts: # apps/dafa-web/src/app/pages/avrop/avrop.component.spec.ts # apps/dafa-web/src/app/pages/ciam-landing/ciam-landing.component.spec.ts # apps/dafa-web/src/app/pages/logout/logout.component.spec.ts commit ace9950d3dc9517d8fe4e4b53af6813b6b175720 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 23 10:53:00 2021 +0200 Fix remaining linting warnings/errors commit c15b0a4b8a62604928871d45095d9ad257add0a8 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 23 10:44:32 2021 +0200 fix more linting errors and warnings ... and 3 more commits
42 lines
1.0 KiB
JSON
42 lines
1.0 KiB
JSON
{
|
|
"extends": ["../../.eslintrc.json"],
|
|
"ignorePatterns": ["!**/*"],
|
|
"overrides": [
|
|
{
|
|
"files": ["*.ts"],
|
|
"excludedFiles": ["*.spec.ts"],
|
|
"extends": [
|
|
"plugin:@nrwl/nx/angular",
|
|
"eslint:recommended",
|
|
"plugin:@typescript-eslint/recommended",
|
|
"plugin:@typescript-eslint/recommended-requiring-type-checking",
|
|
"plugin:@angular-eslint/template/process-inline-templates"
|
|
],
|
|
"parserOptions": { "project": ["apps/dafa-web/tsconfig.*?.json"] },
|
|
"rules": {
|
|
"@angular-eslint/directive-selector": [
|
|
"error",
|
|
{
|
|
"type": "attribute",
|
|
"prefix": "dafa",
|
|
"style": "camelCase"
|
|
}
|
|
],
|
|
"@angular-eslint/component-selector": [
|
|
"error",
|
|
{
|
|
"type": "element",
|
|
"prefix": "dafa",
|
|
"style": "kebab-case"
|
|
}
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"files": ["*.html"],
|
|
"extends": ["plugin:@nrwl/nx/angular-template"],
|
|
"rules": {}
|
|
}
|
|
]
|
|
}
|