Merge branch 'no_reminder_item_victor' of MyFit/users-myfit into master

src/components/Calendar/CalendarTable.jsx

@@ -34,7 +34,7 @@ export default function CalendarTable({ className }) {
 
 
       <div>
-      <Calendar onChange={onChange} value={value} />
+      <Calendar onChange={onChange} value={value} calendarType="US" />
     </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/services/UsersService.js

@@ -6,18 +6,24 @@ 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);
     }
+
+    getUserLoginHistory(){
+        var reqData = {
+            member_id: localStorage.getItem("member_id")
+        };
+        return this.getAuxEnd("/loginhx", reqData);
+      }
+
     //----------------------------------------  -----
     //----------------------------------------  -----
     // Unified call below
@@ -34,11 +40,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) => {
@@ -58,20 +62,15 @@ class usersService {
 
     postAuxEnd(uri, reqData) {
         const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
-        const token = '..your token..'
+        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 ${token}`,
+                '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)