diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-06-03 03:30:01 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-06-03 03:30:01 +0200 |
| commit | 551aa368a88b664467a6c850c0dba3ca2e4369ba (patch) | |
| tree | 815287fac8217d70ab936eef2dcae4be65e10723 /app | |
| parent | b78e1b985966b0ad976f7298e6a43b70cf8da603 (diff) | |
deploy bundle
Diffstat (limited to 'app')
| -rw-r--r-- | app/client/common/header.component.js | 5 | ||||
| -rw-r--r-- | app/client/socket/socket.system.js | 5 | ||||
| -rw-r--r-- | app/client/system/system.reducer.js | 7 | ||||
| -rw-r--r-- | app/client/types.js | 1 | ||||
| -rw-r--r-- | app/server/bridge.js | 7 |
5 files changed, 22 insertions, 3 deletions
diff --git a/app/client/common/header.component.js b/app/client/common/header.component.js index 02d48b9..776fbe4 100644 --- a/app/client/common/header.component.js +++ b/app/client/common/header.component.js @@ -7,7 +7,7 @@ import * as systemActions from '../system/system.actions' import modules from '../modules' -function Header({ app, fps, playing, actions }) { +function Header({ site, app, fps, playing, actions }) { const tool_list = Object.keys(modules).map((name, i) => { const label = name.replace(/_/, " ") return <option value={name} key={i}>{label}</option> @@ -15,7 +15,7 @@ function Header({ app, fps, playing, actions }) { const Links = modules[app.tool].links return ( <header> - <b>live cortex</b> + <b>{site.name} cortex</b> <span> <select onChange={e => actions.changeTool(e.target.value)} value={app.tool}> {tool_list} @@ -30,6 +30,7 @@ function Header({ app, fps, playing, actions }) { } const mapStateToProps = state => ({ + site: state.system.site, app: state.system.app, fps: state.live.fps, playing: state.live.playing, diff --git a/app/client/socket/socket.system.js b/app/client/socket/socket.system.js index 3d80902..4ac6cd4 100644 --- a/app/client/socket/socket.system.js +++ b/app/client/socket/socket.system.js @@ -27,6 +27,11 @@ socket.on('system_res', (data) => { type: data.rpc_connected ? types.system.rpc_connected : types.system.rpc_disconnected, runner: data.runner, }) + case 'site': + return dispatch({ + type: types.system.load_site, + site: data.site, + }) default: break } diff --git a/app/client/system/system.reducer.js b/app/client/system/system.reducer.js index fe3d9e3..fd2d7f6 100644 --- a/app/client/system/system.reducer.js +++ b/app/client/system/system.reducer.js @@ -7,7 +7,7 @@ const systemInitialState = { error: null, site: { - name: 'Lens Cortex', + name: 'loading', }, app: { tool: 'samplernn', @@ -126,6 +126,11 @@ const systemReducer = (state = systemInitialState, action) => { error: null, } } + case types.system.load_site: + return { + ...state, + site: action.site, + } case types.system.running_command: return { ...state, diff --git a/app/client/types.js b/app/client/types.js index d758bc6..a367891 100644 --- a/app/client/types.js +++ b/app/client/types.js @@ -2,6 +2,7 @@ import { crud_type } from './api/crud.types' export default { system: { + load_site: 'SYSTEM_LOAD_SITE', running_command: 'SYSTEM_RUNNING_COMMAND', command_output: 'SYSTEM_COMMAND_OUTPUT', relay_connected: 'SYSTEM_RELAY_CONNECTED', diff --git a/app/server/bridge.js b/app/server/bridge.js index a6c465e..776ec31 100644 --- a/app/server/bridge.js +++ b/app/server/bridge.js @@ -74,6 +74,13 @@ function bind_client(socket){ socket.emit('system_res', { type: 'relay_disconnected' }) } + socket.emit('system_res', { + type: 'site', + site: { + name: process.env.SITE_NAME || 'untitled' + } + }) + socket.on('cmd', data => { // console.log('Client sent command', data) relay.emit('cmd', data) |
