Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

Misc UI adjustments

fzaninotto6ac5426b8bc4
diff --git a/src/atomic-crm/activity/ActivityLogIterator.tsx b/src/atomic-crm/activity/ActivityLogIterator.tsx
index 79e6c7d8..53094cf4 100644
--- a/src/atomic-crm/activity/ActivityLogIterator.tsx
+++ b/src/atomic-crm/activity/ActivityLogIterator.tsx
@@ -1,5 +1,6 @@
-import { Separator } from "@/components/ui/separator";
import { Fragment, useState } from "react";
+import { Separator } from "@/components/ui/separator";
+
import {
COMPANY_CREATED,
CONTACT_CREATED,
@@ -28,7 +29,7 @@ export function ActivityLogIterator({
const filteredActivities = activities.slice(0, activitiesDisplayed);
return (
- <div className="space-y-2">
+ <div className="space-y-4">
{filteredActivities.map((activity, index) => (
<Fragment key={index}>
<ActivityItem key={activity.id} activity={activity} />
diff --git a/src/atomic-crm/companies/CompanyAside.tsx b/src/atomic-crm/companies/CompanyAside.tsx
index 5b9a5050..02f63e8e 100644
--- a/src/atomic-crm/companies/CompanyAside.tsx
+++ b/src/atomic-crm/companies/CompanyAside.tsx
@@ -1,3 +1,5 @@
+import { Globe, Linkedin, Phone } from "lucide-react";
+import { useRecordContext } from "ra-core";
import {
EditButton,
ReferenceField,
@@ -7,8 +9,7 @@ import {
UrlField,
SelectField,
} from "@/components/admin";
-import { Globe, Linkedin, Phone } from "lucide-react";
-import { useRecordContext } from "ra-core";
+
import { AsideSection } from "../misc/AsideSection";
import { SaleName } from "../sales/SaleName";
import type { Company } from "../types";
@@ -23,7 +24,7 @@ export const CompanyAside = ({ link = "edit" }: CompanyAsideProps) => {
if (!record) return null;
return (
- <div className="ml-4 w-[250px] min-w-[250px] space-y-4">
+ <div className="hidden sm:block w-[250px] min-w-[250px] space-y-4">
<div className="flex flex-row space-x-1">
{link === "edit" ? (
<EditButton label="Edit Company" />
diff --git a/src/atomic-crm/companies/CompanyCard.tsx b/src/atomic-crm/companies/CompanyCard.tsx
index acb901dd..f7d17350 100644
--- a/src/atomic-crm/companies/CompanyCard.tsx
+++ b/src/atomic-crm/companies/CompanyCard.tsx
@@ -1,8 +1,8 @@
-import { ReferenceManyField } from "@/components/admin";
-import { Card } from "@/components/ui/card";
import { DollarSign } from "lucide-react";
-import { useCreatePath, useListContext, useRecordContext } from "ra-core";
import { Link } from "react-router";
+import { useCreatePath, useListContext, useRecordContext } from "ra-core";
+import { ReferenceManyField } from "@/components/admin";
+import { Card } from "@/components/ui/card";
import { Avatar as ContactAvatar } from "../contacts/Avatar";
import type { Company } from "../types";
@@ -22,7 +22,7 @@ export const CompanyCard = (props: { record?: Company }) => {
})}
className="no-underline"
>
- <Card className="h-[200px] flex flex-col justify-between p-4 transition-shadow shadow hover:bg-muted">
+ <Card className="h-[200px] flex flex-col justify-between p-4 hover:bg-muted">
<div className="flex flex-col items-center gap-1">
<CompanyAvatar />
<div className="text-center mt-1">
diff --git a/src/atomic-crm/companies/CompanyCreate.tsx b/src/atomic-crm/companies/CompanyCreate.tsx
index db85fb80..e3ab22ee 100644
--- a/src/atomic-crm/companies/CompanyCreate.tsx
+++ b/src/atomic-crm/companies/CompanyCreate.tsx
@@ -1,14 +1,13 @@
-import { Form, useGetIdentity } from "ra-core";
+import { CreateBase, Form, useGetIdentity } from "ra-core";
+import { Card, CardContent } from "@/components/ui/card";
+import { CancelButton, SaveButton, FormToolbar } from "@/components/admin";
-import { CancelButton, Create } from "@/components/admin";
-import { SaveButton } from "@/components/admin";
-import { FormToolbar } from "@/components/admin";
import { CompanyInputs } from "./CompanyInputs";
export const CompanyCreate = () => {
const { identity } = useGetIdentity();
return (
- <Create
+ <CreateBase
redirect="show"
transform={(values) => {
// add https:// before website if not present
@@ -18,15 +17,23 @@ export const CompanyCreate = () => {
return values;
}}
>
- <Form defaultValues={{ sales_id: identity?.id }}>
- <CompanyInputs />
- <FormToolbar>
- <div className="flex flex-row gap-2 justify-end">
- <CancelButton />
- <SaveButton label="Create Company" />
- </div>
- </FormToolbar>
- </Form>
- </Create>
+ <div className="mt-2 flex lg:mr-72">
+ <div className="flex-1">
+ <Form defaultValues={{ sales_id: identity?.id }}>
+ <Card>
+ <CardContent>
+ <CompanyInputs />
+ <FormToolbar>
+ <div className="flex flex-row gap-2 justify-end">
+ <CancelButton />
+ <SaveButton label="Create Company" />
+ </div>
+ </FormToolbar>
+ </CardContent>
+ </Card>
+ </Form>
+ </div>
+ </div>
+ </CreateBase>
);
};
diff --git a/src/atomic-crm/companies/CompanyEdit.tsx b/src/atomic-crm/companies/CompanyEdit.tsx
index 7afd1ccd..7c1a5046 100644
--- a/src/atomic-crm/companies/CompanyEdit.tsx
+++ b/src/atomic-crm/companies/CompanyEdit.tsx
@@ -18,7 +18,7 @@ export const CompanyEdit = () => (
return values;
}}
>
- <div className="flex">
+ <div className="mt-2 flex gap-8">
<Form className="flex flex-1 flex-col gap-4 pb-2">
<Card>
<CardContent>
diff --git a/src/atomic-crm/companies/CompanyInputs.tsx b/src/atomic-crm/companies/CompanyInputs.tsx
index f68ae750..93b92fc4 100644
--- a/src/atomic-crm/companies/CompanyInputs.tsx
+++ b/src/atomic-crm/companies/CompanyInputs.tsx
@@ -30,8 +30,8 @@ export const CompanyInputs = () => {
return (
<div className="flex flex-col gap-4 p-1">
<CompanyDisplayInputs />
- <div className={`flex gap-4 ${isMobile ? "flex-col" : "flex-row"}`}>
- <div className="flex flex-col gap-8 flex-1">
+ <div className={`flex gap-6 ${isMobile ? "flex-col" : "flex-row"}`}>
+ <div className="flex flex-col gap-10 flex-1">
<CompanyContactInputs />
<CompanyContextInputs />
</div>
@@ -63,6 +63,7 @@ const CompanyDisplayInputs = () => {
className="w-full h-fit"
validate={required()}
helperText={false}
+ placeholder="Company name"
/>
</div>
);
diff --git a/src/atomic-crm/companies/CompanyShow.tsx b/src/atomic-crm/companies/CompanyShow.tsx
index cef3425e..89046c65 100644
--- a/src/atomic-crm/companies/CompanyShow.tsx
+++ b/src/atomic-crm/companies/CompanyShow.tsx
@@ -1,6 +1,3 @@
-import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
-import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
import { formatDistance } from "date-fns";
import { UserPlus } from "lucide-react";
import {
@@ -16,6 +13,9 @@ import {
useMatch,
useNavigate,
} from "react-router-dom";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
import { ReferenceManyField, SortButton } from "@/components/admin";
import { ActivityLog } from "../activity/ActivityLog";
@@ -54,7 +54,7 @@ const CompanyShowContent = () => {
if (isPending || !record) return null;
return (
- <div className="flex pb-2">
+ <div className="mt-2 flex pb-2 gap-8">
<div className="flex-1">
<Card>
<CardContent>
@@ -145,7 +145,7 @@ const ContactsIterator = () => {
<RouterLink
to={`/contacts/${contact.id}/show`}
state={{ from: location.pathname }}
- className="flex items-center justify-between hover:bg-muted py-2 px-4 transition-colors"
+ className="flex items-center justify-between hover:bg-muted py-2 transition-colors"
>
<div className="mr-4">
<Avatar />
diff --git a/src/atomic-crm/contacts/ContactAside.tsx b/src/atomic-crm/contacts/ContactAside.tsx
index 14ac9cdf..7bfaf877 100644
--- a/src/atomic-crm/contacts/ContactAside.tsx
+++ b/src/atomic-crm/contacts/ContactAside.tsx
@@ -26,7 +26,7 @@ export const ContactAside = ({ link = "edit" }: { link?: "edit" | "show" }) => {
const record = useRecordContext<Contact>();
if (!record) return null;
return (
- <div className="ml-4 w-64 min-w-64 text-sm">
+ <div className="hidden sm:block w-64 min-w-64 text-sm">
<div className="mb-4 -ml-1">
{link === "edit" ? (
<EditButton label="Edit Contact" />
diff --git a/src/atomic-crm/contacts/ContactCreate.tsx b/src/atomic-crm/contacts/ContactCreate.tsx
index 9a4aed23..f81cf002 100644
--- a/src/atomic-crm/contacts/ContactCreate.tsx
+++ b/src/atomic-crm/contacts/ContactCreate.tsx
@@ -17,7 +17,7 @@ export const ContactCreate = () => {
tags: [],
})}
>
- <div className="mt-2 flex">
+ <div className="mt-2 flex lg:mr-72">
<div className="flex-1">
<Form defaultValues={{ sales_id: identity?.id }}>
<Card>
diff --git a/src/atomic-crm/contacts/ContactEdit.tsx b/src/atomic-crm/contacts/ContactEdit.tsx
index 1922117d..fe5e4d0d 100644
--- a/src/atomic-crm/contacts/ContactEdit.tsx
+++ b/src/atomic-crm/contacts/ContactEdit.tsx
@@ -16,7 +16,7 @@ const ContactEditContent = () => {
const { isPending, record } = useEditContext<Contact>();
if (isPending || !record) return null;
return (
- <div className="mt-2 flex">
+ <div className="mt-2 flex gap-8">
<Form className="flex flex-1 flex-col gap-4">
<Card>
<CardContent>
diff --git a/src/atomic-crm/contacts/ContactInputs.tsx b/src/atomic-crm/contacts/ContactInputs.tsx
index 556017e4..41015abb 100644
--- a/src/atomic-crm/contacts/ContactInputs.tsx
+++ b/src/atomic-crm/contacts/ContactInputs.tsx
@@ -25,8 +25,8 @@ export const ContactInputs = () => {
return (
<div className="flex flex-col gap-2 p-1">
<Avatar />
- <div className={`flex gap-4 ${isMobile ? "flex-col" : "flex-row"}`}>
- <div className="flex flex-col gap-6 flex-1">
+ <div className={`flex gap-6 ${isMobile ? "flex-col" : "flex-row"}`}>
+ <div className="flex flex-col gap-10 flex-1">
<ContactIdentityInputs />
<ContactPositionInputs />
</div>
@@ -34,7 +34,7 @@ export const ContactInputs = () => {
orientation={isMobile ? "horizontal" : "vertical"}
className="flex-shrink-0"
/>
- <div className="flex flex-col gap-4 flex-1">
+ <div className="flex flex-col gap-10 flex-1">
<ContactPersonalInformationInputs />
<ContactMiscInputs />
</div>
@@ -113,11 +113,18 @@ const ContactPersonalInformationInputs = () => {
label="Email addresses"
helperText={false}
>
- <SimpleFormIterator inline disableReordering>
+ <SimpleFormIterator
+ inline
+ disableReordering
+ disableClear
+ className="[&>ul>li]:border-b-0 [&>ul>li]:pb-0"
+ >
<TextInput
source="email"
className="w-full"
helperText={false}
+ label={false}
+ placeholder="Email"
validate={email()}
onPaste={handleEmailPaste}
onBlur={handleEmailBlur}
@@ -125,6 +132,7 @@ const ContactPersonalInformationInputs = () => {
<SelectInput
source="type"
helperText={false}
+ label={false}
optionText="id"
choices={personalInfoTypes}
defaultValue="Work"
@@ -133,11 +141,23 @@ const ContactPersonalInformationInputs = () => {
</SimpleFormIterator>
</ArrayInput>
<ArrayInput source="phone_jsonb" label="Phone numbers" helperText={false}>
- <SimpleFormIterator inline disableReordering>
- <TextInput source="number" className="w-full" helperText={false} />
+ <SimpleFormIterator
+ inline
+ disableReordering
+ disableClear
+ className="[&>ul>li]:border-b-0 [&>ul>li]:pb-0"
+ >
+ <TextInput
+ source="number"
+ className="w-full"
+ helperText={false}
+ label={false}
+ placeholder="Phone number"
+ />
<SelectInput
source="type"
helperText={false}
+ label={false}
optionText="id"
choices={personalInfoTypes}
defaultValue="Work"
diff --git a/src/atomic-crm/contacts/ContactShow.tsx b/src/atomic-crm/contacts/ContactShow.tsx
index b34ceab4..1c4ca605 100644
--- a/src/atomic-crm/contacts/ContactShow.tsx
+++ b/src/atomic-crm/contacts/ContactShow.tsx
@@ -22,7 +22,7 @@ const ContactShowContent = () => {
if (isPending || !record) return null;
return (
- <div className="mt-2 mb-2 flex">
+ <div className="mt-2 mb-2 flex gap-8">
<div className="flex-1">
<Card>
<CardContent>
diff --git a/src/atomic-crm/dashboard/DashboardActivityLog.tsx b/src/atomic-crm/dashboard/DashboardActivityLog.tsx
index 7171289d..c6c4c2b3 100644
--- a/src/atomic-crm/dashboard/DashboardActivityLog.tsx
+++ b/src/atomic-crm/dashboard/DashboardActivityLog.tsx
@@ -13,7 +13,7 @@ export function DashboardActivityLog() {
Latest Activity
</h2>
</div>
- <Card className="mb-2 p-4">
+ <Card className="mb-2 p-6">
<ActivityLog pageSize={10} />
</Card>
</div>
diff --git a/src/atomic-crm/layout/Layout.tsx b/src/atomic-crm/layout/Layout.tsx
index b69ed3d1..62d979a7 100644
--- a/src/atomic-crm/layout/Layout.tsx
+++ b/src/atomic-crm/layout/Layout.tsx
@@ -8,15 +8,13 @@ import Header from "./Header";
export const Layout = ({ children }: { children: ReactNode }) => (
<>
<Header />
- <div className="max-w-screen-xl mx-auto pt-4 px-4">
- <main id="main-content">
- <ErrorBoundary FallbackComponent={Error}>
- <Suspense fallback={<Skeleton className="h-12 w-12 rounded-full" />}>
- {children}
- </Suspense>
- </ErrorBoundary>
- </main>
- </div>
+ <main className="max-w-screen-xl mx-auto pt-4 px-4" id="main-content">
+ <ErrorBoundary FallbackComponent={Error}>
+ <Suspense fallback={<Skeleton className="h-12 w-12 rounded-full" />}>
+ {children}
+ </Suspense>
+ </ErrorBoundary>
+ </main>
<Notification />
</>
);
diff --git a/src/atomic-crm/tasks/TasksIterator.tsx b/src/atomic-crm/tasks/TasksIterator.tsx
index 3164a9c1..2148b870 100644
--- a/src/atomic-crm/tasks/TasksIterator.tsx
+++ b/src/atomic-crm/tasks/TasksIterator.tsx
@@ -21,7 +21,7 @@ export const TasksIterator = ({
);
return (
- <div className={`space-y-1 ${className || ""}`}>
+ <div className={`space-y-2 ${className || ""}`}>
{tasks.map((task) => (
<Task task={task} showContact={showContact} key={task.id} />
))}
diff --git a/src/components/admin/array-input.tsx b/src/components/admin/array-input.tsx
index 74ec21be..7f55024b 100644
--- a/src/components/admin/array-input.tsx
+++ b/src/components/admin/array-input.tsx
@@ -135,7 +135,7 @@ export const ArrayInput = (props: ArrayInputProps) => {
name={finalSource}
{...sanitizeInputRestProps(rest)}
>
- <Label className="text-muted-foreground text-sm">
+ <Label className="text-sm">
<FieldTitle
label={label}
source={arraySource}
diff --git a/src/components/admin/simple-form-iterator.tsx b/src/components/admin/simple-form-iterator.tsx
index 9add9585..6e15a349 100644
--- a/src/components/admin/simple-form-iterator.tsx
+++ b/src/components/admin/simple-form-iterator.tsx
@@ -331,7 +331,7 @@ export const SimpleFormIteratorItem = React.forwardRef(
<li
ref={ref}
className={cn(
- "flex flex-row items-start justify-between gap-2 pb-2 border-b border-border last:border-b-0",
+ "flex flex-row items-start justify-between gap-3 pb-2 border-b border-border last:border-b-0",
// Align the buttons with the input
"[&:has(label)>.simple-form-iterator-item-actions]:pt-10",
)}
diff --git a/src/components/ui/card.tsx b/src/components/ui/card.tsx
index 113d66c7..abb84216 100644
--- a/src/components/ui/card.tsx
+++ b/src/components/ui/card.tsx
@@ -7,7 +7,7 @@ function Card({ className, ...props }: React.ComponentProps<"div">) {
<div
data-slot="card"
className={cn(
- "bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",
+ "bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6",
className,
)}
{...props}
diff --git a/src/components/ui/label.tsx b/src/components/ui/label.tsx
index 79d77b4b..62311821 100644
--- a/src/components/ui/label.tsx
+++ b/src/components/ui/label.tsx
@@ -13,7 +13,7 @@ function Label({
<LabelPrimitive.Root
data-slot="label"
className={cn(
- "flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50",
+ "flex items-center gap-2 text-sm leading-none font-medium select-none text-muted-foreground group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50",
className,
)}
{...props}
diff --git a/src/index.css b/src/index.css
index 0ff54bc9..0d14e21d 100644
--- a/src/index.css
+++ b/src/index.css
@@ -92,7 +92,7 @@
--accent: oklch(0.269 0 0);
--accent-foreground: oklch(0.985 0 0);
--destructive: oklch(0.704 0.191 22.216);
- --border: oklch(1 0 0 / 10%);
+ --border: oklch(1 0 0 / 15%);
--input: oklch(1 0 0 / 15%);
--ring: oklch(0.556 0 0);
--chart-1: oklch(0.488 0.243 264.376);