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

Jump to bottom

fix: QA 반영 #29

Merged
merged 2 commits into from
Aug 22, 2024
Merged

fix: QA 반영 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07412b3
fix: Fix webcam position
Najeong-Kim Aug 22, 2024
6e11372
fix: Fix slope update date
Najeong-Kim Aug 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
6 changes: 3 additions & 3 deletions src/entities/slop/model/eden.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export const EDEN: ResortInfo = {
id: 'jupiter-slope',
name: '쥬피터 슬로프',
position: {
top: 'top-[17%]',
top: 'top-[16%]',
left: 'left-[50%]',
},
scale: 1,
Expand All @@ -91,8 +91,8 @@ export const EDEN: ResortInfo = {
id: 'uranus-slope',
name: '우라누스 슬로프',
position: {
top: 'top-[34%]',
left: 'left-[75%]',
top: 'top-[32%]',
left: 'left-[77%]',
},
scale: 1,
},
Expand Down
6 changes: 3 additions & 3 deletions src/entities/slop/model/elysian-gangchon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export const ELYSIAN_GANGCHON: ResortInfo = {
name: '서브하우스',
position: {
top: 'top-[86%]',
left: 'left-[18%]',
left: 'left-[19%]',
},
scale: 1,
},
Expand All @@ -119,8 +119,8 @@ export const ELYSIAN_GANGCHON: ResortInfo = {
id: 'ski-house',
name: '스키하우스',
position: {
top: 'top-[82%]',
left: 'left-[77%]',
top: 'top-[83%]',
left: 'left-[80%]',
},
scale: 1,
},
Expand Down
4 changes: 2 additions & 2 deletions src/entities/slop/model/gonjiam.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ export const GONJIAM: ResortInfo = {
id: 'top-rest-area',
name: '정상 휴게소',
position: {
top: 'top-[5%]',
left: 'left-[19%]',
top: 'top-[7%]',
left: 'left-[20%]',
},
scale: 1,
src: '/api/webcam?url=http://konjiam.live.cdn.cloudn.co.kr/konjiam/cam01.stream/playlist.m3u8',
Expand Down
4 changes: 2 additions & 2 deletions src/entities/slop/model/jisan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ export const JISAN: ResortInfo = {
id: 'orange-station',
name: '오렌지 탑승장',
position: {
top: 'top-[69%]',
left: 'left-[29%]',
top: 'top-[74%]',
left: 'left-[31%]',
},
scale: 1,
},
Expand Down
10 changes: 5 additions & 5 deletions src/entities/slop/model/muju.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@ export const MUJU: ResortInfo = {
id: 'seolcheonbong-summit',
name: '설천봉 정상',
position: {
top: 'top-[10%]',
left: 'left-[36%]',
top: 'top-[12%]',
left: 'left-[37%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam07.stream/playlist.m3u8',
scale: 1,
Expand All @@ -302,7 +302,7 @@ export const MUJU: ResortInfo = {
id: 'seolcheon-top-slope',
name: '설천상단 슬로프',
position: {
top: 'top-[15%]',
top: 'top-[16%]',
left: 'left-[23%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam06.stream/playlist.m3u8',
Expand All @@ -312,8 +312,8 @@ export const MUJU: ResortInfo = {
id: 'mansunbong-summit',
name: '만선봉 정상',
position: {
top: 'top-[30%]',
left: 'left-[53%]',
top: 'top-[32%]',
left: 'left-[51%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam02.stream/playlist.m3u8',
scale: 1,
Expand Down
11 changes: 11 additions & 0 deletions src/widgets/header/lib/getFormattedYesterday.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export const getFormattedYesterday = () => {
const today = new Date();

const yesterday = new Date(today);
yesterday.setDate(today.getDate() - 1);

const month = yesterday.getMonth() + 1;
const day = yesterday.getDate();

return `${month}월 ${day}일`;
};
3 changes: 2 additions & 1 deletion src/widgets/header/ui/slop-status-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import CircleInfo from '@/shared/icons/circle-info';
import { cn } from '@/shared/lib';
import { Tooltip } from '@/shared/ui/tooltip';
import { getFormattedYesterday } from '../lib/getFormattedYesterday';

const SlopStatusHeader = () => {
return (
Expand All @@ -19,7 +20,7 @@ const SlopStatusHeader = () => {
<p className={cn('body3-medium')}>매일 스키장 홈페이지에 고지된 정보를 가져와요.</p>
</Tooltip>
</div>
<p className={cn('body1-medium text-gray-50')}>10월 21일 23:00 업데이트</p>
<p className={cn('body1-medium text-gray-50')}>{getFormattedYesterday()} 23:00 업데이트</p>
</div>
);
};
Expand Down
Loading