Skip to content

Fix points translation, design and redirection #411

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
moshmage merged 3 commits into from
May 22, 2024
Merged

Fix points translation, design and redirection #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d70cd52
fix label
vhcsilva May 21, 2024
fef4fe5
adjust card size
vhcsilva May 21, 2024
ed0139f
fix path
vhcsilva May 21, 2024
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
3 changes: 2 additions & 1 deletion components/common/points/points-badge.view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ export function PointsBadge({
available: { bg: "gray-700", text: "white", icon: <StarFilledIcon /> },
claimed: { bg: "green-600", text: "black", icon: <StarIcon /> },
}[variant];
const pointsLabel = typeof points === "number" ? formatNumberToString(points, 0) : points;

return(
<div className={`d-flex align-items-center gap-1 bg-${bg} text-${text} not-hover px-2 py-1 border-radius-4`}>
{icon}
<span className={`xs-small font-weight-normal text-${text}`}>{formatNumberToString(points, 0)}</span>
<span className={`xs-small font-weight-normal text-${text}`}>{pointsLabel}</span>
</div>
);
}
10 changes: 5 additions & 5 deletions components/points-system/collected-points/collected-points.view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function CollectedPointsView({
className="p-3 mt-4 mb-4"
bodyClassName="p-0"
>
<div className="row align-items-center gy-3 gap-md-0">
<div className="row gy-3">
<div className="col-auto">
<span className="d-block xl-semibold text-white">
{t("on-going")}
Expand All @@ -55,7 +55,7 @@ export function CollectedPointsView({
</div>

{onGoing.map(pointBase => (
<div className="col-12 col-lg" key={`on-going-${pointBase.actionName}`}>
<div className="col-12 col-lg d-grid" key={`on-going-${pointBase.actionName}`}>
<OnGoingCard
title={t(`rules.${pointBase.actionName}.title`)}
description={t(`rules.${pointBase.actionName}.description`)}
Expand All @@ -72,7 +72,7 @@ export function CollectedPointsView({

<div className="row mb-4 gy-3">
{socials?.map(pointBase => (
<div className="col-12 col-md-6 col-xl-4" key={`social-${pointBase.actionName}`}>
<div className="col-12 col-md-6 col-xl-4 d-grid" key={`social-${pointBase.actionName}`}>
<SocialCard
title={t(`rules.${pointBase.actionName}.title`)}
social={getSocialName(pointBase.actionName)}
Expand All @@ -89,7 +89,7 @@ export function CollectedPointsView({

<div className="row mb-4 gy-3">
{profile?.map(pointBase => (
<div className="col-12 col-sm-6 col-xl-4" key={`social-${pointBase.actionName}`}>
<div className="col-12 col-sm-6 col-xl-4 d-grid" key={`social-${pointBase.actionName}`}>
<GenericCard
title={t(`rules.${pointBase.actionName}.title`)}
description={t(`rules.${pointBase.actionName}.description`)}
Expand All @@ -107,7 +107,7 @@ export function CollectedPointsView({

<div className="row mb-4 gy-3">
{other?.map(pointBase => (
<div className="col-12 col-sm-6 col-xl" key={`social-${pointBase.actionName}`}>
<div className="col-12 col-sm-6 col-xl d-grid" key={`social-${pointBase.actionName}`}>
<GenericCard
title={t(`rules.${pointBase.actionName}.title`)}
description={t(`rules.${pointBase.actionName}.description`)}
Expand Down
3 changes: 0 additions & 3 deletions components/proposal/deliverable-details/controller.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,13 @@ export default function ProposalDeliverableDetails({
deliverableId: deliverable?.id,
fromProposal: true
});
const asPath = `/task/${issue?.id}/deliverable/${deliverable?.id}`;

return(
<DeliverableDetailsView
id={deliverable?.id}
createdAt={deliverable?.createdAt}
deliverableHref={deliverableHref}
deliverableTitle={deliverable?.title}
user={deliverable?.user}
asPath={asPath}
/>
);
}
3 changes: 0 additions & 3 deletions components/proposal/deliverable-details/view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ interface DeliverableDetailsViewProps {
id: number;
user: User;
deliverableTitle?: string;
asPath?: string;
createdAt: Date;
deliverableHref: UrlObject;
}
Expand All @@ -21,7 +20,6 @@ export default function DeliverableDetailsView({
id,
user,
deliverableTitle,
asPath,
createdAt,
deliverableHref,
}: DeliverableDetailsViewProps) {
Expand All @@ -42,7 +40,6 @@ export default function DeliverableDetailsView({
title={t("actions.go-to-deliverable")}
className="caption-large text-gray-500 p-0 hover-primary text-decoration-underline"
label={`#${id || ""}`}
asPath={asPath}
transparent
/>
</div>
Expand Down