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

Feature ticket 34 prototype navigation bar #157

Merged
merged 4 commits into from
Feb 18, 2025
Merged

Feature ticket 34 prototype navigation bar #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f26a50
Added Poppins font for Navbar
Ravik-TH Feb 15, 2025
215259c
Added LogIn Button Design
Ravik-TH Feb 17, 2025
be397a1
Changed global CSS for index and App div
ravi-p-k-1 Feb 17, 2025
75f531b
Added Sproutly Logo to Navbar
ravi-p-k-1 Feb 18, 2025
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
4 changes: 4 additions & 0 deletions frontend/web-app/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">

<title>React App</title>
</head>
<body>
Expand Down
1 change: 1 addition & 0 deletions frontend/web-app/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import RouterProvider from './Components/Router';
import './Styles/global.css'

function App() {
return (
Expand Down
54 changes: 42 additions & 12 deletions frontend/web-app/src/Components/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,47 @@
import React from 'react'
import { Link, Outlet } from 'react-router-dom';
import React, { useMemo } from 'react'
import { Link, Outlet, useLocation } from 'react-router-dom';
import '../Styles/custom/navBar.css'
import sproutlyLogo from '../Images/sproutly-logo.svg';
import sproutlyText from '../Images/sproutly-text.svg';

function NavBar() {
return (
<div>
<div>
<Link to="/">Home</Link>
<Link to="/about">About</Link>
<Link to="/faq">FAQ</Link>
</div>
<Outlet />
</div>
)

const location = useLocation();

const pageArray = useMemo(() => {
return [
{
name: 'Home',
path: '/',
},
{
name: 'About',
path: '/about',
},
{
name: 'FAQ',
path: '/faq',
}
]
}, [])

return (
<>
<div className='navbar'>
<div>
<img className='sproutly-logo' src={sproutlyLogo} alt='error img'/>
<img className='sproutly-text' src={sproutlyText} alt='error img'/>
</div>
<div className='navbar-link-container'>
{pageArray.map((page, index)=>{
return <Link key={index} className={`navbar-link${location.pathname===page.path? ' text-white': ''}`} to={page.path}>{page.name}</Link>
})}
</div>
<button className='navbar-login-logout-button'>Log In</button>
</div>
<Outlet />
</>
)
};

export default NavBar;
46 changes: 46 additions & 0 deletions frontend/web-app/src/Styles/custom/navBar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/* NavBar CSS */

.navbar {
display: flex;
flex-direction: row;
justify-content: space-between;
height: 72px;
align-items: center;
padding-left: 50px;
padding-right: 50px;
background-color: #AFD582;
}

.navbar > *{
font-family: "Poppins", serif;
font-weight: 1000;
text-decoration: none;
color: #4C5740;
}

.navbar-link-container{
width: 30%;
display: flex;
flex-direction: row;
justify-content: space-between;
}

.navbar-link{
text-decoration: none;
color: #4C5740;
}

.navbar-login-logout-button{
height: 41.5px;
background-color: #E6F2D7;
display: flex;
line-height: 41.5px;
padding-left: 26px;
padding-right: 26px;
border-radius: 15px;
border-color: #E6F2D7;
}

.sproutly-text{
padding-left: 11px;
}
10 changes: 10 additions & 0 deletions frontend/web-app/src/Styles/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
/* Global CSS */

html, body, #root, .App {
height: 100%;
width: 100%;
margin: 0px;
}

.text-white{
color: #FFFFFF;
}