Skip to content

Commit

Permalink
Merge pull request #1478 from NicoPennec/fix/eslint
Browse files Browse the repository at this point in the history
Various fixes
  • Loading branch information
frankrousseau committed Jul 8, 2024
2 parents eade789 + 4194146 commit dafa924
Show file tree
Hide file tree
Showing 80 changed files with 386 additions and 367 deletions.
19 changes: 15 additions & 4 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
},
extends: [
'eslint:recommended',
'plugin:vue/essential',
'plugin:vue/recommended',
'plugin:prettier/recommended'
],
rules: {
Expand All @@ -21,10 +21,21 @@ module.exports = {
destructuring: 'all'
}
],

// additional rules for Vue
'vue/component-definition-name-casing': ['error', 'kebab-case'],
'vue/component-name-in-template-casing': ['error', 'kebab-case'],
'vue/prop-name-casing': ['error', 'camelCase'],

// disabled vue/recommended rules
'vue/attributes-order': 'off',
'vue/multi-word-component-names': 'off',
'vue/no-lone-template': 'off',
'vue/no-use-v-if-with-v-for': 'off',
'vue/prop-name-casing': ['error', 'camelCase']
},
globals: {}
'vue/no-v-html': 'off',
'vue/order-in-components': 'off',
'vue/require-default-prop': 'off',
'vue/require-prop-types': 'off',
'vue/no-template-shadow': 'off'
}
}
112 changes: 56 additions & 56 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dev": "vite",
"build": "vite build",
"preview": "vite preview",
"lint": "eslint --ext .js,.vue --ignore-path .gitignore src/",
"lint": "eslint --ext .js,.vue src/",
"lint:fix": "npm run lint -- --fix",
"format": "prettier --write --list-different src/**/*.{js,vue}",
"test:unit": "vitest tests/unit",
Expand All @@ -24,7 +24,7 @@
"@fullcalendar/multimonth": "6.1.14",
"@fullcalendar/vue": "6.1.14",
"@google/model-viewer": "3.5.0",
"@sentry/vue": "8.14.0",
"@sentry/vue": "8.15.0",
"async": "3.2.5",
"bowser": "2.11.0",
"chart.js": "2.9.4",
Expand Down Expand Up @@ -90,6 +90,6 @@
"node": ">=18.12"
},
"lint-staged": {
"*.{js,vue}": "eslint --cache --fix"
"*.{js,vue}": "eslint --cache"
}
}
2 changes: 1 addition & 1 deletion src/components/cells/TaskStatusCell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<td class="name">
<div
class="tag"
v-bind:class="[!disable ? '' : 'canceled']"
:class="{ canceled: disable }"
:style="{
background: color,
color: textColor
Expand Down
10 changes: 5 additions & 5 deletions src/components/lists/AssetList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@

<table-metadata-selector-menu
ref="headerMetadataSelectorMenu"
:metadataDisplayHeaders.sync="metadataDisplayHeaders"
:metadata-display-headers.sync="metadataDisplayHeaders"
:descriptors="assetMetadataDescriptors"
:exclude="{
timeSpent: !isAssetTime,
Expand Down Expand Up @@ -307,8 +307,8 @@
:entity="asset"
:task-test="taskMap.get(asset.validations.get(columnId))"
:selected="isSelected(i, k, j)"
:rowX="getIndex(i, k)"
:columnY="j"
:row-x="getIndex(i, k)"
:column-y="j"
:minimized="hiddenColumns[columnId]"
:is-static="true"
:is-assignees="isShowAssignations"
Expand Down Expand Up @@ -406,8 +406,8 @@
:selected="
isSelected(i, k, j + stickedDisplayedValidationColumns.length)
"
:rowX="getIndex(i, k)"
:columnY="j"
:row-x="getIndex(i, k)"
:column-y="j"
:minimized="hiddenColumns[columnId]"
:is-static="true"
:is-assignees="isShowAssignations"
Expand Down
10 changes: 5 additions & 5 deletions src/components/lists/EditList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@

<table-metadata-selector-menu
ref="headerMetadataSelectorMenu"
:metadataDisplayHeaders.sync="metadataDisplayHeaders"
:metadata-display-headers.sync="metadataDisplayHeaders"
:descriptors="editMetadataDescriptors"
:exclude="{
timeSpent: !isEditTime,
Expand Down Expand Up @@ -308,7 +308,7 @@
'datatable-row-header': true
}"
:column="taskTypeMap.get(columnId)"
:columnY="j"
:column-y="j"
:entity="edit"
:is-assignees="isShowAssignations"
:is-static="true"
Expand All @@ -318,7 +318,7 @@
: '0'
"
:minimized="hiddenColumns[columnId]"
:rowX="i"
:row-x="i"
:selected="isSelected(i, j)"
:sticked="true"
:task-test="taskMap.get(edit.validations.get(columnId))"
Expand Down Expand Up @@ -396,8 +396,8 @@
:selected="
isSelected(i, j + stickedDisplayedValidationColumns.length)
"
:rowX="i"
:columnY="j"
:row-x="i"
:column-y="j"
:is-assignees="isShowAssignations"
@select="onTaskSelected"
@unselect="onTaskUnselected"
Expand Down
10 changes: 5 additions & 5 deletions src/components/lists/EpisodeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@

<table-metadata-selector-menu
ref="headerMetadataSelectorMenu"
:metadataDisplayHeaders.sync="metadataDisplayHeaders"
:metadata-display-headers.sync="metadataDisplayHeaders"
:descriptors="episodeMetadataDescriptors"
:exclude="{
timeSpent: !isEpisodeTime,
Expand Down Expand Up @@ -262,7 +262,7 @@
'datatable-row-header': true
}"
:column="taskTypeMap.get(columnId)"
:columnY="j"
:column-y="j"
:entity="episode"
:is-assignees="isShowAssignations"
:is-static="true"
Expand All @@ -272,7 +272,7 @@
: '0'
"
:minimized="hiddenColumns[columnId]"
:rowX="i"
:row-x="i"
:selected="isSelected(i, j)"
:sticked="true"
:task-test="taskMap.get(episode.validations.get(columnId))"
Expand Down Expand Up @@ -377,8 +377,8 @@
:selected="
isSelected(i, j + stickedDisplayedValidationColumns.length)
"
:rowX="i"
:columnY="j"
:row-x="i"
:column-y="j"
:is-assignees="isShowAssignations"
@select="onTaskSelected"
@unselect="onTaskUnselected"
Expand Down
Loading

0 comments on commit dafa924

Please sign in to comment.