From d1fb0026b622355b69419e9641d752bb1968f047 Mon Sep 17 00:00:00 2001 From: Thomas Nordquist Date: Mon, 4 Mar 2019 18:01:20 +0100 Subject: [PATCH] Reorder imports --- app/src/actions/Connection.ts | 14 ++++++------- app/src/actions/Publish.ts | 4 ++-- app/src/actions/Sidebar.ts | 4 ++-- app/src/actions/Tree.ts | 8 ++++---- app/src/actions/index.ts | 10 +++++----- app/src/components/BrokerStatistics.tsx | 9 ++++----- app/src/components/CodeDiff.tsx | 2 +- app/src/components/Copy.tsx | 8 ++++---- app/src/components/CustomIconButton.tsx | 2 +- app/src/components/Sidebar/MessageHistory.tsx | 4 ++-- app/src/components/Sidebar/NodeStats.tsx | 5 ++--- app/src/components/Sidebar/PlotHistory.tsx | 9 ++++----- app/src/components/TitleBar.tsx | 14 ++++++------- app/src/components/helper/ClearAdornment.tsx | 2 +- app/src/index.tsx | 20 +++++++++---------- app/src/reducers/Connection.ts | 2 +- app/src/reducers/index.ts | 14 ++++++------- 17 files changed, 64 insertions(+), 67 deletions(-) diff --git a/app/src/actions/Connection.ts b/app/src/actions/Connection.ts index e3edc8a..498d54a 100644 --- a/app/src/actions/Connection.ts +++ b/app/src/actions/Connection.ts @@ -1,19 +1,19 @@ import * as q from '../../../backend/src/Model' import * as url from 'url' import { Action, ActionTypes } from '../reducers/Connection' +import { AppState } from '../reducers' +import { DataSourceState, MqttOptions } from '../../../backend/src/DataSource' +import { Dispatch } from 'redux' +import { globalActions } from '.' +import { showError } from './Global' +import { showTree } from './Tree' +import { TopicViewModel } from '../TopicViewModel' import { addMqttConnectionEvent, makeConnectionStateEvent, removeConnection, rendererEvents, } from '../../../events' -import { AppState } from '../reducers' -import { Dispatch } from 'redux' -import { MqttOptions, DataSourceState } from '../../../backend/src/DataSource' -import { showTree } from './Tree' -import { TopicViewModel } from '../TopicViewModel' -import { showError } from './Global' -import { globalActions } from '.'; export const connect = (options: MqttOptions, connectionId: string) => (dispatch: Dispatch, getState: () => AppState) => { dispatch(connecting(connectionId)) diff --git a/app/src/actions/Publish.ts b/app/src/actions/Publish.ts index f857b32..38cf70c 100644 --- a/app/src/actions/Publish.ts +++ b/app/src/actions/Publish.ts @@ -1,7 +1,7 @@ -import { ActionTypes, Action } from '../reducers/Publish' +import { Action, ActionTypes } from '../reducers/Publish' import { AppState } from '../reducers' import { Dispatch } from 'redux' -import { rendererEvents, makePublishEvent } from '../../../events' +import { makePublishEvent, rendererEvents } from '../../../events' export const setTopic = (topic?: string): Action => { return { diff --git a/app/src/actions/Sidebar.ts b/app/src/actions/Sidebar.ts index 1eb38ae..d057fc9 100644 --- a/app/src/actions/Sidebar.ts +++ b/app/src/actions/Sidebar.ts @@ -1,7 +1,7 @@ -import { Dispatch, Action } from 'redux' +import * as q from '../../../backend/src/Model' +import { Action, Dispatch } from 'redux' import { AppState } from '../reducers' import { makePublishEvent, rendererEvents } from '../../../events' -import * as q from '../../../backend/src/Model' export const clearRetainedTopic = () => (dispatch: Dispatch, getState: () => AppState) => { const { selectedTopic } = getState().tree diff --git a/app/src/actions/Tree.ts b/app/src/actions/Tree.ts index 97c9e16..0d51279 100644 --- a/app/src/actions/Tree.ts +++ b/app/src/actions/Tree.ts @@ -1,10 +1,10 @@ -import { AppState } from '../reducers' -import { ActionTypes } from '../reducers/Tree' import * as q from '../../../backend/src/Model' -import { Dispatch, AnyAction } from 'redux' +import { ActionTypes } from '../reducers/Tree' +import { AnyAction, Dispatch } from 'redux' +import { AppState } from '../reducers' +import { batchActions } from 'redux-batched-actions' import { setTopic } from './Publish' import { TopicViewModel } from '../TopicViewModel' -import { batchActions } from 'redux-batched-actions' const debounce = require('lodash.debounce') export const selectTopic = (topic: q.TreeNode) => (dispatch: Dispatch, getState: () => AppState) => { diff --git a/app/src/actions/index.ts b/app/src/actions/index.ts index 3c205b2..4b88872 100644 --- a/app/src/actions/index.ts +++ b/app/src/actions/index.ts @@ -1,10 +1,10 @@ -import * as settingsActions from './Settings' -import * as publishActions from './Publish' -import * as treeActions from './Tree' -import * as updateNotifierActions from './UpdateNotifier' import * as connectionActions from './Connection' -import * as sidebarActons from './Sidebar' import * as connectionManagerActions from './ConnectionManager' import * as globalActions from './Global' +import * as publishActions from './Publish' +import * as settingsActions from './Settings' +import * as sidebarActons from './Sidebar' +import * as treeActions from './Tree' +import * as updateNotifierActions from './UpdateNotifier' export { settingsActions, treeActions, publishActions, updateNotifierActions, connectionActions, sidebarActons, connectionManagerActions, globalActions } diff --git a/app/src/components/BrokerStatistics.tsx b/app/src/components/BrokerStatistics.tsx index 48f5c33..5015272 100644 --- a/app/src/components/BrokerStatistics.tsx +++ b/app/src/components/BrokerStatistics.tsx @@ -1,12 +1,11 @@ -import * as React from 'react' import * as q from '../../../backend/src/Model' - +import * as React from 'react' import { AppState } from '../reducers' -import { Typography } from '@material-ui/core' -import { StyleRulesCallback, withStyles } from '@material-ui/core/styles' - import { connect } from 'react-redux' +import { StyleRulesCallback, withStyles } from '@material-ui/core/styles' import { TopicViewModel } from '../TopicViewModel' +import { Typography } from '@material-ui/core' + const abbreviate = require('number-abbreviate') interface Stats { diff --git a/app/src/components/CodeDiff.tsx b/app/src/components/CodeDiff.tsx index e0401ca..9580b31 100644 --- a/app/src/components/CodeDiff.tsx +++ b/app/src/components/CodeDiff.tsx @@ -1,7 +1,7 @@ import * as diff from 'diff' import * as Prism from 'prismjs' import * as React from 'react' -import { Theme, withStyles, Badge } from '@material-ui/core' +import { Badge, Theme, withStyles } from '@material-ui/core' import 'prismjs/components/prism-json' import 'prismjs/themes/prism-tomorrow.css' diff --git a/app/src/components/Copy.tsx b/app/src/components/Copy.tsx index 2c0cc5d..e00955b 100644 --- a/app/src/components/Copy.tsx +++ b/app/src/components/Copy.tsx @@ -1,10 +1,10 @@ import * as React from 'react' -import { Snackbar, SnackbarContent, Tooltip } from '@material-ui/core' -import FileCopy from '@material-ui/icons/FileCopy' import Check from '@material-ui/icons/Check' +import CustomIconButton from './CustomIconButton' +import FileCopy from '@material-ui/icons/FileCopy' import green from '@material-ui/core/colors/green' -import { withStyles, Theme } from '@material-ui/core/styles' -import CustomIconButton from './CustomIconButton'; +import { Snackbar, SnackbarContent, Tooltip } from '@material-ui/core' +import { Theme, withStyles } from '@material-ui/core/styles' const copy = require('copy-text-to-clipboard') diff --git a/app/src/components/CustomIconButton.tsx b/app/src/components/CustomIconButton.tsx index 36753ce..7d38e7c 100644 --- a/app/src/components/CustomIconButton.tsx +++ b/app/src/components/CustomIconButton.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { IconButton } from '@material-ui/core' -import { withStyles, Theme } from '@material-ui/core/styles' +import { Theme, withStyles } from '@material-ui/core/styles' interface Props { onClick: any, diff --git a/app/src/components/Sidebar/MessageHistory.tsx b/app/src/components/Sidebar/MessageHistory.tsx index e0ae14a..f0bf8e5 100644 --- a/app/src/components/Sidebar/MessageHistory.tsx +++ b/app/src/components/Sidebar/MessageHistory.tsx @@ -1,10 +1,10 @@ -import * as React from 'react' import * as q from '../../../../backend/src/Model' - +import * as React from 'react' import BarChart from '@material-ui/icons/BarChart' import DateFormatter from '../helper/DateFormatter' import History from './History' import { TopicViewModel } from '../../TopicViewModel' + const PlotHistory = React.lazy(() => import('./PlotHistory')) const throttle = require('lodash.throttle') diff --git a/app/src/components/Sidebar/NodeStats.tsx b/app/src/components/Sidebar/NodeStats.tsx index 99a3da5..31257d3 100644 --- a/app/src/components/Sidebar/NodeStats.tsx +++ b/app/src/components/Sidebar/NodeStats.tsx @@ -1,8 +1,7 @@ -import * as React from 'react' import * as q from '../../../../backend/src/Model' - -import { Typography } from '@material-ui/core' +import * as React from 'react' import { TopicViewModel } from '../../TopicViewModel' +import { Typography } from '@material-ui/core' interface Props { node: q.TreeNode diff --git a/app/src/components/Sidebar/PlotHistory.tsx b/app/src/components/Sidebar/PlotHistory.tsx index 8e7c0c7..778bb21 100644 --- a/app/src/components/Sidebar/PlotHistory.tsx +++ b/app/src/components/Sidebar/PlotHistory.tsx @@ -1,10 +1,9 @@ -const { XYPlot, XAxis, LineMarkSeries, Hint, YAxis, HorizontalGridLines, LineSeries } = require('react-vis') -import { default as ReactResizeDetector } from 'react-resize-detector' - -import DateFormatter from '../helper/DateFormatter' -import * as React from 'react' import * as q from '../../../../backend/src/Model' +import * as React from 'react' +import DateFormatter from '../helper/DateFormatter' +import { default as ReactResizeDetector } from 'react-resize-detector' import 'react-vis/dist/style.css' +const { XYPlot, LineMarkSeries, Hint, YAxis, HorizontalGridLines } = require('react-vis') interface Props { messages: q.Message[] diff --git a/app/src/components/TitleBar.tsx b/app/src/components/TitleBar.tsx index de11e55..414aa7b 100644 --- a/app/src/components/TitleBar.tsx +++ b/app/src/components/TitleBar.tsx @@ -1,8 +1,15 @@ import * as React from 'react' import ClearAdornment from './helper/ClearAdornment' import CloudOff from '@material-ui/icons/CloudOff' +import ConnectionHealthIndicator from './ConnectionHealthIndicator' import Menu from '@material-ui/icons/Menu' import Search from '@material-ui/icons/Search' +import { AppState } from '../reducers' +import { bindActionCreators } from 'redux' +import { connect } from 'react-redux' +import { connectionActions, settingsActions } from '../actions' +import { fade } from '@material-ui/core/styles/colorManipulator' +import { StyleRulesCallback, withStyles } from '@material-ui/core/styles' import { AppBar, Button, @@ -11,13 +18,6 @@ import { Toolbar, Typography, } from '@material-ui/core' -import { AppState } from '../reducers' -import { bindActionCreators } from 'redux' -import { connect } from 'react-redux' -import { connectionActions, settingsActions } from '../actions' -import { fade } from '@material-ui/core/styles/colorManipulator' -import { StyleRulesCallback, withStyles } from '@material-ui/core/styles' -import ConnectionHealthIndicator from './ConnectionHealthIndicator'; const styles: StyleRulesCallback = theme => ({ title: { diff --git a/app/src/components/helper/ClearAdornment.tsx b/app/src/components/helper/ClearAdornment.tsx index a7f9dc1..c4dfe7a 100644 --- a/app/src/components/helper/ClearAdornment.tsx +++ b/app/src/components/helper/ClearAdornment.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import { IconButton } from '@material-ui/core' import Clear from '@material-ui/icons/Clear' +import { IconButton } from '@material-ui/core' interface Props { value?: string diff --git a/app/src/index.tsx b/app/src/index.tsx index 4c41af0..e0df202 100644 --- a/app/src/index.tsx +++ b/app/src/index.tsx @@ -1,17 +1,17 @@ -import './tracking' - import * as React from 'react' import * as ReactDOM from 'react-dom' -import reduxThunk from 'redux-thunk' -import { batchDispatchMiddleware } from 'redux-batched-actions' - -import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles' -import reducers from './reducers' - import App from './App' -import { Provider } from 'react-redux' -import { createStore, applyMiddleware, compose } from 'redux' import Demo from './components/demo' +import reducers from './reducers' +import reduxThunk from 'redux-thunk' +import { applyMiddleware, compose, createStore } from 'redux' +import { batchDispatchMiddleware } from 'redux-batched-actions' +import { createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles' +import { Provider } from 'react-redux' +import './tracking' + + + const composeEnhancers = /*(window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || */ compose const store = createStore( diff --git a/app/src/reducers/Connection.ts b/app/src/reducers/Connection.ts index 016d2f8..0c5b8dd 100644 --- a/app/src/reducers/Connection.ts +++ b/app/src/reducers/Connection.ts @@ -1,6 +1,6 @@ +import * as q from '../../../backend/src/Model' import { Action } from 'redux' import { createReducer } from './lib' -import * as q from '../../../backend/src/Model' import { MqttOptions } from '../../../backend/src/DataSource' import { TopicViewModel } from '../TopicViewModel' diff --git a/app/src/reducers/index.ts b/app/src/reducers/index.ts index 93b2ace..890f9a6 100644 --- a/app/src/reducers/index.ts +++ b/app/src/reducers/index.ts @@ -1,11 +1,11 @@ -import { Action, Reducer, combineReducers } from 'redux' - +import { Action, combineReducers, Reducer } from 'redux' +import { connectionManagerReducer, ConnectionManagerState } from './ConnectionManager' +import { connectionReducer, ConnectionState } from './Connection' +import { publishReducer, PublishState } from './Publish' +import { settingsReducer, SettingsState } from './Settings' import { trackEvent } from '../tracking' -import { PublishState, publishReducer } from './Publish' -import { ConnectionState, connectionReducer } from './Connection' -import { SettingsState, settingsReducer } from './Settings' -import { TreeState, treeReducer } from './Tree' -import { ConnectionManagerState, connectionManagerReducer } from './ConnectionManager' +import { treeReducer, TreeState } from './Tree' + export enum ActionTypes { showUpdateNotification = 'SHOW_UPDATE_NOTIFICATION',