Skip to content

Bug fixes #5155

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 62 commits into from
Nov 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
5e16bd1
#5032 removed dropdown
kkartunov Oct 12, 2020
b8c4a59
Add logo and profile
kkartunov Oct 12, 2020
14aac6e
SSR: Revert changes make in PR #4285
luizrrodrigues Oct 14, 2020
b9e2811
ci: deploy seo-fix to Stag env
luizrrodrigues Oct 14, 2020
1d2a7f1
Fixes for 4029, 4994, 5102
dedywahyudi Oct 14, 2020
5f31b78
fixes based on feedback
dedywahyudi Oct 14, 2020
d58f288
ci: deploy dedywahyudi/4029-4994-5102 to Stag env
luizrrodrigues Oct 15, 2020
b13b2de
move url to configs
dedywahyudi Oct 15, 2020
1fb5ee0
fix different spacing
dedywahyudi Oct 15, 2020
fe1cf3e
Merge branch 'master' into tco-header-dropdown
kkartunov Oct 15, 2020
2b09f0e
Fixes for #5032
kkartunov Oct 15, 2020
1aa1e01
Update index.jsx
PrakashDurlabhji Oct 15, 2020
e8b6b89
Update ChallengeFilters.jsx
PrakashDurlabhji Oct 15, 2020
ae99333
Update index.jsx
PrakashDurlabhji Oct 15, 2020
d18b2b1
Update index.jsx
PrakashDurlabhji Oct 15, 2020
312d56b
Update index.jsx
PrakashDurlabhji Oct 15, 2020
fa753ae
Update index.jsx.snap
PrakashDurlabhji Oct 15, 2020
595ff74
fix: no challenges message when sorting all challenges
gets0ul Oct 15, 2020
e2b07f2
Update ChallengeFilters.jsx
PrakashDurlabhji Oct 15, 2020
1ba0692
Update index.jsx
PrakashDurlabhji Oct 15, 2020
33220f7
Merge pull request #5109 from topcoder-platform/issue-5093-pkdurlabhji
luizrrodrigues Oct 15, 2020
41e0490
Update TopcoderFooter.jsx.snap
PrakashDurlabhji Oct 15, 2020
c36f75c
Merge pull request #5112 from topcoder-platform/issue-3215-pkdurlabhji
luizrrodrigues Oct 15, 2020
7213ca8
fix: empty values in dashboard sub-community
gets0ul Oct 15, 2020
b25dd09
Update ChallengeFilters.jsx
PrakashDurlabhji Oct 15, 2020
b99c9ad
Update index.jsx
PrakashDurlabhji Oct 15, 2020
9858be2
Merge pull request #5115 from topcoder-platform/issue-5035-pkdurlabhji
luizrrodrigues Oct 15, 2020
5d3c3aa
Update ChallengeFilters.jsx
PrakashDurlabhji Oct 15, 2020
2719939
Update ChallengeFilters.jsx
PrakashDurlabhji Oct 15, 2020
fa78ea7
Update index.jsx
PrakashDurlabhji Oct 15, 2020
06e9f93
Update index.jsx.snap
PrakashDurlabhji Oct 15, 2020
865a898
Update index.jsx.snap
PrakashDurlabhji Oct 15, 2020
345e915
Update index.jsx
PrakashDurlabhji Oct 15, 2020
032c5cf
Merge pull request #5111 from topcoder-platform/issue-5071-pkdurlabhji
luizrrodrigues Oct 16, 2020
1605740
fix: #5081 hide view more button when result is less than 10
gets0ul Oct 16, 2020
1ced930
Merge pull request #5117 from topcoder-platform/issue-4252-pkdurlabhji
luizrrodrigues Oct 16, 2020
bf4c5f8
Merge pull request #5110 from topcoder-platform/issue-5083-pkdurlabhji
luizrrodrigues Oct 16, 2020
169c172
issue-5072
Oct 17, 2020
fc86b83
Merge pull request #5122 from topcoder-platform/issue-5081-gets0ul
luizrrodrigues Oct 17, 2020
5017bdb
Merge branch 'bug-bash' into issue-5088-gets0ul
luizrrodrigues Oct 18, 2020
d1b40f6
Merge branch 'issue-5088-gets0ul' into bug-bash
luizrrodrigues Oct 18, 2020
74efb44
Merge pull request #5124 from topcoder-platform/issue-5072-Lieutenant…
luizrrodrigues Oct 18, 2020
fe857a9
ci: Deploy develop to Stag and QA env
luizrrodrigues Oct 18, 2020
039cdd7
Merge pull request #5116 from topcoder-platform/issue-5046-gets0ul
luizrrodrigues Oct 19, 2020
33e2226
ci: deploy tco-header-dropdown to Stag env
luizrrodrigues Oct 19, 2020
3451199
ci: on test
kkartunov Oct 20, 2020
6ffa4df
ci: remove from staging
kkartunov Oct 21, 2020
fd5a6d3
Fixed return URL bug
kkartunov Oct 21, 2020
1a93030
f2f-30146374
Oct 26, 2020
fb6f70f
Merge pull request #5141 from topcoder-platform/f2f-30146374
luizrrodrigues Oct 26, 2020
57482d7
ci: deploy seo-fix to Test env
luizrrodrigues Oct 26, 2020
f20c97d
ci: deploy seo-fix to Stag env
luizrrodrigues Nov 2, 2020
0a9a473
Merge branch 'develop' into bug-bash
luizrrodrigues Nov 3, 2020
2fedc9c
Merge branch 'develop' into seo-fix
luizrrodrigues Nov 3, 2020
6a7c9e6
ci: remove bug-bash from QA env
luizrrodrigues Nov 3, 2020
b49fc07
Merge branch 'develop' into dedywahyudi/4029-4994-5102
luizrrodrigues Nov 3, 2020
96fd7f6
Merge pull request #5150 from topcoder-platform/bug-bash
luizrrodrigues Nov 3, 2020
3efa2be
Merge pull request #5151 from topcoder-platform/seo-fix
luizrrodrigues Nov 3, 2020
9f13236
Merge pull request #5104 from topcoder-platform/dedywahyudi/4029-4994…
luizrrodrigues Nov 3, 2020
12f2125
ci: remove develop from QA and Test envs
luizrrodrigues Nov 3, 2020
44f42d4
Merge branch 'develop' into tco-header-dropdown
luizrrodrigues Nov 3, 2020
31958f6
Merge pull request #5152 from topcoder-platform/tco-header-dropdown
luizrrodrigues Nov 3, 2020
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 .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ workflows:
filters:
branches:
only:
- listing-develop-sync
- issue-5041
# This is beta env for production soft releases
- "build-prod-beta":
context : org-global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
</a>
<a
className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost src-shared-components-Dashboard-SRM-___styles__tc-btn___3no83"
href="https://www.topcoder-dev.com/member-onboarding/learning-practicing-skills/"
href="https://www.topcoder-dev.com/thrive/articles/How%20To%20Compete%20in%20SRMs"
>
Learn More
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exports[`renders a full Profile correctly 1`] = `
>
<Sticky
activeClass="active"
bottomBoundary={-250}
bottomBoundary={0}
enableTransforms={true}
enabled={true}
onStateChange={null}
Expand Down Expand Up @@ -630,7 +630,7 @@ exports[`renders an empty Profile correctly 1`] = `
>
<Sticky
activeClass="active"
bottomBoundary={-250}
bottomBoundary={0}
enableTransforms={true}
enabled={true}
onStateChange={null}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science"
href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science&tax="
>
Data Science
</a>
Expand All @@ -115,7 +115,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Design"
href="https://www.topcoder-dev.com/thrive/tracks?track=Design&tax="
>
Design
</a>
Expand All @@ -124,7 +124,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=Development"
href="https://www.topcoder-dev.com/thrive/tracks?track=Development&tax="
>
Development
</a>
Expand All @@ -133,7 +133,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
<a
href="https://www.topcoder-dev.com/thrive/tracks?track=QA"
href="https://www.topcoder-dev.com/thrive/tracks?track=QA&tax="
>
QA
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exports[`Matches shallow shapshot 1`] = `
/>
</div>
<Footer
hideTcLinksInFooter={false}
hideTcLinksInFooter={true}
/>
</div>
`;
Expand All @@ -37,7 +37,7 @@ exports[`Matches shallow shapshot 2`] = `
/>
</div>
<Footer
hideTcLinksInFooter={false}
hideTcLinksInFooter={true}
/>
</div>
`;
3 changes: 3 additions & 0 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ module.exports = {
STUDIO_FONTS_POLICY:
'http://help.topcoder.com/hc/en-us/articles/217959447-Font-Policy-for-Design-Challenges',
TOPCODER_TERMS: 'https://www.topcoder.com/community/how-it-works/terms/',
HOWTOCOMPETEINMARATHON: 'https://www.topcoder.com/thrive/articles/How%20To%20Compete%20in%20a%20Marathon%20Match',
USABLECODEDEV: 'https://www.topcoder.com/thrive/articles/Usable%20Code%20in%20Dev%20Challenges',
EXTENSIONVSCODE: 'https://marketplace.visualstudio.com/items?itemName=Topcoder.topcoder-workflow&ssr=false#overview',
},

IOS: 'https://ios.topcoder-dev.com',
Expand Down
36 changes: 36 additions & 0 deletions src/assets/themes/tco/TCO20.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/shared/components/Dashboard/SRM/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const SRM = (props) => {
<a href={`${config.URL.COMMUNITY}/tc?module=ProblemArchive`} className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost" styleName="tc-btn">
Problem Archive
</a>
<a href={`${config.URL.BASE}/member-onboarding/learning-practicing-skills/`} className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost" styleName="tc-btn">
<a href={`${config.URL.BASE}/thrive/articles/How%20To%20Compete%20in%20SRMs`} className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost" styleName="tc-btn">
Learn More
</a>
</div>
Expand Down
5 changes: 4 additions & 1 deletion src/shared/components/ProfilePage/Header/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ class ProfileHeader extends React.Component {
const {
info,
} = this.props;
const { photoURL } = info;
let photoURL = '';
if (isomorphy.isClientSide()) {
({ photoURL } = info);
}
this.state = {
imageUrl: photoURL,
};
Expand Down
11 changes: 8 additions & 3 deletions src/shared/components/ProfilePage/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import React from 'react';
import PT from 'prop-types';
import { PrimaryButton } from 'topcoder-react-ui-kit';
import Sticky from 'react-stickynode';
import { isomorphy } from 'topcoder-react-utils';

import Robot from 'assets/images/robot-happy.svg';

Expand Down Expand Up @@ -55,11 +56,15 @@ class ProfilePage extends React.Component {

componentDidMount() {
this.handleResize();
window.addEventListener('resize', this.handleResize);
if (isomorphy.isClientSide()) {
window.addEventListener('resize', this.handleResize);
}
}

componentWillUnmount() {
window.removeEventListener('resize', this.handleResize);
if (isomorphy.isClientSide()) {
window.removeEventListener('resize', this.handleResize);
}
}

getActiveTracks() {
Expand Down Expand Up @@ -181,7 +186,7 @@ class ProfilePage extends React.Component {
<div styleName="about-container">
<div styleName="profile-header-container">
<Sticky
bottomBoundary={document.body.scrollHeight - 250}
bottomBoundary={isomorphy.isClientSide() ? document.body.scrollHeight - 250 : 0}
enabled={!isMobile}
top={10}
>
Expand Down
8 changes: 4 additions & 4 deletions src/shared/components/TopcoderFooter/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ export default function TopcoderFooter() {
<div styleName="sep-line" />
<ul styleName="navi-col-links">
<Link to={`${base}/thrive/tracks?track=Competitive%20Programming`}>Competitive Programming</Link>
<Link to={`${base}/thrive/tracks?track=Data%20Science`}>Data Science</Link>
<Link to={`${base}/thrive/tracks?track=Design`}>Design</Link>
<Link to={`${base}/thrive/tracks?track=Development`}>Development</Link>
<Link to={`${base}/thrive/tracks?track=QA`}>QA</Link>
<Link to={`${base}/thrive/tracks?track=Data%20Science&tax=`}>Data Science</Link>
<Link to={`${base}/thrive/tracks?track=Design&tax=`}>Design</Link>
<Link to={`${base}/thrive/tracks?track=Development&tax=`}>Development</Link>
<Link to={`${base}/thrive/tracks?track=QA&tax=`}>QA</Link>
</ul>
</div>
<div styleName="navi-col">
Expand Down
3 changes: 3 additions & 0 deletions src/shared/components/buttons/themed/tc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
text-decoration: none !important;
text-transform: uppercase !important;
margin: 0 !important;
white-space: nowrap !important;
}

@mixin primary-green {
Expand Down Expand Up @@ -107,6 +108,7 @@
text-decoration: none !important;
text-transform: uppercase !important;
margin: 0 !important;
white-space: nowrap !important;
}

@mixin secondary-gray {
Expand All @@ -133,6 +135,7 @@
font-weight: 700 !important;
text-transform: uppercase !important;
margin: 0 !important;
white-space: nowrap !important;
}

@mixin warn-red {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import './style.scss';

/* Date/time format to use in the card. */
const FORMAT = 'MMM DD, HH:mm';
const FORMAT_YEAR = 'MMM DD YYYY, HH:mm';

export default function Card({ past, time, title }) {
const time2 = moment(time);
Expand All @@ -20,7 +21,7 @@ export default function Card({ past, time, title }) {
{title}
</p>
<p styleName="date">
{time2.format(FORMAT)}
{time2.format(time2.year() !== moment().year() ? FORMAT_YEAR : FORMAT)}
</p>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,28 @@ export default function SideBar({
</div>
);

const usableCodeArticle = (
<div styleName="tctooltiptext tooltiptextapproval">
<h4>
Useable Code Rules
</h4>
<p>
A set of guidelines to help determine if code is acceptable or not.
</p>
</div>
);

const vscodeTip = (
<div styleName="tctooltiptext tooltiptextapproval">
<h4>
Topcoder Extension for VSCode
</h4>
<p>
Shortcuts to perform actions related to Topcoder platform without having to open a browser
</p>
</div>
);

return (
<div styleName="challenge-spec-sidebar">
<div styleName="challenge-sidebar-inner">
Expand Down Expand Up @@ -197,9 +219,45 @@ export default function SideBar({
</span>
)
}
{
!isDesign && (
<span styleName="link-like-paragraph tooltip-container">
<a
href={config.URL.INFO.USABLECODEDEV}
title="Useable Code Rules"
target="_blank"
rel="noreferrer"
>
Useable Code Rules
</a>
<Tooltip id="usablecode-tip" content={usableCodeArticle} className={styles['tooltip-overlay']} trigger={['hover', 'focus']}>
<div styleName="tctooltip" tabIndex="0" role="button" aria-describedby="usablecode-tip">
?
</div>
</Tooltip>
</span>
)
}
</div>
)
}
{ isMM && (
<div>
<h2>
CHALLENGE LINKS:
</h2>
<p styleName="link-like-paragraph">
<a
href={config.URL.INFO.HOWTOCOMPETEINMARATHON}
title="How To Compete in a Marathon Match"
target="_blank"
rel="noreferrer"
>
How To Compete in a Marathon Match
</a>
</p>
</div>
)}
{
isDesign
&& (
Expand Down Expand Up @@ -331,6 +389,26 @@ export default function SideBar({
</div>
)
}
<div>
<h2>
TOOLBOX:
</h2>
<span styleName="link-like-paragraph tooltip-container">
<a
href={config.URL.INFO.EXTENSIONVSCODE}
title="Topcoder Extension for VSCode"
target="_blank"
rel="noreferrer"
>
Topcoder Extension <br /> for VSCode
</a>
<Tooltip id="vscode-tip" content={vscodeTip} className={styles['tooltip-overlay']} trigger={['hover', 'focus']}>
<div styleName="tctooltip" tabIndex="0" role="button" aria-describedby="vscode-tip">
?
</div>
</Tooltip>
</span>
</div>
{ shareable && (
<div>
<h2>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@import "mixins";

.no-margin-top {
margin-top: -10px !important;
}

.challenge-spec-sidebar {
background: $tc-dark-blue-10;
width: 245px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import SwitchWithLabel from 'components/SwitchWithLabel';
import { challenge as challengeUtils } from 'topcoder-react-lib';
// import { COMPETITION_TRACKS as TRACKS } from 'utils/tc';
import _ from 'lodash';
import { BUCKETS } from 'utils/challenge-listing/buckets';

// import localStorage from 'localStorage';
import ChallengeSearchBar from './ChallengeSearchBar';
Expand Down Expand Up @@ -49,6 +50,7 @@ export default function ChallengeFilters({
if (filterState.events && filterState.events.length) filterRulesCount += 1;
if (filterState.tags && filterState.tags.length) filterRulesCount += 1;
if (filterState.types && filterState.types.length) filterRulesCount += 1;
if (activeBucket === BUCKETS.ALL && filterState.status && filterState.status !== 'All') filterRulesCount += 1;
if (filterState.endDateStart || filterState.startDateEnd) {
filterRulesCount += 1;
}
Expand Down
Loading