Skip to content

Commit eb75cf7

Browse files
author
Victor George
committed
Merge branch 'dev' of https://github.com/appirio-tech/connect-app into design-style-4
* 'dev' of https://github.com/appirio-tech/connect-app: Fixed lint error Github issue #557, General: restore terms of service page -- Restored terms page from v1. We don't have Proxima Nova font now, so used standard roboto font for now. Update Footer.jsx Update FooterV2 Github issue #541 Project Details: notify user when they are leaving Specification tab without saving changes Github issue #542 Project Specifications || Save buttons should be disabled when form is pristine -- Got them fixed by community. Winner: utkarshkukreti Github issue #543, Change project name search to project keyword search -- Fixed. Removed comment Github issue #544, NPM Install error -- Fixed. It was there because of latest update by react-datetime. They have updated the version (2.7.4) in package.json but forgot to make a release for the same. Github issue #527, Discussions: Discussion thread not showing all posts -- Found critical issue when reviewing the code the mentioned issue. It was causing wrong posts to be shown under a topic. Fixed renaming of the form fields. This could have caused either new links or old links to be rendered as empty or may be throw an error. Github issue #526 Add Team Member || Modal is not visible after clicking on Add button -- Applied fix from winner of the challenge. This fix has least intrusive changes with only two files being changed and only 3 lines of addition overall. Other change which I committed in separate branch (feature/add_team_member_scroll) works fine but has changes in more 6-7 files and requires functional component to be stateful. So, we are going to accept this fix as final solution. Updating copy on AddLink.jsx
2 parents 61026b8 + 37a7a09 commit eb75cf7

File tree

15 files changed

+224
-23
lines changed

15 files changed

+224
-23
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"lodash": "^4.16.4",
4646
"moment": "^2.14.1",
4747
"react": "^15.3.1",
48+
"react-datetime": "2.7.1",
4849
"react-addons-css-transition-group": "^15.3.1",
4950
"react-addons-pure-render-mixin": "^15.3.1",
5051
"react-color": "^2.2.7",

‎src/components/ConnectTerms/ConnectTerms.jsx‎

Lines changed: 77 additions & 0 deletions
Large diffs are not rendered by default.

‎src/components/ConnectTerms/ConnectTerms.scss‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
@import 'tc-includes';
2+
3+
.terms-page-wrapper {
4+
background-color: $tc-gray-neutral-light;
5+
text-align: center;
6+
padding-right: 40px;
7+
padding-left: 40px;
8+
padding-bottom: 40px;
9+
@include roboto-light;
10+
11+
.terms-page {
12+
display: block;
13+
max-width: 960px;
14+
padding: 70px 100px;
15+
margin: 20px auto;
16+
17+
text-align: left;
18+
19+
background: $tc-white;
20+
box-shadow: 0px 1px 3px 0px $tc-gray-30;
21+
strong {
22+
@include roboto-bold;
23+
}
24+
25+
& h1,h2,h3 {
26+
text-transform: uppercase;
27+
color: $tc-gray-80;
28+
}
29+
30+
& h1 {
31+
font-size: 28px;
32+
line-height: 35px;
33+
font-weight: 300;
34+
padding-bottom: 15px;
35+
}
36+
& h2 {
37+
font-size: 20px;
38+
line-height: 30px;
39+
padding-bottom: 15px;
40+
padding-top: 10px;
41+
font-weight: 500;
42+
}
43+
44+
& h3 {
45+
font-size: 16px;
46+
line-height: 25px;
47+
padding-bottom: 0;
48+
padding-top: 10px;
49+
font-weight: bold;
50+
}
51+
52+
& p {
53+
@include roboto;
54+
font-size: 16px;
55+
line-height: 25px;
56+
color: $tc-gray-80;
57+
font-weight: 300;
58+
padding-bottom: 1em;
59+
}
60+
61+
& a {
62+
color: $tc-dark-blue;
63+
&:hover {
64+
text-decoration: underline;
65+
}
66+
}
67+
68+
& ol,
69+
& ul {
70+
list-style: outside;
71+
padding-left: 1em;
72+
padding-bottom: 1em;
73+
padding-top: 1em;
74+
font-weight: bold;
75+
li {
76+
@include roboto-light;
77+
font-size: 16px;
78+
line-height: 25px;
79+
color: $tc-gray-80;
80+
padding-bottom: 1em;
81+
padding-left: 1em;
82+
font-weight: 300;
83+
}
84+
}
85+
86+
& ol {
87+
list-style-type: decimal;
88+
}
89+
90+
& ul {
91+
list-style-type: disc;
92+
}
93+
}
94+
}

‎src/components/Footer/Footer.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ require('./Footer.scss')
77
const Footer = () => {
88
const currentYear = moment().format('YYYY')
99
const otherNavigationItems = [
10-
{img: '', text: 'About', link: 'https://www.topcoder.com/about-topcoder/'},
11-
{img: '', text: 'Contact', link: 'https://www.topcoder.com/about-topcoder/contact/'},
12-
{img: '', text: 'Help', link: 'https://help.topcoder.com/hc/en-us'},
13-
{img: '', text: 'Privacy', link: 'https://www.topcoder.com/community/how-it-works/privacy-policy/'},
10+
{img: '', text: 'About', link: 'https://www.topcoder.com/about-topcoder/', target: '_blank'},
11+
{img: '', text: 'Contact', link: 'https://www.topcoder.com/about-topcoder/contact/', target: '_blank'},
12+
{img: '', text: 'Help', link: 'https://help.topcoder.com/hc/en-us', target: '_blank'},
13+
{img: '', text: 'Privacy', link: 'https://www.topcoder.com/community/how-it-works/privacy-policy/', target: '_blank'},
1414
{img: '', text: 'Terms', link: 'https://connect.topcoder.com/terms'}
1515
]
1616
const isProjectDetails = /projects\/\d+/.test(window.location.pathname)

‎src/components/FooterV2/FooterV2.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import './FooterV2.scss'
44
const FooterV2 = () => (
55
<div className="footer-v2">
66
<ul className="footer-links">
7-
<li><a href="https://www.topcoder.com/about-topcoder/">About</a></li>
8-
<li><a href="https://www.topcoder.com/about-topcoder/contact/">Contact</a></li>
9-
<li><a href="https://help.topcoder.com/hc/en-us">Help</a></li>
10-
<li><a href="https://www.topcoder.com/community/how-it-works/privacy-policy/">Privacy</a></li>
7+
<li><a href="https://www.topcoder.com/about-topcoder/" target="_blank">About</a></li>
8+
<li><a href="https://www.topcoder.com/about-topcoder/contact/" target="_blank">Contact</a></li>
9+
<li><a href="https://help.topcoder.com/hc/en-us" target="_blank">Help</a></li>
10+
<li><a href="https://www.topcoder.com/community/how-it-works/privacy-policy/" target="_blank">Privacy</a></li>
1111
<li><a href="https://connect.topcoder.com/terms">Terms</a></li>
1212
</ul>
1313
<div className="footer-copyright">

‎src/components/LinksMenu/AddLink.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ class AddLink extends React.Component {
3434
<Formsy.Form onValidSubmit={onAdd} onValid={this.enableSubmitBtn} onInvalid={this.disableSubmitBtn}>
3535
<TCFormFields.TextInput
3636
name="title"
37-
label="Title"
37+
label="Name"
3838
type="text"
3939
validations="isRequired"
40-
validationError="Title is required"
40+
validationError="Name is required"
4141
maxLength={250}
4242
wrapperClass="form-group"
4343
/>
4444
<TCFormFields.TextInput
4545
name="address"
46-
label="Address"
46+
label="URL"
4747
type="text"
48-
validationError="This is a required field."
48+
validationError="URL is required."
4949
validations={{
5050
isRelaxedUrl: true,
5151
isRequired: true

‎src/components/TeamManagement/AddTeamMember.jsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import AutoCompleteInput from './AutoCompleteInput'
33
import cn from 'classnames'
44
import { Icons } from 'appirio-tech-react-components'
55
import { PROJECT_ROLE_CUSTOMER } from '../../config/constants'
6-
6+
import Scroll from 'react-scroll'
77

88
const { XMarkIcon } = Icons
99

@@ -17,6 +17,7 @@ const AddTeamMember = (props) => {
1717
const onBtnClose = () => {
1818
onKeywordChange('')
1919
onToggleAddTeamMember(false)
20+
Scroll.animateScroll.scrollMore(1)
2021
}
2122
const onConfirmAddMember = () => {
2223
// if adding a customer and there is no owner yet for the project

‎src/components/TeamManagement/AutoCompleteInput.jsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class AutoCompleteInput extends React.Component {
6363
{selectedNewMember && <img src={selectedNewMember.photoURL} />}
6464
</span>
6565
<input
66+
autoFocus
6667
ref="input"
6768
value={keyword}
6869
className="tc-file-field__inputs"

‎src/components/TopBar/TopBar.jsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class TopBar extends Component {
3232
}
3333
/*eslint-enable */
3434

35-
handleSearch(name) {
36-
this.props.applyFilters({ name })
35+
handleSearch(keyword) {
36+
this.props.applyFilters({ keyword })
3737
}
3838

3939
handleMyProjectsFilter(event) {
@@ -107,7 +107,7 @@ class TopBar extends Component {
107107
<SearchBar
108108
hideSuggestionsWhenEmpty
109109
showPopularSearchHeader={ false }
110-
searchTermKey="name"
110+
searchTermKey="keyword"
111111
onTermChange={ this.handleTermChange }
112112
onSearch={ this.handleSearch }
113113
onClearSearch={ this.handleSearch }

‎src/components/TopBar/TopBarContainer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ class TopBarContainer extends React.Component {
7878

7979
applyFilters(filter) {
8080
const criteria = _.assign({}, this.props.criteria, filter)
81-
if (criteria && criteria.name)
82-
criteria.name = encodeURIComponent(criteria.name)
81+
if (criteria && criteria.keyword)
82+
criteria.keyword = encodeURIComponent(criteria.keyword)
8383
this.routeWithParams(criteria, 1)
8484
}
8585

0 commit comments

Comments
 (0)