From 069481353e0d08dcd9328257255e616f42125576 Mon Sep 17 00:00:00 2001 From: Buster Neece Date: Fri, 30 Dec 2022 10:44:47 -0600 Subject: [PATCH] ESLint fixes. --- frontend/.eslintignore | 3 +- frontend/.eslintrc.js | 7 +- .../Admin/Permissions/Form/StationForm.vue | 2 + .../vue/components/Common/BaseEditModal.vue | 2 +- frontend/vue/components/Common/DataTable.vue | 15 ++-- .../vue/components/Common/ScheduleView.vue | 3 +- frontend/vue/components/Dashboard.vue | 1 + .../vue/components/Form/VuelidateError.vue | 5 +- .../Public/FullPlayer/SongHistory.vue | 1 + frontend/vue/components/Public/Player.vue | 3 +- frontend/vue/components/Stations/Media.vue | 6 +- .../Stations/Media/Form/WaveformEditor.vue | 6 +- .../Stations/Playlists/EditModal.vue | 2 +- .../Stations/Playlists/Form/Schedule.vue | 65 ++++++++-------- .../Stations/Streamers/EditModal.vue | 2 +- .../Stations/Streamers/Form/Schedule.vue | 74 ++++++++----------- 16 files changed, 101 insertions(+), 96 deletions(-) diff --git a/frontend/.eslintignore b/frontend/.eslintignore index 1f9fa6d86..8a18de949 100644 --- a/frontend/.eslintignore +++ b/frontend/.eslintignore @@ -1,3 +1,2 @@ -vue/components/Public/WebDJ/Stream.js -vue/components/Public/WebDJ/Track.js +vue/components/Public/WebDJ/* vue/vendor/chartjs-colorschemes/* diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index e83ab16ac..f8c4dd468 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -4,16 +4,17 @@ module.exports = { 'plugin:vue/vue3-recommended' ], rules: { - "vue/no-v-html": "off", - "vue/multi-word-component-names": "off", "no-unused-vars": ["error", { "varsIgnorePattern": "^_|props", }], + "vue/multi-word-component-names": "off", "vue/html-indent": ["error", 4, { "attribute": 1, "baseIndent": 1, "closeBracket": 0, "alignAttributesVertically": true - }] + }], + "vue/no-v-html": "off", + "vue/no-mutating-props": "off" } } diff --git a/frontend/vue/components/Admin/Permissions/Form/StationForm.vue b/frontend/vue/components/Admin/Permissions/Form/StationForm.vue index 44c5c04ad..c055f4632 100644 --- a/frontend/vue/components/Admin/Permissions/Form/StationForm.vue +++ b/frontend/vue/components/Admin/Permissions/Form/StationForm.vue @@ -51,6 +51,7 @@ const props = defineProps({ } }); + const remainingStations = computed(() => { return pickBy(props.stations, (stationName, stationId) => { return !find(props.form.permissions.$model.station, {'station_id': stationId}); @@ -61,6 +62,7 @@ const hasRemainingStations = computed(() => { return !isEmpty(remainingStations.value); }); + const remove = (index) => { props.form.permissions.$model.station.splice(index, 1); }; diff --git a/frontend/vue/components/Common/BaseEditModal.vue b/frontend/vue/components/Common/BaseEditModal.vue index c9d62d158..e68411faa 100644 --- a/frontend/vue/components/Common/BaseEditModal.vue +++ b/frontend/vue/components/Common/BaseEditModal.vue @@ -9,7 +9,7 @@ import mergeExisting from "~/functions/mergeExisting"; export default { name: 'BaseEditModal', - components: {ModalForm}, + components: {ModalForm}, // eslint-disable-line props: { createUrl: { type: String, diff --git a/frontend/vue/components/Common/DataTable.vue b/frontend/vue/components/Common/DataTable.vue index e3ec49ff5..d56293e3b 100644 --- a/frontend/vue/components/Common/DataTable.vue +++ b/frontend/vue/components/Common/DataTable.vue @@ -92,6 +92,7 @@
@@ -147,7 +148,7 @@ @refreshed="onRefreshed" @sort-changed="onSortChanged" > -