Skip to content

Commit 8afd0ef

Browse files
authored
Merge pull request #1321 from Moadong/develop-fe
FE v1.3.4
2 parents 8c89ea2 + 376103f commit 8afd0ef

File tree

3 files changed

+10
-29
lines changed

3 files changed

+10
-29
lines changed

frontend/src/pages/MainPage/components/Banner/bannerData.ts

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,6 @@ interface BannerItem {
1616
}
1717

1818
const BANNERS: BannerItem[] = [
19-
{
20-
id: '2026-club-fair',
21-
desktopImage: ClubFairDesktopImage,
22-
mobileImage: ClubFairMobileImage,
23-
linkTo: '/festival-introduction',
24-
alt: '2026 동아리 소개 한마당 홍보',
25-
},
26-
{
27-
id: 'app-release-december-2025',
28-
desktopImage: AppReleaseDesktopImage,
29-
mobileImage: AppReleaseMobileImage,
30-
linkTo: 'APP_STORE_LINK',
31-
alt: '앱 다운로드 배너',
32-
},
3319
{
3420
id: 'all-clubs-in-one-place',
3521
desktopImage: AllClubsDesktopImage,
@@ -44,6 +30,13 @@ const BANNERS: BannerItem[] = [
4430
linkTo: '/introduce',
4531
alt: '지금 바로 모아동에서 시작하세요',
4632
},
33+
{
34+
id: 'app-release-december-2025',
35+
desktopImage: AppReleaseDesktopImage,
36+
mobileImage: AppReleaseMobileImage,
37+
linkTo: 'APP_STORE_LINK',
38+
alt: '앱 다운로드 배너',
39+
},
4740
];
4841

4942
export default BANNERS;

frontend/src/pages/MainPage/components/Filter/Filter.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ const Filter = ({ alwaysVisible = false }: FilterProps) => {
3434
<Styled.FilterListContainer>
3535
{FILTER_OPTIONS.map((filter) => (
3636
<Styled.FilterButtonWrapper key={filter.path}>
37-
<Styled.NotificationDot
38-
$isVisible={filter.path === FESTIVAL_PATH}
39-
/>
4037
<Styled.FilterButton
4138
$isActive={pathname === filter.path}
4239
onClick={() => handleFilterOptionClick(filter.path)}

frontend/src/pages/MainPage/components/Popup/Popup.tsx

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { MouseEvent, useEffect, useState } from 'react';
22
import { useNavigate } from 'react-router-dom';
33
import AppDownloadImage from '@/assets/images/popup/app-download.png';
4-
import FestivalImage from '@/assets/images/popup/festival.png';
54
import { USER_EVENT } from '@/constants/eventName';
65
import useMixpanelTrack from '@/hooks/Mixpanel/useMixpanelTrack';
76
import useDevice from '@/hooks/useDevice';
@@ -24,15 +23,14 @@ export const isPopupHidden = (): boolean => {
2423
};
2524

2625
const Popup = () => {
27-
const navigate = useNavigate();
2826
const [isOpen, setIsOpen] = useState(false);
2927
const [imageLoaded, setImageLoaded] = useState(false);
3028
const { isMobile } = useDevice();
3129
const trackEvent = useMixpanelTrack();
3230

3331
useEffect(() => {
3432
const img = new Image();
35-
img.src = FestivalImage;
33+
img.src = AppDownloadImage;
3634
img.onload = () => setImageLoaded(true);
3735
img.onerror = () => setImageLoaded(true);
3836
}, []);
@@ -92,13 +90,6 @@ const Popup = () => {
9290
window.open(storeLink, '_blank');
9391
};
9492

95-
const handleFestival = () => {
96-
trackEvent(USER_EVENT.FESTIVAL_POPUP_CLICKED, {
97-
popupType: 'festival',
98-
});
99-
navigate('/festival-introduction');
100-
};
101-
10293
const handleBackdropClick = (e: MouseEvent<HTMLDivElement>) => {
10394
if (e.target === e.currentTarget) {
10495
handleClose('backdrop_click');
@@ -118,8 +109,8 @@ const Popup = () => {
118109
onClick={(e: MouseEvent<HTMLDivElement>) => e.stopPropagation()}
119110
>
120111
<Styled.Container>
121-
<Styled.ImageWrapper onClick={handleFestival}>
122-
<Styled.PopupImage src={FestivalImage} alt='동소한' />
112+
<Styled.ImageWrapper onClick={handleDownload}>
113+
<Styled.PopupImage src={AppDownloadImage} alt='앱 다운로드' />
123114
</Styled.ImageWrapper>
124115

125116
<Styled.ButtonGroup>

0 commit comments

Comments
 (0)