diff --git a/src/component/auth/Signup.jsx b/src/component/auth/Signup.jsx index c6a33b0..20ad5e5 100644 --- a/src/component/auth/Signup.jsx +++ b/src/component/auth/Signup.jsx @@ -82,9 +82,13 @@ export default function Signup() {
+

Already have an account ? Sign In + className='bg-secondary; hover:text-primary font-bold' style={{paddingRight: '10px'}}> +

diff --git a/src/component/auth/Signup2.jsx b/src/component/auth/Signup2.jsx index a39e359..87ae7f3 100644 --- a/src/component/auth/Signup2.jsx +++ b/src/component/auth/Signup2.jsx @@ -1,101 +1,119 @@ -import React, { useState } from 'react' -import { Form, Formik } from "formik"; +import React, {useState} from 'react' +import {Form, Formik} from "formik"; import * as Yup from "yup"; // import LoginImg from '../../assets/bg/login.svg' -import { Link } from 'react-router-dom' +import {Link} from 'react-router-dom' import siteLinks from '../../links/siteLinks' -import { useMutation } from '@tanstack/react-query'; -import { signUpUser } from '../../services/services'; +import {useMutation} from '@tanstack/react-query'; +import {signUpUser} from '../../services/services'; import getImage from '../../utils/getImage'; const validationSchema = Yup.object().shape({ email: Yup.string() - .email("Wrong email format") - // .matches( - // /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/, - // "Invalid email format" - // ) - .min(3, "Minimum 3 characters") - .max(50, "Maximum 50 characters") - .required("Email is required"), + .email("Wrong email format") + // .matches( + // /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/, + // "Invalid email format" + // ) + .min(3, "Minimum 3 characters") + .max(50, "Maximum 50 characters") + .required("Email is required"), firstname: Yup.string().required("Firstname is required"), lastname: Yup.string().required("Lastname is required"), isChecked: Yup.bool().oneOf([true], "Please accept the terms & policy"), // use bool instead of boolean // username: Yup.string().min(3, "Minimum 3 characters").max(50, "Maximum 50 characters").required("Email is required"), // password: Yup.string().min(3, "Minimum 3 characters").max(50, "Maximum 50 characters").required("Email is required"), - }) +}) - const initialValues = { +const initialValues = { email: '', firstname: '', lastname: '', isChecked: false, // username: '', // password: '' - }; +}; export default function Signup2() { - const mutation = useMutation({ - mutationFn: (fields) => { - return signUpUser(fields) - }, - onSuccess: (res) => { - console.log('res', res) + const mutation = useMutation({ + mutationFn: (fields) => { + return signUpUser(fields) + }, + onSuccess: (res) => { + console.log('res', res) + } + }) + + const signUp = (values) => { + // helpers.resetForm() + // console.log('values', values, helpers) + delete values.isChecked + mutation.mutate(values) } - }) - const signUp = (values) => { - // helpers.resetForm() - // console.log('values', values, helpers) - delete values.isChecked - mutation.mutate(values) - } - - return ( -
-
-
-
-
-
-
-
-
-

{process.env.REACT_APP_PANEL_NAME}

-

Welcome, Please create your account.

- - {(props) => { - return ( -
-
- {!mutation.isSuccess ? - <> -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- {/*
+ return ( +
+
+
+
+
+
+
+
+
+

{process.env.REACT_APP_PANEL_NAME}

+

Welcome, Please create your account.

+ + {(props) => { + return ( + +
+ {!mutation.isSuccess ? + <> +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ {/*
@@ -107,62 +125,83 @@ export default function Signup2() {
*/} -
-
- - -
- {props.errors.isChecked} -
+
+
+ + +
+ {props.errors.isChecked} +
- {mutation.error && - <> -
-

{mutation.error.message}

-
+ {mutation.error && + <> +
+

{mutation.error.message}

+
+ + } + +
+ +
+ : +
+
+

Check + your email to continue.

+ mail-alert + Home +
+
} -
- -
- - : -
-
-

Check your email to continue.

- mail-alert - Home +
+

Already have an account ? + +

- } - -
-

Already have an account ? Sign In

-
-
- - ); - }} - + + ); + }} + +
-
- {/*
+ {/*
*/} +
-
+
-
- ) + ) } diff --git a/src/component/product/settingsTab/URLConfiguration.jsx b/src/component/product/settingsTab/URLConfiguration.jsx index d6d40f6..ce89ab4 100644 --- a/src/component/product/settingsTab/URLConfiguration.jsx +++ b/src/component/product/settingsTab/URLConfiguration.jsx @@ -27,17 +27,12 @@ const URLConfiguration = () => {
-
-
- - -