Merge remote-tracking branch 'justin/justin-groups-features' into feature/new-editor

qortal-ui-plugins/plugins/core/components/UserInfo/UserInfo.js

@@ -7,8 +7,6 @@ import '@vaadin/button';
 import '@polymer/paper-progress/paper-progress.js';
 import { cropAddress } from '../../../utils/cropAddress.js';
 
-// const parentEpml = new Epml({ type: "WINDOW", source: window.parent });
-
 export class UserInfo extends LitElement {
   static get properties() {
 		return {
@@ -34,7 +32,6 @@ export class UserInfo extends LitElement {
     const imageHTMLRes = new Image();
     imageHTMLRes.src = imageUrl;
     imageHTMLRes.classList.add("user-info-avatar");
-    // imageHTMLRes.style= "width:30px; height:30px; float: left; border-radius:50%; font-size:14px";
     imageHTMLRes.onload = () => {
         this.isImageLoaded = true;
     }

qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat-css.src.js

@@ -193,6 +193,23 @@ export const qchatStyles = css`
       overflow-x: hidden;     
   }
 
+    .people-list ul::-webkit-scrollbar-track {
+        background-color: whitesmoke;
+        border-radius: 7px;
+    }
+
+    .people-list ul::-webkit-scrollbar {
+        width: 6px;
+        border-radius: 7px;
+        background-color: whitesmoke;
+    }
+
+    .people-list ul::-webkit-scrollbar-thumb {
+        background-color: rgb(180, 176, 176);
+        border-radius: 7px;
+        transition: all 0.3s ease-in-out;
+    }
+    
   .chat {
       width: 80vw;
       height: 100vh;

qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js

@@ -163,6 +163,8 @@ class Chat extends LitElement {
     }
 
     render() {
+        console.log(12, "q-chat here");
+        console.log(window.location.href);
         return html`
             <div class="container clearfix">
                 <div class="people-list" id="people-list">
@@ -177,12 +179,14 @@ class Chat extends LitElement {
                     </ul>
                     <div class="blockedusers">
                         <div class="groups-button-container">
-                            <a href="/app/group-management">
-                                <button class="groups-button">
+                                <button 
+                                    @click=${() => {
+                                        this.redirectToGroups();
+                                        }}
+                                    class="groups-button">
                                     <mwc-icon>groups</mwc-icon>
                                     ${translate("sidemenu.groupmanagement")}
                                 </button>
-                            </a>
                             ${this.groupInvites.length > 0 ? (
                                 html`                                
                                 <div class="groups-button-notif">
@@ -530,6 +534,10 @@ class Chat extends LitElement {
         }
     }
 
+    redirectToGroups() {
+        window.location.href = `../../group-management/index.html`
+    }
+
 
 
     async _sendMessage(outSideMsg, msg) {