Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger
# Conflicts: # projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html
This commit is contained in:
khk
commit
1efc686562
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="profile-img">
|
<div class="profile-img">
|
||||||
<div class="profile-img-mask">
|
<div class="profile-img-mask">
|
||||||
<img ucapImage [base]="profileImageRoot" [path]="userInfo.profileImageFile"
|
<img ucapImage [base]="profileImageRoot" [path]="userInfo.profileImageFile"
|
||||||
[default]="'assets/images/img_nophoto_50.png'" />
|
[default]="'assets/images/img_nophoto_50.png'" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button mat-mini-fab class="mat-elevation-z6 btn-upload-profile-image" *ngIf="isMe && editableProfileImage"
|
<button mat-mini-fab class="mat-elevation-z6 btn-upload-profile-image" *ngIf="isMe && editableProfileImage"
|
||||||
|
|
@ -22,8 +22,7 @@
|
||||||
profileImageFileUploadItem &&
|
profileImageFileUploadItem &&
|
||||||
profileImageFileUploadItem.uploadingProgress$
|
profileImageFileUploadItem.uploadingProgress$
|
||||||
" mode="determinate" strokeWidth="5" diameter="84"
|
" mode="determinate" strokeWidth="5" diameter="84"
|
||||||
[value]="profileImageFileUploadItem.uploadingProgress$ | async" class="upload-profile-image-spinner">
|
[value]="profileImageFileUploadItem.uploadingProgress$ | async" class="upload-profile-image-spinner"></mat-spinner>
|
||||||
</mat-spinner>
|
|
||||||
|
|
||||||
<input type="file" #profileImageFileInput style="display: none" (change)="onChangeFileInput()" />
|
<input type="file" #profileImageFileInput style="display: none" (change)="onChangeFileInput()" />
|
||||||
|
|
||||||
|
|
@ -42,11 +41,9 @@
|
||||||
|
|
||||||
<div *ngIf="!isMe" class="profile-option">
|
<div *ngIf="!isMe" class="profile-option">
|
||||||
<span *ngIf="isBuddy" class="btn-favorite" (click)="onToggleFavorit()">
|
<span *ngIf="isBuddy" class="btn-favorite" (click)="onToggleFavorit()">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none"
|
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
|
||||||
stroke="currentColor" stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="round"
|
stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="round" [ngClass]="[isFavorit ? 'on' : '']">
|
||||||
[ngClass]="[isFavorit ? 'on' : '']">
|
<polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2">
|
||||||
<polygon
|
|
||||||
points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2">
|
|
||||||
</polygon>
|
</polygon>
|
||||||
</svg>
|
</svg>
|
||||||
</span>
|
</span>
|
||||||
|
|
@ -76,12 +73,11 @@
|
||||||
<div *ngIf="isMe" class="profile-edit">
|
<div *ngIf="isMe" class="profile-edit">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||||
<path d="M12.3 3.7l4 4L4 20H0v-4L12.3 3.7zm1.4-1.4L16 0l4 4-2.3 2.3-4-4z" /></svg>
|
<path d="M12.3 3.7l4 4L4 20H0v-4L12.3 3.7zm1.4-1.4L16 0l4 4-2.3 2.3-4-4z" /></svg>
|
||||||
</div>
|
</div>
|
||||||
</mat-card-header>
|
</mat-card-header>
|
||||||
|
|
||||||
<mat-card-content>
|
<mat-card-content>
|
||||||
<ul class="userInfo-list">
|
<ul class="userInfo-list">
|
||||||
<!--기존
|
|
||||||
<li>
|
<li>
|
||||||
<dt class="division">사업장</dt>
|
<dt class="division">사업장</dt>
|
||||||
<dd>{{ userInfo.workplace }}</dd>
|
<dd>{{ userInfo.workplace }}</dd>
|
||||||
|
|
@ -94,35 +90,14 @@
|
||||||
<dt class="division">사원직무/거래처</dt>
|
<dt class="division">사원직무/거래처</dt>
|
||||||
<dd>가나다라마바사아자차카타파하</dd>
|
<dd>가나다라마바사아자차카타파하</dd>
|
||||||
</li>
|
</li>
|
||||||
-->
|
|
||||||
<li class="company">
|
|
||||||
<dt class="division">회사</dt>
|
|
||||||
<dd>회사명</dd>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<dt class="division">담당업무</dt>
|
|
||||||
<dd>담당업무 정보</dd>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<dt>근무지</dt>
|
|
||||||
<dd>근무지영역정보</dd>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<dt class="division">직무</dt>
|
|
||||||
<dd>직무정보</dd>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<dt>거래처</dt>
|
|
||||||
<dd>거래처정보</dd>
|
|
||||||
</li>
|
|
||||||
<li>
|
<li>
|
||||||
<dt class="division">이메일</dt>
|
<dt class="division">이메일</dt>
|
||||||
<dd>{{ userInfo.email }}</dd>
|
<dd>{{ userInfo.email }}</dd>
|
||||||
<li>
|
<li>
|
||||||
<dt class="division">사무실</dt>
|
<dt class="division">사무실</dt>
|
||||||
<dd>{{ userInfo.lineNumber }}1234567890123456789012345678901234567890</dd>
|
<dd>{{ userInfo.lineNumber }}1234567890123456789012345678901234567890</dd>
|
||||||
<button mat-mini-fab class="mat-elevation-z userInfo-call" *ngIf="!isMe" matTooltip="전화"
|
<button mat-mini-fab class="mat-elevation-z userInfo-call" *ngIf="!isMe" matTooltip="전화" matTooltipPosition="above"
|
||||||
matTooltipPosition="above" [disabled]="getDisabledBtn('LINE')" (click)="onClickCall('LINE')">
|
[disabled]="getDisabledBtn('LINE')" (click)="onClickCall('LINE')">
|
||||||
<svg id="레이어_1" data-name="레이어 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
<svg id="레이어_1" data-name="레이어 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||||
<path d="M18.61,16.55c-0.42,1.03-2.29,1.97-3.12,2.01c-0.83,0.04-0.85,0.64-5.37-1.32c-4.51-1.96-7.23-6.73-7.45-7.04
|
<path d="M18.61,16.55c-0.42,1.03-2.29,1.97-3.12,2.01c-0.83,0.04-0.85,0.64-5.37-1.32c-4.51-1.96-7.23-6.73-7.45-7.04
|
||||||
C2.46,9.9,0.92,7.71,1,5.51c0.08-2.2,1.29-3.24,1.72-3.67c0.43-0.43,0.92-0.51,1.22-0.51c0.36-0.01,0.59-0.01,0.85,0
|
C2.46,9.9,0.92,7.71,1,5.51c0.08-2.2,1.29-3.24,1.72-3.67c0.43-0.43,0.92-0.51,1.22-0.51c0.36-0.01,0.59-0.01,0.85,0
|
||||||
|
|
@ -136,8 +111,8 @@
|
||||||
<li>
|
<li>
|
||||||
<dt class="division">핸드폰</dt>
|
<dt class="division">핸드폰</dt>
|
||||||
<dd>{{ userInfo.hpNumber }}</dd>
|
<dd>{{ userInfo.hpNumber }}</dd>
|
||||||
<button mat-mini-fab class="mat-elevation-z userInfo-call" *ngIf="!isMe" matTooltip="모바일"
|
<button mat-mini-fab class="mat-elevation-z userInfo-call" *ngIf="!isMe" matTooltip="모바일" matTooltipPosition="above"
|
||||||
matTooltipPosition="above" [disabled]="getDisabledBtn('MOBILE')" (click)="onClickCall('MOBILE')">
|
[disabled]="getDisabledBtn('MOBILE')" (click)="onClickCall('MOBILE')">
|
||||||
<svg id="레이어_1" data-name="레이어 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
<svg id="레이어_1" data-name="레이어 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||||
<path d="M18.61,16.55c-0.42,1.03-2.29,1.97-3.12,2.01c-0.83,0.04-0.85,0.64-5.37-1.32c-4.51-1.96-7.23-6.73-7.45-7.04
|
<path d="M18.61,16.55c-0.42,1.03-2.29,1.97-3.12,2.01c-0.83,0.04-0.85,0.64-5.37-1.32c-4.51-1.96-7.23-6.73-7.45-7.04
|
||||||
C2.46,9.9,0.92,7.71,1,5.51c0.08-2.2,1.29-3.24,1.72-3.67c0.43-0.43,0.92-0.51,1.22-0.51c0.36-0.01,0.59-0.01,0.85,0
|
C2.46,9.9,0.92,7.71,1,5.51c0.08-2.2,1.29-3.24,1.72-3.67c0.43-0.43,0.92-0.51,1.22-0.51c0.36-0.01,0.59-0.01,0.85,0
|
||||||
|
|
@ -145,7 +120,7 @@
|
||||||
c-0.24,0.25-0.5,0.57-0.71,0.76C5.65,8.04,5.4,8.27,5.65,8.73c0.25,0.46,1.1,1.96,2.39,3.19c1.66,1.59,3.1,2.11,3.54,2.35
|
c-0.24,0.25-0.5,0.57-0.71,0.76C5.65,8.04,5.4,8.27,5.65,8.73c0.25,0.46,1.1,1.96,2.39,3.19c1.66,1.59,3.1,2.11,3.54,2.35
|
||||||
c0.44,0.24,0.71,0.21,0.98-0.07c0.27-0.29,1.18-1.26,1.49-1.7c0.32-0.44,0.62-0.35,1.02-0.19c0.41,0.16,2.58,1.33,3.03,1.57
|
c0.44,0.24,0.71,0.21,0.98-0.07c0.27-0.29,1.18-1.26,1.49-1.7c0.32-0.44,0.62-0.35,1.02-0.19c0.41,0.16,2.58,1.33,3.03,1.57
|
||||||
c0.44,0.24,0.74,0.36,0.84,0.55C19.05,14.62,19.02,15.52,18.61,16.55L18.61,16.55z" />
|
c0.44,0.24,0.74,0.36,0.84,0.55C19.05,14.62,19.02,15.52,18.61,16.55L18.61,16.55z" />
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
@ -153,26 +128,16 @@
|
||||||
<mat-card-actions>
|
<mat-card-actions>
|
||||||
<div fxFlex fxLayout="row" fxLayoutAlign="space-around center">
|
<div fxFlex fxLayout="row" fxLayoutAlign="space-around center">
|
||||||
<div class="button-text-item">
|
<div class="button-text-item">
|
||||||
<button mat-mini-fab class="mat-elevation-z bg-accent-darkest" [matTooltip]="isMe ? 'MyTalk' : '1:1 대화'"
|
<button mat-mini-fab class="mat-elevation-z bg-accent-darkest" [matTooltip]="isMe ? 'MyTalk' : '1:1 대화'" matTooltipPosition="above"
|
||||||
matTooltipPosition="above" (click)="onClickOpenChat()">
|
(click)="onClickOpenChat()">
|
||||||
<svg id="레이어_1" data-name="레이어 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
<svg id="레이어_1" data-name="레이어 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||||
<path
|
<path d="M26.57,14a9.05,9.05,0,0,0-12.82,0,9.07,9.07,0,0,0-.57,12.2,3.57,3.57,0,0,1-1.46,1.61.84.84,0,0,0-.46.89.86.86,0,0,0,.71.71,4.34,4.34,0,0,0,.71.05,5.32,5.32,0,0,0,3.19-1.06A9.07,9.07,0,0,0,26.57,14Z" transform="translate(-11.09 -11.32)"/>
|
||||||
d="M26.57,14a9.05,9.05,0,0,0-12.82,0,9.07,9.07,0,0,0-.57,12.2,3.57,3.57,0,0,1-1.46,1.61.84.84,0,0,0-.46.89.86.86,0,0,0,.71.71,4.34,4.34,0,0,0,.71.05,5.32,5.32,0,0,0,3.19-1.06A9.07,9.07,0,0,0,26.57,14Z"
|
<path d="M20.16,20.53a.14.14,0,0,1-.14-.14.14.14,0,0,1,.14-.14.14.14,0,0,1,.13.14A.13.13,0,0,1,20.16,20.53Z" transform="translate(-11.09 -11.32)"/><path class="cls-1" d="M20.16,19.75a.64.64,0,1,0,.64.64.64.64,0,0,0-.64-.64Z" transform="translate(-11.09 -11.32)"/>
|
||||||
transform="translate(-11.09 -11.32)" />
|
<circle cx="12.35" cy="9.07" r="0.14"/><path class="cls-1" d="M23.44,19.75a.64.64,0,1,0,.64.64.64.64,0,0,0-.64-.64Z" transform="translate(-11.09 -11.32)"/>
|
||||||
<path
|
<circle cx="5.78" cy="9.07" r="0.14"/><path class="cls-1" d="M16.88,19.75a.64.64,0,1,0,.63.64.64.64,0,0,0-.63-.64Z" transform="translate(-11.09 -11.32)"/>
|
||||||
d="M20.16,20.53a.14.14,0,0,1-.14-.14.14.14,0,0,1,.14-.14.14.14,0,0,1,.13.14A.13.13,0,0,1,20.16,20.53Z"
|
|
||||||
transform="translate(-11.09 -11.32)" />
|
|
||||||
<path class="cls-1" d="M20.16,19.75a.64.64,0,1,0,.64.64.64.64,0,0,0-.64-.64Z"
|
|
||||||
transform="translate(-11.09 -11.32)" />
|
|
||||||
<circle cx="12.35" cy="9.07" r="0.14" />
|
|
||||||
<path class="cls-1" d="M23.44,19.75a.64.64,0,1,0,.64.64.64.64,0,0,0-.64-.64Z"
|
|
||||||
transform="translate(-11.09 -11.32)" />
|
|
||||||
<circle cx="5.78" cy="9.07" r="0.14" />
|
|
||||||
<path class="cls-1" d="M16.88,19.75a.64.64,0,1,0,.63.64.64.64,0,0,0-.63-.64Z"
|
|
||||||
transform="translate(-11.09 -11.32)" />
|
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
<span *ngIf="!isMe" class="button-text">대화</span>
|
<span *ngIf="!isMe" class="button-text" >대화</span>
|
||||||
<span *ngIf="isMe" class="button-text">myTalk</span>
|
<span *ngIf="isMe" class="button-text">myTalk</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -182,25 +147,23 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||||
<path
|
<path
|
||||||
d="M2 2c0-1.1.9-2 2-2h12a2 2 0 0 1 2 2v16a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2zm2 0v14h12V2H4zm6 17a1 1 0 1 0 0-2 1 1 0 0 0 0 2z" />
|
d="M2 2c0-1.1.9-2 2-2h12a2 2 0 0 1 2 2v16a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2zm2 0v14h12V2H4zm6 17a1 1 0 1 0 0-2 1 1 0 0 0 0 2z" />
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
<span class="button-text">SMS</span>
|
<span class="button-text">SMS</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="button-text-item" *ngIf="!isMe">
|
<div class="button-text-item" *ngIf="!isMe">
|
||||||
<button mat-mini-fab class="mat-elevation-z bg-accent-darkest" *ngIf="!isMe" matTooltip="화상회의"
|
<button mat-mini-fab class="mat-elevation-z bg-accent-darkest" *ngIf="!isMe" matTooltip="화상회의" matTooltipPosition="above"
|
||||||
matTooltipPosition="above" (click)="onClickVideoConference()">
|
(click)="onClickVideoConference()">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||||
<path
|
<path d="M16 7l4-4v14l-4-4v3a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V4c0-1.1.9-2 2-2h12a2 2 0 0 1 2 2v3zm-8 7a4 4 0 1 0 0-8 4 4 0 0 0 0 8zm0-2a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/></svg>
|
||||||
d="M16 7l4-4v14l-4-4v3a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V4c0-1.1.9-2 2-2h12a2 2 0 0 1 2 2v3zm-8 7a4 4 0 1 0 0-8 4 4 0 0 0 0 8zm0-2a2 2 0 1 1 0-4 2 2 0 0 1 0 4z" />
|
|
||||||
</svg>
|
|
||||||
</button>
|
</button>
|
||||||
<span class="button-text">화상</span>
|
<span class="button-text">화상</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="button-text-item" *ngIf="!isMe">
|
<div class="button-text-item" *ngIf="!isMe">
|
||||||
<button mat-mini-fab class="mat-elevation-z bg-accent-darkest" *ngIf="!isMe" matTooltip="쪽지"
|
<button mat-mini-fab class="mat-elevation-z bg-accent-darkest" *ngIf="!isMe" matTooltip="쪽지" matTooltipPosition="above"
|
||||||
matTooltipPosition="above" (click)="onClickMessage()">
|
(click)="onClickMessage()">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||||
<path d="M0 0l20 10L0 20V0zm0 8v4l10-2L0 8z" /></svg>
|
<path d="M0 0l20 10L0 20V0zm0 8v4l10-2L0 8z" /></svg>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user