Skip to content

daythree #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ankitkm95 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

daythree #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lenskartapp/src/Components/Login.jsx/LoginComponent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,21 @@ import {
useDisclosure,
Image
} from '@chakra-ui/react';
import SignUpComponent from './SingnUpComponent';


const LoginComponent = () => {
const LoginComponent = ({text, asALink}) => {
const { isOpen, onOpen, onClose } = useDisclosure()

const initialRef = React.useRef(null)
const finalRef = React.useRef(null)
const styleObj = {
border:'none',background:'none', color: asALink ? 'blue' : null
};

return (
<>
<Button onClick={onOpen}>Login</Button>
<Button style={styleObj} onClick={onOpen}>{text}</Button>
{/* <Button ml={4} ref={finalRef}>
I'll receive focus on close
</Button> */}
Expand Down Expand Up @@ -54,11 +58,12 @@ const LoginComponent = () => {
</ModalBody>

<ModalFooter>
<Button colorScheme='blue' mr={3}>
<Button style={{width: '100%', background: '#cccccc', margin: 'auto', borderRadius: '25px', color: 'navy'}} colorScheme='blue' mr={3}>
Save
</Button>
<Button onClick={onClose}>Cancel</Button>
{/* <Button onClick={onClose}>Cancel</Button> */}
</ModalFooter>
<SignUpComponent text='New member? Create an Account' asALink= {true}/>
</ModalContent>
</Modal>

Expand Down
21 changes: 16 additions & 5 deletions lenskartapp/src/Components/Login.jsx/SingnUpComponent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,22 @@ import {
Input,
useDisclosure
} from '@chakra-ui/react';
import LoginComponent from './LoginComponent';



const SignUpComponent = () => {
const SignUpComponent = ({text, asALink}) => {
const { isOpen, onOpen, onClose } = useDisclosure()

const initialRef = React.useRef(null)
const finalRef = React.useRef(null)
const styleObj = {
border:'none',background:'none', marginLeft: '-45px', color: asALink ? 'blue' : null
};

return (
<>
<Button onClick={onOpen}>Login</Button>
<Button style={styleObj} onClick={onOpen}>{text}</Button>
{/* <Button ml={4} ref={finalRef}>
I'll receive focus on close
</Button> */}
Expand All @@ -36,7 +41,7 @@ const SignUpComponent = () => {
>
<ModalOverlay />
<ModalContent>
<ModalHeader>Create your account</ModalHeader>
<ModalHeader>Create an account</ModalHeader>
<ModalCloseButton />
<ModalBody pb={6}>
<FormControl>
Expand All @@ -60,14 +65,20 @@ const SignUpComponent = () => {
<FormLabel>Password</FormLabel>
<Input type='password' placeholder='Password' />
</FormControl>
<br />
<p style={{color: 'navy', fontSize: '14px'}}>Got a Referral Code?( Optional )</p>
<br /><br />
<input type="checkbox" /><span style={{color: 'navy', fontSize: '14px'}}> Get Updates on Whatsapp</span>
<p style={{fontSize: '13px'}}>By creating this account, you agree to our Privacy Policy</p>
</ModalBody>

<ModalFooter>
<Button colorScheme='blue' mr={3}>
<Button style={{width: '100%', background: '#cccccc', margin: 'auto', borderRadius: '25px', color: 'navy'}} colorScheme='blue' mr={3}>
Create an Account
</Button>
<Button onClick={onClose}>Cancel</Button>
{/* <Button onClick={onClose}>Cancel</Button> */}
</ModalFooter>
<LoginComponent text= 'Have an account? Sign In' asALink = {true} />
</ModalContent>
</Modal>
</>
Expand Down
8 changes: 7 additions & 1 deletion lenskartapp/src/Components/Navbar/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React from 'react'
import { Link } from 'react-router-dom'
import style from "../../Styles/Navbar.module.css"
import LoginComponent from '../Login.jsx/LoginComponent'
import SignUpComponent from '../Login.jsx/SingnUpComponent'

const Navbar = () => {
return (
Expand All @@ -18,8 +20,12 @@ const Navbar = () => {

<Link className={style.Link} to="/trackOrder">Track Order
</Link>
<Link className={style.Link1} to="/signIn">Sign In & Sign Up
<LoginComponent text= 'Login' asALink={false} />
<SignUpComponent text='& Sign Up' asALink={false} />
{/* <Link className={style.Link1} to="/signIn">Sign In
</Link>
<Link className={style.Link1} to="/signIn">&Sign Up
</Link> */}
<Link className={style.Link2} to="/whislist">

Whislist</Link>
Expand Down