hotfix: qa 이것저것

team-acode · Feb 1, 2024 · 2aa990d · 2aa990d
1 parent c22d728
commit 2aa990d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 21 deletions.
diff --git a/app/mypage/page.tsx b/app/mypage/page.tsx
@@ -62,9 +62,11 @@ const page = async ({ searchParams }: MyPageProps) => {
       <div className="mt-9 mx-4">
         <div className="flex items-center">
           <h3 className="h2 mr-auto">스크랩</h3>
-          <Link href="mypage/wish" className="body2 text-acodegray-500">
-            모두 보기
-          </Link>
+          {user.scraps.length ? (
+            <Link href="mypage/wish" className="body2 text-acodegray-500">
+              모두 보기
+            </Link>
+          ) : null}
         </div>
         {user.scraps.length ? (
           <ul className="flex mt-5 overflow-auto gap-[14px]">

diff --git a/app/opengraph-image.png b/app/opengraph-image.png
diff --git a/components/common/BottomModal.tsx b/components/common/BottomModal.tsx
@@ -23,14 +23,17 @@ const BottomModal = ({
 
   return (
     <div
-      className="fixed left-0 right-0 top-0 bottom-0 z-50 flex flex-col bg-[#1c1818]/[0.7] justify-end"
+      className="fixed max-w-[430px] mx-auto left-0 right-0 top-0 bottom-0 z-50 flex flex-col bg-[#1c1818]/[0.7] justify-end items-center"
       ref={modalOutsideRef}
       onClick={(e) => {
         if (e.target === modalOutsideRef.current) closeModal();
       }}
       aria-hidden
     >
-      <div className={`${modalStyle} bg-acodewhite w-full`} ref={modalRef}>
+      <div
+        className={`${modalStyle} bg-acodewhite w-full max-w-[430px]`}
+        ref={modalRef}
+      >
         {children}
       </div>
     </div>

diff --git a/components/matchingtest/Loading.tsx b/components/matchingtest/Loading.tsx
@@ -1,15 +1,10 @@
-import {
-  Loading1,
-  Loading2,
-  Loading3,
-  Loading4,
-  Orange,
-} from '@/public/images';
+import { Loading1, Loading2, Loading3, Loading4 } from '@/public/images';
 import React, { useState, useEffect } from 'react';
 import { useRouter } from 'next/navigation';
 import Header from '@/components/matchingtest/Header';
 import Image from 'next/image';
 import Link from 'next/link';
+import Ad2 from '@/public/images/ad2.png';
 
 interface LoadingPageProps {
   setIsDone: React.Dispatch<React.SetStateAction<boolean>>;
@@ -63,18 +58,20 @@ const Loading = ({ setIsDone }: LoadingPageProps) => {
         target="_blank"
       >
         <Image
-          src={Orange}
-          className="h-[106px] w-full"
+          src={Ad2}
+          className="w-full object-cover"
           alt="loading ad"
-          height={106}
+          fill
           quality={50}
+          placeholder="blur"
+          blurDataURL={Ad2.blurDataURL}
         />
         <span className="absolute font-bold w-full h-full h2 mt-[26px] pl-[16px]">
-          하늘 아래
+          흥미진진한 향수
           <br />
-          같은 오렌지는 없다
+          <span className="text-acodered">가십</span>이 궁금하다면
         </span>
-        <span className="absolute caption1 text-[#DBDBDB] w-full h-full flex mt-[26px] pr-[16px] justify-end items-cencter">
+        <span className="absolute caption1 font-medium text-[#DBDBDB] w-full h-full flex mt-[26px] pr-[16px] justify-end items-cencter">
           더 보러 가기
           <svg
             xmlns="http://www.w3.org/2000/svg"

diff --git a/components/mypage/MyPageModalTemplate.tsx b/components/mypage/MyPageModalTemplate.tsx
@@ -27,14 +27,14 @@ const MyPageModalTemplate = ({
         <div className="absolute bottom-5 left-4 right-4 flex justify-between">
           <button
             type="button"
-            className="h2 text-acodeblack h-14 w-[166px] rounded-[4px] bg-acodegray-50"
+            className="h2 text-acodeblack h-14 flex-1 min-w-[166px] mr-[5.5px] rounded-[4px] bg-acodegray-50"
             onClick={closeModal}
           >
             취소
           </button>
           <button
             type="button"
-            className="h2 text-acodewhite h-14 w-[166px] rounded-[4px] bg-acodeblack"
+            className="h2 text-acodewhite h-14 flex-1 min-w-[166px] ml-[5.5px] rounded-[4px] bg-acodeblack"
             onClick={handleClickOk}
           >
             확인

diff --git a/public/images/Orange.png b/public/images/Orange.png
diff --git a/public/images/ad2.png b/public/images/ad2.png
diff --git a/public/images/index.ts b/public/images/index.ts
@@ -107,4 +107,3 @@ export { default as FruityGray } from './Fruity-gray.png';
 export { default as FougereGray } from './Fougere-gray.png';
 
 export { default as KakaoShare } from './KakaoShare.png';
-export { default as Orange } from './Orange.png';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -107,4 +107,3 @@ export { default as FruityGray } from './Fruity-gray.png';
		export { default as FougereGray } from './Fougere-gray.png';

		export { default as KakaoShare } from './KakaoShare.png';
		export { default as Orange } from './Orange.png';