Skip to content

Commit 6a321a7

Browse files
authored
Merge pull request #35 from happbob/feat/OODD-50
Feat: 로그인, 회원가입, 프로필 조회 페이지 기능 99% 완료!!
2 parents f45d43f + ea4056c commit 6a321a7

28 files changed

Lines changed: 524 additions & 353 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ dist-ssr
2424
*.njsproj
2525
*.sln
2626
*.sw?
27-
.env
27+
.env

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
"js-cookie": "^3.0.5",
2323
"react": "^18.3.1",
2424
"react-dom": "^18.3.1",
25-
"react-error-overlay": "6.0.9",
2625
"react-router-dom": "^6.24.1",
27-
"react-scripts": "4.0.3",
2826
"recoil": "^0.7.7",
2927
"recoil-persist": "^5.1.0",
3028
"request": "^2.88.2",
3129
"socket.io-client": "^4.7.5",
3230
"styled-components": "^6.1.11",
3331
"styled-reset": "^4.5.2",
34-
"swiper": "^11.1.8"
32+
"swiper": "^11.1.8",
33+
"react-scripts": "4.0.3",
34+
"react-error-overlay": "6.0.9"
3535
},
3636
"devDependencies": {
3737
"@types/express": "^4.17.21",

src/App.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

src/apis/core/index.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,8 @@ export const request: CustomInstance = axios.create({
4646

4747
request.interceptors.request.use(
4848
(config) => {
49-
const jwt = localStorage.getItem(JWT_KEY);
50-
console.log(jwt);
51-
if (jwt) {
52-
config.headers.Authorization = `Bearer ${jwt}`;
53-
}
49+
const jwt = window.localStorage.getItem(JWT_KEY);
50+
config.headers.Authorization = `Bearer ${jwt}`;
5451
return config;
5552
},
5653
(error) => {

src/pages/AccountSetting/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import back from '../../assets/back.svg';
1515
import request, { BaseResponse } from '../../apis/core';
1616
import { UserProfileResponse } from '../ProfileEdit/dto';
1717
import imageBasic from '../../assets/imageBasic.svg';
18+
import Loading from '../../components/Loading';
1819

1920
const AccountSetting: React.FC = () => {
2021
const navigate = useNavigate();
@@ -68,7 +69,7 @@ const AccountSetting: React.FC = () => {
6869
};
6970

7071
if (!userProfile) {
71-
return <div>Loading...</div>; // 로딩 상태
72+
return <Loading/>; // 로딩 상태
7273
}
7374

7475
return (

0 commit comments

Comments
 (0)