2020-1-CloudComputing / D_Team_Khuloud

Go to a project
Toggle navigation Toggle navigation pinning
Hong
ec5658f9 2 parents 8d0ff2d8 d5abee49

Merge branch 'master' of http://khuhub.khu.ac.kr/2020-1-CloudComputing/D_Team_Khuloud

Inline Side-by-side
Showing 5 changed files with 24 additions and 71 deletions
...@@ -113,6 +113,22 @@ ...@@ -113,6 +113,22 @@
113 "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", 113 "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
114 "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" 114 "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
115 }, 115 },
116 + "aws-sdk": {
117 + "version": "2.685.0",
118 + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.685.0.tgz",
119 + "integrity": "sha512-mAOj7b4PuXRxIZkNdSkBWZ28lS2wYUY7O9u33nH9a7BawlttMNbxOgE/wDCPMrTLfj+RLQx0jvoIYj8BKCTRFw==",
120 + "requires": {
121 + "buffer": "4.9.1",
122 + "events": "1.1.1",
123 + "ieee754": "1.1.13",
124 + "jmespath": "0.15.0",
125 + "querystring": "0.2.0",
126 + "sax": "1.2.1",
127 + "url": "0.10.3",
128 + "uuid": "3.3.2",
129 + "xml2js": "0.4.19"
130 + }
131 + },
116 "aws-sign2": { 132 "aws-sign2": {
117 "version": "0.7.0", 133 "version": "0.7.0",
118 "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", 134 "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
...@@ -1101,15 +1117,9 @@ ...@@ -1101,15 +1117,9 @@
1101 "integrity": "sha512-GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA==" 1117 "integrity": "sha512-GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA=="
1102 }, 1118 },
1103 "punycode": { 1119 "punycode": {
1104 -<<<<<<< HEAD
1105 - "version": "2.1.1",
1106 - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
1107 - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
1108 -=======
1109 "version": "1.3.2", 1120 "version": "1.3.2",
1110 "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", 1121 "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
1111 "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" 1122 "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
1112 ->>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
1113 }, 1123 },
1114 "qs": { 1124 "qs": {
1115 "version": "6.5.2", 1125 "version": "6.5.2",
...@@ -1327,8 +1337,6 @@ ...@@ -1327,8 +1337,6 @@
1327 "requires": { 1337 "requires": {
1328 "psl": "^1.1.28", 1338 "psl": "^1.1.28",
1329 "punycode": "^2.1.1" 1339 "punycode": "^2.1.1"
1330 -<<<<<<< HEAD
1331 -=======
1332 }, 1340 },
1333 "dependencies": { 1341 "dependencies": {
1334 "punycode": { 1342 "punycode": {
...@@ -1336,7 +1344,6 @@ ...@@ -1336,7 +1344,6 @@
1336 "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", 1344 "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
1337 "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" 1345 "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
1338 } 1346 }
1339 ->>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
1340 } 1347 }
1341 }, 1348 },
1342 "tunnel-agent": { 1349 "tunnel-agent": {
...@@ -1403,8 +1410,6 @@ ...@@ -1403,8 +1410,6 @@
1403 "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", 1410 "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
1404 "requires": { 1411 "requires": {
1405 "punycode": "^2.1.0" 1412 "punycode": "^2.1.0"
1406 -<<<<<<< HEAD
1407 -=======
1408 }, 1413 },
1409 "dependencies": { 1414 "dependencies": {
1410 "punycode": { 1415 "punycode": {
...@@ -1421,7 +1426,6 @@ ...@@ -1421,7 +1426,6 @@
1421 "requires": { 1426 "requires": {
1422 "punycode": "1.3.2", 1427 "punycode": "1.3.2",
1423 "querystring": "0.2.0" 1428 "querystring": "0.2.0"
1424 ->>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
1425 } 1429 }
1426 }, 1430 },
1427 "util-deprecate": { 1431 "util-deprecate": {
...@@ -1435,15 +1439,9 @@ ...@@ -1435,15 +1439,9 @@
1435 "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" 1439 "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
1436 }, 1440 },
1437 "uuid": { 1441 "uuid": {
1438 -<<<<<<< HEAD
1439 - "version": "3.4.0",
1440 - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
1441 - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
1442 -=======
1443 "version": "3.3.2", 1442 "version": "3.3.2",
1444 "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", 1443 "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
1445 "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" 1444 "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
1446 ->>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
1447 }, 1445 },
1448 "vary": { 1446 "vary": {
1449 "version": "1.1.2", 1447 "version": "1.1.2",
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
29 <v-btn icon> 29 <v-btn icon>
30 <v-icon color="grey lighten-1">mdi-information</v-icon> 30 <v-icon color="grey lighten-1">mdi-information</v-icon>
31 </v-btn> 31 </v-btn>
32 + <v-btn icon>
33 + <v-icon color="grey lighten-1">mdi-delete</v-icon>
34 + </v-btn>
32 </v-list-item-action> 35 </v-list-item-action>
33 </v-list-item> 36 </v-list-item>
34 <v-divider inset></v-divider> 37 <v-divider inset></v-divider>
...@@ -48,6 +51,9 @@ ...@@ -48,6 +51,9 @@
48 <v-btn icon> 51 <v-btn icon>
49 <v-icon color="grey lighten-1">mdi-information</v-icon> 52 <v-icon color="grey lighten-1">mdi-information</v-icon>
50 </v-btn> 53 </v-btn>
54 + <v-btn icon>
55 + <v-icon color="grey lighten-1">mdi-delted</v-icon>
56 + </v-btn>
51 </v-list-item-action> 57 </v-list-item-action>
52 </v-list-item> 58 </v-list-item>
53 </v-list> 59 </v-list>
...@@ -121,7 +127,6 @@ ...@@ -121,7 +127,6 @@
121 </v-dialog> 127 </v-dialog>
122 </div> 128 </div>
123 </template> 129 </template>
124 -
125 <script> 130 <script>
126 import { folder, makeFolder } from '../api/index'; 131 import { folder, makeFolder } from '../api/index';
127 export default { 132 export default {
...@@ -190,7 +195,6 @@ import { folder, makeFolder } from '../api/index'; ...@@ -190,7 +195,6 @@ import { folder, makeFolder } from '../api/index';
190 console.log(error.response.data); 195 console.log(error.response.data);
191 } 196 }
192 } 197 }
193 - 198 + }
194 - }
195 } 199 }
196 -</script> 200 +</script>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<template>
2 - <div>
3 - <v-list>
4 - <v-icon>mdi-folder</v-icon>
5 - <v-header>Folders</v-header>
6 - <v-list-item
7 - v-for="item in items"
8 - :key="item.files">
9 -
10 - </v-list-item>
11 - </v-list>
12 - </div>
13 -</template>
14 -
15 -<script>
16 -export default {
17 - props:{
18 -
19 - }
20 -}
21 -</script>
22 -
23 -<style>
24 -
25 -</style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -67,11 +67,6 @@ export default new VueRouter ({ ...@@ -67,11 +67,6 @@ export default new VueRouter ({
67 name:'Feedback', 67 name:'Feedback',
68 component: () => import('../views/Feedback.vue') 68 component: () => import('../views/Feedback.vue')
69 }, 69 },
70 - {
71 - path: '/folder',
72 - name: 'Folder',
73 - component: () => import('../views/FolderPage.vue')
74 - }
75 70
76 ] 71 ]
77 }) 72 })
......
1 -<template>
2 - <div>
3 - <FolderList></FolderList>
4 - </div>
5 -</template>
6 -
7 -<script>
8 -import FolderList from '../components/FolderList'
9 -
10 -export default {
11 - components: {
12 - FolderList,
13 - }
14 -}
15 -</script>
16 -
17 -<style>
18 -
19 -</style>
...\ No newline at end of file ...\ No newline at end of file