Skip to content
This repository was archived by the owner on Jul 13, 2026. It is now read-only.

Commit 6bed855

Browse files
ohiayameohiayame
committed
Merge branch 'feature/refact-aym' into dev-merge_test
2 parents ce7702e + ba0eeb5 commit 6bed855

26 files changed

Lines changed: 2310 additions & 620 deletions

‎src/api/adminApi.js‎

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { errorMsg } from './apiClient'
99
export const getProfessors = async () => {
1010
try {
1111
const res = await api.get(`/modal/common/professors`)
12-
return res.data
12+
return res.data.data
1313
} catch (e) {
1414
errorMsg(e)
1515
}
@@ -32,8 +32,8 @@ export const getProfessors = async () => {
3232
export const getApproval = async () => {
3333
try {
3434
const res = await api.get(`/admin/users`)
35-
console.log(res.data)
36-
return res.data
35+
console.log(res.data.data)
36+
return res.data.data
3737
} catch (e) {
3838
errorMsg(e)
3939
}
@@ -45,8 +45,8 @@ export const getApproval = async () => {
4545
export const getEmail = async () => {
4646
try {
4747
const res = await api.get(`/admin/email`)
48-
console.log(res.data)
49-
return res.data
48+
console.log(res.data.data)
49+
return res.data.data
5050
} catch (e) {
5151
errorMsg(e)
5252
}
@@ -63,8 +63,8 @@ export const getUserInfo = async (grade, status) => {
6363
status: status,
6464
},
6565
})
66-
console.log(res.data)
67-
return res.data
66+
console.log(res.data.data)
67+
return res.data.data
6868
} catch (e) {
6969
errorMsg(e)
7070
}
@@ -86,8 +86,8 @@ export const getUserInfo = async (grade, status) => {
8686
export const getAdminsInfo = async () => {
8787
try {
8888
const res = await api.get(`/admin/proadmin`)
89-
console.log(res.data)
90-
return res.data
89+
console.log(res.data.data)
90+
return res.data.data
9191
} catch (e) {
9292
errorMsg(e)
9393
}
@@ -103,7 +103,7 @@ export const postApproval = async (user_id, action) => {
103103
user_id: user_id,
104104
action: action,
105105
})
106-
return res.data
106+
return res.data.data
107107
} catch (e) {
108108
errorMsg(e)
109109
}
@@ -118,17 +118,17 @@ export const postEmail = async (email, reason) => {
118118
email: email,
119119
reason: reason,
120120
})
121-
return res.data
121+
return res.data.data
122122
} catch (e) {
123123
errorMsg(e)
124124
}
125125
}
126126

127-
// ========================== PATCH ===============================
127+
// ========================== PUT ===============================
128128
// ---------------------------------------------------------------
129-
// 승인 / 거절 등록
129+
// 학생 정보 수정
130130
// ---------------------------------------------------------------
131-
export const patchUser = async (userInfo) => {
131+
export const putUser = async (userInfo) => {
132132
try {
133133
const res = await api.patch(`/admin/students/${userInfo.user_id}`, {
134134
name: userInfo.name,
@@ -139,7 +139,24 @@ export const patchUser = async (userInfo) => {
139139
class_id: userInfo.class_id,
140140
is_international: userInfo.is_international,
141141
})
142-
return res.data
142+
return res.data.data
143+
} catch (e) {
144+
errorMsg(e)
145+
}
146+
}
147+
148+
// ---------------------------------------------------------------
149+
// 교수,관리자 정보 수정
150+
// ---------------------------------------------------------------
151+
export const putAdmin = async (userInfo) => {
152+
try {
153+
const res = await api.put(`/admin/proadmin/${userInfo.user_id}`, {
154+
role_type: userInfo.role_type,
155+
name: userInfo.name,
156+
phone: userInfo.phone,
157+
})
158+
console.log(res.data.data)
159+
return res.data.data
143160
} catch (e) {
144161
errorMsg(e)
145162
}
@@ -152,7 +169,7 @@ export const patchUser = async (userInfo) => {
152169
export const delEmail = async (id) => {
153170
try {
154171
const res = await api.delete(`/admin/email/${id}`)
155-
return res.data
172+
return res.data.data
156173
} catch (e) {
157174
errorMsg(e)
158175
}
@@ -164,7 +181,7 @@ export const delEmail = async (id) => {
164181
export const delUser = async (id) => {
165182
try {
166183
const res = await api.delete(`/admin/students/${id}`)
167-
return res.data
184+
return res.data.data
168185
} catch (e) {
169186
errorMsg(e)
170187
}

‎src/api/classroomApi.js‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { errorMsg } from './apiClient'
99
export const getClassrooms = async () => {
1010
try {
1111
const res = await api.get(`/modal/common/classrooms`)
12-
console.log(res.data)
13-
return res.data
12+
console.log(res.data.data)
13+
return res.data.data
1414
} catch (e) {
1515
errorMsg(e)
1616
}
@@ -28,8 +28,8 @@ export const getClassrooms = async () => {
2828
export const getClassroomsInfo = async () => {
2929
try {
3030
const res = await api.get(`/classrooms`)
31-
console.log(res.data)
32-
return res.data
31+
console.log(res.data.data)
32+
return res.data.data
3333
} catch (e) {
3434
errorMsg(e)
3535
}
@@ -48,8 +48,8 @@ export const getClassroomsInfo = async () => {
4848
export const getPollClassrooms = async () => {
4949
try {
5050
const res = await api.get(`/classrooms/polls/rules`)
51-
console.log(res.data)
52-
return res.data
51+
console.log(res.data.data)
52+
return res.data.data
5353
} catch (e) {
5454
errorMsg(e)
5555
}
@@ -73,8 +73,8 @@ export const getReservation = async (classroom_id, date) => {
7373
const res = await api.get(`/classrooms/${classroom_id}/reservations`, {
7474
params: { date: date },
7575
})
76-
console.log(res.data)
77-
return res.data
76+
console.log(res.data.data)
77+
return res.data.data
7878
} catch (e) {
7979
errorMsg(e)
8080
}
@@ -100,8 +100,8 @@ export const getPoll = async (date) => {
100100
date: date,
101101
},
102102
})
103-
console.log(res.data)
104-
return res.data
103+
console.log(res.data.data)
104+
return res.data.data
105105
} catch (e) {
106106
errorMsg(e)
107107
}
@@ -118,8 +118,8 @@ export const postReservation = async (classroom_id, data) => {
118118
start_time: data.start_time,
119119
end_time: data.end_time,
120120
})
121-
console.log(res.data)
122-
return res.data
121+
console.log(res.data.data)
122+
return res.data.data
123123
} catch (e) {
124124
errorMsg(e)
125125
}
@@ -136,7 +136,7 @@ export const postClassroom = async (CRdata) => {
136136
room_type: CRdata.room_type,
137137
})
138138
// console.log(res.data);
139-
return res.data
139+
return res.data.data
140140
} catch (e) {
141141
errorMsg(e)
142142
}
@@ -152,7 +152,7 @@ export const postPollClassroom = async (data) => {
152152
required_count: data.required_count,
153153
})
154154
// console.log(res.data);
155-
return res.data
155+
return res.data.data
156156
} catch (e) {
157157
errorMsg(e)
158158
}
@@ -167,13 +167,12 @@ export const postPoll = async (poll_id, action) => {
167167
action: action,
168168
})
169169
// console.log(res.data);
170-
return res.data
170+
return res.data.data
171171
} catch (e) {
172172
errorMsg(e)
173173
}
174174
}
175175

176-
177176
// ========================== put ===============================
178177
// ---------------------------------------------------------------
179178
// 강의실 수정
@@ -186,7 +185,7 @@ export const putClassroom = async (CRdata) => {
186185
room_type: CRdata.room_type,
187186
})
188187
// console.log(res.data);
189-
return res.data
188+
return res.data.data
190189
} catch (e) {
191190
errorMsg(e)
192191
}
@@ -202,7 +201,7 @@ export const putPollClassroom = async (data) => {
202201
required_count: data.required_count,
203202
})
204203
console.log(res.data)
205-
return res.data
204+
return res.data.data
206205
} catch (e) {
207206
errorMsg(e)
208207
}
@@ -216,7 +215,7 @@ export const deleteReservation = async (classroom_id, reservation_id) => {
216215
try {
217216
const res = await api.delete(`/classrooms/${classroom_id}/reservations/${reservation_id}`)
218217
// console.log(res.data);
219-
return res.data
218+
return res.data.data
220219
} catch (e) {
221220
errorMsg(e)
222221
}
@@ -229,7 +228,7 @@ export const deleteClassroom = async (classroom_id) => {
229228
try {
230229
const res = await api.delete(`/classrooms/${classroom_id}`)
231230
// console.log(res.data);
232-
return res.data
231+
return res.data.data
233232
} catch (e) {
234233
errorMsg(e)
235234
}

0 commit comments

Comments
 (0)