Skip to content

Commit b2c0f4e

Browse files
authored
fix: update card ui, slope camera click range and toast (#45)
* fix: update card ui * fix: fix slope camera click range and toast
1 parent 16411ee commit b2c0f4e

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

Diff for: src/features/slop/ui/slop-camera.tsx

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import React, { useEffect, useRef } from 'react';
22
import { createPortal } from 'react-dom';
3+
import { toast } from 'sonner';
34
import type { Position, Webcam } from '@/entities/slop/model/model';
45
import ArrowRightIcon from '@/shared/icons/arrow-right';
6+
import NeutralFace from '@/shared/icons/neutral-face';
57
import { cn } from '@/shared/lib';
68
import postAppMessage from '@/shared/lib/postAppMessage';
79
import CameraButton from '@/shared/ui/cam-button';
@@ -44,7 +46,13 @@ const SlopCamera = ({
4446
setOpenCamera();
4547

4648
if (!src) {
47-
postAppMessage('선택한 웹캠은 아직 준비중 이에요');
49+
postAppMessage('선택한 웹캠은 아직 준비중 이에요', (message) =>
50+
toast(
51+
<>
52+
<NeutralFace /> {message}
53+
</>
54+
)
55+
);
4856
}
4957
};
5058

@@ -68,10 +76,8 @@ const SlopCamera = ({
6876
}
6977
isOpen={isOpen}
7078
>
71-
<div className={cn('flex items-center')}>
72-
<p className={cn('body3-medium')} onClick={openVideo}>
73-
{name}
74-
</p>
79+
<div className={cn('flex cursor-pointer items-center')} onClick={openVideo}>
80+
<p className={cn('body3-medium')}>{name}</p>
7581
<ArrowRightIcon />
7682
</div>
7783
</Tooltip>

Diff for: src/shared/lib/postAppMessage.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,21 @@ declare global {
1313
}
1414
}
1515

16-
const postAppMessage = (message: string) => {
16+
const postAppMessage = (message: string, showToast: (message: string) => void) => {
1717
const userAgent = navigator.userAgent.toLowerCase();
1818
const android = userAgent.match(/android/i);
1919
const iphone = userAgent.match(/iphone/i);
2020

2121
if (android !== null) {
22-
console.log("Android");
2322
return window.Android.showToast(message);
2423
} else if (iphone !== null) {
25-
console.log("iOS");
2624
if (window.webkit.messageHandlers.weski) {
2725
window.webkit.messageHandlers.weski.postMessage({ method: "showToast", message: message });
2826
} else {
2927
console.error("Weski bridge is not available.");
3028
}
3129
} else {
32-
return window.opener.postMessage(message);
30+
return showToast(message);
3331
}
3432
}
3533

Diff for: src/shared/ui/card.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface CardProps extends React.HTMLAttributes<HTMLDivElement> {
77
const Card = ({ className, children, ...props }: CardProps) => (
88
<div
99
className={cn(
10-
'backdrop-blur-px rounded-[15px] border border-white/15 bg-gradient-to-br from-white/15 to-white/30 shadow-[2px_10px_29px_0px_rgba(47,49,65,0.02)]',
10+
'backdrop-blur-px rounded-[15px] border border-white/30 bg-gradient-to-br from-white/90 to-white/30 shadow-[2px_10px_29px_0px_rgba(47,49,65,0.02)]',
1111
className
1212
)}
1313
{...props}

Diff for: src/widgets/discovery/ui/discovery-card.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const DiscoveryCard = ({ resortId, name, openSlopes, currentWeather, weeklyWeath
1313
<Card
1414
className={cn(
1515
'box-border flex cursor-pointer flex-col gap-[15px] pb-4 pt-[34px] md:pb-[26px] md:pt-10',
16-
'transition-all hover:scale-[1.02] hover:border-2 hover:border-main-1/30 hover:pb-[15px] hover:pt-[33px] hover:md:pb-[25px] hover:md:pt-[39px]'
16+
'transition-all hover:scale-[1.02] hover:border-2 hover:border-main-1/60 hover:pb-[15px] hover:pt-[33px] hover:md:pb-[25px] hover:md:pt-[39px]'
1717
)}
1818
onClick={() => router.push(`/${resortId}`)}
1919
>

0 commit comments

Comments
 (0)