Skip to content

Commit

Permalink
Merge branch 'main' into feature-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@coderajawat
coderajawat authored Oct 31, 2024
2 parents b2846cb + 1f975d5 commit bd8731f
Show file tree
Hide file tree
Showing 6 changed files with 338 additions and 63 deletions.
55 changes: 55 additions & 0 deletions about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,61 @@
<link rel="icon" type="image/x-icon" href="favicon.ico"/>
</head>
<body>



<div class="nav-container" id="top">
<nav class="newNav">
<div style="display: flex; flex-direction: row; align-items: center;">
<img src="/favicon.ico" class="sitelogo">

<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>

<ul class="navLinks">
<li class="link" id="View-link" data-aos=""><a href="mapa.html">View</a></li>
<li class="link" id="LogIn-link" data-aos=""><a href="newLogin.html">Log In</a></li>
<li class="link" data-aos=""><a href="./index.html">Home</a></li>
<li class="link" data-aos=""><a href="./about.html">About</a></li>
<li class="link dropdown" data-aos="">
<a href="#Services" class="dropdown">Services</a>
<ul class="dropdown-menu">
<li><a href="/trending.html">Destination</a></li>
<li><a href="/packages.html">Prices</a></li>
<li><a href="/index.html">Trip Gallery</a></li>
<li><a href="/index.html">Tourist Guide</a></li>
<li><a href="/hotel.html">Hotel & Resort</a></li>
</ul>
</li>
<li class="link" data-aos=""><a href="./topdeals/topdeals.html">Top Deals</a></li>
<li class="link" data-aos=""><a href="./packages.html">Packages</a></li>
<li class="link" data-aos=""><a href="#testimonials">Testimonial</a></li>
<li class="link" data-aos=""><a href="feedback.html">Rate Us?</a></li>
<li class="link" data-aos=""><a href="#cnt-form">Contact Us</a></li>
</ul>

<a href="newLogin.html" class="contact-btn" id="nav-login-btn"><button class="btn login" id="btn-style"
data-aos="fade-down">Login/SignUp</button></a>
<a href="mapa.html" class="contact-btn" id="nav-view-btn"><button class="btn" id="btn-style" style="margin: 0;"
data-aos="fade-down">view <map name=""></map></button></a>

<a href="loginPage.html" class="contact-btn"><button class="btn" id="logout-btn"
style="margin: 0; display: none;" data-aos="fade-down" disabled>Log Out</button></a>

<!-- <a href="login-modified.html" class="contact-btn"><button class="btn" id="btn-style"
style="margin: 0; box-shadow:1.5px 1.5px 6px red;" data-aos="fade-down">Login</button></a> -->

<div class="toggle-container" data-aos="fade-down">
<input id="themeToggle" class="toggle" type="checkbox">
</div>
<div class="hamburger" data-aos="fade-down">
<div class="line"></div>
<div class="line"></div>
<div class="line"></div>
</div>
</nav>
</div>

<div class="background">
<video autoplay muted loop playsinline>
<source src="./about.mp4" type="video/mp4">
Expand Down
108 changes: 107 additions & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,112 @@ <h1>TourGuide . . .</h1>
<canvas></canvas>
</div>

<nav class="newNav">
<div style="display: flex; align-items: center;">
<img src="/favicon.ico" class="sitelogo">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>

<ul class="navLinks">
<li class="link" id="View-link" data-aos=""><a href="mapa.html">View</a></li>
<li class="link" id="LogIn-link" data-aos=""><a href="newLogin.html">Log In</a></li>
<li class="link" data-aos=""><a href="#Home">Home</a></li>
<li class="link" data-aos=""><a href="./about.html">About</a></li>
<li class="link dropdown" data-aos="">
<a href="#Services" class="dropdown">Services</a>
<ul class="dropdown-menu">
<li><a href="/trending.html">Destination</a></li>
<li><a href="/packages.html">Prices</a></li>
<li><a href="/index.html">Trip Gallery</a></li>
<li><a href="/index.html">Tourist Guide</a></li>
<li><a href="/hotel.html">Hotel & Resort</a></li>
</ul>
</li>
<li class="link" data-aos=""><a href="./topdeals/topdeals.html">Top Deals</a></li>
<li class="link" data-aos=""><a href="./packages.html">Packages</a></li>
<li class="link" data-aos=""><a href="#testimonials">Testimonial</a></li>
<li class="link" data-aos=""><a href="feedback.html">Rate Us?</a></li>
<li class="link" data-aos=""><a href="#cnt-form">Contact Us</a></li>
</ul>

<div class="contact-btns">
<a href="newLogin.html" class="contact-btn" id="nav-login-btn">
<button class="btn login" id="btn-style" data-aos="fade-down">Login/<br>SignUp</button>
</a>
<a href="mapa.html" class="contact-btn" id="nav-view-btn">
<button class="btn" id="btn-style" style="margin: 0;" data-aos="fade-down">View <map name=""></map></button>
</a>
<a href="loginPage.html" class="contact-btn">
<button class="btn" id="logout-btn" style="margin: 0; display: none;" data-aos="fade-down" disabled>Log
Out</button>
</a>
</div>

<div class="toggle-container" data-aos="fade-down" style="margin-right: 28px;">
<input id="themeToggle" class="toggle" type="checkbox">
</div>

<div class="hamburger" id="hamburger" data-aos="fade-down">
<div class="line" style="margin-bottom: 5px;"></div>
<div class="line" style="margin-bottom: 5px;"></div>
<div class="line" style="margin-bottom: 5px;"></div>
<div class="line" style="margin-bottom: 5px;"></div>
</div>
</nav>

<style>
/* General Styles for the Navigation */
.nav-container {
background-color: #ffffff;
/* Background color */
padding: 5px 20px;
/* Reduced padding for smaller height */
display: flex;
justify-content: space-between;
align-items: center;
}

.newNav {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
}

.sitelogo {
height: 35px;
/* Slightly smaller logo */
width: 35px;
margin-right: 10px;
/* Reduced space between logo and title */
}

.nav__logo {
font-size: 28px;
/* Adjust font size */
color: #ece6e6;
/* Logo color */
text-decoration: none;
/* Remove underline */
}

.navLinks {
list-style: none;
/* Remove bullet points */
display: flex;
/* Display items in a row */
margin: 0;
/* Remove default margin */
padding: 0;
/* Remove default padding */
}

.navLinks.active {
display: flex;
/* Show links when the 'active' class is applied */
}



<!-- <div id="progressbar"></div> -->

Expand Down Expand Up @@ -2233,7 +2339,7 @@ <h3 class="footer-head" class="footer__title" style="cursor: default;">Contact U


<script>
let hamburger = document.querySelector('.hamburger');
hamburger = document.querySelector('.hamburger');
hamburger.addEventListener('click', () => {
let list = document.querySelector('.navLinks');
list.classList.toggle('activeHamburger');
Expand Down
41 changes: 38 additions & 3 deletions packages.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@
</video>
<div class="video-overlay"></div>
<header>

<nav>
<div class="container">
<a href="#" class="nav__logo">
Expand All @@ -426,6 +427,31 @@
</ul>
</li>
<li class="link"><a href="#">Contact</a></li>

<div class="nav-container" id="top">
<nav class="newNav">
<div style="display: flex; flex-direction: row; align-items: center;">
<img src="/favicon.ico" class="sitelogo">

<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>

<ul class="navLinks">
<li class="link" id="View-link" data-aos=""><a href="mapa.html">View</a></li>
<li class="link" id="LogIn-link" data-aos=""><a href="newLogin.html">Log In</a></li>
<li class="link" data-aos=""><a href="./index.html">Home</a></li>
<li class="link" data-aos=""><a href="./about.html">About</a></li>
<li class="link dropdown" data-aos="">
<a href="#Services" class="dropdown">Services</a>
<ul class="dropdown-menu">
<ul class="dropdown-menu">
<li><a href="/trending.html">Destination</a></li>
<li><a href="/packages.html">Prices</a></li>
<li><a href="/index.html">Trip Gallery</a></li>
<li><a href="/index.html">Tourist Guide</a></li>
<li><a href="/hotel.html">Hotel & Resort</a></li>
</ul>

</ul>
</div>
<div class="toggle-container">
Expand Down Expand Up @@ -479,7 +505,10 @@ <h3>Basic Plan</h3>
<li><i class="fas fa-check"></i> Hotel Accommodation</li>
<li><i class="fas fa-check"></i> Guided Tours</li>
</ul>
<button class="btn">Book Now</button>
<a href="payment.html">
<button class="btn">Book Now</button>
</a>

</div>
<div class="pricing-card">
<h3>Premium Plan</h3>
Expand All @@ -489,7 +518,10 @@ <h3>Premium Plan</h3>
<li><i class="fas fa-check"></i> Hotel Accommodation</li>
<li><i class="fas fa-check"></i> All Meals Included</li>
</ul>
<button class="btn">Book Now</button>
<a href="payment.html">
<button class="btn">Book Now</button>
</a>

</div>
<div class="pricing-card">
<h3>Luxury Plan</h3>
Expand All @@ -499,7 +531,10 @@ <h3>Luxury Plan</h3>
<li><i class="fas fa-check"></i> 5 Star Hotel Accommodation</li>
<li><i class="fas fa-check"></i> All Meals & Drinks Included</li>
</ul>
<button class="btn">Book Now</button>
<a href="payment.html">
<button class="btn">Book Now</button>
</a>

</div>
</div>
</section>
Expand Down
59 changes: 31 additions & 28 deletions payment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,34 +39,37 @@
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>

<ul class="navLinks">
<li class="link" id="View-link" data-aos=""><a href="mapa.html">View</a></li>
<li class="link" id="LogIn-link" data-aos=""><a href="newLogin.html">Log In</a></li>
<li class="link" data-aos=""><a href="#Home">Home</a></li>
<li class="link" data-aos=""><a href="#AboutUs">About</a></li>
<li class="link dropdown" data-aos="">
<a href="#Services" class="dropdown">Services</a>
<ul class="dropdown-menu">
<li><a href="#Destinations">Destination</a></li>
<li><a href="#trip">Prices</a></li>
<li><a href="#ReviewGallery">Trip Gallery</a></li>
<li><a href="#tourist">Tourist Guide</a></li>
<li><a href="#hotel">Hotel & Resort</a></li>
</ul>
</li>
<li class="link" data-aos=""><a href="./packages.html">Packages</a></li>
<li class="link" data-aos=""><a href="#testimonials">Testimonial</a></li>
<li class="link" data-aos=""><a href="feedback.html">Rate Us?</a></li>
<li class="link" data-aos=""><a href="#cnt-form">Contact Us</a></li>
</ul>

<a href="newLogin.html" class="contact-btn" id="nav-login-btn"><button class="btn login" id="btn-style"
data-aos="fade-down">Login/SignUp</button></a>
<a href="mapa.html" class="contact-btn" id="nav-view-btn"><button class="btn" id="btn-style" style="margin: 0;"
data-aos="fade-down">view <map name=""></map></button></a>

<a href="loginPage.html" class="contact-btn"><button class="btn" id="logout-btn"
style="margin: 0; display: none;" data-aos="fade-down" disabled>Log Out</button></a>
<ul class="navLinks">
<li class="link" id="View-link" data-aos=""><a href="mapa.html">View</a></li>
<li class="link" id="LogIn-link" data-aos=""><a href="newLogin.html">Log In</a></li>
<li class="link" data-aos=""><a href="./index.html">Home</a></li>
<li class="link" data-aos=""><a href="./about.html">About</a></li>
<li class="link dropdown" data-aos="">
<a href="#Services" class="dropdown">Services</a>
<ul class="dropdown-menu">
<ul class="dropdown-menu">
<li><a href="/trending.html">Destination</a></li>
<li><a href="/packages.html">Prices</a></li>
<li><a href="/index.html">Trip Gallery</a></li>
<li><a href="/index.html">Tourist Guide</a></li>
<li><a href="/hotel.html">Hotel & Resort</a></li>
</ul>
</ul>
</li>
<li class="link" data-aos=""><a href="./topdeals/topdeals.html">Top Deals</a></li>
<li class="link" data-aos=""><a href="./packages.html">Packages</a></li>
<li class="link" data-aos=""><a href="#testimonials">Testimonial</a></li>
<li class="link" data-aos=""><a href="feedback.html">Rate Us?</a></li>
<li class="link" data-aos=""><a href="#cnt-form">Contact Us</a></li>
</ul>

<a href="newLogin.html" class="contact-btn" id="nav-login-btn"><button class="btn login" id="btn-style"
data-aos="fade-down">Login/SignUp</button></a>
<a href="mapa.html" class="contact-btn" id="nav-view-btn"><button class="btn" id="btn-style" style="margin: 0;"
data-aos="fade-down">view <map name=""></map></button></a>

<a href="loginPage.html" class="contact-btn"><button class="btn" id="logout-btn"
style="margin: 0; display: none;" data-aos="fade-down" disabled>Log Out</button></a>

<!-- <a href="login-modified.html" class="contact-btn"><button class="btn" id="btn-style"
style="margin: 0; box-shadow:1.5px 1.5px 6px red;" data-aos="fade-down">Login</button></a> -->
Expand Down
Loading

0 comments on commit bd8731f

Please sign in to comment.