Skip to content

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

Use DateInput

fzaninottoe8b7050abdb4
diff --git a/src/components/admin/date-input.tsx b/src/components/admin/date-input.tsx
index 67b75088..1f69e03c 100644
--- a/src/components/admin/date-input.tsx
+++ b/src/components/admin/date-input.tsx
@@ -217,7 +217,7 @@ export const DateInput = (props: DateInputProps) => {
className={cn(
"ra-input",
`ra-input-${source}`,
- "[color-scheme:light] dark:[color-scheme:dark] relative [&::-webkit-calendar-picker-indicator]:cursor-pointer [&::-webkit-calendar-picker-indicator]:absolute [&::-webkit-calendar-picker-indicator]:right-3 [&::-webkit-calendar-picker-indicator]:opacity-100 pr-10",
+ "[color-scheme:light] dark:[color-scheme:dark] relative [&::-webkit-calendar-picker-indicator]:cursor-pointer [&::-webkit-calendar-picker-indicator]:absolute [&::-webkit-calendar-picker-indicator]:right-3 [&::-webkit-calendar-picker-indicator]:opacity-100",
inputClassName,
)}
disabled={disabled || readOnly}
diff --git a/src/components/atomic-crm/deals/DealInputs.tsx b/src/components/atomic-crm/deals/DealInputs.tsx
index 68cf1169..457bb893 100644
--- a/src/components/atomic-crm/deals/DealInputs.tsx
+++ b/src/components/atomic-crm/deals/DealInputs.tsx
@@ -4,6 +4,7 @@ import { ReferenceArrayInput } from "@/components/admin/reference-array-input";
import { ReferenceInput } from "@/components/admin/reference-input";
import { TextInput } from "@/components/admin/text-input";
import { NumberInput } from "@/components/admin/number-input";
+import { DateInput } from "@/components/admin/date-input";
import { SelectInput } from "@/components/admin/select-input";
import { Separator } from "@/components/ui/separator";
import { useIsMobile } from "@/hooks/use-mobile";
@@ -82,11 +83,10 @@ const DealMiscInputs = () => {
helperText={false}
validate={required()}
/>
- <TextInput
+ <DateInput
validate={required()}
source="expected_closing_date"
helperText={false}
- type="date"
defaultValue={new Date().toISOString().split("T")[0]}
/>
<SelectInput
diff --git a/src/components/atomic-crm/notes/NoteInputs.tsx b/src/components/atomic-crm/notes/NoteInputs.tsx
index a2955b7b..cc7f206a 100644
--- a/src/components/atomic-crm/notes/NoteInputs.tsx
+++ b/src/components/atomic-crm/notes/NoteInputs.tsx
@@ -72,7 +72,7 @@ export const NoteInputs = ({ showStatus }: { showStatus?: boolean }) => {
helperText={false}
type="datetime-local"
className="text-primary"
- defaultValue={new Date().toISOString().slice(0, 16)}
+ defaultValue={getCurrentDate()}
/>
</div>
<FileInput source="attachments" multiple>
diff --git a/src/components/atomic-crm/notes/utils.ts b/src/components/atomic-crm/notes/utils.ts
index 39116e41..6a27b4f6 100644
--- a/src/components/atomic-crm/notes/utils.ts
+++ b/src/components/atomic-crm/notes/utils.ts
@@ -1,8 +1,8 @@
export const getCurrentDate = () => {
const now = new Date();
- now.setSeconds(0);
- now.setMilliseconds(0);
- return now.toISOString();
+ const offset = now.getTimezoneOffset();
+ const localDate = new Date(now.getTime() - offset * 60 * 1000);
+ return localDate.toISOString().slice(0, 16);
};
export const formatNoteDate = (dateString: string) => {
diff --git a/src/components/atomic-crm/tasks/AddTask.tsx b/src/components/atomic-crm/tasks/AddTask.tsx
index 34a666d7..d5f4e04e 100644
--- a/src/components/atomic-crm/tasks/AddTask.tsx
+++ b/src/components/atomic-crm/tasks/AddTask.tsx
@@ -14,6 +14,7 @@ import { useState } from "react";
import { AutocompleteInput } from "@/components/admin/autocomplete-input";
import { ReferenceInput } from "@/components/admin/reference-input";
import { TextInput } from "@/components/admin/text-input";
+import { DateInput } from "@/components/admin/date-input";
import { SelectInput } from "@/components/admin/select-input";
import { SaveButton } from "@/components/admin/form";
import { Button } from "@/components/ui/button";
@@ -161,11 +162,10 @@ export const AddTask = ({
</ReferenceInput>
)}
- <div className="flex flex-row gap-4">
- <TextInput
+ <div className="grid grid-cols-2 gap-4">
+ <DateInput
source="due_date"
helperText={false}
- type="date"
validate={required()}
/>
<SelectInput
diff --git a/src/components/atomic-crm/tasks/TaskEdit.tsx b/src/components/atomic-crm/tasks/TaskEdit.tsx
index 93bc83e8..13a8aeb0 100644
--- a/src/components/atomic-crm/tasks/TaskEdit.tsx
+++ b/src/components/atomic-crm/tasks/TaskEdit.tsx
@@ -1,6 +1,7 @@
import { EditBase, Form, required, useNotify, type Identifier } from "ra-core";
import { DeleteButton } from "@/components/admin/delete-button";
import { TextInput } from "@/components/admin/text-input";
+import { DateInput } from "@/components/admin/date-input";
import { SelectInput } from "@/components/admin/select-input";
import { SaveButton } from "@/components/admin/form";
import {
@@ -55,11 +56,10 @@ export const TaskEdit = ({
multiline
helperText={false}
/>
- <div className="flex flex-row gap-4">
- <TextInput
+ <div className="grid grid-cols-2 gap-4">
+ <DateInput
source="due_date"
helperText={false}
- type="date"
validate={required()}
/>
<SelectInput