Skip to content

Commit

Permalink
Merge branch 'fix/#161/FixMainPage' of https://github.com/TEAM-BEAT/B…
Browse files Browse the repository at this point in the history
…EAT-Client into fix/#161/FixMainPage

; Conflicts:
;	src/components/commons/hamburger/Hamburger.styled.ts
;	src/components/commons/hamburger/Hamburger.tsx
  • Loading branch information
pepperdad committed Jul 15, 2024
2 parents 0b8ab28 + 41d9310 commit 41df4f1
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/pages/main/components/performance/Performance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Performance = ({ genre, performanceList }: PerformanceComponentProps) => {
const navigate = useNavigate();

const handleNavigate = () => {
navigate("/register");
navigate("/gig-register");
};

const filteredData =
Expand All @@ -44,9 +44,13 @@ const Performance = ({ genre, performanceList }: PerformanceComponentProps) => {
))}
</S.PerformanceLayout>
<Spacing marginBottom="1.5" />
<S.BannerWrapper onClick={handleNavigate}>
<S.Banner $image={BannerImg} />
</S.BannerWrapper>
{genre === "ALL" ? (
<S.BannerWrapper onClick={handleNavigate}>
<S.Banner $image={BannerImg} />
</S.BannerWrapper>
) : (
<></>
)}
<Spacing marginBottom="3.2" />
<S.PerformanceLayout>
{data2.map((item) => (
Expand Down

0 comments on commit 41df4f1

Please sign in to comment.