Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 victorAnumudu
|
59ee61445b | ||
 jenkins
|
c508fd41c7 | ||
|
jenkins
|
5f3a193ec0 | ||
 tokslaw
|
e36a33450d | ||
|
victorAnumudu
|
33f01e296a | ||
|
jenkins
|
35670f3138 | ||
|
jenkins
|
3c4387473a | ||
|
victorAnumudu
|
9df067ab6d | ||
|
tokslaw
|
c75cf8ad64 | ||
|
tokslaw
|
5f047e6636 | ||
|
victorAnumudu
|
eb0c5b2a69 | ||
|
jenkins
|
6bc79d17b9 |
@@ -14,4 +14,9 @@ REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituse
|
||||
REACT_APP_SESSION_EXPIRE_MINUTES=15
|
||||
|
||||
REACT_APP_TRACKING="Tracking"
|
||||
REACT_APP_RESOURCES="Resources"
|
||||
REACT_APP_RESOURCES="Resources"
|
||||
REACT_APP_HISTORY="History"
|
||||
|
||||
REACT_APP_TRACKING_SHOW=1
|
||||
|
||||
REACT_APP_RESOURCES_SHOW=1
|
||||
@@ -0,0 +1,22 @@
|
||||
SKIP_PREFLIGHT_CHECK=true
|
||||
|
||||
REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
|
||||
REACT_APP_TWITTER="https://twitter.com/fluxtra"
|
||||
|
||||
REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
|
||||
#REACT_APP_APPSITE="http://localhost:7012"
|
||||
|
||||
|
||||
REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
|
||||
REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
|
||||
# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
|
||||
|
||||
REACT_APP_SESSION_EXPIRE_MINUTES=15
|
||||
|
||||
REACT_APP_TRACKING="Tracking"
|
||||
REACT_APP_RESOURCES="Resources"
|
||||
REACT_APP_HISTORY="History"
|
||||
|
||||
REACT_APP_TRACKING_SHOW=1
|
||||
|
||||
REACT_APP_RESOURCES_SHOW=1
|
||||
@@ -0,0 +1,22 @@
|
||||
SKIP_PREFLIGHT_CHECK=true
|
||||
|
||||
REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
|
||||
REACT_APP_TWITTER="https://twitter.com/fluxtra"
|
||||
|
||||
REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
|
||||
#REACT_APP_APPSITE="http://localhost:7012"
|
||||
|
||||
|
||||
REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
|
||||
REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
|
||||
# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
|
||||
|
||||
REACT_APP_SESSION_EXPIRE_MINUTES=15
|
||||
|
||||
REACT_APP_TRACKING="Tracking"
|
||||
REACT_APP_RESOURCES="Resources"
|
||||
REACT_APP_HISTORY="History"
|
||||
|
||||
REACT_APP_TRACKING_SHOW=0
|
||||
|
||||
REACT_APP_RESOURCES_SHOW=0
|
||||
@@ -191,11 +191,14 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
|
||||
</span>
|
||||
</NavLink>
|
||||
</li>
|
||||
|
||||
{process.env.REACT_APP_RESOURCES_SHOW == 1 ?
|
||||
<li className="item group">
|
||||
<NavLink
|
||||
to="/resources"
|
||||
className={`nav-item flex items-center ${
|
||||
((navData) => (navData.isActive ? "active" : ""),
|
||||
(
|
||||
(navData) => (navData.isActive ? "active" : ""),
|
||||
sidebar ? "justify-start space-x-3.5" : "justify-center")
|
||||
}`}
|
||||
>
|
||||
@@ -211,6 +214,9 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
|
||||
</span>
|
||||
</NavLink>
|
||||
</li>
|
||||
:
|
||||
null
|
||||
}
|
||||
|
||||
<li className="item group">
|
||||
<NavLink
|
||||
|
||||
@@ -82,127 +82,138 @@ 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-light-purple dark:border-[#5356fb29] hover:bg-gray-50"> */}
|
||||
<tr key={index} className="even:bg-slate-100 odd:bg-gray-50 dark:bg-dark-white dark:odd:bg-black hover:bg-light-purple transition-all duration-500">
|
||||
<td className="py-4 px-2 rounded-l-full">
|
||||
<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 dark:text-white">
|
||||
|
||||
Added <span className="text-purple dark:text-white">
|
||||
{/* {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 rounded-r-full">
|
||||
<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-light-purple dark:border-[#5356fb29] hover:bg-gray-50"> */}
|
||||
<tr key={index} className="even:bg-slate-100 odd:bg-gray-50 dark:bg-dark-white dark:odd:bg-black hover:bg-light-purple transition-all duration-500">
|
||||
<td className="py-4 px-2 rounded-l-full">
|
||||
<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 dark:text-white">
|
||||
|
||||
Added <span className="text-purple dark:text-white">
|
||||
{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 rounded-r-full">
|
||||
{/* <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
@@ -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 {
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user