Merge pull request #324 from depromeet/fix/#323

피드 레이아웃 컴포넌트 분기 처리, 피드 작성 완료 라우팅 수정
depromeet · Apr 10, 2024 · a374f98 · a374f98
2 parents 93a8873 + d5249a6
commit a374f98
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 12 deletions.
diff --git a/public/assets/image/default_profile.png b/public/assets/image/default_profile.png
diff --git a/src/app/feed/layout.tsx b/src/app/feed/layout.tsx
@@ -1,14 +1,21 @@
+'use client';
+
+import { usePathname } from 'next/navigation';
+
 interface LayoutProps {
   children: React.ReactNode;
 }
 
 export default function Layout({ children }: LayoutProps) {
+  const pathname = usePathname();
   return (
     <div>
-      <h1 className="flex top-0 items-center justify-center w-full h-[56px] body-16-bold border-b-[1px] border-gray-100">
-        피드
-      </h1>
-      <div className="top-[56px]">{children}</div>
+      {pathname === '/feed' && (
+        <h1 className="flex top-0 items-center justify-center w-full h-[56px] body-16-bold border-b-[1px] border-gray-100">
+          피드
+        </h1>
+      )}
+      <div>{children}</div>
     </div>
   );
 }
diff --git a/src/app/feed/regist/page.tsx b/src/app/feed/regist/page.tsx
@@ -26,7 +26,7 @@ export default function Page() {
         queryKey: ['get-myLog'],
       });
       push(
-        `/review/complete?storeName=${storeName}&myRevisitedCount=${
+        `/feed/regist/complete?storeName=${storeName}&myRevisitedCount=${
           Number(myRevisitedCount) + 1
         }`,
       );

diff --git a/src/app/fonts/NanumSquareRoundB.woff2 b/src/app/fonts/NanumSquareRoundB.woff2
diff --git a/src/app/fonts/NanumSquareRoundEB.woff2 b/src/app/fonts/NanumSquareRoundEB.woff2
diff --git a/src/app/fonts/NanumSquareRoundL.woff2 b/src/app/fonts/NanumSquareRoundL.woff2
diff --git a/src/app/fonts/NanumSquareRoundR.woff2 b/src/app/fonts/NanumSquareRoundR.woff2
diff --git a/src/app/fonts/PretendardBold.woff2 b/src/app/fonts/PretendardBold.woff2
diff --git a/src/app/fonts/PretendardLight.woff2 b/src/app/fonts/PretendardLight.woff2
diff --git a/src/app/fonts/PretendardMedium.woff2 b/src/app/fonts/PretendardMedium.woff2
diff --git a/src/app/fonts/PretendardRegular.woff2 b/src/app/fonts/PretendardRegular.woff2
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -22,22 +22,22 @@ export const viewport: Viewport = {
   userScalable: false,
 };
 
-const nanumSquareRound = localFont({
+const pretendard = localFont({
   src: [
     {
-      path: './fonts/NanumSquareRoundL.woff2',
+      path: './fonts/PretendardLight.woff2',
       weight: '300',
     },
     {
-      path: './fonts/NanumSquareRoundR.woff2',
+      path: './fonts/PretendardRegular.woff2',
       weight: '400',
     },
     {
-      path: './fonts/NanumSquareRoundB.woff2',
+      path: './fonts/PretendardMedium.woff2',
       weight: '500',
     },
     {
-      path: './fonts/NanumSquareRoundEB.woff2',
+      path: './fonts/PretendardBold.woff2',
       weight: '700',
     },
   ],
@@ -54,7 +54,7 @@ export default function RootLayout({
   return (
     <QueryClientProviders>
       <WebViewContainer />
-      <html lang="en" className={`${nanumSquareRound.variable}`}>
+      <html lang="en" className={`${pretendard.variable}`}>
         <head></head>
         <body className="relative overscroll-y-none min-h-[100dvh] w-full max-w-[480px] mx-auto scrollbar-hide">
           <Suspense>{children}</Suspense>

diff --git a/src/components/feed/Feed/FeedProfile.tsx b/src/components/feed/Feed/FeedProfile.tsx
@@ -3,6 +3,8 @@
 import Image, { ImageProps } from 'next/image';
 import { useRouter } from 'next/navigation';
 
+import DefaultProfileImage from 'public/assets/image/default_profile.png';
+
 interface FeedProfileProps extends Omit<ImageProps, 'id'> {
   nickName: string;
   isFollowed: boolean;
@@ -40,7 +42,7 @@ export default function FeedProfile({
           className="relative w-[36px] h-[36px] rounded-[50%] overflow-hidden"
           onClick={handleClickProfile}
         >
-          <Image alt={alt} src={src} fill {...props} />
+          <Image alt={alt} src={src ?? DefaultProfileImage} fill {...props} />
         </div>
         <p>{nickName}</p>
       </div>