From f3a29d33ddecdae0c5d2013cdbf967ed0ff42845 Mon Sep 17 00:00:00 2001 From: Milos Stojanovic Date: Wed, 26 Jun 2019 10:54:38 +0200 Subject: [PATCH] lint tweaks --- .eslintignore | 2 - .eslintrc.js | 18 +++- frontend/main.js | 11 +- frontend/mixins/shared.js | 12 +-- frontend/registerServiceWorker.js | 2 +- frontend/views/Browser.vue | 18 ++-- frontend/views/Login.vue | 2 +- frontend/views/Users.vue | 10 +- frontend/views/partials/Menu.vue | 2 +- frontend/views/partials/TreeNode.vue | 4 +- frontend/views/partials/Upload.vue | 2 +- package-lock.json | 154 +++++++++++++-------------- 12 files changed, 118 insertions(+), 119 deletions(-) delete mode 100644 .eslintignore diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 82ea063..0000000 --- a/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -frontend/main.js -frontend/registerServiceWorker.js diff --git a/.eslintrc.js b/.eslintrc.js index a873f88..449b9a0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -2,12 +2,26 @@ module.exports = { extends: [ // add more generic rulesets here, such as: 'eslint:recommended', - 'plugin:vue/recommended' + 'plugin:vue/recommended', ], rules: { // override/add rules settings here, such as: 'no-unused-vars': 'error', 'vue/require-prop-types': 0, - 'vue/max-attributes-per-line': 4 + 'vue/max-attributes-per-line': 4, + 'vue/attributes-order': 0, + 'semi': [ + 'error', + 'never' + ], + 'linebreak-style': [ + 'error', + 'unix' + ], + 'quotes': [ + 'error', + 'single' + ], + 'no-trailing-spaces': 1, } } diff --git a/frontend/main.js b/frontend/main.js index 9ca1e0b..b4a220a 100644 --- a/frontend/main.js +++ b/frontend/main.js @@ -1,5 +1,3 @@ -/* eslint-disable no-console */ - import Vue from 'vue' import App from './App.vue' import router from './router' @@ -14,10 +12,9 @@ import '@fortawesome/fontawesome-free/css/fontawesome.css' //TODO: import './registerServiceWorker' Vue.config.productionTip = false -Vue.config.baseURL = - process.env.VUE_APP_API_ENDPOINT - ? process.env.VUE_APP_API_ENDPOINT - : window.location.origin+window.location.pathname+'?r=' + +/* eslint-disable-next-line */ +Vue.config.baseURL = process.env.VUE_APP_API_ENDPOINT ? process.env.VUE_APP_API_ENDPOINT : window.location.origin+window.location.pathname+'?r=' axios.defaults.withCredentials = true axios.defaults.baseURL = Vue.config.baseURL @@ -33,7 +30,6 @@ Vue.mixin(shared) new Vue({ router, store, - render: h => h(App), created: function() { api.getConfig() @@ -63,4 +59,5 @@ new Vue({ }) }) }, + render: h => h(App), }).$mount('#app') diff --git a/frontend/mixins/shared.js b/frontend/mixins/shared.js index b7d1b7a..6a8a975 100644 --- a/frontend/mixins/shared.js +++ b/frontend/mixins/shared.js @@ -39,15 +39,15 @@ const funcs = { return this.$store.getters.hasPermissions(permissions) }, formatBytes(bytes, decimals = 2) { - if (bytes === 0) return '0 Bytes'; + if (bytes === 0) return '0 Bytes' - const k = 1024; - const dm = decimals < 0 ? 0 : decimals; - const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + const k = 1024 + const dm = decimals < 0 ? 0 : decimals + const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] - const i = Math.floor(Math.log(bytes) / Math.log(k)); + const i = Math.floor(Math.log(bytes) / Math.log(k)) - return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]; + return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i] }, formatDate(timestamp) { return moment.unix(timestamp).format('YY/MM/DD hh:mm:ss') diff --git a/frontend/registerServiceWorker.js b/frontend/registerServiceWorker.js index 76cede0..38d50de 100644 --- a/frontend/registerServiceWorker.js +++ b/frontend/registerServiceWorker.js @@ -1,4 +1,4 @@ -/* eslint-disable no-console */ +/* eslint-disable */ import { register } from 'register-service-worker' diff --git a/frontend/views/Browser.vue b/frontend/views/Browser.vue index ae3dd5e..f1b8bf2 100644 --- a/frontend/views/Browser.vue +++ b/frontend/views/Browser.vue @@ -41,7 +41,7 @@ - + {{ lang('New') }} @@ -90,22 +90,22 @@ checkable >