Showing
5 changed files
with
28 additions
and
23 deletions
1 | { | 1 | { |
2 | +<<<<<<< HEAD | ||
2 | "accessKeyId": "ASIAZQ5XTMMF3ZUR2BUN", | 3 | "accessKeyId": "ASIAZQ5XTMMF3ZUR2BUN", |
3 | "secretAccessKey": "eWtyyVMNd0bRvfEWHr2/8QS9Pz7kx8CfE+s1e9kZ", | 4 | "secretAccessKey": "eWtyyVMNd0bRvfEWHr2/8QS9Pz7kx8CfE+s1e9kZ", |
4 | "sessionToken": "FwoGZXIvYXdzELP//////////wEaDNHd6noZfvBmcxG92CLDAeuqzY82tmA4/ZQ0KRZhj/qwO15RUafkJfnFkRcRVd1BFkLDMkUAM79KYlfEwFyav9yPbz1fPg8nh3QYWcdFRrr02jFSPs2aFuzVYDWhSjY8t7ulft7ug7C4SmARQ7WAvJ8gON8PNFy0SmMyfl+dXomcBrKx8miw+vgsbtbnVIoBal6vaARMi60DDBNR9gOTi/ocWWhQdeoMIKfnnrhywJ+b8REcJdaUC4gYBmowFLa8hlDu9LzZFlocEe22Hs8bEm/0HCjWgv/2BTItyAqTUVvzyHPGtxvoOA5f8fB30ZbU7ISzRcIVpPOGgTTDJXAXE7gZmDSQX2+U", | 5 | "sessionToken": "FwoGZXIvYXdzELP//////////wEaDNHd6noZfvBmcxG92CLDAeuqzY82tmA4/ZQ0KRZhj/qwO15RUafkJfnFkRcRVd1BFkLDMkUAM79KYlfEwFyav9yPbz1fPg8nh3QYWcdFRrr02jFSPs2aFuzVYDWhSjY8t7ulft7ug7C4SmARQ7WAvJ8gON8PNFy0SmMyfl+dXomcBrKx8miw+vgsbtbnVIoBal6vaARMi60DDBNR9gOTi/ocWWhQdeoMIKfnnrhywJ+b8REcJdaUC4gYBmowFLa8hlDu9LzZFlocEe22Hs8bEm/0HCjWgv/2BTItyAqTUVvzyHPGtxvoOA5f8fB30ZbU7ISzRcIVpPOGgTTDJXAXE7gZmDSQX2+U", |
6 | +======= | ||
7 | + "accessKeyId": "ASIAXZL2SWFEZSIHHRDT", | ||
8 | + "secretAccessKey": "cdcXCezNz9OhFowZxE2KSftDmT3xSYAtiLJl1dFk", | ||
9 | + "sessionToken": "FwoGZXIvYXdzEJf//////////wEaDG1NOyJj0/Xdzqu+uyLDAa8vgymCVldXPpET+AOsq5CXhMzhMEDmWogIaq6lWJVy8sdnK9tOXY/u9vz8p6cTm7xWb0YiX6TKDhlfFZX6ynv0Xw/p/qvbn4lPsoT8K9PpdDOWJUMA8qX/5RrKNO4OAolUkw+EMjQbK38u+g3HEVP8mo+DiGLrBGj+0Ar0xhGiU/Lg5qKRdp+tEYIn0ypDNu/2q13apRiMH7n+OVFzilil10g1qq8NLaW98QvVC4xRIgkjAMcRqA9yPdVrhc9yFyqjrCjA+vj2BTIt8CDkFsEAFqJR3W0YPDbsu2YdTq3SKgpOsxNXGsEFMaEhFxodp5/Qsk7tfMsO", | ||
10 | +>>>>>>> 65298bebf7d1e88ec40f530f921db5c35185068f | ||
5 | "region": "us-east-1" | 11 | "region": "us-east-1" |
6 | } | 12 | } | ... | ... |
... | @@ -88,14 +88,7 @@ function accessedList(curData) { | ... | @@ -88,14 +88,7 @@ function accessedList(curData) { |
88 | }); | 88 | }); |
89 | } | 89 | } |
90 | function modifyFile(fileData){ | 90 | function modifyFile(fileData){ |
91 | - return axios.post(`/api/file/modify/${fileName}`, { | 91 | + return axios.post(`/api/file/modify/${fileData.name}`,fileData); |
92 | - params: { | ||
93 | - user_id: fileData.id, | ||
94 | - cur: fileData.cur, | ||
95 | - name: fileData.rename, | ||
96 | - content: fileData.content | ||
97 | - }, | ||
98 | - }); | ||
99 | } | 92 | } |
100 | 93 | ||
101 | 94 | ... | ... |
... | @@ -75,7 +75,7 @@ | ... | @@ -75,7 +75,7 @@ |
75 | </v-dialog> | 75 | </v-dialog> |
76 | <v-divider inset></v-divider> | 76 | <v-divider inset></v-divider> |
77 | <v-subheader inset>Files</v-subheader> | 77 | <v-subheader inset>Files</v-subheader> |
78 | - <v-list-item v-for="item in this.$store.getters.fileL" :key="item.title" @click.stop="dialog_file = true; file_detail(item)"> | 78 | + <v-list-item v-for="item in this.$store.getters.fileL" :key="item.title" @dblclick.stop="dialog_file = true; file_detail(item)"> |
79 | <v-list-item-avatar> | 79 | <v-list-item-avatar> |
80 | <v-icon> mdi-file</v-icon> | 80 | <v-icon> mdi-file</v-icon> |
81 | </v-list-item-avatar> | 81 | </v-list-item-avatar> |
... | @@ -90,9 +90,11 @@ | ... | @@ -90,9 +90,11 @@ |
90 | > | 90 | > |
91 | <v-card> | 91 | <v-card> |
92 | <v-card-title class="headline"> | 92 | <v-card-title class="headline"> |
93 | - <v-text-field v-model="current_filename" v-text="current_filename"></v-text-field> | 93 | + <v-text-field v-model="current_filename" ></v-text-field> |
94 | </v-card-title> | 94 | </v-card-title> |
95 | - <v-card-text v-model="current_filedata" v-text="current_filedata"></v-card-text> | 95 | + <v-card-text> |
96 | + <v-text-field v-model="current_filedata" ></v-text-field> | ||
97 | + </v-card-text> | ||
96 | <v-card-actions> | 98 | <v-card-actions> |
97 | <v-spacer></v-spacer> | 99 | <v-spacer></v-spacer> |
98 | <v-btn | 100 | <v-btn |
... | @@ -233,14 +235,13 @@ export default { | ... | @@ -233,14 +235,13 @@ export default { |
233 | }; | 235 | }; |
234 | console.log(curData); | 236 | console.log(curData); |
235 | const response = await folder(curData); | 237 | const response = await folder(curData); |
236 | - const file_response = await file(curData); | ||
237 | this.$store.commit('setFolder', response.data.folders); | 238 | this.$store.commit('setFolder', response.data.folders); |
238 | this.$store.commit('setCur', response.data.cur); | 239 | this.$store.commit('setCur', response.data.cur); |
239 | this.$store.commit('setParent', response.data.parentPath); | 240 | this.$store.commit('setParent', response.data.parentPath); |
240 | this.folders = this.$store.getters.folderL; | 241 | this.folders = this.$store.getters.folderL; |
242 | + const file_response = await file(curData); | ||
241 | this.$store.commit('setFile', file_response.data.files); | 243 | this.$store.commit('setFile', file_response.data.files); |
242 | this.folders = this.$store.getters.folderL; | 244 | this.folders = this.$store.getters.folderL; |
243 | - console.log(this.$store.getters.fileL); | ||
244 | this.files = this.$store.getters.fileL; | 245 | this.files = this.$store.getters.fileL; |
245 | } catch (error) { | 246 | } catch (error) { |
246 | console.log('에러'); | 247 | console.log('에러'); |
... | @@ -291,6 +292,10 @@ export default { | ... | @@ -291,6 +292,10 @@ export default { |
291 | this.$store.commit('setCur', response.data.cur); | 292 | this.$store.commit('setCur', response.data.cur); |
292 | this.$store.commit('setParent', response.data.parentPath); | 293 | this.$store.commit('setParent', response.data.parentPath); |
293 | this.folders = this.$store.getters.folderL; | 294 | this.folders = this.$store.getters.folderL; |
295 | + const file_response = await file(curData); | ||
296 | + this.$store.commit('setFile', file_response.data.files); | ||
297 | + this.folders = this.$store.getters.folderL; | ||
298 | + this.files = this.$store.getters.fileL; | ||
294 | } catch (error) { | 299 | } catch (error) { |
295 | console.log('에러'); | 300 | console.log('에러'); |
296 | console.log(error.response.data); | 301 | console.log(error.response.data); |
... | @@ -308,6 +313,10 @@ export default { | ... | @@ -308,6 +313,10 @@ export default { |
308 | this.$store.commit('setCur', response.data.cur); | 313 | this.$store.commit('setCur', response.data.cur); |
309 | this.$store.commit('setParent', response.data.parentPath); | 314 | this.$store.commit('setParent', response.data.parentPath); |
310 | this.folders = this.$store.getters.folderL; | 315 | this.folders = this.$store.getters.folderL; |
316 | + const file_response = await file(curData); | ||
317 | + this.$store.commit('setFile', file_response.data.files); | ||
318 | + this.folders = this.$store.getters.folderL; | ||
319 | + this.files = this.$store.getters.fileL; | ||
311 | } catch (error) { | 320 | } catch (error) { |
312 | console.log('에러'); | 321 | console.log('에러'); |
313 | console.log(error.response.data); | 322 | console.log(error.response.data); |
... | @@ -378,8 +387,6 @@ export default { | ... | @@ -378,8 +387,6 @@ export default { |
378 | async delete_file(itemName) { | 387 | async delete_file(itemName) { |
379 | try { | 388 | try { |
380 | var itemlist = this.$store.getters.fileL; | 389 | var itemlist = this.$store.getters.fileL; |
381 | - console.log(itemlist); | ||
382 | - console.log(itemName); | ||
383 | const currentData = { | 390 | const currentData = { |
384 | fileName: null, | 391 | fileName: null, |
385 | user_id: null, | 392 | user_id: null, |
... | @@ -387,7 +394,6 @@ export default { | ... | @@ -387,7 +394,6 @@ export default { |
387 | }; | 394 | }; |
388 | 395 | ||
389 | for (var i = 0; i < itemlist.length; i++) { | 396 | for (var i = 0; i < itemlist.length; i++) { |
390 | - console.log(itemlist[i].file_name); | ||
391 | if (itemlist[i].file_name == itemName) { | 397 | if (itemlist[i].file_name == itemName) { |
392 | currentData.fileName = itemlist[i].file_name; | 398 | currentData.fileName = itemlist[i].file_name; |
393 | currentData.user_id = itemlist[i].user_id; | 399 | currentData.user_id = itemlist[i].user_id; |
... | @@ -397,13 +403,10 @@ export default { | ... | @@ -397,13 +403,10 @@ export default { |
397 | id: currentData.user_id, | 403 | id: currentData.user_id, |
398 | cur: currentData.cur, | 404 | cur: currentData.cur, |
399 | }; | 405 | }; |
400 | - console.log(currentData); | ||
401 | const response = await deleteFile(currentData); | 406 | const response = await deleteFile(currentData); |
402 | setTimeout(function() {}, 500); | 407 | setTimeout(function() {}, 500); |
403 | const filelist = await file(filelistData); | 408 | const filelist = await file(filelistData); |
404 | - console.log(filelist.data.files); | ||
405 | this.$store.commit('setFile', filelist.data.files); | 409 | this.$store.commit('setFile', filelist.data.files); |
406 | - console.log(this.$store.getters.fileL); | ||
407 | this.files = this.$store.getters.fileL; | 410 | this.files = this.$store.getters.fileL; |
408 | } catch (error) { | 411 | } catch (error) { |
409 | console.log('에러'); | 412 | console.log('에러'); |
... | @@ -425,6 +428,7 @@ export default { | ... | @@ -425,6 +428,7 @@ export default { |
425 | } | 428 | } |
426 | }, | 429 | }, |
427 | async file_detail(fileData){ | 430 | async file_detail(fileData){ |
431 | + console.log(fileData); | ||
428 | try{ | 432 | try{ |
429 | const currentData = { | 433 | const currentData = { |
430 | id: fileData.user_id, | 434 | id: fileData.user_id, |
... | @@ -432,9 +436,10 @@ export default { | ... | @@ -432,9 +436,10 @@ export default { |
432 | fileName: fileData.file_name | 436 | fileName: fileData.file_name |
433 | } | 437 | } |
434 | const detailData = await detailFile(currentData) | 438 | const detailData = await detailFile(currentData) |
435 | - console.log(detailData) | 439 | + this.current_filename = detailData.data.file_name; |
436 | - this.current_filename = detailData.file_name; | 440 | + this.current_filedata = detailData.data.content; |
437 | - this.current_filedata = detailFile.content; | 441 | + console.log(this.current_filename); |
442 | + console.log(this.current_filedata); | ||
438 | }catch(error){ | 443 | }catch(error){ |
439 | console.log('에러'); | 444 | console.log('에러'); |
440 | console.log(error); | 445 | console.log(error); | ... | ... |
... | @@ -5,7 +5,9 @@ | ... | @@ -5,7 +5,9 @@ |
5 | <template v-slot:default> | 5 | <template v-slot:default> |
6 | <thead> | 6 | <thead> |
7 | <tr> | 7 | <tr> |
8 | + <th class="text-left">File ID</th> | ||
8 | <th class="text-left">Name</th> | 9 | <th class="text-left">Name</th> |
10 | + <th class="text-left">Dir</th> | ||
9 | <th class="text-left">Date</th> | 11 | <th class="text-left">Date</th> |
10 | </tr> | 12 | </tr> |
11 | </thead> | 13 | </thead> | ... | ... |
... | @@ -24,7 +24,6 @@ | ... | @@ -24,7 +24,6 @@ |
24 | <v-layout column> | 24 | <v-layout column> |
25 | <v-flex> | 25 | <v-flex> |
26 | <v-toolbar flat> | 26 | <v-toolbar flat> |
27 | - <v-toolbar-title>빠른 액세스</v-toolbar-title> | ||
28 | <v-spacer></v-spacer> | 27 | <v-spacer></v-spacer> |
29 | </v-toolbar> | 28 | </v-toolbar> |
30 | <v-container> | 29 | <v-container> | ... | ... |
-
Please register or login to post a comment