From 2bf17388c3f02f4be844cd711164fe47521efe8a Mon Sep 17 00:00:00 2001 From: seondal Date: Thu, 18 Apr 2024 01:34:27 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20feat=20:=20=20=ED=8F=AC?= =?UTF-8?q?=EC=A6=88=ED=94=BD=20=EC=9D=B8=EC=9B=90=20=EC=88=98=20=EB=B0=94?= =?UTF-8?q?=EA=BE=B8=EB=A9=B4=20=EA=B8=B0=EB=B3=B8=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EB=A1=9C=20=EB=BF=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(Main)/pick/page.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/(Main)/pick/page.tsx b/src/app/(Main)/pick/page.tsx index 727476d..2d3720f 100644 --- a/src/app/(Main)/pick/page.tsx +++ b/src/app/(Main)/pick/page.tsx @@ -10,9 +10,11 @@ import PoseImage from '@/components/Modal/PoseImage'; import { SelectionBasic } from '@/components/Selection'; import { peopleCountList } from '@/constants/data'; +const DEFAULT_IMAGE = '/images/image-frame.png'; + export default function Page() { const [countState, setCountState] = useState(1); - const [image, setImage] = useState('/images/image-frame.png'); + const [image, setImage] = useState(DEFAULT_IMAGE); const [isRendered, setIsRendered] = useState(false); const [isLottie, setIsLottie] = useState(true); const { refetch } = usePosePickQuery(countState, { @@ -24,6 +26,11 @@ export default function Page() { }, }); + useEffect(() => { + setImage(DEFAULT_IMAGE); + setIsRendered(true); + }, [countState]); + useEffect(() => { setTimeout(() => setIsLottie(false), 2200); }, []); From 59ff6d53bfbba98a7ed3cc6cf24df80f48b99e4b Mon Sep 17 00:00:00 2001 From: seondal Date: Thu, 18 Apr 2024 01:34:38 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=92=84=20style=20:=20=20=EC=A0=84?= =?UTF-8?q?=EB=B0=98=EC=A0=81=EC=9D=B8=20z-index=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Button/BottomFixedDiv.tsx | 2 +- src/components/Header/index.tsx | 2 +- src/components/Modal/BottomSheet.tsx | 4 ++-- src/components/Modal/Popup.tsx | 4 ++-- src/components/Modal/PoseImage.tsx | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Button/BottomFixedDiv.tsx b/src/components/Button/BottomFixedDiv.tsx index 93e3454..f306cc6 100644 --- a/src/components/Button/BottomFixedDiv.tsx +++ b/src/components/Button/BottomFixedDiv.tsx @@ -15,7 +15,7 @@ export function BottomDiv({ children }: StrictPropsWithChildren) { export function BottomFixedDiv({ children }: StrictPropsWithChildren) { return ( <> -
+
{children}
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx index 1f7e162..48d3c79 100644 --- a/src/components/Header/index.tsx +++ b/src/components/Header/index.tsx @@ -18,7 +18,7 @@ export default function Header({ return ( <> -
+
{close ? :
}

{title}

diff --git a/src/components/Modal/BottomSheet.tsx b/src/components/Modal/BottomSheet.tsx index e844553..951458a 100644 --- a/src/components/Modal/BottomSheet.tsx +++ b/src/components/Modal/BottomSheet.tsx @@ -11,13 +11,13 @@ export default function BottomSheet({ children }: StrictPropsWithChildren) { return ( <>
-
+
diff --git a/src/components/Modal/Popup.tsx b/src/components/Modal/Popup.tsx index 04476ac..329a38f 100644 --- a/src/components/Modal/Popup.tsx +++ b/src/components/Modal/Popup.tsx @@ -10,9 +10,9 @@ interface PopupI extends PropsWithChildren { export default function Popup({ title, content, children, onClose }: PopupI) { return ( -
+
-
+
{(title || content) && (

{title}

diff --git a/src/components/Modal/PoseImage.tsx b/src/components/Modal/PoseImage.tsx index 17bfa86..1411b90 100644 --- a/src/components/Modal/PoseImage.tsx +++ b/src/components/Modal/PoseImage.tsx @@ -12,7 +12,7 @@ export default function PoseImage({ src, responsive = false, onLoad }: DetailedI <> {isModalShow && (
setIsModalShow(false)} >
From 8766841d90b148f68f629339d0303b0be806b6c0 Mon Sep 17 00:00:00 2001 From: seondal Date: Thu, 18 Apr 2024 02:22:16 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E2=9C=A8=20feat=20:=20=20=F0=9F=9B=A0=20fi?= =?UTF-8?q?x=20:=20=20=F0=9F=92=84=20style=20:=20=20body=20min-height=20?= =?UTF-8?q?=EB=8F=99=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/globals.css | 11 +++++++++++ src/app/layout.tsx | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app/globals.css b/src/app/globals.css index 7601d48..38ab5a2 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -11,6 +11,17 @@ display: none; } +body { + min-height: 100vh; +} + +@supports (-webkit-touch-callout: none) { + body { + /* for ios safari 15, safe-area-inset-bottom is 0, so a special fix apply here */ + min-height: -webkit-fill-available; + } +} + @media (min-width: 440px) { html { font-size: 16px; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index e9ada8d..f28847b 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -49,7 +49,7 @@ export const metadata: Metadata = { export default function RootLayout({ children }: { children: React.ReactNode }) { return ( - +