Skip to content

Commit 01b34dc

Browse files
author
Vikas Agarwal
committed
Merge branch 'hotfix/footer_for_project_form'
2 parents 0d8f700 + c0db0eb commit 01b34dc

File tree

5 files changed

+55
-23
lines changed

5 files changed

+55
-23
lines changed

src/config/projectWizard/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ const products = {
4545
brief: 'Watson Chatbot',
4646
details: 'Build Chatbot using IBM Watson',
4747
formTitle: 'Chatbot powered by IBM Watson®',
48+
formDesclaimer: 'IBM is receiving compensation from Topcoder for referring customers to IBM Watson Conversation Service.',
4849
icon: 'product-chatbot-watson',
4950
id: 'watson_chatbot',
5051
aliases: ['watson_chatbot'],

src/projects/create/components/FillProjectDetails.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,20 @@ class FillProjectDetails extends Component {
5151
<section className="two-col-content content">
5252
<div className="container">
5353
<div className="left-area">
54-
<ProjectBasicDetailsForm
55-
project={project}
56-
sections={sections}
57-
isEdittable
58-
submitHandler={this.props.onCreateProject}
59-
saving={processing}
60-
onProjectChange={this.props.onProjectChange}
61-
submitBtnText={ submitBtnText }
62-
/>
54+
<div className="left-area-content">
55+
<ProjectBasicDetailsForm
56+
project={project}
57+
sections={sections}
58+
isEdittable
59+
submitHandler={this.props.onCreateProject}
60+
saving={processing}
61+
onProjectChange={this.props.onProjectChange}
62+
submitBtnText={ submitBtnText }
63+
/>
64+
</div>
65+
<div className="left-area-footer">
66+
<span>{ _.get(product, 'formDesclaimer') }</span>
67+
</div>
6368
</div>
6469
<div className="right-area">
6570
<Sticky top={20}>

src/projects/create/components/FillProjectDetails.scss

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,35 @@
3434
flex: auto;
3535
width: auto;
3636
position: relative;
37-
border-radius: 4px;
38-
background: $tc-white;
39-
box-shadow: 0px 1px 3px 0px $tc-gray-30;
40-
padding: 50px;
41-
42-
.title {
43-
color: $tc-gray-80;
44-
@include roboto-bold;
37+
38+
.left-area-content {
39+
border-radius: 4px;
40+
background: $tc-white;
41+
box-shadow: 0px 1px 3px 0px $tc-gray-30;
42+
padding: 50px;
43+
44+
.title {
45+
color: $tc-gray-80;
46+
@include roboto-bold;
47+
}
48+
49+
.section-footer {
50+
margin-top: $base_unit * 4;
51+
margin-bottom: 0;
52+
background: none;
53+
height: 40px;
54+
}
4555
}
4656

47-
.section-footer {
48-
margin-top: $base_unit * 4;
49-
margin-bottom: 0;
50-
background: none;
51-
height: 40px;
57+
.left-area-footer {
58+
@include tc-label-sm;
59+
color: $tc-gray-50;
60+
margin-top: 4 * $base_unit;
61+
62+
span {
63+
clear: both;
64+
float: none;
65+
}
5266
}
5367
}
5468

@@ -78,7 +92,7 @@
7892

7993
.ProjectWizard {
8094
.FillProjectDetails {
81-
.left-area .title span,
95+
.left-area-content .title span,
8296
.section-header .section-number {
8397
display: none;
8498
}

src/projects/detail/containers/Specification.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,12 @@ $sideBarMaxWidth: 360px;
300300
resize: vertical;
301301
}
302302
}
303+
304+
.right-area-footer {
305+
@include tc-label-sm;
306+
color: $tc-gray-50;
307+
margin-top: 4 * $base_unit;
308+
}
303309
}
304310

305311
.contents-list {

src/projects/detail/containers/SpecificationContainer.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import Sticky from 'react-stickynode'
88
import ProjectSpecSidebar from '../components/ProjectSpecSidebar'
99
import FooterV2 from '../../../components/FooterV2/FooterV2'
1010
import EditProjectForm from '../components/EditProjectForm'
11+
import { findProduct } from '../../../config/projectWizard'
1112
import { updateProject, fireProjectDirty, fireProjectDirtyUndo } from '../../actions/project'
1213
import spinnerWhileLoading from '../../../components/LoadingSpinner'
1314
// import { Icons } from 'appirio-tech-react-components'
@@ -49,6 +50,8 @@ class SpecificationContainer extends Component {
4950

5051
render() {
5152
const { project, currentMemberRole, processing } = this.props
53+
const productId = _.get(project, 'details.products[0]')
54+
const product = findProduct(productId)
5255

5356
let specification = 'topcoder.v1'
5457
if (project.details && project.details.products && project.details.products[0])
@@ -76,6 +79,9 @@ class SpecificationContainer extends Component {
7679
fireProjectDirty={ this.props.fireProjectDirty }
7780
fireProjectDirtyUndo= { this.props.fireProjectDirtyUndo }
7881
/>
82+
<div className="right-area-footer">
83+
{ _.get(product, 'formDesclaimer') }
84+
</div>
7985
</div>
8086

8187
</div>

0 commit comments

Comments
 (0)