From 29ed2ff7e3e3b927a2d67bec81850c56ae302b75 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Mon, 7 Oct 2024 22:44:06 +0900 Subject: [PATCH 1/8] =?UTF-8?q?design:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?= =?UTF-8?q?=ED=91=B8=ED=84=B0=20=EB=B0=98=EC=9D=91=ED=98=95=20=EC=9E=91?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next.config.mjs | 1 + src/components/home/HomeFooter.tsx | 21 +++++++++++++++------ src/components/home/IssueItem.tsx | 2 +- src/factory/ReportIssue.ts | 1 + 4 files changed, 18 insertions(+), 7 deletions(-) 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/components/home/HomeFooter.tsx b/src/components/home/HomeFooter.tsx index 1f1214e..0b5983e 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..055320e 100644 --- a/src/components/home/IssueItem.tsx +++ b/src/components/home/IssueItem.tsx @@ -12,7 +12,7 @@ const IssueItem = ({ id, title, category, link, date }: MainNews) => {
Image diff --git a/src/factory/ReportIssue.ts b/src/factory/ReportIssue.ts index 1fa30cd..1051620 100644 --- a/src/factory/ReportIssue.ts +++ b/src/factory/ReportIssue.ts @@ -4,6 +4,7 @@ import axios from 'axios'; const fetchReportIssues = async () => { const { data } = await axios.get(`https://api.moaguide.com/`); + console.log('최신이슈', data); return data; }; From 79f9e80a48550456d453bb9a2829bf5101576ed2 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Mon, 7 Oct 2024 22:45:10 +0900 Subject: [PATCH 2/8] =?UTF-8?q?design:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?= =?UTF-8?q?=ED=91=B8=ED=84=B0=20=EB=B0=98=EC=9D=91=ED=98=95=20=EC=9E=91?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/home/HomeFooter.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/home/HomeFooter.tsx b/src/components/home/HomeFooter.tsx index 0b5983e..a330268 100644 --- a/src/components/home/HomeFooter.tsx +++ b/src/components/home/HomeFooter.tsx @@ -37,7 +37,7 @@ const HomeFooter = () => {
개인정보처리방침
-
|
+
|
이용약관
From d6f6f7bc78216f01cc536eaff144f05fd2eedb86 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Tue, 8 Oct 2024 01:32:49 +0900 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=EB=A9=94=EC=9D=B8=20=EB=A6=AC?= =?UTF-8?q?=ED=8F=AC=ED=8A=B8,=20=EC=B5=9C=EC=8B=A0=20=EC=9D=B4=EC=8A=88?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/home/HomeFooter.tsx | 2 +- src/components/home/IssueItem.tsx | 4 ++-- src/components/home/MainReport.tsx | 2 ++ src/components/home/MainReportItem.tsx | 11 ++++++----- src/types/homeComponentsType.ts | 3 +++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/home/HomeFooter.tsx b/src/components/home/HomeFooter.tsx index a330268..5fa036a 100644 --- a/src/components/home/HomeFooter.tsx +++ b/src/components/home/HomeFooter.tsx @@ -3,7 +3,7 @@ import React from 'react'; const HomeFooter = () => { return ( -
+
{/* 왼쪽 */}
diff --git a/src/components/home/IssueItem.tsx b/src/components/home/IssueItem.tsx index 055320e..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/types/homeComponentsType.ts b/src/types/homeComponentsType.ts index 51e17b9..829182c 100644 --- a/src/types/homeComponentsType.ts +++ b/src/types/homeComponentsType.ts @@ -3,6 +3,8 @@ export interface MainReportType { title: string; category: string; date: string; + imageLink: string; + description: string; } export interface MainNews { @@ -11,6 +13,7 @@ export interface MainNews { category: string; link: string; date: string; + imgUrl: string; } export interface MainReportNewsType { From c6748dc761cd0bc8423fe122372d302a38dcbb69 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Tue, 8 Oct 2024 01:40:18 +0900 Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EC=9C=A0=EC=A7=80=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=EA=B0=92=20=EC=A0=84=EB=8B=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/sign/SignLayout.tsx | 7 ++++--- src/service/auth.ts | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/sign/SignLayout.tsx b/src/components/sign/SignLayout.tsx index 32c5867..03d8d57 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,10 +24,9 @@ const SignLayout = () => { } }, [isLoggedIn, router]); - const throttledHandleLogin = throttle(async () => { try { - const response = await login(email, password); + const response = await login(email, password, rememberMe); // rememberMe 값 추가 setIsLoggedIn(true); const userInfo = response.user; @@ -46,7 +46,6 @@ const SignLayout = () => { } }, 1000); - return (
@@ -79,6 +78,8 @@ const SignLayout = () => { setRememberMe(e.target.checked)} // 상태 유지 여부 업데이트 className="mr-2" />