diff --git a/src/components/Helpers/SelectBox/index.jsx b/src/components/Helpers/SelectBox/index.jsx index c2fa678..23178a8 100755 --- a/src/components/Helpers/SelectBox/index.jsx +++ b/src/components/Helpers/SelectBox/index.jsx @@ -2,15 +2,15 @@ import React, { useState } from "react"; import useToggle from "../../../hooks/useToggle"; function SelectBox({ datas = [], className, action, contentBodyClasses }) { - const [item, setItem] = useState(datas[0]); + const [item, setItem] = useState('All category'); // custom hook const [toggle, setToggle] = useToggle(false); - const handler = (e, value) => { + const handler = (e, code, category) => { e.preventDefault(); if (action) { - action(value); + action(code); } - setItem(value); + setItem(category); setToggle.set(false); }; return ( @@ -54,13 +54,13 @@ function SelectBox({ datas = [], className, action, contentBodyClasses }) { } ${contentBodyClasses || ""}`} > diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx index 557fdbf..3ba59ba 100755 --- a/src/components/Partials/Sidebar.jsx +++ b/src/components/Partials/Sidebar.jsx @@ -18,7 +18,6 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) { try { const res = await api.getUserReminders(); setUserReminders(res.data.reminders); - console.log("res", res); } catch (error) { console.log("Error from User Reminders", error); } diff --git a/src/components/Reminders/ReminderTable.jsx b/src/components/Reminders/ReminderTable.jsx index 5c23cbe..1d6b40f 100755 --- a/src/components/Reminders/ReminderTable.jsx +++ b/src/components/Reminders/ReminderTable.jsx @@ -15,10 +15,15 @@ export default function ReminderTable({ className }) { const getUserReminders = async () => { try { const res = await api.getUserReminders(); - - setUserReminders(res.data.reminders); + if(res.status == 200){ + setUserReminders([ + {reminders: res.data.reminders}, + {category: [{category: 'All category', code: 'All category'}, ...res.data.reminder_category]} + ]); + setIsLoading(false) + return + } setIsLoading(false) - }catch(error) { setIsLoading(false) } @@ -28,9 +33,7 @@ export default function ReminderTable({ className }) { getUserReminders(); }, []); - // const filterCategories = ["All Categories", "Doctors Visit", "Medications"]; - const filterCategories = ["All category", "Exercise/GYM", "Appointments", "Medication"]; // use this - const [selectedCategory, setCategory] = useState(filterCategories[0]) + const [selectedCategory, setCategory] = useState('All category') return (
0 && userReminders[1].category} className="Update-table-dropdown" contentBodyClasses="w-auto min-w-max" /> @@ -58,11 +61,11 @@ export default function ReminderTable({ className }) { { isLoading ?
- Loading... + Loading...
: { - userReminders.length > 0 && ( + userReminders[0].reminders.length > 0 && ( selectedCategory == "All category" ? ( - userReminders.map((reminder, index) => ( + userReminders[0].reminders.map((reminder, index) => (
@@ -102,7 +105,7 @@ export default function ReminderTable({ className }) {

- {reminder.description} + {reminder.description.substring(0, 30)+ ' ...'}

@@ -143,7 +146,7 @@ export default function ReminderTable({ className }) { )) ) : - userReminders.map((reminder, index) => { + userReminders[0].reminders.map((reminder, index) => { if(reminder.category == selectedCategory){ return ( @@ -158,7 +161,7 @@ export default function ReminderTable({ className }) {

- {reminder.description} + {reminder.description.substring(0, 30)+ ' ...'}