2020-1-CloudComputing / D_Team_Khuloud

Go to a project
Toggle navigation Toggle navigation pinning
최동원
88e27b27 1 parent cf94c6a3

코드 정리

Expand all
Inline Side-by-side
Showing 8 changed files with 168 additions and 103 deletions
module.exports = {
root: true,
env: {
node: true,
},
extends: [
'eslint:recommended',
'plugin:vue/essential',
'prettier',
'plugin:prettier/recommended',
],
parserOptions: {
parser: 'babel-eslint',
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'prettier/prettier': [
'error',
{
singleQuote: true,
semi: true,
useTabs: true,
tabWidth: 2,
trailingComma: 'all',
printWidth: 80,
bracketSpacing: true,
arrowParens: 'avoid',
},
],
},
overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)',
],
env: {
jest: true,
},
},
],
};
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
]
}
presets: ['@vue/cli-plugin-babel/preset'],
};
......
......@@ -2147,6 +2147,20 @@
}
}
},
"babel-eslint": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
"integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
"@babel/parser": "^7.7.0",
"@babel/traverse": "^7.7.0",
"@babel/types": "^7.7.0",
"eslint-visitor-keys": "^1.0.0",
"resolve": "^1.12.0"
}
},
"babel-loader": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
......@@ -4422,9 +4436,9 @@
"dev": true
},
"cross-spawn": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
"integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"dev": true,
"requires": {
"path-key": "^3.1.0",
......@@ -4596,14 +4610,14 @@
"dev": true
},
"espree": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/espree/-/espree-7.0.0.tgz",
"integrity": "sha512-/r2XEx5Mw4pgKdyb7GNLQNsu++asx/dltf/CI8RFi9oGHxmQFgvLbc5Op4U6i8Oaj+kdslhJtVlEZeAqH5qOTw==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/espree/-/espree-7.1.0.tgz",
"integrity": "sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw==",
"dev": true,
"requires": {
"acorn": "^7.1.1",
"acorn": "^7.2.0",
"acorn-jsx": "^5.2.0",
"eslint-visitor-keys": "^1.1.0"
"eslint-visitor-keys": "^1.2.0"
},
"dependencies": {
"acorn": {
......@@ -4611,6 +4625,12 @@
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
"integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
"dev": true
},
"eslint-visitor-keys": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz",
"integrity": "sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==",
"dev": true
}
}
},
......@@ -10644,9 +10664,9 @@
"dev": true
},
"v8-compile-cache": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
"integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
"integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
"dev": true
},
"validate-npm-package-license": {
......
......@@ -4,7 +4,8 @@
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build"
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"dependencies": {
"axios": "^0.19.2",
......@@ -19,6 +20,7 @@
"@vue/cli-plugin-router": "~4.3.0",
"@vue/cli-plugin-vuex": "~4.3.0",
"@vue/cli-service": "~4.3.0",
"babel-eslint": "^10.1.0",
"eslint": "^7.1.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.3",
......
import axios from 'axios'
import axios from 'axios';
const instance = axios.create({
baseURL: process.env.VUE_APP_API_URL,
......@@ -18,8 +18,8 @@ function folder(curData) {
return axios.get('/api/folder/show', {
params: {
id: curData.id,
cur: curData.cur
}
cur: curData.cur,
},
});
}
......@@ -35,52 +35,60 @@ function moveFolder(folderData) {
return axios.post('/api/folder/move', folderData);
}
function file(curData){
function file(curData) {
return axios.get('/api/file', {
params: {
id: curData.id,
cur: curData.cur
}
cur: curData.cur,
},
});
}
function uploadFile(fileData){
function uploadFile(fileData) {
return axios.post('/api/file/upload', fileData, {
headers :{
'Content-Type' : 'multipart/form-data'
}
headers: {
'Content-Type': 'multipart/form-data',
},
});
}
function detailFile(fileData){
function detailFile(fileData) {
return axios.get(`/api/file/${fileData.name}`, {
params:{
params: {
id: fileData.id,
cur: fileData.cur
}
})
cur: fileData.cur,
},
});
}
function deleteFile(fileData){
function deleteFile(fileData) {
return axios.get(`/api/file/delete/${fileData.fileName}`, {
params:{
params: {
//현재 접속한 사람의 id와 삭제할 파일의 이름, 현재 폴더위치를 파라미터로 넘긴다.
id: fileData.user_id,
cur: fileData.cur
}
cur: fileData.cur,
},
});
}
function downloadFile(fileData){
function downloadFile(fileData) {
return axios.get(`api/file/download/${fileData.fileName}`, {
params:{
params: {
//현재 접속한 사람의 id와 다운로드를 위해 선택한 파일의 이름을 파라미터로 넘긴다.
id: fileData.id,
cur: fileData.cur
}
cur: fileData.cur,
},
});
}
export { registerUser, loginUser, folder, makeFolder, deleteFolder, moveFolder,
file, uploadFile, deleteFile, downloadFile };
export {
registerUser,
loginUser,
folder,
makeFolder,
deleteFolder,
moveFolder,
file,
uploadFile,
deleteFile,
downloadFile,
};
......
This diff is collapsed. Click to expand it.
......@@ -7,7 +7,7 @@
v-if="isUserLogin"
>
<v-list dense>
<v-list-item router :to="{name: 'Main'}" exact>
<v-list-item router :to="{ name: 'Main' }" exact>
<v-list-item-action>
<v-icon>mdi-home</v-icon>
</v-list-item-action>
......@@ -15,7 +15,7 @@
<v-list-item-title>홈</v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item router :to="{name: 'File'}" exact>
<v-list-item router :to="{ name: 'File' }" exact>
<v-list-item-action>
<v-icon>mdi-file</v-icon>
</v-list-item-action>
......@@ -23,7 +23,7 @@
<v-list-item-title>파일</v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item router :to="{name: 'Fav'}" exact>
<v-list-item router :to="{ name: 'Fav' }" exact>
<v-list-item-action>
<v-icon>mdi-heart</v-icon>
</v-list-item-action>
......@@ -31,7 +31,7 @@
<v-list-item-title>즐겨찾기</v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item router :to="{name: 'Quick'}" exact>
<v-list-item router :to="{ name: 'Quick' }" exact>
<v-list-item-action>
<v-icon>mdi-history</v-icon>
</v-list-item-action>
......@@ -39,7 +39,7 @@
<v-list-item-title>빠른 액세스</v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item router :to="{name: 'Contact'}" exact>
<v-list-item router :to="{ name: 'Contact' }" exact>
<v-list-item-action>
<v-icon>mdi-contacts</v-icon>
</v-list-item-action>
......@@ -47,7 +47,7 @@
<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 router :to="{ name: 'Main' }" exact>
<v-list-item-action>
<v-icon>mdi-settings</v-icon>
</v-list-item-action>
......@@ -63,7 +63,7 @@
<v-list-item-title>휴지통</v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item router :to="{name: 'Feedback'}" exact>
<v-list-item router :to="{ name: 'Feedback' }" exact>
<v-list-item-action>
<v-icon>mdi-message</v-icon>
</v-list-item-action>
......@@ -71,7 +71,7 @@
<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 router :to="{ name: 'Main' }" exact>
<v-list-item-action>
<v-icon>mdi-help-circle</v-icon>
</v-list-item-action>
......@@ -82,19 +82,17 @@
</v-list>
</v-navigation-drawer>
<v-app-bar
:clipped-left="$vuetify.breakpoint.lgAndUp"
app
color="blue darken-3"
dark
>
<v-app-bar-nav-icon @click.stop="drawer = !drawer" v-if="isUserLogin"></v-app-bar-nav-icon>
<v-toolbar-title
style="width: 300px"
class="ml-0 pl-4"
>
<v-app-bar-nav-icon
@click.stop="drawer = !drawer"
v-if="isUserLogin"
></v-app-bar-nav-icon>
<v-toolbar-title style="width: 300px" class="ml-0 pl-4">
<span class="hidden-sm-and-down">KhuLoud</span>
</v-toolbar-title>
<template v-if="isUserLogin">
......@@ -112,23 +110,21 @@
</template>
<v-spacer></v-spacer>
<template v-if="isUserLogin">
<v-btn icon @click = "logoutUser">
<v-btn icon @click="logoutUser">
<v-icon>mdi-login</v-icon>
</v-btn>
</template>
<template v-else>
<v-btn icon @click = "$router.push({name: 'Login'})">
<v-btn icon @click="$router.push({ name: 'Login' })">
<v-icon>mdi-login</v-icon>
</v-btn>
<v-btn icon @click = "$router.push({name: 'RegistUser'})">
<v-btn icon @click="$router.push({ name: 'RegistUser' })">
<v-icon>mdi-account</v-icon>
</v-btn>
</template>
</v-app-bar>
<v-content>
<v-container
>
<v-container>
<router-view></router-view>
</v-container>
</v-content>
......@@ -144,7 +140,7 @@ export default {
{ icon: 'mdi-home', text: '홈' },
{ icon: 'mdi-file', text: '파일' },
{ icon: 'mdi-heart', text: '즐겨찾기' },
{ icon: 'mdi-history', text: '빠른 액세스'},
{ icon: 'mdi-history', text: '빠른 액세스' },
{ icon: 'mdi-contacts', text: '연락처' },
{ icon: 'mdi-settings', text: '설정' },
{ icon: 'mdi-message', text: '피드백' },
......@@ -152,19 +148,17 @@ export default {
],
}),
computed: {
isUserLogin(){
isUserLogin() {
return this.$store.getters.isLogin;
},
},
methods: {
logoutUser(){
logoutUser() {
this.$store.commit('clearid');
this.$router.push('/');
}
}
}
},
},
};
</script>
<style>
</style>
\ No newline at end of file
<style></style>
......
import Vue from 'vue'
import VueRouter from 'vue-router'
import Vue from 'vue';
import VueRouter from 'vue-router';
// import Home from '../views/Home.vue'
// import Login from '../views/Login.vue'
// import Main from '../views/Main.vue'
......@@ -12,65 +12,64 @@ import VueRouter from 'vue-router'
// import RegistUser from '../views/RegistUser'
Vue.use(VueRouter);
export default new VueRouter ({
export default new VueRouter({
mode: 'history',
base: process.env.BASE_URL,
routes : [
routes: [
{
path: '/',
redirect: '/Login'
redirect: '/Login',
},
{
path: '/home',
name: 'Home',
component: () => import('../views/Home.vue')
component: () => import('../views/Home.vue'),
},
{
path: '/main',
name:'Main',
component: () => import('../views/Main.vue')
name: 'Main',
component: () => import('../views/Main.vue'),
},
{
path: '/contact',
name:'Contact',
component: () => import('../views/Contact.vue')
name: 'Contact',
component: () => import('../views/Contact.vue'),
},
{
path: '/registuser',
name: 'RegistUser',
component: () => import('../views/SignupPage.vue')
component: () => import('../views/SignupPage.vue'),
},
{
path: '/login',
name: 'Login',
component: () => import('../views/LoginPage.vue')
component: () => import('../views/LoginPage.vue'),
},
{
path:'/file',
name:'File',
component: () => import('../views/File.vue')
path: '/file',
name: 'File',
component: () => import('../views/File.vue'),
},
{
path:'/fav',
name:'Fav',
component: () => import('../views/FavList.vue')
path: '/fav',
name: 'Fav',
component: () => import('../views/FavList.vue'),
},
{
path:'/quick',
name:'Quick',
component : () => import('../views/QuickList.vue')
path: '/quick',
name: 'Quick',
component: () => import('../views/QuickList.vue'),
},
{
path:'/feedback',
name:'Feedback',
component: () => import('../views/Feedback.vue')
path: '/feedback',
name: 'Feedback',
component: () => import('../views/Feedback.vue'),
},
{
path: '/folder',
name: 'Folder',
component: () => import('../views/FolderPage.vue')
component: () => import('../views/FolderPage.vue'),
},
]
})
],
});
......