diff --git a/next.config.mjs b/next.config.mjs index 8db54e5..2769ce6 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -9,6 +9,7 @@ const nextConfig = { 'd2qf2amuam62ps.cloudfront.net', 'scs-phinf.pstatic.net', 'api.moaguide.com', + 'entertain.naver.com', ], }, diff --git a/src/app/mypage/edit/page.tsx b/src/app/mypage/edit/page.tsx index 2cd26d4..9da9759 100644 --- a/src/app/mypage/edit/page.tsx +++ b/src/app/mypage/edit/page.tsx @@ -170,7 +170,7 @@ const Editpage = () => {
휴대폰 번호
-
{member.memberPhone}
+
{member?.memberPhone || '없음'}
diff --git a/src/components/common/Gnb.tsx b/src/components/common/Gnb.tsx index bad6542..cd0394b 100644 --- a/src/components/common/Gnb.tsx +++ b/src/components/common/Gnb.tsx @@ -44,7 +44,7 @@ const Gnb = () => {
router.push('/search')} className="cursor-pointer"> search_icon
-
{ if (isLoggedIn) { router.push('/sign'); @@ -54,6 +54,9 @@ const Gnb = () => { }} className="cursor-pointer"> alert +
*/} +
+ alert
{isLoggedIn ? ( diff --git a/src/components/home/HomeFooter.tsx b/src/components/home/HomeFooter.tsx index 1f1214e..5fa036a 100644 --- a/src/components/home/HomeFooter.tsx +++ b/src/components/home/HomeFooter.tsx @@ -3,8 +3,8 @@ import React from 'react'; const HomeFooter = () => { return ( -
-
+
+
{/* 왼쪽 */}
@@ -17,24 +17,33 @@ const HomeFooter = () => {
사업자등록번호 : 0000-00-00000
통신판매업 번호 : 0000-0000-0000
-
+
Copyright © 2024. MOA GUIDE. All Rights Reserved.
{/* 오른쪽 */}
-
+
카카오톡으로 1:1 문의
- +
-
+
개인정보처리방침
|
이용약관
+
+
개인정보처리방침
+
|
+
이용약관
+
+ +
+ Copyright © 2024. MOA GUIDE. All Rights Reserved. +
diff --git a/src/components/home/IssueItem.tsx b/src/components/home/IssueItem.tsx index aeea0c7..c697bc2 100644 --- a/src/components/home/IssueItem.tsx +++ b/src/components/home/IssueItem.tsx @@ -6,13 +6,13 @@ import Image from 'next/image'; import Link from 'next/link'; import React from 'react'; -const IssueItem = ({ id, title, category, link, date }: MainNews) => { +const IssueItem = ({ id, title, category, link, imgUrl, date }: MainNews) => { return (
Image diff --git a/src/components/home/MainReport.tsx b/src/components/home/MainReport.tsx index c2dce70..a68c4e5 100644 --- a/src/components/home/MainReport.tsx +++ b/src/components/home/MainReport.tsx @@ -53,6 +53,8 @@ const MainReport = () => { date={item.date} category={item.category} id={item.id} + imageLink={item.imageLink} + description={item.description} /> )) )} diff --git a/src/components/home/MainReportItem.tsx b/src/components/home/MainReportItem.tsx index 15c3c83..bee5028 100644 --- a/src/components/home/MainReportItem.tsx +++ b/src/components/home/MainReportItem.tsx @@ -4,7 +4,7 @@ import { formatCategory } from '@/utils/formatCategory'; import { format, parseISO } from 'date-fns'; import React from 'react'; -const MainReportItem = ({ category, title, date, id }: MainReportType) => { +const MainReportItem = ({ category, title, date, id, description, imageLink }: MainReportType) => { return (
{/* 왼쪽 */} @@ -13,16 +13,17 @@ const MainReportItem = ({ category, title, date, id }: MainReportType) => { {formatCategory(category)}
{title}
+
{description}
{format(parseISO(date), 'yyyy.MM.dd')}
{/* 오른쪽 */} -
+
diff --git a/src/components/home/SubMenu.tsx b/src/components/home/SubMenu.tsx index 7b85b5c..20916a4 100644 --- a/src/components/home/SubMenu.tsx +++ b/src/components/home/SubMenu.tsx @@ -32,10 +32,10 @@ const SubMenu = () => {
{ - router.push('/reportpage'); + router.push('/practicepage'); }} className="cursor-pointer flex-1 flex items-center justify-between px-[16px] md:px-[28px] py-[22px] rounded-[12px] bg-bg"> -
리포트
+
학습하기
paper
@@ -65,13 +65,13 @@ const SubMenu = () => {
{ - router.push('/reportpage'); + router.push('/practicepage'); }} className="max-w-[110px] w-full py-4 flex flex-col justify-center items-center gap-3 rounded-[12px] border border-gray100">
paper
-
리포트
+
학습하기
diff --git a/src/components/practice/CategoryPractice.tsx b/src/components/practice/CategoryPractice.tsx index 0b2f60d..ab0c147 100644 --- a/src/components/practice/CategoryPractice.tsx +++ b/src/components/practice/CategoryPractice.tsx @@ -79,7 +79,7 @@ const CategoryPractice = () => { { diff --git a/src/components/sign/SignLayout.tsx b/src/components/sign/SignLayout.tsx index 32c5867..ef48850 100644 --- a/src/components/sign/SignLayout.tsx +++ b/src/components/sign/SignLayout.tsx @@ -12,6 +12,7 @@ const SignLayout = () => { const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); const [errorMessage, setErrorMessage] = useState(''); + const [rememberMe, setRememberMe] = useState(false); const [loginType, setLoginType] = useState<'local' | 'naver' | 'google' | 'kakao'>('local'); const router = useRouter(); const { isLoggedIn, setIsLoggedIn } = useAuthStore(); @@ -23,19 +24,10 @@ const SignLayout = () => { } }, [isLoggedIn, router]); - const throttledHandleLogin = throttle(async () => { try { - const response = await login(email, password); + await login(email, password, rememberMe); setIsLoggedIn(true); - - const userInfo = response.user; - setMember({ - memberEmail: userInfo.email, - memberNickName: userInfo.nickname, - memberPhone: userInfo.phoneNumber, - loginType: 'local', - }); setErrorMessage(''); @@ -46,7 +38,6 @@ const SignLayout = () => { } }, 1000); - return (
@@ -79,6 +70,8 @@ const SignLayout = () => { setRememberMe(e.target.checked)} className="mr-2" />