From 7e9e187c1881420fcd8e82f47d7e5a73768a1cec Mon Sep 17 00:00:00 2001 From: diminator Date: Wed, 19 Aug 2015 17:18:32 +0200 Subject: [PATCH] bug fix breadcrumbs bug fix sluice landing page bug fix sluice register_piece bug fix ownershiphistory pending --- .../slides_container.js | 2 +- .../prize/components/prize_register_piece.js | 37 +++++++++++++++++-- js/components/whitelabel/prize/prize_app.js | 4 +- js/components/whitelabel/wallet/wallet_app.js | 4 +- 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/js/components/ascribe_slides_container/slides_container.js b/js/components/ascribe_slides_container/slides_container.js index 50b6eb82..f63a895e 100644 --- a/js/components/ascribe_slides_container/slides_container.js +++ b/js/components/ascribe_slides_container/slides_container.js @@ -165,7 +165,7 @@ let SlidesContainer = React.createClass({ let breadcrumbs = []; ReactAddons.Children.map(this.props.children, (child, i) => { - if(i >= this.state.startFrom) { + if(i >= this.state.startFrom && child.props['data-slide-title']) { breadcrumbs.push(child.props['data-slide-title']); } }); diff --git a/js/components/whitelabel/prize/components/prize_register_piece.js b/js/components/whitelabel/prize/components/prize_register_piece.js index 9e240444..1e91cca0 100644 --- a/js/components/whitelabel/prize/components/prize_register_piece.js +++ b/js/components/whitelabel/prize/components/prize_register_piece.js @@ -1,6 +1,10 @@ 'use strict'; import React from 'react'; + +import PrizeActions from '../actions/prize_actions'; +import PrizeStore from '../stores/prize_store'; + import RegisterPiece from '../../../register_piece'; import Property from '../../../ascribe_forms/property'; import InputTextAreaToggable from '../../../ascribe_forms/input_textarea_toggable'; @@ -10,8 +14,26 @@ import { getLangText } from '../../../../utils/lang_utils'; let PrizeRegisterPiece = React.createClass({ + getInitialState() { + return PrizeStore.getState(); + }, + + componentDidMount() { + PrizeStore.listen(this.onChange); + PrizeActions.fetchPrize(); + }, + + componentWillUnmount() { + PrizeStore.unlisten(this.onChange); + }, + + onChange(state) { + this.setState(state); + }, + render() { - return ( + if (this.state.prize.active){ + return ( - - ); + ); + } + else { + return ( +
+
+ The prize is no longer active +
+
+ ); + } } }); diff --git a/js/components/whitelabel/prize/prize_app.js b/js/components/whitelabel/prize/prize_app.js index dc95f478..dec859fc 100644 --- a/js/components/whitelabel/prize/prize_app.js +++ b/js/components/whitelabel/prize/prize_app.js @@ -23,9 +23,7 @@ let PrizeApp = React.createClass({ return (
{header} -
- -
+