Skip to content
This repository has been archived by the owner on Sep 29, 2024. It is now read-only.

Commit

Permalink
feat: Responsive Navbar Layout (#257)
Browse files Browse the repository at this point in the history
* feat: footer layout

* fix: fixed copyright escaping footer and added links

* fix: fixed copyright margin and text size

* fix: remove empty classanme

* feat: Navbar layout with images

Signed-off-by: Jy <[email protected]>

* feat: Add dropdown-menu component

Signed-off-by: AlexNg <[email protected]>

* feat: responsive navbar layout with CTA and dropdown menu

* fix: fixed format error

* fix: removed unusued location in main

* fix: fix prettier code style

* feat: added one more colour shade for primary-dark

* feat: changed <a> to internal link and admin buttons

* chore: removed unused svg files

* chore: removed unused props in navbar

* fix: remove additional /

---------

Reviewed-by: AlexNg <[email protected]>
Signed-off-by: Jy <[email protected]>
Signed-off-by: AlexNg <[email protected]>
Co-authored-by: AlexNg <[email protected]>
  • Loading branch information
KenNoYu and caffeine-addictt authored Aug 8, 2024
1 parent 7137da4 commit f4d249b
Show file tree
Hide file tree
Showing 7 changed files with 773 additions and 6 deletions.
1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"dependencies": {
"@hookform/resolvers": "^3.6.0",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-slot": "^1.0.2",
Expand Down
Binary file added client/public/logo_279x279.webp
Binary file not shown.
130 changes: 126 additions & 4 deletions client/src/components/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,132 @@
*/

import * as React from 'react';
import { Location } from 'react-router-dom';
import { AuthContext } from '@service/auth';
import { Button, InternalLink } from '@components/ui/button';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
DropdownMenuSeparator,
DropdownMenuLabel,
} from '@components/ui/dropdown-menu';
import { BellIcon, HamburgerMenuIcon } from '@radix-ui/react-icons';
import { PageComponent } from '@pages/route-map';

export type NavbarProps = { location: Location; isAdmin: boolean };
const Navbar = (props: NavbarProps): React.ReactNode => {
return <nav>This is the navbar at {props.location.pathname}</nav>;
const Navbar: PageComponent = (): React.JSX.Element => {
const { isAdmin } = React.useContext(AuthContext)!;
return (
<nav className="bg-accent-dark">
<div className="mx-auto flex h-16 max-w-screen-xl flex-wrap items-center justify-between p-4">
<a href="/" className="flex items-center space-x-3 rtl:space-x-reverse">
<img src="/logo_279x279.webp" className="h-8" alt="Logo" />
<span className="self-center whitespace-nowrap text-2xl font-semibold">
Green Bites SG
</span>
</a>
<div className="flex space-x-3 md:order-2 md:space-x-1 rtl:space-x-reverse">
<DropdownMenu>
<DropdownMenuTrigger>
<Button className="size-10 items-center !bg-primary-dark p-2 text-center">
<HamburgerMenuIcon />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent className="block w-80 rounded border-none !bg-primary-dark !text-text-light !no-underline md:w-60 md:p-1 md:text-sm">
<DropdownMenuItem className="focus:bg-primary-dark-200 dark:focus:bg-primary-dark-200">
<InternalLink
href="/"
aria-current="page"
className="m-0 p-0 !text-text-light !no-underline"
variant={'link'}
>
Home
</InternalLink>
</DropdownMenuItem>
<DropdownMenuItem className="focus:bg-primary-dark-200 dark:focus:bg-primary-dark-200">
<InternalLink
href="/about"
className="m-0 p-0 !text-text-light !no-underline"
variant={'link'}
>
About
</InternalLink>
</DropdownMenuItem>
<DropdownMenuItem className="focus:bg-primary-dark-200 dark:focus:bg-primary-dark-200">
<InternalLink
href="/home"
className="m-0 p-0 !text-text-light !no-underline"
variant={'link'}
>
My Account
</InternalLink>
</DropdownMenuItem>
<DropdownMenuItem className="focus:bg-primary-dark-200 dark:focus:bg-primary-dark-200">
<InternalLink
href="/food-tips"
className="m-0 p-0 !text-text-light !no-underline"
variant={'link'}
>
Today's Sustainable Food Tips
</InternalLink>
</DropdownMenuItem>
<DropdownMenuItem className="focus:bg-primary-dark-200 md:hidden dark:focus:bg-primary-dark-200">
<InternalLink
href="/my-events"
className="m-0 p-0 !text-text-light !no-underline md:hidden"
variant={'link'}
>
My Events
</InternalLink>
</DropdownMenuItem>
{isAdmin && (
<>
<DropdownMenuLabel>Admin</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuItem className="focus:bg-primary-dark-200 dark:focus:bg-primary-dark-200">
<InternalLink
href="/dashboard"
className="m-0 p-0 !text-text-light !no-underline"
variant={'link'}
>
Dashboard
</InternalLink>
</DropdownMenuItem>
<DropdownMenuItem className="focus:bg-primary-dark-200 dark:focus:bg-primary-dark-200">
<InternalLink
href="/events"
className="m-0 p-0 !text-text-light !no-underline"
variant={'link'}
>
Event Management
</InternalLink>
</DropdownMenuItem>
</>
)}
</DropdownMenuContent>
</DropdownMenu>
<DropdownMenu>
<DropdownMenuTrigger>
<Button className="size-10 items-center !bg-primary-dark p-2 text-center">
<BellIcon />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent className="h-52 w-60 !min-w-full border-none !bg-primary-dark text-base md:p-2 md:text-sm">
<DropdownMenuItem className="!text-text-light focus:bg-primary-dark-200 dark:focus:bg-primary-dark-200">
Notification Item
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
<InternalLink
href="/my-events"
variant={'link'}
className="hidden items-center justify-center rounded-md bg-primary-dark p-2 text-center text-sm !text-text-light !no-underline md:inline-flex"
>
My Events
</InternalLink>
</div>
</div>
</nav>
);
};
export default Navbar;
201 changes: 201 additions & 0 deletions client/src/components/ui/dropdown-menu.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
import * as React from 'react';
import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
import { Check, ChevronRight, Circle } from 'lucide-react';

import { cn } from '@utils/tailwind';

const DropdownMenu = DropdownMenuPrimitive.Root;

const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;

const DropdownMenuGroup = DropdownMenuPrimitive.Group;

const DropdownMenuPortal = DropdownMenuPrimitive.Portal;

const DropdownMenuSub = DropdownMenuPrimitive.Sub;

const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;

const DropdownMenuSubTrigger = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
inset?: boolean;
}
>(({ className, inset, children, ...props }, ref) => (
<DropdownMenuPrimitive.SubTrigger
ref={ref}
className={cn(
'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-neutral-100 data-[state=open]:bg-neutral-100 dark:focus:bg-neutral-800 dark:data-[state=open]:bg-neutral-800',
inset && 'pl-8',
className,
)}
{...props}
>
{children}
<ChevronRight className="ml-auto size-4" />
</DropdownMenuPrimitive.SubTrigger>
));
DropdownMenuSubTrigger.displayName =
DropdownMenuPrimitive.SubTrigger.displayName;

const DropdownMenuSubContent = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
>(({ className, ...props }, ref) => (
<DropdownMenuPrimitive.SubContent
ref={ref}
className={cn(
'z-50 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white p-1 text-neutral-950 shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-neutral-800 dark:bg-neutral-950 dark:text-neutral-50',
className,
)}
{...props}
/>
));
DropdownMenuSubContent.displayName =
DropdownMenuPrimitive.SubContent.displayName;

const DropdownMenuContent = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
>(({ className, sideOffset = 4, ...props }, ref) => (
<DropdownMenuPrimitive.Portal>
<DropdownMenuPrimitive.Content
ref={ref}
sideOffset={sideOffset}
className={cn(
'z-50 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white p-1 text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-neutral-800 dark:bg-neutral-950 dark:text-neutral-50',
className,
)}
{...props}
/>
</DropdownMenuPrimitive.Portal>
));
DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;

const DropdownMenuItem = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
inset?: boolean;
}
>(({ className, inset, ...props }, ref) => (
<DropdownMenuPrimitive.Item
ref={ref}
className={cn(
'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-neutral-800 dark:focus:text-neutral-50',
inset && 'pl-8',
className,
)}
{...props}
/>
));
DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;

const DropdownMenuCheckboxItem = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
>(({ className, children, checked, ...props }, ref) => (
<DropdownMenuPrimitive.CheckboxItem
ref={ref}
className={cn(
'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-neutral-800 dark:focus:text-neutral-50',
className,
)}
checked={checked}
{...props}
>
<span className="absolute left-2 flex size-3.5 items-center justify-center">
<DropdownMenuPrimitive.ItemIndicator>
<Check className="size-4" />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
</DropdownMenuPrimitive.CheckboxItem>
));
DropdownMenuCheckboxItem.displayName =
DropdownMenuPrimitive.CheckboxItem.displayName;

const DropdownMenuRadioItem = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
>(({ className, children, ...props }, ref) => (
<DropdownMenuPrimitive.RadioItem
ref={ref}
className={cn(
'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-neutral-800 dark:focus:text-neutral-50',
className,
)}
{...props}
>
<span className="absolute left-2 flex size-3.5 items-center justify-center">
<DropdownMenuPrimitive.ItemIndicator>
<Circle className="size-2 fill-current" />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
</DropdownMenuPrimitive.RadioItem>
));
DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName;

const DropdownMenuLabel = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Label>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {
inset?: boolean;
}
>(({ className, inset, ...props }, ref) => (
<DropdownMenuPrimitive.Label
ref={ref}
className={cn(
'px-2 py-1.5 text-sm font-semibold',
inset && 'pl-8',
className,
)}
{...props}
/>
));
DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;

const DropdownMenuSeparator = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
>(({ className, ...props }, ref) => (
<DropdownMenuPrimitive.Separator
ref={ref}
className={cn(
'-mx-1 my-1 h-px bg-neutral-100 dark:bg-neutral-800',
className,
)}
{...props}
/>
));
DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName;

const DropdownMenuShortcut = ({
className,
...props
}: React.HTMLAttributes<HTMLSpanElement>) => {
return (
<span
className={cn('ml-auto text-xs tracking-widest opacity-60', className)}
{...props}
/>
);
};
DropdownMenuShortcut.displayName = 'DropdownMenuShortcut';

export {
DropdownMenu,
DropdownMenuTrigger,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuCheckboxItem,
DropdownMenuRadioItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuShortcut,
DropdownMenuGroup,
DropdownMenuPortal,
DropdownMenuSub,
DropdownMenuSubContent,
DropdownMenuSubTrigger,
DropdownMenuRadioGroup,
};
2 changes: 1 addition & 1 deletion client/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export const Layout = (): JSX.Element => {
return (
<div className="flex min-w-full max-w-full flex-col bg-background-light text-text-light dark:bg-background-dark dark:text-text-dark">
<main className="flex min-h-screen flex-col">
<Navbar location={location} isAdmin />
<Navbar />

<QueryClientProvider client={new QueryClient()}>
<Routes location={location}>
Expand Down
5 changes: 4 additions & 1 deletion client/tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ const config = withUt({
},
primary: {
light: '#3CC360',
dark: '#CDBCB1',
dark: {
DEFAULT: '#CDBCB1',
200: '#B5A69C',
},
},
text: {
light: '#010E04',
Expand Down
Loading

0 comments on commit f4d249b

Please sign in to comment.