diff --git a/.eslintignore b/.eslintignore index 74abc1e0..200eb7ce 100644 --- a/.eslintignore +++ b/.eslintignore @@ -38,6 +38,7 @@ app/renderer.prod.js.map app/style.css app/style.css.map dist +dist_electron dll main.js main.js.map diff --git a/.eslintrc.js b/.eslintrc.js index e0b3ed38..ffc2a593 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,8 +10,7 @@ module.exports = { env: { browser: true, - node: true, - jest: true + node: true }, extends: ['airbnb-base', 'plugin:vue/recommended'], @@ -56,18 +55,25 @@ module.exports = { 'max-len': ['error', { code: 150 }], 'comma-dangle': 'off', 'no-await-in-loop': 'off', - 'import/prefer-default-export': 'off' + 'import/prefer-default-export': 'off', + 'no-unused-vars': ['error', { args: 'after-used', argsIgnorePattern: '^_' }] }, overrides: [ { files: [ - '**/__tests__/*.{j,t}s?(x)', - '**/tests/unit/**/*.spec.{j,t}s?(x)', + '**/test/**/*.spec.{j,t}s?(x)', + '**/*.test.{j,t}s?(x)' ], env: { jest: true, }, }, + { + files: ['src/originalBudgetTrackingApp/**/*'], + rules: { + 'no-console': 'off' + } + } ], }; diff --git a/.gitignore b/.gitignore index dd5ea8f4..e0685013 100644 --- a/.gitignore +++ b/.gitignore @@ -85,5 +85,5 @@ client_secret.json src/originalBudgetTrackingApp/mockData src/originalBudgetTrackingApp/categoryCalculationScript.js -config.json +config.encrypted googleApiToken.json diff --git a/package.json b/package.json index d44cd45f..33edc4fa 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "vue-router": "^3.1.6", "vuetify": "^2.2.22", "vuex": "^3.1.3", - "vuex-electron": "^1.0.3", + "vuex-persist": "^2.2.0", "ynab": "^1.19.0" }, "devDependencies": { diff --git a/src/components/MainPage/Importers.vue b/src/components/MainPage/Importers.vue index 72bcbf3d..391ef813 100644 --- a/src/components/MainPage/Importers.vue +++ b/src/components/MainPage/Importers.vue @@ -7,7 +7,7 @@ @@ -51,12 +51,12 @@ - @@ -80,13 +80,14 @@ diff --git a/src/components/MainPage/Importers/Importer.vue b/src/components/MainPage/Importers/Importer.vue index 95bd27da..62b8a279 100644 --- a/src/components/MainPage/Importers/Importer.vue +++ b/src/components/MainPage/Importers/Importer.vue @@ -1,65 +1,57 @@