Skip to content

Commit

Permalink
update nav bar with new style
Browse files Browse the repository at this point in the history
  • Loading branch information
odeta939 committed Oct 18, 2023
1 parent eb16f87 commit aec099f
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 63 deletions.
17 changes: 10 additions & 7 deletions vinoa-web/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
@tailwind components;
@tailwind utilities;

html {
@apply text-grey-highlight;
}

body {
@apply bg-violet-light;
@apply bg-white;
@apply text-black;

min-height: 100vh;
}
nav {
@apply bg-violet-darker;
}

nav li{
@apply bg-[#F5F5F5];
@apply rounded-md;
@apply px-4;
@apply py-2;
}
38 changes: 23 additions & 15 deletions vinoa-web/components/Navigation/Navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,41 @@
'use client';
import Logo from '@/lib/assets/Logo';
import ProfileLogo from '@/lib/assets/ProfileLogo';
import Link from 'next/link';
import LoginButton from '../LoginButton';
import { usePathname } from 'next/navigation';

const Navigation = () => {
const path = usePathname();
return (
<nav className='p-4'>
<div className='flex place-items-center justify-between text-xl'>
<div className='flex place-items-center justify-between text-l'>
<div className='flex items-center'>
<Link href={'/'}>
<Logo />
<Logo color='#800020' />
</Link>
</div>
<ul className=' flex justify-end items-center gap-6 '>
<li className='hover:underline underline-offset-4'>
<ul className='flex justify-end items-center gap-6 '>
<li
className={`${path == '/' && 'ring-2 ring-black rounded-md'} ${
path != '/' && 'hover:underline-offset-4 hover:underline'
} `}
>
<Link href={'/'}>Home</Link>
</li>
<li className='hover:underline underline-offset-4'>
<Link href='/monthsWine'>Month&#39;s wine</Link>
</li>
<li className='hover:underline underline-offset-4'>
<li
className={`${path == '/wines' && 'ring-2 ring-black rounded-md'} ${
path != '/wines' && 'hover:underline-offset-4 hover:underline'
} `}
>
<Link href='/wines'>Wines</Link>
</li>
<li>
<Link href='/profile'>
<ProfileLogo />
</Link>
<LoginButton />
<li
className={`${
path == '/profile' && 'ring-2 ring-black rounded-md'
} ${
path != '/profile' && 'hover:underline-offset-4 hover:underline'
} `}
>
<Link href='/profile'>Profile</Link>
</li>
</ul>
</div>
Expand Down
Loading

0 comments on commit aec099f

Please sign in to comment.