From a675143597d4da3a8f606bac3c1e09716c4f8ab7 Mon Sep 17 00:00:00 2001 From: jun-min1623 Date: Mon, 13 Feb 2023 19:43:25 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20frame=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes Frontend/.DS_Store | Bin 0 -> 6148 bytes Frontend/fe_vue/src/api/index.js | 2 +- Frontend/fe_vue/src/view/admin/adminHome.vue | 2 +- .../fe_vue/src/view/admin/adminUserView.vue | 12 ++++++++++-- Frontend/fe_vue/src/view/user/chapterFrame.vue | 17 +++++++++++------ Frontend/fe_vue/src/view/user/chapterView.vue | 7 +++++++ 7 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 .DS_Store create mode 100644 Frontend/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f1edcbaca8136b9c7f8f4a8c6c6c9188fe46af1a GIT binary patch literal 6148 zcmeHKL2KJE6n;w6#-eJU1=$uuDC*!!|Oz4x6cKmBd*NA>ecS zV|wi`>EG$TCn=*P9lM2Xya!L;)6;tr`Xoyh5vgdLb&1+Uws;HOeJ}!xx55bxNn@p}XX9`G z6rWB;S7~ATze}%*d{lKh_o}hdTwQB;!w=*R!2q`eqOI z{=va)=6jnjUmc$HFN(`jUz?ed!mc**!r>flU@Y+PBOaE8F2A9T^L#p^W3bnwcfeh` zoPQZ}X4N*L9y5!oh%g`w2m?!Dz@2X1`cg)dL4*Ne;9p{Z&xZiY7&@#inxg}Sc>(~N za2tWmKaHFdI1C-u7SRGxHWg@7m3v|+n+|{A;zEbDMVn5_JwB8hS-BUAGNYsaz=V?u zElMd22m?Q(vWsRinQw(?WPGKE?F4|t^~mWP)U|B!m_w(n)Ogs${BtP zSAGe92fp|0P0h-*8$#eGJ%7*7@7eKZ%Z`ai4Xb28)FUDf%Gm0n_>FKo>x#6jrvp^d zM@8w2T%W|bj#r|c<8Neu*RDe!DWwrzP;>owQyf9}eu~KFH)7*iIks#4Js#&-Iqmm< zsMcEhPG{X)_cpxu;U_%{r_r=3htcFM*IsFz$Cq{#zs}OxsJHb@7t<&!(upKwNs5qn zZ?YoMv!Skvq?FvyG7X+oJ}f7QzHDFi&asMTDi2(nWt~iWuETQm?Ao% zGnA)@e~2tC^*#DbCG4WvgL-hShs|p}+?2;NSRNTwCyoKffMehm2JD&WZQK&)njHg< zf&Y&IJ|BE2V_>m1C`Shhc>)02aErj^-yzQNEd~~AgJ^*$lL|Dc%04laNr&IJae>9! zph+iXA0Nt&tn3R#$>`|cmvB;nL038k90N@T)=ag>_y6;o-~Y`dS91(F2L34qRQotQ z9%4%NZe5ui-?cvU1C)j1YJ*oPFytymEMLXjP!afjHh_V}+8{g-_ah)QxWX~;M;Z79 DTL*>P literal 0 HcmV?d00001 diff --git a/Frontend/fe_vue/src/api/index.js b/Frontend/fe_vue/src/api/index.js index bafa7ef..75dc581 100644 --- a/Frontend/fe_vue/src/api/index.js +++ b/Frontend/fe_vue/src/api/index.js @@ -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, diff --git a/Frontend/fe_vue/src/view/admin/adminHome.vue b/Frontend/fe_vue/src/view/admin/adminHome.vue index f14ce82..ecff4e1 100644 --- a/Frontend/fe_vue/src/view/admin/adminHome.vue +++ b/Frontend/fe_vue/src/view/admin/adminHome.vue @@ -14,7 +14,7 @@ {{ user }} - diff --git a/Frontend/fe_vue/src/view/admin/adminUserView.vue b/Frontend/fe_vue/src/view/admin/adminUserView.vue index 7959a73..5900842 100644 --- a/Frontend/fe_vue/src/view/admin/adminUserView.vue +++ b/Frontend/fe_vue/src/view/admin/adminUserView.vue @@ -7,6 +7,7 @@ 이름 Email 로드맵 관리 + 코드 관리 @@ -17,11 +18,18 @@ {{ user.email }} - + + + + + @@ -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); diff --git a/Frontend/fe_vue/src/view/user/chapterFrame.vue b/Frontend/fe_vue/src/view/user/chapterFrame.vue index dee0add..b1b9ce8 100644 --- a/Frontend/fe_vue/src/view/user/chapterFrame.vue +++ b/Frontend/fe_vue/src/view/user/chapterFrame.vue @@ -10,6 +10,7 @@ export default { name: 'ChapterFrame', data: () => ({ myIframe: null, + baseUrl: "https://youtube.com/embed/", chapterId: "", chapterName: "", chapterUrl: "", @@ -17,6 +18,9 @@ export default { description: "", finish: true }), + mounted() { + this.getChapterDetail(); + }, methods: { onLoad(frame) { this.myIframe = frame.contentWindow @@ -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) { diff --git a/Frontend/fe_vue/src/view/user/chapterView.vue b/Frontend/fe_vue/src/view/user/chapterView.vue index 230752f..5cc81d2 100644 --- a/Frontend/fe_vue/src/view/user/chapterView.vue +++ b/Frontend/fe_vue/src/view/user/chapterView.vue @@ -28,6 +28,13 @@ export default { curCourseId: "", chapters: [], curChapterId: "", + /* chapters + "chapterName" : "자료형", + "chapterId" : 10011, + "chapterUrl" : "http://toa/lec/10011", + "thumbnailUrl":"url", + "description" : "자료형의 종류는 무엇이 있을까용?", + "finish" : true*/ }; }, computed: {