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

Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

Browse Source
This commit is contained in:
richard-loafle 2020-02-14 15:58:06 +09:00
commit ff0ebc7b5d
16 changed files with 110 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss
View File

@ -188,46 +188,6 @@
}
}
}
//mat-snack-bar 공통
::ng-deep .cdk-global-overlay-wrapper {
.mat-snack-bar-container {
margin: 0;
padding: 30px;
max-width: 60vw;
.mat-simple-snackbar {
display: flex;
justify-content: center;
span {
@include ellipsis(3);
display: inline-block;
padding: 7px 20px;
border: 1px solid #ffffff;
background-color: rgb(255, 255, 255, 0.2);
color: #ffffff;
margin-right: 4px;
flex: 1 1 auto;
max-width: 40vw;
}
&-action {
display: inline-flex;
margin-left: auto;
flex: 0 0 auto;
height: 100%;
button {
//background-color: #00b6d5;
border-radius: 2px;
span {
padding: 0 20px;
color: #ffffff;
background: none;
border: none;
font-weight: 500;
}
}
}
}
}
}
.chat-header {
.profile-img {

12
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss
View File

@ -12,15 +12,3 @@ $tablet-s-width: 768px;
margin-right: -10px;
}
}
/*rightDrawer공통
::ng-deep .rightDrawer-item {
width: 100%;
height: calc(100% - 60px);
.rightDrawer-tab {
.mat-tab-label {
width: 50%;
min-width: 50%;
}
}
}*/

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

@ -53,39 +53,3 @@
}
}
}
::ng-deep .clipboard-tab {
.mat-tab-header {
width: 160px;
flex: 0 0 160px;
.mat-tab-labels {
flex-direction: column;
justify-content: start;
border: none;
height: 100%;
.mat-tab-label {
padding: 0 10px;
align-content: flex-start;
text-align: left;
align-items: center;
justify-content: flex-start;
.mat-checkbox {
label {
margin-right: 8px;
}
}
}
}
.mat-ink-bar {
display: none;
}
}
.mat-tab-body-wrapper {
flex: 1 1 auto;
border-left: 1px solid #dddddd;
.mat-tab-body {
padding: 10px;
}
}
}

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

@ -19,6 +19,7 @@
[detailContents]="data.detailContents"
[curReceiverList]="curReceiverList"
[fileAllowSize]="fileAllowSize"
[sendProcessing]="sendProcessing"
(send)="onSend($event)"
(selectReceiver)="onSelectReceiver($event)"
(cancel)="onCancel()"

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

@ -82,6 +82,8 @@ export class MessageWriteDialogComponent implements OnInit {
isModify = false;
sendProcessing = false;
constructor(
public dialogRef: MatDialogRef<
MessageWriteDialogData,
@ -150,6 +152,8 @@ export class MessageWriteDialogComponent implements OnInit {
}
}
onNewSend(message: Message) {
this.sendProcessing = true;
this.messageApiService
.sendMessage({
...message,
@ -162,6 +166,7 @@ export class MessageWriteDialogComponent implements OnInit {
.pipe(take(1))
.subscribe(
res => {
this.sendProcessing = false;
if (!!res && res.responseCode === MessageStatusCode.Success) {
let msg = '';
if (!!message.reservationTime) {
@ -265,6 +270,8 @@ export class MessageWriteDialogComponent implements OnInit {
);
}
onModifySend(message: MessageModify) {
this.sendProcessing = true;
this.messageApiService
.editReservationMessageEx({
...message,
@ -276,6 +283,7 @@ export class MessageWriteDialogComponent implements OnInit {
.pipe(take(1))
.subscribe(
res => {
this.sendProcessing = false;
if (!!res && res.responseCode === MessageStatusCode.Success) {
this.snackBarService.open(
this.translateService.instant(

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

@ -53,33 +53,3 @@
}
}
}
::ng-deep .setting-tab {
.mat-tab-header {
border: none !important;
.mat-tab-labels {
flex-direction: column;
justify-content: start;
border: none;
height: 100%;
.mat-tab-label {
padding: 0 10px;
align-content: flex-start;
text-align: left;
align-items: center;
justify-content: flex-start;
&.mat-tab-label-active {
opacity: 1;
}
}
}
.mat-ink-bar {
opacity: 0;
}
}
.mat-tab-body-wrapper {
flex: 1 1 auto;
border-left: 1px solid #dddddd;
}
}

8
projects/ucap-webmessenger-app/src/assets/i18n/en.json
View File

@ -4,8 +4,8 @@
"login": "Login",
"logout": "Logout",
"fieldCompany": "Company",
"fieldLoginId": "Login ID",
"fieldLoginPw": "Login password",
"fieldLoginId": "DSP/SC Community ID",
"fieldLoginPw": "DSP/SC Community password",
"fieldPassword": "Password",
"fieldCurrentPassword": "Current password",
"fieldNewPassword": "New password",
@ -26,8 +26,8 @@
"doLogoutByOthers": "Forced logout by user."
},
"errors": {
"requireLoginId": "Login ID is required.",
"requireLoginPw": "Login password is required.",
"requireLoginId": "ID is required.",
"requireLoginPw": "password is required.",
"requireCompany": "Company is required.",
"requireCurrentPassword": "Current password is required.",
"notSameWithCurrentPassword": "Does not match current password",

8
projects/ucap-webmessenger-app/src/assets/i18n/ko.json
View File

@ -4,8 +4,8 @@
"login": "로그인",
"logout": "로그아웃",
"fieldCompany": "회사",
"fieldLoginId": "로그인 아이디",
"fieldLoginPw": "로그인 비밀번호",
"fieldLoginId": "DSP/SC 커뮤티니 아이디",
"fieldLoginPw": "DSP/SC 커뮤티니 비밀번호",
"fieldPassword": "비밀번호",
"fieldCurrentPassword": "현재 비밀번호",
"fieldNewPassword": "신규 비밀번호",
@ -26,8 +26,8 @@
"doLogoutByOthers": "사용자에 의해 강제로그아웃 하였습니다."
},
"errors": {
"requireLoginId": "로그인 아이디를 입력해 주세요.",
"requireLoginPw": "로그인 비밀번호를 입력해 주세요.",
"requireLoginId": "아이디를 입력해 주세요.",
"requireLoginPw": "비밀번호를 입력해 주세요.",
"requireCompany": "회사를 입력해 주세요.",
"requireCurrentPassword": "현재 비밀번호를 입력해 주세요",
"notSameWithCurrentPassword": "현재 비밀번호와 일치하지 않습니다",

46
projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
View File

@ -351,10 +351,12 @@ $daesang-grey: (
box-shadow: none;
border-radius: 0px;
}
.btn-main-float .bg-accent-dark {
background: mat-color($accent, 600);
color: mat-color($primary, default-contrast);
}
.current-head {
display: flex;
justify-content: center;
@ -389,6 +391,7 @@ $daesang-grey: (
}
.mat-tab-body-wrapper {
height: 100%;
border: none;
}
}
@ -401,31 +404,29 @@ $daesang-grey: (
}
}
/*mat-tab-group[horizontal] {
&.theme-list {
.mat-tab-label {
flex-direction: row;
}
}
}*/
mat-tab-group[vertical] {
display: flex;
flex-direction: row;
.mat-tab-labels {
display: flex;
flex-direction: column;
align-content: flex-start;
.mat-tab-label {
justify-content: flex-start;
padding: 0;
.mat-checkbox {
margin-right: 8px;
}
}
}
.mat-ink-bar {
opacity: 0;
}
.mat-tab-body-wrapper {
flex: 1 1 auto;
border-left: 1px solid #dddddd;
padding: 0 10px;
}
}
nav[mat-tab-nav-bar][vertical] {
@ -496,12 +497,35 @@ $daesang-grey: (
}
}
//[s] 번역
.translationForm {
background-color: mat-color($accent, 200, 0.4);
.select-language {
.mat-form-field-wrapper {
width: 100%;
line-height: 0.8em;
.mat-form-field-infix {
padding: 0.2em 0 0;
}
}
.mat-form-field-underline {
bottom: 0.8em;
}
}
.mat-slide-toggle {
@media screen and (max-width: #{$tablet-s-width}) {
label {
width: 20%;
flex-flow: column;
font-size: 0.8em;
}
}
}
}
.translation-preview {
background-color: mat-color($accent, 900, 0.8);
}
.tree-has-child {
li {
.tree-node-body {

11
projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html
View File

@ -1,6 +1,7 @@
<mat-card class="mat-elevation-z0 ucap-message-write">
<form name="messageWriteForm" [formGroup]="messageWriteForm" novalidate>
<perfect-scrollbar>
<div class="write-form">
<div class="add-row">
<button
mat-button
@ -82,8 +83,7 @@
class="attach-file-list"
>
<div class="attach-file">
<span class="mdi mdi-attachment mdi-18px"> </span
>
<span class="mdi mdi-attachment mdi-18px"> </span>
<span class="file-name">{{ oldAttachment.resContent }}</span>
<button
mat-button
@ -115,6 +115,7 @@
</mat-list>
</mat-card-content>
</div>
</div>
</perfect-scrollbar>
</form>
@ -156,7 +157,8 @@
!receiverList ||
0 === receiverList.length ||
0 === contentLength ||
1000 < contentLength
1000 < contentLength ||
!!sendProcessing
"
class="mat-primary"
>
@ -170,7 +172,8 @@
!receiverList ||
0 === receiverList.length ||
0 === contentLength ||
1000 < contentLength
1000 < contentLength ||
!!sendProcessing
"
class="mat-primary"
>

6
projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss
View File

@ -7,6 +7,9 @@
.ps--active-x > .ps__rail-x {
display: none;
}
.write-form {
padding-right: 10px;
}
}
}
@ -72,7 +75,6 @@
min-height: 250px;
border: 1px solid #dddddd;
word-break: break-all;
//overflow: auto;
}
}
}
@ -119,8 +121,6 @@
.mat-chip-list {
.mat-chip-list-wrapper {
margin: 0;
/* max-height: 100px;
overflow: auto;*/
}
}
.message-title {

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

@ -96,6 +96,8 @@ export class WriteComponent implements OnInit, OnDestroy, AfterViewInit {
isModify = false;
@Input()
fileAllowSize: number;
@Input()
sendProcessing = false;
@Output()
send = new EventEmitter<Message | MessageModify>();

6
projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss
View File

@ -1,4 +1,4 @@
::ng-deep .organization-tree {
.organization-tree {
padding: 5px;
.tree-node-closer-container {
@ -65,9 +65,6 @@
border-radius: 4px;
button {
line-height: normal;
.mat-button-wrapper {
width: 24px;
height: 24px;
.tree-node-expand-btn {
background-color: transparent;
font-size: 20px;
@ -76,7 +73,6 @@
}
}
}
}
.tree-no-child {
height: 50px;

3
projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss
View File

@ -26,6 +26,7 @@
::ng-deep .theme-list {
.mat-tab-header {
width: 100%;
border: none !important;
.mat-tab-labels {
position: relative;
width: 100%;
@ -45,7 +46,7 @@
}
}
.mat-tab-body-wrapper {
border: none;
border: none !important;
}
}

41
projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss
View File

@ -1 +1,40 @@
$tablet-s-width: 768px;
//mat-snack-bar-container
.cdk-global-overlay-wrapper {
.mat-snack-bar-container {
margin: 0;
padding: 30px;
max-width: 60vw;
.mat-simple-snackbar {
display: flex;
justify-content: center;
span {
@include ellipsis(3);
display: inline-block;
padding: 7px 20px;
border: 1px solid #ffffff;
background-color: rgb(255, 255, 255, 0.2);
color: #ffffff;
margin-right: 4px;
flex: 1 1 auto;
max-width: 40vw;
}
&-action {
display: inline-flex;
margin-left: auto;
flex: 0 0 auto;
height: 100%;
button {
//background-color: #00b6d5;
border-radius: 2px;
span {
padding: 0 20px;
color: #ffffff;
background: none;
border: none;
font-weight: 500;
}
}
}
}
}
}

24
projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss
View File

@ -98,27 +98,3 @@ $tablet-s-width: 768px;
}
}
}
::ng-deep .translationForm {
.select-language {
.mat-form-field-wrapper {
width: 100%;
line-height: 0.8em;
.mat-form-field-infix {
padding: 0.2em 0 0;
}
}
.mat-form-field-underline {
bottom: 0.8em;
}
}
.mat-slide-toggle {
@media screen and (max-width: #{$tablet-s-width}) {
label {
width: 20%;
flex-flow: column;
font-size: 0.8em;
}
}
}
}