Skip to content
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

Order page, Selected For You Page added #4

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

Order page, Selected For You Page added #4

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
34 changes: 34 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"components": "^0.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-elastic-carousel": "^0.11.5",
"react-icons": "^4.2.0",
"react-redux": "^7.2.4",
"react-router-dom": "^5.2.0",
Expand Down
1 change: 1 addition & 0 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand Down
56 changes: 56 additions & 0 deletions src/components/Ad/Ad.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
@import url('https://fonts.googleapis.com/css2?family=Poppins&display=swap%27');
body{
font-family: 'Poppins', sans-serif;
}
.ad-container{
display: flex;
justify-content: center;
align-items: center;
margin: 10%;
width: 80vw;
height: 20rem;
}

.ad-card{
display: flex;
justify-content:flex-end;
flex-direction: column;
width: 15rem;
height: 40vh;
margin: 1rem;
background-position: center;
background-size: 100% 100%;
background-repeat: no-repeat;
border-radius: 0.5rem;
border-radius: 1rem;
}

.ad-card h2{
color: white;
margin: 1rem;
text-align: left;
}
.ad-card button{
display: flex;
justify-content: center;
align-items: center;
font-size: 0.7rem;
margin: 1rem;
width: auto;
height: 2rem;
padding: 5%;
border-radius: 1rem;
background-color: white;
border: none;
}

.overlay{
border-radius: 1rem;
display: flex;
justify-content:flex-end;
align-items: center;
flex-direction: column;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.2);
}
17 changes: 17 additions & 0 deletions src/components/Ad/AdCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import "./Ad.css"
import product from "../../data";

function AdCard(){
const num = Math.floor(Math.random()*product.length)
const image = product[num].main_img;

return(
<div className="ad-card" style={{ backgroundImage: `url("${image}")` }}>
<div className="overlay">
<h2>New Arrivals Are Now In!</h2>
<button><h5 style={{color:"black"}}>SHOW DETAILS</h5></button>
</div>
</div>
)
}
export default AdCard;
14 changes: 14 additions & 0 deletions src/components/Ad/Ads.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import "./Ad.css";
import AdCard from "./AdCard";
function Ads(){
return(
<div className="ad-container">
<AdCard/>
<AdCard/>
<AdCard/>
<AdCard/>
<AdCard/>
</div>
)
}
export default Ads;
2 changes: 1 addition & 1 deletion src/components/Cart/CartStyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

.cart-product-container .table-product .amount .amount-container{
border: 1px solid #CECECE;
padding: 0.4rem 0.7rem;
/* padding: 0.4rem 0.7rem; */
border-width: 2px 3px;
border-radius: 40px;
}
Expand Down
173 changes: 173 additions & 0 deletions src/components/OrderPage/OrderPage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
.main-order-page{
margin-top: 5rem;
display: flex;
flex-direction: column;
height: 92vh;
}
.main-order-page .order-page{
width: 96%;
color: black;
margin-right: 5rem;
}
.main-order-page .container{
display: grid;
grid-template-columns: repeat(3,1fr);
}

.main-order-page h3{
margin: 1rem;
margin-bottom: 2rem;
}
.main-order-page h4{
color: black;
margin: 1rem;
}
.main-order-page .login-btn{
display: flex;
align-items: center;
justify-content: center;
font-size: 0.8rem;
font-weight: 600;
padding: 0.5%;
margin: 0.5rem;
text-align: center;
height: 2rem;
width: 6rem;
border-radius: 2rem;
background-color: #FBB03B;
}

.main-order-page .signup-btn{
display: flex;
align-items: center;
justify-content: center;
font-size: 0.8rem;
font-weight: 600;
padding: 0.5%;
margin: 0.5rem;
text-align: center;
height: 2rem;
width: 6rem;
border-radius: 2rem;
border: 2px solid rgb(185, 182, 182);
}

.main-order-page .login-signup{
display: flex;
}

.main-order-page .shipping-info-form{
display: grid;
grid-template-rows: repeat(4, 1fr);
grid-template-columns: repeat(2, 1fr);
}

.main-order-page .shipping-info-form input{
height: 3.4rem;
width: 14.5rem;
padding: 0.8rem;
margin: 0.8rem;
border-radius: 2rem;
border: 1px solid gray;
outline: none;
}
.main-order-page .payment-delivery{
margin: 0 2rem;
}
.main-order-page .payment{
display: flex;
flex-wrap: wrap;
background-position: center;
background-size: cover;
background-repeat: no-repeat;
}
.main-order-page .payment button{
padding: 0.6rem;
height: 2.5rem;
width:6rem;
display: flex;
justify-content: center;
align-items: center;
border-radius: 2rem;
border: 1px solid gray;
background-position: center;
background-size: cover;
background-repeat: no-repeat;
}

.main-order-page .payment button img{
height: 100%;
width: 100%;
}

.main-order-page .cart-items{
display: grid;
grid-template-rows: 1fr 1fr;
}
.main-order-page .cart-item{
display: flex;
height: 2rem;
margin: 1.5rem;
margin-left: 0;
}

.main-order-page .cart-item img{
margin-right: 0.5rem;
height: 4rem;
width: 4rem;
border-radius: 50%;
display: inline-block;
}

.main-order-page .total{
display: flex;
justify-content: center;
align-items: center;
width: 13rem;
height: 2rem;
padding: 1%;
border-radius: 2rem;
background-color: rgb(211, 210, 210);
margin: 5rem;
}

.main-order-page .end{
margin-top: 0;
display: flex;
justify-content: space-between;
width: 100vw;
}

.main-order-page .payment-proceed{
margin-right: 5rem;
display: flex;
}
.main-order-page .continue,.main-order-page .proceed{
display: flex;
align-items: center;
justify-content: center;
font-size: 0.7rem;
font-weight: 600;
padding: 1.5rem;
margin: 1rem;
text-align: center;
height: 2rem;
width: 12rem;
border-radius: 2rem;
border: 2px solid rgb(185, 182, 182);
}

.main-order-page .proceed{
background-color: #FBB03B;
border: none;
}

.main-order-page .form-control{
color: gray;
padding: 1rem;
margin: 1rem;
border-radius: 2rem;
border: 1px solid gray;
outline: none;
font-size: 0.9rem;
}
Loading