Move window modules into common folder

src/auto-updater/index.js

@@ -14,19 +14,19 @@ const yaml = require('js-yaml')
 
 const log = require('../error-manager/log')
 const BfxMacUpdater = require('./bfx.mac.updater')
-const wins = require('../windows')
+const wins = require('../window-creators/windows')
 const {
   showLoadingWindow,
   hideLoadingWindow
-} = require('../change-loading-win-visibility-state')
+} = require('../window-creators/change-loading-win-visibility-state')
 const {
   closeAlert
 } = require('../modal-dialog-src/utils')
 const parseEnvValToBool = require('../helpers/parse-env-val-to-bool')
 const {
   WINDOW_EVENT_NAMES,
   addOnceProcEventHandler
-} = require('../window-event-manager')
+} = require('../window-creators/window-event-manager')
 
 const MENU_ITEM_IDS = require('../create-menu/menu.item.ids')
 

src/change-sync-frequency.js

@@ -29,7 +29,7 @@ const getAlertCustomClassObj = require(
 const {
   WINDOW_EVENT_NAMES,
   addOnceProcEventHandler
-} = require('./window-event-manager')
+} = require('./window-creators/window-event-manager')
 
 const _getSchedulerRule = (timeFormat, alertRes) => {
   if (timeFormat.value === 'days') {

src/enforce-macos-app-location.js

@@ -6,7 +6,7 @@ const productName = require('./helpers/product-name')
 const {
   showLoadingWindow,
   hideLoadingWindow
-} = require('./change-loading-win-visibility-state')
+} = require('./window-creators/change-loading-win-visibility-state')
 
 module.exports = async () => {
   if (

src/error-manager/show-modal-dialog.js

@@ -7,7 +7,7 @@ const { Converter } = require('showdown')
 const Alert = require('electron-alert')
 const { rootPath } = require('electron-root-path')
 
-const wins = require('../windows')
+const wins = require('../window-creators/windows')
 const spawn = require('../helpers/spawn')
 const getAlertCustomClassObj = require(
   '../helpers/get-alert-custom-class-obj'
@@ -21,7 +21,7 @@ const {
 const {
   WINDOW_EVENT_NAMES,
   addOnceProcEventHandler
-} = require('../window-event-manager')
+} = require('../window-creators/window-event-manager')
 
 const mdStyle = fs.readFileSync(path.join(
   rootPath, 'node_modules', 'github-markdown-css/github-markdown.css'

src/export-db.js

@@ -10,7 +10,7 @@ const showMessageModalDialog = require('./show-message-modal-dialog')
 const {
   showLoadingWindow,
   hideLoadingWindow
-} = require('./change-loading-win-visibility-state')
+} = require('./window-creators/change-loading-win-visibility-state')
 const {
   DEFAULT_ARCHIVE_DB_FILE_NAME,
   DB_FILE_NAME,

src/helpers/is-main-win-available.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const wins = require('../windows')
+const wins = require('../window-creators/windows')
 
 module.exports = (
   win = wins?.mainWindow,

src/initialize-app.js

@@ -7,7 +7,7 @@ const { REPORT_FILES_PATH_VERSION } = require('./const')
 
 const triggerSyncAfterUpdates = require('./trigger-sync-after-updates')
 const triggerElectronLoad = require('./trigger-electron-load')
-const wins = require('./windows')
+const wins = require('./window-creators/windows')
 const runServer = require('./run-server')
 const appStates = require('./app-states')
 const {
@@ -16,7 +16,7 @@ const {
 } = require('./window-creators')
 const {
   hideLoadingWindow
-} = require('./change-loading-win-visibility-state')
+} = require('./window-creators/change-loading-win-visibility-state')
 const makeOrReadSecretKey = require('./make-or-read-secret-key')
 const {
   configsKeeperFactory
@@ -43,7 +43,7 @@ const manageWorkerMessages = require(
 )
 const printToPDF = require('./print-to-pdf')
 
-const pathToLayouts = path.join(__dirname, 'layouts')
+const pathToLayouts = path.join(__dirname, 'window-creators/layouts')
 const pathToLayoutAppInitErr = path
   .join(pathToLayouts, 'app-init-error.html')
 

src/make-single-instance.js

@@ -2,7 +2,7 @@
 
 const { app } = require('electron')
 
-const windows = require('./windows')
+const windows = require('./window-creators/windows')
 
 module.exports = () => {
   const isGottenLock = app.requestSingleInstanceLock()

src/manage-worker-messages.js

@@ -2,7 +2,7 @@
 
 const { app, BrowserWindow } = require('electron')
 
-const wins = require('./windows')
+const wins = require('./window-creators/windows')
 const relaunch = require('./relaunch')
 const showMessageModalDialog = require(
   './show-message-modal-dialog'

src/pause-app.js

@@ -3,7 +3,7 @@
 const ipcs = require('./ipcs')
 const {
   showLoadingWindow
-} = require('./change-loading-win-visibility-state')
+} = require('./window-creators/change-loading-win-visibility-state')
 
 const _closeServer = () => {
   return new Promise((resolve, reject) => {

src/print-to-pdf/index.js

@@ -5,7 +5,7 @@ const fs = require('fs/promises')
 const path = require('path')
 
 const ipcs = require('../ipcs')
-const wins = require('../windows')
+const wins = require('../window-creators/windows')
 
 const PROCESS_MESSAGES = require(
   '../../bfx-reports-framework/workers/loc.api/process.message.manager/process.messages'

src/restore-db/index.js

@@ -7,7 +7,7 @@ const Alert = require('electron-alert')
 const { rootPath } = require('electron-root-path')
 
 const ipcs = require('../ipcs')
-const wins = require('../windows')
+const wins = require('../window-creators/windows')
 const {
   deserializeError
 } = require('../helpers/utils')
@@ -29,7 +29,7 @@ const {
 const {
   WINDOW_EVENT_NAMES,
   addOnceProcEventHandler
-} = require('../window-event-manager')
+} = require('../window-creators/window-event-manager')
 
 const fontsStyle = fs.readFileSync(path.join(
   rootPath, 'bfx-report-ui/build/fonts/roboto.css'

src/show-docs/index.js

@@ -7,7 +7,7 @@ const { Converter } = require('showdown')
 const Alert = require('electron-alert')
 const { rootPath } = require('electron-root-path')
 
-const wins = require('../windows')
+const wins = require('../window-creators/windows')
 const isMainWinAvailable = require(
   '../helpers/is-main-win-available'
 )
@@ -26,7 +26,7 @@ const mdUserManual = fs.readFileSync(
 const {
   WINDOW_EVENT_NAMES,
   addOnceProcEventHandler
-} = require('../window-event-manager')
+} = require('../window-creators/window-event-manager')
 
 const mdStyle = fs.readFileSync(path.join(
   rootPath, 'node_modules', 'github-markdown-css/github-markdown.css'

src/show-notification/show-sync-notification.js

@@ -3,7 +3,7 @@
 const PROCESS_MESSAGES = require(
   '../../bfx-reports-framework/workers/loc.api/process.message.manager/process.messages'
 )
-const wins = require('../windows')
+const wins = require('../window-creators/windows')
 const { isWindowInvisible } = require('../helpers/manage-window')
 const showNotification = require('./')
 

src/show-notification/show-trx-tax-report-notification.js

@@ -3,7 +3,7 @@
 const PROCESS_MESSAGES = require(
   '../../bfx-reports-framework/workers/loc.api/process.message.manager/process.messages'
 )
-const wins = require('../windows')
+const wins = require('../window-creators/windows')
 const { isWindowInvisible } = require('../helpers/manage-window')
 const showNotification = require('./')
 

src/trigger-electron-load.js

@@ -3,7 +3,7 @@
 const path = require('path')
 const fs = require('fs')
 
-const wins = require('./windows')
+const wins = require('./window-creators/windows')
 const pathToTriggerElectronLoad = path.join(
   __dirname,
   '../bfx-report-ui/build/triggerElectronLoad.js'

src/change-loading-win-visibility-state.js → src/window-creators/change-loading-win-visibility-state.js

@@ -7,7 +7,7 @@ const {
   hideWindow,
   showWindow,
   centerWindow
-} = require('./helpers/manage-window')
+} = require('../helpers/manage-window')
 
 let intervalMarker
 
@@ -158,7 +158,7 @@ const showLoadingWindow = async (opts = {}) => {
     typeof wins.loadingWindow !== 'object' ||
     wins.loadingWindow.isDestroyed()
   ) {
-    await require('./window-creators')
+    await require('.')
       .createLoadingWindow()
   }
 

src/window-creators.js → src/window-creators/index.js

@@ -9,11 +9,11 @@ const isDevEnv = process.env.NODE_ENV === 'development'
 const isMac = process.platform === 'darwin'
 
 const wins = require('./windows')
-const ipcs = require('./ipcs')
-const serve = require('./serve')
-const appStates = require('./app-states')
+const ipcs = require('../ipcs')
+const serve = require('../serve')
+const appStates = require('../app-states')
 const windowStateKeeper = require('./window-state-keeper')
-const createMenu = require('./create-menu')
+const createMenu = require('../create-menu')
 const {
   showLoadingWindow,
   hideLoadingWindow
@@ -22,10 +22,10 @@ const {
   showWindow,
   hideWindow,
   centerWindow
-} = require('./helpers/manage-window')
-const isBfxApiStaging = require('./helpers/is-bfx-api-staging')
+} = require('../helpers/manage-window')
+const isBfxApiStaging = require('../helpers/is-bfx-api-staging')
 
-const publicDir = path.join(__dirname, '../bfx-report-ui/build')
+const publicDir = path.join(__dirname, '../../bfx-report-ui/build')
 const loadURL = serve({ directory: publicDir })
 
 const pathToLayouts = path.join(__dirname, 'layouts')
@@ -90,7 +90,7 @@ const _createWindow = async (
     y: !y
       ? bounds.y
       : y,
-    icon: path.join(__dirname, '../build/icons/512x512.png'),
+    icon: path.join(__dirname, '../../build/icons/512x512.png'),
     backgroundColor: '#172d3e',
     show: false,
     ...props,

src/layouts/app-init-error.html → src/window-creators/layouts/app-init-error.html

@@ -3,8 +3,8 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="shortcut icon" href="../../bfx-report-ui/build/favicon.ico">
-    <link href="../../bfx-report-ui/build/fonts/roboto.css" rel="stylesheet">
+    <link rel="shortcut icon" href="../../../bfx-report-ui/build/favicon.ico">
+    <link href="../../../bfx-report-ui/build/fonts/roboto.css" rel="stylesheet">
     <title>Bitfinex Reports</title>
     <style>
       body {

src/layouts/app-init.html → src/window-creators/layouts/app-init.html

@@ -4,8 +4,8 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="shortcut icon" href="../../bfx-report-ui/build/favicon.ico">
-  <link href="../../bfx-report-ui/build/fonts/roboto.css" rel="stylesheet">
+  <link rel="shortcut icon" href="../../../bfx-report-ui/build/favicon.ico">
+  <link href="../../../bfx-report-ui/build/fonts/roboto.css" rel="stylesheet">
   <title>Bitfinex Reports</title>
   <style>
     html {
@@ -201,7 +201,7 @@
     <div></div>
   </div>
   <div class="logo">
-    <img class="logo-img" src="../../build/loader.png" alt="logo">
+    <img class="logo-img" src="../../../build/loader.png" alt="logo">
   </div>
   <div id="description" class="description"></div>
 </body>

src/window-event-manager/index.js → src/window-creators/window-event-manager.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const wins = require('../windows')
+const wins = require('./windows')
 
 const WINDOW_EVENT_NAMES = {
   CLOSED: 'closed'

src/window-state-keeper.js → src/window-creators/window-state-keeper.js

@@ -2,7 +2,7 @@
 
 const { screen } = require('electron')
 
-const { getConfigsKeeperByName } = require('./configs-keeper')
+const { getConfigsKeeperByName } = require('../configs-keeper')
 
 module.exports = (options) => {
   let state = null