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 대응 #36

Merged
merged 3 commits into from
Sep 9, 2024
Merged

fix: qa 대응 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dc4bce
feat: 2배수 상수 빠져있던것 반영
Yoon-Hae-Min Sep 9, 2024
8398fbf
fix: 지도 사진 2배수로 변경
Yoon-Hae-Min Sep 9, 2024
c0b7d4b
fix: 웹캠 로딩 문구 노출
Yoon-Hae-Min Sep 9, 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
2 changes: 1 addition & 1 deletion src/entities/slop/image/eden/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/entities/slop/image/elysian-gangchon/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/entities/slop/image/gonjiam/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/entities/slop/image/high1/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/entities/slop/image/jisan/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/entities/slop/image/muju/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/entities/slop/image/phoenix/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/entities/slop/image/vivaldipark/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/entities/slop/image/wellihilli/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/entities/slop/image/yongpyong/map.tsx
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions src/entities/slop/model/muju.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export const MUJU: ResortInfo = {
left: 'left-[47%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam01.stream/playlist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'heidi-house',
Expand All @@ -256,7 +256,7 @@ export const MUJU: ResortInfo = {
left: 'left-[70%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam03.stream/playlist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'seolcheon-house',
Expand All @@ -266,7 +266,7 @@ export const MUJU: ResortInfo = {
left: 'left-[28%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam05.stream/playlist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'soyokgihang-sundown',
Expand All @@ -276,7 +276,7 @@ export const MUJU: ResortInfo = {
left: 'left-[68%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam04.stream/playlist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'seolcheonbong-summit',
Expand All @@ -286,7 +286,7 @@ export const MUJU: ResortInfo = {
left: 'left-[37%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam07.stream/playlist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'mozart-minuet',
Expand All @@ -296,7 +296,7 @@ export const MUJU: ResortInfo = {
left: 'left-[27%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam08.stream/playlist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'seolcheon-top-slope',
Expand All @@ -306,7 +306,7 @@ export const MUJU: ResortInfo = {
left: 'left-[23%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam06.stream/playlist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'mansunbong-summit',
Expand All @@ -316,7 +316,7 @@ export const MUJU: ResortInfo = {
left: 'left-[51%]',
},
src: '/api/webcam?url=http://muju.live.cdn.cloudn.co.kr/mujuresort/_definst_/cam02.stream/playlist.m3u8',
scale: 1,
scale: 2,
},
],
};
Expand Down
20 changes: 10 additions & 10 deletions src/entities/slop/model/yongpyong.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export const YONGPYONG: ResortInfo = {
left: 'left-[17%]',
},
src: '/api/webcam?url=https://live.yongpyong.co.kr/Ycam1/cam15.stream/chunklist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'red-slope',
Expand All @@ -207,7 +207,7 @@ export const YONGPYONG: ResortInfo = {
left: 'left-[29%]',
},
src: '/api/webcam?url=https://live.yongpyong.co.kr/Ycam1/cam03.stream/chunklist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'pink-slope',
Expand All @@ -216,7 +216,7 @@ export const YONGPYONG: ResortInfo = {
top: 'top-[64%]',
left: 'left-[33%]',
},
scale: 1,
scale: 2,
},
{
id: 'yellow-slope',
Expand All @@ -225,7 +225,7 @@ export const YONGPYONG: ResortInfo = {
top: 'top-[71%]',
left: 'left-[37%]',
},
scale: 1,
scale: 2,
},
{
id: 'rainbow-top',
Expand All @@ -235,7 +235,7 @@ export const YONGPYONG: ResortInfo = {
left: 'left-[61%]',
},
src: '/api/webcam?url=https://live.yongpyong.co.kr/Ycam1/cam05.stream/chunklist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'rainbow-foreground',
Expand All @@ -245,7 +245,7 @@ export const YONGPYONG: ResortInfo = {
left: 'left-[79%]',
},
src: '/api/webcam?url=https://live.yongpyong.co.kr/Ycam1/cam10.stream/chunklist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'mega-green-slope',
Expand All @@ -255,7 +255,7 @@ export const YONGPYONG: ResortInfo = {
left: 'left-[56%]',
},
src: '/api/webcam?url=https://live.yongpyong.co.kr/Ycam1/cam07.stream/chunklist.m3u8',
scale: 1,
scale: 2,
},
{
id: 'base-foreground',
Expand All @@ -264,7 +264,7 @@ export const YONGPYONG: ResortInfo = {
top: 'top-[84%]',
left: 'left-[34%]',
},
scale: 1,
scale: 2,
},
{
id: 'access-road',
Expand All @@ -273,7 +273,7 @@ export const YONGPYONG: ResortInfo = {
top: 'top-[86%]',
left: 'left-[26%]',
},
scale: 1,
scale: 2,
},
{
id: 'slope-top',
Expand All @@ -282,7 +282,7 @@ export const YONGPYONG: ResortInfo = {
top: 'top-[26%]',
left: 'left-[30%]',
},
scale: 1,
scale: 2,
},
],
};
5 changes: 4 additions & 1 deletion src/features/slop/ui/slop-video.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ const SlopVideo = ({ src, closeVideo }: SlopVideoProps) => {
<div
className={cn('absolute top-0 z-50 flex h-full w-full items-center justify-center bg-black')}
>
<Loading />
<div className={cn('absolute flex h-[110px] flex-col items-center justify-between')}>
<Loading />
<p className={cn('body1-medium text-white')}>웹캠을 불러오고 있어요</p>
</div>

<video
playsInline
Expand Down
2 changes: 1 addition & 1 deletion src/shared/ui/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface LoadingProps {
const Loading = ({ className }: LoadingProps) => {
return (
<div
className={cn('absolute h-4 w-4 animate-mulShdSpin rounded-full bg-black', className)}
className={cn('mt-[2em] h-4 w-4 animate-mulShdSpin rounded-full bg-black', className)}
></div>
);
};
Expand Down
16 changes: 8 additions & 8 deletions tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,35 +107,35 @@ const config = {
mulShdSpin: {
'0%, 100%': {
boxShadow:
'0 -3em 0 0.2em #fff, 2em -2em 0 0em #fff, 3em 0 0 -1em #fff, 2em 2em 0 -1em #fff, 0 3em 0 -1em #fff, -2em 2em 0 -1em #fff, -3em 0 0 -1em #fff, -2em -2em 0 0 #fff',
'0 -2em 0 0.1em #fff, 1.5em -1.5em 0 0em #fff, 2em 0 0 -0.5em #fff, 1.5em 1.5em 0 -0.5em #fff, 0 2em 0 -0.5em #fff, -1.5em 1.5em 0 -0.5em #fff, -2em 0 0 -0.5em #fff, -1.5em -1.5em 0 0 #fff',
},
'12.5%': {
boxShadow:
'0 -3em 0 0 #fff, 2em -2em 0 0.2em #fff, 3em 0 0 0 #fff, 2em 2em 0 -1em #fff, 0 3em 0 -1em #fff, -2em 2em 0 -1em #fff, -3em 0 0 -1em #fff, -2em -2em 0 -1em #fff',
'0 -2em 0 0 #fff, 1.5em -1.5em 0 0.1em #fff, 2em 0 0 0 #fff, 1.5em 1.5em 0 -0.5em #fff, 0 2em 0 -0.5em #fff, -1.5em 1.5em 0 -0.5em #fff, -2em 0 0 -0.5em #fff, -1.5em -1.5em 0 -0.5em #fff',
},
'25%': {
boxShadow:
'0 -3em 0 -0.5em #fff, 2em -2em 0 0 #fff, 3em 0 0 0.2em #fff, 2em 2em 0 0 #fff, 0 3em 0 -1em #fff, -2em 2em 0 -1em #fff, -3em 0 0 -1em #fff, -2em -2em 0 -1em #fff',
'0 -2em 0 -0.25em #fff, 1.5em -1.5em 0 0 #fff, 2em 0 0 0.1em #fff, 1.5em 1.5em 0 0 #fff, 0 2em 0 -0.5em #fff, -1.5em 1.5em 0 -0.5em #fff, -2em 0 0 -0.5em #fff, -1.5em -1.5em 0 -0.5em #fff',
},
'37.5%': {
boxShadow:
'0 -3em 0 -1em #fff, 2em -2em 0 -1em #fff, 3em 0 0 0 #fff, 2em 2em 0 0.2em #fff, 0 3em 0 0 #fff, -2em 2em 0 -1em #fff, -3em 0 0 -1em #fff, -2em -2em 0 -1em #fff',
'0 -2em 0 -0.5em #fff, 1.5em -1.5em 0 -0.5em #fff, 2em 0 0 0 #fff, 1.5em 1.5em 0 0.1em #fff, 0 2em 0 0 #fff, -1.5em 1.5em 0 -0.5em #fff, -2em 0 0 -0.5em #fff, -1.5em -1.5em 0 -0.5em #fff',
},
'50%': {
boxShadow:
'0 -3em 0 -1em #fff, 2em -2em 0 -1em #fff, 3em 0 0 -1em #fff, 2em 2em 0 0 #fff, 0 3em 0 0.2em #fff, -2em 2em 0 0 #fff, -3em 0 0 -1em #fff, -2em -2em 0 -1em #fff',
'0 -2em 0 -0.5em #fff, 1.5em -1.5em 0 -0.5em #fff, 2em 0 0 -0.5em #fff, 1.5em 1.5em 0 0 #fff, 0 2em 0 0.1em #fff, -1.5em 1.5em 0 0 #fff, -2em 0 0 -0.5em #fff, -1.5em -1.5em 0 -0.5em #fff',
},
'62.5%': {
boxShadow:
'0 -3em 0 -1em #fff, 2em -2em 0 -1em #fff, 3em 0 0 -1em #fff, 2em 2em 0 -1em #fff, 0 3em 0 0 #fff, -2em 2em 0 0.2em #fff, -3em 0 0 0 #fff, -2em -2em 0 -1em #fff',
'0 -2em 0 -0.5em #fff, 1.5em -1.5em 0 -0.5em #fff, 2em 0 0 -0.5em #fff, 1.5em 1.5em 0 -0.5em #fff, 0 2em 0 0 #fff, -1.5em 1.5em 0 0.1em #fff, -2em 0 0 0 #fff, -1.5em -1.5em 0 -0.5em #fff',
},
'75%': {
boxShadow:
'0 -3em 0 -1em #fff, 2em -2em 0 -1em #fff, 3em 0 0 -1em #fff, 2em 2em 0 -1em #fff, 0 3em 0 -1em #fff, -2em 2em 0 0 #fff, -3em 0 0 0.2em #fff, -2em -2em 0 0 #fff',
'0 -2em 0 -0.5em #fff, 1.5em -1.5em 0 -0.5em #fff, 2em 0 0 -0.5em #fff, 1.5em 1.5em 0 -0.5em #fff, 0 2em 0 -0.5em #fff, -1.5em 1.5em 0 0 #fff, -2em 0 0 0.1em #fff, -1.5em -1.5em 0 0 #fff',
},
'87.5%': {
boxShadow:
'0 -3em 0 0 #fff, 2em -2em 0 -1em #fff, 3em 0 0 -1em #fff, 2em 2em 0 -1em #fff, 0 3em 0 -1em #fff, -2em 2em 0 0 #fff, -3em 0 0 0 #fff, -2em -2em 0 0.2em #fff',
'0 -2em 0 0 #fff, 1.5em -1.5em 0 -0.5em #fff, 2em 0 0 -0.5em #fff, 1.5em 1.5em 0 -0.5em #fff, 0 2em 0 -0.5em #fff, -1.5em 1.5em 0 0 #fff, -2em 0 0 0 #fff, -1.5em -1.5em 0 0.1em #fff',
},
},
},
Expand Down
Loading