Merge pull request #219 from Moaguide-develop/dev

Dev

Author: eun-hak

next.config.mjs

@@ -24,7 +24,8 @@ const nextConfig = {
       'mimgnews.pstatic.net',
       'image.newsis.com',
       'www.chuksannews.co.kr',
-      'ssl.pstatic.net'
+      'ssl.pstatic.net',
+      'imgnews.pstatic.net'
     ]
   },
   swcMinify: true,

src/app/layout.tsx

@@ -75,8 +75,9 @@ export default function RootLayout({
       />
       <meta
         name="naver-site-verification"
-        content="04dacb01e59bc7de3fb1e9260ae7e5f98ee465ac"
+        content="2e5a2baeaa16a876f71debbf19ada393b4f4a688"
       />
+
       {/* 본서버 */}
       <meta
         name="google-site-verification"
@@ -100,10 +101,10 @@ export default function RootLayout({
         ) : null}
         <IntegrateMSW>
           <QueryProvider>
-            <Script
+            {/* <Script
               strategy="beforeInteractive"
               src={`//dapi.kakao.com/v2/maps/sdk.js?appkey=${process.env.NEXT_PUBLIC_MAP_KEY}&autoload=false`}
-            />
+            /> */}
             {/* <AuthWrapper /> */}
             <GnbWrapper />
             <RefreshTokenWrapper />

src/app/learning/page.tsx

@@ -7,17 +7,17 @@ const LearningPage = async () => {
   const accessToken = cookieStore.get('access_token')?.value;
 
   const headers: HeadersInit = {
-    'Content-Type': 'application/json',
+    'Content-Type': 'application/json'
   };
-  
+
   if (accessToken) {
     headers['Authorization'] = `Bearer ${accessToken}`;
   }
 
-  const response = await fetch('http://43.200.90.72/contents/overview', {
+  const response = await fetch('https://moaguide.n-e.kr/contents/overview', {
     method: 'GET',
     headers,
-    cache: 'no-store',
+    cache: 'no-store'
   });
 
   if (!response.ok) {
@@ -28,11 +28,11 @@ const LearningPage = async () => {
   const initialData = await response.json();
 
   return (
-    <div className='min-h-[calc(100dvh-135.5px)] flex flex-col'>
+    <div className="min-h-[calc(100dvh-135.5px)] flex flex-col">
       <Navbar />
       <LearningPageClient initialData={initialData} />
     </div>
   );
 };
 
-export default LearningPage;
+export default LearningPage;

src/app/mypage/bookmark/page.tsx

@@ -21,7 +21,7 @@ const BookmarkPage = async ({
 
   try {
     const productBookmarkResponse = await fetch(
-      `https://api.moaguide.com/summary/list?category=${category}&subcategory=bookmark&sort=bookmark&page=${pages}&size=10`,
+      `https://moaguide.n-e.kr/summary/list?category=${category}&subcategory=bookmark&sort=bookmark&page=${pages}&size=10`,
       {
         headers: {
           Authorization: `Bearer ${token}`

src/app/practice/[id]/page.tsx

@@ -1,4 +1,3 @@
-
 import PracticeDetailIndex from '@/components/practice/PracticeDetailIndex';
 import type { ArticleItem } from '@/types/homeComponentsType';
 import React from 'react';
@@ -10,9 +9,12 @@ interface PracticeDetailPageProps {
 }
 
 const PracticeDetailPage = async ({ params }: PracticeDetailPageProps) => {
-  const response = await fetch(`https://api.moaguide.com/study/detail/article/${params.id}`, {
-    cache: 'no-store'
-  });
+  const response = await fetch(
+    `https://moaguide.n-e.kr/study/detail/article/${params.id}`,
+    {
+      cache: 'no-store'
+    }
+  );
 
   if (!response.ok) {
     throw new Error('Failed to fetch data');
@@ -23,4 +25,4 @@ const PracticeDetailPage = async ({ params }: PracticeDetailPageProps) => {
   return <PracticeDetailIndex data={data} />;
 };
 
-export default PracticeDetailPage;
+export default PracticeDetailPage;

src/app/product/page.tsx

@@ -3,7 +3,7 @@ import Product from './(product)/Product';
 import { IProductCommon, IReport, ISummaryData } from '@/types/Diviend';
 import { getCookie } from '@/utils/serverCookies';
 
-const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL || 'https://api.moaguide.com';
+const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL || 'https://moaguide.n-e.kr';
 
 const ProductPage = async ({
   searchParams

src/app/robots.ts

@@ -1,16 +1,17 @@
 import { MetadataRoute } from 'next';
 
 export default function robots(): MetadataRoute.Robots {
-  const isVercel =
-    process.env.VERCEL_URL && process.env.VERCEL_URL.includes('vercel.app');
+  const siteUrl = process.env.NEXT_PUBLIC_SITE_URL ?? '';
+  const isMainDomain = siteUrl.includes('moaguide.com');
+
   return {
     rules: [
       {
         userAgent: '*',
-        allow: isVercel ? '' : '/',
-        disallow: isVercel ? '/' : ''
-      }
+        allow: isMainDomain ? '/' : '',
+        disallow: isMainDomain ? '' : '/',
+      },
     ],
-    sitemap: 'https://moaguide.com/sitemap.xml'
+    sitemap: `${siteUrl}/sitemap.xml`,
   };
-}
+}

src/app/sign/(sign)/GoogleLogin.tsx

@@ -5,7 +5,7 @@ import GoogleLoginButton from '/public/images/sign/google-login.svg';
 const GoogleLogin = ({ setLoginType }: { setLoginType: (type: 'google') => void }) => {
   const handleGoogleLogin = () => {
     setLoginType('google');
-    window.location.href = 'https://api.moaguide.com/oauth2/authorization/google';
+    window.location.href = 'https://moaguide.n-e.kr/oauth2/authorization/google';
   };
 
   return (

src/components/common/Gnb.tsx

@@ -94,4 +94,4 @@ const Gnb = () => {
   );
 };
 
-export default Gnb;
+export default Gnb;

src/components/home/RealtimeRank.tsx

@@ -16,10 +16,11 @@ const RealtimeRank = () => {
     return <RealtimeRankSkeleton />;
   }
 
+  //돌아가려면 sm:block
   return (
     <div className="max-w-[280px] w-full h-[291px] hidden sm:block">
       <div className="flex flex-col gap-5">
-        <div className="mt-1 text-body5 text-black sm:text-heading4">
+        <div className="mt-1 text-body5 text-black sm:text-heading4 ">
           실시간 검색 순위
         </div>
         <div className="p-5 shadow-custom-normal rounded-[12px] flex-1">
@@ -30,7 +31,9 @@ const RealtimeRank = () => {
                   className={`${i < 3 ? 'text-normal text-body6 ' : 'text-gray400 text-body6'}`}>
                   {item.rank}위
                 </div>
-                <div className="flex-1 text-body2 text-black truncate cursor-pointer" onClick={() => {
+                <div
+                  className="flex-1 text-body2 text-black truncate cursor-pointer"
+                  onClick={() => {
                     setKeyword(item.keyword);
                     router.push('/search');
                   }}>