Reminder category dropdown #38

Merged
tokslaw merged 1 commits from reminder_category_dropdown_victor into master 2023-02-06 12:25:22 +00:00
3 changed files with 25 additions and 23 deletions
+8 -8
View File
@@ -2,15 +2,15 @@ import React, { useState } from "react";
import useToggle from "../../../hooks/useToggle";
function SelectBox({ datas = [], className, action, contentBodyClasses }) {
const [item, setItem] = useState(datas[0]);
const [item, setItem] = useState('All category');
// custom hook
const [toggle, setToggle] = useToggle(false);
const handler = (e, value) => {
const handler = (e, code, category) => {
e.preventDefault();
if (action) {
action(value);
action(code);
}
setItem(value);
setItem(category);
setToggle.set(false);
};
return (
@@ -54,13 +54,13 @@ function SelectBox({ datas = [], className, action, contentBodyClasses }) {
} ${contentBodyClasses || ""}`}
>
<ul className="flex flex-col space-y-3">
{datas.map((value) => (
{datas.map((value, index) => (
<li
key={value}
onClick={(e) => handler(e, value)}
key={index}
onClick={(e) => handler(e, value.code, value.category)}
className="text-thin-light-gray tracking-wide text-sm cursor-pointer"
>
{value}
{value.category}
</li>
))}
</ul>
-1
View File
@@ -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);
}
+17 -14
View File
@@ -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 (
<div
className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
@@ -45,7 +48,7 @@ export default function ReminderTable({ className }) {
</div>
<SelectBox
action={setCategory}
datas={filterCategories}
datas={userReminders.length > 0 && userReminders[1].category}
className="Update-table-dropdown"
contentBodyClasses="w-auto min-w-max"
/>
@@ -58,11 +61,11 @@ export default function ReminderTable({ className }) {
{
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">
<svg aria-hidden="true" className="w-32 h-32 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
</svg>
<span class="sr-only">Loading...</span>
<span className="sr-only">Loading...</span>
</div>
:
<Link
@@ -87,9 +90,9 @@ export default function ReminderTable({ className }) {
</tr>
{
userReminders.length > 0 && (
userReminders[0].reminders.length > 0 && (
selectedCategory == "All category" ? (
userReminders.map((reminder, index) => (
userReminders[0].reminders.map((reminder, index) => (
<tr key={index} className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
<td className=" py-4">
<div className="flex space-x-2 items-center">
@@ -102,7 +105,7 @@ export default function ReminderTable({ className }) {
</div>
<div className="flex flex-col">
<h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
{reminder.description}
{reminder.description.substring(0, 30)+ ' ...'}
</h1>
<span className="text-sm text-thin-light-gray">
@@ -143,7 +146,7 @@ export default function ReminderTable({ className }) {
))
)
:
userReminders.map((reminder, index) => {
userReminders[0].reminders.map((reminder, index) => {
if(reminder.category == selectedCategory){
return (
<tr key={index} className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
@@ -158,7 +161,7 @@ export default function ReminderTable({ className }) {
</div>
<div className="flex flex-col">
<h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
{reminder.description}
{reminder.description.substring(0, 30)+ ' ...'}
</h1>
<span className="text-sm text-thin-light-gray">