mirror of
https://github.com/Qortal/qortal-ui.git
synced 2025-02-12 02:05:51 +00:00
Merge remote-tracking branch 'justin/justin-groups-features' into feature/group-features
This commit is contained in:
commit
1e711c8014
@ -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 {
|
||||
@ -35,7 +33,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;
|
||||
}
|
||||
@ -52,14 +49,6 @@ export class UserInfo extends LitElement {
|
||||
return imageHTMLRes;
|
||||
}
|
||||
|
||||
updated(changedProperties) {
|
||||
if (changedProperties && changedProperties.has('selectedHead')) {
|
||||
if (this.selectedHead) {
|
||||
console.log(this.selectedHead, "selected head")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
let avatarImg = "";
|
||||
if (this.selectedHead && this.selectedHead.name) {
|
||||
|
@ -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;
|
||||
|
@ -97,6 +97,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">
|
||||
@ -112,12 +114,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">
|
||||
@ -463,6 +467,10 @@ class Chat extends LitElement {
|
||||
}
|
||||
}
|
||||
|
||||
redirectToGroups() {
|
||||
window.location.href = `../../group-management/index.html`
|
||||
}
|
||||
|
||||
setChatEditor(editor) {
|
||||
this.chatEditor = editor;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user