Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Design/#101 | 책정보 api 연결, 내보내기 추가 퍼블리싱 #106

Merged
merged 26 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ab6f5eb
💄 UI: 통계 요약 내보내기 페이지 퍼블리싱
yoonjin-C Nov 18, 2024
d1edee5
💚 Chore: Caprasimo 글씨체 추가
yoonjin-C Nov 18, 2024
b00f103
💚 Chore: Caprasimo 글씨체 추가
yoonjin-C Nov 18, 2024
8de31d2
✨ Feat: 내보내기 페이지 라우팅 추가
yoonjin-C Nov 18, 2024
cf492db
💄 UI: 디자인 수정사항 반영 및 애니메이션 추가
yoonjin-C Nov 18, 2024
149df43
✏️ Fix: 파일 경로 수정
yoonjin-C Nov 18, 2024
32075b3
💄 UI: 헤더 UI 수정
yoonjin-C Nov 18, 2024
5ae8872
📝 Docs: 이미지 내보내기를 위한 의존성 추가
yoonjin-C Nov 18, 2024
a8822d8
✨ Feat: 이미지 내보내기 기능 구현
yoonjin-C Nov 18, 2024
b8bb809
✨ Feat: 기록 api 연결
yoonjin-C Nov 20, 2024
501c84f
✨ Feat: 통계 요약 api 연결
yoonjin-C Nov 20, 2024
18e8438
✨ Feat: 키워드 api 연결
yoonjin-C Nov 20, 2024
5fd7128
✨ Feat: 키워드 api 연결
yoonjin-C Nov 20, 2024
a5a3222
🐛 Fix: null 값 대비 수정
yoonjin-C Nov 20, 2024
97b6363
✨ Feat: 연관 추천 도서 api 연결
yoonjin-C Nov 20, 2024
6ef33b6
🐛 Fix: 경험치 오류 수정
yoonjin-C Nov 21, 2024
e386b7d
✨ Feat: 나의 배지 조회 api 연결
yoonjin-C Nov 21, 2024
a994e7f
♻️ Refactor: 배지 도움말 모달 이름 변경
yoonjin-C Nov 21, 2024
470bedb
✨ Feat: 배지 모달 연결
yoonjin-C Nov 21, 2024
fcda589
✨ Feat: 타유저의 Custom 도서 조회 api 연결
yoonjin-C Nov 21, 2024
5281559
🎨 Fix: 회의 수정사항 반영
yoonjin-C Nov 23, 2024
671ad2f
💚 Chore: 컬러 팔레트 추가
yoonjin-C Nov 25, 2024
7a4413b
💚 Fix: 컬러 팔레트 수정
yoonjin-C Nov 25, 2024
acff7c9
✏️ Fix: 통계페이지 라우팅 수정
yoonjin-C Nov 26, 2024
6143e82
✏️ Fix: 의존성 배열에 bookinfoId 추가
yoonjin-C Nov 26, 2024
f47e3eb
Merge branch 'dev' into design/#101
yoonjin-C Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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