removed line spaces

.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_TRACKING = "Tracking"
+REACT_APP_RESOURCES = "Resources"

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/App.jsx

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

src/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 React, { useState, useEffect } from "react";
-import { Link } from 'react-router-dom';
+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/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/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", {
+    // toast.success("Come Back Soon", {
-      icon: `🙂`,
+    //   icon: `🙂`,
-    });
+    // });
 
     navigate("/login", { replace: true });
   };

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/Sidebar.jsx

@@ -168,7 +168,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
-                   Tracking
+                   {process.env.REACT_APP_TRACKING}
                   </span>
                 </NavLink>
               </li>
@@ -208,7 +208,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
-                    Resources
+                    {process.env.REACT_APP_RESOURCES}
                   </span>
                 </NavLink>
               </li>

src/components/Reminders/ReminderTable.jsx

@@ -1,30 +1,43 @@
 import React, { useEffect, useState } from "react";
+import { Link } from "react-router-dom";
 import dataImage1 from "../../assets/images/data-table-user-1.png";
 import usersService from "../../services/UsersService";
 import SelectBox from "../Helpers/SelectBox";
 
 export default function ReminderTable({ className }) {
   const [userReminders, setUserReminders] = useState([]);
+  const [selectedCategory, setCategory] = useState(filterCategories[0])
 
-  const api = new usersService();
   useEffect(() => {
     getUserReminders();
   }, []);
-
+  const api = new usersService();
   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 handleSelectCategory = (value) => {
-  const [selectedCategory, setCategory] = useState(filterCategories[0]);
+    let newValue = ""
+    if(value == 'All category'){
+      newValue = "All category"
+    }else if(value == 'Exercise/GYM') {
+      newValue = "EXEM"
+    }else if(value == 'Appointment') {
+      newValue = "APPT"
+    }else{
+      newValue = "MEDC"
+    }
+    setCategory(newValue);
+  }
+  // const filterCategories = ["All Categories", "Doctors Visit", "Medications"];
+      const filterCategories = ["All category", "Exercise/GYM", "Appointment", "Medication"];
+
   return (
     <div
       className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
@@ -38,16 +51,29 @@ export default function ReminderTable({ className }) {
           </h1>
         </div>
         <SelectBox
-          action={setCategory}
+          action={handleSelectCategory}
           datas={filterCategories}
           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 ?
+        <div  className="lg:flex justify-center">
+          <div style={{ transform: 'translateY(150px)' }}>
+            <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>
@@ -55,271 +81,126 @@ export default function ReminderTable({ className }) {
               <td className="py-4 text-right">.</td>
             </tr>
           
-            {selectedCategory === "All Categories" ? (
+                {
+                  userReminders.length > 0 && (
+                    selectedCategory == "All category" ? (
+                      userReminders.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()}</span>
-               {userReminders.map((reminders, index) => ( 
+                          </span>
-
+                        </div>
-                <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">
+                    </td>
-                        <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                    <td className="text-center py-4 px-2">
-                        {reminders.description}
+                      <div className="flex space-x-1 items-center justify-center">
-                        </h1>
-                        <span className="text-sm text-thin-light-gray">
              
-                          Added <span className="text-purple">{new Date(reminders.added).toLocaleString()}</span>
+                        <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                        {new Date(reminder.start_date).toLocaleString()}
                         </span>
                       </div>
-                    </div>
+                    </td>
-                  </td>
+                    <td className="text-center py-4 px-2">
-                  <td className="text-center py-4 px-2">
+                      <div className="flex space-x-1 items-center justify-center">
-                    <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()}
-                      <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>
+                    <td className="text-right py-4 px-2">
-                  <td className="text-center py-4 px-2">
+                      <span className="text-base text-thin-light-gray whitespace-nowrap">
-                    <div className="flex space-x-1 items-center justify-center">
+                       {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>
+                    </td>
+                      </tr>
+                      ))
+                    )
+                    :
+                    userReminders.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">
                           
-                      <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                            Added <span className="text-purple">{new Date(reminder.added).toLocaleString()}</span>
-                        12-01-25 : 6:30 PM
+                          </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-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">
+                    </td>
-                        <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                    <td className="text-center py-4 px-2">
-                          Hospital Testing Appointament
+                      <div className="flex space-x-1 items-center justify-center">
-                        </h1>
+             
-                        <span className="text-sm text-thin-light-gray">
+                        <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                          Added <span className="text-purple">10-10-2025</span>
+                        {new Date(reminder.start_date).toLocaleString()}
                         </span>
                       </div>
-                    </div>
+                    </td>
-                  </td>
+                    <td className="text-center py-4 px-2">
-                  <td className="text-center py-4 px-2">
+                      <div className="flex space-x-1 items-center justify-center">
-                    <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()}
-                      <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>
+                    <td className="text-right py-4 px-2">
-                  <td className="text-center py-4 px-2">
+                      <span className="text-base text-thin-light-gray whitespace-nowrap">
-                    <div className="flex space-x-1 items-center justify-center">
+                       {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>
+                    </td>
+                          </tr>
+                        )
+                      }
+                    })
+                  )
+                }
 
-                      <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/index.css

@@ -670,3 +670,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,6 +1,6 @@
 import React, {useEffect} from "react";
 import { Navigate, Outlet, useNavigate } from "react-router-dom";
-import { toast } from "react-toastify";
+// import { toast } from "react-toastify";
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
   const isLogin = localStorage.getItem("email");
@@ -19,9 +19,6 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   useEffect(()=>{
     setTimeout(()=>{
       expireSession()
-      toast.success("Opps, session has expired", {
-        icon: `🙂`,
-      });
     }, 300000) //expires user login session after 5 minutes
   },[])
 

src/services/UsersService.js

@@ -6,17 +6,17 @@ 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);
+        var reqData = {
+            member_id: localStorage.getItem("member_id")
+        };
+        return this.getAuxEnd("/reminders", reqData);
     }
+
     //----------------------------------------  -----
     //----------------------------------------  -----
     // Unified call below
@@ -33,11 +33,9 @@ class usersService {
             }
         };
         const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
-        return Axios.get(endPoint,axiosConfig)
+        return Axios.get(endPoint,axiosConfig,reqData)
             .then((response) => {
-                // console.log(response);
+                 console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
-                // res = response;
-                // console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
                 return response;
             })
             .catch((error) => {
@@ -54,24 +52,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",