From 035ef3818bb03ff9da041f3d571ea151a42d5b69 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Wed, 10 Jun 2020 21:08:45 +0300 Subject: [PATCH 01/29] WIP define interface by creating json output --- .../node/outputVendors/json/index.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/originalBudgetTrackingApp/node/outputVendors/json/index.js diff --git a/src/originalBudgetTrackingApp/node/outputVendors/json/index.js b/src/originalBudgetTrackingApp/node/outputVendors/json/index.js new file mode 100644 index 00000000..4ce57184 --- /dev/null +++ b/src/originalBudgetTrackingApp/node/outputVendors/json/index.js @@ -0,0 +1,16 @@ +export const name = 'json'; +export const description = 'Create a new Json file with the transactions, or merge them into existing file'; + +export const fields = { + filename: { + type: 'string', + requierd: true, + validation: (value) => value && value.length > 0 + } +}; + +export const convertFieldsToConfig = (fieldsWithValues) => fieldsWithValues; + +export const output = async (transactions, config) => { + console.log(transactions, config); +}; From 89e8c6494de9823319929fd8089a81b5a25a1810 Mon Sep 17 00:00:00 2001 From: Baruch Rothkoff Date: Thu, 11 Jun 2020 13:58:22 +0300 Subject: [PATCH 02/29] init Json output --- package.json | 1 + .../node/outputVendors/index.js | 3 ++ .../node/outputVendors/index.test.js | 25 ++++++++++++++++ .../node/outputVendors/json/index.js | 1 + yarn.lock | 29 ------------------- 5 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 src/originalBudgetTrackingApp/node/outputVendors/index.js create mode 100644 src/originalBudgetTrackingApp/node/outputVendors/index.test.js diff --git a/package.json b/package.json index 803d9521..3a38470e 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,7 @@ "jest": "^26.0.1", "jest-circus": "^26.0.1", "jest-config": "^26.0.1", + "jest-each": "^26.0.1", "jest-environment-jsdom": "^26.0.1", "prettier": "^2.0.5", "replace-in-file": "5.0.2", diff --git a/src/originalBudgetTrackingApp/node/outputVendors/index.js b/src/originalBudgetTrackingApp/node/outputVendors/index.js new file mode 100644 index 00000000..3625531f --- /dev/null +++ b/src/originalBudgetTrackingApp/node/outputVendors/index.js @@ -0,0 +1,3 @@ +const files = require.context('.', true, /\.\/.+\/index\.js$/); + +export default files.keys().map((key) => files(key)); diff --git a/src/originalBudgetTrackingApp/node/outputVendors/index.test.js b/src/originalBudgetTrackingApp/node/outputVendors/index.test.js new file mode 100644 index 00000000..979a429c --- /dev/null +++ b/src/originalBudgetTrackingApp/node/outputVendors/index.test.js @@ -0,0 +1,25 @@ +/* eslint-disable global-require, import/no-dynamic-require */ +import each from 'jest-each'; +import fs from 'fs'; +import path from 'path'; + +const vendorsIndexes = fs.readdirSync(__dirname, { withFileTypes: true }) + .filter((dir) => dir.isDirectory()) + .map(({ name }) => path.join(__dirname, name)) + .filter((dir) => fs.readdirSync(dir).includes('index.js')) + .map((dir) => path.join(dir, 'index.js')); + +describe('Validate vendors interface', () => { + each([vendorsIndexes]) + .describe('Vendor %s', (vendorPath) => { + let vendor; + beforeAll(() => { + vendor = require(vendorPath); + }); + + it('Should contains \'name\' as string', () => { + expect(vendor).toHaveProperty('name'); + expect(typeof vendor.name).toBe('string'); + }); + }); +}); diff --git a/src/originalBudgetTrackingApp/node/outputVendors/json/index.js b/src/originalBudgetTrackingApp/node/outputVendors/json/index.js index 4ce57184..4958150b 100644 --- a/src/originalBudgetTrackingApp/node/outputVendors/json/index.js +++ b/src/originalBudgetTrackingApp/node/outputVendors/json/index.js @@ -3,6 +3,7 @@ export const description = 'Create a new Json file with the transactions, or mer export const fields = { filename: { + displayName: 'Path to file', type: 'string', requierd: true, validation: (value) => value && value.length > 0 diff --git a/yarn.lock b/yarn.lock index cc98ea30..55216206 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7737,19 +7737,6 @@ israeli-bank-scrapers-core@^0.8.1: puppeteer-core "^2.0.0" uuid "^3.3.2" -israeli-bank-scrapers@^0.9.0: - version "0.9.0" - resolved "https://registry.npmjs.org/israeli-bank-scrapers/-/israeli-bank-scrapers-0.9.0.tgz#f0fda11d3837a88f515a231df8fe679b834c5166" - integrity sha512-Mt8Zhz4HDq2Vt0vIepxjdM/Z/7Jr1bPjguAjjf2+TAa1dUEDV0lGEqsXJEk+vc/8ZXANkZhHi/TU/eTn8g6KkA== - dependencies: - build-url "^2.0.0" - core-js "^3.1.4" - lodash "^4.17.10" - moment "^2.22.2" - node-fetch "^2.2.0" - puppeteer "^2.0.0" - uuid "^3.3.2" - isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -11356,22 +11343,6 @@ puppeteer-core@^2.0.0: rimraf "^2.6.1" ws "^6.1.0" -puppeteer@^2.0.0: - version "2.1.1" - resolved "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz#ccde47c2a688f131883b50f2d697bd25189da27e" - integrity sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg== - dependencies: - "@types/mime-types" "^2.1.0" - debug "^4.1.0" - extract-zip "^1.6.6" - https-proxy-agent "^4.0.0" - mime "^2.0.3" - mime-types "^2.1.25" - progress "^2.0.1" - proxy-from-env "^1.0.0" - rimraf "^2.6.1" - ws "^6.1.0" - q@^1.1.2, q@~1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" From 070a40cc37b513ec2272239796a85c2358e4d29e Mon Sep 17 00:00:00 2001 From: Baruch Rothkoff Date: Thu, 11 Jun 2020 14:29:42 +0300 Subject: [PATCH 03/29] export outputs vendors --- src/originalBudgetTrackingApp/node/index.js | 2 ++ src/originalBudgetTrackingApp/node/index.test.js | 2 ++ src/originalBudgetTrackingApp/node/outputVendors/index.js | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/originalBudgetTrackingApp/node/index.js b/src/originalBudgetTrackingApp/node/index.js index 4caba2a0..dd1af15f 100644 --- a/src/originalBudgetTrackingApp/node/index.js +++ b/src/originalBudgetTrackingApp/node/index.js @@ -5,7 +5,9 @@ import * as ynab from './outputVendors/ynab/ynab'; import * as googleSheets from './outputVendors/googleSheets/googleSheets'; import * as categoryCalculation from './categoryCalculationScript'; import * as configManager from './configManager'; +import outputs from './outputVendors'; +export { outputs }; export { configManager }; const TRANSACTION_STATUS_COMPLETED = 'completed'; diff --git a/src/originalBudgetTrackingApp/node/index.test.js b/src/originalBudgetTrackingApp/node/index.test.js index ad46b832..71f73ad4 100644 --- a/src/originalBudgetTrackingApp/node/index.test.js +++ b/src/originalBudgetTrackingApp/node/index.test.js @@ -30,6 +30,8 @@ const TRANSACTION_2 = { accountNumber: '2222' }; +jest.mock('./outputVendors', () => []); + describe('Main flow tests', () => { describe('Transaction post processing', () => { test('Transaction hash', () => { diff --git a/src/originalBudgetTrackingApp/node/outputVendors/index.js b/src/originalBudgetTrackingApp/node/outputVendors/index.js index 3625531f..f277ba0f 100644 --- a/src/originalBudgetTrackingApp/node/outputVendors/index.js +++ b/src/originalBudgetTrackingApp/node/outputVendors/index.js @@ -1,3 +1,7 @@ const files = require.context('.', true, /\.\/.+\/index\.js$/); -export default files.keys().map((key) => files(key)); +export default files.keys().reduce((acc, key) => { + const output = files(key); + acc[output.name] = output; + return acc; +}, {}); From 75a0131a543d0218eb3728fac82f98340b3eb890 Mon Sep 17 00:00:00 2001 From: Baruch Rothkoff Date: Sun, 14 Jun 2020 08:22:27 +0300 Subject: [PATCH 04/29] WIP --- .eslintrc.js | 3 +- src/components/MainPage.vue | 4 ++ src/components/MainPage/Exporters.vue | 62 +++------------- .../MainPage/Exporters/JsonExporter.vue | 72 ++++++++++++++----- src/components/Shared/FormField.js | 5 ++ src/originalBudgetTrackingApp/node/index.js | 8 +-- .../node/outputVendors/index.js | 7 +- .../node/outputVendors/json/index.js | 2 +- 8 files changed, 85 insertions(+), 78 deletions(-) create mode 100644 src/components/Shared/FormField.js diff --git a/.eslintrc.js b/.eslintrc.js index e0b3ed38..af32bbcd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -56,7 +56,8 @@ 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', { argsIgnorePattern: '^_' }] }, overrides: [ diff --git a/src/components/MainPage.vue b/src/components/MainPage.vue index 810ae202..0728e6c7 100644 --- a/src/components/MainPage.vue +++ b/src/components/MainPage.vue @@ -73,6 +73,7 @@ import Importers from '@/components/MainPage/Importers'; import DataTable from '@/components/MainPage/DataTable'; import Exporters from '@/components/MainPage/Exporters'; import ProfileChip from '@/components/MainPage/ProfileChip'; +import vendors from '@/originalBudgetTrackingApp/node/outputVendors'; import ReportProblemDialog from './MainPage/ReportProblemDialog'; export default { @@ -108,6 +109,9 @@ export default { ], }; }, + created() { + console.log(JSON.stringify(vendors)); + }, methods: { openExternal(url) { shell.openExternal(url); diff --git a/src/components/MainPage/Exporters.vue b/src/components/MainPage/Exporters.vue index 95880746..3fbd4df9 100644 --- a/src/components/MainPage/Exporters.vue +++ b/src/components/MainPage/Exporters.vue @@ -5,70 +5,30 @@ Exporters - - - - {{ comp.title }} - - - - - - - + + + diff --git a/src/components/shared/FormField/index.js b/src/components/shared/FormField/index.js new file mode 100644 index 00000000..08c254c1 --- /dev/null +++ b/src/components/shared/FormField/index.js @@ -0,0 +1,12 @@ +import textField from './TextField'; + +const typeToComponent = { + text: textField +}; + +export default { + functional: true, + // TODO do we want to inject all props from 'outputVendors' (by passing context.data), + // or we want to sanitize and select specific properties? + render: (h, context) => h(typeToComponent[context.props.type], context.data), +}; diff --git a/src/originalBudgetTrackingApp/node/outputVendors/index.js b/src/originalBudgetTrackingApp/node/outputVendors/index.js index d03883d6..0758e5ba 100644 --- a/src/originalBudgetTrackingApp/node/outputVendors/index.js +++ b/src/originalBudgetTrackingApp/node/outputVendors/index.js @@ -4,7 +4,7 @@ const files = require.context('.', true, /\.\/.+\/index\.js$/); export default files.keys().reduce((acc, key) => { const vendor = files(key); - const name = path.basename(key, '.js'); + const name = path.basename(path.dirname(key)); acc[name] = { name, ...vendor }; return acc; }, {}); diff --git a/src/originalBudgetTrackingApp/node/outputVendors/json/index.js b/src/originalBudgetTrackingApp/node/outputVendors/json/index.js index 84605f84..389f0d08 100644 --- a/src/originalBudgetTrackingApp/node/outputVendors/json/index.js +++ b/src/originalBudgetTrackingApp/node/outputVendors/json/index.js @@ -3,10 +3,14 @@ export const description = 'Create a new Json file with the transactions, or mer export const fields = { filename: { - displayName: 'Path to file', - type: 'string', + label: 'Path to file', + type: 'text', requierd: true, - validation: (value) => value && value.length > 0 + outlined: true, + // value -> true | error message + rules: [ + (value) => (value && value.length > 0) || 'You have to set path to filename', + ] } }; From 30e32863b29abee8adda8db91e635d71b1703bf8 Mon Sep 17 00:00:00 2001 From: Baruch Rothkoff Date: Fri, 26 Jun 2020 10:43:28 +0300 Subject: [PATCH 06/29] Back to ncp --- package.json | 3 ++- yarn.lock | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 775432b4..47731d8d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "build": "vue-cli-service electron:build", "postinstall": "electron-builder install-app-deps", "postuninstall": "electron-builder install-app-deps", - "prepare": "cp -n src/originalBudgetTrackingApp/categoryCalculationScript-example.js src/originalBudgetTrackingApp/categoryCalculationScript.js || true", + "prepare": "ncp src/originalBudgetTrackingApp/categoryCalculationScript-example.js src/originalBudgetTrackingApp/categoryCalculationScript.js || true", "lint": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter src", "lint:fix": "yarn lint --fix", "test": "yarn unit && yarn e2e", @@ -80,6 +80,7 @@ "jest-config": "^26.0.1", "jest-each": "^26.0.1", "jest-environment-jsdom": "^26.0.1", + "ncp": "^2.0.0", "prettier": "^2.0.5", "replace-in-file": "5.0.2", "sass": "^1.26.3", diff --git a/yarn.lock b/yarn.lock index ced5b300..da7fe653 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9634,6 +9634,11 @@ nconf@^0.10.0: secure-keys "^1.0.0" yargs "^3.19.0" +ncp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" + integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= + needle@^2.3.3, needle@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0" From 2640879b7d05cc8d01767ed98af7e4b779946cae Mon Sep 17 00:00:00 2001 From: Baruch Rothkoff Date: Fri, 26 Jun 2020 10:48:14 +0300 Subject: [PATCH 07/29] Fix merge --- src/components/MainPage.vue | 4 ---- src/components/MainPage/Exporters.vue | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/MainPage.vue b/src/components/MainPage.vue index 0728e6c7..810ae202 100644 --- a/src/components/MainPage.vue +++ b/src/components/MainPage.vue @@ -73,7 +73,6 @@ import Importers from '@/components/MainPage/Importers'; import DataTable from '@/components/MainPage/DataTable'; import Exporters from '@/components/MainPage/Exporters'; import ProfileChip from '@/components/MainPage/ProfileChip'; -import vendors from '@/originalBudgetTrackingApp/node/outputVendors'; import ReportProblemDialog from './MainPage/ReportProblemDialog'; export default { @@ -109,9 +108,6 @@ export default { ], }; }, - created() { - console.log(JSON.stringify(vendors)); - }, methods: { openExternal(url) { shell.openExternal(url); diff --git a/src/components/MainPage/Exporters.vue b/src/components/MainPage/Exporters.vue index 3fbd4df9..e839ef12 100644 --- a/src/components/MainPage/Exporters.vue +++ b/src/components/MainPage/Exporters.vue @@ -14,7 +14,7 @@ + + diff --git a/src/components/MainPage/Exporters.vue b/src/components/MainPage/Exporters.vue index e839ef12..0283cd0e 100644 --- a/src/components/MainPage/Exporters.vue +++ b/src/components/MainPage/Exporters.vue @@ -29,26 +29,6 @@ export default { computed: { vendors: () => outputVendors, }, - methods: { - iconClass(success) { - if (success === true) { - return { - icon: 'mdi-check-circle', - color: 'green', - }; - } - if (success === false) { - return { - icon: 'mdi-alert-circle', - color: 'error', - }; - } - return { - icon: 'mdi-help-circle', - color: 'info', - }; - }, - }, }; diff --git a/src/components/MainPage/Exporters/JsonExporter.vue b/src/components/MainPage/Exporters/JsonExporter.vue index fb0fbd17..9b2d1653 100644 --- a/src/components/MainPage/Exporters/JsonExporter.vue +++ b/src/components/MainPage/Exporters/JsonExporter.vue @@ -5,19 +5,23 @@ {{ vendor.displayName }} - + - Export {{ properties.file }} + Save @@ -26,20 +30,15 @@ + + diff --git a/src/components/shared/FormField/index.js b/src/components/shared/FormField/index.js index 08c254c1..3ba869f4 100644 --- a/src/components/shared/FormField/index.js +++ b/src/components/shared/FormField/index.js @@ -1,7 +1,9 @@ import textField from './TextField'; +import fileField from './FileField'; const typeToComponent = { - text: textField + text: textField, + file: fileField, }; export default { diff --git a/src/main.js b/src/main.js index a9a91cf6..a130ee7c 100644 --- a/src/main.js +++ b/src/main.js @@ -11,6 +11,11 @@ import store from './store'; initializeReporter(); +process.on('unhandledRejection', (error) => { + debugger; + console.error(error) +}) + const logger = electron.remote.getGlobal('logger'); logger.info('The renderer process got the logger'); diff --git a/src/originalBudgetTrackingApp/configManager/configUtils.js b/src/originalBudgetTrackingApp/configManager/configUtils.js index f5bc61df..4a7f29c8 100644 --- a/src/originalBudgetTrackingApp/configManager/configUtils.js +++ b/src/originalBudgetTrackingApp/configManager/configUtils.js @@ -1,5 +1,6 @@ -export const getDefaultValues = (vendor) => Object.keys(vendor.fields).reduce((defaultValues, key) => { - const { defaultValue } = vendor.fields[key]; - defaultValues[key] = defaultValue === undefined ? null : defaultValue; - return defaultValues; -}, {}); +export const getDefaultValues = (vendor) => Object.keys(vendor.fields) + .reduce((defaultValues, key) => { + const { defaultValue } = vendor.fields[key]; + defaultValues[key] = defaultValue === undefined ? null : defaultValue; + return defaultValues; + }, {}); diff --git a/src/originalBudgetTrackingApp/outputVendors/json/index.js b/src/originalBudgetTrackingApp/outputVendors/json/index.js index 82fa81e8..218e420b 100644 --- a/src/originalBudgetTrackingApp/outputVendors/json/index.js +++ b/src/originalBudgetTrackingApp/outputVendors/json/index.js @@ -4,10 +4,10 @@ export const description = 'Create a new Json file with the transactions, or mer // TODO: need to think about default object export const fields = { filename: { - label: 'Path to file', + label: 'Output File', type: 'text', - requierd: true, - outlined: true, + // TODO requierd applied by 'rules'? + // requierd: true, // value -> true | error message rules: [ (value) => (value && value.length > 0) || 'You have to set path to filename', diff --git a/src/store/modules/Config.js b/src/store/modules/Config.js index 389c6a97..bb3705dc 100644 --- a/src/store/modules/Config.js +++ b/src/store/modules/Config.js @@ -7,8 +7,7 @@ export const REMOVE_IMPORTER_ACTION = 'REMOVE_IMPORTER_ACTION'; export const GET_IMPORTERS_GETTER = 'GET_IMPORTERS_GETTER'; export const GET_EXPORTER_GETTER = 'GET_EXPORTER_GETTER'; -// TODO defaultConfig or empty? -const state = {}; // defaultConfig; +const state = {}; const mutations = { addImporter: (state, importer) => state.scraping.accountsToScrape.push(importer), From a3f79e5d16409947db22e18e8947b43768a98e3f Mon Sep 17 00:00:00 2001 From: Baruch Rothkoff Date: Wed, 1 Jul 2020 17:58:24 +0300 Subject: [PATCH 12/29] remove test eslint --- test/.eslintrc | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 test/.eslintrc diff --git a/test/.eslintrc b/test/.eslintrc deleted file mode 100644 index 55f121d1..00000000 --- a/test/.eslintrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "env": { - "jest": true - } -} From fc051fc6194f23f2492a8e5ff2121a1cd3767b07 Mon Sep 17 00:00:00 2001 From: Baruch Rothkoff Date: Tue, 14 Jul 2020 19:21:46 +0300 Subject: [PATCH 13/29] Promise not resolved https://github.com/electron/electron/issues/19554 --- src/background.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/background.js b/src/background.js index b5dc4c2f..46986bd2 100644 --- a/src/background.js +++ b/src/background.js @@ -16,7 +16,6 @@ let mainWindow; global.logger = CreateLogger(app); const { logger } = global; - function createWindow() { // Create the browser window. mainWindow = new BrowserWindow({ @@ -28,14 +27,17 @@ function createWindow() { }, }); + // Workaround from https://github.com/electron/electron/issues/19554 + const loadURL = (url) => setTimeout(() => mainWindow.loadURL(url), 100); + if (process.env.WEBPACK_DEV_SERVER_URL) { // Load the url of the dev server if in development mode - mainWindow.loadURL(process.env.WEBPACK_DEV_SERVER_URL); + loadURL(process.env.WEBPACK_DEV_SERVER_URL); if (!process.env.IS_TEST) mainWindow.webContents.openDevTools(); } else { createProtocol('app'); // Load the index.html when not in development - mainWindow.loadURL('app://./index.html'); + loadURL('app://./index.html'); } mainWindow.on('closed', () => { mainWindow = null; From 4a84e53114e44a84782cc13803962f14da68fbbf Mon Sep 17 00:00:00 2001 From: Baruch Rothkoff Date: Tue, 14 Jul 2020 19:24:28 +0300 Subject: [PATCH 14/29] Update lint --- src/components/MainPage/DataTable.vue | 1 - src/components/MainPage/Exporters.vue | 1 - src/components/MainPage/ProfileChip.vue | 1 - src/logger.js | 1 - src/modules/reporting/index.js | 1 - src/modules/spreadsheet/googleOAuth2.js | 1 - src/store/index.js | 1 - src/store/modules/Transactions.js | 1 - yarn.lock | 3388 ++++++++++++++--------- 9 files changed, 2023 insertions(+), 1373 deletions(-) diff --git a/src/components/MainPage/DataTable.vue b/src/components/MainPage/DataTable.vue index 41ff3a0f..d9fd5f51 100644 --- a/src/components/MainPage/DataTable.vue +++ b/src/components/MainPage/DataTable.vue @@ -43,7 +43,6 @@ const detailes = properties.map((prop) => ({ const tableFooterHeight = 59; - export default { name: 'DataTable', data() { diff --git a/src/components/MainPage/Exporters.vue b/src/components/MainPage/Exporters.vue index 0283cd0e..cf7c626b 100644 --- a/src/components/MainPage/Exporters.vue +++ b/src/components/MainPage/Exporters.vue @@ -17,7 +17,6 @@ import { outputVendors } from '@/originalBudgetTrackingApp'; import JsonExporter from './Exporters/JsonExporter'; - export default { components: { JsonExporter }, data() { diff --git a/src/components/MainPage/ProfileChip.vue b/src/components/MainPage/ProfileChip.vue index d8487da5..f63b9580 100644 --- a/src/components/MainPage/ProfileChip.vue +++ b/src/components/MainPage/ProfileChip.vue @@ -56,7 +56,6 @@ diff --git a/src/main.js b/src/main.js index 3a92e575..3a4b2c4c 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import electron from 'electron'; import Vue from 'vue'; -import App from './App'; +import Main from './components/MainPage'; import Splash from './Splash'; import { initializeReporter } from './modules/reporting'; import LoggerPlugin from './plugins/logger'; @@ -28,6 +28,8 @@ new Vue({ store, vuetify, + name: 'IsraeliBankScrapersDesktop', + data() { return { loaded: false, @@ -40,6 +42,6 @@ new Vue({ }); }, render(h) { - return this.loaded ? h(App) : h(Splash); + return this.loaded ? h(Main) : h(Splash); }, }).$mount('#app'); From 4a85c2fa61eb1b44faf0a2e850080d133bcfe125 Mon Sep 17 00:00:00 2001 From: Baruch Rothkoff Date: Wed, 15 Jul 2020 08:11:16 +0300 Subject: [PATCH 21/29] Get input vendors from configManager --- src/Splash.vue | 1 - src/components/MainPage/Importers.vue | 5 ++--- src/modules/importers/index.js | 5 ----- src/modules/importers/scrapers.js | 7 ------- src/originalBudgetTrackingApp/bankScraper.js | 7 ++++++- src/originalBudgetTrackingApp/index.js | 1 + 6 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 src/modules/importers/index.js delete mode 100644 src/modules/importers/scrapers.js diff --git a/src/Splash.vue b/src/Splash.vue index 81bbaf8a..61bbb6db 100644 --- a/src/Splash.vue +++ b/src/Splash.vue @@ -3,7 +3,6 @@