#RI-4567 - resolve comments

Author: egor-zalenski

redisinsight/desktop/app.ts

@@ -1,20 +1,20 @@
 /* eslint global-require: off, no-console: off */
 import { app, nativeTheme } from 'electron'
 
-import { initElectronHandlers } from 'desktopSrc/handlers'
-import { launchApiServer } from 'desktopSrc/services'
-import { wrapErrorMessageSensitiveData } from 'desktopSrc/utils'
-import { configMain as config } from 'desktopSrc/config'
 import {
+  initElectronHandlers,
   initLogging,
   WindowType,
   windowFactory,
   AboutPanelOptions,
   checkForUpdate,
   installExtensions,
   initTray,
-  initAutoUpdaterHandlers
+  initAutoUpdaterHandlers,
+  launchApiServer
 } from 'desktopSrc/lib'
+import { wrapErrorMessageSensitiveData } from 'desktopSrc/utils'
+import { configMain as config } from 'desktopSrc/config'
 
 if (!config.isProduction) {
   const sourceMapSupport = require('source-map-support')

redisinsight/desktop/src/handlers/app.handlers.ts renamed to redisinsight/desktop/src/lib/app/app.handlers.ts

@@ -1,7 +1,6 @@
 import { app } from 'electron'
 import log from 'electron-log'
-import { getBackendGracefulShutdown } from 'desktopSrc/services'
-import { WindowType, getWindows, windowFactory } from 'desktopSrc/lib'
+import { getBackendGracefulShutdown, WindowType, getWindows, windowFactory } from 'desktopSrc/lib'
 
 export const initAppHandlers = () => {
   app.on('activate', () => {

redisinsight/desktop/src/handlers/dialog.handlers.ts renamed to redisinsight/desktop/src/lib/app/dialog.handlers.ts

@@ -1,5 +1,5 @@
 import { app, ipcMain } from 'electron'
-import { electronStore } from 'desktopSrc/services'
+import { electronStore } from 'desktopSrc/lib'
 import { IpcEvent } from 'uiSrc/electron/constants'
 
 export const initIPCHandlers = () => {

redisinsight/desktop/src/handlers/index.ts renamed to redisinsight/desktop/src/lib/app/index.ts

@@ -7,3 +7,6 @@ export * from './extensions/extensions'
 export * from './tray/trayManager'
 export * from './window/browserWindow'
 export * from './logging/logging'
+export * from './app'
+export * from './server/server'
+export * from './store/store'

redisinsight/desktop/src/handlers/ipc.handlers.ts renamed to redisinsight/desktop/src/lib/app/ipc.handlers.ts

@@ -1,7 +1,12 @@
 import { app, Menu, shell, BrowserWindow, MenuItemConstructorOptions, MenuItem } from 'electron'
-import { electronStore } from 'desktopSrc/services'
 // eslint-disable-next-line import/no-cycle
-import { getDisplayAppInTrayValue, updateDisplayAppInTray, WindowType, windowFactory } from 'desktopSrc/lib'
+import {
+  getDisplayAppInTrayValue,
+  updateDisplayAppInTray,
+  WindowType,
+  windowFactory,
+  electronStore
+} from 'desktopSrc/lib'
 import { ElectronStorageItem } from 'uiSrc/electron/constants'
 
 interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {

redisinsight/desktop/src/lib/index.ts

@@ -4,7 +4,7 @@ import log from 'electron-log'
 import { configMain as config } from 'desktopSrc/config'
 import { wrapErrorMessageSensitiveData } from 'desktopSrc/utils'
 
-import server from '../../../api/dist/src/main'
+import server from '../../../../api/dist/src/main'
 
 const port = config.defaultPort
 

redisinsight/desktop/src/lib/menu/menu.ts

@@ -1,5 +1,5 @@
 import { BrowserWindow, Tray } from 'electron'
-import { electronStore } from 'desktopSrc/services'
+import { electronStore } from 'desktopSrc/lib'
 import { ElectronStorageItem } from 'uiSrc/electron/constants'
 // eslint-disable-next-line import/no-cycle
 import { TrayBuilder } from './tray'