Skip to content

Add indicator for completed challenges #2635

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
CollinBeczak merged 2 commits into from
May 19, 2025
Merged

Add indicator for completed challenges #2635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8737f70
add indicator for completed challenges in users top challenges in lea…
CollinBeczak Feb 18, 2025
48e45ff
Merge branch 'main' into add-indicator-for-completed-challenges
CollinBeczak May 19, 2025
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
23 changes: 21 additions & 2 deletions src/pages/Leaderboard/CardLeaderboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Link } from "react-router-dom";
import AsAvatarUser from "../../interactions/User/AsAvatarUser";
import messages from "./Messages";
import "./Leaderboard.scss";
import SvgSymbol from "../../components/SvgSymbol/SvgSymbol";

class CardLeaderboard extends Component {
state = {
Expand All @@ -28,9 +29,27 @@ class CardLeaderboard extends Component {
const topChallengeItems = this.props.suppressTopChallenges
? null
: _map(leader.topChallenges.slice(0, this.props.maxTopChallenges), (challenge) => (
<li key={challenge.id}>
<Link to={`/browse/challenges/${challenge.id}`} title={challenge.name}>
<li
key={challenge.id}
className={
challenge.status === 5
? "mr-text-green-lighter mr-flex mr-items-center mr-justify-center"
: "mr-flex mr-items-center mr-justify-center"
}
>
<Link
to={`/browse/challenges/${challenge.id}`}
title={challenge.name}
className="mr-flex mr-items-center mr-justify-center"
>
{_truncate(challenge.name, { length: 35 })}
{challenge.status === 5 && (
<SvgSymbol
sym="check-circled-icon"
viewBox="0 0 20 20"
className="mr-fill-current mr-w-4 mr-h-4 mr-ml-2 mr-text-green"
/>
)}
</Link>
</li>
));
Expand Down
8 changes: 8 additions & 0 deletions src/pages/Leaderboard/RowLeaderboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import PropTypes from "prop-types";
import { Component } from "react";
import { FormattedMessage, FormattedNumber } from "react-intl";
import { Link } from "react-router-dom";
import SvgSymbol from "../../components/SvgSymbol/SvgSymbol";
import AsAvatarUser from "../../interactions/User/AsAvatarUser";
import messages from "./Messages";
import "./Leaderboard.scss";
Expand Down Expand Up @@ -32,6 +33,13 @@ class RowLeaderboard extends Component {
<Link to={`/browse/challenges/${challenge.id}`} title={challenge.name}>
{_truncate(challenge.name, { length: 35 })}
</Link>
{challenge.status === 5 ? (
<SvgSymbol
sym="check-icon"
viewBox="0 0 20 20"
className="mr-fill-current mr-w-4 mr-h-4"
/>
) : null}
</li>
));

Expand Down