diff --git a/apps/blog/src/components/Header/Nav.tsx b/apps/blog/src/components/Header/Nav.tsx index 999bc42..470699a 100644 --- a/apps/blog/src/components/Header/Nav.tsx +++ b/apps/blog/src/components/Header/Nav.tsx @@ -18,11 +18,17 @@ const Nav = styled.div` export default () => { return ( - {NavbarData.map((item, index) => ( - - {item.title} - - ))} + {NavbarData.map(({ path, title }, index) => { + return path.at(0) === "/" ? ( + + {title} + + ) : ( + + {title} + + ) + })} ) } diff --git a/apps/blog/src/components/Sidebar/SubMenu.tsx b/apps/blog/src/components/Sidebar/SubMenu.tsx index 34606b3..241cee1 100644 --- a/apps/blog/src/components/Sidebar/SubMenu.tsx +++ b/apps/blog/src/components/Sidebar/SubMenu.tsx @@ -6,11 +6,11 @@ import type { Item } from "../../data/NavbarData" import { useCallback, useState } from "react" import { Link } from "react-router-dom" -import styled from "styled-components" +import styled, { css } from "styled-components" import button from "../../styles/button" -const SidebarLink = styled(Link)` +const sharedStyle = css` ${button}; display: flex; width: 100%; @@ -31,6 +31,14 @@ const SidebarLink = styled(Link)` } ` +const SidebarLink = styled(Link)` + ${sharedStyle} +` + +const SidebarAnchor = styled.a` + ${sharedStyle} +` + const SidebarLabel = styled.span` margin-left: 1rem; ` @@ -39,21 +47,31 @@ interface Props { item: Item } -const SubMenu = (props: Props) => { +const SubMenu = ({ item }: Props) => { + const { path, icon, title } = item const [isSubNavOpen, setSubNavOpen] = useState(false) const handleSidebarLinkClick = useCallback(() => { setSubNavOpen((prev) => !prev) }, [isSubNavOpen]) - return ( - <> - + if (path.at(0) == "/") { + return ( + - {props.item.icon} - {props.item.title} + {icon} + {title} - > + ) + } + + return ( + + + {icon} + {title} + + ) }