made tracking component body navigate on click

This reverts commit d13ddd5cec.

package-lock.json

@@ -3011,6 +3011,22 @@
         "csstype": "^3.0.2"
       }
     },
+    "@types/react-calendar": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@types/react-calendar/-/react-calendar-3.9.0.tgz",
+      "integrity": "sha512-KpAu1MKAGFw5hNwlDnWsHWqI9i/igAB+8jH97YV7QpC2v7rlwNEU5i6VMFb73lGRacuejM/Zd2LklnEzkFV3XA==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
+    "@types/react-dom": {
+      "version": "18.0.10",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz",
+      "integrity": "sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
     "@types/resolve": {
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
@@ -4897,6 +4913,11 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
+    "detect-element-overflow": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/detect-element-overflow/-/detect-element-overflow-1.3.1.tgz",
+      "integrity": "sha512-E29Axx3pyotgg3j5HUbusTTarjPUHsC02p7fZ3/cnUufyK0kx5RzRA9waBvrKFWGc/LWiRj3pD9Y3y+mymMYiQ=="
+    },
     "detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -9486,6 +9507,11 @@
         }
       }
     },
+    "make-event-props": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/make-event-props/-/make-event-props-1.4.2.tgz",
+      "integrity": "sha512-ZOHqRpLn2htnMd9zqhE+wticVr31PdwrJXHcvEEdKgrfjCOuSDn8urG9SDzEIqzP1ayp1uTdDJcOiTlJhqWpEQ=="
+    },
     "makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -11087,6 +11113,22 @@
         "countup.js": "^2.3.2"
       }
     },
+    "react-date-picker": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/react-date-picker/-/react-date-picker-9.2.0.tgz",
+      "integrity": "sha512-kAE7HFLq1ic4pS0Pk9SyPTjejIfjTyPov04a2eZzLxfZh8ss8EPaaaX7bBUP4RUCkbxHpR0P4UHloD0/fFDCZw==",
+      "requires": {
+        "@types/react-calendar": "^3.0.0",
+        "@wojtekmaj/date-utils": "^1.0.3",
+        "clsx": "^1.2.1",
+        "get-user-locale": "^1.2.0",
+        "make-event-props": "^1.1.0",
+        "prop-types": "^15.6.0",
+        "react-calendar": "^4.0.0",
+        "react-fit": "^1.4.0",
+        "update-input-width": "^1.2.2"
+      }
+    },
     "react-dev-utils": {
       "version": "12.0.1",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
@@ -11153,6 +11195,18 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
+    "react-fit": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/react-fit/-/react-fit-1.5.0.tgz",
+      "integrity": "sha512-U9RxtM55RrNlGZp76r3QPWwSZ74r8NUOvwxwNOk+0vLlu/oJwP+6vjCkaOTw1hf8SzY0tmI07HwDdW/2CXYeLQ==",
+      "requires": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "detect-element-overflow": "^1.3.1",
+        "prop-types": "^15.6.0",
+        "tiny-warning": "^1.0.0"
+      }
+    },
     "react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
@@ -12738,6 +12792,11 @@
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
     },
+    "tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -12952,6 +13011,11 @@
         "picocolors": "^1.0.0"
       }
     },
+    "update-input-width": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/update-input-width/-/update-input-width-1.3.1.tgz",
+      "integrity": "sha512-hV2DGiSn7FKerjIXaI3s0EG/AnmAeoRTV5cvpsFcygzUzKreYj5qSu7rVihzUOEXF/MP2mjJpUzwi14sZdp0nw=="
+    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",

package.json

@@ -17,6 +17,7 @@
     "react-calendar": "^4.0.0",
     "react-chartjs-2": "^4.1.0",
     "react-countup": "^6.2.0",
+    "react-date-picker": "^9.2.0",
     "react-dom": "^18.0.0",
     "react-lottie": "^1.2.3",
     "react-redux": "^8.0.2",

src/Routers.jsx

@@ -28,6 +28,7 @@ import RemindersAddPage from './views/RemindersAddPage';
 import TrackingPage from "./views/TrackingPage";
 import CalendarPage from "./views/CalendarPage";
 import ResourcePage from "./views/ResourcePage";
+import TrackActionPage from "./views/TrackActionPage";
 
 export default function Routers() {
   return (
@@ -67,7 +68,7 @@ export default function Routers() {
           <Route exact path="/notification" element={<Notification />} />
 
           <Route exact path="/t-weight" element={<TrackingPage />} />
-
+          <Route exact path="/track-action/:trackpage" element={<TrackActionPage />} />
           <Route
             exact
             path="/my-collection/collection-item"

src/components/Cards/TrackItemCard.jsx

@@ -1,14 +1,16 @@
 import React, { useState } from "react";
-import { Link } from "react-router-dom";
+import { Link, useNavigate } from "react-router-dom";
 // import { toast } from "react-toastify";
 import localImgLoad from "../../lib/localImgLoad";
 import CountDown from "../Helpers/CountDown";
 import Icons from "../Helpers/Icons";
 
 export default function TrackItemCard({ datas, hidden = false }) {
+  const navigate = useNavigate()
   const [addFavorite, setValue] = useState(false);
   const [options, setOption] = useState(false);
-  const favoriteHandler = () => {
+  const favoriteHandler = (e) => {
+    e.stopPropagation()
     if (!addFavorite) {
       setValue(true);
     } else {
@@ -16,7 +18,7 @@ export default function TrackItemCard({ datas, hidden = false }) {
     }
   };
   return (
-    <div className="card-style-one flex flex-col justify-between w-full h-[200px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
+    <div className="card-style-one flex flex-col justify-between w-full h-[200px] bg-white dark:bg-dark-white p-3 pb rounded-2xl cursor-pointer" onClick={()=>{navigate(`/track-action/${datas.widget}`, { replace: true })}}>
       <div className="content">
         {/* thumbnail */}
         <div className="w-full h-40">
@@ -79,7 +81,7 @@ export default function TrackItemCard({ datas, hidden = false }) {
 
           <p className="text-sm text-thin-light-gray dark:text-white">
             <Link
-            to={`/${datas.widget}`}
+            to={`/track-action/${datas.widget}`}
             className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1"
             >
             {datas.title}

src/components/Home/TotalRecentHx.jsx

@@ -0,0 +1,136 @@
+import React, { useState } from "react";
+import MarketVisitorAnalytic from "../Charts/MarketVisitorAnalytic";
+import SelectBox from "../Helpers/SelectBox";
+import SellHistoryWidget from "./SellHistoryWidget";
+
+export default function TotalRecentHx({ className }) {
+  const [currencyDataLvl, setCurrencyDataLvl] = useState([
+    "Jan 1",
+    "Jan 2",
+    "Jan 3",
+    "Jan 4",
+    "Jan 5",
+    "Jan 6",
+    "Jan 7",
+    "Jan 8",
+    "Jan 9",
+    "Jan 10",
+    "Jan 11",
+    "Jan 12",
+    "Jan 13",
+    "Jan 14",
+    "Jan 15",
+  ]);
+  const filterDatas = ["Last 15 days", "Last 7 days", "Last Month"];
+  const [filterDataSet, setFilterDataSet] = useState([
+    50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100,
+  ]);
+  const dataSetHandler = (value) => {
+    if (value === "Last Month") {
+      setCurrencyDataLvl([
+        "Jan 1",
+        "Jan 2",
+        "Jan 3",
+        "Jan 4",
+        "Jan 5",
+        "Jan 6",
+        "Jan 7",
+        "Jan 8",
+        "Jan 9",
+        "Jan 10",
+        "Jan 11",
+        "Jan 12",
+        "Jan 13",
+        "Jan 14",
+        "Jan 15",
+        "Jan 16",
+        "Jan 17",
+        "Jan 18",
+        "Jan 19",
+        "Jan 20",
+        "Jan 21",
+        "Jan 22",
+        "Jan 23",
+        "Jan 24",
+        "Jan 25",
+        "Jan 26",
+        "Jan 27",
+        "Jan 28",
+        "Jan 29",
+        "Jan 30",
+      ]);
+      setFilterDataSet([
+        50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 50, 30,
+        50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100,
+      ]);
+    } else if (value === "Last 7 days") {
+      setCurrencyDataLvl([
+        "Jan 1",
+        "Jan 2",
+        "Jan 3",
+        "Jan 4",
+        "Jan 5",
+        "Jan 6",
+        "Jan 7",
+      ]);
+      setFilterDataSet([50, 30, 100, 20, 50, 30, 100]);
+    } else {
+      setCurrencyDataLvl([
+        "Jan 1",
+        "Jan 2",
+        "Jan 3",
+        "Jan 4",
+        "Jan 5",
+        "Jan 6",
+        "Jan 7",
+        "Jan 8",
+        "Jan 9",
+        "Jan 10",
+        "Jan 11",
+        "Jan 12",
+        "Jan 13",
+        "Jan 14",
+        "Jan 15",
+      ]);
+      setFilterDataSet([
+        50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100,
+      ]);
+    }
+  };
+  return (
+    <div
+      className={`sell-history-market-visitor-analytic w-full ${
+        className || ""
+      }`}
+    >
+      <div className="content-wrapper w-full  lg:flex xl:space-x-8 lg:space-x-4">
+
+        <div className="flex-1 ">
+          <div className="market-visitor w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white   overflow-hidden rounded-2xl  section-shadow">
+            <div className="flex flex-col justify-between h-full">
+              <div className="content flex justify-between items-center mb-5">
+                <div>
+                  <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+                    Market Visitor
+                  </h1>
+                </div>
+                <SelectBox datas={filterDatas} action={dataSetHandler} />
+              </div>
+              <div className="h-[233px]">
+                <MarketVisitorAnalytic
+                  datasets={filterDataSet}
+                  dataLvls={currencyDataLvl}
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+        
+        <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+          <SellHistoryWidget />
+        </div>
+
+      </div>
+    </div>
+  );
+}

src/components/Home/index.jsx

@@ -1,12 +1,8 @@
 import React from "react";
 import datas from "../../data/product_data.json";
 import Layout from "../Partials/Layout";
-import CreateNft from "./CreateNft";
-import Hero from "./Hero";
-import SellHistoryMarketVisitorAnalytic from "./SellHistoryMarketVisitorAnalytic";
-import TopSellerTopBuyerSliderSection from "./TopSellerTopBuyerSliderSection";
-import TrendingSection from "./TrendingSection";
 import UpdateTable from "./UpdateTable";
+import TotalRecentHx from "./TotalRecentHx";
 
 export default function Home() {
     const trending = datas.datas;
@@ -14,10 +10,7 @@ export default function Home() {
     return (
         <Layout>
             <div className="home-page-wrapper">
-                {/*   <Hero className="mb-10" />
+                <TotalRecentHx className="mb-10"/> 
-        <CreateNft />
-        <TrendingSection trending={trending} className="mb-10" />*/}
-                <SellHistoryMarketVisitorAnalytic className="mb-10"/> {/* <TopSellerTopBuyerSliderSection className="mb-10" /> */}
                 <UpdateTable className="mb-10"/>
             </div>
         </Layout>

src/components/Reminders/AddEditReminder.jsx

@@ -34,7 +34,7 @@ export default function AddEditReminder({ className }) {
   const [reminder, setReminder]=useState({
     'member_id': localStorage.getItem('member_id'),
     description: location.state?.reminder.description || '',
-    note: location.state?.reminder.note || '',
+    notes: location.state?.reminder.notes || '',
     category: location.state?.reminder.code || '',
     mode: location.state?.reminder.code || '',
     'start_date': location.state? new Date(location.state?.reminder.start_date) : startDate,
@@ -72,9 +72,9 @@ export default function AddEditReminder({ className }) {
      }
     setSuccess(true)
     setMessage({status: true, message: ''})
-    let {description, note, category, mode} = reminder
+    let {description, notes, category, mode} = reminder
     //CHECKING IF AN EMPTY FIELD WAS PASSED
-    if(!description || !note || !category || !mode){
+    if(!description || !notes || !category || !mode){
       setSuccess(false)
       setMessage({status: false, message: 'All fields must be filled'})
       return
@@ -206,8 +206,8 @@ export default function AddEditReminder({ className }) {
               <div className="input-field mt-2">
                 <div className="input-wrapper w-full ">
                   <textarea
-                    name='note'
+                    name='notes'
-                    value={reminder.note}
+                    value={reminder.notes}
                     placeholder="provide a detailed description of your item."
                     rows="7"
                     className="w-full h-full px-7 py-4  border border-light-purple dark:border-[#5356fb29]  rounded-[20px] text-dark-gray dark:text-white bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"

src/components/Reminders/ReminderTable.jsx

@@ -99,7 +99,7 @@ export default function ReminderTable({ className }) {
                       <div className="flex space-x-2 items-center">
                         <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
                           <img
-                            src={(reminder.category!='')?localImgLoad(`images/${reminder.category}.png`):dataImage1}
+                            src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
                             alt="data"
                             className="w-full h-full"
                           />
@@ -138,7 +138,7 @@ export default function ReminderTable({ className }) {
                       </span>
                     </td>
                     <td className="text-right py-4 px-2">
-                    <Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full">Edit</Link>
+                    <Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
                     </td>
                       </tr>
                       ))
@@ -151,8 +151,8 @@ export default function ReminderTable({ className }) {
                     <td className=" py-4">
                       <div className="flex space-x-2 items-center">
                         <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                          <img
+                        <img
-                            src={dataImage1}
+                            src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
                             alt="data"
                             className="w-full h-full"
                           />
@@ -197,7 +197,7 @@ export default function ReminderTable({ className }) {
                       >
                         Edit
                       </button> */}
-                      <Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full">Edit</Link>
+                      <Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
                     </td>
                           </tr>
                         )

src/components/Tracking/TrackAction/UserRecentTracking.jsx

@@ -0,0 +1,28 @@
+import React, { useState } from "react";
+
+export default function UserRecentTracking() {
+  
+
+  return (
+    <div className="currency-statics w-full mb-11">
+      <div className="w-full bg-white dark:bg-dark-white   rounded-2xl p-7">
+        <div className="flex flex-col justify-between h-full">
+          <div className="content sm:flex justify-between items-center mb-5">
+            <div>
+              <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+               Recent Records
+              </h1>
+            </div>
+           
+          </div>
+          <div className="currency-statics-chart">
+           
+           SOME TABLE HERE 
+          </div>
+        </div>
+
+
+      </div>
+    </div>
+  );
+}

src/components/Tracking/TrackAction/UserWeightWidget.jsx

@@ -0,0 +1,19 @@
+import React, { useState } from "react";
+import background from "../../../assets/images/shape/balance-bg.svg";
+
+export default function UserWeightWidget() {
+  const [eth] = useState(90);
+  const [btc] = useState(85);
+  const [ltc] = useState(20);
+  return (
+    <div
+      className="current-balance-widget w-full h-full rounded-2xl overflow-hidden flex flex-col justify-between  px-8 py-9"
+      style={{
+        background: `url(${background}) 0% 0% / cover no-repeat`,
+      }}
+    >
+
+
+    </div>
+  );
+}

src/components/Tracking/TrackAction/index.jsx

@@ -0,0 +1,53 @@
+import React from "react";
+import { useParams } from 'react-router-dom'
+
+import bank1 from "../../../assets/images/bank-1.png";
+import bank2 from "../../../assets/images/bank-2.png";
+import bank3 from "../../../assets/images/bank-3.png";
+import bank4 from "../../../assets/images/bank-4.png";
+import Layout from "../../Partials/Layout";
+//import CurrencyStaticsSection from "./CurrencyStaticsSection";
+//import CurrentBalanceWidget from "./CurrentBalanceWidget";
+//import InvestmentSection from "./InvestmentSection";
+//import RecentTransactionWidget from "./RecentTransactionWidget";
+
+import UserWeightWidget from "./UserWeightWidget";
+import UserRecentTracking from "./UserRecentTracking";
+
+export default function TrackAction() {
+  
+  let {trackpage} = useParams();
+
+  console.log("TRACK PAGE  = = ",trackpage);
+
+  return (
+    <>
+      <Layout>
+        <div className="my-wallet-wrapper w-full mb-10">
+          <div className="main-wrapper w-full">
+            <div className="balance-inquery w-full lg:h-[436px] lg:flex lg:space-x-11 mb-11">
+              <div className="lg:w-1/2 h-full mb-10 lg:mb-0">
+                <UserWeightWidget />
+              </div>
+              <div className="flex-1">
+                <div className="my-wallets w-full h-full bg-white dark:bg-dark-white   rounded-lg p-6">
+                  <div className="mb-4">
+                    <h1 className="text-xl font-bold tracking-wide   text-dark-gray dark:text-white">
+                     Some title HERE 
+                    </h1>
+                  </div>
+                  <div className="content-area">
+
+                    SOMETHING HERE 
+
+                  </div>
+                </div>
+              </div>
+            </div>
+            <UserRecentTracking />
+          </div>
+        </div>
+      </Layout>
+    </>
+  );
+}

src/views/TrackActionPage.jsx

@@ -0,0 +1,11 @@
+import React from "react";
+import MyWallet from "../components/MyWallet";
+import TrackAction from "../components/Tracking/TrackAction";
+
+export default function TrackActionPage() {
+  return (
+    <>
+      <TrackAction />
+    </>
+  );
+}