refactor: Moved shared constants into 'constants' folder.

nrkno · Feb 25, 2022 · 2b807a8 · 2b807a8
1 parent 110ecfb
commit 2b807a8
Show file tree

Hide file tree

Showing 61 changed files with 1,954 additions and 48 deletions.
diff --git a/client/components/ChanStrip.tsx b/client/components/ChanStrip.tsx
@@ -16,10 +16,10 @@ import {
     SOCKET_SET_AUX_LEVEL,
     SOCKET_SET_INPUT_GAIN,
     SOCKET_SET_INPUT_SELECTOR,
-} from '../../shared/SOCKET_IO_DISPATCHERS'
+} from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import ReductionMeter from './ReductionMeter'
 import ClassNames from 'classnames'
-import { fxParamsList } from '../../shared/MixerProtocolInterface'
+import { fxParamsList } from '../../shared/constants/MixerProtocolInterface'
 import { getFaderLabel } from '../utils/labels'
 
 interface IChanStripInjectProps {

diff --git a/client/components/ChanStripEq.tsx b/client/components/ChanStripEq.tsx
@@ -7,8 +7,8 @@ import { Store } from 'redux'
 import { connect } from 'react-redux'
 import { IFader } from '../../shared/faders-types'
 import { IChannel } from '../../shared/channel-types'
-import { SOCKET_SET_FX } from '../../shared/SOCKET_IO_DISPATCHERS'
-import { fxParamsList } from '../../shared/MixerProtocolInterface'
+import { SOCKET_SET_FX } from '../../shared/constants/SOCKET_IO_DISPATCHERS'
+import { fxParamsList } from '../../shared/constants/MixerProtocolInterface'
 import { getFaderLabel } from '../utils/labels'
 
 interface IChanStripFullInjectProps {

diff --git a/client/components/ChanStripFull.tsx b/client/components/ChanStripFull.tsx
@@ -15,10 +15,10 @@ import {
     SOCKET_SET_AUX_LEVEL,
     SOCKET_SET_INPUT_GAIN,
     SOCKET_SET_INPUT_SELECTOR,
-} from '../../shared/SOCKET_IO_DISPATCHERS'
+} from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import ReductionMeter from './ReductionMeter'
 import ClassNames from 'classnames'
-import { fxParamsList } from '../../shared/MixerProtocolInterface'
+import { fxParamsList } from '../../shared/constants/MixerProtocolInterface'
 import { IChannel } from '../../shared/channel-types'
 import { getFaderLabel } from '../utils/labels'
 import ChanStripEq from './ChanStripEq'

diff --git a/client/components/Channel.tsx b/client/components/Channel.tsx
@@ -8,12 +8,12 @@ import '../assets/css/NoUiSlider.css'
 
 //assets:
 import '../assets/css/Channel.css'
-import * as IO from '../../shared/SOCKET_IO_DISPATCHERS'
+import * as IO from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import { IChannelReference, IFader } from '../../shared/faders-types'
 import { ISettings } from '../../shared/settings-types'
 import { storeShowChanStrip } from '../../shared/actions/settingsActions'
 import { withTranslation } from 'react-i18next'
-import { VuLabelConversionType } from '../../shared/MixerProtocolInterface'
+import { VuLabelConversionType } from '../../shared/constants/MixerProtocolInterface'
 import { Conversions } from '../../shared/actions/utils/dbConversion'
 import { getFaderLabel } from '../utils/labels'
 

diff --git a/client/components/ChannelMonitorOptions.tsx b/client/components/ChannelMonitorOptions.tsx
@@ -10,7 +10,7 @@ import {
     SOCKET_SET_AUX_LEVEL,
     SOCKET_SET_FADER_MONITOR,
     SOCKET_SHOW_IN_MINI_MONITOR,
-} from '../../shared/SOCKET_IO_DISPATCHERS'
+} from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import { getFaderLabel } from '../utils/labels'
 
 interface IMonitorSettingsInjectProps {

diff --git a/client/components/ChannelRouteSettings.tsx b/client/components/ChannelRouteSettings.tsx
@@ -5,7 +5,7 @@ import '../assets/css/ChannelRouteSettings.css'
 import { Store } from 'redux'
 import { connect } from 'react-redux'
 import { storeShowOptions } from '../../shared/actions/settingsActions'
-import { SOCKET_SET_ASSIGNED_FADER } from '../../shared/SOCKET_IO_DISPATCHERS'
+import { SOCKET_SET_ASSIGNED_FADER } from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import { IchMixerConnection } from '../../shared/channel-types'
 import { IFader } from '../../shared/faders-types'
 import { getFaderLabel } from '../utils/labels'

diff --git a/client/components/Channels.tsx b/client/components/Channels.tsx
@@ -28,7 +28,7 @@ import {
     SOCKET_CLEAR_PST,
     SOCKET_RESTART_SERVER,
     SOCKET_TOGGLE_ALL_MANUAL,
-} from '../../shared/SOCKET_IO_DISPATCHERS'
+} from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import ChanStripFull from './ChanStripFull'
 
 interface IChannelsInjectProps {

diff --git a/client/components/Labels.tsx b/client/components/Labels.tsx
@@ -10,7 +10,7 @@ import { IFader } from '../../shared/faders-types'
 import {
     SOCKET_FLUSH_LABELS,
     SOCKET_SET_LABELS,
-} from '../../shared/SOCKET_IO_DISPATCHERS'
+} from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import { ICustomPages } from '../../shared/settings-types'
 import { getChannelLabel } from '../utils/labels'
 import { flushExtLabels, updateLabels } from '../../shared/actions/faderActions'

diff --git a/client/components/MicTally.tsx b/client/components/MicTally.tsx
@@ -11,7 +11,7 @@ import { getFaderLabel } from '../utils/labels'
 import {
     SOCKET_TOGGLE_PGM,
     SOCKET_TOGGLE_VO,
-} from '../../shared/SOCKET_IO_DISPATCHERS'
+} from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 
 
 interface IMicTallyInjectProps {

diff --git a/client/components/MiniChanStrip.tsx b/client/components/MiniChanStrip.tsx
@@ -5,7 +5,7 @@ import '../assets/css/MiniChanStrip.css'
 import { Store } from 'redux'
 import { connect } from 'react-redux'
 import { IFader } from '../../shared/faders-types'
-import { SOCKET_SET_AUX_LEVEL } from '../../shared/SOCKET_IO_DISPATCHERS'
+import { SOCKET_SET_AUX_LEVEL } from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import { getFaderLabel } from '../utils/labels'
 
 interface IChanStripInjectProps {

diff --git a/client/components/PagesSettings.tsx b/client/components/PagesSettings.tsx
@@ -13,7 +13,7 @@ import Select from 'react-select'
 import {
     SOCKET_GET_PAGES_LIST,
     SOCKET_SET_PAGES_LIST,
-} from '../../shared/SOCKET_IO_DISPATCHERS'
+} from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import { ICustomPages } from '../../shared/settings-types'
 import { getFaderLabel } from '../utils/labels'
 

diff --git a/client/components/RoutingStorage.tsx b/client/components/RoutingStorage.tsx
@@ -12,7 +12,7 @@ import {
     SOCKET_SAVE_CCG_FILE,
     SOCKET_GET_MIXER_PRESET_LIST,
     SOCKET_LOAD_MIXER_PRESET,
-} from '../../shared/SOCKET_IO_DISPATCHERS'
+} from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 
 interface IStorageProps {
     load: any

diff --git a/client/components/Settings.tsx b/client/components/Settings.tsx
@@ -9,7 +9,7 @@ import '../assets/css/Settings.css'
 import { ISettings } from '../../shared/settings-types'
 import { Store } from 'redux'
 import { ChangeEvent } from 'react'
-import { SOCKET_SAVE_SETTINGS } from '../../shared/SOCKET_IO_DISPATCHERS'
+import { SOCKET_SAVE_SETTINGS } from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import { storeShowSettings } from '../../shared/actions/settingsActions'
 
 //Set style for Select dropdown component:

diff --git a/client/index.tsx b/client/index.tsx
@@ -12,11 +12,11 @@ import {
     SOCKET_GET_CCG_LIST,
     SOCKET_GET_MIXER_PRESET_LIST,
     SOCKET_GET_PAGES_LIST,
-} from '../shared/SOCKET_IO_DISPATCHERS'
+} from '../shared/constants/SOCKET_IO_DISPATCHERS'
 
 import { I18nextProvider } from 'react-i18next'
 import i18n from './i18n'
-import { IMixerProtocol } from '../shared/MixerProtocolInterface'
+import { IMixerProtocol } from '../shared/constants/MixerProtocolInterface'
 
 declare global {
     interface Window {

diff --git a/client/utils/SocketClientHandlers.ts b/client/utils/SocketClientHandlers.ts
@@ -22,7 +22,7 @@ import {
     SOCKET_SET_MIXER_ONLINE,
     SOCKET_RETURN_MIXER_PRESET_LIST,
     SOCKET_RETURN_PAGES_LIST,
-} from '../../shared/SOCKET_IO_DISPATCHERS'
+} from '../../shared/constants/SOCKET_IO_DISPATCHERS'
 import {
     IchMixerConnection,
     InumberOfChannels,

diff --git a/client/webpack.config.js b/client/webpack.config.js
@@ -39,6 +39,9 @@ module.exports = {
     extensions: [ '.tsx', '.ts', '.js' ]
   },
   target: 'web',
+  output: {
+    path: path.resolve(__dirname, '../dist'),
+  },
   plugins: [
     new HtmlWebpackPlugin({
       template: './index.ejs',

diff --git a/electron/package.json b/electron/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "electron",
+  "version": "0.0.0",
+  "main": "electron.js",
+  "license": "MIT",
+  "scripts": {
+    "build": "electron-build -mw"
+  },
+  "devDependencies": {
+    "electron": "^16.0.4",
+    "electron-builder": "^22.14.5"
+  }
+}