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.

Sign up for GitHub

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

[refac] 온보딩 halfsuccess 애니메이션 적용 #238

Merged
merged 17 commits into from
Dec 30, 2023
Merged

[refac] 온보딩 halfsuccess 애니메이션 적용 #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2815df9
refac: 온보딩, 선물하기, 설정 refac
choyeon2e Dec 19, 2023
6cf6ef9
conflict
choyeon2e Dec 19, 2023
7bc57c0
refac: 선물하기 바텀시트 연결 수정
choyeon2e Dec 19, 2023
0232091
conflict
choyeon2e Dec 19, 2023
2ecdd81
conflict
choyeon2e Dec 19, 2023
8403f16
conflict
choyeon2e Dec 19, 2023
3bbd66f
conflict
choyeon2e Dec 19, 2023
0867405
conflict
choyeon2e Dec 21, 2023
ef3b382
conflict
choyeon2e Dec 21, 2023
8d70c43
refac: 선물하기 api 재연결
choyeon2e Dec 24, 2023
4b20d74
refac: 프렌즈페이지 재연결
choyeon2e Dec 24, 2023
c7949d1
refac: 렌더링 방지 및 오류 수정
choyeon2e Dec 24, 2023
a13556a
feat: 선물하기 페이지 무한스크롤 구현
choyeon2e Dec 27, 2023
0dba672
conflict
choyeon2e Dec 27, 2023
e5f59dc
refac: 코드 자잘한 수정
choyeon2e Dec 27, 2023
7b9ded9
conflict
choyeon2e Dec 29, 2023
e1f62af
refac: 온보딩 halfsuccess 애니메이션 적용
choyeon2e Dec 29, 2023
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: 4 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<!-- <base href="https://tify-client.vercel.app/"> -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
/>
<title>TIFY</title>
</head>
<body>
Expand Down
3 changes: 1 addition & 2 deletions src/components/atoms/GiftFilter/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { useEffect, useState } from 'react'
import { useRecoilState } from 'recoil'
import styled from '@emotion/styled'

import { theme } from '@styles/theme'
import { SelectedPropsType, SelectedTagType } from '@models/favor'
import { PropsType } from '@models/components/atoms/GiftFilter'
import { friendState } from '@libs/store/friend'
import { FilterIcon } from '@assets/icons/FilterIcon'
import Svg from '../Svg'
import { useRecoilState, useRecoilValue } from 'recoil'

export const GiftFilter = ({
selectedProps,
Expand Down
6 changes: 3 additions & 3 deletions src/pages/onboarding/details/HalfSuccess.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import styled from '@emotion/styled'
import { RoundButton } from '@components/atoms/RoundButton'
import { onboardingPageState, onboardingState } from '@libs/store/onboard'
import onBoardingImg from '@assets/image/onBoardingImg.png'
import VideoBox from '@components/WeeklyQuestion/VideoBox'
import { question } from '@utils/question'
export function HalfSuccess() {
const [info, setInfo] = useRecoilState(onboardingState)
const [goNext, setGoNext] = useRecoilState(onboardingPageState)
Expand All @@ -20,9 +22,7 @@ export function HalfSuccess() {
<Text typo="SCD_Headline_20">나의 취향 프로필을 꾸며볼까요?</Text>
</TextDiv>
<Spacing height={100} />
<div style={{ textAlign: 'center' }}>
<img src={onBoardingImg} alt="온보딩 이미지" width={360} height={242} />
</div>
<VideoBox category={'ME'} />
<BottomSticker>
<RoundButton
variant="mediumRound"
Expand Down