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;
};
diff --git a/src/factory/ReportLists.ts b/src/factory/ReportLists.ts
index 5b27aa5..ba0346a 100644
--- a/src/factory/ReportLists.ts
+++ b/src/factory/ReportLists.ts
@@ -2,14 +2,11 @@ import { useInfiniteQuery } from '@tanstack/react-query';
import axios from 'axios';
const fetchStudyGuides = async ({ pageParam = 1 }) => {
- const { data } = await axios.get(`https://api.moaguide.com/study/guide?page=${pageParam}&size=10`);
+ const { data } = await axios.get(`https://api.moaguide.com/study/guide`);
return {
content: data.roadmap,
nextPage: pageParam + 1,
- totalPages: data.total,
- totalElements: data.roadmap.length,
- currentPage: data.page,
- isLast: data.page + 1 >= data.total,
+ isLast: data.roadmap.length < 10 || !data.roadmap.length || data.nextCursor === null,
};
};
diff --git a/src/service/auth.ts b/src/service/auth.ts
index ef5473d..6c15af6 100644
--- a/src/service/auth.ts
+++ b/src/service/auth.ts
@@ -64,14 +64,15 @@ export const finalSignup = async (
}
};
-// 토큰 사용하는 API 함수들
-export const login = async (email: string, password: string) => {
+export const login = async (email: string, password: string, rememberMe: boolean) => {
try {
const formData = new FormData();
formData.append('email', email);
formData.append('password', password);
- const response = await basicAxiosInstance.post('/login', formData, {
+ const url = `/login?rememberMe=${rememberMe}`;
+
+ const response = await basicAxiosInstance.post(url, formData, {
headers: {
'Content-Type': 'multipart/form-data',
},
@@ -88,7 +89,6 @@ export const login = async (email: string, password: string) => {
setToken(accessToken);
console.log('Access Token 저장 성공:', accessToken);
- // 사용자 정보 업데이트
const { setMember } = useMemberStore.getState();
const userInfo = response.data.user;
if (!userInfo) {
@@ -203,13 +203,13 @@ export const deleteUser = async () => {
const { clearMember } = useMemberStore.getState();
clearMember();
- return response; // 반환값 추가
+ return response;
} else {
console.error('회원탈퇴 실패', response.status);
- return response; // 실패 시에도 response 반환
+ return response;
}
} catch (error) {
console.error('회원탈퇴 오류:', error);
- throw error; // 에러를 호출한 함수로 throw하여 catch하도록 함
+ throw error;
}
};
\ No newline at end of file
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 {