-
Notifications
You must be signed in to change notification settings - Fork 7
feat(ui): add real-time download progress to instance creation flow #122
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,160 @@ | ||
| import { X } from "lucide-react"; | ||
| import { useState } from "react"; | ||
| import { CheckCircle, Download, Loader2, Package, XCircle } from "lucide-react"; | ||
| import { useDownloadStore } from "@/stores/download-store"; | ||
|
|
||
| export function DownloadMonitor() { | ||
| const [isVisible, setIsVisible] = useState(true); | ||
| function formatBytes(bytes: number): string { | ||
| if (bytes === 0) return "0 B"; | ||
| const units = ["B", "KB", "MB", "GB"]; | ||
| const i = Math.floor(Math.log(bytes) / Math.log(1024)); | ||
| const value = bytes / 1024 ** i; | ||
| return `${value.toFixed(value < 10 ? 1 : 0)} ${units[i]}`; | ||
|
RockChinQ marked this conversation as resolved.
|
||
| } | ||
|
|
||
| function shortenFileName(path: string): string { | ||
| const parts = path.replace(/\\/g, "/").split("/"); | ||
| return parts[parts.length - 1] || path; | ||
| } | ||
|
|
||
| /** | ||
| * Inline progress display for use inside dialogs or pages. | ||
| * Reads from the global download store. | ||
| */ | ||
| export function DownloadProgress() { | ||
| const { | ||
| phase, | ||
| totalFiles, | ||
| completedFiles, | ||
| currentFile, | ||
| currentFileStatus, | ||
| currentFileDownloaded, | ||
| currentFileTotal, | ||
| totalDownloadedBytes, | ||
| errorMessage, | ||
| phaseLabel, | ||
| } = useDownloadStore(); | ||
|
|
||
| if (phase === "idle") return null; | ||
|
|
||
| if (!isVisible) return null; | ||
| const overallPercent = | ||
| totalFiles > 0 ? Math.round((completedFiles / totalFiles) * 100) : 0; | ||
|
|
||
| const filePercent = | ||
| currentFileTotal > 0 | ||
| ? Math.round((currentFileDownloaded / currentFileTotal) * 100) | ||
| : 0; | ||
|
RockChinQ marked this conversation as resolved.
|
||
|
|
||
| return ( | ||
| <div className="bg-zinc-900/80 backdrop-blur-md border border-zinc-700 rounded-lg shadow-2xl overflow-hidden"> | ||
| {/* Header */} | ||
| <div className="flex items-center justify-between px-4 py-3 bg-zinc-800/50 border-b border-zinc-700"> | ||
| <div className="flex items-center gap-2"> | ||
| <div className="w-2 h-2 bg-emerald-500 rounded-full animate-pulse"></div> | ||
| <span className="text-sm font-medium text-white">Downloads</span> | ||
| </div> | ||
| <button | ||
| type="button" | ||
| onClick={() => setIsVisible(false)} | ||
| className="text-zinc-400 hover:text-white transition-colors p-1" | ||
| > | ||
| <X size={16} /> | ||
| </button> | ||
| <div className="space-y-4 min-w-0 overflow-hidden tabular-nums"> | ||
| {/* Phase header */} | ||
| <div className="flex items-center gap-2 min-w-0"> | ||
| {phase === "preparing" && ( | ||
| <Loader2 className="h-4 w-4 shrink-0 text-indigo-400 animate-spin" /> | ||
| )} | ||
| {phase === "downloading" && ( | ||
| <Download className="h-4 w-4 shrink-0 text-indigo-400 animate-pulse" /> | ||
| )} | ||
| {phase === "finalizing" && ( | ||
| <Loader2 className="h-4 w-4 shrink-0 text-indigo-400 animate-spin" /> | ||
| )} | ||
| {phase === "installing-mod-loader" && ( | ||
| <Package className="h-4 w-4 shrink-0 text-indigo-400 animate-pulse" /> | ||
| )} | ||
| {phase === "completed" && ( | ||
| <CheckCircle className="h-4 w-4 shrink-0 text-emerald-400" /> | ||
| )} | ||
| {phase === "error" && ( | ||
| <XCircle className="h-4 w-4 shrink-0 text-red-400" /> | ||
| )} | ||
| <span className="text-sm font-medium truncate">{phaseLabel}</span> | ||
| </div> | ||
|
|
||
| {/* Content */} | ||
| <div className="p-4"> | ||
| <div className="space-y-3"> | ||
| {/* Download Item */} | ||
| {/* Preparing phase — no file counts yet */} | ||
| {phase === "preparing" && ( | ||
| <div className="flex items-center gap-2 text-sm text-muted-foreground"> | ||
| <Loader2 className="h-3 w-3 shrink-0 animate-spin" /> | ||
| <span className="truncate">Resolving version and assets...</span> | ||
| </div> | ||
| )} | ||
|
|
||
| {/* Overall progress */} | ||
| {phase === "downloading" && totalFiles > 0 && ( | ||
| <div className="space-y-2 min-w-0"> | ||
| {/* Overall bar */} | ||
| <div className="space-y-1"> | ||
| <div className="flex justify-between text-xs"> | ||
| <span className="text-zinc-300">Minecraft 1.20.4</span> | ||
| <span className="text-zinc-400">65%</span> | ||
| <div className="flex justify-between text-xs text-muted-foreground"> | ||
| <span> | ||
| Overall: {completedFiles} / {totalFiles} files | ||
| </span> | ||
| <span className="shrink-0 ml-2 w-10 text-right"> | ||
| {overallPercent}% | ||
| </span> | ||
| </div> | ||
| <div className="h-1.5 bg-zinc-800 rounded-full overflow-hidden"> | ||
| <div className="h-2 bg-secondary rounded-full overflow-hidden"> | ||
| <div | ||
| className="h-full bg-emerald-500 rounded-full transition-all duration-300" | ||
| style={{ width: "65%" }} | ||
| ></div> | ||
| className="h-full bg-indigo-500 rounded-full transition-all duration-300" | ||
| style={{ width: `${overallPercent}%` }} | ||
| /> | ||
| </div> | ||
| <div className="flex justify-between text-[10px] text-zinc-500"> | ||
| <span>142 MB / 218 MB</span> | ||
| <span>2.1 MB/s • 36s remaining</span> | ||
| <div className="text-xs text-muted-foreground"> | ||
| {formatBytes(totalDownloadedBytes)} downloaded | ||
| </div> | ||
| </div> | ||
|
|
||
| {/* Download Item */} | ||
| <div className="space-y-1"> | ||
| <div className="flex justify-between text-xs"> | ||
| <span className="text-zinc-300">Java 17</span> | ||
| <span className="text-zinc-400">100%</span> | ||
| </div> | ||
| <div className="h-1.5 bg-zinc-800 rounded-full overflow-hidden"> | ||
| <div className="h-full bg-emerald-500 rounded-full"></div> | ||
| </div> | ||
| <div className="text-[10px] text-emerald-400">Completed</div> | ||
| {/* Current file — always reserve space to avoid layout shifts */} | ||
| <div className="min-h-[2.5rem] border-t border-border pt-2 min-w-0"> | ||
| {currentFile && currentFileStatus !== "Finished" && ( | ||
| <div className="space-y-1"> | ||
| <div className="flex items-center gap-2 text-xs"> | ||
| <span className="text-muted-foreground truncate w-0 grow"> | ||
| {shortenFileName(currentFile)} | ||
| </span> | ||
| <span className="text-muted-foreground shrink-0 w-16 text-right"> | ||
| {currentFileStatus === "Downloading" | ||
| ? `${filePercent}%` | ||
| : currentFileStatus} | ||
| </span> | ||
| </div> | ||
| {currentFileStatus === "Downloading" && | ||
| currentFileTotal > 0 && ( | ||
| <div className="h-1 bg-secondary rounded-full overflow-hidden"> | ||
| <div | ||
| className="h-full bg-indigo-400/60 rounded-full transition-all duration-150" | ||
| style={{ width: `${filePercent}%` }} | ||
| /> | ||
| </div> | ||
| )} | ||
| </div> | ||
| )} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| )} | ||
|
|
||
| {/* Finalizing phase — downloads done, waiting for install to finish */} | ||
| {phase === "finalizing" && ( | ||
| <div className="flex items-center gap-2 text-sm text-muted-foreground"> | ||
| <Loader2 className="h-3 w-3 shrink-0 animate-spin" /> | ||
| <span className="truncate">Verifying installation...</span> | ||
| </div> | ||
| )} | ||
|
|
||
| {/* Mod loader install phase */} | ||
| {phase === "installing-mod-loader" && ( | ||
| <div className="flex items-center gap-2 text-sm text-muted-foreground min-w-0"> | ||
| <Loader2 className="h-3 w-3 shrink-0 animate-spin" /> | ||
| <span className="truncate">{phaseLabel}</span> | ||
| </div> | ||
| )} | ||
|
|
||
| {/* Error */} | ||
| {phase === "error" && errorMessage && ( | ||
| <div className="text-sm text-red-400 break-words">{errorMessage}</div> | ||
| )} | ||
|
|
||
| {/* Completed */} | ||
| {phase === "completed" && ( | ||
| <div className="text-sm text-emerald-400"> | ||
| Successfully installed {totalFiles > 0 ? `${totalFiles} files` : ""} | ||
| </div> | ||
| )} | ||
| </div> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.