MyFit/users-myfit
2
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed activate edit reminder conflict

Browse Source
This commit was merged in pull request #45.
This commit is contained in:
victorAnumudu
2023-02-08 13:21:41 +01:00
parent 099ace7f73
commit 368a8f2b53
3 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Reminders/ReminderTable.jsx
+10 -20
View File
@@ -110,8 +110,7 @@ export default function ReminderTable({ className }) {
<span className="text-sm text-thin-light-gray">
Added <span className="text-purple">
{/* {new Date(reminder.added).toLocaleString()} */}
{reminder.added.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
{new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
</span>
</span>
</div>
@@ -121,16 +120,14 @@ export default function ReminderTable({ className }) {
<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()} */}
{reminder.start_date.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
{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()} */}
{reminder.end_date.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
{new Date(reminder.end_date).toLocaleString().replace(/-/g, '/')}
</span>
</div>
</td>
@@ -140,12 +137,7 @@ export default function ReminderTable({ className }) {
</span>
</td>
<td className="text-right py-4 px-2">
<button
type="button"
className="btn-gradient lg:flex hidden w-[55px] h-[40px] rounded-full text-white justify-center items-center"
>
Edit
</button>
<Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full">Edit</Link>
</td>
</tr>
))
@@ -171,8 +163,7 @@ export default function ReminderTable({ className }) {
<span className="text-sm text-thin-light-gray">
Added <span className="text-purple">
{/* {new Date(reminder.added).toLocaleString()} */}
{reminder.added.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
{new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
</span>
</span>
</div>
@@ -182,16 +173,14 @@ export default function ReminderTable({ className }) {
<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()} */}
{reminder.start_date.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
{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()} */}
{reminder.end_date.split('.')[0].replace(/-/g, '/').replace(/ /g, ', ')}
{new Date(reminder.end_date).toLocaleString().replace(/-/g, '/')}
</span>
</div>
</td>
@@ -201,12 +190,13 @@ export default function ReminderTable({ className }) {
</span>
</td>
<td className="text-right py-4 px-2">
<button
{/* <button
type="button"
className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
>
Edit
</button>
</button> */}
<Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full">Edit</Link>
</td>
</tr>
)