diff --git a/src/renderer/src/hooks/use-date.ts b/src/renderer/src/hooks/use-date.ts index 21ed1b34..9486400c 100644 --- a/src/renderer/src/hooks/use-date.ts +++ b/src/renderer/src/hooks/use-date.ts @@ -72,7 +72,7 @@ export function useDate() { const locale = getDateLocale(); return format( date, - locale == enUS ? "MM/dd/yyyy - HH:mm" : "dd/MM/yyyy - HH:mm" + locale == enUS ? "MM/dd/yyyy - HH:mm" : "dd/MM/yyyy HH:mm" ); }, diff --git a/src/renderer/src/pages/achievements/achievements-content.tsx b/src/renderer/src/pages/achievements/achievements-content.tsx index 874368a8..c41f376a 100644 --- a/src/renderer/src/pages/achievements/achievements-content.tsx +++ b/src/renderer/src/pages/achievements/achievements-content.tsx @@ -10,7 +10,6 @@ import { LockIcon, PersonIcon, TrophyIcon, - UnlockIcon, } from "@primer/octicons-react"; import { SPACING_UNIT, vars } from "@renderer/theme.css"; import { gameDetailsContext } from "@renderer/context"; @@ -192,49 +191,55 @@ function AchievementList({ user, otherUser }: AchievementListProps) { -
- {otherUserAchievement.unlockTime ? ( -
- - {formatDateTime(otherUserAchievement.unlockTime)} -
- ) : ( -
- -
- )} -
+ {otherUserAchievement.unlocked ? ( +
+ + {formatDateTime(otherUserAchievement.unlockTime!)} +
+ ) : ( +
+ +
+ )} -
- {userDetails?.subscription && achievements[index].unlockTime ? ( -
- -

{formatDateTime(achievements[index].unlockTime)}

-
- ) : ( -
- -
- )} -
+ {userDetails?.subscription && achievements[index].unlocked ? ( +
+ + {formatDateTime(achievements[index].unlockTime!)} +
+ ) : ( +
+ +
+ )} ))} @@ -371,17 +376,20 @@ export function AchievementsContent({ otherUser }: AchievementsContentProps) { {otherUser && ( -
+
-
{getProfileImage(otherUser)}
-
+
+ {getProfileImage(otherUser)} +
+
{getProfileImage({ ...userDetails, userId: userDetails.id, diff --git a/src/renderer/src/pages/achievements/achievements.css.ts b/src/renderer/src/pages/achievements/achievements.css.ts index 77013ba8..84daa165 100644 --- a/src/renderer/src/pages/achievements/achievements.css.ts +++ b/src/renderer/src/pages/achievements/achievements.css.ts @@ -4,6 +4,7 @@ import { recipe } from "@vanilla-extract/recipes"; export const HERO_HEIGHT = 150; export const LOGO_HEIGHT = 100; +export const LOGO_MAX_WIDTH = 200; export const wrapper = style({ display: "flex", @@ -59,7 +60,9 @@ export const heroContent = style({ }); export const gameLogo = style({ + width: LOGO_MAX_WIDTH, height: LOGO_HEIGHT, + objectFit: "contain", }); export const container = style({ @@ -71,7 +74,7 @@ export const container = style({ zIndex: "1", }); -export const panel = recipe({ +export const tableHeader = recipe({ base: { width: "100%", backgroundColor: vars.color.darkBackground,