Browse Source

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

pull/90/head
Phillip 2 years ago
parent
commit
1e711c8014
  1. 11
      qortal-ui-plugins/plugins/core/components/UserInfo/UserInfo.js
  2. 17
      qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat-css.src.js
  3. 14
      qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js

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

@ -7,8 +7,6 @@ import '@vaadin/button';
import '@polymer/paper-progress/paper-progress.js'; import '@polymer/paper-progress/paper-progress.js';
import { cropAddress } from '../../../utils/cropAddress.js'; import { cropAddress } from '../../../utils/cropAddress.js';
// const parentEpml = new Epml({ type: "WINDOW", source: window.parent });
export class UserInfo extends LitElement { export class UserInfo extends LitElement {
static get properties() { static get properties() {
return { return {
@ -35,7 +33,6 @@ export class UserInfo extends LitElement {
const imageHTMLRes = new Image(); const imageHTMLRes = new Image();
imageHTMLRes.src = imageUrl; imageHTMLRes.src = imageUrl;
imageHTMLRes.classList.add("user-info-avatar"); imageHTMLRes.classList.add("user-info-avatar");
// imageHTMLRes.style= "width:30px; height:30px; float: left; border-radius:50%; font-size:14px";
imageHTMLRes.onload = () => { imageHTMLRes.onload = () => {
this.isImageLoaded = true; this.isImageLoaded = true;
} }
@ -52,14 +49,6 @@ export class UserInfo extends LitElement {
return imageHTMLRes; return imageHTMLRes;
} }
updated(changedProperties) {
if (changedProperties && changedProperties.has('selectedHead')) {
if (this.selectedHead) {
console.log(this.selectedHead, "selected head")
}
}
}
render() { render() {
let avatarImg = ""; let avatarImg = "";
if (this.selectedHead && this.selectedHead.name) { if (this.selectedHead && this.selectedHead.name) {

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

@ -193,6 +193,23 @@ export const qchatStyles = css`
overflow-x: hidden; 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 { .chat {
width: 80vw; width: 80vw;
height: 100vh; height: 100vh;

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

@ -97,6 +97,8 @@ class Chat extends LitElement {
} }
render() { render() {
console.log(12, "q-chat here");
console.log(window.location.href);
return html` return html`
<div class="container clearfix"> <div class="container clearfix">
<div class="people-list" id="people-list"> <div class="people-list" id="people-list">
@ -112,12 +114,14 @@ class Chat extends LitElement {
</ul> </ul>
<div class="blockedusers"> <div class="blockedusers">
<div class="groups-button-container"> <div class="groups-button-container">
<a href="/app/group-management"> <button
<button class="groups-button"> @click=${() => {
this.redirectToGroups();
}}
class="groups-button">
<mwc-icon>groups</mwc-icon> <mwc-icon>groups</mwc-icon>
${translate("sidemenu.groupmanagement")} ${translate("sidemenu.groupmanagement")}
</button> </button>
</a>
${this.groupInvites.length > 0 ? ( ${this.groupInvites.length > 0 ? (
html` html`
<div class="groups-button-notif"> <div class="groups-button-notif">
@ -463,6 +467,10 @@ class Chat extends LitElement {
} }
} }
redirectToGroups() {
window.location.href = `../../group-management/index.html`
}
setChatEditor(editor) { setChatEditor(editor) {
this.chatEditor = editor; this.chatEditor = editor;
} }

Loading…
Cancel
Save