shows active resources link when env variable is set to true/1

.env

@@ -15,3 +15,8 @@ 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

.env.development

@@ -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

.env.production

@@ -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

src/components/Partials/Sidebar.jsx

@@ -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

src/components/Reminders/ReminderTable.jsx

@@ -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>
+              <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 && (
                     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">
+                        {/* <tr key={index} className="bg-white dark:bg-dark-white border border-light-purple dark:border-[#5356fb29]  hover:bg-gray-50"> */}
-                      <div className="flex space-x-2 items-center">
+                        <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">
-                        <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                            <td className="py-4 px-2 rounded-l-full">
-                          <img
+                              <div className="flex space-x-2 items-center">
-                            src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
+                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                            alt="data"
+                                  <img
-                            className="w-full h-full"
+                                    src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
-                          />
+                                    alt="data"
-                        </div>
+                                    className="w-full h-full"
-                        <div className="flex flex-col">
+                                  />
-                          <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                                </div>
-                          {reminder.description.substring(0, 30)+ ' ...'}
+                                <div className="flex flex-col">
-                          </h1>
+                                  <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                          <span className="text-sm text-thin-light-gray">
+                                  {reminder.description.substring(0, 30)+ ' ...'}
+                                  </h1>
+                                  <span className="text-sm text-thin-light-gray dark:text-white"> 
                                   
-                            Added <span className="text-purple">
+                                    Added <span className="text-purple dark:text-white">
-                              {/* {new Date(reminder.added).toLocaleString().replace(/-/g, '/')} */}
+                                      {/* {new Date(reminder.added).toLocaleString().replace(/-/g, '/')} */}
-                              {reminder.added.split(' ')[0]}
+                                      {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>
+                            </td>
-                        </div>
+                            <td className="text-right py-4 px-2 rounded-r-full">
-                      </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) => {
                       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">
+                          {/* <tr key={index} className="bg-white dark:bg-dark-white border border-light-purple dark:border-[#5356fb29]  hover:bg-gray-50"> */}
-                      <div className="flex space-x-2 items-center">
+                          <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">
-                        <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                            <td className="py-4 px-2 rounded-l-full">
-                        <img
+                              <div className="flex space-x-2 items-center">
-                            src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
+                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                            alt="data"
+                                <img
-                            className="w-full h-full"
+                                    src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
-                          />
+                                    alt="data"
-                        </div>
+                                    className="w-full h-full"
-                        <div className="flex flex-col">
+                                  />
-                          <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                                </div>
-                          {reminder.description.substring(0, 30)+ ' ...'}
+                                <div className="flex flex-col">
-                          </h1>
+                                  <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                          <span className="text-sm text-thin-light-gray">
+                                  {reminder.description.substring(0, 30)+ ' ...'}
+                                  </h1>
+                                  <span className="text-sm text-thin-light-gray dark:text-white">
                                   
-                            Added <span className="text-purple">
+                                    Added <span className="text-purple dark:text-white">
-                            {new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
+                                    {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>
+                            </td>
-                        </div>
+                            <td className="text-right py-4 px-2 rounded-r-full">
-                      </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 class="spacer"></tr> */}
+                          </>
                         )
                       }
                     })

src/index.css

@@ -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 {

src/services/UsersService.js

@@ -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")