From 455914a6882081ae9786ff9b205e5d6b51d959aa Mon Sep 17 00:00:00 2001 From: Nishant Kaushal <101548649+nishant0708@users.noreply.github.com> Date: Wed, 5 Jun 2024 03:23:08 +0530 Subject: [PATCH 1/7] backend using firebase --- Html-files/login.html | 130 ++++++++++++++++++++++++++++------------ Html-files/signup.html | 133 +++++++++++++++++++++++++++++++---------- 2 files changed, 192 insertions(+), 71 deletions(-) diff --git a/Html-files/login.html b/Html-files/login.html index 459f8712..07584872 100644 --- a/Html-files/login.html +++ b/Html-files/login.html @@ -5,7 +5,9 @@ - + + + Login Here
Delicious food is waiting for You

LOGIN


- +
- +
@@ -45,7 +47,7 @@

LOGIN

OR

- +
@@ -57,44 +59,94 @@

easing: 'ease', once: false, }); - - - + // Google Sign-In + document.getElementById('google-login').addEventListener('click', () => { + const provider = new firebase.auth.GoogleAuthProvider(); + auth.signInWithPopup(provider) + .then((result) => { + const user = result.user; + + // Save user info to Realtime Database if new user + if (result.additionalUserInfo.isNewUser) { + return database.ref('users/' + user.uid).set({ + name: user.displayName, + email: user.email, + username: user.email.split('@')[0] + }); + } + }) + .then(() => { + alert('Logged in with Google!'); + window.location.href = '../index.html'; // Redirect to homepage or dashboard + }) + .catch((error) => { + console.error('Error logging in with Google:', error); + alert(error.message); + }); + }); + + - + \ No newline at end of file diff --git a/Html-files/signup.html b/Html-files/signup.html index 4e1d1e99..3a837b3d 100644 --- a/Html-files/signup.html +++ b/Html-files/signup.html @@ -5,13 +5,15 @@ Sign up - + + + - + @@ -36,7 +38,7 @@

SIGN UP

- +
@@ -52,37 +54,104 @@

OR

+ - - - + + + - \ No newline at end of file + From a36e29c83d8050d33d2c024f27dcd26e81110553 Mon Sep 17 00:00:00 2001 From: Komal Maurya <145214525+KomalMaurya@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:46:41 +0530 Subject: [PATCH 2/7] Add files via upload --- style.css | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 103 insertions(+), 2 deletions(-) diff --git a/style.css b/style.css index b0a12f0f..af120a3a 100644 --- a/style.css +++ b/style.css @@ -33,6 +33,7 @@ body { .transparent-image { opacity: 0.8; + margin-top: 5px; } /* Navbar link hover effect */ @@ -104,13 +105,17 @@ body { .search-bar { position: relative; display: flex; + margin-top: 10px; } .search-bar input[type="text"] { width: 100%; padding: 10px; border: 1px solid #ccc; border-radius: 5px; - margin-top: 10px; +} + +.ul2 li{ + cursor: pointer; } .search-bar button { @@ -120,7 +125,7 @@ body { border-radius: 5px; cursor: pointer; margin-left: 5px; - margin-top: 10px; + /* margin-top: 5px; */ } .search-bar button:hover { @@ -1286,6 +1291,101 @@ nav { transform: translateY(-8px) rotate(-45deg); } +@media (max-width: 999px){ + .navbar a{ + font-size: 0.8rem; + } + .transparent-image{ + max-width: 90%; + max-height: 40%; + margin-top: 5px; + margin-left: -10px; + } + .navigbar{ + margin-left: 4px; + } + +} + +@media(max-width:950px){ + .transparent-image{ + margin-left: -25px; + max-width: 100%; + } + .navbar a{ + font: 0.6rem; + } + .ul2 li{ + margin-top: 3px; + gap: 15px; + } + .search-bar{ + margin-top: 13px; + margin-right: -50px; + } + + .search-bar input{ + max-width: 70%; + } +} + +@media(max-width:890px){ + .transparent-image{ + /* margin-left: -25px; */ + transition: all 0.4s; + max-width: 100%; + } + .ul1{ + margin-left: -10px; + gap: 15px; + } + .ul2 li{ + margin-right: -15px; + } + .ul2{ + gap: 25px; + } + .search-bar{ + margin-right: -95px; + } + .search-bar input{ + /* max-height: 60%; */ + max-width: 50%; + } +} + +@media(max-width: 780px){ + .transparent-image{ + max-height: 40%; + max-width: 100%; + } + .search-bar{ + margin-right: -90px; + } + .search-bar input{ + margin-right: -2px; + max-height: 80%; + + } + .search-bar button{ + margin-right: -20px; + max-width: 40%; + max-height: 70%; + margin-top: 4px; + } + .ul1{ + gap: 10px; + } + .ul2 li{ + margin-top: 7px; + } +} + +@media(max-width:768px){ + .transparent-image{ + margin-left: 5px; + } +} /* Hide hamburger menu by default */ .hamburger-menu { display: none; @@ -1317,6 +1417,7 @@ nav { color: white; text-decoration: none; font-size: 16px; + text-align: center; } /* Additional styling for active state of hamburger menu */ From bb8cf4107b8cdc9351a2eb7759b3aebea4a550cf Mon Sep 17 00:00:00 2001 From: Kashvi Date: Wed, 5 Jun 2024 16:42:26 +0530 Subject: [PATCH 3/7] Fixed the size of Your message button in Footer --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index a9c2911d..394255fa 100644 --- a/style.css +++ b/style.css @@ -556,7 +556,7 @@ label { input, textarea { height: 30px; - width: max-content; + width: auto; padding: 3px; box-sizing: border-box; border-radius: 4px; From 0e190fbdbf909bff7409868d21ec26e2b1b6ae7e Mon Sep 17 00:00:00 2001 From: Husan7 <162671639+Husan7@users.noreply.github.com> Date: Wed, 5 Jun 2024 18:06:21 +0530 Subject: [PATCH 4/7] Services cards animation --- Css-files/services1.css | 93 ++++++++++++++++++++++++++++++++++++++++ Html-files/services.html | 74 ++++++++++++-------------------- 2 files changed, 121 insertions(+), 46 deletions(-) create mode 100644 Css-files/services1.css diff --git a/Css-files/services1.css b/Css-files/services1.css new file mode 100644 index 00000000..22fff31f --- /dev/null +++ b/Css-files/services1.css @@ -0,0 +1,93 @@ +*{ + margin: 0; + padding: 0; + box-sizing: border-box; + font-family: 'Poppins', sans-serif; +} +.container{ + position: relative; + display: flex; + justify-content: center; + align-items: center; + flex-wrap: wrap; + gap: 100px 50px; + padding: 100px 50px; +} +/* background cards size and rounding */ +.container .card +{ + position: relative; + display: flex; + justify-content: center; + align-items: flex-start; + width: 350px; + height: 300px; + background: #fff; + border-radius: 20px; + box-shadow: 0 35px 80px rgba(0,0,0,0.15); + transition: 0.5s; +} +.container .card:hover +{ + height: 350px; +} +.container .card .imgbx +{ + position: absolute; + top: 20px; + width: 300px; + height: 220px; + background: #333; + border-radius: 12px; + transition: 0.5s; + overflow: hidden; +} +.container .card:hover .imgbx +{ + top: -100px; + scale: 0.75; + box-shadow: 0 15px 45px rgba(0,0,0,0.15); +} +.container .card .imgbx img{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + object-fit: cover; +} +.container .card .content +{ + position: absolute; + top: 252px; + width: 100%; + padding: 0 30px; + height: 35px; + overflow: hidden; + text-align: center; + transition: 0.5s; +} +.container .card:hover .content +{ + top: 150px; + height: 250px; +} +.container .card .content h2{ + font-size: 1.33em; + font-weight: 700; + color: var(--clr); +} +.container .card .content p{ + color: #233; +} +.container .card .content a{ + position: relative; + top: 15px; + display: inline-block; + padding: 12px 25px; + background: var(--clr); + color: #fff; + font-weight: 500; + text-decoration: 8px; + border-radius: 8px; +} \ No newline at end of file diff --git a/Html-files/services.html b/Html-files/services.html index 93d4bd33..02f4cf1e 100644 --- a/Html-files/services.html +++ b/Html-files/services.html @@ -16,6 +16,7 @@ + @@ -58,56 +59,37 @@

S E R V I C E S

- -
-
- -

Food Tour and Experiences

- - - + +
+
+
+
-
- -

Catering Services for Events

- - - - -
-
-

S E R V I C E S

+
+

Food Tour and Experiences

+ Take Experience +
+
+
+
+ +
+
+

Catering Services for Events

+ Book Catering +
+
+
+
+ +
+
+

Meal Delivery Subscription

+ Take Subscription
-
-
- -

Food Tour and Experiences

- - - -
-
- -

Catering Services for Events

- - - -
-
- -

Meal Delivery Subscription

- - - -
-
+
From c8da470e24ff78a16391d86e37832cb2b4731d43 Mon Sep 17 00:00:00 2001 From: Husan7 <162671639+Husan7@users.noreply.github.com> Date: Wed, 5 Jun 2024 18:19:26 +0530 Subject: [PATCH 5/7] Update services.html --- Html-files/services.html | 55 +--------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/Html-files/services.html b/Html-files/services.html index 6bb82c7a..95b7822d 100644 --- a/Html-files/services.html +++ b/Html-files/services.html @@ -93,59 +93,6 @@

Meal Delivery Subscription

-
-======= - -
-
- -

Food Tour and Experiences

- - - -
-
- -

Catering Services for Events

- - - - -
-
-

S E R V I C E S

-
-
-
- -

Food Tour and Experiences

- - - -
-
- -

Catering Services for Events

- - - -
-
- -

Meal Delivery Subscription

- - - -
-
-
-
@@ -387,4 +334,4 @@

Follow Us

- \ No newline at end of file + From bd231c75eba99f9f7effca7ac784dc483401be9a Mon Sep 17 00:00:00 2001 From: harini_sayani Date: Wed, 5 Jun 2024 20:34:34 +0530 Subject: [PATCH 6/7] font changed in home page --- index.html | 114 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/index.html b/index.html index ff444678..4f02fe37 100644 --- a/index.html +++ b/index.html @@ -140,19 +140,19 @@

-

amazing & delicious

-

+

amazing & delicious

+

Where every flavour
tells a story

-

+

come with family & feel the joy of mouthwatering food

- View Our Menu - + View Our Menu + @@ -171,36 +171,36 @@

-

Get 30% OFF on your first order!

-

Get 30% OFF on your first order!

-

Get 30% OFF on your first order!

+

Get 30% OFF on your first order!

+

Get 30% OFF on your first order!

+

Get 30% OFF on your first order!

-

"Savor the Flavors: Discover What Sets Our Restaurant's Cuisine Apart!"

+

"Savor the Flavors: Discover What Sets Our Restaurant's Cuisine Apart!"

-

Authentic Indian Flavors

-

From aromatic curries to flavorful biryanis, our menu showcases the diversity and +

Authentic Indian Flavors

+

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

-

Tech-Infused Dining Experience

-

+

Tech-Infused Dining Experience

+

Customers can use apps to place orders, customize their dishes, and even provide feedback, making their visit more convenient and interactive.

-

Innovative Fusion Dishes

-

The combinations of Indian and international cuisines not only tantalize taste buds +

Innovative Fusion Dishes

+

The combinations of Indian and international cuisines not only tantalize taste buds but also provide unique experience.

@@ -210,25 +210,25 @@

Innovative Fusion Dishes

-

Bringing
happiness
to you

-

Food is more than sustenance; it's a source of pure
happiness. From the first bite of a favorite +

Bringing
happiness
to you

+

Food is more than sustenance; it's a source of pure
happiness. From the first bite of a favorite childhood dish
to the thrill of discovering new flavors, food has a unique
way of filling our hearts with joy.

-

Online Delivery


- Order Online +

Online Delivery


+ Order Online
-

Click & Collect


- Take out Order +

Click & Collect


+ Take out Order
-

Restaurant Dining


+

Restaurant Dining


- Book Table + Book Table
@@ -236,8 +236,8 @@

Restaurant Dining


@@ -283,8 +283,8 @@

Juices

-->
-

Our Happy Clients

-

+

Our Happy Clients

+

At Foodie, we pride ourselves on delivering delicious meals & exceptional service. Don’t just take our word for it—hear what our satisfied customers have to say!

@@ -296,7 +296,7 @@

Our Happy Clients

- Matt Gilbert + Matt Gilbert
  • @@ -307,9 +307,9 @@

    Our Happy Clients

-

Foodie never disappoints! The food is always fresh, delicious, and delivered right +

Foodie never disappoints! The food is always fresh, delicious, and delivered right on time. My go-to for all my meals!

-

Jan 01, 2024

+

Jan 01, 2024

@@ -318,7 +318,7 @@

Our Happy Clients

- John Doe + John Doe
  • @@ -329,9 +329,9 @@

    Our Happy Clients

-

I love the variety on Foodie! There's something for everyone, and the delivery +

I love the variety on Foodie! There's something for everyone, and the delivery service is incredibly reliable

-

April 16, 2024

+

April 16, 2024

@@ -340,7 +340,7 @@

Our Happy Clients

- Laren Green + Laren Green
  • @@ -351,9 +351,9 @@

    Our Happy Clients

-

Fantastic service and mouth-watering dishes! Foodie has made my dining experience +

Fantastic service and mouth-watering dishes! Foodie has made my dining experience so much more convenient.

-

May 15, 2024

+

May 15, 2024

@@ -409,10 +409,10 @@

Our Happy Clients

-

Free Delivery!

-

Download the App now!

+

Free Delivery!

+

Download the App now!


-

For best discounts and free delivery download the app now from your Google Play Store or App Store.

+

For best discounts and free delivery download the app now from your Google Play Store or App Store.

Get it on Google Play Store Download the App now!