updated reminder state

.env

@@ -9,5 +9,9 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
 
 REACT_APP_AUX_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
 REACT_APP_USERS_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
+# REACT_APP_PASSWORD_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
 
-REACT_APP_SESSION_EXPIRE_MINUTES = 5
+REACT_APP_SESSION_EXPIRE_MINUTES = 5
+
+REACT_APP_TRACKING="Tracking"
+REACT_APP_RESOURCES="Resources"

.gitignore

@@ -5,6 +5,9 @@
 /.pnp
 .pnp.js
 
+/.idea
+/.vscode
+
 # testing
 /coverage
 

package-lock.json

@@ -3348,6 +3348,11 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "@wojtekmaj/date-utils": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@wojtekmaj/date-utils/-/date-utils-1.1.2.tgz",
+      "integrity": "sha512-06PQad/6pyYDjInBW2ih4Oy30EAg0mtXTCz+b/fGwzN2JB2X2Zsa4QtHl4I8M+IaCKN8bwj61OW3XAWxh+D9hA=="
+    },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -6490,6 +6495,14 @@
         "get-intrinsic": "^1.1.1"
       }
     },
+    "get-user-locale": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/get-user-locale/-/get-user-locale-1.5.1.tgz",
+      "integrity": "sha512-WiNpoFRcHn1qxP9VabQljzGwkAQDrcpqUtaP0rNBEkFxJdh4f3tik6MfZsMYZc+UgQJdGCxWEjL9wnCUlRQXag==",
+      "requires": {
+        "lodash.memoize": "^4.1.1"
+      }
+    },
     "glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -11049,6 +11062,17 @@
         }
       }
     },
+    "react-calendar": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-4.0.0.tgz",
+      "integrity": "sha512-y9Q5Oo3Mq869KExbOCP3aJ3hEnRZKZ0TqUa9QU1wJGgDZFrW1qTaWp5v52oZpmxTTrpAMTUcUGaC0QJcO1f8Nw==",
+      "requires": {
+        "@wojtekmaj/date-utils": "^1.0.2",
+        "clsx": "^1.2.1",
+        "get-user-locale": "^1.2.0",
+        "prop-types": "^15.6.0"
+      }
+    },
     "react-chartjs-2": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-4.3.1.tgz",

package.json

@@ -14,6 +14,7 @@
     "cors": "^2.8.5",
     "faker": "^6.6.6",
     "react": "^18.0.0",
+    "react-calendar": "^4.0.0",
     "react-chartjs-2": "^4.1.0",
     "react-countup": "^6.2.0",
     "react-dom": "^18.0.0",

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/ActiveBids/OverviewSection.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Link } from "react-router-dom";
-import { toast } from "react-toastify";
+// import { toast } from "react-toastify";
 import activeAidsBanner from "../../assets/images/active-aids-banner.jpg";
 import HeroUser from "../../assets/images/hero-user.png";
 import CountDown from "../Helpers/CountDown";
@@ -10,10 +10,8 @@ export default function OverviewSection({ className }) {
   const favoriteHandler = () => {
     if (!addFavorite) {
       setValue(true);
-      toast.success("Added to Favorite List");
     } else {
       setValue(false);
-      toast.warn("Remove to Favorite List");
     }
   };
   return (

src/components/AuthPages/ForgotPassword/index.jsx

@@ -1,10 +1,40 @@
-import React from "react";
-import { Link } from 'react-router-dom';
+import React, { useState, useEffect } from "react";
+import { Link, useNavigate } from 'react-router-dom';
 import titleShape from "../../../assets/images/shape/title-shape-two.svg";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 
 export default function ForgotPassword() {
+
+  const navigate = useNavigate();
+  const [validation, setValidation] = useState("")
+  const [buttonDisabled, setButtonDisabled] = useState(true)
+
+  // email
+  const [email, setEmail] = useState("");
+  const handleEmail = (e) => {
+    setEmail(e.target.value);
+  };
+
+
+  function validationChecker(email) {
+    const emailCheck = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
+    if (email === "") {
+      setValidation("email is required");
+
+    } else if (!email.match(emailCheck)) {
+      setValidation('Please input a valid email address');
+
+    } else {
+      setValidation("");
+      setButtonDisabled(false)
+    }
+  }
+
+  useEffect(() => {
+    validationChecker(email)
+  }, [email])
+
   return (
     <>
       <AuthLayout
@@ -28,19 +58,24 @@ export default function ForgotPassword() {
                   name="email"
                   type="email"
                   iconName="message"
+                  inputHandler={handleEmail}
+                  value={email}
                 />
+                {validation && <p className="my-5 font-bold  text-red-500">{validation}</p>}
               </div>
+
               <div className="signin-area mb-3.5">
-                <a
-                  href="/verify-you"
+
+                <button
                   className="w-full rounded-[50px] mb-5 h-[58px] text-xl text-white font-bold flex justify-center bg-purple items-center"
+                  disabled={buttonDisabled}
+                  onClick={() => navigate("/verify-you")}
                 >
                   Send Code
-                </a>
-
+                </button>
 
                 <Link to="/"
-                  className=" my-40 font-bold flex justify-center text-red-500 items-center"
+                  className="my-40 font-bold flex justify-center text-red-500 items-center"
                 >
                   Back to Home
                 </Link>

src/components/AuthPages/Login/index.jsx

@@ -45,10 +45,10 @@ export default function Login() {
       // if (email === "support@mermsemr.com") {
       if (loginResult.data.status > 0 && loginResult.data.session_token !='') { // just for a start
         localStorage.setItem("email", `${email}`);
-        localStorage.setItem("member_id", `${JSON.stringify(loginResult.data.member_id)}`);
-        localStorage.setItem("member_uuid", `${JSON.stringify(loginResult.data.member_uuid)}`);
+        localStorage.setItem("member_id", loginResult.data.member_id);
+        localStorage.setItem("member_uuid", loginResult.data.member_uuid);
         localStorage.setItem("session_token", `${loginResult.data.session_token}`);
-        localStorage.setItem("status", `${JSON.stringify(loginResult.data.status)}`);
+        localStorage.setItem("status", loginResult.data.status);
         localStorage.setItem("profile", `${JSON.stringify(loginResult.data.profile)}`);
         setLoginLoading(true);
          // userApi.getUserReminders(); //testing

src/components/Cards/BlogCardStyle.jsx

@@ -0,0 +1,212 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+// import { toast } from "react-toastify";
+import localImgLoad from "../../lib/localImgLoad";
+import Icons from "../Helpers/Icons";
+
+export default function BlogCardStyle({
+  className,
+  datas,
+  hidden = false,
+}) {
+  const [addFavorite, setValue] = useState(datas.whishlisted);
+  const [options, setOption] = useState(false);
+  const favoriteHandler = () => {
+    if (!addFavorite) {
+      setValue(true);
+    } else {
+      setValue(false);
+    }
+  };
+  return (
+    <div
+      className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+        className || ""
+      }`}
+    >
+      <div className="flex flex-col justify-between w-full h-full">
+        <div className="card-two-info flex justify-between items-center">
+          <div className="owned-by flex space-x-2 items-center">
+            <div className="owned w-[46px] h-[46px] rounded-full overflow-hidden">
+              <img
+                src={localImgLoad(`images/${datas.owner_img}`)}
+                alt=""
+                className="w-full h-full"
+              />
+            </div>
+            <div>
+              <p className="text-thin-light-gray text-sm leading-3">Owned by</p>
+              <p className="text-base   text-dark-gray dark:text-white">
+                {datas.owner}
+              </p>
+            </div>
+          </div>
+          <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
+  
+        </div>
+        <div className="thumbnail-area w-full">
+          <div
+            className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
+            style={{
+              background: `url(${localImgLoad(
+                `images/${datas.thumbnil}`
+              )}) 0% 0% / cover no-repeat`,
+            }}
+          >
+            <div className="product-two-options flex justify-between mb-5 relative">
+              <div className="status">
+                {datas.isActive && (
+                  <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">
+                    Active
+                  </span>
+                )}
+              </div>
+              <div className=" review flex space-x-2">
+                <button
+                  onClick={favoriteHandler}
+                  type="button"
+                  className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${
+                    addFavorite ? "text-red-500" : "text-thin-light-gray"
+                  }`}
+                >
+                  <Icons name="love" />
+                </button>
+                <button
+                  onClick={() => setOption(!options)}
+                  type="button"
+                  className="w-7 h-7 bg-white   rounded-full flex justify-center items-center text-thin-light-gray"
+                >
+                  <Icons name="dots" />
+                </button>
+                {options && (
+                  <div
+                    onClick={() => setOption(!options)}
+                    className="w-full h-screen fixed top-0 left-0 z-10"
+                  ></div>
+                )}
+                <div
+                  style={{ boxShadow: "0px 4px 87px 0px #0000002B" }}
+                  className={`drop-down-content w-[80px] bg-white dark:bg-dark-white   rounded-[4px] p-2.5 absolute right-0 top-[100%] z-20 ${
+                    options ? "active" : ""
+                  }`}
+                >
+                  <ul className="flex flex-col space-y-3">
+                    <li
+                      onClick={() => setOption(!options)}
+                      className="text-thin-light-gray tracking-wide text-xs cursor-pointer"
+                    >
+                      <div className="flex space-x-2.5 items-center">
+                        <span>
+                          <svg
+                            width="13"
+                            height="12"
+                            viewBox="0 0 13 12"
+                            fill="none"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M0.110352 11.9873C0.154533 10.848 0.104327 9.69692 0.260972 8.57138C0.639531 5.85371 2.91942 3.60923 5.76865 3.03157C6.15022 2.95404 6.53983 2.91055 6.95102 2.84768C6.95102 1.93155 6.95102 1.00502 6.95102 0.000488281C8.99544 1.56756 10.9836 3.09255 12.9999 4.63835C10.9876 6.18745 8.99895 7.71764 6.96106 9.28613C6.96106 8.30145 6.96106 7.37729 6.96106 6.3789C6.39875 6.48337 5.86505 6.53868 5.36147 6.68381C3.3045 7.2766 1.81738 8.49243 0.95282 10.3611C0.700281 10.9066 0.452259 11.454 0.20223 12.001"
+                              fill="#374557"
+                              fillOpacity="0.6"
+                            />
+                          </svg>
+                        </span>
+                        <span className="text-sm tracking-wide text-[#374557]">
+                          Share
+                        </span>
+                      </div>
+                    </li>
+                    <li
+                      onClick={() => setOption(!options)}
+                      className="text-thin-light-gray tracking-wide text-xs cursor-pointer"
+                    >
+                      <div className="flex space-x-2.5 items-center">
+                        <span>
+                          <svg
+                            width="11"
+                            height="11"
+                            viewBox="0 0 11 11"
+                            fill="none"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M5.47576 9.99806C4.18586 9.99806 2.89403 10.0078 1.60413 9.99418C0.665318 9.98448 -0.0659459 9.19853 0.00388304 8.26121C0.02328 7.9934 0.116385 7.70813 0.252164 7.47332C1.50908 5.27072 2.7757 3.07394 4.05008 0.881042C4.73286 -0.29109 6.26327 -0.294972 6.94411 0.875221C8.2243 3.072 9.4948 5.27654 10.7575 7.48496C11.4287 8.65904 10.6392 9.99418 9.28338 9.99806C8.01482 10.0019 6.74626 9.99806 5.47576 9.99806ZM6.09452 3.81526C6.0984 3.81526 6.10422 3.81526 6.1081 3.81526C6.1081 3.75122 6.1081 3.68717 6.1081 3.62119C6.10616 3.22143 5.84818 2.94004 5.48934 2.94198C5.13631 2.94392 4.84924 3.26218 4.86863 3.65224C4.91713 4.56821 4.97338 5.48225 5.03157 6.39822C5.05097 6.68737 5.23718 6.85814 5.49903 6.8562C5.75701 6.85426 5.94516 6.67184 5.96068 6.38851C6.00917 5.53076 6.04991 4.67301 6.09452 3.81526ZM4.88997 7.88279C4.88221 8.22628 5.14795 8.50767 5.48546 8.51349C5.80551 8.51931 6.08288 8.25927 6.09646 7.94295C6.11004 7.58393 5.84624 7.29284 5.50291 7.28896C5.17705 7.28508 4.89967 7.55482 4.88997 7.88279Z"
+                              fill="#374557"
+                              fillOpacity="0.6"
+                            />
+                          </svg>
+                        </span>
+                        <span className="text-sm tracking-wide text-[#374557]">
+                          Report
+                        </span>
+                      </div>
+                    </li>
+                  </ul>
+                </div>
+              </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>
+        <div className="details-area">
+          {/* title */}
+          <Link to="/shop-details" className="mb-2.5">
+            <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+              {datas.title}
+            </h1>
+          </Link>
+          <div className="flex justify-between">
+            <div className="flex items-center space-x-2">
+              <div className="w-[42px] h-[42px]">
+     
+              </div>
+              <div>
+               
+              </div>
+
+            </div>
+            <div>
+              <button
+                type="button"
+                className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
+              >
+               View
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

src/components/Cards/ProductCardStyleOne.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Link } from "react-router-dom";
-import { toast } from "react-toastify";
+// import { toast } from "react-toastify";
 import localImgLoad from "../../lib/localImgLoad";
 import CountDown from "../Helpers/CountDown";
 import Icons from "../Helpers/Icons";
@@ -11,10 +11,8 @@ export default function ProductCardStyleOne({ datas, hidden = false }) {
   const favoriteHandler = () => {
     if (!addFavorite) {
       setValue(true);
-      toast.success("Added to Favorite List");
     } else {
       setValue(false);
-      toast.warn("Remove to Favorite List");
     }
   };
   return (

src/components/Cards/ProductCardStyleTwo.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Link } from "react-router-dom";
-import { toast } from "react-toastify";
+// import { toast } from "react-toastify";
 import localImgLoad from "../../lib/localImgLoad";
 import Icons from "../Helpers/Icons";
 
@@ -14,10 +14,8 @@ export default function ProductCardStyleTwo({
   const favoriteHandler = () => {
     if (!addFavorite) {
       setValue(true);
-      toast.success("Added to Favorite List");
     } else {
       setValue(false);
-      toast.warn("Remove to Favorite List");
     }
   };
   return (

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/Helpers/Inputs/InputCom/index.jsx

@@ -9,6 +9,7 @@ export default function InputCom({
   iconName,
   inputHandler,
   value,
+  maxLength
 }) {
   return (
     <div className="input-com">
@@ -28,6 +29,8 @@ export default function InputCom({
           className="input-field placeholder:text-base text-bese px-6 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
           type={type}
           id={name}
+          name={name}
+          maxLength={maxLength}
         />
         {iconName && (
           <div className="absolute right-6 bottom-[19px] z-10">
@@ -37,4 +40,4 @@ export default function InputCom({
       </div>
     </div>
   );
-}
+}

src/components/Helpers/SelectBox/index.jsx

@@ -2,15 +2,15 @@ import React, { useState } from "react";
 import useToggle from "../../../hooks/useToggle";
 
 function SelectBox({ datas = [], className, action, contentBodyClasses }) {
-  const [item, setItem] = useState(datas[0]);
+  const [item, setItem] = useState('All category');
   // custom hook
   const [toggle, setToggle] = useToggle(false);
-  const handler = (e, value) => {
+  const handler = (e, code, category) => {
     e.preventDefault();
     if (action) {
-      action(value);
+      action(code);
     }
-    setItem(value);
+    setItem(category);
     setToggle.set(false);
   };
   return (
@@ -54,13 +54,13 @@ function SelectBox({ datas = [], className, action, contentBodyClasses }) {
             } ${contentBodyClasses || ""}`}
           >
             <ul className="flex flex-col space-y-3">
-              {datas.map((value) => (
+              {datas.map((value, index) => (
                 <li
-                  key={value}
-                  onClick={(e) => handler(e, value)}
+                  key={index}
+                  onClick={(e) => handler(e, value.code, value.category)}
                   className="text-thin-light-gray tracking-wide text-sm cursor-pointer"
                 >
-                  {value}
+                  {value.category}
                 </li>
               ))}
             </ul>

src/components/Home/Hero.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Link } from "react-router-dom";
-import { toast } from "react-toastify";
+// import { toast } from "react-toastify";
 import heroBg from "../../assets/images/hero-bg.svg";
 import heroUser from "../../assets/images/hero-user.png";
 import slider1 from "../../assets/images/slider-1.jpg";
@@ -21,10 +21,8 @@ export default function Hero({ className }) {
   const favoriteHandler = () => {
     if (!addFavorite) {
       setValue(true);
-      toast.success("Added to Favorite List");
     } else {
       setValue(false);
-      toast.warn("Remove to Favorite List");
     }
   };
   return (

src/components/Partials/Layout.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom";
-import { toast } from "react-toastify";
+// import { toast } from "react-toastify";
 import useToggle from "../../hooks/useToggle";
 import { drawerToggle } from "../../store/drawer";
 import ModalCom from "../Helpers/ModalCom";
@@ -26,9 +26,9 @@ export default function Layout({ children }) {
     localStorage.removeItem('member_uuid');
     localStorage.removeItem('session_token');
     localStorage.removeItem('status');
-    toast.success("Come Back Soon", {
-      icon: `🙂`,
-    });
+    // toast.success("Come Back Soon", {
+    //   icon: `🙂`,
+    // });
 
     navigate("/login", { replace: true });
   };
@@ -95,7 +95,7 @@ export default function Layout({ children }) {
       {logoutModal && (
         <ModalCom action={logoutModalHandler} situation={logoutModal}>
           <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white   lg:rounded-2xl">
-            <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple dark:border-[#5356fb29] ">
+            <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
               <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
                 Confirm
               </h1>

src/components/Partials/Layout.jsx.rej

@@ -0,0 +1,10 @@
+diff a/src/components/Partials/Layout.jsx b/src/components/Partials/Layout.jsx	(rejected hunks)
+@@ -143,7 +143,7 @@
+               </div>
+               <div className="mb-6">
+                 <p className="text-2xl tracking-wide text-center text-dark-gray dark:text-white">
+-                  Are you sure you want to Logout of your myFit account?
++                  Are you sure you want to Logout of your myFit account ?
+                 </p>
+               </div>
+               <div className="flex space-x-2.5">

src/components/Partials/MobileSideBar.jsx

@@ -111,8 +111,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                     <Icons name="market" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    Tracking
-
+                    {process.env.REACT_APP_TRACKING}
                   </span>
                 </NavLink>
               </li>
@@ -138,7 +137,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                     <Icons name="star" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    Resources
+                    {process.env.REACT_APP_RESOURCES}
                   </span>
                 </NavLink>
               </li>

src/components/Partials/RightSideBar.jsx

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Link } from "react-router-dom";
 import topCreator1 from "../../assets/images/top-creator-1.png";
 import topCreator2 from "../../assets/images/top-creator-2.png";
 import topCreator3 from "../../assets/images/top-creator-3.png";
@@ -177,13 +178,15 @@ export default function RightSideBar() {
             </div>
           </div>
 
-          <div className="platform-list">
-            <div className="item flex space-x-3 items-center mb-4">
+          <div className="platform-list flex flex-col gap-4">
+            <Link to="/add-reminder" className="cursor-pointer p-2 md:hover:shadow-md transition md:hover:duration-300 rounded-md">
+            <div className="item flex space-x-3 items-center">
               {/* image */}
               <div className="w-8 h-8 rounded-full">
                 <svg
-                  width="40"
-                  height="41"
+                  className="w-[100%]"
+                  // width="40"
+                  // height="41"
                   viewBox="0 0 40 41"
                   fill="none"
                   xmlns="http://www.w3.org/2000/svg"
@@ -206,12 +209,15 @@ export default function RightSideBar() {
               </div>
               {/* action */}
             </div>
-            <div className="item flex space-x-3 items-center mb-4">
+            </Link>
+            <Link to="/#" className="cursor-pointer p-2 md:hover:shadow-md transition md:hover:duration-300 rounded-md">       
+            <div className="item flex space-x-3 items-center">
               {/* image */}
               <div className="w-8 h-8 rounded-full">
                 <svg
-                  width="40"
-                  height="41"
+                  className="w-[100%]"
+                  // width="40"
+                  // height="41"
                   viewBox="0 0 40 41"
                   fill="none"
                   xmlns="http://www.w3.org/2000/svg"
@@ -237,7 +243,7 @@ export default function RightSideBar() {
               </div>
               {/* action */}
             </div>
-
+            </Link>
           </div>
         </div>
       </div>

src/components/Partials/Sidebar.jsx

@@ -18,7 +18,6 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
     try {
       const res = await api.getUserReminders();
       setUserReminders(res.data.reminders);
-      console.log("res", res);
     } catch (error) {
       console.log("Error from User Reminders", error);
     }
@@ -117,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"
                     }`}
                   >
@@ -137,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>
@@ -160,15 +159,15 @@ 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"
                     }`}
                   >
-                   Tracking
+                   {process.env.REACT_APP_TRACKING}
                   </span>
                 </NavLink>
               </li>
@@ -180,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"
                     }`}
                   >
@@ -200,15 +199,15 @@ 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"
                     }`}
                   >
-                    Resources
+                    {process.env.REACT_APP_RESOURCES}
                   </span>
                 </NavLink>
               </li>
@@ -221,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"
                     }`}
                   >
@@ -250,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"
                     }`}
                   >
@@ -270,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,10 +1,111 @@
-import React from 'react'
+import React, {useState, useEffect} from 'react'
 import Layout from '../Partials/Layout'
-import { Link } from 'react-router-dom'
+import { Link, useNavigate, useLocation, useParams } from 'react-router-dom'
+
+// import { toast } from 'react-toastify';
+
 import InputCom from "../Helpers/Inputs/InputCom";
 
+import Calendar from 'react-calendar';
+import 'react-calendar/dist/Calendar.css';
+
+import usersService from "../../services/UsersService";
+
 
 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());
+
+  const [mode, setMode] = useState([]) // for setting mode option display, content is updated when page loads
+
+  const [category, setCategory] = useState([]) // for setting category option display, content is updated when page loads
+
+  const [success, setSuccess] = useState(false)
+  const [message, setMessage]=useState({
+    status: false,
+    message: ''
+  })
+
+  const [reminder, setReminder]=useState({
+    'member_id': localStorage.getItem('member_id'),
+    description: location.state?.reminder.description || '',
+    note: location.state?.reminder.note || '',
+    category: location.state?.reminder.code || '',
+    mode: location.state?.reminder.code || '',
+    '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
+    setReminder(prev=>(
+      {...prev, [name]:value}
+    ))
+  }
+
+  const getUserMode = async () => {
+    try {
+      const res = await api.getUserModeCategory('remmode');
+      setMode(res.data);
+    } catch (error) {
+      console.log("Error getting mode");
+    }
+  };
+
+  const getUserCategory = async () => {
+    try {
+      const res = await api.getUserModeCategory('remcategory');
+      setCategory(res.data);
+    } catch (error) {
+      console.log("Error getting user category");
+    }
+  };
+
+  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
+    //CHECKING IF AN EMPTY FIELD WAS PASSED
+    if(!description || !note || !category || !mode){
+      setSuccess(false)
+      setMessage({status: false, message: 'All fields must be filled'})
+      return
+    }
+
+    try {
+      const res = await api.addReminder(reminder);
+      if(res && res.status == 200){
+        setSuccess(false)
+        setMessage({status: true, message: 'Reminder set successfully'})
+        setTimeout(()=>{
+          navigate('/reminders', {replace: true})
+        }, 2000)
+        return
+      }
+      setSuccess(false)
+      setMessage({status: false, message: `Sorry, couldn't perform action`})
+    } catch (error) {
+      setSuccess(false)
+      setMessage({status: false, message: 'An error occurred'})
+    }
+  }
+
+  
+  
+  useEffect(() => {
+    getUserMode();
+    getUserCategory()
+  }, []);
   return (
     <>
       <Layout>
@@ -16,7 +117,6 @@ export default function AddEditReminder({ className }) {
         className || ""
       }`}
     >
-           
 		  <div className="fields w-full">
                {/*description */}
                <div className="field w-full mb-6">
@@ -25,50 +125,80 @@ export default function AddEditReminder({ className }) {
                 type="text"
                 name="description"
                 placeholder="Describe the Reminder"
-                value={''}
+                value={reminder.description}
+                inputHandler={onReminderInputChange}
+                maxLength={100}
               />
             </div>
 
              {/* first name and last name */}
              <div className="xl:flex xl:space-x-7 mb-6">
               <div className="field w-full mb-6 xl:mb-0">
-                <InputCom
+                {/* <InputCom
                   label="Reminder Type"
                   type="text"
                   name="remType"
                   placeholder="Drop down of Category"
                   value={''}
-                />
+                /> */}
+                <label className="input-label text-dark-gray dark:text-white text-xl font-bold block mb-2.5">Reminder Type</label>
+                <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 &&
+                  <>
+                    {category.map((option, index)=>(
+                      <option key={index} className='' value={option.code}>{option.category}</option>
+                    ))
+                    }
+                  </>
+                  }
+                </select>
               </div>
               <div className="field w-full">
-                <InputCom
+                {/* <InputCom
                   label="Mode"
                   type="text"
                   name="remMode"
                   placeholder="Drop down of Modes"
                   value={''}
-                />
+                /> */}
+                <label className="input-label text-dark-gray dark:text-white text-xl font-bold block mb-2.5">Mode</label>
+                <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 &&
+                  <>
+                    {mode.map((option, index)=>(
+                      <option key={index} className='' value={option.code}>{option.mode}</option>
+                    ))
+                    }
+                  </>
+                  }
+                </select>
               </div>
             </div>
 
             <div className="xl:flex xl:space-x-7 mb-6">
               <div className="field w-full mb-6 xl:mb-0">
-                <InputCom
+                {/* <InputCom
                   label="Start Date"
                   type="text"
                   name="startDate"
                   placeholder="10-10-2021"
                   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={reminder.start_date} calendarType="US" />
               </div>
               <div className="field w-full">
-                <InputCom
+                {/* <InputCom
                   label="End Date"
                   type="text"
                   name="endDate"
                   placeholder="10-20-2034"
                   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={reminder.end_date} calendarType="US" />
               </div>
             </div>
 
@@ -78,16 +208,18 @@ export default function AddEditReminder({ className }) {
               <div className="input-field mt-2">
                 <div className="input-wrapper w-full ">
                   <textarea
-                    value={''}
+                    name='note'
+                    value={reminder.note}
                     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"
+                    onChange={onReminderInputChange}
+                    maxLength={250}
                   />
                 </div>
               </div>
             </div>
-
-       
+              <p className={`text-center ${message.status ? 'text-[rgb(0,128,0)]':'text-[rgb(255,0,0)]'}`}>{message.message}</p>
           </div>
           {/* border line */}
           <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
@@ -101,13 +233,24 @@ export default function AddEditReminder({ className }) {
                 Cancel
               </span>
             </button>
-
-            <button
-              type="button"
-              className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-            >
-              Upadate
-            </button>
+              {
+                success ? 
+                <div role="status">
+                  <svg aria-hidden="true" className="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+                      <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+                  </svg>
+                  <span className="sr-only">Loading...</span>
+              </div>
+                :
+              <button
+                type="button"
+                className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                onClick={handleAddReminder}
+              >
+                {location.state?.reminder ? 'Edit' : 'Upadate'}
+              </button>
+            }
           </div>
         </div>
         </div>
@@ -116,4 +259,4 @@ export default function AddEditReminder({ className }) {
       </Layout>
     </>
   )
-}
+}

src/components/Reminders/ReminderTable.jsx

@@ -2,29 +2,38 @@ import React, { useEffect, useState } from "react";
 import dataImage1 from "../../assets/images/data-table-user-1.png";
 import usersService from "../../services/UsersService";
 import SelectBox from "../Helpers/SelectBox";
+import { Link } from "react-router-dom";
 
 export default function ReminderTable({ className }) {
+  const api = new usersService();
+
+  const [isLoading, setIsLoading] = useState(true)
+
   const [userReminders, setUserReminders] = useState([]);
 
-  const api = new usersService();
+  
+  const getUserReminders = async () => {
+    try {
+      const res = await api.getUserReminders();
+      if(res.status == 200){
+        setUserReminders([
+          {reminders: res.data.reminders},
+          {category: [{category: 'All category', code: 'All category'}, ...res.data.reminder_category]}
+        ]);
+        setIsLoading(false)
+        return
+      }
+      setIsLoading(false)
+    }catch(error) {
+      setIsLoading(false)
+    }
+  };
+  
   useEffect(() => {
     getUserReminders();
   }, []);
 
-  const getUserReminders = async () => {
-    try {
-      const res = await api.getUserReminders();
-     
-      setUserReminders(res.data.reminders);
-      console.log("res", res);
-      
-    } catch (error) {
-      console.log("Error from User Reminders", error);
-    }
-  };
-
-  const filterCategories = ["All Categories", "Doctors Visit", "Medications"];
-  const [selectedCategory, setCategory] = useState(filterCategories[0]);
+  const [selectedCategory, setCategory] = useState('All category')
   return (
     <div
       className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
@@ -39,287 +48,167 @@ export default function ReminderTable({ className }) {
         </div>
         <SelectBox
           action={setCategory}
-          datas={filterCategories}
+          datas={userReminders.length > 0 && userReminders[1].category}
           className="Update-table-dropdown"
           contentBodyClasses="w-auto min-w-max"
         />
       </div>
-      <div className="relative w-full overflow-x-auto sm:rounded-lg">
+      {
+        userReminders.length < 1 ?
+        // when no reminders display below code
+        <div  className="lg:flex justify-center">
+          <div style={{ transform: 'translateY(150px)' }}>
+            {
+              isLoading ? 
+              <div role="status">
+                <svg aria-hidden="true" className="w-32 h-32 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+                    <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+                </svg>
+                <span className="sr-only">Loading...</span>
+            </div>
+              :
+            <Link
+              to="/add-reminder"
+              className="btn-gradient lg:flex hidden w-[300px] h-[50px] rounded-full text-white justify-center items-center"
+            >
+              0 Reminders Start Reminder
+            </Link>
+            }
+          </div>
+        </div>
+        :
+        <div className="relative w-full overflow-x-auto sm:rounded-lg">
         <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
           <tbody>
-            <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">
+            <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-bottom ">
               <td className="py-4">Item</td>
               <td className="py-4 text-center">Start</td>
               <td className="py-4 text-center">End</td>
               <td className="py-4 text-center">Reminder</td>
               <td className="py-4 text-right">.</td>
             </tr>
+          
+                {
+                  userReminders[0].reminders.length > 0 && (
+                    selectedCategory == "All category" ? (
+                      userReminders[0].reminders.map((reminder, index) => (
+                      <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                    <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
+                            src={dataImage1}
+                            alt="data"
+                            className="w-full h-full"
+                          />
+                        </div>
+                        <div className="flex flex-col">
+                          <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                          {reminder.description.substring(0, 30)+ ' ...'}
+                          </h1>
+                          <span className="text-sm text-thin-light-gray">
+                          
+                            Added <span className="text-purple">
+                              {new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
+                              </span>
+                          </span>
+                        </div>
+                      </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.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().replace(/-/g, '/')}
+                        </span>
+                      </div>
+                    </td>
+                    <td className="text-right py-4 px-2">
+                      <span className="text-base text-thin-light-gray whitespace-nowrap">
+                       {reminder.reminder}
+                      </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>
+                    </td>
+                      </tr>
+                      ))
+                    )
+                    :
+                    userReminders[0].reminders.map((reminder, index) => {
+                      if(reminder.category == selectedCategory){
+                        return (
+                          <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                    <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
+                            src={dataImage1}
+                            alt="data"
+                            className="w-full h-full"
+                          />
+                        </div>
+                        <div className="flex flex-col">
+                          <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                          {reminder.description.substring(0, 30)+ ' ...'}
+                          </h1>
+                          <span className="text-sm text-thin-light-gray">
+                          
+                            Added <span className="text-purple">
+                            {new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
+                              </span>
+                          </span>
+                        </div>
+                      </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.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().replace(/-/g, '/')}
+                        </span>
+                      </div>
+                    </td>
+                    <td className="text-right py-4 px-2">
+                      <span className="text-base text-thin-light-gray whitespace-nowrap">
+                       {reminder.reminder}
+                      </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>
+                        )
+                      }
+                    })
+                  )
+                }
 
-            {selectedCategory === "All Categories" ? (
-
-              <>
-               {userReminders.map((reminders, index) => ( 
-
-                <tr key={reminders.id} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                  <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
-                          src={dataImage1}
-                          alt="data"
-                          className="w-full h-full"
-                        />
-                      </div>
-                      <div className="flex flex-col">
-                        <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                        {reminders.description}
-                        </h1>
-                        <span className="text-sm text-thin-light-gray">
-                        
-                          Added <span className="text-purple">{new Date(reminders.added).toLocaleString()}</span>
-                        </span>
-                      </div>
-                    </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(reminders.start_date).toLocaleString()}
-                      </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(reminders.end_date).toLocaleString()}
-                      </span>
-                    </div>
-                  </td>
-                  <td className="text-right py-4 px-2">
-                    <span className="text-base text-thin-light-gray whitespace-nowrap">
-                     {reminders.reminder}
-                    </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>
-                  </td>
-                </tr>
-              ))}
-                
-              </>
-            
-            ) : selectedCategory === "Doctors Visit" ? (
-              <>
-                <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                  <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
-                          src={dataImage1}
-                          alt="data"
-                          className="w-full h-full"
-                        />
-                      </div>
-                      <div className="flex flex-col">
-                        <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                          Doctors Testing Appointament
-                        </h1>
-                        <span className="text-sm text-thin-light-gray">
-                          Added <span className="text-purple">10-10-2025</span>
-                        </span>
-                      </div>
-                    </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">
-                        12-01-25 : 6:30 PM
-                      </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">
-                      12-01-28 : 6:30 PM
-                      </span>
-                    </div>
-                  </td>
-                  <td className="text-right py-4 px-2">
-                    <span className="text-base text-thin-light-gray whitespace-nowrap">
-                     4
-                    </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>
-                  </td>
-                </tr>
-                <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                  <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
-                          src={dataImage1}
-                          alt="data"
-                          className="w-full h-full"
-                        />
-                      </div>
-                      <div className="flex flex-col">
-                        <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                          Hospital Testing Appointament
-                        </h1>
-                        <span className="text-sm text-thin-light-gray">
-                          Added <span className="text-purple">10-10-2025</span>
-                        </span>
-                      </div>
-                    </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">
-                        12-01-25 : 6:30 PM
-                      </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">
-                      12-01-28 : 6:30 PM
-                      </span>
-                    </div>
-                  </td>
-                  <td className="text-right py-4 px-2">
-                    <span className="text-base text-thin-light-gray whitespace-nowrap">
-                     4
-                    </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>
-                  </td>
-                </tr>
-              </>
-            ) : (
-              <>
-                <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                  <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
-                          src={dataImage1}
-                          alt="data"
-                          className="w-full h-full"
-                        />
-                      </div>
-                      <div className="flex flex-col">
-                        <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                          Pizza Testing Appointament
-                        </h1>
-                        <span className="text-sm text-thin-light-gray">
-                          Added <span className="text-purple">10-10-2025</span>
-                        </span>
-                      </div>
-                    </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">
-                        12-01-25 : 6:30 PM
-                      </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">
-                      12-01-28 : 6:30 PM
-                      </span>
-                    </div>
-                  </td>
-                  <td className="text-right py-4 px-2">
-                    <span className="text-base text-thin-light-gray whitespace-nowrap">
-                     4
-                    </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>
-                  </td>
-                </tr>
-                <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                  <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
-                          src={dataImage1}
-                          alt="data"
-                          className="w-full h-full"
-                        />
-                      </div>
-                      <div className="flex flex-col">
-                        <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                          Pizza Testing Appointament
-                        </h1>
-                        <span className="text-sm text-thin-light-gray">
-                          Added <span className="text-purple">10-10-2025</span>
-                        </span>
-                      </div>
-                    </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">
-                        12-01-25 : 6:30 PM
-                      </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">
-                      12-01-28 : 6:30 PM
-                      </span>
-                    </div>
-                  </td>
-                  <td className="text-right py-4 px-2">
-                    <span className="text-base text-thin-light-gray whitespace-nowrap">
-                     4
-                    </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>
-                  </td>
-                </tr>
-              </>
-            )}
           </tbody>
         </table>
       </div>
+      }
     </div>
-  );
-}
+  )
+}

src/components/Resources/BlogTab.jsx

@@ -0,0 +1,59 @@
+import React from "react";
+//import ProductCardStyleTwo from "../Cards/ProductCardStyleTwo";
+import DataIteration from "../Helpers/DataIteration";
+import SearchCom from "../Helpers/SearchCom";
+import BlogCardStyle from "../Cards/BlogCardStyle";
+
+export default function BlogTab({ className, products }) {
+  return (
+    <>
+      <div className={`onsale-tab-wrapper w-full ${className || ""}`}>
+        <div className="main-container w-full">
+          <div className="filter-section w-full items-center sm:flex justify-between mb-6">
+            {/* filter-search */}
+            <div className="sm:w-1/2 w-full sm:pr-20 pr-0 mb-5 sm:mb-0">
+              <SearchCom />
+            </div>
+            {/* filer-dropdown */}
+            <div className="flex-1 flex sm:justify-end">
+              <div className="flex space-x-1 items-center">
+                <span className="text-18 text-thin-light-gray">
+                  Recently Received
+                </span>
+                <span>
+                  <svg
+                    width="20"
+                    height="10"
+                    viewBox="0 0 13 6"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      opacity="0.7"
+                      d="M12.4124 0.247421C12.3327 0.169022 12.2379 0.106794 12.1335 0.0643287C12.0291 0.0218632 11.917 0 11.8039 0C11.6908 0 11.5787 0.0218632 11.4743 0.0643287C11.3699 0.106794 11.2751 0.169022 11.1954 0.247421L7.27012 4.07837C7.19045 4.15677 7.09566 4.219 6.99122 4.26146C6.88678 4.30393 6.77476 4.32579 6.66162 4.32579C6.54848 4.32579 6.43646 4.30393 6.33202 4.26146C6.22758 4.219 6.13279 4.15677 6.05312 4.07837L2.12785 0.247421C2.04818 0.169022 1.95338 0.106794 1.84895 0.0643287C1.74451 0.0218632 1.63249 0 1.51935 0C1.40621 0 1.29419 0.0218632 1.18975 0.0643287C1.08531 0.106794 0.990517 0.169022 0.910844 0.247421C0.751218 0.404141 0.661621 0.616141 0.661621 0.837119C0.661621 1.0581 0.751218 1.2701 0.910844 1.42682L4.84468 5.26613C5.32677 5.73605 5.98027 6 6.66162 6C7.34297 6 7.99647 5.73605 8.47856 5.26613L12.4124 1.42682C12.572 1.2701 12.6616 1.0581 12.6616 0.837119C12.6616 0.616141 12.572 0.404141 12.4124 0.247421Z"
+                      fill="#374557"
+                      fillOpacity="0.6"
+                    />
+                  </svg>
+                </span>
+              </div>
+            </div>
+          </div>
+          <div className="content-section w-full-width">
+            <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
+              <DataIteration
+                datas={products}
+                startLength={0}
+                endLength={products.length}
+              >
+                {({ datas }) => (
+                  <BlogCardStyle key={datas.id} datas={datas} />
+                )}
+              </DataIteration>
+            </div>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+}

src/components/Resources/index.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import authProfilePic from "../../assets/images/auth-profile-picture.png";
 import profileBanner from "../../assets/images/profile-cover.png";
@@ -13,6 +13,10 @@ import HiddenProductsTab from "./HiddenProductsTab";
 import OnSaleTab from "./OnSaleTab";
 import OwnTab from "./OwnTab";
 
+import BlogTab from "./BlogTab";
+
+import usersService from "../../services/UsersService";
+
 export default function Resources() {
   const onSaleProducts = marketPlace.data;
   const CreatedSell = marketPlace.data;
@@ -24,8 +28,8 @@ export default function Resources() {
   const tabs = [
     {
       id: 1,
-      name: "onsale",
-      content: "On Sale",
+      name: "blog",
+      content: "Blogs",
     },
     {
       id: 2,
@@ -54,6 +58,30 @@ export default function Resources() {
     },
   ];
 
+
+  const api = new usersService();
+
+  const [isLoading, setIsLoading] = useState(true)
+
+  const [userResources, setUserResource] = useState([]);
+
+  
+  const getUserResources = async () => {
+    try {
+      const res = await api.getUserResources();
+      setUserResource(res.data.resources);
+      setIsLoading(false)
+      
+    }catch(error) {
+      setIsLoading(false)
+    }
+  };
+  
+  useEffect(() => {
+    getUserResources();
+  }, []);
+
+
   const [tab, setTab] = useState(tabs[0].name);
   const tabHandler = (value) => {
     setTab(value);
@@ -112,8 +140,8 @@ export default function Resources() {
             </div>
 
             <div className="tab-cotainer w-full mb-10">
-              {tab === "onsale" ? (
-                <OnSaleTab products={onSaleProducts} />
+              {tab === "blog" ? (
+                <BlogTab products={onSaleProducts} resources={userResources} />
               ) : tab === "owned" ? (
                 <OwnTab products={ownProducts} />
               ) : tab === "created" ? (

src/components/Settings/Tabs/LoginActivityTab.jsx

@@ -1,146 +1,115 @@
-import React from "react";
+import React, { useState, useEffect } from "react";
 import Icons from "../../Helpers/Icons";
+import usersService from "../../../services/UsersService";
 
 export default function LoginActivityTab() {
+  const api = new usersService();
+
+  const [userHistory, setUserHistory] = useState([]) // State for user login history
+
+  //page loading status
+  const [isLoading, setIsloading] = useState({
+    status: true,
+    message: 'loading'
+  })
+
+  
+  const getUserLoginHistory = async () => {
+    try {
+      const res = await api.getUserLoginHistory();
+      console.log(res.status == 200)
+      if(res.status != 200){
+        setIsloading({
+          status: false,
+          message: `Couldn't get user history, try again`
+        })
+        return
+      }
+      if(res.status == 200 && res.data.loginhx.length < 1){
+        setIsloading({
+          status: false,
+          message: `No User History found`
+        })
+        return
+      }
+      setUserHistory(res.data.loginhx);
+      setIsloading({
+        status: false,
+        message: ``
+      })
+    } catch(error) {
+      setIsloading({
+        status: false,
+        message: `Opps! something went wrong`
+      })
+    }
+  };
+  
+  useEffect(() => {
+    getUserLoginHistory();
+  }, []);
+  
   return (
     <div className="login-activity-tab w-full">
       <div className="relative w-full overflow-x-auto sm:rounded-lg">
-        <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+        {
+          isLoading.status == true ?
+          <div role="status">
+            <svg aria-hidden="true" className="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+                <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+            </svg>
+            <span className="sr-only">Loading...</span>
+        </div>
+          :
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
           <tbody>
             <tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">
               <td className="py-4 text-center">Channel</td>
               <td className="py-4 text-center">Date</td>
               <td className="py-4 text-center">Location</td>
             </tr>
-            <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-              <td className="text-center py-4">
-                <div className="flex items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    Desktop
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <div className="flex space-x-1 items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    10-10-2035
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
-                  10.0.0.1000
-                </span>
-              </td>
-            </tr>
-            <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-              <td className="text-center py-4">
-                <div className="flex items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    Desktop
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <div className="flex space-x-1 items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    10-10-2035
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
-                  10.0.0.1000
-                </span>
-              </td>
-            </tr>
-            <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-              <td className="text-center py-4">
-                <div className="flex items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    Desktop
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <div className="flex space-x-1 items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    10-10-2035
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
-                  10.0.0.1000
-                </span>
-              </td>
-            </tr>
-            <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-              <td className="text-center py-4">
-                <div className="flex items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    Desktop
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <div className="flex space-x-1 items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    10-10-2035
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
-                  10.0.0.1000
-                </span>
-              </td>
-            </tr>
-            <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-              <td className="text-center py-4">
-                <div className="flex items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    Desktop
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <div className="flex space-x-1 items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    10-10-2035
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
-                  10.0.0.1000
-                </span>
-              </td>
-            </tr>
-            <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-              <td className="text-center py-4">
-                <div className="flex items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    Mobile
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <div className="flex space-x-1 items-center justify-center">
-                  <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
-                    10-10-2035
-                  </span>
-                </div>
-              </td>
-              <td className="text-center py-4">
-                <span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
-                  10.0.0.1000
-                </span>
-              </td>
-            </tr>
+            {
+              userHistory.length > 0 ?
+              userHistory.map((data, index)=>(
+                <>
+                <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                  <td className="text-center py-4">
+                    <div className="flex items-center justify-center">
+                      <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
+                        Desktop
+                        {/* {data.channel} */}
+                      </span>
+                    </div>
+                  </td>
+                  <td className="text-center py-4">
+                    <div className="flex space-x-1 items-center justify-center">
+                      <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
+                        10-10-2035
+                        {/* {data.date} */}
+                      </span>
+                    </div>
+                  </td>
+                  <td className="text-center py-4">
+                    <span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
+                      10.0.0.1000
+                      {/* {data.location} */}
+                    </span>
+                  </td>
+                </tr>
+              </>
+              ))
+              :
+              <>
+                <tr>
+                  <td colSpan={3}>{isLoading.message}</td>
+                </tr>             
+              </>
+            }
           </tbody>
         </table>
+        }
       </div>
     </div>
   );
-}
+}

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================================= */
@@ -670,3 +677,38 @@ TODO: Responsive ===========================
     @apply mb-2;
   }
 }
+
+/* Calendar */
+.react-calendar{
+  width: 100%;
+  min-height: 23.2rem;
+  border-radius: 7px !important;
+}
+
+.react-calendar__navigation{
+  margin-top: 2px;
+  margin-inline: 2px;
+}
+
+.react-calendar__navigation button:enabled:hover,
+.react-calendar__navigation button:enabled:focus{
+  @apply rounded-full transition duration-500
+}
+
+.react-calendar__month-view__days{
+  display: grid !important;
+  grid-template-columns: repeat(7, 1fr);
+}
+
+.react-calendar__month-view__weekdays__weekday abbr:where([title]){
+  text-decoration: none !important;
+  cursor: default;
+}
+
+.react-calendar__tile{
+  border: 1px solid #cfd7e3 !important;
+  border-left: 0;
+  text-align: right;
+  height: 4.813rem !important;
+  transition: all 500ms;
+}

src/middleware/AuthRoute.jsx

@@ -1,5 +1,5 @@
 import React, {useEffect} from "react";
-import { Navigate, Outlet, useNavigate } from "react-router-dom";
+import { Navigate, Outlet, useNavigate, useLocation } from "react-router-dom";
 import { toast } from "react-toastify";
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
@@ -7,23 +7,43 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   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()
-      toast.success("Opps, session has expired", {
-        icon: `🙂`,
-      });
-    }, 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 />;

src/services/UsersService.js

@@ -6,24 +6,49 @@ class usersService {
     }
 
     logInUser(reqData) {
-       // debugger;
-        /*
-        clean up the request data here
-         */
         localStorage.setItem("session_token", ``);
         return this.postAuxEnd("/login", reqData);
     }
 
-    getUserReminders(){
-        return this.getAuxEnd("/reminders", null);
+     //END POINT TO ADD REMINDER
+     addReminder(reqData){
+        return this.postAuxEnd("/editreminder", reqData);
     }
+
+    getUserReminders(){
+        var reqData = {
+            member_id: localStorage.getItem("member_id")
+        };
+        return this.getAuxEnd("/reminders", reqData);
+    }
+
+    getUserLoginHistory(){
+        var reqData = {
+            member_id: localStorage.getItem("member_id")
+        };
+        return this.getAuxEnd("/loginhx", reqData);
+      }
+
+       //END POINT TO POPULATE MODE AND CATEGORY ON ADD REMINDER PAGED
+        getUserModeCategory(path){
+            var reqData = {
+                member_id: localStorage.getItem("member_id")
+            };
+            return this.getAuxEnd(`/${path}`, reqData);
+        }
+
+      getUserResources(){
+        var reqData = {
+            member_id: localStorage.getItem("member_id")
+        };
+        return this.getAuxEnd("/resources", reqData);
+      }
     //----------------------------------------  -----
     //----------------------------------------  -----
     // Unified call below
     //----------------------------------------  -----
     //----------------------------------------  -----
     getAuxEnd(uri, reqData) {
-        // debugger;
         const session_token = localStorage.getItem("session_token");
         let axiosConfig = {
             headers: {
@@ -33,11 +58,12 @@ class usersService {
             }
         };
         const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
-        return Axios.get(endPoint,axiosConfig)
+        return Axios.get(endPoint,{
+               params: {
+                reqData
+               }})
             .then((response) => {
-                // console.log(response);
-                // res = response;
-                // console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
+                 console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
                 return response;
             })
             .catch((error) => {
@@ -54,24 +80,21 @@ class usersService {
             });
     }
 
+
     postAuxEnd(uri, reqData) {
         const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
         const session_token = localStorage.getItem("session_token");
         let axiosConfig = {
             headers: {
                 'Accept': 'application/json',
+                'Access-Control-Allow-Origin': '*',
                 'Content-Type': 'application/json;charset=UTF-8',
                 'Authorization': `Basic ${session_token}`,
             }
         };
-        //Access-Control-Allow-Origin
-        var postData = {
-            email: "test@test.com",
-            password: "password"
-        };
       //  Axios.defaults.headers.post['Content-Type'] ='application/json;charset=utf-8';
       //  Axios.defaults.headers.post['Access-Control-Allow-Origin'] = '*'; //,axiosConfig
-        return Axios.post(endPoint, reqData,axiosConfig)
+        return Axios.post(endPoint, reqData)
             .then((response) => {
                 console.log(response);
                 // res = response;

tailwind.config.js

@@ -5,7 +5,7 @@ module.exports = {
     extend: {
       colors: {
         pink: "#F539F8",
-        purple: "#5356FB",
+        purple: "#1a3544",
         "light-gray": "#E5E5E5",
         "thin-light-gray": "#858D98",
         "dark-gray": "#374557",