Merge branch 'develop' into comment-moderation
This commit is contained in:
commit
054b49ecbb
|
@ -23,11 +23,22 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&-brief {
|
||||||
|
font-size: 1rem;
|
||||||
|
margin-bottom: 1.75rem;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
&-tags {
|
||||||
|
text-align: center;
|
||||||
|
margin-bottom: 1.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
&-title {
|
&-title {
|
||||||
font-size: 2.4rem;
|
font-size: 2.4rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin-bottom: 1.75rem;
|
margin-bottom: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-content {
|
&-content {
|
||||||
|
|
|
@ -2,7 +2,7 @@ import React from 'react';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { Icon, Button, Affix } from 'antd';
|
import { Icon, Button, Affix, Tag } from 'antd';
|
||||||
import ExceptionPage from 'components/ExceptionPage';
|
import ExceptionPage from 'components/ExceptionPage';
|
||||||
import { fetchRfp } from 'modules/rfps/actions';
|
import { fetchRfp } from 'modules/rfps/actions';
|
||||||
import { getRfp } from 'modules/rfps/selectors';
|
import { getRfp } from 'modules/rfps/selectors';
|
||||||
|
@ -47,17 +47,40 @@ class RFPDetail extends React.Component<Props> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const tags = [];
|
||||||
|
|
||||||
|
if (rfp.matching) {
|
||||||
|
tags.push(
|
||||||
|
<Tag key="matching" color="#1890ff">
|
||||||
|
x2 matching
|
||||||
|
</Tag>,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rfp.bounty) {
|
||||||
|
tags.push(
|
||||||
|
<Tag key="bounty" color="#CF8A00">
|
||||||
|
<UnitDisplay value={rfp.bounty} symbol="ZEC" /> bounty
|
||||||
|
</Tag>,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="RFPDetail">
|
<div className="RFPDetail">
|
||||||
<div className="RFPDetail-top">
|
<div className="RFPDetail-top">
|
||||||
<Link className="RFPDetail-top-back" to="/requests">
|
<Link className="RFPDetail-top-back" to="/requests">
|
||||||
<Icon type="arrow-left" /> Back to Requests
|
<Icon type="arrow-left" /> Back to Requests
|
||||||
</Link>
|
</Link>
|
||||||
|
|
||||||
<div className="RFPDetail-top-date">
|
<div className="RFPDetail-top-date">
|
||||||
Opened {moment(rfp.dateOpened * 1000).format('LL')}
|
Opened {moment(rfp.dateOpened * 1000).format('LL')}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h1 className="RFPDetail-title">{rfp.title}</h1>
|
<h1 className="RFPDetail-title">{rfp.title}</h1>
|
||||||
|
<div className="RFPDetail-tags">{tags}</div>
|
||||||
|
<p className="RFPDetail-brief">{rfp.brief}</p>
|
||||||
|
|
||||||
<Markdown className="RFPDetail-content" source={rfp.content} />
|
<Markdown className="RFPDetail-content" source={rfp.content} />
|
||||||
<div className="RFPDetail-rules">
|
<div className="RFPDetail-rules">
|
||||||
<ul>
|
<ul>
|
||||||
|
|
Loading…
Reference in New Issue