Skip to content

Commit

Permalink
๐Ÿš€ ver 1.0.3
Browse files Browse the repository at this point in the history
๐Ÿš€ ver 1.0.3
  • Loading branch information
Changyu-Ryou authored Nov 4, 2021
2 parents 1de96ed + d1c3082 commit 9f24487
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 15 deletions.
5 changes: 3 additions & 2 deletions src/assets/icon/notification_empty.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ const MeetingCardWrapper = styled.div<WrapperProps>`
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)};
Expand Down
20 changes: 15 additions & 5 deletions src/components/LandingPage/components/MeetingList/MeetingList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,21 @@ function MeetingList({ title, className }: Props): ReactElement {
return (
<MeetingListWrapper className={classnames('meeting-list', className)}>
<ListTitle>
{title}
{title !== LANDING.CURRENT_MEETING && (
<MeetingCounter className="title2 meeting-list__counter">
{meetings && meetings.length.toString()}
</MeetingCounter>
{title === LANDING.UPCOMING_MEETING ? (
<span>
{LANDING.UPCOMING_MEETING_01}
<MeetingCounter className="title2 meeting-list__counter">
{meetings && meetings.length.toString()}
</MeetingCounter>
{LANDING.UPCOMING_MEETING_02}
</span>
) : (
<span>
{title}
<MeetingCounter className="title2 meeting-list__counter">
{meetings && meetings.length.toString()}
</MeetingCounter>
</span>
)}
</ListTitle>

Expand Down
21 changes: 15 additions & 6 deletions src/components/LandingPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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();

Expand Down Expand Up @@ -72,11 +77,15 @@ const LandingPage: React.FC = () => {
<BlockDivider className="landing__divider" />
</div>
)}
<MeetingList
className="landing__upoming"
title={LANDING.UPCOMING_MEETING}
/>
<BlockDivider className="landing__divider" />
{upcomingMeetingsValue.length !== 0 && (
<div>
<MeetingList
className="landing__upoming"
title={LANDING.UPCOMING_MEETING}
/>
<BlockDivider className="landing__divider" />
</div>
)}
<MeetingList
className="landing__tomorrow"
title={LANDING.TOMORROW_MEETING}
Expand Down
2 changes: 2 additions & 0 deletions src/components/OnBoardPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -48,6 +49,7 @@ function OnBoardPage(): ReactElement {
};

useEffect(() => {
logEvent(analytics, 'sub_onboard__show');
logEvent(analytics, 'onBoard__show', {
start_time: startTime,
});
Expand Down
1 change: 1 addition & 0 deletions src/constant/color.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 3 additions & 1 deletion src/constant/message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export const LANDING = {
NAVIGATOR_TITLE: '๋žœ์„ ๋™๋„ค๋ชจ์ž„',
CURRENT_MEETING: '์ง€๊ธˆ ๋ฐ”๋กœ ๋ชจ์ž„์— ์ฐธ์—ฌํ•ด ๋ณด์„ธ์š”',
UPCOMING_MEETING: '์˜ค๋Š˜ ์ฐธ์—ฌํ•  ์ˆ˜ ์žˆ๋Š” ๋ชจ์ž„',
UPCOMING_MEETING_01: '์˜ค๋Š˜',
UPCOMING_MEETING_02: '๊ฐœ ๋ชจ์ž„์ด ๋‚จ์•„์žˆ์–ด์š”.',
TOMORROW_MEETING: '๋ฏธ๋ฆฌ ๋ณด๋Š” ๋‚ด์ผ ๋ชจ์ž„',
START_MEETING_LATER: ' ํ›„ ๋ชจ์ž„์ด ์‹œ์ž‘๋ผ์š”',
CURR_MEETING_SUB_TITLE: '์ง€๊ธˆ ๋ฐ”๋กœ ๋ชจ์ž„์—์„œ ๋™๋„ค ์ด์›ƒ๋“ค๊ณผ ๋Œ€ํ™”๋ฅผ ๋‚˜๋ˆ ๋ณด์„ธ์š”!',
Expand Down Expand Up @@ -60,7 +62,7 @@ export const MEETING_DETAIL = {
DESCRIPTION_TITLE1: '์ด๋Ÿฐ ๋ถ„์ด๋ฉด ์ฐธ์—ฌํ•ด๋ณด์„ธ์š”!',
DESCRIPTION_TITLE2: '์ด๋Ÿฐ ์ฃผ์ œ๋กœ ๋Œ€ํ™”๋ฅผ ๋‚˜๋ˆ ๋ณด์„ธ์š”!',
JOIN_NOW: '์ง€๊ธˆ ์ฐธ์—ฌํ•˜๊ธฐ',
CLOSE_MEETING: '์˜ค๋Š˜์€ ์ข…๋ฃŒ๋œ ๋ชจ์ž„์ด์—์š”',
CLOSE_MEETING: '๋‚ด์ผ ์—ด๋ฆฌ๋Š” ๋ชจ์ž„์ด์—์š”',
JOIN_LATER: ' ํ›„์— ๋งŒ๋‚˜์š”',
GREEN_BOX_INFO:
'๋ชจ๋“  ๋ชจ์ž„์€ ์คŒ(Zoom) ํ™”์ƒ ํšŒ์˜๋กœ ์ง„ํ–‰๋ผ์š”. ์คŒ ์•ฑ์„ ๋‹ค์šด๋กœ๋“œํ•œ ํ›„ ์ด์šฉํ•ด ์ฃผ์„ธ์š”. ์นด๋ฉ”๋ผ๋ฅผ ์ผœ์ง€ ์•Š์•„๋„ ๊ดœ์ฐฎ์•„์š”!',
Expand Down

0 comments on commit 9f24487

Please sign in to comment.