Skip to content
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

[시작페이지] style qa 진행 #376

Merged
merged 23 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e458088
refactor: 바뀐start 페이지 속 svg 수정 이후, header 속 svg 수정
Feb 19, 2024
7649962
fix: logo header속 아이콘 도 수정
Feb 19, 2024
2aca13c
style: home 아이콘 크기 수정
Feb 19, 2024
aeab64b
fix: 새롭게 바뀐 svg 적용 + 애니메이션 적용을 위한 배경으로 변동
Feb 19, 2024
c34dc0a
style: step svg 파일 추가 후 tsx로 변환완료
Feb 19, 2024
e93d6ba
feat: 새로운 애니메이션 적용 및, 변경 된 svg 새롭게 적용 scroll animation 모든 부분
Feb 19, 2024
99b8c75
feat: 새로운 tournament animation lottie 적용
Feb 19, 2024
0d6b494
style: header 색상 하얀색으로 변경
Feb 19, 2024
19e91f8
style: navigate 중앙정렬 및 색상 변경 + globalstyle margin 0 auto 추가
Feb 19, 2024
5d58a3e
style: 로고 헤더 wrapper 생성 후 중앙정렬
Feb 19, 2024
bf48894
fix: 화면 밀리는 문제 해결 start page + 애니메이션 속도 조절
Feb 19, 2024
1901030
feat: downIcon에도 애니메이션 적용 start page
Feb 19, 2024
ba18328
Merge branch 'develop' into refactor/#371-qa2_style
Feb 20, 2024
5fc6c30
Merge branch 'develop' into refactor/#371-qa2_style
Feb 20, 2024
75f1da6
style: 시작 페이지 사진 width 값 100%으로 수정 첫번째 사진 제외하고
Feb 21, 2024
78ef47b
style: 기존 width 37.5rem 로 변경 시작 첫번째 이미지
Feb 21, 2024
b34ea0f
fix: svg 파일 import 문 삭제
Feb 21, 2024
d4007ee
Merge branch 'develop' into refactor/#371-qa2_style
Feb 22, 2024
dddb728
fix: icon 바꾼거 네이밍 변경 적용 merge 시 바뀌게 된 듯 함
Feb 22, 2024
6538bce
refactor: 변경 된 start 첫번째 사진 svg에서 tsx 생성
Feb 22, 2024
595f483
refactor: start 페이지 첫번째 이미지 수정 반영 margin 없음
Feb 22, 2024
81dfc3e
refactor: 수정 된 버튼 그라데이션 svg 반영
Feb 22, 2024
bf1fe49
feat: 수정한 버튼 그라데이션 코드에 적용
Feb 22, 2024
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
11 changes: 11 additions & 0 deletions public/svg/gradient_CTA.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions public/svg/ic_home_2.svg

This file was deleted.

26 changes: 26 additions & 0 deletions src/assets/svg/GradientCta.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import type { SVGProps } from 'react';
const SvgGradientCta = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 375 92' {...props}>
<path
fill='url(#gradient_CTA_svg__a)'
d='M375 92h375v92H375z'
transform='rotate(-180 375 92)'
/>
<defs>
<linearGradient
id='gradient_CTA_svg__a'
x1={562.5}
x2={562.5}
y1={92}
y2={184}
gradientUnits='userSpaceOnUse'
>
<stop stopColor='#fff' />
<stop offset={0.23} stopColor='#fff' />
<stop offset={0.63} stopColor='#fff' stopOpacity={0.7} />
<stop offset={1} stopColor='#fff' stopOpacity={0} />
</linearGradient>
</defs>
</svg>
);
export default SvgGradientCta;
41 changes: 41 additions & 0 deletions src/assets/svg/HomeBackground.tsx

Large diffs are not rendered by default.

32 changes: 0 additions & 32 deletions src/assets/svg/HomeCtaBgGradient.tsx

This file was deleted.

13 changes: 13 additions & 0 deletions src/assets/svg/IcHome.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import type { SVGProps } from 'react';
const SvgIcHome = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 40 40' {...props}>
<path
stroke='#868384'
strokeLinecap='round'
strokeLinejoin='round'
strokeWidth={1.5}
d='M11 18.07a2 2 0 0 1 .89-1.664l7-4.666a2 2 0 0 1 2.22 0l7 4.666A2 2 0 0 1 29 18.07v9.53a1.4 1.4 0 0 1-1.4 1.4h-4.1a1 1 0 0 1-1-1v-4.5a1 1 0 0 0-1-1h-3a1 1 0 0 0-1 1V28a1 1 0 0 1-1 1h-4.1a1.4 1.4 0 0 1-1.4-1.4z'
/>
</svg>
);
export default SvgIcHome;
13 changes: 0 additions & 13 deletions src/assets/svg/IcHome2.tsx

This file was deleted.

8 changes: 4 additions & 4 deletions src/assets/svg/IcMypage.tsx → src/assets/svg/IcProfile.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import type { SVGProps } from 'react';
const SvgIcMypage = (props: SVGProps<SVGSVGElement>) => (
const SvgIcProfile = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 40 40' {...props}>
<path
stroke='#ACA7A9'
stroke='#868384'
strokeLinecap='round'
strokeWidth={1.5}
d='M24 16a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z'
/>
<path
stroke='#ACA7A9'
stroke='#868384'
strokeWidth={1.5}
d='M12 28.4a5.4 5.4 0 0 1 5.4-5.4h5.2a5.4 5.4 0 0 1 5.4 5.4.6.6 0 0 1-.6.6H12.6a.6.6 0 0 1-.6-.6Z'
/>
</svg>
);
export default SvgIcMypage;
export default SvgIcProfile;
2 changes: 1 addition & 1 deletion src/assets/svg/Main02.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { SVGProps } from 'react';
const SvgMain02 = (props: SVGProps<SVGSVGElement>) => (
<svg
width='37.5rem'
width='100%'
xmlns='http://www.w3.org/2000/svg'
xmlnsXlink='http://www.w3.org/1999/xlink'
fill='none'
Expand Down
92 changes: 38 additions & 54 deletions src/assets/svg/Main03.tsx

Large diffs are not rendered by default.

86 changes: 4 additions & 82 deletions src/assets/svg/Main04.tsx

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/assets/svg/Person1.tsx

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/assets/svg/Person2.tsx

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions src/assets/svg/Person3.tsx

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions src/assets/svg/Step1.tsx

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions src/assets/svg/Step2.tsx

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions src/assets/svg/Step3.tsx

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions src/assets/svg/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
export { default as IcHome2 } from './IcHome2';
export { default as IcMypage } from './IcMypage';
export { default as GradientCta } from './GradientCta';
export { default as HomeBackground } from './HomeBackground';
export { default as Step1 } from './Step1';
export { default as Step2 } from './Step2';
export { default as Step3 } from './Step3';
export { default as IcHome } from './IcHome';
export { default as IcProfile } from './IcProfile';
export { default as Svg3Dicons } from './3Dicons';
export { default as Divider } from './Divider';
export { default as Favicon } from './Favicon';
export { default as HomeBgGradientFix } from './HomeBgGradientFix';
export { default as HomeCtaBgGradient } from './HomeCtaBgGradient';
export { default as IcAdd } from './IcAdd';
export { default as IcAlertCircle } from './IcAlertCircle';
export { default as IcAlertSquare } from './IcAlertSquare';
Expand Down Expand Up @@ -69,9 +73,9 @@ export { default as Logo } from './Logo';
export { default as Logotype } from './Logotype';
export { default as LogoSweet } from './LogoSweet';
export { default as LongDivider } from './LongDivider';
export { default as Main02 } from './Main02';
export { default as Main03 } from './Main03';
export { default as Main04 } from './Main04';
export { default as Main02 } from './Main02';
export { default as MypageImage } from './MypageImage';
export { default as Person1 } from './Person1';
export { default as Person2 } from './Person2';
Expand Down
6 changes: 3 additions & 3 deletions src/components/HomeMypageHeader/HomeMypageHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IcMypage, IcHome2 } from '../../assets/svg';
import { IcProfile, IcHome } from '../../assets/svg';
import { useNavigate } from 'react-router';
import * as S from './HomeMypageHeader.style';

Expand All @@ -15,11 +15,11 @@ const HomeMypageHeader = () => {

return (
<S.HomeMypageHeaderWrapper>
<IcHome2 style={{ width: '2.4rem' }} onClick={handleSettingHomeIcon} />
<IcHome style={{ width: '2.4rem' }} onClick={handleSettingHomeIcon} />
{userImg ? (
<S.UserProfileImg src={userImg} onClick={handleMyPageIcon} />
) : (
<IcMypage style={{ width: '4.3rem' }} onClick={handleMyPageIcon} />
<IcProfile style={{ width: '4.3rem' }} onClick={handleMyPageIcon} />
)}
</S.HomeMypageHeaderWrapper>
);
Expand Down
23 changes: 4 additions & 19 deletions src/components/ScrollAnimationContainer/ScrollAnimation.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,13 @@ import styled, { keyframes } from 'styled-components';
const frameInAnimation = keyframes`
0% {
opacity: 0;
transform: translateX(-100%);
}

100%{
opacity: 1;
transform: translateX(-5%);
transform: translateX(-1rem);
}
`;
const frameInAnimationLeft = keyframes`
0% {
opacity: 0;
transform: translateX(100%);
}

100%{
opacity: 1;
transform: translate(25%);
transform: translateX(1.5rem);
}
`;
const frameInAnimationUp = keyframes`
Expand All @@ -37,28 +27,23 @@ const frameInAnimationUp = keyframes`
export const Container = styled.div`
${({ theme: { mixin } }) => mixin.flexBox({ direction: 'column' })};
max-width: 37.5rem;
margin: 2.4rem;

&.frame-in {
animation: ${frameInAnimation} 2s forwards;
}
`;

export const LeftContainer = styled.div`
${({ theme: { mixin } }) => mixin.flexBox({ direction: 'column' })};
${({ theme: { mixin } }) => mixin.flexBox({ justify: 'flex-end' })};
max-width: 37.5rem;
margin-top: 4.9rem;

&.frame-in {
animation: ${frameInAnimationLeft} 2s forwards;
}
`;

export const UpContainer = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
${({ theme: { mixin } }) => mixin.flexCenter({})};

&.frame-in {
animation: ${frameInAnimationUp} 2s forwards;
Expand Down
13 changes: 9 additions & 4 deletions src/pages/Start/LogoHeader/LogoHeader.style.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import styled from 'styled-components';

export const LogoHeaderWrapper = styled.div`
${({ theme: { mixin } }) => mixin.flexBox({ align: 'center' })};
${({ theme: { mixin } }) => mixin.flexBox({ justify: 'center' })};
position: fixed;
width: 100%;
padding: 0 2rem;
height: 5.6rem;
gap: 21.2rem;
z-index: 999;
top: 0rem;
background-color: #fafafa;
background-color: white;
`;

export const IconWrapper = styled.div`
${({ theme: { mixin } }) => mixin.flexBox({ align: 'center' })};
width: 37.5rem;
gap: 21.2rem;
padding: 0 2rem;
`;

export const UserProfileImg = styled.img`
Expand Down
16 changes: 9 additions & 7 deletions src/pages/Start/LogoHeader/LogoHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IcMypage, SweetLogoPink } from '../../../assets/svg';
import { IcProfile, SweetLogoPink } from '../../../assets/svg';
import { useNavigate } from 'react-router';
import * as S from './LogoHeader.style';

Expand All @@ -12,13 +12,15 @@ const LogoHeader = () => {

return (
<S.LogoHeaderWrapper>
<SweetLogoPink style={{ width: '9.9rem' }} />
<S.IconWrapper>
<SweetLogoPink style={{ width: '9.9rem' }} />

{userImg ? (
<S.UserProfileImg src={userImg} onClick={handleMyPageIcon} />
) : (
<IcMypage style={{ width: '4.8rem' }} onClick={handleMyPageIcon} />
)}
{userImg ? (
<S.UserProfileImg src={userImg} onClick={handleMyPageIcon} />
) : (
<IcProfile style={{ width: '4.8rem' }} onClick={handleMyPageIcon} />
)}
</S.IconWrapper>
</S.LogoHeaderWrapper>
);
};
Expand Down
30 changes: 12 additions & 18 deletions src/pages/Start/Start.style.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
import styled from 'styled-components';
import HomeBg from '../../assets/img/home_bg11.png';
import {
HomeBackground,
HomeBgGradientFix,
HomeCtaBgGradient,
IcDown,
GradientCta,
Main02,
Main03,
Main04,
} from '../../assets/svg';
import BtnFill from '../../components/common/Button/Cta/fill/BtnFill';

export const Wrapper = styled.div`
background-image: url(${HomeBg});
background-size: cover;
width: 100%;
width: 37.5rem;
height: 100vh;
background-repeat: no-repeat;
${({ theme: { mixin } }) => mixin.flexCenter({})};
margin: auto;
background-color: #fafafa;
margin: auto 0;
`;

export const Gradient = styled(HomeBgGradientFix)`
position: absolute;
top: 55rem;
top: 54rem;
z-index: 2;
width: 100%;
`;

export const BtnGradient = styled(HomeCtaBgGradient)`
export const BtnGradient = styled(GradientCta)`
position: fixed;
z-index: 2;
bottom: 0;
Expand All @@ -40,9 +37,13 @@ export const BtnFillStyle = styled(BtnFill)`
margin: 2rem;
`;

export const Main1 = styled(HomeBackground)`
position: absolute;
`;

export const Main2 = styled(Main02)`
position: absolute;
top: 62rem;
top: 61rem;
`;

export const Main3 = styled(Main03)`
Expand All @@ -54,10 +55,3 @@ export const Main4 = styled(Main04)`
position: absolute;
top: 211rem;
`;

export const DownIcon = styled(IcDown)`
position: absolute;
top: 53rem;
width: 4rem;
color: ${({ theme: { colors } }) => colors.G_07};
`;
Loading