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

Contact US Conflict resolved #14 #532 #643 #660

Merged
merged 1 commit into from
May 30, 2024
Merged

Contact US Conflict resolved #14 #532 #643 #660

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
692 changes: 692 additions & 0 deletions Css-files/ContactUpdate.css
View file
Open in desktop

Large diffs are not rendered by default.

255 changes: 255 additions & 0 deletions Html-files/ContactUpdate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta name="Description" content="Enter your description here" />
<title>Contact us - Food Ordering Website</title>
<!-- bootstrap CDN -->
<link rel="shortcut icon" href="Foodie_Favicon.png" type="image/x-icon">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css"
integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<link rel="shortcut icon" type="image/x-icon" href="./Favicon image/favicon.ico">
<link
href="https://fonts.googleapis.com/css2?family=Fuggles&family=Mooli&family=Oswald:wght@600&family=Roboto:wght@100;300&display=swap"
rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Baloo+Bhai|Bree+Serif&display=swap" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
crossorigin="anonymous"></script>
<!-- OWN CSS -->
<link id="theme-link" rel="stylesheet" href="/Css-files/ContactUpdate.css">

</head>

<body data-bs-spy="scroll" data-bs-target=".navbar" data-bs-offset="100">
<!-- header design section -->
<nav>
<div class="navigbar">
<div class="logo">Foodie</div>
<button class="navbar-toggler" id="menu-toggle" aria-label="Toggle navigation">
<span class="bar"></span>
<span class="bar"></span>
<span class="bar"></span>
</button>
<!-- Hamburger menu list -->
<ul class="hamburger-menu" id="hamburger-menu">
<li><a href="../index.html">Home</a></li>
<li><a href="menu.html">Menu</a></li>
<li><a href="services.html">Services</a></li>
<li><a href="ContactUpdate.html">Contact Us</a></li>
<li><a class="" href="/Html-files/login.html">Login</a></li>
<li><a class="" href="signup.html">Sign Up</a></li>
<li><a class="" href="cart.html">Cart</a></li>
</ul>
<ul class="ul1" id="nav-links">
<li><a href="../index.html">Home</a></li>
<li><a href="menu.html">Menu</a></li>
<li><a href="services.html">Services</a></li>
<li><a href="ContactUpdate.html">Contact Us</a></li>
</ul>
<div>
<ul class="ul2">
<li> <a class="" href="/Html-files/login.html">Login</a></li>
<li> <a class="" href="signup.html">Sign Up</a></li>
<li>
<a class="" href="cart.html"><i class="fa-solid fa-cart-shopping"></i></a>
</li>
</ul>
</div>
</div>
</nav>

<!--explore food section-->
<section id="explore-food">
<div class="explore-food wrapper">
<div class="container">
<div class="row">
<div class="col-sm-12">
<div class="text-content text-center">
<h2>Exclusive Offers</h2>
<p>Discover a world of flavors with our diverse culinary offerings. From savory dishes crafted with fresh, local ingredients to indulgent desserts that delight the senses, each bite tells a story. Savor the fusion of traditional recipes and innovative twists, bringing global tastes to your table. Taste the difference today!</p>
</div>
</div>
</div>
<div class="row pt-5">
<div class="col-lg-4 col-md-6 mb-lg-0 mb-5">
<div class="card border">
<img decoding="async" src="/Html-files/assets/Food-coupons.jpg" class="img-fluid">
<div class="p-3">
<h5>🎉 Grab your savings now with our unbeatable new discounts! 💸</h5>
<p>Don't miss out on our exclusive offers! 🎉 Enjoy massive discounts 💸 on your favorite items and save big on every purchase! 🛍️</p>
<button class="mt-2 main-btn">Read More</button>
</div>
</div>
</div>
<div class="col-lg-4 col-md-6 mb-lg-0 mb-5">
<div class="card border">
<img decoding="async" src="/Html-files/assets/Food-collaboration.jpg" class="img-fluid">
<div class="p-3">
<h5>🤝 Exciting new collaborations just launched! Discover the latest partnerships today! 🌟 </h5>
<p>Experience the thrill of our new collaborations! 🤩 Discover innovative partnerships and enjoy exclusive benefits now! 🌍✨</p>
<button class="mt-2 main-btn">Read More</button>
</div>
</div>
</div>
<div class="col-lg-4 col-md-6 mb-lg-0 mb-5">
<div class="card border">
<img decoding="async" src="/Html-files/assets/game.png" class="img-fluid">
<div class="p-3">
<h5>🎮 New games alert! Level up your fun with our latest releases! 🚀</h5>
<p>Dive into the excitement with our new game releases! 🎉 Challenge yourself and explore thrilling adventures today! 🕹️🌟</p>
<button class="mt-2 main-btn">Read More</button>
</div>
</div>
</div>
</div>
</div>
</div>
</section>


<!-- testimonial section -->
<section id="testimonial">
<div class="wrapper testimonial-section">
<div class="container text-center">
<div class="text-center pb-4">
<h2 class="text-dark" >Have A Great Taste !!</h2>
</div>
<div class="row">
<div class="col-sm-12 col-lg-10 offset-lg-1">
<div id="carouselExampleDark" class="carousel slide" data-bs-ride="carousel">
<div class="carousel-indicators">
<button type="button" data-bs-target="#carouselExampleDark" data-bs-slide-to="0" class="active"
aria-current="true" aria-label="Slide 1"></button>
<button type="button" data-bs-target="#carouselExampleDark" data-bs-slide-to="1"
aria-label="Slide 2"></button>
<button type="button" data-bs-target="#carouselExampleDark" data-bs-slide-to="2"
aria-label="Slide 3"></button>
</div>
<div class="carousel-inner">
<div class="carousel-item active">
<div class="carousel-caption">
<img decoding="async" src="/Html-files/assets/panipuri.jpg">
<p>"crispy shells, spicy tangy water, ultimate flavor explosion! 🌶️🌟💥"</p>
</div>
</div>
<div class="carousel-item">
<div class="carousel-caption">
<img decoding="async" src="/Html-files/assets/bruchetta.jpg">
<p>" Fresh tomatoes, basil, garlic on toasted bread. Italian delight! 🍅🍞"</p>
</div>
</div>
<div class="carousel-item">
<div class="carousel-caption">
<img decoding="async" src="/Html-files/assets/Ramen.jpg">
<p>"Savory broth, tender noodles, vibrant toppings. Japanese comfort food! 🍜"</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</section>


<!-- footer section -->

<footer>


<div class="foot-panel2">
<ul>
<p>Our Pages</p>
<a href="/index.html">Home</a>
<a href="/Html-files/menu.html">Menu</a>
<a href="/Html-files/services.html">Services</a>
<a href="/Html-files/ContactUpdate.html">Contact us</a>
<a href="/Html-files/cart.html">Cart</a>
</ul>

<ul>
<p> Exclusive Offers</p>
<a href="#">Foodie Discounts</a>
<a href="#">Limited-Time Promotions</a>
<a href="#">Special Event Packages</a>
<a href="#">Membership Benefits</a>
<a href="#">Early Access to New Recipes</a>
<a href="#">VIP Foodie Events</a>
<a href="#">Personalized Culinary Experiences</a>

</ul>

<ul>
<p>Payment Products</p>
<a href="#">Secure Checkout</a>
<a href="#">Credit/Debit Cards</a>
<a href="#">Online Payment</a>
<a href="#">Mobile Wallets</a>
<a href="#">Contactless Payments</a>
</ul>

<form class="newsletter" action="/submit" >
<h3>Contact Us</h3>
<!-- <div class="d-flex m-2">
<input class="form-control" placeholder="Enter Name Here" type="text">
</div> -->
<div class="d-flex m-2">
<input class="form-control" placeholder="Email Address Here" type="email">
</div>
<div class="d-flex m-2">
<input class="form-control" placeholder="Enter Message Here" type="text">
</div>
<br>
<button class="main-btn m-2" type="submit">Submit</button>
</form>
</div>


<div class="foot_panel4">
<div class="pages">
<h4>Follow Us</h4>
<div class="social-icons">
<a class="fa-brands fa-facebook" href="https://facebook.com" target="_blank"></a>
<a class="fa-brands fa-instagram" href="https://instagram.com" target="_blank"></a>
<a class="fa-brands fa-twitter" href="https://twitter.com" target="_blank"></a>
<a class="fa-brands fa-github" href="https://github.com" target="_blank"></a>
</div>
<p>Stay connected with us on social media for the latest updates, recipes, and foodie adventures.
</p>
<div class="copyright">
&copy; 2024 Foodies - All Rights Reserved | <span id="author">
<a href="https://www.linkedin.com/in/khushi-joshi-95a587256/" target="_blank">Khushi Joshi</a>
</span></p>
</div>
</div>
</div>
</footer>

<!-- go to top button -->
<a href="#" id="gotop-btn" style="position: fixed; bottom: 50px; right: 50px; padding: 10px; background-color: brown;"><i class="fa-solid fa-angle-up"></i></a>


<!-- JS Libraries -->
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
<!-- own js -->
<script>
function redirectLogin() {
window.location.href = "/login.html";
}

function redirectSignup() {
window.location.href = "Html-files/signup.html";
}
</script>
</body>

</html>

Binary file added Html-files/assets/Food-collaboration.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Html-files/assets/Food-coupons.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Html-files/assets/Food-game.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Html-files/assets/Ramen.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Html-files/assets/bruchetta.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Html-files/assets/game.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Html-files/assets/panipuri.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions Html-files/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@
style="background-image: url('contact_page_background_image.png'); background-size: cover; background-repeat: no-repeat; background-attachment: fixed;">

<header>
<!-- <nav class="navbarbg">
<ul id="header-items">
<li><a href="../index.html">Home</a></li>
<li><a href="menu.html">Menu</a></li>
<li><a href="services.html">Services</a></li>
<li><a href="contact.html">Contact us</a></li>
<li><a href="cart.html">Cart</a></li>
</ul>
</nav> -->
<!-- updated nav bar -->
<nav>
<div class="navigbar">
<div class="logo">Foodie</div>
Expand Down
4 changes: 2 additions & 2 deletions Html-files/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<li><a href="../index.html">Home</a></li>
<li><a href="menu.html">Menu</a></li>
<li><a href="services.html">Services</a></li>
<li><a href="contact.html">Contact Us</a></li>
<li><a href="ContactUpdate.html">Contact Us</a></li>
</ul>
<div>
<ul class="ul2">
Expand Down Expand Up @@ -344,7 +344,7 @@ <h3>Juices</h3>
<a href="../index.html">Home</a>
<a href="#">Menu</a>
<a href="services.html">Services</a>
<a href="contact.html">Contact</a>
<a href="ContactUpdate.html">Contact</a>
<a href="cart.html">Cart</a>
</ul>

Expand Down
4 changes: 2 additions & 2 deletions Html-files/services.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<li><a href="../index.html">Home</a></li>
<li><a href="menu.html">Menu</a></li>
<li><a href="services.html">Services</a></li>
<li><a href="contact.html">Contact Us</a></li>
<li><a href="ContactUpdate.html">Contact Us</a></li>
</ul>
<div>
<ul class="ul2">
Expand Down Expand Up @@ -217,7 +217,7 @@ <h2 class="testimonal__title">Priya Sharma</h2>
<a href="../index.html">Home</a>
<a href="menu.html">Menu</a>
<a href="#">Services</a>
<a href="contact.html">Contact</a>
<a href="ContactUpdate.html">Contact</a>
<a href="cart.html">Cart</a>
</ul>

Expand Down
6 changes: 3 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<li><a href="../index.html">Home</a></li>
<li><a href="Html-files/menu.html">Menu</a></li>
<li><a href="Html-files/services.html">Services</a></li>
<li><a href="Html-files/contact.html">Contact Us</a></li>
<li><a href="Html-files/ContactUpdate.html">Contact Us</a></li>
<li><a class="" onclick="redirectLogin()">Login</a></li>
<li><a class="" onclick="redirectSignup()">Sign Up</a></li>
<li><a class="" href="Html-files/cart.html">Cart</a></li>
Expand All @@ -61,7 +61,7 @@
<li><a href="../index.html">Home</a></li>
<li><a href="Html-files/menu.html">Menu</a></li>
<li><a href="Html-files/services.html">Services</a></li>
<li><a href="Html-files/contact.html">Contact Us</a></li>
<li><a href="Html-files/ContactUpdate.html">Contact Us</a></li>
</ul>
<div>
<ul class="ul2">
Expand Down Expand Up @@ -306,7 +306,7 @@ <h2>Download the App now!</h2>
<a href="#">Home</a>
<a href="/Html-files/menu.html">Menu</a>
<a href="/Html-files/services.html">Services</a>
<a href="/Html-files/contact.html">Contact us</a>
<a href="/Html-files/ContactUpdate.html">Contact us</a>
<a href="/Html-files/cart.html">Cart</a>
</ul>

Expand Down
Loading