77. Minor changes

Soumyadas15 · Mar 16, 2024 · 00f9c5c · 00f9c5c
1 parent 34ef8d6
commit 00f9c5c
Show file tree

Hide file tree

Showing 10 changed files with 410 additions and 223 deletions.
diff --git a/components/modals/createModals/AuditModal.tsx b/components/modals/createModals/AuditModal.tsx
@@ -13,9 +13,6 @@ import Heading from "../../reusable/Heading";
 import Input from "../../reusable/Input";
 import axios from 'axios';
 import toast from "react-hot-toast";
-import useSuccessModal from "@/hooks/useSuccessModal";
-import useCreateModal from "@/hooks/useLoginModal";
-import { useModal } from "@/hooks/useModalStore";
 import { ProgressBar } from "../../ProgressBar";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { Button } from "@/components/ui/button";
@@ -25,6 +22,7 @@ import { Calendar } from "@/components/ui/calendar";
 import { CalendarIcon } from "lucide-react";
 import { cn } from "@/lib/utils";
 import { format } from "date-fns"
+import DateInput from "@/components/reusable/DateInput";
 
 enum STEPS {
   DATE = 0,
@@ -134,28 +132,11 @@ const AuditModal = ({
         exit={{ opacity: 0, x: "100%" }}
         transition={{ duration: 0.3, ease: "easeInOut" }}
       >
-        <Popover>
-          <PopoverTrigger asChild>
-            <Button
-              variant={"outline"}
-              className={cn(
-                "w-full border-[1px] border-neutral-300 rounded-[5px] justify-start text-left font-normal",
-                !date && "text-muted-foreground"
-              )}
-            >
-              <CalendarIcon className="mr-2 h-4 w-4" />
-              {date ? format(date, "PPP") : <span>Pick a date</span>}
-            </Button>
-          </PopoverTrigger>
-          <PopoverContent className="w-auto p-0 z-[9999] bg-neutral-200 rounded-[10px]" align="start">
-            <Calendar
-              mode="single"
-              selected={date}
-              onSelect={setDate}
-              initialFocus
-            />
-          </PopoverContent>
-        </Popover>
+        <DateInput
+            label="Date"
+            selectedDate={date}
+            onSelect={setDate}
+        />
       </motion.div>
     </div>
   )

diff --git a/components/modals/createModals/FeedbackModal.tsx b/components/modals/createModals/FeedbackModal.tsx
@@ -23,6 +23,7 @@ import { format } from 'date-fns';
 import { Calendar } from "../../ui/calendar";
 import useFeedbackModal from "@/hooks/createModalHooks/useFeedbackModal";
 import { ProgressBar } from "../../ProgressBar";
+import DateInput from "@/components/reusable/DateInput";
 
 enum STEPS {
   TYPE = 0,
@@ -226,28 +227,11 @@ const FeedbackModal = ({
             exit={{ opacity: 0, x: "100%" }}
             transition={{ duration: 0.3, ease: "easeInOut" }}
         >
-            <Popover>
-            <PopoverTrigger asChild>
-                <Button
-                variant={"outline"}
-                className={cn(
-                    "w-full border-[1px] border-neutral-300 rounded-[5px] justify-start text-left font-normal",
-                    !date && "text-muted-foreground"
-                )}
-                >
-                <CalendarIcon className="mr-2 h-4 w-4" />
-                {date ? format(date, "PPP") : <span>Start date</span>}
-                </Button>
-            </PopoverTrigger>
-            <PopoverContent className="w-auto p-0 z-[9999] bg-neutral-200 rounded-[10px]" align="start">
-                <Calendar
-                mode="single"
-                selected={date}
-                onSelect={setDate}
-                initialFocus
-                />
-            </PopoverContent>
-            </Popover>
+            <DateInput
+              label="Start Date"
+              selectedDate={date}
+              onSelect={setDate}
+            />
         </motion.div>
         <motion.div
             key="closureDate"
@@ -256,28 +240,11 @@ const FeedbackModal = ({
             exit={{ opacity: 0, x: "100%" }}
             transition={{ duration: 0.3, ease: "easeInOut" }}
         >
-            <Popover>
-            <PopoverTrigger asChild>
-                <Button
-                variant={"outline"}
-                className={cn(
-                    "w-full border-[1px] border-neutral-300 rounded-[5px] justify-start text-left font-normal",
-                    !closureDate && "text-muted-foreground"
-                )}
-                >
-                <CalendarIcon className="mr-2 h-4 w-4" />
-                {closureDate ? format(closureDate, "PPP") : <span>End date</span>}
-                </Button>
-            </PopoverTrigger>
-            <PopoverContent className="w-auto p-0 z-[9999] bg-neutral-200 rounded-[10px]" align="start">
-                <Calendar
-                mode="single"
-                selected={closureDate}
-                onSelect={setClosureDate}
-                initialFocus
-                />
-            </PopoverContent>
-            </Popover>
+            <DateInput
+              label="Closure Date"
+              selectedDate={closureDate}
+              onSelect={setClosureDate}
+            />
         </motion.div>
       </div>
     )