Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2d7a2d1
feat(merge): display file size and page count in PdfCard
SrashtiChauhan Apr 20, 2026
67d84a6
Merge branch 'main' into feat/file-metadata-v2
SrashtiChauhan Apr 20, 2026
04bcf9e
fix(lint): remove unused motion imports
SrashtiChauhan Apr 20, 2026
16d8498
Potential fix for pull request finding
SrashtiChauhan Apr 20, 2026
f9de56f
fix: restore framer-motion imports where required
SrashtiChauhan Apr 20, 2026
4d8479c
fix: address review comments (remove gitignore changes and fix imports)
SrashtiChauhan Apr 20, 2026
678fe1b
fix: restore FREE_LIMITS import and clean unnecessary changes
SrashtiChauhan Apr 20, 2026
0957a70
chore: finalize metadata updates and fixes
SrashtiChauhan Apr 22, 2026
dd52a0f
fix: metadata page count issue in required tools
SrashtiChauhan Apr 24, 2026
3f7882f
feat: add metadata (size + page count) across all tools
SrashtiChauhan Apr 24, 2026
6e0beff
Merge branch 'main' into feat/file-metadata-v2
SrashtiChauhan Apr 24, 2026
b28534b
feat: improve merge file card UI (spacing, hover, metadata clarity)
SrashtiChauhan Apr 29, 2026
1aa375c
Merge branch 'main' into feat/file-metadata-v2
SrashtiChauhan Apr 29, 2026
2aefcdf
fix: remove console log and lint issues in watermark tool
SrashtiChauhan Apr 29, 2026
629b215
fix: add missing getPdfPageCount import in watermark tool
SrashtiChauhan Apr 29, 2026
2130cf7
fix: add missing getPdfPageCount import in watermark tool
SrashtiChauhan Apr 29, 2026
3eeead9
fix: resolve missing getPdfPageCount import
SrashtiChauhan Apr 30, 2026
33b475d
fix: remove unintended files from PR history
SrashtiChauhan May 2, 2026
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
26 changes: 18 additions & 8 deletions src/pages/Merge/Merge.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pdfjsLib.GlobalWorkerOptions.workerSrc = new URL(
import.meta.url,
).toString();

// ─── helpers ──────────────────────────────────────────────────────────────────
// ─── helpers
let _uid = 0;
function makeId() { return ++_uid; }

Expand Down Expand Up @@ -58,10 +58,10 @@ function PdfCard({ item, onRemove, onPreview, onDragStart, onDragEnter, onDragEn
onDragOver={(e) => e.preventDefault()}
onDrop={() => { onDragEnd(); setOver(false); }}
className={[
"relative group flex flex-col items-center gap-2 border rounded-2xl p-2.5 cursor-grab active:cursor-grabbing select-none transition-all duration-150",
"relative group flex flex-col items-center gap-3 border rounded-2xl p-3 cursor-grab active:cursor-grabbing select-none transition-all duration-150",
over
? "border-white/40 bg-white/[0.06] scale-[1.02]"
: "bg-zinc-900/60 border-white/[0.06] hover:border-white/20",
: "bg-zinc-900/60 border-white/[0.06] hover:border-white/30 hover:shadow-[0_0_20px_rgba(255,255,255,0.05)] hover:scale-[1.02]",
].join(" ")}
>
{/* Order badge */}
Expand All @@ -73,7 +73,7 @@ function PdfCard({ item, onRemove, onPreview, onDragStart, onDragEnter, onDragEn

{/* Thumbnail area */}
<div
className="w-full overflow-hidden rounded-xl bg-zinc-800 flex items-center justify-center relative"
className="w-full overflow-hidden rounded-xl bg-zinc-800/80 border border-white/[0.05] flex items-center justify-center relative"
style={{ minHeight: 120 }}
>
{item.thumb ? (
Expand Down Expand Up @@ -111,10 +111,20 @@ function PdfCard({ item, onRemove, onPreview, onDragStart, onDragEnter, onDragEn
</button>
</div>

{/* Name + size */}
<div className="w-full px-1">
<p className="text-[11px] text-zinc-300 font-medium truncate">{item.name}</p>
<p className="text-[10px] text-zinc-500">{formatFileSize(item.size)}{item.numPages != null && ` · ${item.numPages} pages`}</p>
{/* File Info */}
<div className="w-full px-2 mt-1 flex flex-col gap-1">

{/* File name */}
<p className="text-xs font-semibold text-white truncate leading-tight">
{item.name}
</p>

{/* Metadata */}
<p className="text-[11px] text-zinc-400 leading-tight">
{formatFileSize(item.size)}
{item.numPages != null && ` • ${item.numPages} pages`}
</p>

</div>

{/* Remove */}
Expand Down
Loading
Loading