From c4844b457cb7eeb8cab0ee8dca179be684a38b17 Mon Sep 17 00:00:00 2001 From: Gunnar Mills Date: Tue, 28 Jan 2020 20:18:40 -0600 Subject: Revert "Change eslint rules to use vue recommended" Merged accidentally. Although this one did have the proper +1s/+2s. The 2 underneath did not. The author will resubmit. This reverts commit 5e7ac49058e5dc37fd43ecf3c0d06f5dda14af5b. Change-Id: Iceb1de3a170cc0b592b183545c792aa3eb87bfee Signed-off-by: Gunnar Mills --- .eslintrc.js | 5 ++-- src/components/AppHeader/AppHeader.vue | 6 ++--- src/components/AppNavigation/AppNavigation.vue | 8 +++--- src/components/Global/PageSection.vue | 7 +---- src/components/Global/PageTitle.vue | 7 +---- src/components/Global/StatusIcon.vue | 7 +---- src/layouts/AppLayout.vue | 8 +++--- .../LocalUserManagement/LocalUserManagement.vue | 18 ++++++------- .../LocalUserManagement/ModalSettings.vue | 7 +---- .../LocalUserManagement/ModalUser.vue | 11 +++----- .../LocalUserManagement/TableRoles.vue | 8 +++--- src/views/Login/Login.vue | 14 +++++----- src/views/Overview/Overview.vue | 30 +++++++++++----------- src/views/Overview/OverviewEvents.vue | 10 ++++---- src/views/Overview/OverviewQuickLinks.vue | 20 +++++++-------- src/views/Unauthorized/Unauthorized.vue | 2 +- 16 files changed, 71 insertions(+), 97 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index b28fdf49..4de4c1fd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -3,7 +3,7 @@ module.exports = { env: { node: true }, - extends: ['plugin:vue/recommended', '@vue/prettier'], + extends: ['plugin:vue/essential', '@vue/prettier'], rules: { 'no-console': 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', @@ -12,8 +12,7 @@ module.exports = { { singleQuote: true } - ], - 'vue/component-name-in-template-casing': ['error', 'kebab-case'] + ] }, parserOptions: { parser: 'babel-eslint' diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue index b2d29c95..5c2c333c 100644 --- a/src/components/AppHeader/AppHeader.vue +++ b/src/components/AppHeader/AppHeader.vue @@ -42,6 +42,9 @@ import StatusIcon from '../Global/StatusIcon'; export default { name: 'AppHeader', components: { IconAvatar, IconRenew, StatusIcon }, + created() { + this.getHostInfo(); + }, computed: { hostStatus() { return this.$store.getters['global/hostStatus']; @@ -58,9 +61,6 @@ export default { } } }, - created() { - this.getHostInfo(); - }, methods: { getHostInfo() { this.$store.dispatch('global/getHostStatus'); diff --git a/src/components/AppNavigation/AppNavigation.vue b/src/components/AppNavigation/AppNavigation.vue index 47609d96..c246b537 100644 --- a/src/components/AppNavigation/AppNavigation.vue +++ b/src/components/AppNavigation/AppNavigation.vue @@ -7,7 +7,7 @@ Health - + Event Log Hardware Status Sensors @@ -19,7 +19,7 @@ Control - + Server power operations @@ -33,7 +33,7 @@ Configuration - + Network settings SNMP settings Firmware @@ -45,7 +45,7 @@ Access Control - + LDAP Local user management diff --git a/src/components/Global/PageSection.vue b/src/components/Global/PageSection.vue index 03040b29..678fd31d 100644 --- a/src/components/Global/PageSection.vue +++ b/src/components/Global/PageSection.vue @@ -8,12 +8,7 @@ diff --git a/src/components/Global/PageTitle.vue b/src/components/Global/PageTitle.vue index 26588ca7..02314249 100644 --- a/src/components/Global/PageTitle.vue +++ b/src/components/Global/PageTitle.vue @@ -8,12 +8,7 @@ diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue index e1bb4103..e5a55018 100644 --- a/src/layouts/AppLayout.vue +++ b/src/layouts/AppLayout.vue @@ -1,15 +1,15 @@