diff --git a/ui/package-lock.json b/ui/package-lock.json index e019927336b..c40a90607f9 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1112,9 +1112,9 @@ } }, "@fortawesome/vue-fontawesome": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.6.tgz", - "integrity": "sha512-HAGRbrOuGDwwUmCYdpzR0hhNQ3EE30dOS4JiJKcoZ+S4M210CxyU0OXCgzIg3HzK/23rlpHbV8zi9PDDZDnuIw==" + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.7.tgz", + "integrity": "sha512-YCw2Q2m4fxzyFsPOH3uDYMoJztTD+pT+AAyse4LFpbdrBg+r8ueaVT8BFnXEjrGwMDJJeXrwJ5AOC6q/JWBI4w==" }, "@hapi/address": { "version": "2.0.0", @@ -6767,9 +6767,9 @@ } }, "eslint": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.2.2.tgz", - "integrity": "sha512-mf0elOkxHbdyGX1IJEUsNBzCDdyoUgljF3rRlgfyYh0pwGnreLc0jjD6ZuleOibjmnUWZLY2eXwSooeOgGJ2jw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.3.0.tgz", + "integrity": "sha512-ZvZTKaqDue+N8Y9g0kp6UPZtS4FSY3qARxBs7p4f0H0iof381XHduqVerFWtK8DPtKmemqbqCFENWSQgPR/Gow==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -6884,15 +6884,6 @@ "estraverse": "^4.1.1" } }, - "eslint-utils": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", - "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.0.0" - } - }, "eslint-visitor-keys": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", @@ -18066,9 +18057,9 @@ "integrity": "sha512-UzD8t1CG+aoWVOOpGd5KcaCNtCgUc0byaKhJMH+6N7H/p1ThVkYl/VCt7DmCrdhUlzZK+hT5JPTKAdrbWi0nNw==" }, "vue-router": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.2.tgz", - "integrity": "sha512-WssQEHSEvIS1/CI4CO2T8LJdoK4Q9Ngox28K7FDNMTfzNTk2WS5D0dDlqYCaPG+AG4Z8wJkn1KrBc7AhspZJUQ==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz", + "integrity": "sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==" }, "vue-style-loader": { "version": "4.1.2", diff --git a/ui/package.json b/ui/package.json index 01ce8002d43..b2b719fe9ae 100644 --- a/ui/package.json +++ b/ui/package.json @@ -16,7 +16,7 @@ "@fortawesome/free-brands-svg-icons": "^5.10.2", "@fortawesome/free-regular-svg-icons": "^5.10.2", "@fortawesome/free-solid-svg-icons": "^5.10.2", - "@fortawesome/vue-fontawesome": "^0.1.6", + "@fortawesome/vue-fontawesome": "^0.1.7", "ant-design-vue": "~1.3.16", "axios": "^0.19.0", "enquire.js": "^2.1.6", @@ -36,7 +36,7 @@ "vue-flag-icon": "^1.0.6", "vue-i18n": "^8.14.0", "vue-ls": "^3.2.1", - "vue-router": "^3.1.2", + "vue-router": "^3.1.3", "vue-svg-component-runtime": "^1.0.1", "vuex": "^3.1.1" }, @@ -51,7 +51,7 @@ "babel-eslint": "^10.0.3", "babel-jest": "^24.9.0", "babel-plugin-import": "^1.12.1", - "eslint": "^6.2.2", + "eslint": "^6.3.0", "eslint-plugin-html": "^6.0.0", "eslint-plugin-vue": "^5.2.3", "less": "^3.10.3", diff --git a/ui/src/core/bootstrap.js b/ui/src/core/bootstrap.js index 6fda48b090b..e67bbe51a66 100644 --- a/ui/src/core/bootstrap.js +++ b/ui/src/core/bootstrap.js @@ -13,7 +13,6 @@ import { DEFAULT_FIXED_SIDEMENU, DEFAULT_CONTENT_WIDTH_TYPE, DEFAULT_MULTI_TAB - // CURRENT_LOCALE } from '@/store/mutation-types' import config from '@/config/settings' @@ -30,7 +29,4 @@ export default function Initializer () { store.commit('TOGGLE_MULTI_TAB', Vue.ls.get(DEFAULT_MULTI_TAB, config.multiTab)) store.commit('SET_TOKEN', Vue.ls.get(ACCESS_TOKEN)) store.commit('SET_PROJECT', Vue.ls.get(CURRENT_PROJECT)) - // store.commit('CURRENT_LOCALE', Vue.ls.get(CURRENT_LOCALE), config.defaultLocale) - - // last step } diff --git a/ui/src/store/mutation-types.js b/ui/src/store/mutation-types.js index 2ff33ef9159..6e0c55345d6 100644 --- a/ui/src/store/mutation-types.js +++ b/ui/src/store/mutation-types.js @@ -10,7 +10,6 @@ export const DEFAULT_FIXED_SIDEMENU = 'DEFAULT_FIXED_SIDEMENU' export const DEFAULT_FIXED_HEADER_HIDDEN = 'DEFAULT_FIXED_HEADER_HIDDEN' export const DEFAULT_CONTENT_WIDTH_TYPE = 'DEFAULT_CONTENT_WIDTH_TYPE' export const DEFAULT_MULTI_TAB = 'DEFAULT_MULTI_TAB' -// export const CURRENT_LOCALE = 'CURRENT_LOCALE' export const CONTENT_WIDTH_TYPE = { Fluid: 'Fluid',