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

changesInLandingPage #18

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

changesInLandingPage #18

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
5 changes: 3 additions & 2 deletions src/AllRoutes/MainRouter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import React from 'react'
import { Route, Routes } from 'react-router-dom'
import HomePage from '../Pages/HomePage'

import Login from '../Pages/Login'
import HotelPage from '../Pages/HotelPage'
import { Cart } from '../Pages/Cart'
import Signup from '../Pages/Signup'
import FlightPage from '../Pages/FlightPage'
import Home from '../LandingComponents/Home'

export default function MainRouter() {
return (
<Routes>
<Route path='/' element={<HomePage />}/>
<Route path='/' element={<Home />}/>
<Route path='/login' element={<Login />}/>
<Route path='/hotels' element={<HotelPage />}/>
<Route path='/cart/:id' element={<Cart />}/>
Expand Down
192 changes: 96 additions & 96 deletions src/AllRoutes/Navbar.jsx → src/AllRoutes/Notusable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,96 +1,96 @@
import { NavLink } from "react-router-dom";
import trip_wiz from "../images/trip_wiz.png"
import { Image } from "@chakra-ui/react";
const Navbar = () => {
const links = [
{
id: 1,
title: "Home",
path: "/"
},
{
id: 2,
title: "Hotel",
path: "/hotels"
},
{
id: 3,
title: "Blogs",
path: "/blogs"
},
{
id: 4,
title: "Abouts",
path: "/about"
},
{
id: 5,
title: "Contact",
path: "/contact"
},
{
id: 6,
title: "Login",
path: "/login"
},
{
id: 7,
title: "Cart",
path: "/cart"
},
];
const activeStyle = {
textDecoration: 'none',
color: 'orange',
fontSize:"20px",
fontVariant: "small-caps"
};
const defaultStyle = {
textDecoration: 'none',
fontSize:"20px",
fontVariant: "small-caps",
backgroundColor: "#4c4177",
color:"whitesmoke",
};
const navbarStyle = {
backgroundColor: "#4c4177",
backgroundImage: "linear-gradient(315deg, #4c4177 0%, #2a5470 74%)"
}
return (
<div style={{display:"flex",backgroundColor: "#4c4177",color:"whitesmoke"}}>
<NavLink to="/" >
<Image src={trip_wiz} w="70px" alt="travel" borderRadius={"50%"} />
</NavLink>
<div style={{display:"flex",justifyContent:"space-between", gap:"40px",ml:"600px", maxW:"container.lg"}} >
{links.map((link) => (
<div key={link.id} >
<NavLink
to={link.path}
style={({ isActive }) =>
isActive ? activeStyle : defaultStyle
}
>
{link.title}
</NavLink>
</div>
))}
</div>
</div>
);
};
export { Navbar };
import { NavLink } from "react-router-dom";
import trip_wiz from "../images/trip_wiz.png"
import { Image } from "@chakra-ui/react";

const Navbardemo = () => {

const links = [
{
id: 1,
title: "Home",
path: "/"
},

{
id: 2,
title: "Hotel",
path: "/hotels"
},
{
id: 3,
title: "Blogs",
path: "/blogs"
},
{
id: 4,
title: "Abouts",
path: "/about"
},
{
id: 5,
title: "Contact",
path: "/contact"
},
{
id: 6,
title: "Login",
path: "/login"
},
{
id: 7,
title: "Cart",
path: "/cart"
},
];

const activeStyle = {
textDecoration: 'none',
color: 'orange',
fontSize:"20px",
fontVariant: "small-caps"
};

const defaultStyle = {
textDecoration: 'none',
fontSize:"20px",
fontVariant: "small-caps",
backgroundColor: "#4c4177",
color:"whitesmoke",



};
const navbarStyle = {
backgroundColor: "#4c4177",
backgroundImage: "linear-gradient(315deg, #4c4177 0%, #2a5470 74%)"
}

return (
<div style={{display:"flex",backgroundColor: "#4c4177",color:"whitesmoke"}}>
<NavLink to="/" >
<Image src={trip_wiz} w="70px" alt="travel" borderRadius={"50%"} />
</NavLink>

<div style={{display:"flex",justifyContent:"space-between", gap:"40px",ml:"600px", maxW:"container.lg"}} >
{links.map((link) => (
<div key={link.id} >
<NavLink
to={link.path}

style={({ isActive }) =>
isActive ? activeStyle : defaultStyle
}
>
{link.title}
</NavLink>

</div>
))}

</div>
</div>
);
};

export { Navbardemo };

5 changes: 3 additions & 2 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@

import './App.css';
import MainRouter from './AllRoutes/MainRouter';
import { Navbar } from './AllRoutes/Navbar';

import { ChakraProvider } from '@chakra-ui/react';
import { Footer } from './Components/Footer';
import Navbar from './LandingComponents/Navbar';

function App() {
return (
<div className="App">
<Navbar />
<Navbar/>
<MainRouter/>
<ChakraProvider>
<Footer/>
Expand Down
8 changes: 3 additions & 5 deletions src/Components/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ export const Footer = () => {
>
<Box flex="1" mb="4">
<Flex alignItems="center">
<Box mr="2" w="30%">
<Image src="https://i.ibb.co/DVQLYVm/logo-color.png" alt="" w="100%" />
<Box mr="2" w="60%">
<Image src="https://i.ibb.co/0Jw2rMn/logo-no-background.png" alt="" w="200px" />
</Box>
<Text fontSize="2xl" fontWeight="bold">
Outdoor Life
</Text>

</Flex>
<Text mt="4" textAlign="justify" fontSize="sm">
Outdoor Life is a digital service where you can book your local & international trips
Expand Down
6 changes: 5 additions & 1 deletion src/LandingComponents/Home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
.destination {
width: 80%;
margin: auto;
margin-top: 60px;
margin-top: 130px;
}

/* Add the following styles for the hover effect */
Expand Down Expand Up @@ -309,6 +309,9 @@ margin: auto;
}
.star{
color: #FB9216;
display: flex;
flex-direction: row;
margin: 10px;
}
.subscribe{
color: white;
Expand Down Expand Up @@ -414,6 +417,7 @@ margin: auto;
padding: 15px;
border-radius: 1rem;
margin-top: 70px;
margin-bottom: 100px;
box-shadow: 0 2px 8px 4px rgba(178, 178, 178, 0.45);
transition: background-color 0.3s ease, box-shadow 0.3s ease;
}
Expand Down
Loading