From c930bf7aac7c7e6c193074a3586a2ba35f3dfd91 Mon Sep 17 00:00:00 2001 From: Kavish Paraswar Date: Sat, 5 Oct 2024 19:10:03 +0530 Subject: [PATCH 01/91] The neccesary changes are done which includes:- Now , The shape of the email input tag does match the design of the message input box in services ,collections ,etc pages . I added more social media tags, such as YouTube and Snapchat, with the same features as the existing ones. The navbar was doubled in this ,also the items in the cart had small font size ,all the change are done --- Css-files/content.css | 22 +- Html-files/cart.html | 29 +- Html-files/menu.html | 793 ++++++++++++++++++++++-------------------- index.html | 2 +- 4 files changed, 448 insertions(+), 398 deletions(-) diff --git a/Css-files/content.css b/Css-files/content.css index b075a566..22badc66 100644 --- a/Css-files/content.css +++ b/Css-files/content.css @@ -119,7 +119,7 @@ body { .mainhead { text-align: center; padding-top: 30px; - padding-bottom: 50px; + /* padding-bottom: 50px; */ } .mainhead h1 { font-family: Georgia; @@ -452,7 +452,7 @@ input } .social-icons a{ - font-size: 1.2rem; + font-size: 1rem; padding: 15px; text-decoration: none; color: brown !important; @@ -469,6 +469,12 @@ input .fa-twitter:hover { color:#00B6F1; } +.fa-youtube:hover { + color: #FF0000; +} +.fa-snapchat:hover { + color: yellow; +} .cart-section{ padding: 55px 70px 30px 70px; @@ -494,6 +500,9 @@ input border: 2px solid black; width: 75%; } +td{ + font-size: 20px; +} #bill{ color: rgb(196, 74, 74); @@ -552,16 +561,21 @@ input #contactForm input, #contactForm textarea { - width: 50%; + width: 64%; padding: 20px; + font-size: 15px; margin: 5px; border-radius: 10px; border: none; } +#contactForm input{ + width: 76%; + font-size: 15px; +} #contactForm h3 { height: 30px; - color: #141414; + color: hsl(357, 82%,35%); } #contactForm textarea { height: 100px; diff --git a/Html-files/cart.html b/Html-files/cart.html index b0f76487..ad0a1afd 100644 --- a/Html-files/cart.html +++ b/Html-files/cart.html @@ -250,6 +250,7 @@ color: white; border: 3px solid whitesmoke; } + @@ -318,23 +319,7 @@

C A R T

-
-
- -
- -
-

C A R T

-
-
+
@@ -433,15 +418,17 @@

Contact Us!

Follow Us

Stay connected with us on social media for the latest updates, latest collection, and vintage adventures. diff --git a/Html-files/menu.html b/Html-files/menu.html index ba7e2623..a4edce6d 100644 --- a/Html-files/menu.html +++ b/Html-files/menu.html @@ -8,7 +8,8 @@ - + @@ -16,230 +17,253 @@ - - - + + + @@ -273,18 +297,25 @@

-

O U R   C O L L E C T I O N

+

O U R   C O L L E C T I O N +

+
+ Vintage Vibe +

Vintage Vibe!

+ +
+ + +
+ Services for Events +

Services for Events

+ +
+ + +
+ Retro Delivery Subscription +

Retro Delivery Subscription

+ +
+ +

From 8bef6acdd9aadecf22010772d49bd50224757033 Mon Sep 17 00:00:00 2001 From: tarunkumar2005 Date: Tue, 8 Oct 2024 17:41:00 +0530 Subject: [PATCH 03/91] Added the switch links for signup and login pages --- Html-files/login.html | 22 ++++++++++++++++++++++ Html-files/signup.html | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/Html-files/login.html b/Html-files/login.html index d4e62d66..b843d0fd 100644 --- a/Html-files/login.html +++ b/Html-files/login.html @@ -89,6 +89,26 @@ --ff-poppins: "Poppins", sans-serif; } +
@@ -142,6 +162,8 @@

LOGINLogin

+ +

diff --git a/Html-files/signup.html b/Html-files/signup.html index b9985cf9..4979b2d5 100644 --- a/Html-files/signup.html +++ b/Html-files/signup.html @@ -169,6 +169,26 @@ .area .way:nth-child(8):hover ~ .box{transform: rotateX(20deg) rotateY(0deg);} .area .way:nth-child(9):hover ~ .box{transform: rotateX(20deg) rotateY(-20deg);} +
@@ -241,6 +261,8 @@

SIGN U

+ + diff --git a/Html-files/cart.js b/Html-files/cart.js index addf6077..b5b29cab 100644 --- a/Html-files/cart.js +++ b/Html-files/cart.js @@ -93,12 +93,32 @@ const applyFirstTimeDiscount = () => { couponCode = generateCouponCode(); localStorage.setItem('couponCode', couponCode); } - if(document.getElementById('couponCode')){ - document.getElementById('couponCode').innerHTML = `Use coupon code ${couponCode} for 30% off!`; - alert(`Congratulations! Your coupon code is ${couponCode}. You've received a 30% discount on your first order.`); + if (document.getElementById('couponCode')) { + document.getElementById('couponCode').innerHTML = `Use coupon code ${couponCode} for 30% off!`; + + // Display the custom modal + document.getElementById('couponDisplay').innerText = couponCode; // Show the coupon code + document.getElementById('customAlert').style.display = "block"; // Show the modal } - } + +// Close the modal when the user clicks on the (x) +document.getElementById('closeModal').onclick = function() { + document.getElementById('customAlert').style.display = "none"; +} + +// Close the modal when the user clicks the OK button +document.getElementById('okButton').onclick = function() { + document.getElementById('customAlert').style.display = "none"; +} + +// Close the modal when the user clicks anywhere outside of the modal +window.onclick = function(event) { + if (event.target == document.getElementById('customAlert')) { + document.getElementById('customAlert').style.display = "none"; + } +} + window.onload = applyFirstTimeDiscount; function updateBadgeCount() { From 42af69f6d2a88cd84fba1fab35bbeff3f4540719 Mon Sep 17 00:00:00 2001 From: priya Date: Tue, 8 Oct 2024 18:17:34 +0530 Subject: [PATCH 05/91] added dark mode button --- index.html | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/index.html b/index.html index 2c04a774..d3d689c4 100644 --- a/index.html +++ b/index.html @@ -14,6 +14,9 @@ + + + + + + @@ -484,26 +485,26 @@

"Step into the past and discover our latest additions!
Explore our new arrivals and uncover the charm of a bygone era!"

+

"Step into the past and discover our latest additions!
Explore our new arrivals and uncover the charm of a bygone era!"

-
+
Biryani

60s-style florals

From aromatic curries to flavorful biryanis, our menu showcases the diversity and deliciousness of Indian cuisine.

-
+
Plate

60's Dinning Items

Elegant porcelain plates with delicate floral patterns. Each plate tells a story of family gatherings and special occasions.

-
+
Candy

Whimsical Nostalgia: The Stardust Bonbon

The Stardust Bonbon, a sweet relic from an era when the universe was our playground.

@@ -515,19 +516,19 @@

Whims
-

-

Bringing happiness
to you

+

+

Bringing happiness to you

Order your favourite vintage collections!

-
-
-
+
+
+

Online Delivery


Order Online
-
+

Click & Collect


Take out Order
@@ -547,25 +548,25 @@

"Get r

diff --git a/style.css b/style.css index cc0e934a..97ce82e6 100644 --- a/style.css +++ b/style.css @@ -222,15 +222,17 @@ body { gap: 20px; } - .box { + .service_item { text-align: center; flex: 1; + padding: 10px; + margin: 5px 0; } - .box h2 { + .service_item h2 { font-family: var(--ff-philosopher); color: hsl(357, 82%, 35%); - font-size: 1.5rem; + font-size: 1.7rem; margin-bottom: 10px; } @@ -240,6 +242,7 @@ body { color: white; padding: 12px 30px; font-size: 1rem; + margin-top: 10px; text-decoration: none; border-radius: 10px; transition: background-color 0.3s ease; From 2c6499b1cb520167cb4c25320d31fe7e96a61f3d Mon Sep 17 00:00:00 2001 From: Amit Roy Date: Wed, 9 Oct 2024 22:08:52 +0530 Subject: [PATCH 21/91] [Feature Request]: Add a forgot password page --- Css-files/forgotpass1.css | 145 ++++++++++++++++++++++++++++++++++++ Html-files/forgot-pass.html | 134 +++++++++++++++++++++++++++++++++ Html-files/login.html | 11 +++ 3 files changed, 290 insertions(+) create mode 100644 Css-files/forgotpass1.css create mode 100644 Html-files/forgot-pass.html diff --git a/Css-files/forgotpass1.css b/Css-files/forgotpass1.css new file mode 100644 index 00000000..245aee19 --- /dev/null +++ b/Css-files/forgotpass1.css @@ -0,0 +1,145 @@ +@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400;700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Philosopher:ital,wght@0,400;0,700;1,400;1,700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Philosopher:ital,wght@0,400;0,700;1,400;1,700&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); + +body { + margin: 0; + font-family: 'Noto Sans', sans-serif; + overflow: hidden; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100%25' height='100%25' viewBox='0 0 1600 800'%3E%3Cg %3E%3Cpath fill='%23ffb9b0' d='M486 705.8c-109.3-21.8-223.4-32.2-335.3-19.4C99.5 692.1 49 703 0 719.8V800h843.8c-115.9-33.2-230.8-68.1-347.6-92.2C492.8 707.1 489.4 706.5 486 705.8z'/%3E%3Cpath fill='%23ffc1b7' d='M1600 0H0v719.8c49-16.8 99.5-27.8 150.7-33.5c111.9-12.7 226-2.4 335.3 19.4c3.4 0.7 6.8 1.4 10.2 2c116.8 24 231.7 59 347.6 92.2H1600V0z'/%3E%3Cpath fill='%23ffc8bf' d='M478.4 581c3.2 0.8 6.4 1.7 9.5 2.5c196.2 52.5 388.7 133.5 593.5 176.6c174.2 36.6 349.5 29.2 518.6-10.2V0H0v574.9c52.3-17.6 106.5-27.7 161.1-30.9C268.4 537.4 375.7 554.2 478.4 581z'/%3E%3Cpath fill='%23ffcfc6' d='M0 0v429.4c55.6-18.4 113.5-27.3 171.4-27.7c102.8-0.8 203.2 22.7 299.3 54.5c3 1 5.9 2 8.9 3c183.6 62 365.7 146.1 562.4 192.1c198.8 51.8 403.4 40.8 597.3-14.8V0H0z'/%3E%3Cpath fill='%23FFD6CE' d='M181.8 259.4c98.2 6 191.9 35.2 281.3 72.1c2.8 1.1 5.5 2.3 8.3 3.4c171 71.6 342.7 158.5 531.3 207.7c198.8 51.8 403.4 40.8 597.3-14.8V0H0v283.2C59 263.6 120.6 255.7 181.8 259.4z'/%3E%3Cpath fill='%23ffdcd4' d='M1600 0H0v136.3c62.3-20.9 127.7-27.5 192.2-19.2c93.6 12.1 180.5 47.7 263.3 89.6c2.6 1.3 5.1 2.6 7.7 3.9c158.4 81.1 319.7 170.9 500.3 223.2c210.5 61 430.8 49 636.6-16.6V0z'/%3E%3Cpath fill='%23ffe1d9' d='M454.9 86.3C600.7 177 751.6 269.3 924.1 325c208.6 67.4 431.3 60.8 637.9-5.3c12.8-4.1 25.4-8.4 38.1-12.9V0H288.1c56 21.3 108.7 50.6 159.7 82C450.2 83.4 452.5 84.9 454.9 86.3z'/%3E%3Cpath fill='%23ffe6df' d='M1600 0H498c118.1 85.8 243.5 164.5 386.8 216.2c191.8 69.2 400 74.7 595 21.1c40.8-11.2 81.1-25.2 120.3-41.7V0z'/%3E%3Cpath fill='%23ffebe4' d='M1397.5 154.8c47.2-10.6 93.6-25.3 138.6-43.8c21.7-8.9 43-18.8 63.9-29.5V0H643.4c62.9 41.7 129.7 78.2 202.1 107.4C1020.4 178.1 1214.2 196.1 1397.5 154.8z'/%3E%3Cpath fill='%23FFF0EA' d='M1315.3 72.4c75.3-12.6 148.9-37.1 216.8-72.4h-723C966.8 71 1144.7 101 1315.3 72.4z'/%3E%3C/g%3E%3C/svg%3E"); + background-size: cover; +} +.circle { + z-index: 998; + width: 20px; + height: 20px; + border-radius: 50%; + pointer-events: none; + animation: colors 5s infinite; + position: fixed; + transform: translate(-50%, -50%); +} +.card-forgot { + width: 60%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + padding: 30px 35px; + border-radius: 20px; + box-shadow: 0px 10px 40px rgba(0, 0, 0, 0.15); + background: rgba(236, 236, 236, 0.8); + backdrop-filter: blur(10px); /* Soft background blur effect */ + animation: fadeIn 2s ease-in-out; +} + +@keyframes fadeIn { + 0% { + opacity: 0; + transform: translateY(30px); + } + 100% { + opacity: 1; + transform: translateY(0); + } +} +.card-forgot h1 { + color: hsl(203, 30%,26%); + font-family: "Philosopher", sans-serif; + text-transform: uppercase; + text-align: center; +} + +.home-btn { + position: absolute; + top: 32px; + font-family: "Philosopher", sans-serif; + left: 30px; +} + +.home-btn a { + font-size: 30px; + text-decoration: none; + color: rgb(134, 78, 112); + position: relative; + transition: color 0.3s ease; /* Smooth color transition */ +} + +.home-btn a:hover { + color: rgb(141, 108, 108); /* Darken color on hover */ +} + +.home-btn a::after { + content: ''; + position: absolute; + width: 100%; + height: 1.5px; + bottom: -5px; + left: 0; + background-color: transparent; + transition: background-color 0.3s ease; /* Smooth transition */ +} + +.home-btn a:hover::after { + background-color: rgb(141, 108, 108); +} +.textfield { + width: 100%; + margin-bottom: 15px; +} + +.textfield > input { + width: 100%; + height: 45px; + border-radius: 15px; + border: 1px solid #b38484; + padding-left: 10px; + outline: none; + transition: border 0.3s ease; /* Smooth border transition */ +} + +.textfield > input:focus { + border: 2px solid #a76666; /* Highlight border on focus */ +} +.btn-reset { + width: 100%; + padding: 10px 0; + border: none; + background-color: #e55d5d; + color: #fff; + font-size: 18px; + font-weight: bold; + border-radius: 10px; + cursor: pointer; + transition: background-color 0.3s ease; +} + +.btn-reset:hover { + background-color: #ff4a4a; +} + +.error-message { + color: red; + font-family: "Poppins", sans-serif; + margin-top: 10px; +} +.switch-link { + text-align: center; + margin-top: 20px; + font-family: "Poppins", sans-serif; +} + +.switch-link a { + color: hsl(0, 100%, 50%); + text-decoration: none; + font-weight: bold; + transition: color 0.3s ease; +} + +.switch-link a:hover { + color: hsl(203, 30%, 26%); +} \ No newline at end of file diff --git a/Html-files/forgot-pass.html b/Html-files/forgot-pass.html new file mode 100644 index 00000000..34929827 --- /dev/null +++ b/Html-files/forgot-pass.html @@ -0,0 +1,134 @@ + + + + + + + + + + Retro - Forgot Password + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+

Forgot Password

+
+
+ + +
+ +

+
+ +
+
+ + + + diff --git a/Html-files/login.html b/Html-files/login.html index b843d0fd..eac4de4a 100644 --- a/Html-files/login.html +++ b/Html-files/login.html @@ -108,6 +108,15 @@ .switch-link a:hover { color: hsl(203, 30%, 26%); } + .forgot-link{ + text-decoration: none; + color: #3a3a3a; + margin-bottom: 10px; + } + .forgot-link:hover{ + text-decoration: underline; + color: #000; + } @@ -159,7 +168,9 @@

LOGINPassword

+ Forgot Password ? + or

From 41b58cb0f71a72b40f19848d048df61605720e6d Mon Sep 17 00:00:00 2001 From: Vijitverm1234 <143703788+Vijitverm1234@users.noreply.github.com> Date: Wed, 9 Oct 2024 22:24:00 +0530 Subject: [PATCH 22/91] resolving the conflicts --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 2fe0d747..2ca83bed 100644 --- a/index.html +++ b/index.html @@ -533,8 +533,8 @@

Click & Collect


Take out Order
-
-
+ +
- -