박기범

merge

......@@ -10,6 +10,7 @@ var userRouter = require('./routes/userlogin/user');
var loginRouter = require('./routes/userlogin/login');
var registerRouter = require('./routes/userlogin/register');
var fileRouter = require('./routes/file/router');
var contactRouter = require('./routes/contact');
//var trashcanRouter = require('./routes/trashcan/router');
var folderRouter = require('./routes/folders');
var quickRouter = require('./routes/quick');
......@@ -69,7 +70,7 @@ app.use('/api/trashcan', trashcanRouter);
//app.use('/users', usersRouter);
app.use('/api/file', fileRouter);
app.use('/api/quick', quickRouter);
app.use('/api/contact', contactRouter);
// catch 404 and forward to error handler
app.use(function(req, res, next) {
next(createError(404));
......@@ -86,4 +87,4 @@ app.use(function(err, req, res, next) {
res.render('error');
});
module.exports = app;
\ No newline at end of file
module.exports = app;
......
No preview for this file type
No preview for this file type
......@@ -4,7 +4,7 @@ const AWS = require("aws-sdk");
const moment = require("moment");
AWS.config.loadFromPath(__dirname + "/modules/awsconfig.json");
const BUCKET_NAME = "hong-s3-cloud";
const BUCKET_NAME = "qkrrlqja-test";
let curPath = "";
let user_id = "";
let parentPath = "";
......@@ -424,4 +424,4 @@ router.get('/search', function(req, res, next) {
});
module.exports = router;
\ No newline at end of file
module.exports = router;
......
{
"accessKeyId": "",
"secretAccessKey": "",
"sessionToken": "",
"accessKeyId": "ASIAXZL2SWFEVX2QLC2C",
"secretAccessKey": "xLT4QyCqNlgTNQvFP4oW6aVq04kLRkFPw3DO87hW",
"sessionToken": "FwoGZXIvYXdzEMr//////////wEaDJbPF1ZfC7m53f7t+CLDAQrg8xWLOlDP3orR6rIbCbXVHihhuEjZsOzAEsU9w3pMwCrUHvMNFFColA5OMcJC3AhZUCE0MkpsyIA/LJ/f17TJiNIePpnrynfhU+e/q5Mvc8TWDdNemHG9IW8jfXY950DtLXz2RPErVzWDYux2kGcSmvDpWmOP7hueZzsjZONjmbHU3jG3Godhg5HvGuariYm9h/msyipIQ3QPoqdum/3YEanjkKZqyk8bzqqeU3rNVUJTFOi4mX68H0h4tFpNlPIlYiimjYT3BTItwf48W22vdxtEZOnwYyIZJpXQIUmLOlzSzjwWoLkLsXGhJA9aoGJyM1ADziVY",
"region": "ap-northeast-2"
}
\ No newline at end of file
}
......
<template lang="html">
<v-flex>
<h1>빠른액세스</h1>
<v-simple-table>
<template v-slot:default>
<thead>
<tr>
<th class="text-left">File ID</th>
<th class="text-left">Name</th>
<th class="text-left">Dir</th>
<th class="text-left">Date</th>
</tr>
</thead>
<tbody>
<tr v-for="item in recent_list" :key="item.name">
<td>{{ item.file_id }}</td>
<td>{{ item.file_name }}</td>
<td>{{ item.location }}</td>
<td>{{ item.date }}</td>
</tr>
</tbody>
</template>
</v-simple-table>
<v-divider></v-divider>
</v-flex>
<v-flex>
<h1>빠른액세스</h1>
<v-simple-table>
<template v-slot:default>
<thead>
<tr>
<th class="text-left">File ID</th>
<th class="text-left">Name</th>
<th class="text-left">Dir</th>
<th class="text-left">Date</th>
</tr>
</thead>
<tbody>
<tr v-for="item in recent_list" :key="item.name">
<td>{{ item.file_id }}</td>
<td>{{ item.file_name}}</td>
<td>{{ item.location }}</td>
<td>{{ item.date }}</td>
</tr>
</tbody>
</template>
</v-simple-table>
<v-divider></v-divider>
</v-flex>
</template>
<script>
import { accessedList } from '../api/index';
import Axios from 'axios';
export default {
data() {
return {
recent_list: [],
};
},
async created() {
try {
const curData = {
id: this.$store.state.id,
};
console.log(curData);
const list_reponse = await accessedList(curData);
this.$store.commit('setRecentList', list_reponse.data);
this.recent_list = this.$store.getters.recentL;
console.log(this.$store.getters.recentL);
} catch (error) {
console.log('에러');
console.log(error);
}
},
methods: {},
};
import { accessedList } from '../api/index';
import Axios from 'axios';
export default {
data() {
return {
recent_list : []
}
},
async created(){
try {
const curData = {
id : this.$store.state.id,
}
console.log(curData);
const list_reponse = await accessedList(curData);
this.$store.commit('setRecentList', list_reponse.data)
this.recent_list = this.$store.getters.recentL;
console.log(this.$store.getters.recentL);
} catch (error) {
console.log("에러");
console.log(error);
}
},
methods:{
}
}
</script>
<style lang="css" scoped></style>
<style lang="css" scoped>
</style>
......