Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit into capability-to-hide-tracking

.env

@@ -17,6 +17,4 @@ REACT_APP_TRACKING="Tracking"
 REACT_APP_RESOURCES="Resources"
 REACT_APP_HISTORY="History"
 
-REACT_APP_TRACKING_SHOW=1
+REACT_APP_TRACKING_SHOW=1
-
-REACT_APP_RESOURCES_SHOW=1

.env.development

@@ -18,5 +18,3 @@ REACT_APP_RESOURCES="Resources"
 REACT_APP_HISTORY="History"
 
 REACT_APP_TRACKING_SHOW=1
-
-REACT_APP_RESOURCES_SHOW=1

.env.production

@@ -18,5 +18,3 @@ REACT_APP_RESOURCES="Resources"
 REACT_APP_HISTORY="History"
 
 REACT_APP_TRACKING_SHOW=0
-
-REACT_APP_RESOURCES_SHOW=0

src/components/Partials/MobileSideBar.jsx

@@ -102,7 +102,8 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              <li className="item group">
+              {(process.env.REACT_APP_TRACKING_SHOW == true) ? 
+              (<li className="item group">
                 <NavLink
                   to="/tracking"
                   className="nav-item flex items-center justify-start space-x-3.5"
@@ -114,7 +115,8 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                     {process.env.REACT_APP_TRACKING}
                   </span>
                 </NavLink>
-              </li>
+              </li>)
+              : ''}
               <li className="item group">
                 <NavLink
                   to="/calendar"
@@ -128,8 +130,6 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-
-              {process.env.REACT_APP_RESOURCES_SHOW == true ?
               <li className="item group">
                 <NavLink
                   to="/resources"
@@ -143,9 +143,6 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              :
-              <></>
-              }
               <li className="item group">
                 <NavLink
                   to="/history"

src/components/Partials/Sidebar.jsx

@@ -151,7 +151,8 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              <li className="item group">
+              {(process.env.REACT_APP_TRACKING_SHOW == true) ? 
+              (<li className="item group">
                 <NavLink
                   to="/tracking"
                   className={`nav-item flex items-center  ${
@@ -170,7 +171,8 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                    {process.env.REACT_APP_TRACKING}
                   </span>
                 </NavLink>
-              </li>
+              </li>)
+              : ''}
               <li className="item group">
                 <NavLink
                   to="/calendar"
@@ -191,31 +193,26 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-
+              <li className="item group">
-               {process.env.REACT_APP_RESOURCES_SHOW == true ?
+                <NavLink
-                <li className="item group">
+                  to="/resources"
-                  <NavLink
+                  className={`nav-item flex items-center ${
-                    to="/resources"
+                    ((navData) => (navData.isActive ? "active" : ""),
-                    className={`nav-item flex items-center ${
+                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                      ((navData) => (navData.isActive ? "active" : ""),
+                  }`}
-                      sidebar ? "justify-start space-x-3.5" : "justify-center")
+                >
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
+                    <Icons name="resources" />
+                  </span>
+                  <span
+                    className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                      sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
-                    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple rounded-full">
+                    {process.env.REACT_APP_RESOURCES}
-                      <Icons name="resources" />
+                  </span>
-                    </span>
+                </NavLink>
-                    <span
+              </li>
-                      className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                        sidebar ? "active flex-1" : "w-0"
-                      }`}
-                    >
-                      {process.env.REACT_APP_RESOURCES}
-                    </span>
-                  </NavLink>
-                </li>
-               :
-               <></>
-               }
           
               <li className="item group">
                 <NavLink