From 6183420a9d435acb304b60c4472055cf816bcccb Mon Sep 17 00:00:00 2001 From: Daniel Ternyak Date: Mon, 18 Feb 2019 12:08:20 -0600 Subject: [PATCH 1/2] Show tags and brief on RFP detail --- frontend/client/components/RFP/index.less | 13 +++++++++++- frontend/client/components/RFP/index.tsx | 26 ++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/frontend/client/components/RFP/index.less b/frontend/client/components/RFP/index.less index b9ae68f2..74513ef7 100644 --- a/frontend/client/components/RFP/index.less +++ b/frontend/client/components/RFP/index.less @@ -23,11 +23,22 @@ } } + &-brief { + font-size: 1rem; + margin-bottom: 1.75rem; + text-align: center; + } + + &-tags { + text-align: center; + margin-bottom: 1.75rem; + } + &-title { font-size: 2.4rem; text-align: center; font-weight: bold; - margin-bottom: 1.75rem; + margin-bottom: 1rem; } &-content { diff --git a/frontend/client/components/RFP/index.tsx b/frontend/client/components/RFP/index.tsx index 3600ac3c..91365b5d 100644 --- a/frontend/client/components/RFP/index.tsx +++ b/frontend/client/components/RFP/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import moment from 'moment'; import { connect } from 'react-redux'; 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 { fetchRfp } from 'modules/rfps/actions'; import { getRfp } from 'modules/rfps/selectors'; @@ -47,17 +47,41 @@ class RFPDetail extends React.Component { } } + const tags = []; + + if (rfp.matching) { + tags.push( + + x2 matching + , + ); + } + + if (rfp.bounty) { + tags.push( + + bounty + , + ); + } + return (
Back to Requests +
Opened {moment(rfp.dateOpened * 1000).format('LL')}
+

{rfp.title}

+
{tags}
+ +

{rfp.brief}

+
    From 00b4a2fbc8b3e7aa283639e5051a0395e65206d1 Mon Sep 17 00:00:00 2001 From: Daniel Ternyak Date: Mon, 18 Feb 2019 12:12:25 -0600 Subject: [PATCH 2/2] remove empty space --- frontend/client/components/RFP/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/client/components/RFP/index.tsx b/frontend/client/components/RFP/index.tsx index 91365b5d..44642334 100644 --- a/frontend/client/components/RFP/index.tsx +++ b/frontend/client/components/RFP/index.tsx @@ -79,7 +79,6 @@ class RFPDetail extends React.Component {

    {rfp.title}

    {tags}
    -

    {rfp.brief}