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

src/components/Calendar/CalendarTable.jsx

@@ -1,16 +1,45 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import dataImage1 from "../../assets/images/data-table-user-1.png";
 import dataImage2 from "../../assets/images/data-table-user-2.png";
 import dataImage3 from "../../assets/images/data-table-user-3.png";
 import dataImage4 from "../../assets/images/data-table-user-4.png";
 import SelectBox from "../Helpers/SelectBox";
+
+import usersService from "../../services/UsersService"; // API SERVICE
+import localImgLoad from "../../lib/localImgLoad"; // img loader
+
+
 import Calendar from 'react-calendar';
 import 'react-calendar/dist/Calendar.css';
 
 export default function CalendarTable({ className }) {
+  const [isLoading, setIsLoading] = useState(true) // for determining when a page is awating request call
+
   const filterCategories = ["All Categories", "Explore", "Featured"];
   const [selectedCategory, setCategory] = useState(filterCategories[0]);
-  const [value, onChange] = useState(new Date());
+
+  const [value, onChange] = useState(new Date()); // value of calendar date and onchange handler for calendar
+  const [remDate, setRemDate] = useState([]) // for holding dates on reminders to display on calendar
+
+  const reminderApi = new usersService(); // instantiating the API SERVICE
+
+  const getUserReminders = async () => {
+    try {
+      const res = await reminderApi.getUserReminders();
+      if(res.status == 200 && res.data.status > 0){
+        setRemDate(res.data.reminders)
+        setIsLoading(false)
+        return
+      }
+      setIsLoading(false)
+    }catch(error) {
+      setIsLoading(false)
+    }
+  };
+  
+  useEffect(() => {
+    getUserReminders();
+  }, []);
 
   return (
     <div
@@ -34,11 +63,86 @@ export default function CalendarTable({ className }) {
 
 
       <div>
-      <Calendar onChange={onChange} value={value} calendarType="US" />
+
+        {
+          isLoading ?  
+            <div role="status" className="flex justify-center">
+              <svg aria-hidden="true" className="w-32 h-32 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                  <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+                  <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+              </svg>
+              <span className="sr-only">Loading...</span>
+            </div>
+          :
+          <Calendar 
+            onChange={onChange} 
+            value={value} 
+            calendarType="US" 
+           
+            tileContent={({ date, view }) => {
+              const reminder = []
+              remDate.map((x) => {
+                // console.log(new Date(date).toDateString() == new Date(x.start_date).toDateString())
+                if(date.toDateString() == new Date(x.start_date.split(' ')[0]).toDateString()){
+                  if(reminder.length < 1) {
+                    reminder.push([x])
+                  }else{
+                    for(let i=0; i<reminder.length; i++){
+                      if(reminder[i][0].start_date.split(' ')[0] == x.start_date.split(' ')[0]){
+                      reminder[i].push(x)
+                      break
+                      }else if(reminder[i][0].start_date != x.start_date && i==reminder.length-1){
+                        reminder.push([x])
+                        break
+                      }
+                    }
+                  }
+                }
+              });
+              return reminder ? reminder.map((rem, index) => {
+                if(rem){
+                  return <ReminderThumbnail key={index} reminders={rem} />
+                }
+              }) : "";
+            }}
+
+          />
+        }
+      
     </div>
 
 
 
     </div>
   );
+}
+
+const ReminderThumbnail = ({reminders}) => {
+  return (
+    <div className="w-full h-full overflow-y-auto overflow-x-hidden pb-1">
+      {reminders.map((reminder, index) => (
+        <div key={index} className="flex space-x-2 items-center bg-slate-300 hover:bg-white mb-1 p-1 transition-all duration-500">
+        <div className="w-[30px] h-[30px] 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 justify-start items-start">
+          <h1 className="font-bold text-[10px] text-dark-gray dark:text-white whitespace-nowrap">
+          {reminder.description?.substring(0, 20)+ ' ...'}
+          </h1>
+          <span className="text-[8px] text-thin-light-gray">
+          
+            Added <span className="text-purple">
+              {reminder.start_date.split(' ')[0]}
+              </span>
+          </span>
+        </div>
+      </div>
+      ))}
+
+    </div>
+  )
 }

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"

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"

src/components/Reminders/ReminderTable.jsx

@@ -90,7 +90,7 @@ export default function ReminderTable({ className }) {
                 <td className="py-4 text-center">Reminder</td>
                 <td className="py-4 text-right">.</td>
               </tr>
-              <tr class="spacer"></tr>
+              <tr className="spacer"></tr>
             </>
           
                 {
@@ -99,7 +99,7 @@ export default function ReminderTable({ className }) {
                       userReminders[0].reminders.map((reminder, index) => (
                       <>
                         {/* <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">
+                        <tr key={index} className="bg-light-purple dark:bg-black hover:bg-gray-50 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">
@@ -149,7 +149,7 @@ export default function ReminderTable({ className }) {
                             <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> */}
+                        <tr className="spacer"></tr>
                       </>
                       ))
                     )
@@ -159,7 +159,7 @@ export default function ReminderTable({ className }) {
                         return (
                           <>
                           {/* <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">
+                          <tr key={index} className="bg-light-purple dark:bg-black hover:bg-gray-50 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">
@@ -212,7 +212,7 @@ export default function ReminderTable({ className }) {
                               <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> */}
+                          <tr className="spacer"></tr>
                           </>
                         )
                       }

src/components/Settings/Tabs/ChangePasswordTab.jsx

@@ -3,6 +3,8 @@
 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");
@@ -38,6 +40,95 @@ 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">
@@ -58,6 +149,9 @@ 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"
@@ -83,6 +177,9 @@ 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"
@@ -108,6 +205,9 @@ 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"
@@ -117,6 +217,7 @@ 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"
@@ -127,9 +228,10 @@ 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">
-                Change Password
+              {loading ? <div className="signup btn-loader"></div> : <span>Change Password</span>}
               </span>
             </button>
           </div>

src/services/UsersService.js

@@ -10,6 +10,10 @@ 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);