Add reminder button modified

.env

@@ -13,5 +13,5 @@ REACT_APP_USERS_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfitu
 
 REACT_APP_SESSION_EXPIRE_MINUTES = 5
 
-REACT_APP_TRACKING = "Tracking"
-REACT_APP_RESOURCES = "Resources"
+REACT_APP_TRACKING="Tracking"
+REACT_APP_RESOURCES="Resources"

src/App.jsx

@@ -1,4 +1,4 @@
-// import Toaster from "./components/Helpers/Toaster";
+import Toaster from "./components/Helpers/Toaster";
 import Routers from "./Routers";
 import Default from "./components/Partials/Default";
 
@@ -7,7 +7,7 @@ function App() {
       <Default>
           <>
               <Routers />
-              {/* <Toaster /> */}
+              <Toaster />
           </>
       </Default>
   );

src/Routers.jsx

@@ -59,6 +59,7 @@ export default function Routers() {
           <Route exact path="/my-collection" element={<MyCollection />} />*/}
           <Route exact path="/reminders" element={<RemindersPage />} />
           <Route exact path="/add-reminder" element={<RemindersAddPage />} />
+          <Route exact path="/add-reminder/:reminder_uuid" element={<RemindersAddPage />} />
           <Route exact path="/tracking" element={<TrackingPage />} />
           <Route exact path="/calendar" element={<CalendarPage />} />
           <Route exact path="/resources" element={<ResourcePage />} />

src/components/Cards/TrackItemCard.jsx

@@ -0,0 +1,109 @@
+import React, { useState } from "react";
+import { Link } 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 [addFavorite, setValue] = useState(false);
+  const [options, setOption] = useState(false);
+  const favoriteHandler = () => {
+    if (!addFavorite) {
+      setValue(true);
+    } else {
+      setValue(false);
+    }
+  };
+  return (
+    <div className="card-style-one flex flex-col justify-between w-full h-[187px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
+      <div className="content">
+        {/* thumbnail */}
+        <div className="w-full h-40">
+          {/* thumbnail image */}
+          <div
+            className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
+            style={{
+              background: `url(${localImgLoad(
+                `images/${datas.thumbnil}`
+              )}) 0% 0% / cover no-repeat`,
+            }}
+          >
+            <div className="product-options flex justify-between relative">
+              <span
+                onClick={favoriteHandler}
+                className={`w-7 h-7 bg-white   rounded-full flex justify-center items-center  cursor-pointer ${
+                  addFavorite ? "text-pink" : "  text-dark-gray"
+                }`}
+              >
+                <Icons name="love" />
+              </span>
+              <span
+                onClick={() => setOption(!options)}
+                className="w-7 h-7 flex justify-center items-center bg-white  rounded-full cursor-pointer"
+              >
+                <Icons name="dots" />
+              </span>
+              {options && (
+                <div
+                  onClick={() => setOption(!options)}
+                  className="w-full h-screen fixed top-0 left-0 z-10"
+                ></div>
+              )}
+            </div>
+            {hidden && (
+              <div className="flex justify-center">
+                <svg
+                  width="108"
+                  height="91"
+                  viewBox="0 0 108 91"
+                  fill="none"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M88.7686 70.8596C87.0739 69.1408 85.4043 67.4283 83.7222 65.7285C81.13 63.1157 78.5316 60.5092 75.9143 57.9216C75.5879 57.5943 75.5439 57.3676 75.7636 56.9458C83.5841 41.861 74.3577 23.6597 57.5994 21.1351C52.3334 20.3418 47.3184 21.2169 42.586 23.6723C42.2784 23.8297 42.0587 23.9871 41.7135 23.6408C38.3681 20.2474 34.9977 16.8854 31.6334 13.5108C31.5393 13.4164 31.464 13.3093 31.3008 13.1142C32.6879 12.5916 33.9934 12.0628 35.3303 11.6095C43.5274 8.82042 51.9442 7.95159 60.5368 8.88967C81.5568 11.1939 100.116 25.3659 107.899 45.0341C108 45.2922 108.031 45.6636 107.924 45.9155C103.889 55.8629 97.6122 64.0979 89.1138 70.6266C89.051 70.6833 88.9757 70.7274 88.7686 70.8596Z"
+                    fill="white"
+                  />
+                  <path
+                    d="M19.1878 20.1909C21.234 22.256 23.2299 24.2769 25.2384 26.2916C27.5168 28.577 29.7952 30.8687 32.0861 33.1415C32.3936 33.4437 32.4438 33.6577 32.2367 34.0606C25.1192 47.7667 31.9731 64.4506 46.6601 69.0466C53.0622 71.0487 59.3011 70.4506 65.3014 67.416C65.5022 67.3153 65.6968 67.2082 65.8663 67.1201C69.4376 70.715 72.9776 74.2847 76.5677 77.9048C76.4046 77.9804 76.1974 78.0874 75.9778 78.1756C66.9898 81.8334 57.6692 83.1619 48.0222 82.186C26.7197 80.0265 8.07841 65.9868 0.119793 46.092C0.00053969 45.7898 -0.0496724 45.368 0.0633048 45.0847C4.06772 35.2002 10.3003 27.0156 18.7297 20.512C18.8489 20.4113 18.987 20.3294 19.1878 20.1909Z"
+                    fill="white"
+                  />
+                  <path
+                    d="M8.82617 4.58337C10.2133 3.1731 11.7636 1.60544 13.3515 0C41.9787 28.8034 70.6247 57.6195 99.2519 86.4229C97.8272 87.8458 96.2643 89.4009 94.6638 91C66.0554 62.1966 37.422 33.3742 8.82617 4.58337Z"
+                    fill="white"
+                  />
+                  <path
+                    d="M58.5234 59.5084C54.6696 60.9753 48.0227 60.7361 43.24 55.6553C39.5997 51.7897 38.0243 44.7573 40.0516 41.0112C46.2151 47.1812 52.341 53.3133 58.5234 59.5084Z"
+                    fill="white"
+                  />
+                  <path
+                    d="M49.7617 31.4036C53.1887 29.5022 60.2309 31.0825 64.1035 34.7278C69.1938 39.5189 69.426 46.2114 68.0515 49.8063C61.957 43.6805 55.8437 37.5294 49.7617 31.4036Z"
+                    fill="white"
+                  />
+                </svg>
+              </div>
+            )}
+          </div>
+        </div>
+        {/* user */}
+        <div className="user w-ful -mt-6 mb-2">
+          <div className="user-img w-10 h-10 flex  justify-center items-center overflow-hidden rounded-full mb-2 ml-4">
+            <img
+              src={localImgLoad(`images/${datas.profile_img}`)}
+              alt="user"
+              className=" w-full h-full"
+            />
+          </div>
+          <p className="text-sm text-thin-light-gray dark:text-white">
+            Owned by
+            <Link to="/user-profile" className="text-purple ml-1">
+              {datas.username}
+            </Link>
+          </p>
+        </div>
+
+      </div>
+     
+    </div>
+  );
+}

src/components/Helpers/Icons.jsx

@@ -1,4 +1,11 @@
 import React from "react";
+import Calendar from "../../assets/images/icons/myFit_calendar.png";
+import History from "../../assets/images/icons/myFit_history.png";
+import Profile from "../../assets/images/icons/myFit_profile.png";
+import Reminder from "../../assets/images/icons/myFit_reminder.png";
+import Resources from "../../assets/images/icons/myFit_resources.png";
+import Settings from "../../assets/images/icons/myFit_settings.png";
+import Tracking from "../../assets/images/icons/myFit_tracking.png";
 
 export default function Icons({ name }) {
   return (
@@ -468,7 +475,14 @@ export default function Icons({ name }) {
         >
           <rect y="0.823242" width="20" height="2.35294" rx="1.17647" />
         </svg>
-      ) : (
+      ) : name === "settings" ? (<img src={Settings} alt="image" className="w-[24px] h-[24px]" />)
+        : name === "tracking" ? (<img src={Tracking} alt="image" className="w-[24px] h-[24px]" />)
+        : name === "resources" ? (<img src={Resources} alt="image" className="w-[24px] h-[24px]" />)
+        : name === "reminder" ? (<img src={Reminder} alt="image" className="w-[24px] h-[24px]" />)
+        : name === "profile" ? (<img src={Profile} alt="image" className="w-[24px] h-[24px]" />)
+        : name === "History" ? (<img src={History} alt="image" className="w-[24px] h-[24px]" />)
+        : name === "calendar" ? (<img src={Calendar} alt="image" className="w-[24px] h-[24px]" />)
+        : (
         ""
       )}
     </>

src/components/Partials/Sidebar.jsx

@@ -116,11 +116,11 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   } `}
                   to="/"
                 >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
                     <Icons name="dashboard" />
                   </span>
                   <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                    className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white dark:focus:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
@@ -136,16 +136,16 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                     sidebar ? "justify-start space-x-3.5" : "justify-center")
                   }`}
                 >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="active-bids" />
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
+                    <Icons name="reminder" />
                   </span>
                   <span
-                    className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
+                    className={`item-content relative group-hover:text-purple dark:hover:text-white dark:focus:text-white text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
                    Reminders
-                    <span className="absolute left-24 -top-1 text-sm flex justify-center items-center w-5 h-5 primary-gradient rounded-full text-white">
+                    <span className={`absolute left-24 -top-1 text-sm flex primary-gradient justify-center items-center w-5 h-5 rounded-full text-white ${'dark' ? 'dark-primary-gradient text-purple' : '', userReminders.length == 0 ? 'hidden' : ''}`}>
                       {userReminders.length > 0 && userReminders.length}
                     </span>
                   </span>
@@ -159,11 +159,11 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                     sidebar ? "justify-start space-x-3.5" : "justify-center")
                   }`}
                 >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="active-bids" />
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
+                    <Icons name="tracking" />
                   </span>
                   <span
-                    className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
+                    className={`item-content relative group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
@@ -179,11 +179,11 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                     sidebar ? "justify-start space-x-3.5" : "justify-center")
                   }`}
                 >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="active-bids" />
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
+                    <Icons name="calendar" />
                   </span>
                   <span
-                    className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
+                    className={`item-content relative group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
@@ -199,11 +199,11 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                     sidebar ? "justify-start space-x-3.5" : "justify-center")
                   }`}
                 >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="star" />
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
+                    <Icons name="resources" />
                   </span>
                   <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                    className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
@@ -220,11 +220,11 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                     sidebar ? "justify-start space-x-3.5" : "justify-center")
                   }`}
                 >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="history" />
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
+                    <Icons name="History" />
                   </span>
                   <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                    className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
@@ -249,11 +249,11 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                     sidebar ? "justify-start space-x-3.5" : "justify-center")
                   }`}
                 >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="people-two" />
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
+                    <Icons name="profile" />
                   </span>
                   <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                    className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
@@ -269,11 +269,11 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                     sidebar ? "justify-start space-x-3.5" : "justify-center")
                   }`}
                 >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="setting" />
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
+                    <Icons name="settings" />
                   </span>
                   <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                    className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >

src/components/Reminders/AddEditReminder.jsx

@@ -1,6 +1,6 @@
 import React, {useState, useEffect} from 'react'
 import Layout from '../Partials/Layout'
-import { Link, useNavigate } from 'react-router-dom'
+import { Link, useNavigate, useLocation, useParams } from 'react-router-dom'
 
 // import { toast } from 'react-toastify';
 
@@ -16,6 +16,10 @@ export default function AddEditReminder({ className }) {
   let navigate = useNavigate()
   const api = new usersService();
 
+  let {reminder_uuid} = useParams() // uuid of single reminder
+  
+  let location = useLocation()
+
   const [startDate, setStartDate] = useState(new Date());
   const [endDate, setEndDate] = useState(new Date());
 
@@ -29,15 +33,14 @@ export default function AddEditReminder({ className }) {
     message: ''
   })
 
-
   const [reminder, setReminder]=useState({
     'member_id': localStorage.getItem('member_id'),
-    description: '',
-    note: '',
-    category: '',
-    mode: '',
-    'start_date': startDate,
-    'end_date': endDate
+    description: location.state?.reminder.description || '',
+    note: location.state?.reminder.note || '',
+    category: location.state?.reminder.category || '',
+    mode: location.state?.reminder.mode || '',
+    'start_date': location.state? new Date(location.state?.reminder.start_date) : startDate,
+    'end_date': location.state? new Date(location.state?.reminder.end_date) : endDate
   })
   
   const onReminderInputChange = ({target:{name,value}}) => { //function to run when user changes any input on the add reminder page
@@ -67,6 +70,9 @@ export default function AddEditReminder({ className }) {
 
   const handleAddReminder = async () => { // function to add reminder, after all test cases are met
      // toast('Reminder Added')
+     if(location.state){
+      reminder.uuid = reminder_uuid
+     }
     setSuccess(true)
     setMessage({status: true, message: ''})
     let {description, note, category, mode} = reminder
@@ -81,14 +87,14 @@ export default function AddEditReminder({ className }) {
       const res = await api.addReminder(reminder);
       if(res && res.status == 200){
         setSuccess(false)
-        setMessage({status: true, message: 'Reminder added successfully'})
+        setMessage({status: true, message: 'Reminder successfully'})
         setTimeout(()=>{
           navigate('/reminders', {replace: true})
         }, 2000)
         return
       }
       setSuccess(false)
-      setMessage({status: false, message: 'Opps cannot add reminder, try again'})
+      setMessage({status: false, message: `Opps, couldn't perform action`})
     } catch (error) {
       setSuccess(false)
       setMessage({status: false, message: 'An error occurred'})
@@ -120,7 +126,7 @@ export default function AddEditReminder({ className }) {
                 placeholder="Describe the Reminder"
                 value={reminder.description}
                 inputHandler={onReminderInputChange}
-                maxLength={10}
+                maxLength={100}
               />
             </div>
 
@@ -135,7 +141,7 @@ export default function AddEditReminder({ className }) {
                   value={''}
                 /> */}
                 <label className="input-label text-dark-gray dark:text-white text-xl font-bold block mb-2.5">Reminder Type</label>
-                <select name='category' className='bg-white dark:bg-dark-white text-gray-700 w-full py-5 cursor-pointer focus:outline-none focus:border-none' onChange={onReminderInputChange}>
+                <select value={reminder.category} name='category' className='bg-white dark:bg-dark-white text-gray-700 w-full py-5 cursor-pointer focus:outline-none focus:border-none' onChange={onReminderInputChange}>
                   <option className='' value="">Select category</option>
                   {category.length > 0 &&
                   <>
@@ -156,7 +162,7 @@ export default function AddEditReminder({ className }) {
                   value={''}
                 /> */}
                 <label className="input-label text-dark-gray dark:text-white text-xl font-bold block mb-2.5">Mode</label>
-                <select name='mode' className='bg-white dark:bg-dark-white text-gray-700 w-full py-5 cursor-pointer focus:outline-none focus:border-none' onChange={onReminderInputChange}>
+                <select value={reminder.mode} name='mode' className='bg-white dark:bg-dark-white text-gray-700 w-full py-5 cursor-pointer focus:outline-none focus:border-none' onChange={onReminderInputChange}>
                 <option className='' value="">Select mode</option>
                   {category.length > 0 &&
                   <>
@@ -180,7 +186,7 @@ export default function AddEditReminder({ className }) {
                   value={''}
                 /> */}
                 <label className="input-label text-dark-gray dark:text-white text-xl font-bold block mb-2.5">Start Date</label>
-                <Calendar onChange={setStartDate} value={startDate} calendarType="US" />
+                <Calendar onChange={setStartDate} value={reminder.start_date} calendarType="US" />
               </div>
               <div className="field w-full">
                 {/* <InputCom
@@ -191,7 +197,7 @@ export default function AddEditReminder({ className }) {
                   value={''}
                 /> */}
                 <label className="input-label text-dark-gray dark:text-white text-xl font-bold block mb-2.5">End Date</label>
-                <Calendar onChange={setEndDate} value={endDate} calendarType="US" />
+                <Calendar onChange={setEndDate} value={reminder.end_date} calendarType="US" />
               </div>
             </div>
 
@@ -241,7 +247,7 @@ export default function AddEditReminder({ className }) {
                 className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
                 onClick={handleAddReminder}
               >
-                Upadate
+                {location.state?.reminder ? 'Edit' : 'Add Reminder'}
               </button>
             }
           </div>
@@ -252,4 +258,4 @@ export default function AddEditReminder({ className }) {
       </Layout>
     </>
   )
-}
+}

src/components/Reminders/ReminderTable.jsx

@@ -110,8 +110,7 @@ export default function ReminderTable({ className }) {
                           <span className="text-sm text-thin-light-gray">
                           
                             Added <span className="text-purple">
-                              {/* {new Date(reminder.added).toLocaleString()} */}
-                              {reminder.added.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
+                              {new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
                               </span>
                           </span>
                         </div>
@@ -121,16 +120,14 @@ export default function ReminderTable({ className }) {
                       <div className="flex space-x-1 items-center justify-center">
              
                         <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                        {/* {new Date(reminder.start_date).toLocaleString()} */}
-                        {reminder.start_date.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
+                        {new Date(reminder.start_date).toLocaleString().replace(/-/g, '/')}
                         </span>
                       </div>
                     </td>
                     <td className="text-center py-4 px-2">
                       <div className="flex space-x-1 items-center justify-center">
                         <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                        {/* {new Date(reminder.end_date).toLocaleString()} */}
-                        {reminder.end_date.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
+                        {new Date(reminder.end_date).toLocaleString().replace(/-/g, '/')}
                         </span>
                       </div>
                     </td>
@@ -140,12 +137,7 @@ export default function ReminderTable({ className }) {
                       </span>
                     </td>
                     <td className="text-right py-4 px-2">
-                      <button
-                        type="button"
-                        className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
-                      >
-                        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>
                     </td>
                       </tr>
                       ))
@@ -171,8 +163,7 @@ export default function ReminderTable({ className }) {
                           <span className="text-sm text-thin-light-gray">
                           
                             Added <span className="text-purple">
-                              {/* {new Date(reminder.added).toLocaleString()} */}
-                              {reminder.added.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
+                            {new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
                               </span>
                           </span>
                         </div>
@@ -182,16 +173,14 @@ export default function ReminderTable({ className }) {
                       <div className="flex space-x-1 items-center justify-center">
              
                         <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                        {/* {new Date(reminder.start_date).toLocaleString()} */}
-                        {reminder.start_date.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
+                        {new Date(reminder.start_date).toLocaleString().replace(/-/g, '/')}
                         </span>
                       </div>
                     </td>
                     <td className="text-center py-4 px-2">
                       <div className="flex space-x-1 items-center justify-center">
                         <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                        {/* {new Date(reminder.end_date).toLocaleString()} */}
-                        {reminder.end_date.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
+                        {new Date(reminder.end_date).toLocaleString().replace(/-/g, '/')}
                         </span>
                       </div>
                     </td>
@@ -201,12 +190,13 @@ export default function ReminderTable({ className }) {
                       </span>
                     </td>
                     <td className="text-right py-4 px-2">
-                      <button
+                      {/* <button
                         type="button"
                         className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
                       >
                         Edit
-                      </button>
+                      </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>
                     </td>
                           </tr>
                         )

src/components/Tracking/TrackCategory.jsx

@@ -0,0 +1,103 @@
+import React, { useRef } from "react";
+import TrackItemCard from "../Cards/TrackItemCard";
+import Icons from "../Helpers/Icons";
+import SliderCom from "../Helpers/SliderCom";
+
+export default function TrackCategoy({ className, trending }) {
+  const settings = {
+    arrows: false,
+    slidesToShow: 4,
+    slidesToScroll: 4,
+    infinite: true,
+    responsive: [
+      {
+        breakpoint: 1025,
+        settings: {
+          slidesToShow: 3,
+          slidesToScroll: 3,
+        },
+      },
+      {
+        breakpoint: 769,
+        settings: {
+          slidesToShow: 2,
+          slidesToScroll: 2,
+        },
+      },
+      {
+        breakpoint: 619,
+        settings: {
+          slidesToShow: 1,
+          slidesToScroll: 1,
+        },
+      },
+    ],
+  };
+  const trendingSlider = useRef(null);
+  const prevHandler = () => {
+    trendingSlider.current.slickPrev();
+  };
+  const nextHandler = () => {
+    trendingSlider.current.slickNext();
+  };
+  return (
+    <div className={`trending-section w-full px-2 sm:px-0 ${className || ""}`}>
+      {/* heading */}
+      <div className="flex justify-between items-center mb-6">
+        <div>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Select Tracking</h1>
+        </div>
+        <div className="slider-btns flex space-x-4">
+          <button onClick={nextHandler} type="button">
+            <div className="trending-slider-left-btn relative text-white w-10 h-10 flex justify-center items-center rounded-full overflow-hidden">
+              <svg
+                width="11"
+                height="19"
+                viewBox="0 0 11 19"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M9.09766 1.1499L1.13307 9.11449L9.09766 17.0791"
+                  stroke="url(#paint0_linear_220_23410)"
+                  strokeWidth="2"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                />
+                <defs>
+                  <linearGradient
+                    id="paint0_linear_220_23410"
+                    x1="9.09766"
+                    y1="1.1499"
+                    x2="-4.2474"
+                    y2="7.96749"
+                    gradientUnits="userSpaceOnUse"
+                  >
+                    <stop stopColor="#F539F8" />
+                    <stop offset="0.416763" stopColor="#C342F9" />
+                    <stop offset="1" stopColor="#5356FB" />
+                  </linearGradient>
+                </defs>
+              </svg>
+            </div>
+          </button>
+          <button onClick={prevHandler} type="button">
+            <div className="trending-slider-right-btn  primary-gradient  text-white w-10 h-10 relative flex justify-center items-center rounded-full ">
+              <Icons name="arrows" />
+            </div>
+          </button>
+        </div>
+      </div>
+      {/* trending products */}
+      <div className="trending-products relative w-full">
+        <SliderCom selector={trendingSlider} settings={settings}>
+          {trending &&
+            trending.length > 0 &&
+            trending.map((item) => (
+              <TrackItemCard key={item.id} datas={item} />
+            ))}
+        </SliderCom>
+      </div>
+    </div>
+  );
+}

src/components/Tracking/TrackingTable.jsx

@@ -17,7 +17,7 @@ export default function TrackingTable({ className }) {
       <div className="header w-full flex justify-between items-center mb-5">
         <div className="flex space-x-2 items-center">
           <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
-            Tracking
+            Recent Tracking
           </h1>
         </div>
         <SelectBox

src/components/Tracking/index.jsx

@@ -4,13 +4,17 @@ import SellHistoryMarketVisitorAnalytic from "../Home/SellHistoryMarketVisitorAn
 import Layout from "../Partials/Layout";
 import TrackingTable from "./TrackingTable";
 import MarketHistorySection from "./MarketHistorySection";
+import TrackCategoy from "./TrackCategory";
+import datas from "../../data/product_data.json";
 
 export default function Tracking() {
+  const trending = datas.datas;
   return (
     <>
       <Layout>
         <div className="history-wrapper w-full mb-10">
           <div className="main-wrapper w-full">
+            <TrackCategoy trending={trending} className="mb-10" />
             <TrackingTable />
           </div>
         </div>

src/index.css

@@ -47,6 +47,10 @@ html {
   background-size: cover; */
 }
 
+.dark .dark-primary-gradient {
+  background: linear-gradient(90deg, rgba(255,255,255,1) 0%, rgba(188,73,190,1) 100%);
+}
+
 .primary-home {
   /*background: linear-gradient(134.38deg, #f539f8 0%, #284f64 43.55%, #1a3544 104.51%); */
   background-image: url("./assets/images/left-myft.jpg");
@@ -309,6 +313,9 @@ input[type="number"] {
 .menu-setting-items .nav-item.active span.item-content {
   @apply text-purple;
 }
+.dark .menu-setting-items .nav-item.active span.item-content {
+  @apply text-white
+}
 /* TODO: =================================layout end================================ */
 /* TODO: =================================HomePage ================================ */
 .home-page-wrapper .hero-slider .slick-slider .slick-dots li {
@@ -520,7 +527,7 @@ input[type="number"] {
   transition: all 0.5s ease-in-out;
   width: 58px;
   height: 58px;
-  @apply bg-pink;
+  @apply bg-purple;
 }
 
 /* TODO: =================================login end================================= */

src/middleware/AuthRoute.jsx

@@ -1,26 +1,49 @@
 import React, {useEffect} from "react";
-import { Navigate, Outlet, useNavigate } from "react-router-dom";
-// import { toast } from "react-toastify";
+import { Navigate, Outlet, useNavigate, useLocation } from "react-router-dom";
+import { toast } from "react-toastify";
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
   const isLogin = localStorage.getItem("email");
   const profile = localStorage.getItem("profile")
 
   const navigate = useNavigate();
+  const { pathname } = useLocation();
 
-  //FUNCTION TO EXPIRE SESSION AFETR 5 MINUTES
+
+  //FUNCTION TO EXPIRE SESSION AFETR 5 MINUTES AND REDIRECT USER TO LOGIN PAGE
   const expireSession = () => {
     localStorage.removeItem("email");
     localStorage.removeItem('session_token');
     localStorage.removeItem('profile');
-    // navigate("/login", { replace: true });
+    localStorage.removeItem('member_id');
+    localStorage.removeItem('member_uuid');
+    localStorage.removeItem('status');
+    navigate("/login", { replace: true }); // redirects user to login page after session expires
   };
 
+   //FUNCTION TO REMIND USER OF EXPIRY TIME
+  const expireSessionReminder = () => {
+    toast.success("session is about to expire", {
+      icon: `🙂`,
+    });
+  }
+
+
   useEffect(()=>{
-    setTimeout(()=>{
+    let sessionExpReminder = setTimeout(()=>{ //reminds user of session expiry after 4 mins 240000
+      expireSessionReminder()
+    }, 240000) 
+
+    let timeForSessionExpiry = setTimeout(()=>{ //reminds user of session expiry after 4 mins 300000
       expireSession()
-    }, 300000) //expires user login session after 5 minutes
-  },[])
+    }, 300000) 
+
+    return ()=>{ // clears timeout side effect
+      clearTimeout(sessionExpReminder)
+      clearInterval(timeForSessionExpiry)
+    }
+  },[pathname])
+
 
   if (!isLogin || !profile || (typeof JSON.parse(profile) == 'object' && JSON.parse(profile).firstname == undefined)) {
     return <Navigate to={redirectPath} replace />;