diff --git a/src/main/services/download/download-manager.ts b/src/main/services/download/download-manager.ts index 80a3f6fb..0d9f5cbb 100644 --- a/src/main/services/download/download-manager.ts +++ b/src/main/services/download/download-manager.ts @@ -244,7 +244,7 @@ export class DownloadManager { private static async getDownloadPayload(game: Game) { switch (game.downloader) { case Downloader.Gofile: { - const id = game!.uri!.split("/").pop(); + const id = game.uri!.split("/").pop(); const token = await GofileApi.authorize(); const downloadLink = await GofileApi.getDownloadLink(id!); @@ -258,7 +258,7 @@ export class DownloadManager { }; } case Downloader.PixelDrain: { - const id = game!.uri!.split("/").pop(); + const id = game.uri!.split("/").pop(); return { action: "start", diff --git a/src/renderer/src/helpers.ts b/src/renderer/src/helpers.ts index a241bf47..972cdfc9 100644 --- a/src/renderer/src/helpers.ts +++ b/src/renderer/src/helpers.ts @@ -2,14 +2,17 @@ import type { GameShop } from "@types"; import Color from "color"; -export const formatDownloadProgress = (progress?: number) => { +export const formatDownloadProgress = ( + progress?: number, + fractionDigits?: number +) => { if (!progress) return "0%"; const progressPercentage = progress * 100; - if (Number(progressPercentage.toFixed(2)) % 1 === 0) + if (Number(progressPercentage.toFixed(fractionDigits ?? 2)) % 1 === 0) return `${Math.floor(progressPercentage)}%`; - return `${progressPercentage.toFixed(2)}%`; + return `${progressPercentage.toFixed(fractionDigits ?? 2)}%`; }; export const getSteamLanguage = (language: string) => { diff --git a/src/renderer/src/pages/profile/profile-content/profile-content.css.ts b/src/renderer/src/pages/profile/profile-content/profile-content.css.ts index cc462a95..847e9492 100644 --- a/src/renderer/src/pages/profile/profile-content/profile-content.css.ts +++ b/src/renderer/src/pages/profile/profile-content/profile-content.css.ts @@ -228,3 +228,11 @@ export const link = style({ cursor: "pointer", }, }); + +export const gameCardStats = style({ + width: "100%", + height: "100%", + transition: "transform 0.5s ease-in-out", + flexShrink: "0", + flexGrow: "0", +}); diff --git a/src/renderer/src/pages/profile/profile-content/profile-content.tsx b/src/renderer/src/pages/profile/profile-content/profile-content.tsx index 2217d569..951eb41b 100644 --- a/src/renderer/src/pages/profile/profile-content/profile-content.tsx +++ b/src/renderer/src/pages/profile/profile-content/profile-content.tsx @@ -1,31 +1,27 @@ import { userProfileContext } from "@renderer/context"; -import { useCallback, useContext, useEffect, useMemo } from "react"; +import { useContext, useEffect, useMemo, useRef, useState } from "react"; import { ProfileHero } from "../profile-hero/profile-hero"; import { useAppDispatch, useFormat } from "@renderer/hooks"; import { setHeaderTitle } from "@renderer/features"; -import { steamUrlBuilder } from "@shared"; -import { SPACING_UNIT, vars } from "@renderer/theme.css"; - +import { SPACING_UNIT } from "@renderer/theme.css"; import * as styles from "./profile-content.css"; -import { ClockIcon, TelescopeIcon, TrophyIcon } from "@primer/octicons-react"; +import { TelescopeIcon } from "@primer/octicons-react"; import { useTranslation } from "react-i18next"; import { useNavigate } from "react-router-dom"; import { LockedProfile } from "./locked-profile"; import { ReportProfile } from "../report-profile/report-profile"; import { FriendsBox } from "./friends-box"; import { RecentGamesBox } from "./recent-games-box"; -import type { UserGame } from "@types"; -import { - buildGameAchievementPath, - buildGameDetailsPath, - formatDownloadProgress, -} from "@renderer/helpers"; -import { MAX_MINUTES_TO_SHOW_IN_PLAYTIME } from "@renderer/constants"; import { UserStatsBox } from "./user-stats-box"; -import HydraIcon from "@renderer/assets/icons/hydra.svg?react"; +import { UserLibraryGameCard } from "./user-library-game-card"; + +const GAME_STATS_ANIMATION_DURATION_IN_MS = 3500; export function ProfileContent() { const { userProfile, isMe, userStats } = useContext(userProfileContext); + const [statsIndex, setStatsIndex] = useState(0); + const [isAnimationRunning, setIsAnimationRunning] = useState(true); + const statsAnimation = useRef(-1); const dispatch = useAppDispatch(); @@ -39,6 +35,35 @@ export function ProfileContent() { } }, [userProfile, dispatch]); + const handleOnMouseEnterGameCard = () => { + setIsAnimationRunning(false); + }; + + const handleOnMouseLeaveGameCard = () => { + setIsAnimationRunning(true); + }; + + useEffect(() => { + let zero = performance.now(); + if (!isAnimationRunning) return; + + statsAnimation.current = requestAnimationFrame( + function animateGameStats(time) { + if (time - zero <= GAME_STATS_ANIMATION_DURATION_IN_MS) { + statsAnimation.current = requestAnimationFrame(animateGameStats); + } else { + setStatsIndex((index) => index + 1); + zero = performance.now(); + statsAnimation.current = requestAnimationFrame(animateGameStats); + } + } + ); + + return () => { + cancelAnimationFrame(statsAnimation.current); + }; + }, [setStatsIndex, isAnimationRunning]); + const { numberFormatter } = useFormat(); const navigate = useNavigate(); @@ -47,42 +72,6 @@ export function ProfileContent() { return userProfile?.relation?.status === "ACCEPTED"; }, [userProfile]); - const buildUserGameDetailsPath = useCallback( - (game: UserGame) => { - if (!userProfile?.hasActiveSubscription || game.achievementCount === 0) { - return buildGameDetailsPath({ - ...game, - objectId: game.objectId, - }); - } - - const userParams = userProfile - ? { - userId: userProfile.id, - } - : undefined; - - return buildGameAchievementPath({ ...game }, userParams); - }, - [userProfile] - ); - - const formatPlayTime = useCallback( - (playTimeInSeconds = 0) => { - const minutes = playTimeInSeconds / 60; - - if (minutes < MAX_MINUTES_TO_SHOW_IN_PLAYTIME) { - return t("amount_minutes", { - amount: minutes.toFixed(0), - }); - } - - const hours = minutes / 60; - return t("amount_hours", { amount: numberFormatter.format(hours) }); - }, - [numberFormatter, t] - ); - const content = useMemo(() => { if (!userProfile) return null; @@ -129,137 +118,13 @@ export function ProfileContent() {