ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
leejinho 2020-02-06 10:29:48 +09:00
parent 7e6099a777
commit 9630ee59ae
14 changed files with 84 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html
View File

@ -1,6 +1,11 @@
<mat-card class="confirm-card mat-elevation-z setting-frame"> <mat-card class="confirm-card mat-elevation-z setting-frame">
<mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle> <mat-card-header>
<mat-card-title>{{ 'accounts.changePassword' | translate }}</mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>{{ 'accounts.changePassword' | translate }}</mat-card-title
>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<div fxFlex class="setting-tab"> <div fxFlex class="setting-tab">

9
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html
View File

@ -1,6 +1,11 @@
<mat-card class="confirm-card mat-elevation-z setting-frame"> <mat-card class="confirm-card mat-elevation-z setting-frame">
<mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle> <mat-card-header>
<mat-card-title>{{ 'settings.label' | translate }}</mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>{{ 'settings.label' | translate }}</mat-card-title
>
<button class="icon-button btn-dialog-close" (click)="onClickChoice(false)"> <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
<i class="mdi mdi-window-close"></i> <i class="mdi mdi-window-close"></i>
</button> </button>

9
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html
View File

@ -1,6 +1,11 @@
<mat-card class="confirm-card mat-elevation-z dialog-creat-chat"> <mat-card class="confirm-card mat-elevation-z dialog-creat-chat">
<mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle> <mat-card-header>
<mat-card-title>{{ data.title }}</mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>{{ data.title }}</mat-card-title
>
<button class="icon-button btn-dialog-close" (click)="onClickChoice(false)"> <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
<i class="mdi mdi-window-close"></i> <i class="mdi mdi-window-close"></i>
</button> </button>

9
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html
View File

@ -1,6 +1,11 @@
<mat-card class="confirm-card mat-elevation-z"> <mat-card class="confirm-card mat-elevation-z">
<mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle> <mat-card-header>
<mat-card-title>{{ data.title }}</mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>{{ data.title }}</mat-card-title
>
<button class="icon-button btn-dialog-close" (click)="onClickChoice(false)"> <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
<i class="mdi mdi-window-close"></i> <i class="mdi mdi-window-close"></i>
</button> </button>

7
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.html
View File

@ -1,6 +1,11 @@
<mat-card class="confirm-card mat-elevation-z"> <mat-card class="confirm-card mat-elevation-z">
<mat-card-header> <mat-card-header>
<mat-card-title>{{ data.title }}</mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>{{ data.title }}</mat-card-title
>
<button class="icon-button btn-dialog-close" (click)="onClickConfirm()"> <button class="icon-button btn-dialog-close" (click)="onClickConfirm()">
<i class="mdi mdi-window-close"></i> <i class="mdi mdi-window-close"></i>
</button> </button>

9
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.html
View File

@ -1,6 +1,11 @@
<mat-card class="confirm-card mat-elevation-z"> <mat-card class="confirm-card mat-elevation-z">
<mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle> <mat-card-header>
<mat-card-title>{{ data.title }}</mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>{{ data.title }}</mat-card-title
>
<button class="icon-button btn-dialog-close" (click)="onClickChoice(false)"> <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
<i class="mdi mdi-window-close"></i> <i class="mdi mdi-window-close"></i>
</button> </button>

8
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html
View File

@ -1,6 +1,10 @@
<mat-card class="confirm-card mat-elevation-z"> <mat-card class="confirm-card mat-elevation-z">
<mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle> <mat-card-header>
<mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>
<ng-container [ngSwitch]="messageInfo.type"> <ng-container [ngSwitch]="messageInfo.type">
<span *ngSwitchCase="MessageType.Receive">{{ <span *ngSwitchCase="MessageType.Receive">{{
'message.type.messageTypeReceiving' | translate 'message.type.messageTypeReceiving' | translate

8
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html
View File

@ -1,6 +1,10 @@
<mat-card class="confirm-card mat-elevation-z"> <mat-card class="confirm-card mat-elevation-z">
<mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle> <mat-card-header>
<mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>
{{ (isModify ? 'message.modify' : 'message.sendTo') | translate }} {{ (isModify ? 'message.modify' : 'message.sendTo') | translate }}
</mat-card-title> </mat-card-title>
<button class="icon-button btn-dialog-close" (click)="onCancel()"> <button class="icon-button btn-dialog-close" (click)="onCancel()">

7
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.html
View File

@ -1,6 +1,11 @@
<mat-card class="confirm-card mat-elevation-z"> <mat-card class="confirm-card mat-elevation-z">
<mat-card-header> <mat-card-header>
<mat-card-title class="title"> <mat-card-title
class="card-header title"
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>
<span *ngIf="data.notice.topYn"> <span *ngIf="data.notice.topYn">
[{{ 'notice.important' | translate }}] [{{ 'notice.important' | translate }}]
</span> </span>

8
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html
View File

@ -1,6 +1,11 @@
<mat-card class="confirm-card mat-elevation-z selected-user-dialog"> <mat-card class="confirm-card mat-elevation-z selected-user-dialog">
<mat-card-header> <mat-card-header>
<mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
class="card-header"
>
{{ data.title }} {{ data.title }}
<span class="count text-accent-dark"> <span class="count text-accent-dark">
{{ selectedUserList.length }} / {{ data.selectedUserList.length }} {{ selectedUserList.length }} / {{ data.selectedUserList.length }}
@ -34,6 +39,7 @@
<ucap-profile-user-list-item <ucap-profile-user-list-item
*cdkVirtualFor="let userInfo of data.selectedUserList" *cdkVirtualFor="let userInfo of data.selectedUserList"
[userInfo]="userInfo" [userInfo]="userInfo"
[showPresence]="false"
[sessionVerinfo]="sessionVerinfo" [sessionVerinfo]="sessionVerinfo"
[selectedUserList]="selectedUserList" [selectedUserList]="selectedUserList"
[checkable]="userInfo.seq !== loginRes.userSeq" [checkable]="userInfo.seq !== loginRes.userSeq"

15
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
View File

@ -1,11 +1,12 @@
<mat-card class="confirm-card mat-elevation-z"> <mat-card class="confirm-card mat-elevation-z">
<mat-card-header <mat-card-header>
cdkDrag <mat-card-title
cdkDragRootElement=".cdk-overlay-pane" cdkDrag
cdkDragHandle cdkDragRootElement=".cdk-overlay-pane"
class="card-header" cdkDragHandle
> class="card-header"
<mat-card-title>{{ 'search.label' | translate }}</mat-card-title> >{{ 'search.label' | translate }}</mat-card-title
>
<button class="icon-button btn-dialog-close" (click)="onCancel()"> <button class="icon-button btn-dialog-close" (click)="onCancel()">
<i class="mdi mdi-window-close"></i> <i class="mdi mdi-window-close"></i>
</button> </button>

9
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html
View File

@ -1,6 +1,11 @@
<mat-card class="confirm-card mat-elevation-z setting-frame"> <mat-card class="confirm-card mat-elevation-z setting-frame">
<mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle> <mat-card-header>
<mat-card-title>{{ 'settings.label' | translate }}</mat-card-title> <mat-card-title
cdkDrag
cdkDragRootElement=".cdk-overlay-pane"
cdkDragHandle
>{{ 'settings.label' | translate }}</mat-card-title
>
<button class="icon-button btn-dialog-close" (click)="onClickChoice(false)"> <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
<i class="mdi mdi-window-close"></i> <i class="mdi mdi-window-close"></i>
</button> </button>

2
projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
View File

@ -4,7 +4,7 @@
</div> </div>
<mat-drawer-container class="contents" autosize> <mat-drawer-container class="contents" autosize>
<mat-drawer #leftSideDrawer mode="side" opened> <mat-drawer #leftSideDrawer mode="side" [disableClose]="true" opened>
<app-layout-messenger-left-side <app-layout-messenger-left-side
#leftSideContainer #leftSideContainer
(openProfile)="onClickOpenProfile($event)" (openProfile)="onClickOpenProfile($event)"

4
projects/ucap-webmessenger-ui-message/src/lib/components/write.component.ts
View File

@ -26,7 +26,7 @@ import { NGXLogger } from 'ngx-logger';
import moment from 'moment'; import moment from 'moment';
import { FileUtil } from '@ucap-webmessenger/core'; import { FileUtil } from '@ucap-webmessenger/core';
import { FormGroup, FormBuilder } from '@angular/forms'; import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { import {
ContentType, ContentType,
CategoryType, CategoryType,
@ -127,7 +127,7 @@ export class WriteComponent implements OnInit, OnDestroy, AfterViewInit {
ngOnInit() { ngOnInit() {
this.messageWriteForm = this.formBuilder.group({ this.messageWriteForm = this.formBuilder.group({
title: ['', []] title: ['', [Validators.required]]
}); });
if (this.isModify) { if (this.isModify) {