Skip to content

Commit

Permalink
Merge pull request #106 from MoneyMakersClub/design/#101
Browse files Browse the repository at this point in the history
Design/#101 | 책정보 api 연결, 내보내기 추가 퍼블리싱
  • Loading branch information
yoonjin-C authored Nov 26, 2024
2 parents 0699e86 + f47e3eb commit fdf5da0
Show file tree
Hide file tree
Showing 74 changed files with 847 additions and 160 deletions.
1 change: 1 addition & 0 deletions bookduck/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@tanstack/react-query": "^5.60.2",
"axios": "^1.7.7",
"classnames": "^2.5.1",
"html2canvas": "^1.4.1",
"event-source-polyfill": "^1.0.31",
"firebase": "^11.0.2",
"react": "^18.3.1",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 11 additions & 3 deletions bookduck/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import RegisterPage from "./pages/SearchPage/SearchRegisterPage";
import SelectCardPage from "./pages/MainPage/SelectCardPage";
import BookInfoPage from "./pages/BookInfoPage/BookInfoPage";
import UserCommentPage from "./pages/BookInfoPage/UserCommentPage";
import BookInfoAddedPage from "./pages/BookInfoPage/BoonInfoAddedPage";
import BookInfoAddedPage from "./pages/BookInfoPage/BookInfoAddedPage";
import StatisticsPage from "./pages/StatisticsPage/StatisticsPage";
import CharacterExportPage from "./pages/StatisticsPage/CharacterExportPage";
import SummaryExportPage from "./pages/StatisticsPage/SummaryExportPage";
import CardDecorationPage from "./pages/RecordingPage/CardDecorationPage";
import LibraryPage from "./pages/LibraryPage/LibraryPage";
import EnterBookCasePage from "./pages/LibraryPage/EnterBookCasePage";
Expand Down Expand Up @@ -70,11 +71,15 @@ function App() {
<Route path="/signin" element={<SigninPage />} />
<Route path="/setting" element={<SettingPage />} />
<Route path="/notification" element={<NotificationPage />} />
<Route path="/statistics" element={<StatisticsPage />} />
<Route path="/statistics/:userId" element={<StatisticsPage />} />
<Route
path="/statistics/export/character"
element={<CharacterExportPage />}
/>
<Route
path="/statistics/export/summary"
element={<SummaryExportPage />}
/>
<Route path="/" element={<Navigate to="/home" replace />} />
<Route path="/api/oauth" element={<OAuthRedierctPage />} />
<Route path="/home" element={<MainPage />} />
Expand All @@ -84,7 +89,10 @@ function App() {
<Route path="/recording" element={<RecordingPage />} />
<Route path="/search/register" element={<RegisterPage />} />
<Route path="/info/book/:bookinfoId" element={<BookInfoPage />} />
<Route path="/info/book/user" element={<BookInfoAddedPage />} />
<Route
path="/info/book/custom/:bookinfoId"
element={<BookInfoAddedPage />}
/>
<Route path="/info/book/comment" element={<UserCommentPage />} />
<Route path="/selectcard" element={<SelectCardPage />} />
<Route path="/selectcard/extract" element={<SelectExtractPage />} />
Expand Down
40 changes: 38 additions & 2 deletions bookduck/src/api/bookinfo.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { apiAuth } from "./api";
import { get, post, patch, put, del } from "./example";

// 한줄평,별점 목록 조회
// 기본 책정보 조회(bookinfoId)
export const getBookInfo = async ({ bookinfoId }) => {
try {
const res = await get(`/bookinfo/${bookinfoId}`);
Expand All @@ -13,6 +13,18 @@ export const getBookInfo = async ({ bookinfoId }) => {
}
};

// custom 책정보 조회(bookinfoId)
export const getCustomBookInfo = async ({ bookinfoId }) => {
try {
const res = await get(`/bookinfo/custom/${bookinfoId}`);
console.log("책정보 조회 성공: ", res);
return res;
} catch (error) {
console.error("책정보 조회 실패: ", error);
throw error;
}
};

// 한줄평,별점 목록 조회
export const getOneLineRatingsInfo = async ({
bookinfoId,
Expand Down Expand Up @@ -104,7 +116,7 @@ export const deleteOneLine = async (onelineId) => {
}
};

//한줄평 좋아요
//한줄평 좋아요 등록
export const enrollLike = async (onelineId) => {
const url = `onelines/${onelineId}/like`;
try {
Expand All @@ -128,3 +140,27 @@ export const deleteLike = async (onelineId) => {
throw error;
}
};

//나의 기록 조회
export const getMyArchive = async ({ bookinfoId }) => {
try {
const res = await get(`/bookinfo/${bookinfoId}/archives/users/me`);
console.log("나의 기록 조회 성공: ", res);
return res;
} catch (error) {
console.error("나의 기록 조회 실패: ", error);
throw error;
}
};

//연관 추천도서 조회
export const getRelatedBookInfo = async ({ bookinfoId }) => {
try {
const res = await get(`/bookinfo/${bookinfoId}/explore`);
console.log("추천도서 조회 성공: ", res);
return res;
} catch (error) {
console.error("추천도서 조회 실패: ", error);
throw error;
}
};
12 changes: 12 additions & 0 deletions bookduck/src/api/character.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,15 @@ export const getItemLists = async () => {
throw error;
}
};

// 내 뱃지 목록 조회
export const getBadgeLists = async () => {
try {
const res = await get(`/badges`);
console.log("배지 리스트 조회 성공: ", res);
return res;
} catch (error) {
console.error("배지 리스트 조회 실패: ", error);
throw error;
}
};
24 changes: 24 additions & 0 deletions bookduck/src/api/statistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,27 @@ export const getUserStatisticsInfo = async (userId) => {
throw error;
}
};

// 키워드 조회
export const getKeywords = async (userId) => {
try {
const res = await get(`/users/${userId}/keywords`);
console.log("키워드 조회 성공: ", res);
return res;
} catch (error) {
console.error("키워드 조회 실패: ", error);
throw error;
}
};

// 통계 요약 내보내기 정보 제공
export const getExportSummaryInfo = async () => {
try {
const res = await get(`/export/statistics`);
console.log("통계 요약 정보 조회 성공: ", res);
return res;
} catch (error) {
console.error("통계 요약 정보 조회 실패: ", error);
throw error;
}
};
10 changes: 6 additions & 4 deletions bookduck/src/assets/bookinfoPage/menu-vertical.svg
12 changes: 6 additions & 6 deletions bookduck/src/assets/bookinfoPage/star-half.svg
6 changes: 4 additions & 2 deletions bookduck/src/assets/bookinfoPage/star-no.svg
6 changes: 4 additions & 2 deletions bookduck/src/assets/bookinfoPage/star-yes.svg
3 changes: 0 additions & 3 deletions bookduck/src/assets/bookinfoPage/start-yes.svg
Diff not rendered.
32 changes: 32 additions & 0 deletions bookduck/src/assets/bookinfoPage/user-no-archive.svg
Binary file added bookduck/src/assets/common/teacher-duck.png
6 changes: 6 additions & 0 deletions bookduck/src/assets/statisticsPage/cancle.svg
3 changes: 3 additions & 0 deletions bookduck/src/assets/statisticsPage/divider.svg
16 changes: 16 additions & 0 deletions bookduck/src/assets/statisticsPage/star-summary.svg
13 changes: 13 additions & 0 deletions bookduck/src/assets/statisticsPage/summary.svg
Loading

0 comments on commit fdf5da0

Please sign in to comment.