Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1d73cf6
feat: 소개페이지 컴포넌트 추가
seongwon030 May 2, 2025
3d2aec1
feat: 소개페이지 이미지 파일 추가
seongwon030 May 2, 2025
0c28e82
feat: 소개페이지 라우터 추가
seongwon030 May 2, 2025
3260145
feat: 소개버튼 클릭 시 소개페이지 네이게이션 추가
seongwon030 May 2, 2025
f7bcf59
refactor: 노션링크 삭제
seongwon030 May 2, 2025
8eeadc9
feat: png파일 변경
seongwon030 May 3, 2025
c015a98
refactor: aspect-ragtio 제거 및 width 100vw설정
seongwon030 May 3, 2025
291d45f
feat: 소개페이지 헤더 추가
seongwon030 May 3, 2025
e2e3125
feat: 기존 헤더스타일 상속 및 max-width: none으로 설정
seongwon030 May 3, 2025
6a8ba1c
feat: 로딩 스피너 임시 구현
seongwon030 May 3, 2025
4f12fc1
feat: footer뺀 png 추가
seongwon030 May 5, 2025
012afaa
feat: 소개페이지 footer 추가
seongwon030 May 5, 2025
d56e625
refactor: IntroducePageFooter로 변경
seongwon030 May 5, 2025
b5a6499
fix: bracketSameLine설정 제거
seongwon030 May 6, 2025
d3e614b
refactor: 소개페이지 이미지 assets내 introduce폴더로 이동
seongwon030 May 6, 2025
2e9156f
feat: 삭제 아이콘 추가
seongwon030 May 6, 2025
5637c2c
refactor: 이미지 경로 수정
seongwon030 May 6, 2025
5a3f7a8
feat: flex로 모바일 헤더 보이도록 설정
seongwon030 May 6, 2025
414aa65
feat: 모바일 메뉴바 스타일 컴포넌트 추가
seongwon030 May 6, 2025
64fcf2c
feat: 모바일 메뉴 컴포넌트 추가
seongwon030 May 6, 2025
c2a4ed8
refactor: gap 280px에서 150px으로 조정
seongwon030 May 6, 2025
410575e
refactor: 모바일 메뉴바 로직 분리
seongwon030 May 6, 2025
5d0e565
refactor: 소개페이지 변경
seongwon030 May 7, 2025
b243684
refactor: 소개페이지 변경
seongwon030 May 7, 2025
813c135
refactor: 절대경로로 변경
seongwon030 May 9, 2025
4df930d
refactor: 절대경로로 변경
seongwon030 May 9, 2025
eb3d510
fix: object-fit: cover 제거
seongwon030 May 9, 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
5 changes: 2 additions & 3 deletions frontend/.prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@
"arrowParens": "always",
"endOfLine": "auto",
"prefer-const": true,
"singleAttributePerLine": false,
"bracketSameLine": true
}
"singleAttributePerLine": false
}
8 changes: 5 additions & 3 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import { AdminClubProvider } from '@/context/AdminClubContext';
import GlobalStyles from '@/styles/Global.styles';
import MainPage from '@/pages/MainPage/MainPage';
import ClubDetailPage from '@/pages/ClubDetailPage/ClubDetailPage';
import AdminPage from './pages/AdminPage/AdminPage';
import AdminPage from '@/pages/AdminPage/AdminPage';
import IntroducePage from '@/pages/IntroducePage/IntroducePage';
import ClubInfoEditTab from '@/pages/AdminPage/tabs/ClubInfoEditTab/ClubInfoEditTab';
import RecruitEditTab from './pages/AdminPage/tabs/RecruitEditTab/RecruitEditTab';
import AccountEditTab from './pages/AdminPage/tabs/AccountEditTab/AccountEditTab';
import RecruitEditTab from '@/pages/AdminPage/tabs/RecruitEditTab/RecruitEditTab';
import AccountEditTab from '@/pages/AdminPage/tabs/AccountEditTab/AccountEditTab';
import LoginTab from '@/pages/AdminPage/auth/LoginTab/LoginTab';
import PrivateRoute from '@/pages/AdminPage/auth/PrivateRoute/PrivateRoute';
import PhotoEditTab from '@/pages/AdminPage/tabs/PhotoEditTab/PhotoEditTab';
Expand Down Expand Up @@ -41,6 +42,7 @@ const App = () => {
</Suspense>
}
/>
<Route path='/introduce' element={<IntroducePage />} />
<Route path='/admin/login' element={<LoginTab />} />
<Route
path='/admin/*'
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/images/introduce/delete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions frontend/src/components/common/Header/Header.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,58 @@ export const MobileMenu = styled.button`
object-fit: cover;
}
`;

export const DrawerContainer = styled.div<{ isOpen: boolean }>`
position: fixed;
top: ${({ isOpen }) => (isOpen ? '0' : '-175px')};
height: 175px;
left: 0;
right: 0;
border-radius: 0px 0px 20px 20px;
background: #fff;
box-shadow: 0px 20px 30px 0px rgba(0, 0, 0, 0.25);
transition: top 0.2s ease-in-out;
z-index: 2;
padding: 20px;

visibility: ${({ isOpen }) => (isOpen ? 'visible' : 'hidden')};
`;

export const DrawerWrapper = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 34.75px;
`;

export const DrawerHeader = styled.div`
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
gap: 150px;
`;

export const DrawerMainIcon = styled.img`
width: 158px;
height: 32.25px;
flex-shrink: 0;
cursor: pointer;
`;

export const DrawerDeleteIcon = styled.img`
width: 17px;
height: 17px;
flex-shrink: 0;
`;

export const MenubarIntroduceBox = styled.div`
display: inline-flex;
justify-content: center;
align-items: center;
padding: 6px 36px;
border-radius: 52px;
background: rgba(255, 84, 20, 0.08);
cursor: pointer;
`;
64 changes: 55 additions & 9 deletions frontend/src/components/common/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ import { useLocation } from 'react-router-dom';
import * as Styled from './Header.styles';
import SearchBox from '@/components/common/SearchBox/SearchBox';
import useHeaderService from '@/services/header/useHeaderService';
import useMobileMenu from '@/services/header/useMobileMenu';
import useIsMobile from '@/hooks/useIsMobile';
import DesktopMainIcon from '@/assets/images/moadong_name_logo.svg';
import MobileMainIcon from '@/assets/images/logos/moadong_mobile_logo.svg';
import MenuBar from '@/assets/images/icons/menu_button_icon.svg';
import DeleteIcon from '@/assets/images/introduce/delete.png';

interface MobileHeaderProps {
handleHomeClick: (device: 'mobile' | 'desktop') => void;
Expand All @@ -19,6 +21,42 @@ interface DesktopHeaderProps {
handleIntroduceClick: () => void;
}

interface MobileMenuProp {
isOpen: boolean;
onClose: () => void;
handleHomeClick: (device: 'mobile' | 'desktop') => void;
handleIntroduceClick: () => void;
}

const MobileMenuDrawer = ({
isOpen,
onClose,
handleHomeClick,
handleIntroduceClick,
}: MobileMenuProp) => {
return (
<Styled.DrawerContainer isOpen={isOpen}>
<Styled.DrawerWrapper>
<Styled.DrawerHeader>
<Styled.DrawerMainIcon
src={DesktopMainIcon}
alt='홈 버튼'
onClick={() => handleHomeClick('mobile')}
/>
<Styled.DrawerDeleteIcon
src={DeleteIcon}
alt='삭제 버튼'
onClick={onClose}
/>
</Styled.DrawerHeader>
<Styled.MenubarIntroduceBox onClick={handleIntroduceClick}>
모아동 소개
</Styled.MenubarIntroduceBox>
</Styled.DrawerWrapper>
</Styled.DrawerContainer>
);
};

const MobileHeader = ({
handleHomeClick,
handleMenuClick,
Expand Down Expand Up @@ -56,11 +94,7 @@ const DesktopHeader = ({
/>
</Styled.LogoButtonStyles>
{!isAdminPage && (
<Styled.IntroduceButtonStyles
onClick={handleIntroduceClick}
href='https://valiant-schooner-12c.notion.site/1a64ac84bab3805287e0cef50b563370'
target='_blank'
rel='noopener noreferrer'>
<Styled.IntroduceButtonStyles onClick={handleIntroduceClick}>
모아동 소개
</Styled.IntroduceButtonStyles>
)}
Expand All @@ -78,11 +112,23 @@ const Header = () => {
const { handleHomeClick, handleIntroduceClick, handleMenuClick } =
useHeaderService();

const { isMenuOpen, openMenu, closeMenu } = useMobileMenu({
handleMenuClick,
});

return isMobile ? (
<MobileHeader
handleHomeClick={handleHomeClick}
handleMenuClick={handleMenuClick}
/>
<>
<MobileHeader
handleHomeClick={handleHomeClick}
handleMenuClick={openMenu}
/>
<MobileMenuDrawer
isOpen={isMenuOpen}
onClose={closeMenu}
handleHomeClick={handleHomeClick}
handleIntroduceClick={handleIntroduceClick}
/>
</>
) : (
<DesktopHeader
isAdminPage={isAdminPage}
Expand Down
31 changes: 31 additions & 0 deletions frontend/src/components/common/Spinner/Spinner.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from 'react';
import styled, { keyframes } from 'styled-components';

const spin = keyframes`
0% { transform: rotate(0deg);}
100% { transform: rotate(360deg);}
`;

const SpinnerWrapper = styled.div`
display: flex;
justify-content: center;
align-items: center;
height: 800px;
`;

const SpinnerCircle = styled.div`
border: 6px solid #eee;
border-top: 6px solid #ff5414;
border-radius: 50%;
width: 48px;
height: 48px;
animation: ${spin} 1s linear infinite;
`;

const Spinner = () => (
<SpinnerWrapper>
<SpinnerCircle />
</SpinnerWrapper>
);

export default Spinner;
21 changes: 21 additions & 0 deletions frontend/src/pages/IntroducePage/IntroducePage.styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import styled from 'styled-components';
import { HeaderStyles } from '@/components/common/Header/Header.styles';
import { FooterContainer } from '@/components/common/Footer/Footer.styles';

export const IntroducePageHeader = styled(HeaderStyles)`
max-width: none;

@media (max-width: 500px) {
display: flex;
}
`;

export const IntroducePageFooter = styled(FooterContainer)`
margin-top: -50px;
`;

export const IntroduceImage = styled.img`
width: 100vw;
height: auto;
margin-top: 62px;
`;
30 changes: 30 additions & 0 deletions frontend/src/pages/IntroducePage/IntroducePage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React, { useState } from 'react';
import * as Styled from './IntroducePage.styles';
import Header from '@/components/common/Header/Header';
import Footer from '@/components/common/Footer/Footer';
import Spinner from '@/components/common/Spinner/Spinner';
import IntroduceImage from '@/assets/images/introduce/Introduce.png';

const IntroducePage = () => {
const [loading, setLoading] = useState(true);

return (
<>
<Styled.IntroducePageHeader>
<Header />
</Styled.IntroducePageHeader>
{loading && <Spinner />}
<Styled.IntroduceImage
src={IntroduceImage}
alt='소개 이미지'
style={{ display: loading ? 'none' : 'block' }}
onLoad={() => setLoading(false)}
/>
<Styled.IntroducePageFooter>
<Footer />
</Styled.IntroducePageFooter>
</>
);
};

export default IntroducePage;
1 change: 1 addition & 0 deletions frontend/src/services/header/useHeaderService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const useHeaderService = () => {
};

const goIntroducePage = () => {
navigate('/introduce');
trackEvent('Introduce Button Clicked');
};

Expand Down
33 changes: 33 additions & 0 deletions frontend/src/services/header/useMobileMenu.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { useCallback, useEffect, useState } from 'react';
import useMixpanelTrack from '@/hooks/useMixpanelTrack';

interface MobileMenuProp {
handleMenuClick: () => void;
}

const useMobileMenu = ({ handleMenuClick }: MobileMenuProp) => {
const trackEvent = useMixpanelTrack();
const [isMenuOpen, setIsMenuOpen] = useState(false);

const openMenu = () => {
handleMenuClick();
setIsMenuOpen((prev) => !prev);
};

const closeMenu = useCallback(() => {
setIsMenuOpen(false);
trackEvent('Mobile Menubar delete Button Clicked');
}, []);

useEffect(() => {
const handleEsc = (e: KeyboardEvent) => {
if (e.key === 'Escape') closeMenu();
};
if (isMenuOpen) window.addEventListener('keydown', handleEsc);
return () => window.removeEventListener('keydown', handleEsc);
}, [isMenuOpen, closeMenu]);

return { isMenuOpen, openMenu, closeMenu };
};

export default useMobileMenu;