Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger
This commit is contained in:
richard-loafle
commit
981624fadc
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,5 +17,6 @@
|
|||
(toggleBuddy)="onClickToggleBuddy($event)"
|
||||
(uploadProfileImage)="onUploadProfileImage($event)"
|
||||
(updateIntro)="onUpdateIntro($event)"
|
||||
(close)="onClose($event)"
|
||||
>
|
||||
</ucap-profile-profile>
|
||||
|
|
|
|||
|
|
@ -463,4 +463,8 @@ export class ProfileDialogComponent implements OnInit, OnDestroy {
|
|||
})
|
||||
);
|
||||
}
|
||||
|
||||
onClose() {
|
||||
this.dialogRef.close();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ export * from './lib/types/file-transfer-permissions.type';
|
|||
export * from './lib/types/locale-code.type';
|
||||
export * from './lib/types/notification-method.type';
|
||||
export * from './lib/types/organization-chart-permissions.type';
|
||||
export * from './lib/types/presence.type';
|
||||
export * from './lib/types/push-type.type';
|
||||
export * from './lib/types/status-code.type';
|
||||
export * from './lib/types/status-type.type';
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import { Injectable, Inject } from '@angular/core';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { HttpClient, HttpRequest, HttpResponse } from '@angular/common/http';
|
||||
|
||||
import { Observable } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { map, filter } from 'rxjs/operators';
|
||||
|
||||
import {
|
||||
Login2Request,
|
||||
|
|
@ -45,15 +45,22 @@ export class PiService {
|
|||
}
|
||||
|
||||
public login2(req: Login2Request): Observable<Login2Response> {
|
||||
return this.httpClient
|
||||
.post<any>(
|
||||
this.urls.login2,
|
||||
{},
|
||||
{
|
||||
params: encodeLogin2(req)
|
||||
const httpReq = new HttpRequest(
|
||||
'POST',
|
||||
this.urls.login2,
|
||||
encodeLogin2(req),
|
||||
{ reportProgress: true }
|
||||
);
|
||||
|
||||
return this.httpClient.request(httpReq).pipe(
|
||||
filter(event => {
|
||||
if (event instanceof HttpResponse) {
|
||||
return true;
|
||||
}
|
||||
)
|
||||
.pipe(map(res => decodeLogin2(res)));
|
||||
return false;
|
||||
}),
|
||||
map(res => decodeLogin2((res as HttpResponse<any>).body))
|
||||
);
|
||||
}
|
||||
|
||||
public userTermsAction(
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
import { Component, OnInit, Input } from '@angular/core';
|
||||
import { NGXLogger } from 'ngx-logger';
|
||||
import { PresenceType } from '../types/presence-type.type';
|
||||
import { StatusBulkInfo, StatusInfo } from '@ucap-webmessenger/protocol-status';
|
||||
import { StatusCode } from '@ucap-webmessenger/core';
|
||||
import { StatusCode, PresenceType } from '@ucap-webmessenger/core';
|
||||
|
||||
@Component({
|
||||
selector: 'ucap-profile-my-profile-widget',
|
||||
|
|
|
|||
|
|
@ -384,4 +384,8 @@
|
|||
</div>
|
||||
</mat-card-actions>
|
||||
</mat-card-content>
|
||||
|
||||
<button class="icon-button btn-dialog-close" (click)="onClose()">
|
||||
<i class="mdi mdi-window-close"></i>
|
||||
</button>
|
||||
</mat-card>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
word-wrap: break-word;
|
||||
}
|
||||
}
|
||||
::ng-deep .mat-card-header-text {
|
||||
.mat-card-header-text {
|
||||
.mat-card-subtitle {
|
||||
color: rgb(256, 256, 256, 0.7) !important;
|
||||
}
|
||||
|
|
@ -262,3 +262,8 @@
|
|||
margin-left: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.btn-dialog-close {
|
||||
|
||||
}
|
||||
|
|
@ -63,11 +63,12 @@ export class ProfileComponent implements OnInit {
|
|||
userInfo: UserInfoSS;
|
||||
isBuddy: boolean;
|
||||
}>();
|
||||
|
||||
@Output()
|
||||
uploadProfileImage = new EventEmitter<FileUploadItem>();
|
||||
@Output()
|
||||
updateIntro = new EventEmitter<string>();
|
||||
@Output()
|
||||
close = new EventEmitter();
|
||||
|
||||
@ViewChild('profileImageFileInput', { static: false })
|
||||
profileImageFileInput: ElementRef<HTMLInputElement>;
|
||||
|
|
@ -250,4 +251,8 @@ export class ProfileComponent implements OnInit {
|
|||
}
|
||||
return rtn;
|
||||
}
|
||||
|
||||
onClose() {
|
||||
this.close.emit();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,9 +18,7 @@ import {
|
|||
WorkStatusType
|
||||
} from '@ucap-webmessenger/protocol-status';
|
||||
import { NGXLogger } from 'ngx-logger';
|
||||
import { StatusCode } from '@ucap-webmessenger/core';
|
||||
|
||||
import { PresenceType } from '../types/presence-type.type';
|
||||
import { StatusCode, PresenceType } from '@ucap-webmessenger/core';
|
||||
import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
|
||||
|
||||
@Component({
|
||||
|
|
|
|||
|
|
@ -5,6 +5,4 @@
|
|||
export * from './lib/components/list-item.component';
|
||||
export * from './lib/components/user-list-item.component';
|
||||
|
||||
export * from './lib/types/presence-type.type';
|
||||
|
||||
export * from './lib/ucap-ui-profile.module';
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ $thumbnail-msize: 40px;
|
|||
display: flex;
|
||||
flex: 0 0 auto;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding: 0 5px 0 0;
|
||||
|
||||
.room-info {
|
||||
flex-direction: column;
|
||||
|
|
|
|||
|
|
@ -15,18 +15,9 @@ import {
|
|||
StatusBulkInfo,
|
||||
WorkStatusType
|
||||
} from '@ucap-webmessenger/protocol-status';
|
||||
import { StatusCode } from '@ucap-webmessenger/core';
|
||||
import { StatusCode, PresenceType } from '@ucap-webmessenger/core';
|
||||
import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
|
||||
|
||||
export enum PresenceType {
|
||||
PC = 'pc',
|
||||
MOBILE = 'mobile',
|
||||
CONFERENCE = 'conference',
|
||||
MOBILE_CONFERENCE = 'mobileConference',
|
||||
PHONE = 'phone',
|
||||
IMESSENER = 'imessenger'
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'ucap-integrated-search',
|
||||
templateUrl: './integrated-search.component.html',
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
::ng-deep .mat-card-header {
|
||||
.mat-card-header {
|
||||
.mat-card-header-text {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user