names are changed
This commit is contained in:
parent
8da169a144
commit
5b9fa9f55c
|
@ -11,7 +11,9 @@
|
|||
<ng-template mat-tab-label>
|
||||
<mat-icon>group</mat-icon>
|
||||
</ng-template>
|
||||
<app-layout-chat-left-sidenav-group class="left-group-side"></app-layout-chat-left-sidenav-group>
|
||||
<app-layout-chat-left-sidenav-group
|
||||
class="left-group-side"
|
||||
></app-layout-chat-left-sidenav-group>
|
||||
</mat-tab>
|
||||
<mat-tab>
|
||||
<ng-template mat-tab-label>
|
||||
|
@ -44,8 +46,8 @@
|
|||
<app-layout-chat-left-sidenav-call></app-layout-chat-left-sidenav-call>
|
||||
</mat-tab>
|
||||
</mat-tab-group>
|
||||
<ucap-ui-float-action-button
|
||||
<ucap-float-action-button
|
||||
[fabButtons]="fabButtons"
|
||||
(buttonClick)="onClickFab($event)"
|
||||
></ucap-ui-float-action-button>
|
||||
></ucap-float-action-button>
|
||||
</div>
|
||||
|
|
|
@ -50,6 +50,7 @@
|
|||
</div>
|
||||
|
||||
<div *ngIf="!isSearch" class="app-layout-chat-left-sidenav-chat-list">
|
||||
<perfect-scrollbar fxFlex="1 1 auto">
|
||||
<ucap-room-list-item
|
||||
*ngFor="let room of roomList"
|
||||
[loginRes]="loginRes"
|
||||
|
@ -75,6 +76,7 @@
|
|||
>
|
||||
</ucap-room-list-item>
|
||||
</cdk-virtual-scroll-viewport> -->
|
||||
</perfect-scrollbar>
|
||||
</div>
|
||||
<div *ngIf="!!isSearch" class="app-layout-chat-left-sidenav-chat-list search">
|
||||
<ucap-room-list-item
|
||||
|
@ -114,7 +116,7 @@
|
|||
<mat-menu
|
||||
#chatContextMenu="matMenu"
|
||||
[hasBackdrop]="false"
|
||||
(ucapUiClickOutside)="chatContextMenuTrigger.closeMenu()"
|
||||
(ucapClickOutside)="chatContextMenuTrigger.closeMenu()"
|
||||
>
|
||||
<ng-template matMenuContent let-roomInfo="roomInfo">
|
||||
<button mat-menu-item (click)="onSelectedRoom(roomInfo)">
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
|
||||
<div>
|
||||
<div>
|
||||
<div class="current-head">
|
||||
<h3>그룹</h3>
|
||||
<div class="btn-box">
|
||||
|
@ -11,7 +10,7 @@
|
|||
#groupMenuTrigger="matMenuTrigger"
|
||||
[matMenuTriggerFor]="groupMenu"
|
||||
aria-label="group menu"
|
||||
(ucapUiClickOutside)="groupMenuTrigger.closeMenu()"
|
||||
(ucapClickOutside)="groupMenuTrigger.closeMenu()"
|
||||
>
|
||||
<mat-icon>more_vert</mat-icon>
|
||||
</button>
|
||||
|
@ -51,8 +50,8 @@
|
|||
<span>그룹 가져오기</span>
|
||||
</button>
|
||||
</mat-menu>
|
||||
</div>
|
||||
<div *ngIf="!isShowSearch" class="search-result" style="overflow: auto;">
|
||||
</div>
|
||||
<div *ngIf="!isShowSearch" class="search-result" style="overflow: auto;">
|
||||
<ucap-group-expansion-panel
|
||||
#groupExpansionPanel
|
||||
[groupBuddyList]="groupBuddyList$ | async"
|
||||
|
@ -70,12 +69,16 @@
|
|||
>
|
||||
</ucap-profile-user-list-item>
|
||||
</ucap-group-expansion-panel>
|
||||
</div>
|
||||
<div *ngIf="isShowSearch" class="search-result">
|
||||
</div>
|
||||
<div *ngIf="isShowSearch" class="search-result">
|
||||
<div *ngIf="searchProcessing">
|
||||
<mat-progress-bar mode="indeterminate"></mat-progress-bar>
|
||||
</div>
|
||||
<div class="result-num">검색결과<span class="text-accent-color">({{ searchUserInfos.length }}명)</span></div>
|
||||
<div class="result-num">
|
||||
검색결과<span class="text-accent-color"
|
||||
>({{ searchUserInfos.length }}명)</span
|
||||
>
|
||||
</div>
|
||||
<ucap-profile-user-list-item
|
||||
*ngFor="let userInfo of searchUserInfos"
|
||||
[userInfo]="userInfo"
|
||||
|
@ -84,8 +87,7 @@
|
|||
(click)="onSelectBuddy(userInfo)"
|
||||
>
|
||||
</ucap-profile-user-list-item>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div
|
||||
style="visibility: hidden; position: fixed"
|
||||
|
@ -97,7 +99,7 @@
|
|||
<mat-menu
|
||||
#profileContextMenu="matMenu"
|
||||
[hasBackdrop]="false"
|
||||
(ucapUiClickOutside)="profileContextMenuTrigger.closeMenu()"
|
||||
(ucapClickOutside)="profileContextMenuTrigger.closeMenu()"
|
||||
>
|
||||
<ng-template matMenuContent let-userInfo="userInfo">
|
||||
<button
|
||||
|
@ -164,7 +166,7 @@
|
|||
<mat-menu
|
||||
#groupContextMenu="matMenu"
|
||||
[hasBackdrop]="false"
|
||||
(ucapUiClickOutside)="groupContextMenuTrigger.closeMenu()"
|
||||
(ucapClickOutside)="groupContextMenuTrigger.closeMenu()"
|
||||
>
|
||||
<ng-template matMenuContent let-group="group">
|
||||
<button mat-menu-item (click)="onClickGroupContextMenu('CHAT', group)">
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
<img
|
||||
class="avatar"
|
||||
style="width: 50px; height: 50px;"
|
||||
ucapUiImage
|
||||
ucapImage
|
||||
[base]="profileImageRoot"
|
||||
[path]="getUserProfile(message.senderSeq)"
|
||||
[default]="'assets/images/img_nophoto_50.png'"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<dt>
|
||||
<img
|
||||
class="thumbnail"
|
||||
ucapUiImage
|
||||
ucapImage
|
||||
[base]="profileImageRoot"
|
||||
[path]="userInfo.profileImageFile"
|
||||
[default]="'assets/images/img_nophoto_50.png'"
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
<div class="list-item">
|
||||
<dl class="item-default">
|
||||
<dt>
|
||||
<!-- <img class="thumbnail" /> -->
|
||||
<img
|
||||
class="thumbnail"
|
||||
ucapUiImage
|
||||
ucapImage
|
||||
[base]="sessionVerinfo.profileRoot"
|
||||
[path]="imagePath"
|
||||
[default]="defaultPath"
|
||||
|
@ -12,18 +11,15 @@
|
|||
<span *ngIf="roomInfo.isTimeRoom" class="text-warn-color badge-timer">
|
||||
<mat-icon>timer</mat-icon>
|
||||
</span>
|
||||
<!-- <ucap-ui-imaage
|
||||
[imageClass]="'thumbnail'"
|
||||
[base]="sessionVerinfo.profileRoot"
|
||||
[path]="imagePath"
|
||||
[default]="defaultPath"
|
||||
></ucap-ui-imaage> -->
|
||||
</dt>
|
||||
<dd class="info">
|
||||
<div class="detail">
|
||||
<div class="room-name">
|
||||
<div class="name">{{ getRoomName(roomInfo) }}</div>
|
||||
<div class="num text-accent-color" *ngIf="roomInfo.roomType === RoomType.Multi">
|
||||
<div
|
||||
class="num text-accent-color"
|
||||
*ngIf="roomInfo.roomType === RoomType.Multi"
|
||||
>
|
||||
{{ roomInfo.joinUserCount }}명
|
||||
</div>
|
||||
<div *ngIf="!checkable && !roomInfo.receiveAlarm">
|
||||
|
|
|
@ -9,7 +9,7 @@ export interface FloatActionButton {
|
|||
}
|
||||
|
||||
@Component({
|
||||
selector: 'ucap-ui-float-action-button',
|
||||
selector: 'ucap-float-action-button',
|
||||
templateUrl: './float-action-button.component.html',
|
||||
styleUrls: ['./float-action-button.component.scss'],
|
||||
animations: ucapAnimations
|
||||
|
|
|
@ -15,7 +15,7 @@ import {
|
|||
} from '@angular/core';
|
||||
import { isPlatformBrowser } from '@angular/common';
|
||||
|
||||
@Directive({ selector: '[ucapUiClickOutside]' })
|
||||
@Directive({ selector: '[ucapClickOutside]' })
|
||||
export class ClickOutsideDirective implements OnInit, OnChanges, OnDestroy {
|
||||
@Input()
|
||||
clickOutsideEnabled = true;
|
||||
|
@ -39,7 +39,7 @@ export class ClickOutsideDirective implements OnInit, OnChanges, OnDestroy {
|
|||
clickOutsideEvents = '';
|
||||
|
||||
@Output()
|
||||
ucapUiClickOutside: EventEmitter<Event> = new EventEmitter<Event>();
|
||||
ucapClickOutside: EventEmitter<Event> = new EventEmitter<Event>();
|
||||
|
||||
private nodesExcluded: Array<HTMLElement> = [];
|
||||
private events: Array<string> = ['click', 'contextmenu'];
|
||||
|
@ -164,7 +164,7 @@ export class ClickOutsideDirective implements OnInit, OnChanges, OnDestroy {
|
|||
return;
|
||||
}
|
||||
|
||||
this.ngZone.run(() => this.ucapUiClickOutside.emit(ev));
|
||||
this.ngZone.run(() => this.ucapClickOutside.emit(ev));
|
||||
}
|
||||
|
||||
private _shouldExclude(target): boolean {
|
||||
|
|
|
@ -12,7 +12,7 @@ import {
|
|||
import { NGXLogger } from 'ngx-logger';
|
||||
|
||||
@Directive({
|
||||
selector: 'img[ucapUiImage]'
|
||||
selector: 'img[ucapImage]'
|
||||
})
|
||||
export class ImageDirective implements OnInit, AfterViewInit {
|
||||
@Input()
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"extends": "../../tslint.json",
|
||||
"rules": {
|
||||
"directive-selector": [true, "attribute", "ucapUi", "camelCase"],
|
||||
"component-selector": [true, "element", "ucap-ui", "kebab-case"]
|
||||
"directive-selector": [true, "attribute", "ucap", "camelCase"],
|
||||
"component-selector": [true, "element", "ucap", "kebab-case"]
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user