Skip to content

Jay Mehta / zango-frontend

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 1ea46a5d by Ravindra Kanojiya
Options

Merge branch 'master' of https://git.logicloop.io/jaymehta/zango-frontend

2 parents 6d0f9581 dcc6f0b9
Inline Side-by-side
Showing 4 changed files with 10 additions and 9 deletions
components/layout/Footer.js
...@@ -21,7 +21,7 @@ const Footer = () => { ...@@ -21,7 +21,7 @@ const Footer = () => {
<h3>VENDOR SIGN UP</h3> <h3>VENDOR SIGN UP</h3>
<div className=""> <div className="">
<Button variant="light me-3">Log In</Button> <Button variant="light me-3">Log In</Button>
<Button variant="primary">Sign Up</Button> <Button href="/signup/vendor" variant="primary">Sign Up</Button>
</div> </div>
</div> </div>
</div> </div>
......
components/login/Login.js
...@@ -20,7 +20,7 @@ const Login = (props) => { ...@@ -20,7 +20,7 @@ const Login = (props) => {
<Fragment> <Fragment>
<div className="contaier-fluid login-banner-image"> <div className="contaier-fluid login-banner-image">
<div className="row"> <div className="row">
<div className="col-12 col-lg-4 login-div"> <div className="col-11 col-lg-4 login-div">
<div className=""> <div className="">
<h2>{props.type=="vendor" ? "Vendor Login" : "Login to Experience"}</h2> <h2>{props.type=="vendor" ? "Vendor Login" : "Login to Experience"}</h2>
<div className="form-container"> <div className="form-container">
...@@ -75,7 +75,7 @@ const Login = (props) => { ...@@ -75,7 +75,7 @@ const Login = (props) => {
)} )}
</Formik> </Formik>
<div className="input-group justify-content-center"> <div className="input-group justify-content-center">
<p className="text-center mb-0">or <Link href={`../signup/${props.type}`}>Create a new account</Link></p> <p className="text-center mb-0">or <Link href={`../signup/${props.type}`}><span style={{textDecoration:"underline",cursor:"pointer"}}>Create a new account</span></Link></p>
</div> </div>
{props && props.type == "user" && ( {props && props.type == "user" && (
<> <>
......
components/signup/Signup.js
...@@ -70,7 +70,7 @@ const Signup = (props) => { ...@@ -70,7 +70,7 @@ const Signup = (props) => {
const handleVerifyOtp = (values) => { const handleVerifyOtp = (values) => {
setOtpVerified(true); setOtpVerified(true);
if (props.type == "user") { if (props.type == "user") {
router.push("/"); // router.push("/");
} }
} }
...@@ -79,9 +79,9 @@ const Signup = (props) => { ...@@ -79,9 +79,9 @@ const Signup = (props) => {
<div className="contaier-fluid login-banner-image"> <div className="contaier-fluid login-banner-image">
{(props?.type == "user" || (props?.type == "vendor" && !otpVerified)) && ( {(props?.type == "user" || (props?.type == "vendor" && !otpVerified)) && (
<div className="row"> <div className="row">
<div className="col-12 col-lg-4 login-div signupdiv"> <div className="col-11 col-lg-4 login-div signupdiv">
<div className=""> <div className="">
<h2>{props.type=="vendor" ? "Vendor Signup" : "Signup to get more out of the platform" }</h2> <h2>{props.type == "vendor" ? "Vendor Signup" : "Signup to get more out of the platform"}</h2>
<div className="form-container"> <div className="form-container">
<Formik <Formik
initialValues={{ initialValues={{
...@@ -282,9 +282,10 @@ const Signup = (props) => { ...@@ -282,9 +282,10 @@ const Signup = (props) => {
<div className="form-container"> <div className="form-container">
<div className="input-group mb-2"> <div className="input-group mb-2">
<Button type="button" className="btn btn-primary btn-submit" <Button type="button" className="btn btn-primary btn-submit"
onClick={() => { // onClick={() => {
router.push("") // router.push("/")
}}> // }}
>
Proceed to Dashboard Proceed to Dashboard
</Button> </Button>
</div> </div>
......
yarn.lock
This diff could not be displayed because it is too large.
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!