Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
lovelymahor committed Aug 4, 2024
2 parents bb8dc40 + 0cbc06d commit cd70d5f
Show file tree
Hide file tree
Showing 31 changed files with 1,713 additions and 406 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
144 changes: 125 additions & 19 deletions Adventure.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,67 @@
}
}
</style>
<style>
/* Toggle button styles */
.toggle-container {
position: fixed; /* Change this as needed for positioning */
top: 10px;
right: 10px;
}

.toggle {
appearance: none;
outline: none;
cursor: pointer;
width: 100%;
height: 100%;
box-shadow: inset calc(var(--size)* 0.33) calc(var(--size)* -0.25) 0;
border-radius: 999px;
color: hsl(240, 100%, 95%);
transition: all 500ms;
position: absolute;
top: 0;
left: 0;
}

.toggle:checked {
background-color: #333;
}
.toggle:checked:before {
transform: translateX(25px);
}
.sticky {
margin: 10px 5px;
border-radius: 10px;
margin-top: 0.5rem;
background: linear-gradient(#002152, #271050);
scale: 0.99;
}
nav {
background-color: #123456;
position: fixed;
top: 0;
width: 100%;
z-index: 1001;
}
/* Dark mode feature */
body.dark-mode{
--secondary-color:#0e1525;
--btn-border: red;
}
body.dark-mode {
background-color: var(--secondary-color);
}

body.dark-mode .nav-container {
background-color: #343a40;
}

body.dark-mode .section__container {
background-color: #002152;
color: #ffffff;
}
</style>

<link href="https://cdn.jsdelivr.net/npm/[email protected]/fonts/remixicon.css" rel="stylesheet" />
<link rel="stylesheet" href="styles.css" />
Expand Down Expand Up @@ -132,29 +193,50 @@
</ul>
<a href="/index.html"><button class="btn">Contact Us</button></a>
</nav> -->
<div class="nav-container">
<nav class="newNav">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
<div style="display: flex; flex-direction: row; align-items: center;">
<img src="./img/tour1.png" class="sitelogo">

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

<ul class="navLinks">
<li class="link" data-aos="fade-down"><a href="./index.html#Home">Home</a></li>
<li class="link" data-aos="fade-down"><a href="./index.html#AboutUs">AboutUs</a></li>
<li class="link" data-aos="fade-down"><a href="./index.html#Destinations">Destinations</a></li>
<li class="link" data-aos="fade-down"><a href="./index.html#trip">Pricing</a></li>
<li class="link" data-aos="fade-down"><a href="./index.html#testimonials">Testimonials</a></li>
<li class="link" data-aos="fade-down"><a href="./index.html#ReviewGallery">Reviews</a></li>
<li class="link" data-aos="fade-down"><a href="./feedback.html">Rate Us?</a></li>
<li class="link" data-aos="fade-down"><a href="./login.html">Login</a></li>
</ul>
<a href="./index.html#contact" class="contact-btn"><button class="btn" id="btn-style" style="margin: 0;"
data-aos="fade-down">Contact Us</button></a>
<div class="hamburger" data-aos="fade-down">
<li class="link aos-init aos-animate" id="View-link" data-aos=""><a href="mapa.html">View</a></li>
<li class="link aos-init aos-animate" id="LogIn-link" data-aos=""><a href="newLogin.html">Log In</a></li>
<li class="link aos-init aos-animate" data-aos=""><a href="#Home">Home</a></li>
<li class="link aos-init aos-animate" data-aos=""><a href="#AboutUs">About</a></li>
<li class="link dropdown aos-init aos-animate" 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 &amp; Resort</a></li>
</ul>
</li>
<li class="link aos-init aos-animate" data-aos=""><a href="#testimonials">Testimonial</a></li>
<li class="link aos-init aos-animate" data-aos=""><a href="feedback.html">Rate Us?</a></li>
<li class="link aos-init aos-animate" 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 aos-init aos-animate" id="btn-style" data-aos="fade-down" style="display: block;">Login/SignUp</button></a>
<a href="mapa.html" class="contact-btn" id="nav-view-btn"><button class="btn aos-init aos-animate" 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 aos-init aos-animate" 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 aos-init aos-animate" data-aos="fade-down">
<input id="themeToggle" class="toggle" type="checkbox">
</div>
<div class="hamburger aos-init aos-animate" data-aos="fade-down">
<div class="line"></div>
<div class="line"></div>
<div class="line"></div>
</div>
</nav>
</div>
<section class="trip" id="trip">

<div class="section__container trip__container">
Expand Down Expand Up @@ -666,15 +748,15 @@ <h4>Contact Us</h4>
<button class="top-btn" id="goToTopBtn" onclick="goToTop()"><i class="fa-solid fa-chevron-up"
style="color: #ffffff;"></i></button>

<script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/3.12.5/gsap.min.js"
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/3.12.5/gsap.min.js"
integrity="sha512-7eHRwcbYkK4d9g/6tD/mhkf++eoTHwpNM9woBxtPUBWm67zeAfFC+HrdoE2GanKeocly/VxeLvIqwvCdk7qScg=="
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script>
<script> -->



var tl = gsap.timeline();
<!-- var tl = gsap.timeline();
tl.from("nav", {
opacity: 0,
Expand Down Expand Up @@ -710,7 +792,7 @@ <h4>Contact Us</h4>
opacity: 0,
x:-50,
duration: 0.7,
})
}) -->

</script>

Expand Down Expand Up @@ -788,6 +870,30 @@ <h4>Contact Us</h4>
}
}
</script>
<script>
document.addEventListener('DOMContentLoaded', () => {
const toggleCheckbox = document.getElementById('themeToggle');
const body = document.body;

// Load saved dark mode preference from localStorage
if (localStorage.getItem('dark-mode') === 'enabled') {
body.classList.add('dark-mode');
toggleCheckbox.checked = true;
} else {
toggleCheckbox.checked = false;
}

toggleCheckbox.addEventListener('change', () => {
if (toggleCheckbox.checked) {
body.classList.add('dark-mode');
localStorage.setItem('dark-mode', 'enabled');
} else {
body.classList.remove('dark-mode');
localStorage.setItem('dark-mode', 'disabled');
}
});
});
</script>
<script src="./Image-Gallery/script.js"></script>

</html>
2 changes: 1 addition & 1 deletion Image-Gallery/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ body {
}

.btn {
bottom: -80px;
top : -40px;
background-color: slateblue;
color: white;
border: none;
Expand Down
39 changes: 39 additions & 0 deletions Licensing.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,53 @@
color: rgb(185, 185, 185);
}

</style>
<style>
#progress-container {
position: fixed ;
top: 0px;
left: 0;
width: 100%;
height: 15px;
z-index: 99990;
/* background: #f3f3f3; */
}

#progress-bar {
position: fixed;
top: 0;
left: 0;
width: 0%;
height: 7px;
width: 0;
background: linear-gradient(90deg, rgb(0, 72, 255) 0%, rgb(153, 187, 255) 50%, rgb(0, 184, 250) 100%);
box-shadow: 0 0 4px rgba(0, 166, 255, 0.7), 0 0 10px rgba(255, 255, 255, 0.7);
transition: width 0.09s ease-in-out;
border-radius: 10px;
}


</style>
</head>
<body>
<div id="progress-container">
<div id="progress-bar"></div>
</div>
<script>

window.addEventListener('scroll', function() {
const winScroll = document.body.scrollTop || document.documentElement.scrollTop;
const height = document.documentElement.scrollHeight - document.documentElement.clientHeight;
const scrolled = (winScroll / height) * 100;
document.getElementById('progress-bar').style.width = scrolled + '%';
});
</script>
<a href="index.html">
<img src="./img/Screenshot 2024-01-23 003448.png" style="width: 130px; border-radius: 6px; margin-top: 20px; margin-left: 20px;">
</a>
<div class="container">
<h1 class="title">Licensing Page</h1>

<div class="license-text">
<h2 class="section-title">MIT License</h2>
<p>Copyright (c) 2023 Arpan Chowdhury</p>
Expand Down
34 changes: 16 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,30 +202,18 @@ Show some ❤️&nbsp; by giving <img src="https://imgur.com/o7ncZFp.jpg" height
<tr>
<td align="center"><a href="https://github.com/KrishnenduDG"><img src="img/krishnendu DG.png" width=130px height=130px /></a></br> <h4 style="color:red;">Krishnendu Dasgupta</h4>
<a href="https://www.linkedin.com/in/krishnendu-dasgupta-450391186/"><img src="https://img.icons8.com/fluency/2x/linkedin.png" width="32px" height="32px"></img></a>
</td>

</tr>
</table>
</td>

<table>
<tr>
<td align="center"><a href="https://github.com/itsekta"><img src="img/Ekta.jfif" width=130px height=130px /></a></br> <h4 style="color:red;">Ekta Chaudhary</h4>
<a href="https://www.linkedin.com/in/ekta-software-engineer/"><img src="https://img.icons8.com/fluency/2x/linkedin.png" width="32px" height="32px"></img></a>
</td>

</tr>
</table>
</td>

<table>
<tr>
<td align="center"><a href="https://github.com/Ghanshyam89"><img src="img/GhanshyamNewPic.jpg" width=130px height=130px /></a></br> <h4 style="color:red;">Ghanshyam Prajapati</h4>
<a href="https://www.linkedin.com/in/ghanshyam-prajapati/"><img src="https://img.icons8.com/fluency/2x/linkedin.png" width="32px" height="32px"></img></a>
</td>

</td>
</tr>
</table>

</div>

# Project Admin⚡

Expand All @@ -247,6 +235,11 @@ Show some ❤️&nbsp; by giving <img src="https://imgur.com/o7ncZFp.jpg" height
<img src="https://github.com/shruti-sen2004/Travel_Website/assets/115914670/d544fd3b-aed2-4a05-a2f8-0b7a2ff9014f" width="700" height= "250" />
</p>


## Acknowledgements

Thank you to all the amazing contributors who have made this project possible! 💝

<p align ="center">
<img src="https://api.vaunt.dev/v1/github/entities/apu52/repositories/Travel_Website/contributors?format=svg&limit=54" width="700" height= "250" />
</p>
Expand All @@ -255,10 +248,15 @@ Show some ❤️&nbsp; by giving <img src="https://imgur.com/o7ncZFp.jpg" height
<img align="center" src="https://contrib.rocks/image?max=100&repo=apu52/Travel_Website" />
</a>
<br><br>
Thank you to all the amazing contributors who have made this project possible!!💝

## License
<img src = "https://img.shields.io/badge/License-MIT-blue.svg?style=for-the-badge">
## License

This project is licensed under the MIT License. See the [LICENSE](LICENSE) file for more details.

<p align="center">
<img src="https://img.shields.io/badge/License-MIT-blue.svg?style=for-the-badge" alt="License: MIT">
</p>


<p align="right"><a href="#top"><img src="https://img.shields.io/badge/Move%20to%20top-Blue?style=plastic" alt="Back To Top"></a></p>

Expand Down
Binary file added back5.mp4
Binary file not shown.
38 changes: 37 additions & 1 deletion blog.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
body, html {
margin: 0;
padding: 0;
font-family: 'Outfit', sans-serif;
font-family: 'Outfit', sans-serif !important;
line-height: 1.6;
color: var(--text-color);
height: 100%;
Expand Down Expand Up @@ -101,6 +101,37 @@ body, html {
padding: 2rem;
margin-top: 10vh;
}
.tag {
cursor: pointer;
transition: background-color 0.3s ease;
}

.tag:hover {
background-color: #007bff;
color: white;
}

.filter-controls {
margin-bottom: 20px;
text-align: left;
}

.reset-filters-btn {
font-family: "Outfit";
padding: 5px 10px;
font-size: 1.0rem;
font-weight: 500;
background-color: #f39c12;
border: 3px solid #011c34;
color: #ffffff;
border-radius: 4px;
cursor: pointer;
transition: background-color 0.3s ease;
}

.reset-filters-btn:hover {
background-color: #e2e6ea;
}

main {
display: flex;
Expand All @@ -111,6 +142,7 @@ main {

#blog-posts {
flex: 2;
margin-top: 20px;
display: flex;
flex-direction: column;
gap: 2rem;
Expand Down Expand Up @@ -179,6 +211,8 @@ main {

.tag:hover {
background-color: var(--primary-color);
color: #f39c12;
transition: background-color 0.3s ease;
}

.read-more {
Expand Down Expand Up @@ -294,6 +328,8 @@ aside {

.newsletter-form button:hover {
background-color: var(--primary-color);
color: #f39c12;
transition: background-color 0.3s ease;
}

@media (max-width: 768px) {
Expand Down
Loading

0 comments on commit cd70d5f

Please sign in to comment.