Skip to content

Commit

Permalink
add checkout process pages ++
Browse files Browse the repository at this point in the history 
changed btn hover color,
deleted some unused images,
added new progress bar svg's checkout pages (text converted to path)
  • Loading branch information
@dahltina
dahltina committed May 28, 2021
1 parent bcf007b commit d239a45
Show file tree
Hide file tree
Showing 44 changed files with 377 additions and 114 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
28 changes: 25 additions & 3 deletions CSS/checkout.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ main {
}

.quantity {
max-width: 100%;
width: 100%;
max-width: 100px;
}

.back {
Expand Down Expand Up @@ -115,12 +116,33 @@ form p {
display: none;
}

.loginBtn {
margin-top: 40px;
}

.small-gray-text {
color: var(--gray);
font-size: 14px;
}

.card-details {
display: flex;
}

.ccv {
margin-left: 20px;
}

.confirmation {
margin-top: 50px;
}

/* login error */

/* .loginError {
.loginError {
color: rgb(158, 41, 25);
display: none;
} */
}

/*//////////////////mobile//////////////////////*/
@media (min-width: 200px) and (max-width: 709px) {
Expand Down
12 changes: 4 additions & 8 deletions CSS/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,10 @@ nav a:hover {
cursor: pointer;
}

.btn-large:hover {
color: var(--orange);
background:#FFE2C4;
.btn-large:hover,
.btn-large.green:hover {
color: var(--white);
background: var(--main);
}

.btn-large.cart {
Expand All @@ -197,11 +198,6 @@ nav a:hover {
margin-top: 15px;
}

.btn-large.green:hover {
background: #D6F2CD;
color: var(--green);
}

.btn-large.green:hover,
.btn-large:hover {
transition: all 0.2s ease-in;
Expand Down
10 changes: 4 additions & 6 deletions checkout-2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="jacket-container">
<div class="top-bar">
<h1 class="h1-about">Shopping Cart</h1>
<img class="progress-bar" src="images/checkout2.svg" alt="step 1: review shopping cart"/>
<img class="progress-bar" src="images/components/checkout-2.svg" alt="step 2: enter shipping address"/>
</div>
<div class="line"></div>
<div class="info-line">
Expand Down Expand Up @@ -77,7 +77,8 @@ <h1 class="h1-about">Shopping Cart</h1>
</div>
</div>
<div class="back-continue">
<a class="back" href="mens.html"><b><--Back to Shopping</b></a>
<a href="checkout.html"><b><p><--Previuos step</p></b></a>
<a class="back" href="index.html"><b><--Back to Shopping</b></a>
<p class="continue"><b>Continue</b></p>
</div>
</div>
Expand All @@ -87,20 +88,17 @@ <h5>Confirm Shipping address</h5>
<form action="" method="GET" id="loginForm">
<label for="userName">Full name </label>
<input type="text" name="fullName" id="fullName" required/>
<!-- <div class="loginError" id="userNameError">Username is incorrect</div> -->
<label for="address">Street address </label>
<input type="address" name="address" id="address" required/>
<!-- <div class="loginError" id="passwordError">Password is incorrect</div> -->
<label for="zip">Zip </label>
<input type="zip" name="zip" id="zip" required/>
<label for="city">City </label>
<input type="city" name="city" id="city" required/>

<input id="continueBtn" type="submit" value="CONTINUE" />
<a class="btn-large loginBtn" href="checkout-3.html">continue</a>
</form>
</section>
</main>
</div>
<script src="js/script.js"></script>
</body>
</html>
112 changes: 112 additions & 0 deletions checkout-3.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" href="https://use.typekit.net/gzy8fgh.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;700&display=swap"/>
<link rel="stylesheet" href="CSS/index.css" />
<link rel="stylesheet" href="CSS/checkout.css" />
<title>Shipping | Rainy Days</title>
<meta name="description" content="Shopping cart. Confirm shipping address - Rainy Days"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
</head>
<!-------------------------------------- header --------------------------------------------->
<body>
<div class="top-line"></div>
<div class="body">
<header>
<a href="index.html">
<img class="logo" src="images/RainyDays_Logo.png" alt="rainy days logo"/>
</a>
<div class="topnav">
<div class="favorites item"><img src="images/icons/like.svg" alt="favorites"/></div>
<div class="profile item"><img src="images/icons/profile.svg" alt="profile"/></div>
<div class="cart item"><a href="checkout.html"><img src="images/icons/cart.svg" alt="shopping cart"></a></div>
<div class="search item"><img src="images/icons/search.svg" alt="search"/></div>
</div>
</header>
<!---------------------------- main content --------------------------------------->
<main>
<div class="jacket-container">
<div class="top-bar">
<h1 class="h1-about">Shopping Cart</h1>
<img class="progress-bar" src="images/components/checkout-3.svg" alt="step 2: enter shipping address"/>
</div>
<div class="line"></div>
<div class="info-line">
<p>Product Details</p>
<p class="price">Price</p>
<p>Quantity</p>
<p>Total Price</p>
</div>
<div class="cart-line"></div>
<div class="jacket-specs">
<img class="thumb-2" src="images/jacket_1-1.jpg" alt="men's Forest Jacket"/>
<div>
<p><b>Forest Jacket</b></p>
<p>Size: M</p>
</div>
<p class="price">$54</p>
<img class="quantity" src="images/quantity.svg" />
<p>$54</p>
<div></div>
</div>
<div class="cart-line"></div>
<div class="jacket-specs">
<img class="thumb-2" src="images/jacket_2-1.jpg" alt="Men's Edge Jacket"/>
<div>
<p><b>Edge Jacket</b></p>
<p>Size: M</p>
</div>
<p class="price">$58</p>
<img class="quantity" src="images/quantity.svg" />
<p>$58</p>
<div></div>
</div>
<div class="cart-line"></div>
<div class="sum">
<div></div>
<div>
<p>Total</p>
<p>Shipping</p>
<p><b>Sum Total</b></p>
</div>
<div>
<p>$112</p>
<p>$10</p>
<p><b>$122</b></p>
</div>
</div>
<div class="back-continue">
<a href="checkout-2.html"><b><p><--Previuos step</p></b></a>
<a class="back" href="index.html"><b><--Back to Shopping</b></a>
<p class="continue"><b>Continue</b></p>
</div>
</div>

<section class="login">
<h5>Payment Details</h5>
<img src="images/components/card.svg" alt="credit card">
<div class="card-name">
<p class="small-gray-text">Name on card</p>
<p>John Doe</p>
</div>
<div class="card-number">
<p class="small-gray-text">Card Number</p>
<p>•••• •••• •••• 1564</p>
</div>
<div class="card-details">
<div class="expiration-date">
<p class="small-gray-text">Expiration Date</p>
<p>04/22</p>
</div>
<div class="ccv">
<p class="small-gray-text">CCV</p>
<p>•••</p>
</div>
</div>
<p><a class="btn-large loginBtn" href="checkout-4.html">pay now</a></p>
</section>
</main>
</div>
</body>
</html>
86 changes: 86 additions & 0 deletions checkout-4.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" href="https://use.typekit.net/gzy8fgh.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;700&display=swap"/>
<link rel="stylesheet" href="CSS/index.css" />
<link rel="stylesheet" href="CSS/checkout.css" />
<title>Shipping | Rainy Days</title>
<meta name="description" content="Shopping cart. Confirm shipping address - Rainy Days"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
</head>
<!-------------------------------------- header --------------------------------------------->
<body>
<div class="top-line"></div>
<div class="body">
<header>
<a href="index.html">
<img class="logo" src="images/RainyDays_Logo.png" alt="rainy days logo"/>
</a>
<div class="topnav">
<div class="favorites item"><img src="images/icons/like.svg" alt="favorites"/></div>
<div class="profile item"><img src="images/icons/profile.svg" alt="profile"/></div>
<div class="cart item"><a href="checkout.html"><img src="images/icons/cart.svg" alt="shopping cart"></a></div>
<div class="search item"><img src="images/icons/search.svg" alt="search"/></div>
</div>
</header>
<!---------------------------- main content --------------------------------------->
<main>
<div class="jacket-container">
<div class="top-bar">
<h1 class="h1-about">Success!</h1>
<img class="progress-bar" src="images/components/checkout-4.svg" alt="step 2: enter shipping address"/>
</div>
<div class="line"></div>
<div class="info-line">
<p>Product Details</p>
<p class="price">Price</p>
<p>Quantity</p>
<p>Total Price</p>
</div>
<div class="cart-line"></div>
<div class="jacket-specs">
<img class="thumb-2" src="images/jacket_1-1.jpg" alt="men's Forest Jacket"/>
<div>
<p><b>Forest Jacket</b></p>
<p>Size: M</p>
</div>
<p class="price">$54</p>
<img class="quantity" src="images/quantity.svg" />
<p>$54</p>
<div></div>
</div>
<div class="cart-line"></div>
<div class="jacket-specs">
<img class="thumb-2" src="images/jacket_2-1.jpg" alt="Men's Edge Jacket"/>
<div>
<p><b>Edge Jacket</b></p>
<p>Size: M</p>
</div>
<p class="price">$58</p>
<img class="quantity" src="images/quantity.svg" />
<p>$58</p>
<div></div>
</div>
<div class="cart-line"></div>
<div class="back-continue confirmation">
<a class="back" href="index.html"><b><--Back to Shopping</b></a>
</div>
</div>

<section class="login">
<h5>Order no #23950</h5>
<h3>Thanks for your order!</h3>
<p>Your new jacket will be with you very soon. We’ll send you an e-mail when it’s on it’s way!</p>
<p>You can also log into your account to get updates and manage your order.</p>
<form>
<h4>Want to get discounts, news and more straight to your inbox?</h4>
<label for="email">enter your e-mail</label>
<input type="email" name="email">
<input type="submit" class="btn-large loginBtn" value="sign up!">
</form>
</section>
</main>
</div>
</body>
</html>
12 changes: 5 additions & 7 deletions checkout.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="jacket-container">
<div class="top-bar">
<h1 class="h1-about">Shopping Cart</h1>
<img class="progress-bar" src="images/checkout-progress-bar.svg" alt="step 1: review shopping cart"/>
<img class="progress-bar" src="images/components/checkout-1.svg" alt="step 1: review shopping cart"/>
</div>
<div class="line"></div>
<div class="info-line">
Expand Down Expand Up @@ -77,7 +77,7 @@ <h1 class="h1-about">Shopping Cart</h1>
</div>
</div>
<div class="back-continue">
<a class="back" href="mens.html"><b><--Back to Shopping</b></a>
<a class="back" href="index.html"><b><--Back to Shopping</b></a>
<p class="continue"><b>Continue</b></p>
</div>
</div>
Expand All @@ -87,10 +87,9 @@ <h5>Login</h5>
<form action="" method="GET" id="loginForm">
<label for="userName">User Name </label>
<input type="text" name="userName" id="userName" required/>
<!-- <div class="loginError" id="userNameError">Username is incorrect</div> -->
<label for="password">Password </label>
<input type="password" name="password" id="password" required/>
<!-- <div class="loginError" id="passwordError">Password is incorrect</div> -->
<div class="formError" id="formError">Username or password is incorrect</div>
<div class="flex">
<input type="checkbox" name="remember-me" id="checkbox" />
<label for="checkbox">Remember Me</label>
Expand All @@ -99,12 +98,11 @@ <h5>Login</h5>
<p>Don't have an account?</p>
<p class="signup">Sign Up</p>
<p>or</p>
<p class="signup">Continue as a Guest</p>
<input id="loginBtn" type="submit" value="CONTINUE" />
<a class="signup" href="checkout-2.html">Continue as a Guest</p>
<a class="loginBtn btn-large" href="checkout-2.html">continue</a>
</form>
</section>
</main>
</div>
<script src="js/script.js"></script>
</body>
</html>
Binary file modified images/.DS_Store
View file
Binary file not shown.
Binary file modified images/buttons/.DS_Store
View file
Binary file not shown.
Binary file removed images/buttons/Group [email protected]
View file
Binary file not shown.
Binary file removed images/buttons/button-add-to-cart.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Binary file not shown.
Binary file removed images/buttons/button-buy-now.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Binary file not shown.
Binary file removed images/buttons/button-cont-shopping.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Binary file not shown.
Binary file removed images/buttons/button-mens.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Binary file not shown.
Binary file removed images/buttons/button-pay.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Binary file not shown.
Binary file removed images/buttons/button-signup.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Binary file not shown.
Binary file removed images/buttons/button-womens.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Binary file not shown.
Binary file removed images/buttons/continue.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Binary file not shown.
0 images/buttons/Group [email protected] → images/buttons/new.png
View file
File renamed without changes
Binary file removed images/buttons/neww.png
View file
Binary file not shown.
Binary file modified images/buttons/sale.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/buttons/send.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Binary file not shown.
17 changes: 0 additions & 17 deletions images/buttons/shop-mens.svg
View file

This file was deleted.

17 changes: 0 additions & 17 deletions images/buttons/shop-womens.svg
View file

This file was deleted.

Binary file removed images/buttons/suscribe.png
View file
Binary file not shown.
Binary file removed images/buttons/[email protected]
View file
Diff not rendered.
Loading

0 comments on commit d239a45

Please sign in to comment.