Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e60e1828e |
@@ -90,7 +90,7 @@ export default function ReminderTable({ className }) {
|
|||||||
<td className="py-4 text-center">Reminder</td>
|
<td className="py-4 text-center">Reminder</td>
|
||||||
<td className="py-4 text-right">.</td>
|
<td className="py-4 text-right">.</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="spacer"></tr>
|
<tr className="spacer"></tr>
|
||||||
</>
|
</>
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -99,7 +99,7 @@ export default function ReminderTable({ className }) {
|
|||||||
userReminders[0].reminders.map((reminder, index) => (
|
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="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">
|
<td className="py-4 px-2 rounded-l-full">
|
||||||
<div className="flex space-x-2 items-center">
|
<div className="flex space-x-2 items-center">
|
||||||
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center 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>
|
<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>
|
||||||
</tr>
|
</tr>
|
||||||
{/* <tr class="spacer"></tr> */}
|
<tr className="spacer"></tr>
|
||||||
</>
|
</>
|
||||||
))
|
))
|
||||||
)
|
)
|
||||||
@@ -159,7 +159,7 @@ export default function ReminderTable({ className }) {
|
|||||||
return (
|
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="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">
|
<td className="py-4 px-2 rounded-l-full">
|
||||||
<div className="flex space-x-2 items-center">
|
<div className="flex space-x-2 items-center">
|
||||||
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center 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>
|
<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>
|
||||||
</tr>
|
</tr>
|
||||||
{/* <tr class="spacer"></tr> */}
|
<tr className="spacer"></tr>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,6 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import Icons from "../../Helpers/Icons";
|
import Icons from "../../Helpers/Icons";
|
||||||
import PasswordSvg from "../PasswordSvg";
|
import PasswordSvg from "../PasswordSvg";
|
||||||
import { toast } from "react-toastify";
|
|
||||||
import usersService from "../../../services/UsersService";
|
|
||||||
|
|
||||||
export default function ChangePasswordTab() {
|
export default function ChangePasswordTab() {
|
||||||
const [oldPass, setOldPass] = useState("hide-password");
|
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 (
|
return (
|
||||||
<div className="changePasswordTab w-full">
|
<div className="changePasswordTab w-full">
|
||||||
<div className="w-full flex xl:flex-row flex-col-reverse space-x-5 xl:items-center">
|
<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"
|
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"
|
type="password"
|
||||||
id="old_password"
|
id="old_password"
|
||||||
name='prev_pass'
|
|
||||||
value={passwordDetails.prev_pass}
|
|
||||||
onChange={handlePasswordChange}
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
|
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"
|
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"
|
type="password"
|
||||||
id="new_password"
|
id="new_password"
|
||||||
name="new_pass"
|
|
||||||
value={passwordDetails.new_pass}
|
|
||||||
onChange={handlePasswordChange}
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
|
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"
|
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"
|
type="password"
|
||||||
id="confirm_password"
|
id="confirm_password"
|
||||||
name="confirm_pass"
|
|
||||||
value={passwordDetails.confirm_pass}
|
|
||||||
onChange={handlePasswordChange}
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
|
className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
|
||||||
@@ -217,7 +117,6 @@ export default function ChangePasswordTab() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<div className="flex justify-center space-x-4 items-center">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -228,10 +127,9 @@ export default function ChangePasswordTab() {
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="btn-gradient tracking-wide rounded-full w-[173px] h-[46px] flex justify-center items-center"
|
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">
|
<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>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -10,10 +10,6 @@ class usersService {
|
|||||||
return this.postAuxEnd('/resetpass', reqData);
|
return this.postAuxEnd('/resetpass', reqData);
|
||||||
}
|
}
|
||||||
|
|
||||||
resetProfilePassword(reqData){
|
|
||||||
return this.postAuxEnd('/resetpass-profile', reqData);
|
|
||||||
}
|
|
||||||
|
|
||||||
logInUser(reqData) {
|
logInUser(reqData) {
|
||||||
localStorage.setItem("session_token", ``);
|
localStorage.setItem("session_token", ``);
|
||||||
return this.postAuxEnd("/login", reqData);
|
return this.postAuxEnd("/login", reqData);
|
||||||
|
|||||||
Reference in New Issue
Block a user