forked from Kanika637/amazon-clone
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request Kanika637#77 from Souvik-Nayak/main
Changed Checkout Page
- Loading branch information
Showing
5 changed files
with
125 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,70 @@ | ||
| /* eslint-disable no-unused-vars */ | ||
| import React from 'react' | ||
| import './Checkout.css' | ||
| import Subtotal from "./Subtotal"; | ||
| import CheckoutProduct from './CheckoutProduct'; | ||
| import{useStateValue} from './StateProvider'; | ||
| import { getBasketTotal } from "./reducer"; | ||
| import { useStateValue } from './StateProvider'; | ||
| import FlipMove from 'react-flip-move'; | ||
| import CurrencyFormat from "react-currency-format"; | ||
|
|
||
| function Checkout() { | ||
| const[{basket,user},dispatch]=useStateValue(); | ||
| function Checkout({ price }) { | ||
| const [{ basket, user }, dispatch] = useStateValue(); | ||
|
|
||
| const Finalproducts=({basket})=>( | ||
| const Finalproducts = ({ basket }) => ( | ||
| <FlipMove duration={750} easing="ease-out"> | ||
| {basket.map(article => ( | ||
| <article key={basket.id} {...basket} /> | ||
| ))} | ||
| </FlipMove> | ||
| {basket.map(article => ( | ||
| <article key={basket.id} {...basket} /> | ||
| ))} | ||
| </FlipMove> | ||
| ); | ||
|
|
||
|
|
||
|
|
||
| return ( | ||
| <div className="checkout"> | ||
|
|
||
| <div className="checkout__left"> | ||
| <img className="checkout__add"src="https://th.bing.com/th/id/R.80ae5f35f1c44b0f930163d23226366c?rik=%2bJmqA3%2bhXOe%2byw&riu=http%3a%2f%2fwww.newburyportef.org%2fwp-content%2fuploads%2f2016%2f11%2famazon_smile_newbanner.png&ehk=QYz%2b3M45putNX9M8TW4b9l%2fDWCIrYVY34oQs0qJZQCA%3d&risl=&pid=ImgRaw&r=0" alt="Checkout Add"/> | ||
| {/*<img className="checkout__add" src="https://th.bing.com/th/id/R.80ae5f35f1c44b0f930163d23226366c?rik=%2bJmqA3%2bhXOe%2byw&riu=http%3a%2f%2fwww.newburyportef.org%2fwp-content%2fuploads%2f2016%2f11%2famazon_smile_newbanner.png&ehk=QYz%2b3M45putNX9M8TW4b9l%2fDWCIrYVY34oQs0qJZQCA%3d&risl=&pid=ImgRaw&r=0" alt="Checkout Add" />*/} | ||
| <div> | ||
| <h3>Hello, {user?.email}</h3> | ||
| <h1 className="checkout__title">Your Shopping Basket</h1> | ||
| {/*This will send all the products we are adding in our basket to the shopping list using the basket variable*/} | ||
| {basket.map((item)=>( | ||
|
|
||
| {/*This will send all the products we are adding in our basket to the shopping list using the basket variable*/} | ||
| {basket.map((item) => ( | ||
| <CheckoutProduct | ||
| id={item.id} | ||
| price={item.price} | ||
| rating={item.rating} | ||
| title={item.title} | ||
| image={item.image} | ||
| reviews={item.reviews} | ||
| id={item.id} | ||
| price={item.price} | ||
| rating={item.rating} | ||
| title={item.title} | ||
| image={item.image} | ||
| reviews={item.reviews} | ||
| /> | ||
| ))} | ||
|
|
||
| ))} | ||
| </div> | ||
|
|
||
| <p className="checkout__title"></p> | ||
|
|
||
| {/*The Subtotal that is printed below !*/} | ||
| <CurrencyFormat | ||
| renderText={(value) => ( | ||
| <> | ||
| <p className="subtotal-calculate"> | ||
| Subtotal ({basket.length} items) : <strong>{value}</strong> | ||
| </p> | ||
| </> | ||
| )} | ||
| decimalScale={2} | ||
| value={getBasketTotal(basket)} | ||
| displayType={"text"} | ||
| thousandSeprator={true} | ||
| prefix={"Rs "} | ||
| /> | ||
| </div> | ||
|
|
||
| <div className="checkout__right"> | ||
| <Subtotal/> | ||
| <Subtotal /> | ||
| </div> | ||
|
|
||
|
|
||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| export default Checkout | ||
| export default Checkout |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,41 @@ | ||
| /* eslint-disable no-unused-vars */ | ||
| import React from 'react' | ||
| import "./CheckoutProduct.css"; | ||
| import {useStateValue} from './StateProvider'; | ||
| import { useStateValue } from './StateProvider'; | ||
|
|
||
|
|
||
| function CheckoutProduct({id,image,title,price,rating,reviews}) { | ||
| const[{basket},dispatch]=useStateValue(); | ||
|
|
||
| const removeFromBasket=()=>{ | ||
| function CheckoutProduct({ id, image, title, price, rating, reviews }) { | ||
| const [{ basket }, dispatch] = useStateValue(); | ||
| const removeFromBasket = () => { | ||
| dispatch({ | ||
| type:'REMOVE_FROM_BASKET', | ||
| id:id, | ||
| type: 'REMOVE_FROM_BASKET', | ||
| id: id, | ||
| }) | ||
| } | ||
|
|
||
|
|
||
|
|
||
| return ( | ||
|
|
||
| <div className="checkoutProduct"> | ||
| <img className="checkoutimage__product" src={image} alt="Checkout Product" /> | ||
| <div className="checkoutProduct__info"> | ||
| <p className="checkoutProduct__title">{title}</p> | ||
| <p className="checkoutproduct__price"> | ||
| <small>Rs</small> | ||
| <strong>{price}</strong> | ||
| </p> | ||
| <div className="checkoutproduct__rating"> | ||
|
|
||
|
|
||
|
|
||
| {Array(rating) | ||
| .fill() | ||
| .map((_,i)=>( | ||
| <p>⭐</p> | ||
| ))} | ||
| <span className='product__reviews'>({reviews})</span> | ||
| </div> | ||
| <button className="checkoutproduct__button" onClick={removeFromBasket}>Remove from basket</button> | ||
| <div className="checkoutProduct__info"> | ||
| <div className='checkout_Alignment'> | ||
| <div className="checkoutProduct__title">{title}</div> | ||
| <div className="checkoutproduct__price"> | ||
| <small>Rs </small> | ||
| <strong>{price}</strong> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| <div className="checkoutproduct__rating"> | ||
| {Array(rating) | ||
| .fill() | ||
| .map((_, i) => ( | ||
| <p>⭐</p> | ||
| ))} | ||
| <span className='product__reviews'>({reviews})</span> | ||
| </div> | ||
| <button className="checkoutproduct__button" onClick={removeFromBasket}>Remove from basket</button> | ||
| </div> | ||
| </div> | ||
|
|
||
| ) | ||
| } | ||
|
|
||
| export default CheckoutProduct | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,37 @@ | ||
| /* eslint-disable no-unused-vars */ | ||
| import React from 'react' | ||
| import './Subtotal.css' | ||
| import CurrencyFormat from "react-currency-format"; | ||
| import {useStateValue} from './StateProvider'; | ||
| import {getBasketTotal} from "./reducer"; | ||
| import {useHistory} from "react-router-dom"; | ||
| import { useStateValue } from './StateProvider'; | ||
| import { getBasketTotal } from "./reducer"; | ||
| import { useHistory } from "react-router-dom"; | ||
|
|
||
| function Subtotal() { | ||
| //provide browser history | ||
| const history=useHistory(); | ||
| const[{basket},dispatch]=useStateValue(); | ||
| const history = useHistory(); | ||
| const [{ basket }, dispatch] = useStateValue(); | ||
| return ( | ||
| <div className="subtotal"> | ||
| {/*For rendering the money*/} | ||
| <CurrencyFormat | ||
| renderText={(value)=>( | ||
| <> | ||
| <p> | ||
| Subtotal({basket.length} items):<strong>{value}</strong> | ||
|
|
||
| </p> | ||
| <small className="subtotal__gift"> | ||
| <input type="checkbox"/>This order contains a gift</small> | ||
| </> | ||
| )} | ||
| decimalScale={2} | ||
| value={getBasketTotal(basket)} | ||
| displayType={"text"} | ||
| thousandSeprator={true} | ||
| prefix={"Rs"} | ||
| /> | ||
| <button onClick={e=>history.push("/payment")} className="proceed__button">Proceed to checkout</button> | ||
|
|
||
|
|
||
| <CurrencyFormat | ||
| renderText={(value) => ( | ||
| <> | ||
| <p> | ||
| Subtotal({basket.length} items) : <strong>{value}</strong> | ||
| </p> | ||
| <small className="subtotal__gift"> | ||
| <input type="checkbox" />This order contains a gift</small> | ||
| </> | ||
| )} | ||
| decimalScale={2} | ||
| value={getBasketTotal(basket)} | ||
| displayType={"text"} | ||
| thousandSeprator={true} | ||
| prefix={"Rs "} | ||
| /> | ||
| <button onClick={e => history.push("/payment")} className="proceed__button">Proceed to checkout</button> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Subtotal; | ||
|
|