Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1a599cd582 | |||
| 6254df4f2a | |||
| caf3eff237 |
@@ -31,6 +31,7 @@ import CalendarPage from "./views/CalendarPage";
|
||||
import ResourcePage from "./views/ResourcePage";
|
||||
import TrackActionPage from "./views/TrackActionPage";
|
||||
import SubscriptionPage from "./views/SubscriptionPage";
|
||||
import VerifySignupCompletePage from "./views/VerifySignupCompletePage";
|
||||
|
||||
export default function Routers() {
|
||||
return (
|
||||
@@ -51,6 +52,7 @@ export default function Routers() {
|
||||
/>
|
||||
<Route exact path="/verify-you" element={<VerifyYouPages />} />
|
||||
<Route exact path="/verify-signup" element={<VerifySignupPage />} />
|
||||
<Route exact path="/complete-signup" element={<VerifySignupCompletePage />} />
|
||||
|
||||
{/* private route */}
|
||||
<Route element={<AuthRoute />}>
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
import React from "react";
|
||||
import AuthLayout from "../../AuthLayout";
|
||||
|
||||
export default function ThankYou({ className }) {
|
||||
|
||||
export default function CompleteSignUp({ className }) {
|
||||
return (
|
||||
<>
|
||||
<AuthLayout
|
||||
slogan="Welcome to myFit"
|
||||
>
|
||||
|
||||
<div
|
||||
className={`content-wrapper xl:bg-white dark:xl:bg-dark-white sm:px-[70px] px-5 2xl:px-[100px] 2xl:h-[818px] xl:h-[650px] rounded-xl flex flex-col justify-center ${
|
||||
className || ""
|
||||
@@ -44,5 +51,7 @@ export default function ThankYou({ className }) {
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</AuthLayout>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import titleShape from "../../../../assets/images/shape/text-shape-three.svg";
|
||||
import AuthLayout from "../../AuthLayout";
|
||||
import Otp from "./Otp";
|
||||
|
||||
export default function VerifyYou() {
|
||||
export default function VerifySignup() {
|
||||
return (
|
||||
<>
|
||||
<AuthLayout
|
||||
@@ -23,7 +23,7 @@ export default function VerifyYou() {
|
||||
<Otp />
|
||||
<div className="signin-area mb-3.5">
|
||||
<a
|
||||
href="/update-password"
|
||||
href="/complete-signup"
|
||||
className="w-full rounded-[50px] h-[58px] mb-6 text-xl text-white font-bold flex justify-center bg-purple items-center"
|
||||
>
|
||||
Continue
|
||||
|
||||
@@ -6,12 +6,128 @@ import titleShape from "../../../assets/images/shape/title-shape-two.svg";
|
||||
import InputCom from "../../Helpers/Inputs/InputCom";
|
||||
import { Link, useNavigate } from 'react-router-dom';
|
||||
|
||||
import usersService from "../../../services/UsersService"; // site api services
|
||||
|
||||
export default function SignUp() {
|
||||
const navigate = useNavigate();
|
||||
|
||||
const userSignup = new usersService();
|
||||
|
||||
const [loading, setLoading] = useState(false) // For loading spinner
|
||||
|
||||
const [errorMessage, setErrorMessage] = useState({ // For Displaying success or error message
|
||||
success: false,
|
||||
message: ''
|
||||
})
|
||||
|
||||
const [checked, setValue] = useState(false);
|
||||
const rememberMe = () => {
|
||||
setValue(!checked);
|
||||
};
|
||||
|
||||
// state for user inputed values
|
||||
const [userDetails, setUserDetails] = useState({
|
||||
// username: '',
|
||||
email: '',
|
||||
password: '',
|
||||
confirm_password: '',
|
||||
firstname: '',
|
||||
lastname: ''
|
||||
})
|
||||
|
||||
const handleInputChange = ({target:{name, value}}) => { // function that listens to input change
|
||||
setUserDetails(prev => {
|
||||
return {...prev, [name]:value}
|
||||
})
|
||||
}
|
||||
|
||||
const handleUserSignup = async () => { // handles input validation and submits to api call
|
||||
|
||||
setErrorMessage({ // resets the error message to empty string
|
||||
success: false,
|
||||
message: ''
|
||||
})
|
||||
|
||||
setLoading(true) // Sets loading spinner
|
||||
|
||||
let userInfo = {...userDetails} // assigns userDetails to be user information
|
||||
|
||||
let {email, password, confirm_password, firstname, lastname} = userInfo
|
||||
|
||||
if(!email || !password || !confirm_password || !firstname || !lastname){ // checks if any field is empty
|
||||
setLoading(false)
|
||||
setErrorMessage({
|
||||
success: false,
|
||||
message: 'Please Fill all inputs'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
//checks if email is a valid email address
|
||||
let regEx = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
|
||||
if (regEx.test(email) == false) {
|
||||
setLoading(false)
|
||||
setErrorMessage({
|
||||
success: false,
|
||||
message: 'Please Input a valid email; e.g: text@gmail.com'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if(password != confirm_password){ //checks if password matches confirm password
|
||||
setLoading(false)
|
||||
setErrorMessage({
|
||||
success: false,
|
||||
message: 'Password do not match'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
//checks if password is matches alphanumeric with at least one uppercase letter
|
||||
// let PwdRegEx = /[A-Z]/;
|
||||
if (/[A-Z]/.test(password) == false) {
|
||||
setLoading(false)
|
||||
setErrorMessage({
|
||||
success: false,
|
||||
message: 'Password must contain at least one uppercase character; e.g: Text123'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
userInfo.username = email // assigns email as username also
|
||||
userInfo.mode = 'START' // assigns mode as START
|
||||
|
||||
delete userInfo.confirm_password // deletes confrim password before making API call
|
||||
|
||||
try {
|
||||
const res = await userSignup.signupUser(userInfo);
|
||||
if(res.status != 200 || res.data.status < 1){
|
||||
setLoading(false)
|
||||
setErrorMessage({
|
||||
success: false,
|
||||
message: 'Could not create account try again later'
|
||||
})
|
||||
return
|
||||
}
|
||||
// if status code is 200 proceed
|
||||
setErrorMessage({
|
||||
success: true,
|
||||
message: 'Account created successfully'
|
||||
})
|
||||
setTimeout(()=>{
|
||||
setLoading(false)
|
||||
navigate("/verify-signup", { replace: true })
|
||||
}, 1000)
|
||||
} catch (error) {
|
||||
setLoading(false)
|
||||
setErrorMessage({
|
||||
success: false,
|
||||
message: 'Opps! something went wrong, Try agian later'
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="layout-wrapper">
|
||||
@@ -49,18 +165,22 @@ export default function SignUp() {
|
||||
<InputCom
|
||||
placeholder="Adam"
|
||||
label="First Name"
|
||||
name="first_name"
|
||||
name="firstname"
|
||||
type="text"
|
||||
iconName="people"
|
||||
value={userDetails.first_name}
|
||||
inputHandler={handleInputChange}
|
||||
/>
|
||||
</div>
|
||||
<div className="input-item flex-1">
|
||||
<InputCom
|
||||
placeholder="Wathon"
|
||||
label="Last Name"
|
||||
name="Last_name"
|
||||
name="lastname"
|
||||
type="text"
|
||||
iconName="people"
|
||||
value={userDetails.Last_name}
|
||||
inputHandler={handleInputChange}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -71,6 +191,8 @@ export default function SignUp() {
|
||||
name="email"
|
||||
type="email"
|
||||
iconName="message"
|
||||
value={userDetails.email}
|
||||
inputHandler={handleInputChange}
|
||||
/>
|
||||
</div>
|
||||
<div className="input-item mb-5">
|
||||
@@ -80,15 +202,19 @@ export default function SignUp() {
|
||||
name="password"
|
||||
type="password"
|
||||
iconName="password"
|
||||
value={userDetails.password}
|
||||
inputHandler={handleInputChange}
|
||||
/>
|
||||
</div>
|
||||
<div className="input-item mb-5">
|
||||
<InputCom
|
||||
placeholder="*********"
|
||||
label="Re-enter Password"
|
||||
name="password"
|
||||
name="confirm_password"
|
||||
type="password"
|
||||
iconName="password"
|
||||
value={userDetails.confirm_password}
|
||||
inputHandler={handleInputChange}
|
||||
/>
|
||||
</div>
|
||||
<div className="forgot-password-area flex justify-between items-center mb-6">
|
||||
@@ -129,11 +255,23 @@ export default function SignUp() {
|
||||
</div>
|
||||
</div>
|
||||
<div className="signin-area mb-1">
|
||||
|
||||
|
||||
{errorMessage.message != '' && <p className={`text-center p-3 ${errorMessage.success ? 'text-green-600' : 'text-red-600'}`}>{errorMessage.message}</p>}
|
||||
|
||||
<button
|
||||
className="w-full rounded-[50px] mb-5 h-[58px] text-xl text-white font-bold flex justify-center bg-purple items-center"
|
||||
onClick={() => navigate("/verify-signup")}
|
||||
// onClick={() => navigate("/verify-signup")}
|
||||
onClick={handleUserSignup}
|
||||
>
|
||||
{loading && (
|
||||
<div role="status" className="px-3">
|
||||
<svg aria-hidden="true" className="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-purple" 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>
|
||||
)}
|
||||
Sign Up
|
||||
</button>
|
||||
{/* <a
|
||||
|
||||
@@ -15,6 +15,11 @@ class usersService {
|
||||
return this.postAuxEnd("/editreminder", reqData);
|
||||
}
|
||||
|
||||
//SIGNUP AUTH
|
||||
signupUser(reqData){
|
||||
return this.postAuxEnd("/account", reqData);
|
||||
}
|
||||
|
||||
getUserReminders(){
|
||||
var reqData = {
|
||||
member_id: localStorage.getItem("member_id")
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
import React from "react";
|
||||
import CompleteSignUp from "../components/AuthPages/SignUp/CompleteSignUp";
|
||||
|
||||
export default function VerifySignupCompletePage() {
|
||||
return <CompleteSignUp />;
|
||||
}
|
||||
Reference in New Issue
Block a user