Skip to content

Pankaj #36

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
KalashThakur wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Pankaj #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da7b90c
my code
pankajsajwan12 Apr 3, 2022
94bdaf3
Merge branch 'main' into pankaj
pankajsajwan12 Apr 3, 2022
fd990b6
little change
pankajsajwan12 Apr 3, 2022
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
23 changes: 13 additions & 10 deletions bag.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3>SHOPPING BAG</h3>
</div>
<div id="bag-right-div">
<div id="main-div-bag-right"></div>
<div id="gust-checkout">
<!-- <div id="gust-checkout">
<div id="gust-checkout-text">
<h3>OR</h3>
<p>GUEST CHECKOUT</p>
Expand All @@ -54,7 +54,7 @@ <h3>OR</h3>
<div id="gust-input-button">
<button class="gust-button">CONTINUE AS GUEST</button>
</div>
</div>
</div> -->
</div>
</div>
<div id="totalPrice">
Expand All @@ -72,14 +72,15 @@ <h3>OR</h3>
</script>
<!-- <script src="/script/bag.js"></script>/ -->
<script type="module">
// let bagSing = document.getElementById("bag-lg");
// bagSing.innerHTML=singupPankaj();
import { navbar, footer } from "./components/header.js";
console.log(navbar);


let header = document.getElementById("bag-header");
header.innerHTML = navbar();

let bagfooter = document.getElementById("bag-footer");
bagfooter.innerHTML=footer();
bagfooter.style.marginTop = "20px";


// link navbar on click
document.querySelector("#skincare").addEventListener("click",()=>{
Expand Down Expand Up @@ -110,9 +111,7 @@ <h3>OR</h3>
window.location.href="catg perfume.html"
}

let bagfooter = document.getElementById("bag-footer");
// bagfooter.innerHTML=footer();
bagfooter.style.marginTop = "20px";


import showDataOnbag from "./script/bag.js";
console.log(showDataOnbag);
Expand All @@ -123,11 +122,13 @@ <h3>OR</h3>

showitemInBag = showDataOnbag(showData, showitemInBag);


// showing sing up data
import singupPankaj from "./newlogin.js";
console.log(singupPankaj);

let loginData = document.getElementById("main-div-bag-right");
loginData.innerHTML = singupPankaj();
loginData.innerHTML=singupPankaj();

document.getElementById("onclick").addEventListener("click", () => {
showTotal();
Expand All @@ -144,6 +145,8 @@ <h3>OR</h3>
};
showTotal();


// login sing in
document.querySelector("#userSign").addEventListener("click", () => {
signin();
});
Expand Down
2 changes: 1 addition & 1 deletion components/header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const navbar = () => {
</div>
<div class="account" id="account3" >
<div class="bag-icon"></div>
<div id="account-Bag" class="account-Singin"><a href="bag.html">Bag</a></div>
<div id="account-Bag" class="account-Singin"><a href="cartF.html">Bag</a></div>
<div id="total" class="totalBag-item">0</div>
</div>
</div>
Expand Down
22 changes: 11 additions & 11 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@ <h6 onclick="signin()">New Here?</h6>
</div>

<div class="div1">
<input type="text" placeholder="Email Adress" id="useremail">
<input type="text" placeholder="Password" id="userpass">
<p>Forget Password</p>
<input type="text" class="input" placeholder="Email Adress" id="useremail">
<input type="text" class="input" placeholder="Password" id="userpass">
<p class="p">Forget Password</p>
<button id="btt">Sign In</button>
</div>
<div class="div2">
<input type="text" placeholder="First Name" id="name" class="input-field" required>
<input type="text" placeholder="Last Name">
<input type="text" placeholder="Email Adress" id="email" class="input-field" required>
<input type="text" placeholder="Password" id="password" class="input-field" required>
<p>Please enter a minimum of 8 characters.</p>
<input type="text" placeholder="Re-enter Password">
<input type="text" class="input" placeholder="First Name" id="name" class="input-field" required>
<input type="text" class="input" placeholder="Last Name">
<input type="text" class="input"placeholder="Email Adress" id="email" class="input-field" required>
<input type="text" class="input" placeholder="Password" id="password" class="input-field" required>
<p class="p">Please enter a minimum of 8 characters.</p>
<input type="text" class="input" placeholder="Re-enter Password">
<button id="submit">Register</button>

</div>

</div>

</div>
</div> -->
</div>
</div>
<div id="homenavbar"></div>

Expand Down Expand Up @@ -155,7 +155,7 @@ <h2 id="promo"><span>New Arrivals</span></h2>

</div>
</body>
<script src="lg.js"></script>
<!-- <script src="lg.js"></script> -->
<script src="./script/home.js"></script>
<script src="./script/data.js"></script>

Expand Down
6 changes: 3 additions & 3 deletions puneeth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="./style/header.css">
<link rel="stylesheet" href="signup.css">
<link rel="stylesheet" href="./style/signup.css">
<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css" integrity="sha512-KfkfwYDsLkIlwQp6LFnl8zNdLGxu9YAA1QvwINks4PhcElQSvqcyVLLD9aMhXd13uQjoXtEKNosOWaZqXgel0g==" crossorigin="anonymous" referrerpolicy="no-referrer" /> -->
</head>
<body>
Expand Down Expand Up @@ -209,15 +209,15 @@ <h6 onclick="signin()">New Here?</h6>
<div class="div1">
<input type="text" placeholder="Email Adress" id="useremail">
<input type="text" placeholder="Password" id="userpass">
<p>Forget Password</p>
<p class="p">Forget Password</p>
<button id="btt">Sign In</button>
</div>
<div class="div2">
<input type="text" placeholder="First Name" id="name" class="input-field" required>
<input type="text" placeholder="Last Name">
<input type="text" placeholder="Email Adress" id="email" class="input-field" required>
<input type="text" placeholder="Password" id="password" class="input-field" required>
<p>Please enter a minimum of 8 characters.</p>
<p class="p">Please enter a minimum of 8 characters.</p>
<input type="text" placeholder="Re-enter Password">
<button id="submit">Register</button>

Expand Down
5 changes: 3 additions & 2 deletions style/bag.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ body{
font-size: 20px;
text-transform: uppercase;
text-align: center;
height: auto;
}
#gust-checkout{
text-align: center;
Expand Down Expand Up @@ -102,7 +103,6 @@ body{
.login{
width: 100%;
/* height: 500px; */
/* z-index: 1; */
background: white;
display: flex;
justify-content: center;
Expand All @@ -115,6 +115,7 @@ display: none;
/* height: 100%; */
width: 90%;
background: white;
/* display: block; */
margin-top: 80px;
}
#cont{
Expand All @@ -126,7 +127,7 @@ display: none;
text-align: center;
align-content: center;
cursor: pointer;
/* margin-top: 20px; */
margin-top: 20px;
}
#signup{
display: flex;
Expand Down
3 changes: 3 additions & 0 deletions style/header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ a{
.bag{
color: black;
}
#account-Bag>a{
color: black
}
#mainmenu{
padding: 0;
margin: 0;
Expand Down
23 changes: 15 additions & 8 deletions style/signup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@


/* ------------signup css------------------------ */
/*
------------signup css------------------------ */
#lg{
position: absolute;
top: 0;
height: 100%;
margin-top: 20px;
}
.login{
position: absolute;
top: 0;
/* position: absolute;
top: 0; */
z-index: 1;
background: rgba(255, 255, 255, 0.918);
height: 100%;
width: 100%;
/* height: 100%; */
width: 100%;
display: flex;
justify-content: center;
align-items: center;
display: none;
display: none;


}
Expand Down Expand Up @@ -52,7 +59,7 @@
align-content: center;

}
p{
.p{
font-size: 0.4em;
text-align: left;
text-decoration: underline;
Expand Down Expand Up @@ -80,7 +87,7 @@ p{
.input{
display: block;
height: 20px;
width: 100%;
width: 30px;
font-size: 18px;
margin-bottom: 30px;
border: 1px solid rgb(139, 70, 139);
Expand Down