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

@@ -12,6 +12,7 @@ function registerUser(userData) {
 function loginUser(userData) {
 function loginUser(userData) {
     // const url = 'http://localhost:3000/api/login'
     // const url = 'http://localhost:3000/api/login'
     return axios.post('/api/login', userData);
     return axios.post('/api/login', userData);
+<<<<<<< HEAD
 }
 }
 
 
 function folder(curData) {
 function folder(curData) {
@@ -27,4 +28,17 @@ function makeFolder(folderData) {
     return axios.post('/api/folder/makefolder', folderData);
     return axios.post('/api/folder/makefolder', folderData);
 }
 }
 
 
-export { registerUser, loginUser, folder, makeFolder };
\ No newline at end of file
+export { registerUser, loginUser, folder, makeFolder };
+=======
+  }
+  
+function dropbox(userData){
+  return axios.get(`/api/folder/show/${userData}`);
+}
+
+function makeFolder(folderData){
+  return axios.post('/api/folder/makefolder', folderData);
+}
+
+  export { registerUser, loginUser, dropbox, makeFolder };
+>>>>>>> eacf2da71fd7ae8340b48d4dac8ee121a816fd94

@@ -79,7 +79,11 @@
          +{{ files.length - 2 }} File(s)
          +{{ files.length - 2 }} File(s)
        </span>
        </span>
      </template>
      </template>
+<<<<<<< HEAD
    </v-file-input>
    </v-file-input>
+=======
+    </v-file-input>
+>>>>>>> eacf2da71fd7ae8340b48d4dac8ee121a816fd94
       <v-btn
       <v-btn
         bottom
         bottom
         color="blue"
         color="blue"
@@ -102,7 +106,11 @@
         <v-container>
         <v-container>
           <div>
           <div>
             <v-icon>mdi-folder</v-icon>
             <v-icon>mdi-folder</v-icon>
+<<<<<<< HEAD
             <v-text-field placeholder="name" id="foldername" type="text" v-model="foldername"></v-text-field>
             <v-text-field placeholder="name" id="foldername" type="text" v-model="foldername"></v-text-field>
+=======
+            <v-text-field placeholder="name" id="foldername" type="text" v-model="foldername" ></v-text-field>
+>>>>>>> eacf2da71fd7ae8340b48d4dac8ee121a816fd94
           </div>
           </div>
         </v-container>
         </v-container>
         <v-card-actions>
         <v-card-actions>
@@ -123,6 +131,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
+<<<<<<< HEAD
 import { folder, makeFolder } from '../api/index';
 import { folder, makeFolder } from '../api/index';
   export default {
   export default {
     data() {
     data() {
@@ -131,11 +140,25 @@ import { folder, makeFolder } from '../api/index';
         folders: [],
         folders: [],
         files: [],
         files: [],
         search:'',
         search:'',
+        id: '',
         dialog:false
         dialog:false
+=======
+import { dropbox, makeFolder } from '../api/index';
+  export default {
+    data() {
+      return {
+        foldername: '',
+        folders: [],
+        files: [],
+        search:'',
+        id: '',
+        dialog: false,
+>>>>>>> eacf2da71fd7ae8340b48d4dac8ee121a816fd94
       }
       }
     },
     },
     async created(){
     async created(){
         try {
         try {
+<<<<<<< HEAD
           const curData = {
           const curData = {
             id : this.$store.state.id,
             id : this.$store.state.id,
             cur: this.$store.state.cur
             cur: this.$store.state.cur
@@ -143,11 +166,21 @@ import { folder, makeFolder } from '../api/index';
           const response = await folder(curData);
           const response = await folder(curData);
           console.log(response);
           console.log(response);
           this.$store.commit('setFolder', response.data.folders);
           this.$store.commit('setFolder', response.data.folders);
+=======
+          const userData = this.$store.state.id;
+          console.log(this.id);
+          
+          const response = await dropbox(userData);
+          console.log(response);
+          this.$store.commit('setFolder', response.data.folders);
+          this.$store.commit('setFile', response.data.files);
+>>>>>>> eacf2da71fd7ae8340b48d4dac8ee121a816fd94
         } catch (error) {
         } catch (error) {
           console.log("에러");
           console.log("에러");
           console.log(error.response.data);
           console.log(error.response.data);
         }
         }
       },
       },
+<<<<<<< HEAD
        methods: {
        methods: {
          initFolderName(){
          initFolderName(){
            this.foldername = '';
            this.foldername = '';
@@ -173,5 +206,30 @@ import { folder, makeFolder } from '../api/index';
          }
          }
 
 
   }
   }
+=======
+      methods: {
+        initFolderName(){
+          this.foldername = '';
+        },
+        async makeF(){
+          try {
+            const folderData = {
+              user_id : this.$store.state.id,
+              cur : this.$store.state.id,
+              folder_name : this.foldername
+            };
+            const response = await makeFolder(folderData);
+            this.$store.commit('setFolder', response.data.folders);
+            console.log("폴더 생성 완료");
+          } catch (error) {
+            console.log("에러");
+            console.log(error.response.data);
+          } finally{
+            this.initFolderName();
+            this.dialog = false;
+          }
+        }
+      }
+>>>>>>> eacf2da71fd7ae8340b48d4dac8ee121a816fd94
   }
   }
 </script>
 </script>

@@ -4,11 +4,23 @@ import Vuex from 'vuex'
 Vue.use(Vuex)
 Vue.use(Vuex)
 
 
 export default new Vuex.Store({
 export default new Vuex.Store({
+<<<<<<< HEAD
     state: {
     state: {
         id: '',
         id: '',
         folders: {},
         folders: {},
         files: {},
         files: {},
         cur: '/',
         cur: '/',
+=======
+  state: {
+    id: '',
+    folders: [],
+    files: [],
+    cur:'/',
+  },
+  mutations: {
+    setId(state, userid){
+      state.id = userid;
+>>>>>>> eacf2da71fd7ae8340b48d4dac8ee121a816fd94
     },
     },
     mutations: {
     mutations: {
         setId(state, userid) {
         setId(state, userid) {
@@ -27,6 +39,7 @@ export default new Vuex.Store({
             state.cur = cur;
             state.cur = cur;
         }
         }
     },
     },
+<<<<<<< HEAD
     getters: {
     getters: {
         isLogin(state) {
         isLogin(state) {
             return state.id !== '';
             return state.id !== '';
@@ -43,5 +56,26 @@ export default new Vuex.Store({
         cur(state) {
         cur(state) {
             return state.cur;
             return state.cur;
         }
         }
+=======
+    setFolder(state, folderlist){
+      state.folders  = folderlist;
+    },
+    setFile(state, filelist){
+      state.files = filelist;
+    },
+  },
+  getters: {
+    isLogin(state){
+      return state.id !== '';
+    },
+    userID(state){
+      return state.id;
+    },
+    folderL(state){
+      return state.folders;
+    },
+    fileL(state){
+      return state.files;
+>>>>>>> eacf2da71fd7ae8340b48d4dac8ee121a816fd94
     }
     }
 })
 })
\ No newline at end of file