improved the date dispaly

vedang8 · Mar 9, 2024 · 4cbfa63 · 4cbfa63
1 parent d10d071
commit 4cbfa63
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/client/src/images/carbontrading.jpg b/client/src/images/carbontrading.jpg
diff --git a/client/src/pages/Admin/SellCredits.js b/client/src/pages/Admin/SellCredits.js
@@ -45,15 +45,15 @@ function SellCredits() {
           const { status, _id } = record;
           return (
             <div className="flex gap-5">
-              {status === "Pending" && (
+              {status === "pending" && (
                 <span
                   className="underline cursor-pointer"
                   onClick={() => onStatusUpdate(_id, "Approved")}
                 >
                   Approve
                 </span>
               )}
-              {status === "Pending" && (
+              {status === "pending" && (
                 <span
                   className="underline cursor-pointer"
                   onClick={() => onStatusUpdate(_id, "Rejected")}

diff --git a/client/src/pages/CarbonCredits/Credits.js b/client/src/pages/CarbonCredits/Credits.js
@@ -76,10 +76,20 @@ function Credits() {
     {
       title: "Start Date",
       dataIndex: "startDate",
+      render: (record) => {
+        return (
+          <span>{new Date(record).toLocaleDateString()}</span>
+        );
+      }
     },
     {
       title: "End Date",
       dataIndex: "endDate",
+      render: (record) => {
+        return (
+          <span>{new Date(record).toLocaleDateString()}</span>
+        );
+      }
     },
     {
       title: "Baseline Emission Amt",

diff --git a/client/src/pages/Home.js b/client/src/pages/Home.js
@@ -12,7 +12,7 @@ const Home = () => {
     const [credits, setCredits] = useState([]); 
     const [forms, setForms] = useState([]);
     const [filters, setFilters] = useState({
-      status: "approved",
+      status: "Approved",
     });
     const dispatch = useDispatch();
     const navigate = useNavigate();
@@ -57,7 +57,7 @@ const Home = () => {
         <div>
           <div className="grid grid-cols-5 gap-2">
             {forms
-              .filter((form) => form.status === "approved")
+              .filter((form) => form.status === "Approved")
               .map((form) => {
                 return (
                   <div className="border border-gray-300 rounded border-solid flex flex-col gap-5 pb-2 cursor-pointer"