-
Notifications
You must be signed in to change notification settings - Fork 3
[feature] 소개페이지 임시 이미지로 대체 및 메뉴바 구현 #366
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.
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
seongwon030
merged 27 commits into
develop-fe
from
feature/#365-alter-introduce-page-FE-100
May 9, 2025
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
1d73cf6
feat: 소개페이지 컴포넌트 추가
seongwon030 3d2aec1
feat: 소개페이지 이미지 파일 추가
seongwon030 0c28e82
feat: 소개페이지 라우터 추가
seongwon030 3260145
feat: 소개버튼 클릭 시 소개페이지 네이게이션 추가
seongwon030 f7bcf59
refactor: 노션링크 삭제
seongwon030 8eeadc9
feat: png파일 변경
seongwon030 c015a98
refactor: aspect-ragtio 제거 및 width 100vw설정
seongwon030 291d45f
feat: 소개페이지 헤더 추가
seongwon030 e2e3125
feat: 기존 헤더스타일 상속 및 max-width: none으로 설정
seongwon030 6a8ba1c
feat: 로딩 스피너 임시 구현
seongwon030 4f12fc1
feat: footer뺀 png 추가
seongwon030 012afaa
feat: 소개페이지 footer 추가
seongwon030 d56e625
refactor: IntroducePageFooter로 변경
seongwon030 b5a6499
fix: bracketSameLine설정 제거
seongwon030 d3e614b
refactor: 소개페이지 이미지 assets내 introduce폴더로 이동
seongwon030 2e9156f
feat: 삭제 아이콘 추가
seongwon030 5637c2c
refactor: 이미지 경로 수정
seongwon030 5a3f7a8
feat: flex로 모바일 헤더 보이도록 설정
seongwon030 414aa65
feat: 모바일 메뉴바 스타일 컴포넌트 추가
seongwon030 64fcf2c
feat: 모바일 메뉴 컴포넌트 추가
seongwon030 c2a4ed8
refactor: gap 280px에서 150px으로 조정
seongwon030 410575e
refactor: 모바일 메뉴바 로직 분리
seongwon030 5d0e565
refactor: 소개페이지 변경
seongwon030 b243684
refactor: 소개페이지 변경
seongwon030 813c135
refactor: 절대경로로 변경
seongwon030 4df930d
refactor: 절대경로로 변경
seongwon030 eb3d510
fix: object-fit: cover 제거
seongwon030 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; | ||
seongwon030 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| border-radius: 50%; | ||
| width: 48px; | ||
| height: 48px; | ||
| animation: ${spin} 1s linear infinite; | ||
| `; | ||
|
|
||
| const Spinner = () => ( | ||
| <SpinnerWrapper> | ||
| <SpinnerCircle /> | ||
| </SpinnerWrapper> | ||
| ); | ||
|
|
||
| export default Spinner; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; | ||
| `; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.