Skip to content

Commit

Permalink
Merge pull request #4107 from itcreativeusa/wv-583-place-joined-and-d…
Browse files Browse the repository at this point in the history
…ays-left-over-challenge-images-on-challenge-home-page

Wv 583 place joined and days left over challenge images on challenge home page
  • Loading branch information
DaleMcGrew authored Oct 13, 2024
2 parents 39f2f0e + d970987 commit 1ccc227
Showing 1 changed file with 41 additions and 17 deletions.
58 changes: 41 additions & 17 deletions src/js/common/components/ChallengeListRoot/ChallengeCardList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import ChallengeAbout from '../Challenge/ChallengeAbout';
import { isWebApp } from '../../utils/isCordovaOrWebApp';
import ChallengeStore from '../../stores/ChallengeStore';
import JoinChallengeAndLearnMoreButtons from '../Challenge/JoinChallengeAndLearnMoreButtons';
import JoinedAndDaysLeft from '../Challenge/JoinedAndDaysLeft';
import DesignTokenColors from '../Style/DesignTokenColors';

const DelayedLoad = React.lazy(() => import(/* webpackChunkName: 'DelayedLoad' */ '../Widgets/DelayedLoad'));

Expand Down Expand Up @@ -175,12 +177,18 @@ class ChallengeCardList extends Component {
numberDisplayed += 1;
return (
<ChallengeCardForListVerticalWrapper key={`oneChallengeItem-${oneChallenge.challenge_we_vote_id}`}>
<ChallengeCardForList
challengeWeVoteId={oneChallenge.challenge_we_vote_id}
joinedAndDaysLeftOff
limitCardWidth={useVerticalCard}
useVerticalCard={useVerticalCard}
/>
<CardContainer>
<ChallengeCardForList
challengeWeVoteId={oneChallenge.challenge_we_vote_id}
joinedAndDaysLeftOff
limitCardWidth={useVerticalCard}
useVerticalCard={useVerticalCard}
/>
{/* JoinedAndDaysLeft component positioned absolutely */}
<JoinedAndDaysForChallengePage>
<JoinedAndDaysLeft challengeWeVoteId={oneChallenge.challenge_we_vote_id} />
</JoinedAndDaysForChallengePage>
</CardContainer>
<Link
id="challengeCardAbout"
to={this.onChallengeClickLink(oneChallenge.challenge_we_vote_id)}
Expand Down Expand Up @@ -213,16 +221,16 @@ class ChallengeCardList extends Component {
)}
*/}
{!!(challengeList &&
challengeList.length > 1 &&
numberToDisplay < challengeList.length) &&
(
<LoadMoreItemsManuallyWrapper>
<LoadMoreItemsManually
loadMoreFunction={this.loadMoreHasBeenClicked}
uniqueExternalId="ChallengeCardList"
/>
</LoadMoreItemsManuallyWrapper>
)}
challengeList.length > 1 &&
numberToDisplay < challengeList.length) &&
(
<LoadMoreItemsManuallyWrapper>
<LoadMoreItemsManually
loadMoreFunction={this.loadMoreHasBeenClicked}
uniqueExternalId="ChallengeCardList"
/>
</LoadMoreItemsManuallyWrapper>
)}
</ListWrapper>
<Suspense fallback={<></>}>
<DelayedLoad loadingTextLeftAlign showLoadingText waitBeforeShow={2000}>
Expand Down Expand Up @@ -279,10 +287,14 @@ const styles = () => ({
},
});

const CardContainer = styled('div')`
position: relative;
`;

const ChallengeCardForListVerticalWrapper = styled('div')`
display: flex;
flex-direction: column;
// height: ${isWebApp() ? '100%' : 'unset'};
// height: ${isWebApp() ? '100%' : 'unset'};
width: 80%;
max-width: 300px;
`;
Expand All @@ -291,4 +303,16 @@ const Wrapper = styled('div')`
min-height: 30px;
`;

const JoinedAndDaysForChallengePage = styled('div')`
align-items: center;
border-radius: 20px;
color: ${DesignTokenColors.gray900};
display: flex;
font-size: 12px;
left: 10px;
padding: 5px 10px;
position: absolute;
top: 125px;
`;

export default withStyles(styles)(ChallengeCardList);

0 comments on commit 1ccc227

Please sign in to comment.