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

๐Ÿšจ Hotfix v1.0.1 - ์‚ฌํŒŒ๋ฆฌ์—์„œ ํฌ์ฆˆํ”ฝ ๋ ˆ์ด์•„์›ƒ ๊นจ์ง #72

Merged
merged 3 commits into from
Apr 17, 2024
Merged

๐Ÿšจ Hotfix v1.0.1 - ์‚ฌํŒŒ๋ฆฌ์—์„œ ํฌ์ฆˆํ”ฝ ๋ ˆ์ด์•„์›ƒ ๊นจ์ง #72

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
2bf1738
โœจ feat : ํฌ์ฆˆํ”ฝ ์ธ์› ์ˆ˜ ๋ฐ”๊พธ๋ฉด ๊ธฐ๋ณธ ์ด๋ฏธ์ง€๋กœ ๋ฟ…
seondal Apr 17, 2024
59ff6d5
๐Ÿ’„ style : ์ „๋ฐ˜์ ์ธ z-index ์ˆ˜์ •
seondal Apr 17, 2024
8766841
โœจ feat : ๐Ÿ›  fix : ๐Ÿ’„ style : body min-height ๋™์ ์œผ๋กœ ์„ค์ •!!
seondal Apr 17, 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
9 changes: 8 additions & 1 deletion src/app/(Main)/pick/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string>('/images/image-frame.png');
const [image, setImage] = useState<string>(DEFAULT_IMAGE);
const [isRendered, setIsRendered] = useState(false);
const [isLottie, setIsLottie] = useState(true);
const { refetch } = usePosePickQuery(countState, {
Expand All @@ -24,6 +26,11 @@ export default function Page() {
},
});

useEffect(() => {
setImage(DEFAULT_IMAGE);
setIsRendered(true);
}, [countState]);

useEffect(() => {
setTimeout(() => setIsLottie(false), 2200);
}, []);
Expand Down
11 changes: 11 additions & 0 deletions src/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const metadata: Metadata = {
export default function RootLayout({ children }: { children: React.ReactNode }) {
return (
<html lang="ko">
<body className="flex min-h-screen w-screen touch-none justify-center bg-slate-100 py-px">
<body className="flex w-screen touch-none justify-center bg-slate-100">
<div className="w-full max-w-440 overflow-scroll bg-white text-primary">
<Suspense>
<Analytics />
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/BottomFixedDiv.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function BottomDiv({ children }: StrictPropsWithChildren) {
export function BottomFixedDiv({ children }: StrictPropsWithChildren) {
return (
<>
<div className={`fixed inset-x-0 bottom-0`}>
<div className={`fixed inset-x-0 bottom-0 z-30`}>
<BottomDiv>{children}</BottomDiv>
</div>
<div className="h-100" />
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Header({
return (
<>
<Spacing size={48} />
<div className="fixed inset-x-0 top-0 z-10 mx-auto max-w-440 bg-white">
<div className="fixed inset-x-0 top-0 z-30 mx-auto max-w-440 bg-white">
<div className="flex h-48 items-center justify-between gap-12 px-4 pt-8">
{close ? <CloseButton /> : <div className="w-4" />}
<h4 className="flex flex-1">{title}</h4>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Modal/BottomSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ export default function BottomSheet({ children }: StrictPropsWithChildren) {
return (
<>
<div
className="fixed inset-x-0 inset-y-0 z-30 bg-dimmed opacity-30"
className="fixed inset-x-0 inset-y-0 z-modal bg-dimmed opacity-30"
onClick={closeBottomSheet}
/>
<AnimatedPortal
motionProps={{ initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 } }}
>
<div className="fixed inset-x-0 bottom-0 z-30 mx-auto max-w-440 rounded-t-16 bg-white">
<div className="fixed inset-x-0 bottom-0 z-modal mx-auto max-w-440 rounded-t-16 bg-white">
<div className="flex justify-end px-8 pt-12">
<IconButton icon={ICON.close.black} onClick={closeBottomSheet} />
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Modal/Popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ interface PopupI extends PropsWithChildren {

export default function Popup({ title, content, children, onClose }: PopupI) {
return (
<div className="fixed inset-x-0 inset-y-0 z-30 flex items-center justify-center">
<div className="fixed inset-x-0 inset-y-0 z-modal flex items-center justify-center">
<div className="fixed inset-x-0 inset-y-0 bg-dimmed opacity-30" onClick={onClose} />
<div className="z-30 w-300 rounded-16 bg-white p-16 text-center">
<div className="z-modal w-300 rounded-16 bg-white p-16 text-center">
{(title || content) && (
<div className="mb-16 py-16">
<h4 className="mb-8">{title}</h4>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/PoseImage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function PoseImage({ src, responsive = false, onLoad }: DetailedI
<>
{isModalShow && (
<div
className="fixed inset-x-0 inset-y-0 z-30 flex items-center justify-center"
className="fixed inset-x-0 inset-y-0 z-modal flex items-center justify-center"
onClick={() => setIsModalShow(false)}
>
<div className="fixed inset-x-0 inset-y-0 bg-dimmed opacity-70" />
Expand Down
Loading