diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6cd5d496b6..89a3f65d8d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -245,7 +245,7 @@ workflows:
filters:
branches:
only:
- - listing-develop-sync
+ - develop
# This is beta env for production soft releases
- "build-prod-beta":
context : org-global
diff --git a/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap b/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap
index e93e79feae..5ec908d67c 100644
--- a/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap
@@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
Learn More
diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
index c7007eef45..9a982e6e7f 100644
--- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
+++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
@@ -106,7 +106,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
Data Science
@@ -115,7 +115,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
Design
@@ -124,7 +124,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
Development
@@ -133,7 +133,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
>
QA
diff --git a/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap b/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap
index abe4b7d0da..f37f92bc07 100644
--- a/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap
@@ -16,7 +16,7 @@ exports[`Matches shallow shapshot 1`] = `
/>
`;
@@ -37,7 +37,7 @@ exports[`Matches shallow shapshot 2`] = `
/>
`;
diff --git a/src/shared/components/Dashboard/SRM/index.jsx b/src/shared/components/Dashboard/SRM/index.jsx
index 9c267ca2cf..d3460230ef 100644
--- a/src/shared/components/Dashboard/SRM/index.jsx
+++ b/src/shared/components/Dashboard/SRM/index.jsx
@@ -35,7 +35,7 @@ const SRM = (props) => {
Problem Archive
-
+
Learn More
diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx
index 7d7b2909cd..990491aa97 100644
--- a/src/shared/components/TopcoderFooter/index.jsx
+++ b/src/shared/components/TopcoderFooter/index.jsx
@@ -58,10 +58,10 @@ export default function TopcoderFooter() {
Competitive Programming
- Data Science
- Design
- Development
- QA
+ Data Science
+ Design
+ Development
+ QA
diff --git a/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx b/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx
index 5efc2339be..154e95a46b 100644
--- a/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx
+++ b/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx
@@ -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);
@@ -20,7 +21,7 @@ export default function Card({ past, time, title }) {
{title}
- {time2.format(FORMAT)}
+ {time2.format(time2.year() !== moment().year() ? FORMAT_YEAR : FORMAT)}
);
diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
index 6bc2bd13c7..3e7f9848f1 100644
--- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
+++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -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';
@@ -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;
}
diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
index 8b0147a9fb..ed61187a59 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -359,7 +359,7 @@ export default function FiltersPanel({
}}
options={['Active', 'Completed', 'All'].map(mapOps)}
simpleValue
- value={filterState.status || 'Active'}
+ value={filterState.status || 'All'}
/>
) : null
@@ -433,6 +433,7 @@ export default function FiltersPanel({
events: [],
endDateStart: null,
startDateEnd: null,
+ status: 'All',
});
selectCommunity(defaultCommunityId);
setSearchText('');
diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
index c918eb2043..8e44349086 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
@@ -293,8 +293,11 @@ $panel-radius-4: $corner-radius * 2;
.filter-row {
display: flex;
+ flex-direction: row;
align-items: center;
+ flex-wrap: wrap;
margin-right: $panel-space-100 + 17;
+ width: auto;
@include xs-to-md {
display: block;
@@ -397,6 +400,7 @@ $panel-radius-4: $corner-radius * 2;
z-index: 3;
}
+ min-width: 206px;
margin-right: $panel-space-30;
:global(.Select-value) {
@@ -407,6 +411,17 @@ $panel-radius-4: $corner-radius * 2;
color: $tc-gray-50;
line-height: $panel-space-30 - 2;
}
+
+ @media screen and (max-width: 1024px) {
+ width: 100%;
+ margin-top: 15px;
+ }
+
+ @media screen and (min-width: 1025px) and (max-width: 1346px) {
+ margin-top: 15px;
+
+ @include calc(width, '50% - 30px');
+ }
}
}
}
diff --git a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
index 371326cc55..8946bc722e 100644
--- a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
+++ b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
@@ -184,7 +184,7 @@ export default function Bucket({
{placeholders}
{
// (expandable || loadMore) && (expandable || !keepPlaceholders) && !loading && !expanded ? (
- (expanding || expandable || loadMore) && !loading && !expanded ? (
+ (expanding || expandable) && !loading && loadMore && (expandable ? expanded : !expanded) ? (
{getBucket(activeBucket, true)}
@@ -207,7 +206,8 @@ function Listing({
// }
const loading = loadingMyChallenges
|| loadingOpenForRegistrationChallenges
- || loadingOnGoingChallenges;
+ || loadingOnGoingChallenges
+ || loadingAllChallenges;
const placeholders = [];
if (challenges.length > 0 || (activeBucket === BUCKETS.ALL && allChallenges.length > 0)) {
return (
diff --git a/src/shared/components/challenge-listing/Sidebar/index.jsx b/src/shared/components/challenge-listing/Sidebar/index.jsx
index 903d90cde0..cfa51585c7 100644
--- a/src/shared/components/challenge-listing/Sidebar/index.jsx
+++ b/src/shared/components/challenge-listing/Sidebar/index.jsx
@@ -39,7 +39,7 @@ export default function SideBarFilters({
// editSavedFiltersMode,
// extraBucket,
// filterState,
- hideTcLinksInFooter,
+ // hideTcLinksInFooter,
isAuth,
// resetFilterName,
// savedFilters,
@@ -84,7 +84,7 @@ export default function SideBarFilters({
/>
{/* )} */}
-
+
);
}
@@ -94,7 +94,7 @@ SideBarFilters.defaultProps = {
disabled: false,
// dragState: {},
// extraBucket: null,
- hideTcLinksInFooter: false,
+ // hideTcLinksInFooter: false,
isAuth: false,
expanding: false,
};
@@ -116,7 +116,7 @@ SideBarFilters.propTypes = {
// editSavedFiltersMode: PT.bool.isRequired,
// extraBucket: PT.string,
// filterState: PT.shape().isRequired,
- hideTcLinksInFooter: PT.bool,
+ // hideTcLinksInFooter: PT.bool,
isAuth: PT.bool,
// resetFilterName: PT.func.isRequired,
// savedFilters: PT.arrayOf(PT.shape()).isRequired,
diff --git a/src/shared/containers/Dashboard/index.jsx b/src/shared/containers/Dashboard/index.jsx
index 4ecc310a2b..e4a5140fd1 100644
--- a/src/shared/containers/Dashboard/index.jsx
+++ b/src/shared/containers/Dashboard/index.jsx
@@ -150,8 +150,7 @@ export class DashboardPageContainer extends React.Component {
// if (now - tcBlogTimestamp > CACHE_MAX_AGE
// && !tcBlogLoading) getTopcoderBlogFeed();
- if (now - communitiesTimestamp < CACHE_MAX_AGE
- && now - activeChallengesTimestamp < CACHE_MAX_AGE) {
+ if (now - communitiesTimestamp < CACHE_MAX_AGE) {
updateCommunityStats(this.props);
}
}