diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js index 2568d86aa2..e681f9e3bc 100644 --- a/frappe/public/js/frappe/chat.js +++ b/frappe/public/js/frappe/chat.js @@ -1761,6 +1761,8 @@ class extends Component { if ( props.target ) $(props.target).click(() => this.toggle()) + + frappe.chat.widget = this; } toggle (active) { @@ -2655,7 +2657,7 @@ frappe.chat.render = (render = true, force = false) => // Avoid re-renders. Once is enough. if ( !frappe.chatter || force ) { frappe.chatter = new frappe.Chat({ - target: desk ? '.navbar .frappe-chat-toggle' : null + target: desk ? '.frappe-chat-toggle' : null }) if ( render ) { diff --git a/frappe/public/js/frappe/social/components/ActivitySidebar.vue b/frappe/public/js/frappe/social/components/ActivitySidebar.vue index d3223c7f43..5083ed1c58 100644 --- a/frappe/public/js/frappe/social/components/ActivitySidebar.vue +++ b/frappe/public/js/frappe/social/components/ActivitySidebar.vue @@ -3,7 +3,10 @@
Upcoming Events
{{ get_time(event.starts_on) }} - {{ event.subject }} + {{ event.subject }} +
+
+ No upcoming events
Chat
@@ -32,11 +35,14 @@ export default { }) }, open_chat() { - frappe.chat.widget.toggle(); + setTimeout(frappe.chat.widget.toggle); }, get_time(timestamp) { return frappe.datetime.get_time(timestamp) }, + open_event(event) { + frappe.set_route('Form', 'Event', event.name); + } } } diff --git a/frappe/public/js/frappe/social/components/PostSidebar.vue b/frappe/public/js/frappe/social/components/PostSidebar.vue index 48b801e0bd..b5aa9c8601 100644 --- a/frappe/public/js/frappe/social/components/PostSidebar.vue +++ b/frappe/public/js/frappe/social/components/PostSidebar.vue @@ -1,15 +1,21 @@ @@ -17,7 +23,9 @@ export default { data() { return { - frequently_visited_list: [] + frequently_visited_list: [], + user: frappe.user_info(frappe.session.user), + user_avatar: frappe.avatar(this.user_id, 'avatar-xl') } }, created() { @@ -35,18 +43,37 @@ export default { }, get_label(route) { return frappe.utils.get_route_label(route); + }, + go_to_profile_page() { + frappe.set_route('social', 'profile', this.user.name) } } } diff --git a/frappe/public/js/frappe/social/components/ProfileSidebar.vue b/frappe/public/js/frappe/social/components/ProfileSidebar.vue index 0d0d5d5d7b..167e7d8f39 100644 --- a/frappe/public/js/frappe/social/components/ProfileSidebar.vue +++ b/frappe/public/js/frappe/social/components/ProfileSidebar.vue @@ -10,6 +10,7 @@  {{ user.interest }} + ← Back To Home