Skip to content

Feat/bookmark list #3

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.

Sign up for GitHub

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

Open
soyeonysoss wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feat/bookmark list #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89a4292
bookmarkListList 가져오는 부분
soyeonysoss Jun 5, 2022
1c069b8
mock data code 삭제
soyeonysoss Jun 5, 2022
d76787f
bookmarkListList, bookmarkList response 확인
soyeonysoss Jun 5, 2022
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
9 changes: 5 additions & 4 deletions components/bookmark/BookmarkMain.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,17 @@ function BookmarkMain({ bookmarkId }) {
return getBookmark(token, bookmarkId);
},
});
console.log(bookmarkList); // getBookmark의 response 아닌 getBookmarkList의 response 나오는 문제

return (
<div className="content-wrapper">
{!isBookmarkListListLoading && !isBookmarkListListError && (
<BookmarkList
bookmarkListList={bookmarkListList.results}
bookmarkListList={bookmarkListList.data.data}
bookmarkId={bookmarkId}
/>
)}
{!isBookmarkListLoading && !isBookmarkListError && (
{/* {!isBookmarkListLoading && !isBookmarkListError && (
<>
<BookmarkTitle title={bookmarkList.data.title} />
<BookmarkHeader
Expand All @@ -48,8 +49,8 @@ function BookmarkMain({ bookmarkId }) {
/>
<BookmarkCardList bookmarks={bookmarkList.data.bookmarks} />
</>
)}
</div>
)} */}
</div>
);
}

Expand Down
3 changes: 0 additions & 3 deletions pages/bookmark/[bookmarkId]/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import Head from 'next/head';
import { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import { mockBookmarkList, mockBookmarkListList } from '../../../mock';
import BookmarkMain from '../../../components/bookmark/BookmarkMain';

export async function getServerSideProps(context) {
const { bookmarkId } = context.query;
return {
props: {
bookmarkId,
bookmarkList: mockBookmarkList[bookmarkId],
bookmarkListList: mockBookmarkListList,
},
};
}
Expand Down
32 changes: 16 additions & 16 deletions pages/bookmark/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
import { useState, useEffect } from 'react';
import Head from 'next/head';
import PropTypes from 'prop-types';
import { mockBookmarkListList } from '../../mock';
import { BookmarkList } from '../../components/bookmark/BookmarkList';
import { useQuery } from 'react-query';

export async function getServerSideProps() {
return {
props: {
bookmarkListList: mockBookmarkListList,
},
};
}

function BookmarkDetail({ bookmarkId, bookmarkListList }) {
function BookmarkDetail({ bookmarkId }) {
const {
data: bookmarkListList,
isLoading: isBookmarkListListLoading,
isError: isBookmarkListListError,
} = useQuery('bookmarkList');

const [auth, setAuth] = useState({
username: '',
isAuth: false,
});

useEffect(() => {
const jwt = window.sessionStorage.getItem('jwt');
const username = window.sessionStorage.getItem('username');
const jwt = window.localStorage.getItem('jwt');
const username = window.localStorage.getItem('username');

setAuth({
username,
Expand All @@ -37,10 +35,12 @@ function BookmarkDetail({ bookmarkId, bookmarkListList }) {
<div className="content-wrapper">
{auth.isAuth ? (
<>
<BookmarkList
bookmarkListList={bookmarkListList}
bookmarkId={bookmarkId}
/>
{!isBookmarkListListLoading && !isBookmarkListListError && (
<BookmarkList
bookmarkListList={bookmarkListList.data.data}
bookmarkId={bookmarkId}
/>
)}
<div className="text-center text-xl">
상단의 북마크를 선택해주세요
</div>
Expand Down