Merge branch 'main' of https://github.com/Nexters/kekeche-fe

Nexters · Feb 29, 2024 · 1216691 · 1216691
2 parents 9959a74 + e0a8502
commit 1216691
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/src/app/(routes)/member/[memberId]/page.tsx b/src/app/(routes)/member/[memberId]/page.tsx
@@ -21,8 +21,6 @@ export default async function Home({ params: { memberId } }: { params: { memberI
         accessToken,
     });
 
-    const member = await getMember({ accessToken });
-
     const isMyPage = characters?.isMe;
     const headerText = `${characters?.memberNickname}의 도감`;
     const showCharacterCreateButton = isMyPage && characters.characters.length < MAXIMUM_CHARACTER;

diff --git a/src/assets/images/egg.webp b/src/assets/images/egg.webp
diff --git a/src/components/create-character/index.tsx b/src/components/create-character/index.tsx
@@ -97,7 +97,7 @@ export default function CreateCharacter() {
                         }}
                     >
                         <StepperHeader />
-                        <CarouselContent style={{ minHeight: '100dvh' }} className="m-0 p-0">
+                        <CarouselContent style={{ height: '100dvh', minHeight: '660px' }} className="m-0 p-0">
                             {STEPS.map((step, idx) => (
                                 <StepContainer key={idx}>{step}</StepContainer>
                             ))}

diff --git a/src/components/create-character/stepper-header.tsx b/src/components/create-character/stepper-header.tsx
@@ -19,7 +19,7 @@ export default function StepperHeader() {
     return (
         <>
             {step !== null && step >= 1 && step <= 5 && (
-                <div className="fixed z-[999] mx-auto flex w-screen  min-w-[350px] flex-col items-center bg-white lg:w-[400px]">
+                <div className="absolute z-[999] mx-auto flex w-screen  min-w-[350px] flex-col items-center bg-white lg:w-[400px]">
                     <TopBar>
                         <TopBar.Left>
                             <button className="flex h-full w-[16px] items-center " onClick={handlePrevClick}>

diff --git a/src/components/create-character/steps/show-result.tsx b/src/components/create-character/steps/show-result.tsx
@@ -14,6 +14,7 @@ import { useContext, useEffect, useState } from 'react';
 import Lottie from 'react-lottie';
 import FixedBottomArea from '../fixed-bottom-area';
 import useCarousel from '../hooks/useCarousel';
+import EggImg from '@/assets/images/egg.webp';
 
 export const createCharacter = async (createCharacterValues: CreateCharacterValues, accessToken: string) =>
     await fetch(`${process.env.NEXT_PUBLIC_SERVER_BASE_URL}/api/v1/character`, {
@@ -34,15 +35,6 @@ export default function ShowResult() {
 
     const createCharacterValues = useContext(CreateCharacterValuesContext);
 
-    const defaultOptions = {
-        loop: true,
-        autoplay: true,
-        animationData: LoadingLottie,
-        rendererSettings: {
-            preserveAspectRatio: 'xMidYMid slice',
-        },
-    };
-
     if (createCharacterValues === null) {
         alert('처음부터 하세요.');
         router.push('/');
@@ -99,15 +91,13 @@ export default function ShowResult() {
     return (
         <>
             {isCreating ? (
-                <>
+                <div className="mx-auto flex h-[100vh] w-full flex-col items-center">
                     <Image quality={100} alt="배경" src={HomeBg} fill className="opacity-50" />
                     <div className="text-gray-700 h z-[50] mb-[40px] mt-[180px] w-full text-center text-bold24">
                         캐릭터 생성 중
                     </div>
-                    <div>
-                        <Lottie options={defaultOptions} height={400} width={400} />
-                    </div>
-                </>
+                    <Image priority src={EggImg} alt="알" className="z-[99] mt-[50px]" />
+                </div>
             ) : (
                 <div className="mx-auto mt-[56px] flex h-full w-full flex-col items-center bg-white">
                     <CharacterDetail character={previewCharacter} />