summaryrefslogtreecommitdiff
path: root/app/client/common
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-05-29 18:51:27 +0200
committerJules Laplace <julescarbon@gmail.com>2018-05-29 18:51:27 +0200
commitfe8cef1b709f09f508f17d0d6d06f204dd44a8bb (patch)
tree75c03c0734106dda0a4e5b407778b58ec758d029 /app/client/common
parent7d71a0248a8746088142bb51ce4248c76f274f30 (diff)
pushing files to s3.. filelist color
Diffstat (limited to 'app/client/common')
-rw-r--r--app/client/common/fileList.component.js2
-rw-r--r--app/client/common/header.component.js5
2 files changed, 4 insertions, 3 deletions
diff --git a/app/client/common/fileList.component.js b/app/client/common/fileList.component.js
index 81eeddf..7f4e5fe 100644
--- a/app/client/common/fileList.component.js
+++ b/app/client/common/fileList.component.js
@@ -12,7 +12,7 @@ class FileList extends Component {
const { files } = this.props
const fileList = files.map(file => {
return (
- <div class='row' key={file.name}>
+ <div class='row file' key={file.name}>
<div className="filename">{file.name || file.url}</div>
<div className="size">{file.size ? ((file.size) / 1024 / 1024).toFixed(1) + ' mb.' : ''}</div>
<div className="date">{moment(file.created_at).format("YYYY-MM-DD H:mm")}</div>
diff --git a/app/client/common/header.component.js b/app/client/common/header.component.js
index 5c1c145..02d48b9 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({ fps, app, actions }) {
+function Header({ 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>
@@ -24,7 +24,7 @@ function Header({ fps, app, actions }) {
<span><Link to="/system">system</Link></span>
<span><Link to="/dashboard">dashboard</Link></span>
<Links />
- <span>{fps} fps</span>
+ {playing && <span>{fps} fps</span>}
</header>
)
}
@@ -32,6 +32,7 @@ function Header({ fps, app, actions }) {
const mapStateToProps = state => ({
app: state.system.app,
fps: state.live.fps,
+ playing: state.live.playing,
})
const mapDispatchToProps = (dispatch, ownProps) => ({