Skip to content

Commit

Permalink
feat : frame 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
jun-min1623 committed Feb 13, 2023
1 parent f80a14b commit a675143
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 10 deletions.
Binary file added .DS_Store
Binary file not shown.
Binary file added Frontend/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion Frontend/fe_vue/src/api/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function sendExamResult(config,param){
return axiosService.put('api/exam/result/',param,config);
}
function getChapterDetailData(config,param){
return axiosService.get('api/chapter/',param,config);
return axiosService.get('api/chapter/'+param,config);
}
export { adminUser,signinUser,signupUser,userData,getRoadmap,getSubjectDetail,getCourseData
,getAllSubjectData,postRoadmapToUserByEmail,getNoRoadmapUserData,getExamDetailData,
Expand Down
2 changes: 1 addition & 1 deletion Frontend/fe_vue/src/view/admin/adminHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<td>{{ user }}</td>
<td>
<router-link :to="'/roadmapFactory/' + user" style="text-decoration: none; color:black;">
<button>
<button class="btn btn-dark">
유저 로드맵 작성하기
</button>
</router-link>
Expand Down
12 changes: 10 additions & 2 deletions Frontend/fe_vue/src/view/admin/adminUserView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<th scope="col">이름</th>
<th scope="col">Email</th>
<th scope="col">로드맵 관리</th>
<th scope="col">코드 관리</th>

</tr>
</thead>
Expand All @@ -17,11 +18,18 @@
<td>{{ user.email }}</td>
<td>
<!-- <router-link :to="'/roadmapFactory/' + user" style="text-decoration: none; color:black;"> -->
<button>
<button class="btn btn-dark">
로드맵 관리
</button>
<!-- </router-link> -->
</td>
<td>
<!-- <router-link :to="'/roadmapFactory/' + user" style="text-decoration: none; color:black;"> -->
<button class="btn btn-dark">
코드 관리
</button>
<!-- </router-link> -->
</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -52,7 +60,7 @@ export default {
await adminUser(config)
.then((response) => {
this.success = response.data.success;
this.allUserData = response.data.users;
this.allUserData = response.data.userDetailList;
})
.catch(function (error) {
console.log(error);
Expand Down
17 changes: 11 additions & 6 deletions Frontend/fe_vue/src/view/user/chapterFrame.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ export default {
name: 'ChapterFrame',
data: () => ({
myIframe: null,
baseUrl: "https://youtube.com/embed/",
chapterId: "",
chapterName: "",
chapterUrl: "",
thumbnailUrl: "",
description: "",
finish: true
}),
mounted() {
this.getChapterDetail();
},
methods: {
onLoad(frame) {
this.myIframe = frame.contentWindow
Expand All @@ -32,12 +36,13 @@ export default {
await getChapterDetailData(config, this.chapterId)
.then((response) => {
if (response.data.success) {
this.chapterName = response.data.chapterName;
this.chapterId = response.data.chapterId;
this.chapterUrl = response.data.chapterUrl;
this.thumbnailUrl = response.data.thumbnailUrl;
this.description = response.data.description;
this.finish = response.data.finish;
this.chapterName = response.data.chapterDetail.chapterName;
this.chapterId = response.data.chapterDetail.chapterId;
this.chapterUrl = this.baseUrl + response.data.chapterDetail.chapterUrl;
this.thumbnailUrl = response.data.chapterDetail.thumbnailUrl;
this.description = response.data.chapterDetail.description;
this.finish = response.data.chapterDetail.finish;
}
})
.catch(function (error) {
Expand Down
7 changes: 7 additions & 0 deletions Frontend/fe_vue/src/view/user/chapterView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ export default {
curCourseId: "",
chapters: [],
curChapterId: "",
/* chapters
"chapterName" : "자료형",
"chapterId" : 10011,
"chapterUrl" : "http://toa/lec/10011",
"thumbnailUrl":"url",
"description" : "자료형의 종류는 무엇이 있을까용?",
"finish" : true*/
};
},
computed: {
Expand Down

0 comments on commit a675143

Please sign in to comment.