From fe8cef1b709f09f508f17d0d6d06f204dd44a8bb Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 29 May 2018 18:51:27 +0200 Subject: pushing files to s3.. filelist color --- app/client/common/fileList.component.js | 2 +- app/client/common/header.component.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'app/client/common') 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 ( -
+
{file.name || file.url}
{file.size ? ((file.size) / 1024 / 1024).toFixed(1) + ' mb.' : ''}
{moment(file.created_at).format("YYYY-MM-DD H:mm")}
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 @@ -24,7 +24,7 @@ function Header({ fps, app, actions }) { system dashboard - {fps} fps + {playing && {fps} fps} ) } @@ -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) => ({ -- cgit v1.2.3-70-g09d2