A full-featured CRM built with React, shadcn/ui, and Supabase.
Consistent padding and positioning in deals show and edit dialogs.
Matthieu Hochlander8d96cb09ffbb
diff --git a/src/atomic-crm/deals/DealEdit.tsx b/src/atomic-crm/deals/DealEdit.tsxindex ab8dc769..d73efc44 100644--- a/src/atomic-crm/deals/DealEdit.tsx+++ b/src/atomic-crm/deals/DealEdit.tsx@@ -27,7 +27,7 @@ export const DealEdit = ({ open, id }: { open: boolean; id?: string }) => {return (<Dialog open={open} onOpenChange={() => handleClose()}>- <DialogContent className="lg:max-w-4xl overflow-y-auto max-h-9/10 top-1/20 translate-y-0">+ <DialogContent className="lg:max-w-4xl p-4 overflow-y-auto max-h-9/10 top-1/20 translate-y-0">{id ? (<EditBaseid={id}@@ -61,15 +61,14 @@ function EditHeader() {return (<DialogTitle className="pb-0">- <div className="flex items-center justify-between space-x-4">- <div className="flex items-center gap-8">+ <div className="flex justify-between items-start mb-8">+ <div className="flex items-center gap-4"><ReferenceField source="company_id" reference="companies" link="show"><CompanyAvatar /></ReferenceField>- <h3 className="text-lg font-semibold">Edit {deal.name} deal</h3>+ <h2 className="text-2xl font-semibold">Edit {deal.name} deal</h2></div>-- <div className="flex space-x-4 pr-12">+ <div className="flex gap-2 pr-12"><Button asChild variant="outline" className="h-9"><Link to={`/deals/${deal.id}/show`}>Back to deal</Link></Button>diff --git a/src/atomic-crm/deals/DealShow.tsx b/src/atomic-crm/deals/DealShow.tsxindex 8c919bbf..3f2c596c 100644--- a/src/atomic-crm/deals/DealShow.tsx+++ b/src/atomic-crm/deals/DealShow.tsx@@ -37,7 +37,7 @@ export const DealShow = ({ open, id }: { open: boolean; id?: string }) => {return (<Dialog open={open} onOpenChange={(open) => !open && handleClose()}>- <DialogContent className="lg:max-w-4xl p-0 overflow-y-auto max-h-9/10 top-1/20 translate-y-0">+ <DialogContent className="lg:max-w-4xl p-4 overflow-y-auto max-h-9/10 top-1/20 translate-y-0">{id ? (<ShowBase id={id}><DealShowContent />@@ -57,123 +57,119 @@ const DealShowContent = () => {<><div className="space-y-2">{record.archived_at ? <ArchivedTitle /> : null}- <div className="flex p-4">- <div className="flex-1">- <div className="flex justify-between items-start mb-8">- <div className="flex items-center gap-4">- <ReferenceField- source="company_id"- reference="companies"- link="show"- >- <CompanyAvatar />- </ReferenceField>- <h2 className="text-2xl font-semibold">{record.name}</h2>- </div>- <div- className={`flex gap-2 ${record.archived_at ? "" : "pr-12"}`}+ <div className="flex-1">+ <div className="flex justify-between items-start mb-8">+ <div className="flex items-center gap-4">+ <ReferenceField+ source="company_id"+ reference="companies"+ link="show">- {record.archived_at ? (- <>- <UnarchiveButton record={record} />- <DeleteButton />- </>- ) : (- <>- <ArchiveButton record={record} />- <EditButton />- </>- )}- </div>+ <CompanyAvatar />+ </ReferenceField>+ <h2 className="text-2xl font-semibold">{record.name}</h2></div>+ <div className={`flex gap-2 ${record.archived_at ? "" : "pr-12"}`}>+ {record.archived_at ? (+ <>+ <UnarchiveButton record={record} />+ <DeleteButton />+ </>+ ) : (+ <>+ <ArchiveButton record={record} />+ <EditButton />+ </>+ )}+ </div>+ </div>- <div className="flex gap-8 m-4">- <div className="flex flex-col mr-10">- <span className="text-xs text-muted-foreground tracking-wide">- Expected closing date- </span>- <div className="flex items-center gap-2">- <span className="text-sm">- {isValid(new Date(record.expected_closing_date))- ? format(new Date(record.expected_closing_date), "PP")- : "Invalid date"}- </span>- {new Date(record.expected_closing_date) < new Date() ? (- <Badge variant="destructive">Past</Badge>- ) : null}- </div>- </div>-- <div className="flex flex-col mr-10">- <span className="text-xs text-muted-foreground tracking-wide">- Budget- </span>+ <div className="flex gap-8 m-4">+ <div className="flex flex-col mr-10">+ <span className="text-xs text-muted-foreground tracking-wide">+ Expected closing date+ </span>+ <div className="flex items-center gap-2"><span className="text-sm">- {record.amount.toLocaleString("en-US", {- notation: "compact",- style: "currency",- currency: "USD",- currencyDisplay: "narrowSymbol",- minimumSignificantDigits: 3,- })}+ {isValid(new Date(record.expected_closing_date))+ ? format(new Date(record.expected_closing_date), "PP")+ : "Invalid date"}</span>+ {new Date(record.expected_closing_date) < new Date() ? (+ <Badge variant="destructive">Past</Badge>+ ) : null}</div>+ </div>- {record.category && (- <div className="flex flex-col mr-10">- <span className="text-xs text-muted-foreground tracking-wide">- Category- </span>- <span className="text-sm">{record.category}</span>- </div>- )}+ <div className="flex flex-col mr-10">+ <span className="text-xs text-muted-foreground tracking-wide">+ Budget+ </span>+ <span className="text-sm">+ {record.amount.toLocaleString("en-US", {+ notation: "compact",+ style: "currency",+ currency: "USD",+ currencyDisplay: "narrowSymbol",+ minimumSignificantDigits: 3,+ })}+ </span>+ </div>+ {record.category && (<div className="flex flex-col mr-10"><span className="text-xs text-muted-foreground tracking-wide">- Stage- </span>- <span className="text-sm">- {findDealLabel(dealStages, record.stage)}+ Category</span>- </div>- </div>-- {!!record.contact_ids?.length && (- <div className="m-4">- <div className="flex flex-col min-h-12 mr-10">- <span className="text-xs text-muted-foreground tracking-wide">- Contacts- </span>- <ReferenceArrayField- source="contact_ids"- reference="contacts_summary"- >- <ContactList />- </ReferenceArrayField>- </div>+ <span className="text-sm">{record.category}</span></div>)}- {record.description && (- <div className="m-4 whitespace-pre-line">+ <div className="flex flex-col mr-10">+ <span className="text-xs text-muted-foreground tracking-wide">+ Stage+ </span>+ <span className="text-sm">+ {findDealLabel(dealStages, record.stage)}+ </span>+ </div>+ </div>++ {!!record.contact_ids?.length && (+ <div className="m-4">+ <div className="flex flex-col min-h-12 mr-10"><span className="text-xs text-muted-foreground tracking-wide">- Description+ Contacts</span>- <p className="text-sm leading-6">{record.description}</p>+ <ReferenceArrayField+ source="contact_ids"+ reference="contacts_summary"+ >+ <ContactList />+ </ReferenceArrayField></div>- )}+ </div>+ )}- <div className="m-4">- <Separator className="mb-4" />- <ReferenceManyField- target="deal_id"- reference="dealNotes"- sort={{ field: "date", order: "DESC" }}- empty={<NoteCreate reference={"deals"} />}- >- <NotesIterator reference="deals" />- </ReferenceManyField>+ {record.description && (+ <div className="m-4 whitespace-pre-line">+ <span className="text-xs text-muted-foreground tracking-wide">+ Description+ </span>+ <p className="text-sm leading-6">{record.description}</p></div>+ )}++ <div className="m-4">+ <Separator className="mb-4" />+ <ReferenceManyField+ target="deal_id"+ reference="dealNotes"+ sort={{ field: "date", order: "DESC" }}+ empty={<NoteCreate reference={"deals"} />}+ >+ <NotesIterator reference="deals" />+ </ReferenceManyField></div></div></div>