Hong
......@@ -113,6 +113,22 @@
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
},
"aws-sdk": {
"version": "2.685.0",
"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.685.0.tgz",
"integrity": "sha512-mAOj7b4PuXRxIZkNdSkBWZ28lS2wYUY7O9u33nH9a7BawlttMNbxOgE/wDCPMrTLfj+RLQx0jvoIYj8BKCTRFw==",
"requires": {
"buffer": "4.9.1",
"events": "1.1.1",
"ieee754": "1.1.13",
"jmespath": "0.15.0",
"querystring": "0.2.0",
"sax": "1.2.1",
"url": "0.10.3",
"uuid": "3.3.2",
"xml2js": "0.4.19"
}
},
"aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
......@@ -1101,15 +1117,9 @@
"integrity": "sha512-GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA=="
},
"punycode": {
<<<<<<< HEAD
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
=======
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
>>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
},
"qs": {
"version": "6.5.2",
......@@ -1327,8 +1337,6 @@
"requires": {
"psl": "^1.1.28",
"punycode": "^2.1.1"
<<<<<<< HEAD
=======
},
"dependencies": {
"punycode": {
......@@ -1336,7 +1344,6 @@
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
}
>>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
}
},
"tunnel-agent": {
......@@ -1403,8 +1410,6 @@
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
"requires": {
"punycode": "^2.1.0"
<<<<<<< HEAD
=======
},
"dependencies": {
"punycode": {
......@@ -1421,7 +1426,6 @@
"requires": {
"punycode": "1.3.2",
"querystring": "0.2.0"
>>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
}
},
"util-deprecate": {
......@@ -1435,15 +1439,9 @@
"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
},
"uuid": {
<<<<<<< HEAD
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
=======
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
>>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
},
"vary": {
"version": "1.1.2",
......
......@@ -29,6 +29,9 @@
<v-btn icon>
<v-icon color="grey lighten-1">mdi-information</v-icon>
</v-btn>
<v-btn icon>
<v-icon color="grey lighten-1">mdi-delete</v-icon>
</v-btn>
</v-list-item-action>
</v-list-item>
<v-divider inset></v-divider>
......@@ -48,6 +51,9 @@
<v-btn icon>
<v-icon color="grey lighten-1">mdi-information</v-icon>
</v-btn>
<v-btn icon>
<v-icon color="grey lighten-1">mdi-delted</v-icon>
</v-btn>
</v-list-item-action>
</v-list-item>
</v-list>
......@@ -121,7 +127,6 @@
</v-dialog>
</div>
</template>
<script>
import { folder, makeFolder } from '../api/index';
export default {
......@@ -190,7 +195,6 @@ import { folder, makeFolder } from '../api/index';
console.log(error.response.data);
}
}
}
}
}
</script>
</script>
\ No newline at end of file
......
<template>
<div>
<v-list>
<v-icon>mdi-folder</v-icon>
<v-header>Folders</v-header>
<v-list-item
v-for="item in items"
:key="item.files">
</v-list-item>
</v-list>
</div>
</template>
<script>
export default {
props:{
}
}
</script>
<style>
</style>
\ No newline at end of file
......@@ -67,11 +67,6 @@ export default new VueRouter ({
name:'Feedback',
component: () => import('../views/Feedback.vue')
},
{
path: '/folder',
name: 'Folder',
component: () => import('../views/FolderPage.vue')
}
]
})
......
<template>
<div>
<FolderList></FolderList>
</div>
</template>
<script>
import FolderList from '../components/FolderList'
export default {
components: {
FolderList,
}
}
</script>
<style>
</style>
\ No newline at end of file