From c31e5c0013eb175e2ec82281bc1e742af37902a5 Mon Sep 17 00:00:00 2001
From: Prateeksha Singh <pratu16x7@gmail.com>
Date: Sat, 25 Aug 2018 14:09:01 +0530
Subject: [PATCH] [hub][vue] replace page files, fix item 'seen' prop

---
 erpnext/public/js/hub/components/ItemCard.vue |  4 +-
 .../js/hub/components/ItemCardsContainer.vue  |  1 +
 erpnext/public/js/hub/marketplace.js          | 49 +++++++++++++++++--
 .../PublishPage.vue => pages/Publish.vue}     |  8 +--
 .../SavedProducts.vue}                        |  7 +--
 erpnext/public/js/hub/pages/favourites.js     | 20 --------
 erpnext/public/js/hub/pages/publish.js        | 21 --------
 7 files changed, 54 insertions(+), 56 deletions(-)
 rename erpnext/public/js/hub/{components/PublishPage.vue => pages/Publish.vue} (94%)
 rename erpnext/public/js/hub/{components/SavedProductsPage.vue => pages/SavedProducts.vue} (94%)
 delete mode 100644 erpnext/public/js/hub/pages/favourites.js
 delete mode 100644 erpnext/public/js/hub/pages/publish.js

diff --git a/erpnext/public/js/hub/components/ItemCard.vue b/erpnext/public/js/hub/components/ItemCard.vue
index 6e8b7eadf2..7975868f8e 100644
--- a/erpnext/public/js/hub/components/ItemCard.vue
+++ b/erpnext/public/js/hub/components/ItemCard.vue
@@ -1,5 +1,5 @@
 <template>
-	<div v-if="item.seen" class="col-md-3 col-sm-4 col-xs-6 hub-card-container">
+	<div v-if="seen" class="col-md-3 col-sm-4 col-xs-6 hub-card-container">
 		<div class="hub-card"
 			@click="on_click(item_id)"
 		>
@@ -34,7 +34,7 @@
 
 export default {
 	name: 'item-card',
-	props: ['item', 'item_id_fieldname', 'is_local', 'on_click', 'allow_clear'],
+	props: ['item', 'item_id_fieldname', 'is_local', 'on_click', 'allow_clear', 'seen'],
 	computed: {
 		title() {
 			const item_name = this.item.item_name || this.item.name;
diff --git a/erpnext/public/js/hub/components/ItemCardsContainer.vue b/erpnext/public/js/hub/components/ItemCardsContainer.vue
index d5581753ee..741fc6b02c 100644
--- a/erpnext/public/js/hub/components/ItemCardsContainer.vue
+++ b/erpnext/public/js/hub/components/ItemCardsContainer.vue
@@ -15,6 +15,7 @@
 			:is_local="is_local"
 			:on_click="on_click"
 			:allow_clear="editable"
+			:seen="item.hasOwnProperty('seen') ? item.seen : true"
 			@remove-item="$emit('remove-item', item[item_id_fieldname])"
 		>
 		</item-card>
diff --git a/erpnext/public/js/hub/marketplace.js b/erpnext/public/js/hub/marketplace.js
index 803babbf05..b0e66caabf 100644
--- a/erpnext/public/js/hub/marketplace.js
+++ b/erpnext/public/js/hub/marketplace.js
@@ -1,18 +1,21 @@
+import Vue from 'vue/dist/vue.js';
+
 // pages
 import './pages/home';
-import './pages/favourites';
 import './pages/search';
 import './pages/category';
 import './pages/item';
 import './pages/seller';
 import './pages/register';
 import './pages/profile';
-import './pages/publish';
 import './pages/published_products';
 import './pages/messages';
 import './pages/buying_messages';
 import './pages/not_found';
 
+import SavedProducts from './pages/SavedProducts.vue';
+import Publish from './pages/Publish.vue';
+
 // components
 import { ProfileDialog } from './components/profile_dialog';
 
@@ -197,7 +200,7 @@ erpnext.hub.Marketplace = class Marketplace {
 
 		// registered seller routes
 		if (route[1] === 'saved-products' && !this.subpages['saved-products']) {
-			this.subpages['saved-products'] = new erpnext.hub.SavedProducts(this.$body);
+			this.subpages['saved-products'] = new erpnext.hub.SavedProductsPage(this.$body);
 		}
 
 		if (route[1] === 'profile' && !this.subpages.profile) {
@@ -205,7 +208,7 @@ erpnext.hub.Marketplace = class Marketplace {
 		}
 
 		if (route[1] === 'publish' && !this.subpages.publish) {
-			this.subpages.publish = new erpnext.hub.Publish(this.$body);
+			this.subpages.publish = new erpnext.hub.PublishPage(this.$body);
 		}
 
 		if (route[1] === 'my-products' && !this.subpages['my-products']) {
@@ -263,3 +266,41 @@ erpnext.hub.Marketplace = class Marketplace {
 		});
 	}
 }
+
+
+erpnext.hub.SavedProductsPage = class {
+	constructor(parent) {
+		this.$wrapper = $(`<div id="vue-area-saved">`).appendTo($(parent));
+
+		new Vue({
+			render: h => h(SavedProducts)
+		}).$mount('#vue-area-saved');
+	}
+
+	show() {
+		$('[data-page-name="saved-products"]').show();
+	}
+
+	hide() {
+		$('[data-page-name="saved-products"]').hide();
+	}
+}
+
+erpnext.hub.PublishPage = class {
+	constructor(parent) {
+		this.$wrapper = $(`<div id="vue-area">`).appendTo($(parent));
+
+		new Vue({
+			render: h => h(Publish)
+		}).$mount('#vue-area');
+	}
+
+	show() {
+		$('[data-page-name="publish"]').show();
+	}
+
+	hide() {
+		$('[data-page-name="publish"]').hide();
+	}
+
+}
diff --git a/erpnext/public/js/hub/components/PublishPage.vue b/erpnext/public/js/hub/pages/Publish.vue
similarity index 94%
rename from erpnext/public/js/hub/components/PublishPage.vue
rename to erpnext/public/js/hub/pages/Publish.vue
index 5178553d53..f2b3369d2a 100644
--- a/erpnext/public/js/hub/components/PublishPage.vue
+++ b/erpnext/public/js/hub/pages/Publish.vue
@@ -53,10 +53,10 @@
 </template>
 
 <script>
-import SearchInput from './SearchInput.vue';
-import ItemCardsContainer from './ItemCardsContainer.vue';
-import NotificationMessage from './NotificationMessage.vue';
-import { ItemPublishDialog } from './item_publish_dialog';
+import SearchInput from '../components/SearchInput.vue';
+import ItemCardsContainer from '../components/ItemCardsContainer.vue';
+import NotificationMessage from '../components/NotificationMessage.vue';
+import { ItemPublishDialog } from '../components/item_publish_dialog';
 
 export default {
 	name: 'publish-page',
diff --git a/erpnext/public/js/hub/components/SavedProductsPage.vue b/erpnext/public/js/hub/pages/SavedProducts.vue
similarity index 94%
rename from erpnext/public/js/hub/components/SavedProductsPage.vue
rename to erpnext/public/js/hub/pages/SavedProducts.vue
index d10f550e6c..a80c7ecd10 100644
--- a/erpnext/public/js/hub/components/SavedProductsPage.vue
+++ b/erpnext/public/js/hub/pages/SavedProducts.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import ItemCardsContainer from './ItemCardsContainer.vue';
+import ItemCardsContainer from '../components/ItemCardsContainer.vue';
 
 export default {
 	name: 'saved-products-page',
@@ -50,10 +50,7 @@ export default {
 				'action:item_favourite'
 			)
 			.then((items) => {
-				this.items = items.map(item => {
-					item.seen = true;
-					return item;
-				});
+				this.items = items;
 			})
 		},
 
diff --git a/erpnext/public/js/hub/pages/favourites.js b/erpnext/public/js/hub/pages/favourites.js
deleted file mode 100644
index 547f8154d9..0000000000
--- a/erpnext/public/js/hub/pages/favourites.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import SavedProductsPage from '../components/SavedProductsPage.vue';
-import Vue from 'vue/dist/vue.js';
-
-erpnext.hub.SavedProducts = class {
-	constructor(parent) {
-		this.$wrapper = $(`<div id="vue-area-saved">`).appendTo($(parent));
-
-		new Vue({
-			render: h => h(SavedProductsPage)
-		}).$mount('#vue-area-saved');
-	}
-
-	show() {
-		$('[data-page-name="saved-products"]').show();
-	}
-
-	hide() {
-		$('[data-page-name="saved-products"]').hide();
-	}
-}
diff --git a/erpnext/public/js/hub/pages/publish.js b/erpnext/public/js/hub/pages/publish.js
deleted file mode 100644
index 12172a30ba..0000000000
--- a/erpnext/public/js/hub/pages/publish.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import PublishPage from '../components/PublishPage.vue';
-import Vue from 'vue/dist/vue.js';
-
-erpnext.hub.Publish = class Publish {
-	constructor(parent) {
-		this.$wrapper = $(`<div id="vue-area">`).appendTo($(parent));
-
-		new Vue({
-			render: h => h(PublishPage)
-		}).$mount('#vue-area');
-	}
-
-	show() {
-		$('[data-page-name="publish"]').show();
-	}
-
-	hide() {
-		$('[data-page-name="publish"]').hide();
-	}
-
-}