Merge branch 'reminder_list_border' of MyFit/users-myfit into master
This commit is contained in:
Gogs
@@ -82,127 +82,136 @@ export default function ReminderTable({ className }) {
|
|||||||
<div className="relative w-full overflow-x-auto sm:rounded-lg">
|
<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">
|
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29] default-border-bottom ">
|
<>
|
||||||
<td className="py-4">Item</td>
|
<tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29] default-border-bottom">
|
||||||
<td className="py-4 text-center">Start</td>
|
<td className="py-4">Item</td>
|
||||||
<td className="py-4 text-center">End</td>
|
<td className="py-4 text-center">Start</td>
|
||||||
<td className="py-4 text-center">Reminder</td>
|
<td className="py-4 text-center">End</td>
|
||||||
<td className="py-4 text-right">.</td>
|
<td className="py-4 text-center">Reminder</td>
|
||||||
</tr>
|
<td className="py-4 text-right">.</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="spacer"></tr>
|
||||||
|
</>
|
||||||
|
|
||||||
{
|
{
|
||||||
userReminders[0].reminders.length > 0 && (
|
userReminders[0].reminders.length > 0 && (
|
||||||
selectedCategory == "All category" ? (
|
selectedCategory == "All category" ? (
|
||||||
userReminders[0].reminders.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">
|
<tr key={index} className="bg-white dark:bg-dark-white border border-red-500 dark:border-[#5356fb29] hover:bg-gray-50">
|
||||||
<div className="flex space-x-2 items-center">
|
<td className=" py-4">
|
||||||
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
|
<div className="flex space-x-2 items-center">
|
||||||
<img
|
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
|
||||||
src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
|
<img
|
||||||
alt="data"
|
src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
|
||||||
className="w-full h-full"
|
alt="data"
|
||||||
/>
|
className="w-full h-full"
|
||||||
</div>
|
/>
|
||||||
<div className="flex flex-col">
|
</div>
|
||||||
<h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
|
<div className="flex flex-col">
|
||||||
{reminder.description.substring(0, 30)+ ' ...'}
|
<h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
|
||||||
</h1>
|
{reminder.description.substring(0, 30)+ ' ...'}
|
||||||
<span className="text-sm text-thin-light-gray">
|
</h1>
|
||||||
|
<span className="text-sm text-thin-light-gray">
|
||||||
Added <span className="text-purple">
|
|
||||||
{/* {new Date(reminder.added).toLocaleString().replace(/-/g, '/')} */}
|
Added <span className="text-purple">
|
||||||
{reminder.added.split(' ')[0]}
|
{/* {new Date(reminder.added).toLocaleString().replace(/-/g, '/')} */}
|
||||||
|
{reminder.added.split(' ')[0]}
|
||||||
|
</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().replace(/-/g, '/')} */}
|
||||||
|
{reminder.start_date.split(' ')[0]}
|
||||||
|
</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().replace(/-/g, '/')} */}
|
||||||
|
{reminder.end_date.split(' ')[0]}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td className="text-right py-4 px-2">
|
||||||
|
<span className="text-base text-thin-light-gray whitespace-nowrap">
|
||||||
|
{reminder.reminder}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</td>
|
||||||
</div>
|
<td className="text-right py-4 px-2">
|
||||||
</div>
|
<Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
|
||||||
</td>
|
</td>
|
||||||
<td className="text-center py-4 px-2">
|
</tr>
|
||||||
<div className="flex space-x-1 items-center justify-center">
|
<tr class="spacer"></tr>
|
||||||
|
</>
|
||||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
|
|
||||||
{/* {new Date(reminder.start_date).toLocaleString().replace(/-/g, '/')} */}
|
|
||||||
{reminder.start_date.split(' ')[0]}
|
|
||||||
</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().replace(/-/g, '/')} */}
|
|
||||||
{reminder.end_date.split(' ')[0]}
|
|
||||||
</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">
|
|
||||||
<Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))
|
))
|
||||||
)
|
)
|
||||||
:
|
:
|
||||||
userReminders[0].reminders.map((reminder, index) => {
|
userReminders[0].reminders.map((reminder, index) => {
|
||||||
if(reminder.category == selectedCategory){
|
if(reminder.category == selectedCategory){
|
||||||
return (
|
return (
|
||||||
<tr key={index} className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
<>
|
||||||
<td className=" py-4">
|
<tr key={index} className="bg-white dark:bg-dark-white border border-red-500 dark:border-[#5356fb29] hover:bg-gray-50">
|
||||||
<div className="flex space-x-2 items-center">
|
<td className=" py-4">
|
||||||
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
|
<div className="flex space-x-2 items-center">
|
||||||
<img
|
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
|
||||||
src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
|
<img
|
||||||
alt="data"
|
src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
|
||||||
className="w-full h-full"
|
alt="data"
|
||||||
/>
|
className="w-full h-full"
|
||||||
</div>
|
/>
|
||||||
<div className="flex flex-col">
|
</div>
|
||||||
<h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
|
<div className="flex flex-col">
|
||||||
{reminder.description.substring(0, 30)+ ' ...'}
|
<h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
|
||||||
</h1>
|
{reminder.description.substring(0, 30)+ ' ...'}
|
||||||
<span className="text-sm text-thin-light-gray">
|
</h1>
|
||||||
|
<span className="text-sm text-thin-light-gray">
|
||||||
Added <span className="text-purple">
|
|
||||||
{new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
|
Added <span className="text-purple">
|
||||||
|
{new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
|
||||||
|
</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().replace(/-/g, '/')}
|
||||||
|
</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().replace(/-/g, '/')}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td className="text-right py-4 px-2">
|
||||||
|
<span className="text-base text-thin-light-gray whitespace-nowrap">
|
||||||
|
{reminder.reminder}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</td>
|
||||||
</div>
|
<td className="text-right py-4 px-2">
|
||||||
</div>
|
{/* <button
|
||||||
</td>
|
type="button"
|
||||||
<td className="text-center py-4 px-2">
|
className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
|
||||||
<div className="flex space-x-1 items-center justify-center">
|
>
|
||||||
|
Edit
|
||||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
|
</button> */}
|
||||||
{new Date(reminder.start_date).toLocaleString().replace(/-/g, '/')}
|
<Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
|
||||||
</span>
|
</td>
|
||||||
</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().replace(/-/g, '/')}
|
|
||||||
</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> */}
|
|
||||||
<Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
|
|
||||||
</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr class="spacer"></tr>
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
+7
-1
@@ -365,9 +365,15 @@ input[type="number"] {
|
|||||||
.trending-products .slick-list {
|
.trending-products .slick-list {
|
||||||
margin: 0 -16px;
|
margin: 0 -16px;
|
||||||
}
|
}
|
||||||
.update-table table tr:last-child {
|
|
||||||
|
/* .update-table table tr:last-child {
|
||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
|
} */
|
||||||
|
|
||||||
|
.update-table table tr.spacer {
|
||||||
|
height: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: =================================HomePage end================================ */
|
/* TODO: =================================HomePage end================================ */
|
||||||
/* TODO: =================================my wallet end================================ */
|
/* TODO: =================================my wallet end================================ */
|
||||||
.circle-count {
|
.circle-count {
|
||||||
|
|||||||
Reference in New Issue
Block a user