diff --git a/src/renderer/src/pages/achievements/achievements-content.tsx b/src/renderer/src/pages/achievements/achievements-content.tsx index c41f376a..d876ff9e 100644 --- a/src/renderer/src/pages/achievements/achievements-content.tsx +++ b/src/renderer/src/pages/achievements/achievements-content.tsx @@ -33,11 +33,12 @@ interface AchievementListProps { otherUser: UserInfo | null; } -interface AchievementPanelProps { +interface AchievementSummaryProps { user: UserInfo; + isComparison?: boolean; } -function AchievementPanel({ user }: AchievementPanelProps) { +function AchievementSummary({ user, isComparison }: AchievementSummaryProps) { const { userDetails, hasActiveSubscription } = useUserDetails(); const userTotalAchievementCount = user.achievements.length; @@ -61,8 +62,55 @@ function AchievementPanel({ user }: AchievementPanelProps) { ); }; - if (userDetails?.id == user.userId && !hasActiveSubscription) { - return <>; + if ( + isComparison && + userDetails?.id == user.userId && + !hasActiveSubscription + ) { + return ( +
+
+ +

Assine o HYDRA CLOUD para comparar suas conquistas!!!!

+
+
+ {getProfileImage(user)} +

{user.displayName}

+
+
+ ); } return ( @@ -71,6 +119,7 @@ function AchievementPanel({ user }: AchievementPanelProps) { display: "flex", gap: `${SPACING_UNIT * 2}px`, alignItems: "center", + padding: `${SPACING_UNIT}px`, }} > {getProfileImage(user)} @@ -126,7 +175,7 @@ function AchievementList({ user, otherUser }: AchievementListProps) { const { t } = useTranslation("achievement"); const { formatDateTime } = useDate(); - const { userDetails } = useUserDetails(); + const { hasActiveSubscription } = useUserDetails(); if (!otherUserAchievements || otherUserAchievements.length === 0) { return ( @@ -167,7 +216,12 @@ function AchievementList({ user, otherUser }: AchievementListProps) {
  • + {hasActiveSubscription ? ( + achievements[index].unlocked ? ( +
    + + {formatDateTime(achievements[index].unlockTime!)} +
    + ) : ( +
    + +
    + ) + ) : null} + {otherUserAchievement.unlocked ? (
    )} - - {userDetails?.subscription && achievements[index].unlocked ? ( -
    - - {formatDateTime(achievements[index].unlockTime!)} -
    - ) : ( -
    - -
    - )}
  • ))} @@ -270,7 +326,7 @@ export function AchievementsContent({ otherUser }: AchievementsContentProps) { const dispatch = useAppDispatch(); - const { userDetails } = useUserDetails(); + const { userDetails, hasActiveSubscription } = useUserDetails(); useEffect(() => { if (gameTitle) { @@ -359,19 +415,20 @@ export function AchievementsContent({ otherUser }: AchievementsContentProps) { display: "flex", flexDirection: "column", width: "100%", - gap: `${SPACING_UNIT * 2}px`, - padding: `${SPACING_UNIT * 2}px`, + gap: `${SPACING_UNIT}px`, + padding: `${SPACING_UNIT}px`, }} > - - {otherUser && } + {otherUser && } @@ -380,22 +437,26 @@ export function AchievementsContent({ otherUser }: AchievementsContentProps) {
    + {hasActiveSubscription && ( +
    + {getProfileImage({ + ...userDetails, + userId: userDetails.id, + achievements: sortedAchievements, + })} +
    + )}
    {getProfileImage(otherUser)}
    -
    - {getProfileImage({ - ...userDetails, - userId: userDetails.id, - achievements: sortedAchievements, - })} -
    )} diff --git a/src/renderer/src/pages/achievements/achievements.css.ts b/src/renderer/src/pages/achievements/achievements.css.ts index 84daa165..ebd63aab 100644 --- a/src/renderer/src/pages/achievements/achievements.css.ts +++ b/src/renderer/src/pages/achievements/achievements.css.ts @@ -52,7 +52,6 @@ export const heroImage = style({ export const heroContent = style({ padding: `${SPACING_UNIT * 2}px`, - height: "100%", width: "100%", display: "flex", justifyContent: "space-between",