Merge branch 'share,favorite' of http://khuhub.khu.ac.kr/2020-1-CloudComputing/D…

…_Team_Khuloud into share,favorite

@@ -18,7 +18,7 @@ function folder(curData) {
 	return axios.get('/api/folder/show', {
 	return axios.get('/api/folder/show', {
 		params: {
 		params: {
 			id: curData.id,
 			id: curData.id,
-			cur: curData.cur,
+			folder_id: curData.folder_id,
 		},
 		},
 	});
 	});
 }
 }
@@ -39,7 +39,7 @@ function file(curData) {
 	return axios.get('/api/file', {
 	return axios.get('/api/file', {
 		params: {
 		params: {
 			id: curData.id,
 			id: curData.id,
-			cur: curData.cur,
+			folder_id: curData.cur,
 		},
 		},
 	});
 	});
 }
 }
@@ -109,6 +109,14 @@ function addFavoriteFile(fileData) {
 	return axios.post('api/favorites/addfile', fileData);
 	return axios.post('api/favorites/addfile', fileData);
 }
 }
 
 
+function getFavoriteList(userId) {
+	return axios.get('api/favorites/show', {
+		params: {
+			id: userId,
+		},
+	});
+}
+
 export {
 export {
 	registerUser,
 	registerUser,
 	loginUser,
 	loginUser,
@@ -128,4 +136,5 @@ export {
 	accessedList,
 	accessedList,
 	detailFile,
 	detailFile,
 	modifyFile,
 	modifyFile,
+	getFavoriteList,
 };
 };

@@ -19,11 +19,17 @@
 			>
 			>
 			<v-list-item
 			<v-list-item
 				v-for="item in this.$store.getters.folderL"
 				v-for="item in this.$store.getters.folderL"
-				:key="item.title"
+				:key="item.folder_id"
 				:search="search"
 				:search="search"
 				@click.right="show(item, $event)"
 				@click.right="show(item, $event)"
 				@click=""
 				@click=""
-				@dblclick="moveF(item.folder_name)"
+				@dblclick="
+					$router.push({
+						name: 'Folder',
+						params: { id: item.folder_id },
+						props: { folderId: item.id },
+					})
+				"
 			>
 			>
 				<v-list-item-avatar>
 				<v-list-item-avatar>
 					<v-icon>mdi-folder</v-icon>
 					<v-icon>mdi-folder</v-icon>
@@ -341,7 +347,7 @@ export default {
 		try {
 		try {
 			const curData = {
 			const curData = {
 				id: this.$store.state.id,
 				id: this.$store.state.id,
-				cur: '/',
+				folder_id: -1,
 			};
 			};
 			console.log(curData);
 			console.log(curData);
 			const response = await folder(curData);
 			const response = await folder(curData);

@@ -67,9 +67,10 @@ export default new VueRouter({
 			component: () => import('../views/Feedback.vue'),
 			component: () => import('../views/Feedback.vue'),
 		},
 		},
 		{
 		{
-			path: '/folder',
+			path: '/file/:id',
 			name: 'Folder',
 			name: 'Folder',
 			component: () => import('../views/FolderPage.vue'),
 			component: () => import('../views/FolderPage.vue'),
+			props: true,
 		},
 		},
 	],
 	],
 });
 });

@@ -11,6 +11,8 @@ export default new Vuex.Store({
 		cur: '/',
 		cur: '/',
 		parent: '/',
 		parent: '/',
 		recentList: [],
 		recentList: [],
+		favFolderList: [],
+		favFileList: [],
 	},
 	},
 	mutations: {
 	mutations: {
 		setId(state, userid) {
 		setId(state, userid) {
@@ -34,6 +36,12 @@ export default new Vuex.Store({
 		setRecentList(state, list) {
 		setRecentList(state, list) {
 			state.recentList = list;
 			state.recentList = list;
 		},
 		},
+		setfavFolderList(state, fflist) {
+			state.favFolderList = fflist;
+		},
+		setfavFileList(state, fflist) {
+			state.favFileList = fflist;
+		},
 	},
 	},
 	getters: {
 	getters: {
 		isLogin(state) {
 		isLogin(state) {
@@ -60,5 +68,11 @@ export default new Vuex.Store({
 		setFile(state, filelist) {
 		setFile(state, filelist) {
 			state.files = filelist;
 			state.files = filelist;
 		},
 		},
+		favFolderL(state) {
+			return state.favFolderList;
+		},
+		favFileL(state) {
+			return state.favFileList;
+		},
 	},
 	},
 });
 });

 <template>
 <template>
 	<div>
 	<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>
+		<Fav_list></Fav_list>
 	</div>
 	</div>
 </template>
 </template>
 
 
 <script>
 <script>
+import Fav_list from '../components/Fav_list';
 export default {
 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: {
+		Fav_list,
 	},
 	},
-		],
-		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>
 </script>
+
+<style></style>

+<template>
+	<div>
+		<folderc></folderc>
+	</div>
+</template>
+
+<script>
+import folderc from '../components/folderc';
+export default {
+	components: {
+		folderc,
+	},
+};
+</script>
+
+<style></style>