2020-1-CloudComputing / D_Team_Khuloud

Go to a project
Toggle navigation Toggle navigation pinning
박기범
b71b7251 1 parent 09abdb32

finalize_1

Inline Side-by-side
Showing 9 changed files with 52 additions and 111 deletions
......@@ -4,7 +4,7 @@ const AWS = require("aws-sdk");
const moment = require("moment");
AWS.config.loadFromPath(__dirname + "/modules/awsconfig.json");
const BUCKET_NAME = "qkrrlqja-test";
const BUCKET_NAME = "khuloud";
let curPath = "";
let user_id = "";
let parentPath = "";
......
{
"accessKeyId": "ASIAXZL2SWFEVX2QLC2C",
"secretAccessKey": "xLT4QyCqNlgTNQvFP4oW6aVq04kLRkFPw3DO87hW",
"sessionToken": "FwoGZXIvYXdzEMr//////////wEaDJbPF1ZfC7m53f7t+CLDAQrg8xWLOlDP3orR6rIbCbXVHihhuEjZsOzAEsU9w3pMwCrUHvMNFFColA5OMcJC3AhZUCE0MkpsyIA/LJ/f17TJiNIePpnrynfhU+e/q5Mvc8TWDdNemHG9IW8jfXY950DtLXz2RPErVzWDYux2kGcSmvDpWmOP7hueZzsjZONjmbHU3jG3Godhg5HvGuariYm9h/msyipIQ3QPoqdum/3YEanjkKZqyk8bzqqeU3rNVUJTFOi4mX68H0h4tFpNlPIlYiimjYT3BTItwf48W22vdxtEZOnwYyIZJpXQIUmLOlzSzjwWoLkLsXGhJA9aoGJyM1ADziVY",
"accessKeyId": "",
"secretAccessKey": "",
"sessionToken": "",
"region": "ap-northeast-2"
}
......
......@@ -6,7 +6,7 @@ AWS.config.loadFromPath(__dirname + "/../modules/awsconfig.json");
var cryptoM = require('./../../routes/modules/cryptoM.js');
const moment = require("moment");
const BUCKET_NAME = "hong-s3-cloud";
const BUCKET_NAME = "khuloud";
const s3 = new AWS.S3();
var router = express.Router();
......
......@@ -384,6 +384,7 @@ export default {
},
computed: {
calData() {
console.log(this.$store.getters.folderL);
return this.folders
.filter(data => {
return data.folder_name
......@@ -675,6 +676,7 @@ export default {
cur: this.cfilename.location,
fileName: this.cfilename.file_name,
};
console.log(curentData.cur);
const detailData = await detailFile(currentData);
this.current_filename = detailData.data.file_name;
this.current_filedata = detailData.data.content;
......
......@@ -63,14 +63,6 @@
<v-list-item-title>피드백</v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item router :to="{ name: 'Main' }" exact>
<v-list-item-action>
<v-icon>mdi-help-circle</v-icon>
</v-list-item-action>
<v-list-item-content>
<v-list-item-title>도움말</v-list-item-title>
</v-list-item-content>
</v-list-item>
</v-list>
</v-navigation-drawer>
......@@ -88,14 +80,6 @@
<span class="hidden-sm-and-down">KhuLoud</span>
</v-toolbar-title>
<template v-if="isUserLogin">
<v-text-field
flat
solo-inverted
hide-details
prepend-inner-icon="mdi-magnify"
label="전체 검색"
class="hidden-sm-and-down"
></v-text-field>
</template>
<template v-else>
<div></div>
......@@ -140,8 +124,10 @@ export default {
],
}),
computed: {
isUserLogin() {
return this.$store.getters.isLogin;
console.log(thks.$store.getters.folderL)
},
},
methods: {
......
<template lang="html">
<v-flex>
<h1>빠른액세스</h1>
<v-toolbar flat>
<v-toolbar-title>빠른 액세스</v-toolbar-title>
</v-toolbar>
<v-simple-table>
<template v-slot:default>
<thead>
......@@ -12,7 +14,7 @@
</tr>
</thead>
<tbody>
<tr v-for="item in recent_list" :key="item.name">
<tr v-for="item in recent_list" :key="item.name" @dblclick.stop = "dialog = true;download_file(item.file_name, item.location); ">
<td>{{ item.file_id }}</td>
<td>{{ item.file_name }}</td>
<td>{{ item.location }}</td>
......@@ -22,16 +24,28 @@
</template>
</v-simple-table>
<v-divider></v-divider>
<v-dialog
v-model="dialog"
max-width="290"
>
<v-card>
<v-card-title class="headline">알림</v-card-title>
<v-card-text>
다운로드에 성공했습니다!
</v-card-text>
</v-card>
</v-dialog>
</v-flex>
</template>
<script>
import { accessedList } from '../api/index';
import { accessedList, downloadFile } from '../api/index';
import Axios from 'axios';
export default {
data() {
return {
recent_list: [],
dialog :false,
};
},
async created() {
......@@ -49,7 +63,22 @@ export default {
console.log(error);
}
},
methods: {},
methods: {
async download_file(name, dir) {
try {
const currentData = {
fileName: name,
id: this.$store.state.id,
cur: dir
};
const result = await downloadFile(currentData);
console.log(result);
} catch (error) {
console.log('에러');
console.log(error);
}
},
},
};
</script>
......
......@@ -672,6 +672,7 @@ export default {
cur: this.cfilename.location,
fileName: this.cfilename.file_name,
};
console.log(currentData.cur);
const detailData = await detailFile(currentData);
this.current_filename = detailData.data.file_name;
this.current_filedata = detailData.data.content;
......
<template lang="html">
<v-flex>
<h1>연락처</h1>
<v-toolbar flat>
<v-toolbar-title>연락처</v-toolbar-title>
</v-toolbar>
<v-text-field
v-model="search"
append-icon="mdi-magnify"
......
<template>
<div>
<v-toolbar flat>
<v-toolbar-title>빠른액세스</v-toolbar-title>
<v-spacer></v-spacer>
<v-text-field
v-model="search"
append-icon="mdi-magnify"
label="검색"
single-line
hide-details
></v-text-field>
</v-toolbar>
<v-list two-line subheader>
<v-list-item v-for="item in items" :key="item.title" @click="">
<v-list-item-avatar>
<v-icon>{{ item.iconClass }}</v-icon>
</v-list-item-avatar>
<v-list-item-content>
<v-list-item-title v-text="item.title"></v-list-item-title>
<v-list-item-subtitle v-text="item.subtitle"></v-list-item-subtitle>
</v-list-item-content>
<v-list-item-action>
<v-btn icon>
<v-icon color="grey lighten-1">mdi-information</v-icon>
</v-btn>
</v-list-item-action>
</v-list-item>
<v-list-item v-for="item in items2" :key="item.title" @click="">
<v-list-item-avatar>
<v-icon> {{ item.iconClass }}</v-icon>
</v-list-item-avatar>
<v-list-item-content>
<v-list-item-title v-text="item.title"></v-list-item-title>
<v-list-item-subtitle v-text="item.subtitle"></v-list-item-subtitle>
</v-list-item-content>
<v-list-item-action>
<v-btn icon>
<v-icon color="grey lighten-1">mdi-information</v-icon>
</v-btn>
</v-list-item-action>
</v-list-item>
</v-list>
</div>
<accesslist></accesslist>
</template>
<script>
import accesslist from '@/components/accessList'
export default {
data: () => ({
items: [
{
icon: 'folder',
iconClass: 'mdi-folder',
title: 'Photos',
subtitle: 'Jan 9, 2014',
},
{
icon: 'folder',
iconClass: 'mdi-folder',
title: 'Recipes',
subtitle: 'Jan 17, 2014',
},
{
icon: 'folder',
iconClass: 'mdi-folder',
title: 'Work',
subtitle: 'Jan 28, 2014',
components: {
accesslist,
},
],
items2: [
{
icon: 'assignment',
iconClass: 'mdi-file',
title: 'Vacation itinerary',
subtitle: 'Jan 20, 2014',
},
{
icon: 'call_to_action',
iconClass: 'mdi-PdfBox',
title: 'Kitchen remodel',
subtitle: 'Jan 10, 2014',
},
],
}),
};
</script>
<style></style>
......