Skip to content

Layout fixes #6321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ module.exports = {
HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',

THRIVE: 'https://www.topcoder.com/thrive',
THRIVE: 'https://community-app.topcoder-dev.com/thrive',

COMMUNITIES: {
BLOCKCHAIN: 'https://blockchain.topcoder-dev.com',
Expand Down
2 changes: 2 additions & 0 deletions config/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ module.exports = {

COMMUNITY_API: 'http://localhost:8000',

THRIVE: 'https://www.topcoder.com/thrive',

COMMUNITIES: {
BLOCKCHAIN: 'https://blockchain.topcoder.com',
COGNITIVE: 'https://cognitive.topcoder.com',
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/Settings/Account/MyAccount/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ export default class MyAccount extends ConsentComponent {
<div styleName="field col-2">
<div styleName="validation-bar" className="form-field">
<div styleName={`password toggle-password ${focus['new-password-input'] ? 'focus' : ''}`}>
<input id="new-password-input" styleName="password-input" ref={this.newPasswordRef} onChange={this.checkPassword} onFocus={this.onPasswordFocus} onBlur={this.onPasswordBlur} name="password" type={passwordInputType['new-password-input']} placeholder="RE-TYPE YOUR NEW PASSWORD" minLength="8" maxLength="64" required />
<input id="new-password-input" styleName="password-input" ref={this.newPasswordRef} onChange={this.checkPassword} onFocus={this.onPasswordFocus} onBlur={this.onPasswordBlur} name="password" type={passwordInputType['new-password-input']} placeholder="TYPE YOUR NEW PASSWORD" minLength="8" maxLength="64" required />
<label htmlFor="newPasswordCheckbox" styleName="passwordCheckbox">
<input type="checkbox" id="newPasswordCheckbox" styleName="newPasswordCheckbox" onChange={() => this.toggleTypeAttribute('new-password-input')} />
Show
Expand Down Expand Up @@ -818,7 +818,7 @@ export default class MyAccount extends ConsentComponent {
<div styleName="field col-2">
<div styleName="validation-bar" className="form-field">
<div styleName={`password toggle-password ${focus['re-new-password-input'] ? 'focus' : ''}`}>
<input id="re-new-password-input" styleName="password-input" ref={this.reNewPasswordRef} onChange={this.checkPassword} onFocus={this.onPasswordFocus} onBlur={this.onPasswordBlur} name="re-password" type={passwordInputType['re-new-password-input']} placeholder="TYPE YOUR NEW PASSWORD" minLength="8" maxLength="64" required />
<input id="re-new-password-input" styleName="password-input" ref={this.reNewPasswordRef} onChange={this.checkPassword} onFocus={this.onPasswordFocus} onBlur={this.onPasswordBlur} name="re-password" type={passwordInputType['re-new-password-input']} placeholder="RE-TYPE YOUR NEW PASSWORD" minLength="8" maxLength="64" required />
<label htmlFor="reNewPasswordCheckbox" styleName="passwordCheckbox">
<input type="checkbox" id="reNewPasswordCheckbox" styleName="newPasswordCheckbox" onChange={() => this.toggleTypeAttribute('re-new-password-input')} />
Show
Expand Down
64 changes: 24 additions & 40 deletions src/shared/components/challenge-detail/Specification/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -363,53 +363,37 @@ export default function ChallengeDetailsView(props) {
</div>
)
}
<article>
<h2>
Payments
</h2>
{
isWipro ? (
<div>
<p>
For employees of Wipro Technologies, following are the
payment terms. Winner/s would be awarded the prize money on
successful completion and acceptance of the submission by
the stakeholder. Accumulated prize money for the month will
be paid through Wipro payroll as part of subsequent month’s
salary (eg. Aug month challenge winners payment will be
credited as part Sept month salary). For payment of prize
money, respective country currency conversion shall be
considered as per Wipro standard currency conversion
guidelines. Please refer to policy document at
&zwnj;
<a
href="https://wipro365.sharepoint.com/sites/wipro-people-policies/wipro%20policies/TopGear-RewardPoints-Policy.pdf"
rel="noopener noreferrer"
target="_blank"
>
https://wipro365.sharepoint.com/sites/wipro-people-policies/wipro%20policies/TopGear-RewardPoints-Policy.pdf
</a>
&zwnj;
for details regarding the policy.
</p>
</div>
) : (
{isWipro && (
<article>
<h2>
Payments
</h2>
<div>
<p>
Topcoder will compensate members in accordance with our standard payment policies, unless
otherwise specified in this challenge. For information on payment policies, setting up your profile to
receive payments, and general payment questions, please refer to
For employees of Wipro Technologies, following are the
payment terms. Winner/s would be awarded the prize money on
successful completion and acceptance of the submission by
the stakeholder. Accumulated prize money for the month will
be paid through Wipro payroll as part of subsequent month’s
salary (eg. Aug month challenge winners payment will be
credited as part Sept month salary). For payment of prize
money, respective country currency conversion shall be
considered as per Wipro standard currency conversion
guidelines. Please refer to policy document at
&zwnj;
<a
href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions"
href="https://wipro365.sharepoint.com/sites/wipro-people-policies/wipro%20policies/TopGear-RewardPoints-Policy.pdf"
rel="noopener noreferrer"
target="_blank"
>
Payment Policies and Instructions
</a>.
https://wipro365.sharepoint.com/sites/wipro-people-policies/wipro%20policies/TopGear-RewardPoints-Policy.pdf
</a>
&zwnj;
for details regarding the policy.
</p>
)
}
</article>
</div>
</article>
)}
</div>
</div>
<SideBar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ $tc-link-visited: #0c4e98;
.challenge-specs-main {
@include roboto-regular;

width: 100%;
padding: 0 20px;
max-width: 720px;
align-self: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function ThriveArticles({ articles }) {

const getPageUrl = article => (article.externalArticle && article.contentUrl
? article.contentUrl
: `${config.TC_EDU_BASE_PATH}${config.TC_EDU_ARTICLES_PATH}/${article.slug || article.title}`);
: `${config.URL.THRIVE}${config.TC_EDU_ARTICLES_PATH}/${article.slug || article.title}`);

const items = map(articles, (a, idx) => (
<div styleName="article" key={idx}>
Expand Down
2 changes: 1 addition & 1 deletion src/shared/containers/Profile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class ProfileContainer extends React.Component {
handleParam,
} = this.props;

if (loadingError) {
if (loadingError || (info && info.status !== 'ACTIVE')) {
return <Error404 />;
}

Expand Down