From 447efc70966b7ee5cda0e4546dbe9e6062486694 Mon Sep 17 00:00:00 2001 From: Jonas Hermsmeier Date: Tue, 22 May 2018 20:53:07 +0200 Subject: [PATCH] refactor: Move shared/store.js -> gui/app/models/store.js --- lib/gui/app/app.js | 2 +- lib/gui/app/models/settings.js | 2 +- lib/{shared => gui/app/models}/store.js | 14 +++++++------- lib/gui/app/pages/main/controllers/flash.js | 2 +- lib/shared/models/available-drives.js | 2 +- lib/shared/models/flash-state.js | 2 +- lib/shared/models/selection-state.js | 2 +- tests/gui/models/settings.spec.js | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) rename lib/{shared => gui/app/models}/store.js (97%) diff --git a/lib/gui/app/app.js b/lib/gui/app/app.js index 2f1bb576..c56fa71f 100644 --- a/lib/gui/app/app.js +++ b/lib/gui/app/app.js @@ -33,7 +33,7 @@ const EXIT_CODES = require('../../shared/exit-codes') const messages = require('../../shared/messages') const s3Packages = require('../../shared/s3-packages') const release = require('../../shared/release') -const store = require('../../shared/store') +const store = require('./models/store') const errors = require('../../shared/errors') const packageJSON = require('../../../package.json') const flashState = require('../../shared/models/flash-state') diff --git a/lib/gui/app/models/settings.js b/lib/gui/app/models/settings.js index 48ce87dd..a215e745 100644 --- a/lib/gui/app/models/settings.js +++ b/lib/gui/app/models/settings.js @@ -23,7 +23,7 @@ const _ = require('lodash') const Bluebird = require('bluebird') const localSettings = require('./local-settings') -const store = require('../../../shared/store') +const store = require('./store') const errors = require('../../../shared/errors') /** diff --git a/lib/shared/store.js b/lib/gui/app/models/store.js similarity index 97% rename from lib/shared/store.js rename to lib/gui/app/models/store.js index d4d1be29..b78fb4a8 100644 --- a/lib/shared/store.js +++ b/lib/gui/app/models/store.js @@ -20,13 +20,13 @@ const Immutable = require('immutable') const _ = require('lodash') const redux = require('redux') const uuidV4 = require('uuid/v4') -const constraints = require('./drive-constraints') -const supportedFormats = require('./supported-formats') -const errors = require('./errors') -const release = require('./release') -const fileExtensions = require('./file-extensions') -const utils = require('./utils') -const packageJSON = require('../../package.json') +const constraints = require('../../../shared/drive-constraints') +const supportedFormats = require('../../../shared/supported-formats') +const errors = require('../../../shared/errors') +const release = require('../../../shared/release') +const fileExtensions = require('../../../shared/file-extensions') +const utils = require('../../../shared/utils') +const packageJSON = require('../../../../package.json') /** * @summary Verify and throw if any state fields are nil diff --git a/lib/gui/app/pages/main/controllers/flash.js b/lib/gui/app/pages/main/controllers/flash.js index bc3f0918..f9223baf 100644 --- a/lib/gui/app/pages/main/controllers/flash.js +++ b/lib/gui/app/pages/main/controllers/flash.js @@ -25,7 +25,7 @@ const notification = require('../../../os/notification') const exceptionReporter = require('../../../modules/exception-reporter') const imageWriter = require('../../../modules/image-writer') const path = require('path') -const store = require('../../../../../shared/store') +const store = require('../../../models/store') const constraints = require('../../../../../shared/drive-constraints') const availableDrives = require('../../../../../shared/models/available-drives') diff --git a/lib/shared/models/available-drives.js b/lib/shared/models/available-drives.js index 4d73b352..c324cd57 100644 --- a/lib/shared/models/available-drives.js +++ b/lib/shared/models/available-drives.js @@ -17,7 +17,7 @@ 'use strict' const _ = require('lodash') -const store = require('../store') +const store = require('../../gui/app/models/store') /** * @summary Check if there are available drives diff --git a/lib/shared/models/flash-state.js b/lib/shared/models/flash-state.js index 8ae20d10..78630245 100644 --- a/lib/shared/models/flash-state.js +++ b/lib/shared/models/flash-state.js @@ -17,7 +17,7 @@ 'use strict' const _ = require('lodash') -const store = require('../store') +const store = require('../../gui/app/models/store') const units = require('../units') /** diff --git a/lib/shared/models/selection-state.js b/lib/shared/models/selection-state.js index 245d12fb..58d470fb 100644 --- a/lib/shared/models/selection-state.js +++ b/lib/shared/models/selection-state.js @@ -17,7 +17,7 @@ 'use strict' const _ = require('lodash') -const store = require('../store') +const store = require('../../gui/app/models/store') const availableDrives = require('./available-drives') /** diff --git a/tests/gui/models/settings.spec.js b/tests/gui/models/settings.spec.js index 23d91c4d..3fbfd272 100644 --- a/tests/gui/models/settings.spec.js +++ b/tests/gui/models/settings.spec.js @@ -19,7 +19,7 @@ const m = require('mochainon') const _ = require('lodash') const Bluebird = require('bluebird') -const store = require('../../../lib/shared/store') +const store = require('../../../lib/gui/app/models/store') const settings = require('../../../lib/gui/app/models/settings') const localSettings = require('../../../lib/gui/app/models/local-settings')