Compare commits

...

2 Commits

Author SHA1 Message Date
victorAnumudu eb0c5b2a69 added border around table rows 2023-03-04 18:44:35 +01:00
jenkins 6bc79d17b9 Home Stats 2023-03-04 09:54:27 -05:00
3 changed files with 130 additions and 108 deletions
+116 -107
View File
@@ -82,127 +82,136 @@ export default function ReminderTable({ className }) {
<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-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>
<>
<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>
<tr class="spacer"></tr>
</>
{
userReminders[0].reminders.length > 0 && (
selectedCategory == "All category" ? (
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">
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
<img
src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
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.substring(0, 30)+ ' ...'}
</h1>
<span className="text-sm text-thin-light-gray">
Added <span className="text-purple">
{/* {new Date(reminder.added).toLocaleString().replace(/-/g, '/')} */}
{reminder.added.split(' ')[0]}
<>
<tr key={index} className="bg-white dark:bg-dark-white border border-red-500 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={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
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.substring(0, 30)+ ' ...'}
</h1>
<span className="text-sm text-thin-light-gray">
Added <span className="text-purple">
{/* {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>
</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>
</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>
</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>
<tr class="spacer"></tr>
</>
))
)
:
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">
<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={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
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.substring(0, 30)+ ' ...'}
</h1>
<span className="text-sm text-thin-light-gray">
Added <span className="text-purple">
{new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
<>
<tr key={index} className="bg-white dark:bg-dark-white border border-red-500 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={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
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.substring(0, 30)+ ' ...'}
</h1>
<span className="text-sm text-thin-light-gray">
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>
</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>
</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>
</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 class="spacer"></tr>
</>
)
}
})
+7 -1
View File
@@ -365,9 +365,15 @@ input[type="number"] {
.trending-products .slick-list {
margin: 0 -16px;
}
.update-table table tr:last-child {
/* .update-table table tr:last-child {
border-bottom: none;
} */
.update-table table tr.spacer {
height: 10px;
}
/* TODO: =================================HomePage end================================ */
/* TODO: =================================my wallet end================================ */
.circle-count {
+7
View File
@@ -32,6 +32,13 @@ class usersService {
return this.getAuxEnd("/reminders", reqData);
}
getUserHomeStats(){
var reqData = {
member_id: localStorage.getItem("member_id")
};
return this.getAuxEnd("/home-stats", reqData);
}
getUserLoginHistory(){
var reqData = {
member_id: localStorage.getItem("member_id")