Skip to content

Commit

Permalink
Merge branch 'dev' into feat/#99-my-profile
Browse files Browse the repository at this point in the history
  • Loading branch information
kimhyerims authored Dec 26, 2024
2 parents a71502d + a90d9e9 commit d62e471
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/apis/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ export {
searchCards,
} from './cards';
export { getMyCard, postMyCard, deleteMyCard, putMyCard } from './myCard';
export { kakaoLoginAPI } from './login';
3 changes: 2 additions & 1 deletion src/pages/LoginPage/LoginPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { PrimaryButton, SecondaryButton } from '../../components';
import { useNavigate } from 'react-router-dom';

// import { kakaoLoginAPI, getUserInfo } from '../../apis/login';
import { kakaoLoginAPI } from '../../apis/login';

import { kakaoLoginAPI } from '../../apis';

export default function LoginPage() {
const navigate = useNavigate();
Expand Down

0 comments on commit d62e471

Please sign in to comment.