From bd185ac5d4b937bce98111aea83a26ebc730d011 Mon Sep 17 00:00:00 2001 From: Ryou_Changyu Date: Wed, 3 Nov 2021 18:12:53 +0900 Subject: [PATCH 1/4] =?UTF-8?q?:bento:=20notification=5Fempty=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit notification_empty 이미지 변경 --- src/assets/icon/notification_empty.svg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/assets/icon/notification_empty.svg b/src/assets/icon/notification_empty.svg index 3b988a20..80f8394b 100644 --- a/src/assets/icon/notification_empty.svg +++ b/src/assets/icon/notification_empty.svg @@ -1,3 +1,4 @@ - - + + + From 4a435101f0380b81c15751494f46602bc022e6a6 Mon Sep 17 00:00:00 2001 From: Ryou_Changyu Date: Wed, 3 Nov 2021 18:14:06 +0900 Subject: [PATCH 2/4] =?UTF-8?q?:lipstick:=20=EB=AA=A8=EC=9E=84=20=EC=B9=B4?= =?UTF-8?q?=EB=93=9C=20border=20color=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 모임 카드 border color 변경 --- .../LandingPage/components/MeetingCard/MeetingCard.tsx | 2 +- src/constant/color.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/LandingPage/components/MeetingCard/MeetingCard.tsx b/src/components/LandingPage/components/MeetingCard/MeetingCard.tsx index 5dd26bf9..5044039b 100644 --- a/src/components/LandingPage/components/MeetingCard/MeetingCard.tsx +++ b/src/components/LandingPage/components/MeetingCard/MeetingCard.tsx @@ -199,7 +199,7 @@ const MeetingCardWrapper = styled.div` border: 1px solid ${props => props.live_status === 'tomorrow' - ? COLOR.GRAY_000 + ? COLOR.GRAY_200 : COLOR.TEXTAREA_LIGHT_GRAY}; box-sizing: border-box; margin-top: ${props => (props.idx === 0 ? '1.8rem' : 0)}; diff --git a/src/constant/color.ts b/src/constant/color.ts index 02e88e6a..4e473c45 100644 --- a/src/constant/color.ts +++ b/src/constant/color.ts @@ -6,6 +6,7 @@ export const COLOR = { BACKGROUND_WHITE: '#ffffff', MODAL_WRAPPER_BLACK: 'rgba(25,25,26, 0.75)', GRAY_000: '#FAFAFA', + GRAY_200: '#EDEDED', GRAY_300: '#DFE1E3', GRAY_400: '#DFE1E3', GRAY_500: '#A6AAAE', From a0e646b25f1d8c448e42a58d75e5840bc23d0af4 Mon Sep 17 00:00:00 2001 From: Ryou_Changyu Date: Wed, 3 Nov 2021 18:15:08 +0900 Subject: [PATCH 3/4] =?UTF-8?q?:speech=5Fballoon:=20=EB=AA=A8=EC=9E=84=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=91=9C=EC=8B=9C=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EB=B0=8F=20=ED=83=80=EC=9D=B4=ED=8B=80=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 모임 리스트 표시 조건 및 타이틀 변경 --- .../components/MeetingList/MeetingList.tsx | 20 +++++++++++++----- src/components/LandingPage/index.tsx | 21 +++++++++++++------ src/constant/message.ts | 4 +++- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/components/LandingPage/components/MeetingList/MeetingList.tsx b/src/components/LandingPage/components/MeetingList/MeetingList.tsx index 1306b09d..4d50301b 100644 --- a/src/components/LandingPage/components/MeetingList/MeetingList.tsx +++ b/src/components/LandingPage/components/MeetingList/MeetingList.tsx @@ -29,11 +29,21 @@ function MeetingList({ title, className }: Props): ReactElement { return ( - {title} - {title !== LANDING.CURRENT_MEETING && ( - - {meetings && meetings.length.toString()} - + {title === LANDING.UPCOMING_MEETING ? ( + + {LANDING.UPCOMING_MEETING_01} + + {meetings && meetings.length.toString()} + + {LANDING.UPCOMING_MEETING_02} + + ) : ( + + {title} + + {meetings && meetings.length.toString()} + + )} diff --git a/src/components/LandingPage/index.tsx b/src/components/LandingPage/index.tsx index cd124881..01f41906 100644 --- a/src/components/LandingPage/index.tsx +++ b/src/components/LandingPage/index.tsx @@ -13,7 +13,11 @@ import home_banner from '../../assets/image/home_banner.png'; import suggestion_img from '../../assets/image/suggestion_img.png'; import { COLOR } from '../../constant/color'; import { LANDING } from '../../constant/message'; -import { currMeetings, meetingsAtom } from '../../store/meeting'; +import { + currMeetings, + meetingsAtom, + upcomingMeetings, +} from '../../store/meeting'; import { userInfoAtom } from '../../store/user'; import CustomScreenHelmet from '../common/CustomScreenHelmet'; import CurrMeetingList from './components/MeetingList/CurrMeetingList'; @@ -25,6 +29,7 @@ const LandingPage: React.FC = () => { const setMeetings = useSetRecoilState(meetingsAtom); const currMeetingsValue = useRecoilValue(currMeetings); + const upcomingMeetingsValue = useRecoilValue(upcomingMeetings); const userInfo = useRecoilValue(userInfoAtom); const redirectUrl = useRedirect(); @@ -72,11 +77,15 @@ const LandingPage: React.FC = () => { )} - - + {upcomingMeetingsValue.length !== 0 && ( +
+ + +
+ )} Date: Wed, 3 Nov 2021 18:17:46 +0900 Subject: [PATCH 4/4] =?UTF-8?q?:chart=5Fwith=5Fupwards=5Ftrend:=20?= =?UTF-8?q?=EC=98=A8=EB=B3=B4=EB=93=9C=20=EC=9C=A0=EC=A0=80=20=EC=B6=94?= =?UTF-8?q?=EC=A0=81=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 온보드 유저 추적 이벤트 추가 --- src/components/OnBoardPage/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/OnBoardPage/index.tsx b/src/components/OnBoardPage/index.tsx index 552e1aec..7c54cdbe 100644 --- a/src/components/OnBoardPage/index.tsx +++ b/src/components/OnBoardPage/index.tsx @@ -20,6 +20,7 @@ function OnBoardPage(): ReactElement { const startTime = new Date(); const successGetCodeCB = (code: string) => { + logEvent(analytics, 'sub_onboard__success'); logEvent(analytics, 'onBoard__success', { start_time: startTime, end_time: new Date(), @@ -48,6 +49,7 @@ function OnBoardPage(): ReactElement { }; useEffect(() => { + logEvent(analytics, 'sub_onboard__show'); logEvent(analytics, 'onBoard__show', { start_time: startTime, });