Skip to content

Feature: Add support for PDF documents in expenses (#397) #490

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.

Sign up for GitHub

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

Open
a-camacho wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Feature: Add support for PDF documents in expenses (#397) #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions prisma/migrations/20260107100000_make_expense_document_dimensions_optional/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- AlterTable
ALTER TABLE "ExpenseDocument" ALTER COLUMN "width" DROP NOT NULL;
ALTER TABLE "ExpenseDocument" ALTER COLUMN "height" DROP NOT NULL;
4 changes: 2 additions & 2 deletions prisma/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ model Expense {
model ExpenseDocument {
id String @id
url String
width Int
height Int
width Int?
height Int?
Expense Expense? @relation(fields: [expenseId], references: [id])
expenseId String?
}
Expand Down
60 changes: 41 additions & 19 deletions src/components/expense-documents-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { useToast } from '@/components/ui/use-toast'
import { randomId } from '@/lib/api'
import { ExpenseFormValues } from '@/lib/schemas'
import { formatFileSize } from '@/lib/utils'
import { Loader2, Plus, Trash, X } from 'lucide-react'
import { FileText, Loader2, Plus, Trash, X } from 'lucide-react'
import { useLocale, useTranslations } from 'next-intl'
import { getImageData, usePresignedUpload } from 'next-s3-upload'
import Image from 'next/image'
Expand Down Expand Up @@ -56,8 +56,16 @@ export function ExpenseDocumentsInput({ documents, updateDocuments }: Props) {
const upload = async () => {
try {
setPending(true)
const { width, height } = await getImageData(file)
if (!width || !height) throw new Error('Cannot get image dimensions')
let width = null
let height = null

if (file.type.startsWith('image/')) {
const dims = await getImageData(file)
width = dims.width
height = dims.height
if (!width || !height) throw new Error('Cannot get image dimensions')
}

const { url } = await uploadToS3(file)
updateDocuments([...documents, { id: randomId(), url, width, height }])
} catch (err) {
Expand All @@ -84,7 +92,10 @@ export function ExpenseDocumentsInput({ documents, updateDocuments }: Props) {

return (
<div>
<FileInput onChange={handleFileChange} accept="image/jpeg,image/png" />
<FileInput
onChange={handleFileChange}
accept="image/jpeg,image/png,application/pdf"
/>

<div className="grid grid-cols-2 sm:grid-cols-3 gap-4 [&_*]:aspect-square">
{documents.map((doc) => (
Expand Down Expand Up @@ -147,15 +158,19 @@ export function DocumentThumbnail({
<DialogTrigger asChild>
<Button
variant="secondary"
className="w-full h-full border overflow-hidden rounded shadow-inner"
className="w-full h-full border overflow-hidden rounded shadow-inner p-0"
>
<Image
width={300}
height={300}
className="object-contain"
src={document.url}
alt=""
/>
{document.width && document.height ? (
<Image
width={300}
height={300}
className="object-contain"
src={document.url}
alt=""
/>
) : (
<FileText className="w-12 h-12 text-muted-foreground" />
)}
</Button>
</DialogTrigger>
<DialogContent className="p-4 w-[100vw] max-w-[100vw] h-[100dvh] max-h-[100dvh] sm:max-w-[calc(100vw-32px)] sm:max-h-[calc(100dvh-32px)] [&>:last-child]:hidden">
Expand Down Expand Up @@ -194,13 +209,20 @@ export function DocumentThumbnail({
<CarouselContent>
{documents.map((document, index) => (
<CarouselItem key={index}>
<Image
className="object-contain w-[calc(100vw-32px)] h-[calc(100dvh-32px-40px-16px-48px)] sm:w-[calc(100vw-32px-32px)] sm:h-[calc(100dvh-32px-40px-16px-32px-48px)]"
src={document.url}
width={document.width}
height={document.height}
alt=""
/>
{document.width && document.height ? (
<Image
className="object-contain w-[calc(100vw-32px)] h-[calc(100dvh-32px-40px-16px-48px)] sm:w-[calc(100vw-32px-32px)] sm:h-[calc(100dvh-32px-40px-16px-32px-48px)]"
src={document.url}
width={document.width}
height={document.height}
alt=""
/>
) : (
<iframe
className="w-[calc(100vw-32px)] h-[calc(100dvh-32px-40px-16px-48px)] sm:w-[calc(100vw-32px-32px)] sm:h-[calc(100dvh-32px-40px-16px-32px-48px)]"
src={document.url}
/>
)}
</CarouselItem>
))}
</CarouselContent>
Expand Down
4 changes: 2 additions & 2 deletions src/lib/schemas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ export const expenseFormSchema = z
z.object({
id: z.string(),
url: z.string().url(),
width: z.number().int().min(1),
height: z.number().int().min(1),
width: z.number().int().min(1).nullish(),
height: z.number().int().min(1).nullish(),
}),
)
.default([]),
Expand Down