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

created nav bar #47

Merged
merged 3 commits into from
Jun 6, 2024
Merged

created nav bar #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f42c928
feature: basic stucture and style for header/navbar
nlia656 Apr 28, 2024
38a87d6
feature: links redirect, hover styling done
nlia656 May 12, 2024
52bb76f
Merge branch 'main' into nick/feature/20/navigation-bar
nroh555 Jun 6, 2024
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
Binary file added web/src/assets/auis_white.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 web/src/assets/peacock-logo.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.
35 changes: 30 additions & 5 deletions web/src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,34 @@
import peacockLogo from '../assets/peacock-logo.png';
import whiteName from '../assets/auis_white.png';

function Header() {
return (
<header>
<h1>Header</h1>
</header>
);
return (
<header className="bg-[#034159] h-[90px] w-full px-[15px] flex justify-between items-center">
{/* Images and logo */}
<a className="flex items-center" href="/">
<img className="object-contain w-[70px] h-[70px]" src = {peacockLogo}/>
<img className="object-contain w-[172px] h-[62px]" src = {whiteName}/>
</a>
{/* Links */}
<nav>
<ul className="text-white flex items-center gap-8 text-lg">
<li><a className="hover:bg-[#05394d] px-3 py-2 rounded" href="#">Events</a></li>
<li><a className="hover:bg-[#05394d] px-3 py-2 rounded" href="/pvv">About Us</a></li>
<li><a className="hover:bg-[#05394d] px-3 py-2 rounded" href="/exec">Leadership Team</a></li>
<li><a className="hover:bg-[#05394d] px-3 py-2 rounded" href="/credits">Credits</a></li>
</ul>
</nav>
{/* Login signup buttons */}
<div className="flex items-center gap-8 px-[10px]">
<a href="/login">
<button className="bg-[#FC8700] hover:bg-[#fc7300] text-black px-[18px] py-[10px] text-base rounded" style={{borderRadius: '10px' }}>Log-in</button>
</a>
<a href="/signup">
<button className="bg-[#FC8700] hover:bg-[#fc7300] text-black px-[18px] py-[10px] text-base rounded" style={{borderRadius: '10px' }}>Sign-up</button>
</a>
</div>
</header>
);
}

export default Header;
3 changes: 2 additions & 1 deletion web/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import { RouterProvider } from "react-router-dom";

import App from "./App.tsx";
import "./index.css";

import HomeScreen from "./screens/HomeScreen.tsx";
import TestScreen from "./screens/Test.tsx";
import ExecScreen from "./screens/ExecScreen.tsx";
import LoginScreen from "./screens/LoginScreen.tsx";
import SignUpScreen from "./screens/SignUpScreen.tsx";
import PhotosScreen from "./screens/PhotosScreen.tsx";
import PPVScreen from "./screens/PPVScreen.tsx";
import CreditsScreen from './screens/CreditsScreen.tsx';
import { execs } from "./data/data.ts";

//Add any routes for screens below
Expand All @@ -31,6 +31,7 @@ const router = createBrowserRouter(
<Route path="/signup" element={<SignUpScreen />} />
<Route path="/pvv" element={<PPVScreen />} />
<Route path="/photos" element={<PhotosScreen />} />
<Route path="/credits" element={<CreditsScreen />} />
</Route>
)
);
Expand Down
Loading