Skip to content

refactor: reduce code duplication #688

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

Merged
merged 5 commits into from
Apr 25, 2025
Merged

refactor: reduce code duplication #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3396146
refactor: reduce code duplication
anyulled Apr 1, 2025
8c68713
chore: change to default export
anyulled Apr 1, 2025
2c13079
chore: change to default export
anyulled Apr 1, 2025
e468547
chore: improve readability
anyulled Apr 1, 2025
9a3466b
build: fixing default export
anyulled Apr 25, 2025
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
8 changes: 4 additions & 4 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import About from "./views/About/About";
import Travel from "./views/Travel/Travel";
import NotFoundError from "./components/NotFoundError/NotFoundError";
import { Home2023Wrapper } from "./2023/Home/Home2023Wrapper";
import Speakers2023 from "./2023/Speakers/Speakers2023";
import Speakers2023 from "./components/YearSpecific/Speakers/Speakers2023";
import SpeakerDetailContainer2023 from "./2023/SpeakerDetail/SpeakerDetailContainer2023";
import Talks2023 from "./2023/Talks/Talks2023";
import TalkDetailContainer2023 from "./2023/TalkDetail/TalkDetailContainer2023";
Expand All @@ -85,14 +85,14 @@ import JobOffers2023 from "./2023/JobOffers/JobOffers2023";
import Sponsorship from "./views/sponsorship/Sponsorship";
import Diversity2023 from "./2023/Diversity/Diversity2023";
import CfpSection from "./views/Cfp/CfpSection";
import { CodeOfConduct } from "./views/CodeOfConduct/CodeOfConduct";
import { Accommodation } from "./views/Travel/Accommodation";
import CodeOfConduct from "./views/CodeOfConduct/CodeOfConduct";
import Accommodation from "./views/Travel/Accommodation";
import Schedule from "./views/Schedule/Schedule";
import Diversity from "./views/Diversity/Diversity";
import LiveView from "./views/Talks/LiveView";
import JobOffers from "./views/JobOffers/JobOffers";
import { HomeWrapper2024 } from "./2024/HomeWrapper2024";
import Speakers2024 from "./2024/Speakers/Speakers2024";
import Speakers2024 from "./components/YearSpecific/Speakers/Speakers2024";
import Talks2024 from "./2024/Talks/Talks2024";
import TalkDetailContainer from "./views/MeetingDetail/TalkDetailContainer";
import SpeakerDetailContainer2024 from "./2024/SpeakerDetail/SpeakerDetailContainer2024";
Expand Down
43 changes: 18 additions & 25 deletions src/components/Navigation/HorizontalMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { BIG_BREAKPOINT } from "../../constants/BreakPoints";
import { NavigationItem } from "./NavigationData";
import { useWindowSize } from "react-use";
import { NavMenu, StyledLink, SubLink, SubMenu } from "./Style.Navigation";
import { NavLink } from "react-router";
import { FC } from "react";
Expand All @@ -14,30 +12,25 @@ export const HorizontalMenu: FC<React.PropsWithChildren<Props>> = ({
navItems,
subMenuItems,
}) => {
const { width } = useWindowSize();
return (
<>
{width > BIG_BREAKPOINT && (
<div className="horizontal-navigation">
{navItems.map((item) => (
<StyledLink key={item.id} to={item.link}>
{item.id}
</StyledLink>
))}
{subMenuItems.length > 0 && (
<NavMenu style={{ position: "relative" }}>
News{" "}
<SubMenu>
{subMenuItems.map((item) => (
<SubLink key={item.id}>
<NavLink to={item.link}>{item.id}</NavLink>
</SubLink>
))}
</SubMenu>
</NavMenu>
)}
</div>
<div className="horizontal-navigation">
{navItems.map((item) => (
<StyledLink key={item.id} to={item.link}>
{item.id}
</StyledLink>
))}
{subMenuItems.length > 0 && (
<NavMenu style={{ position: "relative" }}>
News{" "}
<SubMenu>
{subMenuItems.map((item) => (
<SubLink key={item.id}>
<NavLink to={item.link}>{item.id}</NavLink>
</SubLink>
))}
</SubMenu>
</NavMenu>
)}
</>
</div>
);
};
285 changes: 142 additions & 143 deletions src/components/Navigation/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,166 +1,165 @@
import {AnimatePresence} from "framer-motion";
import {FC, useEffect, useState} from "react";
import {MOBILE_BREAKPOINT} from "../../constants/BreakPoints";
import {useLocation, useNavigate} from "react-router";
import { AnimatePresence } from "framer-motion";
import { FC, useEffect, useState } from "react";
import { BIG_BREAKPOINT, MOBILE_BREAKPOINT } from "../../constants/BreakPoints";
import { useLocation, useNavigate } from "react-router";
import Breadcrumbs from "./Breadcrumbs";
import CloseIcon from "../../assets/images/CloseIcon.svg";
import NavigationLogo from "../../assets/images/devBcn.png";
import {ROUTE_HOME, ROUTE_HOME_ALTERNATE} from "../../constants/routes";
import { ROUTE_HOME, ROUTE_HOME_ALTERNATE } from "../../constants/routes";
import TicketsImage from "../../assets/images/TicketsImage.svg";
import {navigationItems2025, subMenuItems2025} from "./NavigationData";
import { navigationItems2025, subMenuItems2025 } from "./NavigationData";
import {
navigationItems2023,
subMenuItems2023,
navigationItems2023,
subMenuItems2023,
} from "../../2023/Navigation/NavigationData2023";
import {useWindowSize} from "react-use";
import { useWindowSize } from "react-use";
import {
StyledClipPath,
StyledHeader,
StyledHeaderLogo,
StyledHeaderWrapper,
StyledLink,
StyledMenuIcon,
StyledNavigation,
StyledNavigationContainer,
StyledNavigationLogo,
StyledNavLinkHighlightedImage,
StyledTicketLink,
StyledClipPath,
StyledHeader,
StyledHeaderLogo,
StyledHeaderWrapper,
StyledLink,
StyledMenuIcon,
StyledNavigation,
StyledNavigationContainer,
StyledNavigationLogo,
StyledNavLinkHighlightedImage,
StyledTicketLink,
} from "./Style.Navigation";
import {HorizontalMenu} from "./HorizontalMenu";
import {HamburgerMenu} from "./HamburgerMenu";
import { HorizontalMenu } from "./HorizontalMenu";
import { HamburgerMenu } from "./HamburgerMenu";
import {
navigationItems2024,
subMenuItems2024
navigationItems2024,
subMenuItems2024,
} from "../../2024/Navigation/NavigationData";

const Navigation: FC<React.PropsWithChildren<unknown>> = () => {
const {width} = useWindowSize();
const [isOpened, setIsOpened] = useState(false);
const [navItems, setNavItems] = useState(navigationItems2025);
const [subNavItems, setSubNavItems] = useState(subMenuItems2025);
const {pathname} = useLocation();
const navigate = useNavigate();
const handleLogoClick = () => {
navigate(ROUTE_HOME);
};
const handleSetMenu = () => {
setIsOpened(!isOpened);
};
const isHomePage = () => {
return pathname === ROUTE_HOME || pathname === ROUTE_HOME_ALTERNATE;
};
const { width } = useWindowSize();
const [isOpened, setIsOpened] = useState(false);
const [navItems, setNavItems] = useState(navigationItems2025);
const [subNavItems, setSubNavItems] = useState(subMenuItems2025);
const { pathname } = useLocation();
const navigate = useNavigate();
const handleLogoClick = () => {
navigate(ROUTE_HOME);
};
const handleSetMenu = () => {
setIsOpened(!isOpened);
};
const isHomePage = () => {
return pathname === ROUTE_HOME || pathname === ROUTE_HOME_ALTERNATE;
};

useEffect(() => {
const navMapping = {
"/2024": {
navItems: navigationItems2024,
subNavItems: subMenuItems2024
},
"/2023": {
navItems: navigationItems2023,
subNavItems: subMenuItems2023
},
default: {
navItems: navigationItems2025,
subNavItems: subMenuItems2025
},
};

const {
navItems,
subNavItems
} = Object.entries(navMapping).find(([key]) => pathname.startsWith(key))?.[1] || navMapping.default;
useEffect(() => {
const navMapping = {
"/2024": {
navItems: navigationItems2024,
subNavItems: subMenuItems2024,
},
"/2023": {
navItems: navigationItems2023,
subNavItems: subMenuItems2023,
},
default: {
navItems: navigationItems2025,
subNavItems: subMenuItems2025,
},
};

setNavItems(navItems);
setSubNavItems(subNavItems);
}, [pathname]);
const { navItems, subNavItems } =
Object.entries(navMapping).find(([key]) =>
pathname.startsWith(key),
)?.[1] || navMapping.default;

setNavItems(navItems);
setSubNavItems(subNavItems);
}, [pathname]);

const getTicketURL = (): string => {
if (pathname.startsWith("/2023")) {
return "https://tickets.devbcn.com/event/devbcn-2023";
}
if (pathname.startsWith("/2024")) {
return "https://tickets.devbcn.com/event/devbcn-2024";
}
return "https://tickets.devbcn.com/event/devbcn-2025";
const getTicketURL = (): string => {
if (pathname.startsWith("/2023")) {
return "https://tickets.devbcn.com/event/devbcn-2023";
}
if (pathname.startsWith("/2024")) {
return "https://tickets.devbcn.com/event/devbcn-2024";
}
return "https://tickets.devbcn.com/event/devbcn-2025";
};

return (
<>
<StyledHeaderWrapper>
<StyledHeader>
<StyledHeaderLogo
alt="DevBcn — logo"
src={NavigationLogo}
onClick={handleLogoClick}
/>
<HorizontalMenu navItems={navItems}
subMenuItems={subNavItems}/>
<HamburgerMenu onClick={handleSetMenu}/>
</StyledHeader>
return (
<>
<StyledHeaderWrapper>
<StyledHeader>
<StyledHeaderLogo
alt="DevBcn — logo"
src={NavigationLogo}
onClick={handleLogoClick}
/>
{width > BIG_BREAKPOINT && (
<HorizontalMenu navItems={navItems} subMenuItems={subNavItems} />
)}
<HamburgerMenu onClick={handleSetMenu} />
</StyledHeader>

{!isHomePage() && <Breadcrumbs/>}
</StyledHeaderWrapper>
<AnimatePresence>
{isOpened && (
<StyledNavigationContainer
transition={{duration: 0.5, ease: "easeIn"}}
initial={{width: 0}}
animate={
width > MOBILE_BREAKPOINT
? {width: "140vw"}
: {width: "100vw"}
}
exit={{width: 0}}
>
<StyledNavigation>
<StyledMenuIcon
src={CloseIcon}
onClick={handleSetMenu}
whileTap={{scale: 0.8}}
/>
<StyledNavigationLogo
src={NavigationLogo}
onClick={() => {
navigate(ROUTE_HOME);
handleSetMenu();
}}
/>
{navItems.map((item) => (
<StyledLink
key={item.id}
to={item.link}
onClick={handleSetMenu}
>
{item.id}
</StyledLink>
))}
{subNavItems.map((item) => (
<StyledLink
key={item.id}
to={item.link}
onClick={handleSetMenu}
>
{item.id}
</StyledLink>
))}
{!isHomePage() && <Breadcrumbs />}
</StyledHeaderWrapper>
<AnimatePresence>
{isOpened && (
<StyledNavigationContainer
transition={{ duration: 0.5, ease: "easeIn" }}
initial={{ width: 0 }}
animate={
width > MOBILE_BREAKPOINT
? { width: "140vw" }
: { width: "100vw" }
}
exit={{ width: 0 }}
>
<StyledNavigation>
<StyledMenuIcon
src={CloseIcon}
onClick={handleSetMenu}
whileTap={{ scale: 0.8 }}
/>
<StyledNavigationLogo
src={NavigationLogo}
onClick={() => {
navigate(ROUTE_HOME);
handleSetMenu();
}}
/>
{navItems.map((item) => (
<StyledLink
key={item.id}
to={item.link}
onClick={handleSetMenu}
>
{item.id}
</StyledLink>
))}
{subNavItems.map((item) => (
<StyledLink
key={item.id}
to={item.link}
onClick={handleSetMenu}
>
{item.id}
</StyledLink>
))}

<StyledTicketLink
href={getTicketURL()}
target="_blank"
rel="noreferrer"
>
<StyledNavLinkHighlightedImage
src={TicketsImage}/>
</StyledTicketLink>
</StyledNavigation>
{width > MOBILE_BREAKPOINT && <StyledClipPath/>}
</StyledNavigationContainer>
)}
</AnimatePresence>
</>
);
<StyledTicketLink
href={getTicketURL()}
target="_blank"
rel="noreferrer"
>
<StyledNavLinkHighlightedImage src={TicketsImage} />
</StyledTicketLink>
</StyledNavigation>
{width > MOBILE_BREAKPOINT && <StyledClipPath />}
</StyledNavigationContainer>
)}
</AnimatePresence>
</>
);
};

export default Navigation;
Loading
Loading