implented add reminder page

.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"

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 { 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("session_token", `${loginResult.data.session_token}`);
-        localStorage.setItem("status", `${JSON.stringify(loginResult.data.status)}`);
+        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", loginResult.data.status);
         localStorage.setItem("profile", `${JSON.stringify(loginResult.data.profile)}`);
         setLoginLoading(true);
          // userApi.getUserReminders(); //testing

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/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">

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 });
   };

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

@@ -1,10 +1,104 @@
-import React from 'react'
+import React, {useState, useEffect} from 'react'
 import Layout from '../Partials/Layout'
-import { Link } from 'react-router-dom'
+import { Link, useNavigate } 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();
+
+  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: '',
+    note: '',
+    category: '',
+    mode: '',
+    'start_date': startDate,
+    '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')
+    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 added successfully'})
+        setTimeout(()=>{
+          navigate('/reminders', {replace: true})
+        }, 2000)
+        return
+      }
+      setSuccess(false)
+      setMessage({status: false, message: 'Opps cannot add reminder, try again'})
+    } catch (error) {
+      setSuccess(false)
+      setMessage({status: false, message: 'An error occurred'})
+    }
+  }
+  
+  useEffect(() => {
+    getUserMode();
+    getUserCategory()
+  }, []);
   return (
     <>
       <Layout>
@@ -16,7 +110,6 @@ export default function AddEditReminder({ className }) {
         className || ""
       }`}
     >
-           
 		  <div className="fields w-full">
                {/*description */}
                <div className="field w-full mb-6">
@@ -25,50 +118,80 @@ export default function AddEditReminder({ className }) {
                 type="text"
                 name="description"
                 placeholder="Describe the Reminder"
-                value={''}
+                value={reminder.description}
+                inputHandler={onReminderInputChange}
+                maxLength={10}
               />
             </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 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.category}>{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 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.mode}>{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={startDate} 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={endDate} calendarType="US" />
               </div>
             </div>
 
@@ -78,16 +201,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 +226,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 class="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}
+              >
+                Upadate
+              </button>
+            }
           </div>
         </div>
         </div>

src/components/Reminders/ReminderTable.jsx

@@ -2,29 +2,35 @@ 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();
+    
+      setUserReminders(res.data.reminders);
+      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 filterCategories = ["All Categories", "Doctors Visit", "Medications"];
+  const filterCategories = ["All category", "Exercise/GYM", "Appointments", "Medication"]; // use this
+  const [selectedCategory, setCategory] = useState(filterCategories[0])
   return (
     <div
       className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
@@ -44,282 +50,162 @@ export default function ReminderTable({ className }) {
           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" class="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 class="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.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}
+                          </h1>
+                          <span className="text-sm text-thin-light-gray">
+                          
+                            Added <span className="text-purple">{new Date(reminder.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(reminder.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(reminder.end_date).toLocaleString()}
+                        </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>
+                    </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}
+                          </h1>
+                          <span className="text-sm text-thin-light-gray">
+                          
+                            Added <span className="text-purple">{new Date(reminder.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(reminder.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(reminder.end_date).toLocaleString()}
+                        </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>
+                    </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/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/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,38 @@ 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);
+    }
+
     //----------------------------------------  -----
     //----------------------------------------  -----
     // Unified call below
@@ -33,11 +54,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);
-                // res = response;
-                // console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
+                 console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
                 return response;
             })
             .catch((error) => {
@@ -54,24 +73,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",