commented env

.env

@@ -17,4 +17,5 @@ REACT_APP_TRACKING="Tracking"
 REACT_APP_RESOURCES="Resources"
 REACT_APP_HISTORY="History"
 
-REACT_APP_TRACKING_SHOW=1
+REACT_APP_TRACKING_SHOW=1
+# REACT_APP_HISTORY_SHOW=1

.env.development

@@ -18,3 +18,4 @@ REACT_APP_RESOURCES="Resources"
 REACT_APP_HISTORY="History"
 
 REACT_APP_TRACKING_SHOW=1
+# REACT_APP_HISTORY_SHOW=1

.env.production

@@ -18,3 +18,4 @@ REACT_APP_RESOURCES="Resources"
 REACT_APP_HISTORY="History"
 
 REACT_APP_TRACKING_SHOW=0
+# REACT_APP_HISTORY_SHOW=0                                

src/components/Partials/MobileSideBar.jsx

@@ -92,7 +92,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <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   text-dark-gray dark:text-white">
-                    <Icons name="active-bids" />
+                    <Icons name="reminder" />
                   </span>
                   <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
                     Reminders
@@ -102,26 +102,28 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              <li className="item group">
+              {process.env.REACT_APP_TRACKING_SHOW ? 
+              (<li className="item group">
                 <NavLink
                   to="/tracking"
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <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   text-dark-gray dark:text-white">
-                    <Icons name="market" />
+                    <Icons name="tracking" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
                     {process.env.REACT_APP_TRACKING}
                   </span>
                 </NavLink>
-              </li>
+              </li>)
+              : ''}
               <li className="item group">
                 <NavLink
                   to="/calendar"
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <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   text-dark-gray dark:text-white">
-                    <Icons name="wallet-two" />
+                    <Icons name="calendar" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
                     Calendar
@@ -134,26 +136,28 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <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   text-dark-gray dark:text-white">
-                    <Icons name="star" />
+                    <Icons name="resources" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
                     {process.env.REACT_APP_RESOURCES}
                   </span>
                 </NavLink>
               </li>
-              <li className="item group">
+              {process.env.REACT_APP_HISTORY_SHOW ?
+              (<li className="item group">
                 <NavLink
                   to="/history"
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <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   text-dark-gray dark:text-white">
-                    <Icons name="history" />
+                    <Icons name="History" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    History
+                    {process.env.REACT_APP_HISTORY}
                   </span>
                 </NavLink>
-              </li>
+                </li>)
+                 : ''}
             </ul>
           </div>
         </div>
@@ -169,7 +173,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <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   text-dark-gray dark:text-white">
-                    <Icons name="people-two" />
+                    <Icons name="profile" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
                     My Profile
@@ -182,7 +186,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <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   text-dark-gray dark:text-white">
-                    <Icons name="setting" />
+                    <Icons name="settings" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
                     Settings

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 ?
+              (<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"
@@ -211,8 +213,8 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-          
-              <li className="item group">
+              {process.env.REACT_APP_HISTORY_SHOW ?
+              (<li className="item group">
                 <NavLink
                   to="/history"
                   className={`nav-item flex items-center ${
@@ -228,10 +230,11 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
-                    History
+                    {process.env.REACT_APP_HISTORY}
                   </span>
                 </NavLink>
-              </li>
+              </li>)
+               : ''}
             </ul>
           </div>
         </div>

src/components/Settings/Tabs/ChangePasswordTab.jsx

@@ -3,8 +3,6 @@
 import React, { useState } from "react";
 import Icons from "../../Helpers/Icons";
 import PasswordSvg from "../PasswordSvg";
-import { toast } from "react-toastify";
-import usersService from "../../../services/UsersService";
 
 export default function ChangePasswordTab() {
   const [oldPass, setOldPass] = useState("hide-password");
@@ -40,95 +38,6 @@ export default function ChangePasswordTab() {
       }
     }
   };
-
-  // Reset Password
-  const reset_profilePass = new usersService()
-  const [loading, setLoading] = useState(false) 
-  const [validation, setValidation] = useState("")
-  // state for password values
-  const [passwordDetails, setPasswordDetails] = useState({
-    prev_pass: '',
-    new_pass: '',
-    confirm_pass: ''
-  })
-  // tracks password changes
-  const handlePasswordChange = ({target:{name, value}}) => {
-    setPasswordDetails(prev => ({...prev, [name]:value}))
-  }
-
-  const handleResetPassword = async(e) => {
-    setValidation("")
-    setLoading(true)
-
-    let resetPassword = {...passwordDetails}
-    let {prev_pass, new_pass, confirm_pass} = resetPassword
-
-    // Check empty fields
-    if(!prev_pass || !new_pass || !confirm_pass) {
-      setLoading(false)
-      setValidation("Please fill the empty fields")
-      return
-    }
-
-    // Checking to see the password has 
-    if(!/^[A-Za-z]\w{6,14}$/.test(new_pass)) {
-      setLoading(false)
-      setValidation("it must be a more 7 alphanumeric characters")
-      return
-    }
-
-    // matching new passwords with confirm_password
-    if(new_pass != confirm_pass){
-      setLoading(false)
-      setValidation("new password does not match")
-      return
-    }
-
-    // matching new passwords with old passwords
-    if(prev_pass === new_pass){
-      setLoading(false)
-      setValidation("you can't use old passwords")
-      return
-    }
-
-    // assigning new values to resetPassword
-    resetPassword.member_id = localStorage.getItem("member_id")
-    resetPassword.session_token = localStorage.getItem("session_token")
-    resetPassword.member_uuid = localStorage.getItem("member_uuid")
-
-    // removed confirm password from the payload
-    delete resetPassword.confirm_pass
-
-    try {
-      const res = await reset_profilePass.resetProfilePassword(resetPassword)
-      console.log(res)
-      
-      if(res.status != 200){
-        setLoading(false)
-        setValidation("An error occurred")
-        return
-      }
-      
-      if(res.status == 200){
-        // if status is okay but can't success not granted
-        if(res.data.status < 0 ) {
-          setLoading(false)
-          setValidation("sorry, error updating password")
-        } else {
-          setLoading(false)
-          // setValidation("password updated successfully")
-          toast.success("password updated successfully")
-  
-          // setPasswordDetails(prev => ({...prev, e.target.name: ''}))
-        }
-      }
-    } catch (error) {
-      setLoading(false)
-      setValidation("something went wrong, try again later")
-    }
-
-  }
-
   return (
     <div className="changePasswordTab w-full">
       <div className="w-full flex xl:flex-row flex-col-reverse space-x-5 xl:items-center">
@@ -149,9 +58,6 @@ export default function ChangePasswordTab() {
                 className="input-field placeholder:text-base text-bese px-12 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
                 type="password"
                 id="old_password"
-                name='prev_pass'
-                value={passwordDetails.prev_pass}
-                onChange={handlePasswordChange}
               />
               <div
                 className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
@@ -177,9 +83,6 @@ export default function ChangePasswordTab() {
                 className="input-field placeholder:text-base text-bese px-12 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
                 type="password"
                 id="new_password"
-                name="new_pass"
-                value={passwordDetails.new_pass}
-                onChange={handlePasswordChange}
               />
               <div
                 className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
@@ -205,9 +108,6 @@ export default function ChangePasswordTab() {
                 className="input-field placeholder:text-base text-bese px-12 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
                 type="password"
                 id="confirm_password"
-                name="confirm_pass"
-                value={passwordDetails.confirm_pass}
-                onChange={handlePasswordChange}
               />
               <div
                 className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
@@ -217,7 +117,6 @@ export default function ChangePasswordTab() {
               </div>
             </div>
           </div>
-          {validation && <p className={`my-5 text-center font-light italic text-sm subpixel-antialiased tracking-wide ${validation == 'Password updated' ? 'text-green-600' : 'text-red-500'} `}>{validation}</p>}
           <div className="flex justify-center space-x-4 items-center">
             <button
               type="button"
@@ -228,10 +127,9 @@ export default function ChangePasswordTab() {
             <button
               type="button"
               className="btn-gradient tracking-wide rounded-full w-[173px] h-[46px] flex justify-center items-center"
-              onClick={handleResetPassword}
             >
               <span className="font-thin text-18 tracking-wide antialiased text-white">
-              {loading ? <div className="signup btn-loader"></div> : <span>Change Password</span>}
+                Change Password
               </span>
             </button>
           </div>

src/services/UsersService.js

@@ -10,10 +10,6 @@ class usersService {
         return this.postAuxEnd('/resetpass', reqData);
     }
 
-    resetProfilePassword(reqData){
-        return this.postAuxEnd('/resetpass-profile', reqData);
-    }
-
     logInUser(reqData) {
         localStorage.setItem("session_token", ``);
         return this.postAuxEnd("/login", reqData);