From f089dad7c726aba70098e8f9e3908c0167cb51e2 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 26 Aug 2018 22:20:16 +0530 Subject: [PATCH] feat: Sidebar in vue --- erpnext/public/js/hub/PageContainer.vue | 5 ++ erpnext/public/js/hub/Sidebar.vue | 102 ++++++++++++++++++++++++ erpnext/public/js/hub/marketplace.js | 92 ++------------------- erpnext/public/js/hub/vue-plugins.js | 2 + erpnext/public/less/hub.less | 2 + 5 files changed, 116 insertions(+), 87 deletions(-) create mode 100644 erpnext/public/js/hub/Sidebar.vue diff --git a/erpnext/public/js/hub/PageContainer.vue b/erpnext/public/js/hub/PageContainer.vue index ca4c63a28a..ae9d4601e5 100644 --- a/erpnext/public/js/hub/PageContainer.vue +++ b/erpnext/public/js/hub/PageContainer.vue @@ -12,6 +12,7 @@ import Search from './pages/Search.vue'; import PublishedProducts from './pages/PublishedProducts.vue'; import Buying from './pages/Buying.vue'; import BuyingMessages from './pages/BuyingMessages.vue'; +import NotFound from './pages/NotFound.vue'; const route_map = { 'marketplace/home': Home, @@ -74,6 +75,10 @@ export default { } } + if (!route) { + return NotFound; + } + return route_map[route]; } } diff --git a/erpnext/public/js/hub/Sidebar.vue b/erpnext/public/js/hub/Sidebar.vue new file mode 100644 index 0000000000..208d8fe34c --- /dev/null +++ b/erpnext/public/js/hub/Sidebar.vue @@ -0,0 +1,102 @@ + + diff --git a/erpnext/public/js/hub/marketplace.js b/erpnext/public/js/hub/marketplace.js index 10a55aafca..663e803945 100644 --- a/erpnext/public/js/hub/marketplace.js +++ b/erpnext/public/js/hub/marketplace.js @@ -3,10 +3,9 @@ import './vue-plugins'; // pages import './pages/item'; -import './pages/messages'; -import './pages/buying_messages'; import PageContainer from './PageContainer.vue'; +import Sidebar from './Sidebar.vue'; import Home from './pages/Home.vue'; import SavedProducts from './pages/SavedProducts.vue'; import Publish from './pages/Publish.vue'; @@ -72,79 +71,10 @@ erpnext.hub.Marketplace = class Marketplace { make_sidebar() { this.$sidebar = this.$parent.find('.layout-side-section').addClass('hidden-xs'); - this.make_sidebar_nav_buttons(); - this.make_sidebar_categories(); - } - - make_sidebar_nav_buttons() { - let $nav_group = this.$sidebar.find('[data-nav-buttons]'); - if (!$nav_group.length) { - $nav_group = $('