Skip to content

Tco21 leaderboard fix #5652

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.

Sign up for GitHub

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 8 commits into from
Jul 23, 2021
Merged

Tco21 leaderboard fix #5652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d3a81cc
Merge pull request #5626 from topcoder-platform/develop
luizrrodrigues Jul 6, 2021
7bd255c
Merge pull request #5633 from topcoder-platform/develop
sushilshinde Jul 7, 2021
4f4975f
Merge pull request #5641 from topcoder-platform/develop
luizrrodrigues Jul 13, 2021
acd4b25
Merge pull request #5645 from topcoder-platform/develop
luizrrodrigues Jul 15, 2021
d6a486b
Merge pull request #5647 from topcoder-platform/develop
luizrrodrigues Jul 16, 2021
ecda4d7
Merge pull request #5649 from topcoder-platform/develop
luizrrodrigues Jul 20, 2021
749e090
fix #5651
kkartunov Jul 22, 2021
ef9b3e6
ci: on beta
kkartunov Jul 22, 2021
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ workflows:
filters:
branches:
only:
- free
- tco21-leaderboard-fix
# This is stage env for production QA releases
- "build-prod-staging":
context : org-global
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Contentful/ContentSlider/ContentSlider.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ ContentSlider.defaultProps = {
cellSpacing: null,
cellAlign: 'center',
wrapAround: true,
heightMode: 'current',
heightMode: 'max',
arrowTheme: 'Gray',
};

Expand Down
4 changes: 3 additions & 1 deletion src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class ChallengeHistoryModal extends Component {
loading,
isCopilot,
isAlgo,
themeName,
} = this.props;
const { sortParam } = this.state;
const challengesOrdered = _.orderBy(challenges, [sortParam.field], [sortParam.order]);
Expand All @@ -44,7 +45,7 @@ class ChallengeHistoryModal extends Component {
competitor={competitor}
isCopilot={isCopilot}
isAlgo={isAlgo}
themeName="TCO22"
themeName={themeName}
/>
</div>
<table styleName="history-table">
Expand Down Expand Up @@ -178,6 +179,7 @@ ChallengeHistoryModal.propTypes = {
loading: PT.bool.isRequired,
isAlgo: PT.bool,
isCopilot: PT.bool,
themeName: PT.string.isRequired,
};

export default ChallengeHistoryModal;
4 changes: 2 additions & 2 deletions src/shared/components/Leaderboard/ChallengeHistoryModal/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $light-gray: #d4d4d4;
width: 70%;
max-height: 90%;
overflow-y: auto;
padding: 80px 78px;
padding: 60px 78px 80px;

@media (max-width: 768px) {
width: 90%;
Expand All @@ -26,7 +26,7 @@ $light-gray: #d4d4d4;
font-weight: 500;
line-height: 38px;
text-align: center;
margin-bottom: 60px;
margin-bottom: 40px;
text-transform: uppercase;

@media (max-width: 768px) {
Expand Down
4 changes: 4 additions & 0 deletions src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ function ChallengeHistoryModalContainer({
loading,
isCopilot,
isAlgo,
themeName,
}) {
useEffect(() => {
getChallengesHistory(dataUrl, competitor);
Expand All @@ -26,6 +27,7 @@ function ChallengeHistoryModalContainer({
loading={loading}
isCopilot={isCopilot}
isAlgo={isAlgo}
themeName={themeName}
/>
);
}
Expand All @@ -36,6 +38,7 @@ ChallengeHistoryModalContainer.defaultProps = {
loading: false,
isCopilot: false,
isAlgo: false,
themeName: 'Default',
};

const CHALLENGES_TYPE = PT.arrayOf(PT.shape({
Expand All @@ -61,6 +64,7 @@ ChallengeHistoryModalContainer.propTypes = {
loading: PT.bool,
isAlgo: PT.bool,
isCopilot: PT.bool,
themeName: PT.string,
};

function mapStateToProps(state, ownProps) {
Expand Down
1 change: 1 addition & 0 deletions src/shared/containers/tco/Leaderboard/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class LeaderboardPageContainer extends React.Component {
dataUrl={tcoPointsApiUrl}
isCopilot={isCopilot}
isAlgo={isAlgo}
themeName={themeName}
/>
) : null
}
Expand Down