feat(desk): Load desk as a module list

frappe/core/page/desktop/desktop.js

@@ -1,19 +1,19 @@
 frappe.provide('frappe.desktop');
 
-frappe.pages['desktop'].on_page_load = function(wrapper) {
-
-	// load desktop
-	if(!frappe.list_desktop) {
-		frappe.desktop.set_background();
-	}
-	frappe.desktop.refresh(wrapper);
-};
-
-frappe.pages['desktop'].on_page_show = function(wrapper) {
-	if(frappe.list_desktop) {
-		$("body").attr("data-route", "list-desktop");
-	}
-};
+// frappe.pages['desktop'].on_page_load = function(wrapper) {
+
+// 	// load desktop
+// 	if(!frappe.list_desktop) {
+// 		frappe.desktop.set_background();
+// 	}
+// 	frappe.desktop.refresh(wrapper);
+// };
+
+// frappe.pages['desktop'].on_page_show = function(wrapper) {
+// 	if(frappe.list_desktop) {
+// 		$("body").attr("data-route", "list-desktop");
+// 	}
+// };
 
 $.extend(frappe.desktop, {
 	refresh: function(wrapper) {

frappe/public/build.json

@@ -248,8 +248,7 @@
 
 		"public/js/frappe/chat.js",
 
-		"public/js/frappe/social/social_factory.js",
-		"public/js/frappe/modules/modules_factory.js"
+		"public/js/frappe/social/social_factory.js"
 	],
 	"css/module.min.css": [
 		"public/less/module.less"
@@ -382,8 +381,5 @@
 	],
 	"js/social.min.js": [
 		"public/js/frappe/social/social_home.js"
-	],
-	"js/modules.min.js": [
-		"public/js/frappe/modules/modules_home.js"
 	]
 }

frappe/public/js/frappe/modules/modules_factory.js

@@ -1,21 +0,0 @@
-frappe.views.ModulesFactory = class ModulesFactory extends frappe.views.Factory {
-	show() {
-		if (frappe.pages.modules) {
-			frappe.container.change_to('modules');
-		} else {
-			this.make('modules');
-		}
-	}
-
-	make(page_name) {
-		const assets = [
-			'/assets/js/modules.min.js'
-		];
-
-		frappe.require(assets, () => {
-			frappe.modules.home = new frappe.modules.Home({
-				parent: this.make_page(true, page_name)
-			});
-		});
-	}
-};

frappe/public/js/frappe/modules/modules_home.js

@@ -1,25 +0,0 @@
-import Modules from './Modules.vue';
-
-frappe.provide('frappe.modules');
-
-frappe.modules.Home = class {
-	constructor({ parent }) {
-		this.$parent = $(parent);
-		this.page = parent.page;
-		this.setup_header();
-		this.make_body();
-	}
-	make_body() {
-		this.$modules_container = this.$parent.find('.layout-main');
-		frappe.require('/assets/js/frappe-vue.min.js', () => {
-			Vue.prototype.__ = window.__; 
-			new Vue({
-				el: this.$modules_container[0],
-				render: h => h(Modules)
-			});
-		});
-	}
-	setup_header() {
-		this.page.set_title(__('Modules'));
-	}
-};

frappe/public/js/frappe/modules/Modules.vue → frappe/public/js/frappe/views/components/Modules.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="modules-page-container">
-        <div v-if="route_str === 'home'" >
+        <div v-if="!route_str" >
              <div v-for="category in module_categories"
                 :key="category">
 

frappe/public/js/frappe/views/pageview.js

@@ -1,6 +1,8 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 
+import Modules from './components/Modules.vue';
+
 frappe.provide('frappe.views.pageview');
 frappe.provide("frappe.standard_pages");
 
@@ -81,14 +83,23 @@ frappe.views.Page = Class.extend({
 			frappe.dom.set_style(this.pagedoc.style || '');
 		}
 
-		this.trigger_page_event('on_page_load');
-
-		// set events
-		$(this.wrapper).on('show', function() {
-			window.cur_frm = null;
-			me.trigger_page_event('on_page_show');
-			me.trigger_page_event('refresh');
-		});
+		if(this.name === "desktop") {
+			frappe.require('/assets/js/frappe-vue.min.js', () => {
+				Vue.prototype.__ = window.__; 
+				new Vue({
+					el: this.wrapper,
+					render: h => h(Modules)
+				});
+			});
+		} else {
+			this.trigger_page_event('on_page_load');
+				// set events
+			$(this.wrapper).on('show', function() {
+				window.cur_frm = null;
+				me.trigger_page_event('on_page_show');
+				me.trigger_page_event('refresh');
+			});
+		}
 	},
 	trigger_page_event: function(eventname) {
 		var me = this;