React/Redux - publish component #323

Merged
bones7242 merged 80 commits from react-upload into master 2018-01-25 22:43:20 +01:00
3 changed files with 7 additions and 3 deletions
Showing only changes of commit c25aa72cbc - Show all commits

View file

@ -46,7 +46,7 @@ function PublishStatus ({ status, message }) {
PublishStatus.propTypes = { PublishStatus.propTypes = {
status : PropTypes.string.isRequired, status : PropTypes.string.isRequired,
message: PropTypes.string.isRequired, message: PropTypes.string,
}; };
export default PublishStatus; export default PublishStatus;

View file

@ -1,4 +1,5 @@
import React from 'react'; import React from 'react';
import ProgressBar from 'components/ProgressBar';
import { makeGetRequest, makePostRequest } from 'utils/xhr'; import { makeGetRequest, makePostRequest } from 'utils/xhr';
import { setUserCookies } from 'utils/cookies'; import { setUserCookies } from 'utils/cookies';
@ -150,7 +151,10 @@ class ChannelCreateForm extends React.Component {
</div> </div>
</form> </form>
) : ( ) : (
<p className="label">{this.state.status}</p> <div>
<p className="fine-print">{this.state.status}</p>
<ProgressBar size={12}/>
</div>
)} )}
</div> </div>
); );

View file

@ -25,7 +25,6 @@ class PublishMetadataInputs extends React.Component {
render () { render () {
return ( return (
<div id="publish-details" className="row row--padded row--no-top row--wide"> <div id="publish-details" className="row row--padded row--no-top row--wide">
<a className="label link--primary" id="publish-details-toggle" href="#" onClick={this.toggleShowInputs}>{this.props.showMetadataInputs ? '[less]' : '[more]'}</a>
{this.props.showMetadataInputs && ( {this.props.showMetadataInputs && (
<div> <div>
<div className="row row--no-top"> <div className="row row--no-top">
@ -66,6 +65,7 @@ class PublishMetadataInputs extends React.Component {
</div> </div>
</div> </div>
)} )}
<a className="label link--primary" id="publish-details-toggle" href="#" onClick={this.toggleShowInputs}>{this.props.showMetadataInputs ? '[less]' : '[more]'}</a>
</div> </div>
); );
} }