Skip to content

Commit

Permalink
add nav bar and header
Browse files Browse the repository at this point in the history
  • Loading branch information
polly89 committed Sep 30, 2023
1 parent ce20648 commit 5ac51e4
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 8 deletions.
26 changes: 26 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-regular-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@the-collab-lab/shopping-list-utils": "^2.0.0",
"classnames": "^2.3.2",
Expand Down
1 change: 0 additions & 1 deletion src/views/Layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

.Nav {
background-color: var(--color-accent);
border-top: 1px solid var(--color-border);
bottom: 0;
display: flex;
flex-direction: row;
Expand Down
26 changes: 19 additions & 7 deletions src/views/Layout.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import { Outlet, NavLink } from 'react-router-dom';
import './Layout.css';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import {
faRightFromBracket,
faList,
faPlus,
} from '@fortawesome/free-solid-svg-icons';

// import { faLeaf } from '@fortawesome/free-brands-svg-icons';

/**
* TODO: The links defined in this file don't work!
Expand All @@ -13,22 +21,26 @@ export function Layout() {
return (
<>
<div className="Layout">
<header className="Layout-header">
<h1 className="text-5xl tracking-widest font-normal">LISTIFY</h1>
<header className="Layout-header flex justify-end">
<FontAwesomeIcon icon={faRightFromBracket} title="Leave list" />
</header>
<main className="Layout-main">
<Outlet />
</main>
<nav className="Nav">
<div className="Nav-container">
<NavLink to="/" className="Nav-link">
Home
</NavLink>
<NavLink to="/list" className="Nav-link">
List
<FontAwesomeIcon icon={faList} title="Navigate to list page" />
<br />
<p className="text-lg">List</p>
</NavLink>
<NavLink to="/add-item" className="Nav-link">
Add Item
<FontAwesomeIcon
icon={faPlus}
title="Navigate to the add item page"
/>
<br />
<p className="text-lg">Add Item</p>
</NavLink>
</div>
</nav>
Expand Down

0 comments on commit 5ac51e4

Please sign in to comment.