Merge branch 'react-pr' into lint-staged

This commit is contained in:
Andrey Okonetchnikov
2016-09-13 18:50:18 +02:00
10 changed files with 124 additions and 68 deletions

View File

@ -4,6 +4,9 @@
vertical-align: top;
text-align: center;
width: 28%;
& h2 {
font-size: 16px;
}
}
.column:not(:last-child) {

View File

@ -13,7 +13,7 @@ export default class UnpublishedListing extends React.Component {
if (!column) {
return entries.entrySeq().map(([currColumn, currEntries]) => (
<div key={currColumn} className={styles.column}>
<h3>{statusDescriptions.get(currColumn)}</h3>
<h2>{statusDescriptions.get(currColumn)}</h2>
{this.renderColumns(currEntries, currColumn)}
</div>
));
@ -22,7 +22,7 @@ export default class UnpublishedListing extends React.Component {
{entries.map(entry => {
// Look for an "author" field. Fallback to username on backend implementation;
const author = entry.getIn(['data', 'author'], entry.getIn(['metaData', 'user']));
const timeStamp = moment(entry.getIn(['metaData', 'timeStamp'])).formate('llll');
const timeStamp = moment(entry.getIn(['metaData', 'timeStamp'])).format('llll');
const link = `/editorialworkflow/${entry.getIn(['metaData', 'collection'])}/${entry.getIn(['metaData', 'status'])}/${entry.get('slug')}`;
return (
<Card key={entry.get('slug')} className={styles.card}>
@ -41,6 +41,7 @@ export default class UnpublishedListing extends React.Component {
return (
<div>
<h1>Editorial Workflow</h1>
{columns}
</div>
);