diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss index 1db7c72e..95fdbca9 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss @@ -46,6 +46,7 @@ .responsive-chats-button { display: none; + line-height: normal; &:last-child { display: block; padding: 0; @@ -54,7 +55,6 @@ border-radius: 50%; color: #efefef; font-size: 16px; - line-height: 40px; } } width: 50px; @@ -84,7 +84,7 @@ height: 20px; span { border-radius: 10px; - padding: 2px 10px; + padding: 1px 10px; margin-right: 6px; font-size: 13px; } diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json index d2e25ea4..8cb2a431 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json @@ -111,6 +111,7 @@ "confirmRecallEvent": "Do you want to recall the chat?
It is also retrieved from the other party's chat window.", "typeReceived": "Received", "typeSent": "Sent", + "sender": "Sender", "sentDate": "Sent date", "validityPeriod": "Validity period", "forwardEventToMe": "Forward chat to me", @@ -126,6 +127,24 @@ "ejectFromRoom": "Eject from room", "confirmEjectFromRoom": "Do you want to eject member[{{targetMember}}] from room?", "badgeDescriptionForUnread": "There is an unconfirmed message.", + "event": { + "inviteToRoomWith": "{{owner}} invited {{inviter}}.", + "exitFromRoomWith": "{{exitor}} has left.", + "ejectedFromRoomWith": "{{requester}} has eject {{ejected}}.", + "renamedRoomWith": "{{requester}} has changed their chat room name to '{{roomName}}'.", + "setTimerWith": "{{requester}} set a timer ({{timer}})", + "showMassTranslationOfOriginal": "Show original", + "showMassTranslationOfTranslated": "Show translated", + "showMassDetail": "Show detail", + "readToHere": "Read to here", + "recalled": "Recalled", + "scheduleTypeNew": "[Event] Registered", + "scheduleTypeUpdate": "[Event] Modified", + "scheduleTypeDelete": "[Event] Deleted", + "scheduleTypeDefault": "[Event] Processing..", + "showPreviousEvents": "Show previous", + "moreUnreadEventsWith": "There is unread messages({{countOfUnread}})" + }, "albumBox": { "label": "Album box" }, @@ -223,6 +242,8 @@ "searchResult": "Search result", "useOnlyForSpecialCharacter": "Can only use Special characters: {{v}}", "units": { + "date": "Date", + "time": "Time", "hour": "hour", "hourFrom": "hour", "minute": "minute", @@ -235,6 +256,7 @@ "download": "Download", "delete": "Delete", "save": "Save", + "saveAs": "Save as", "saveAll": "Save all", "downloadSelected": "Download selected", "openDownloadFolder": "Open download folder", @@ -286,7 +308,8 @@ "Close window": "Close window", "zoomOut": "Zoom out", "zoomIn": "Zoom in", - "zoomReset": "Zoom reset" + "zoomReset": "Zoom reset", + "sirWith": "{{sir}}" }, "paginator": { "itemsPerPage": "Items per page", diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json index 900942ca..824fbfa3 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -111,6 +111,7 @@ "confirmRecallEvent": "해당 대화를 회수하시겠습니까?
상대방 대화창에서도 회수됩니다.", "typeReceived": "수신", "typeSent": "발신", + "sender": "보낸 사람", "sentDate": "보낸 날짜", "validityPeriod": "유효 기간", "forwardEventToMe": "대화 나에게 전달", @@ -126,6 +127,24 @@ "ejectFromRoom": "강퇴", "confirmEjectFromRoom": "{{targetMember}} 님을 대화방에서 퇴장 시키겠습니까?", "badgeDescriptionForUnread": "확인하지 않은 메시지가 있습니다.", + "event": { + "inviteToRoomWith": "{{owner}}이 {{inviter}}을 초대했습니다.", + "exitFromRoomWith": "{{exitor}}님이 퇴장하셨습니다.", + "ejectedFromRoomWith": "{{requester}}님이 {{ejected}}님을 퇴장 시키셨습니다.", + "renamedRoomWith": "{{requester}}님이 대화방명을 '{{roomName}}'으로 변경하셨습니다.", + "setTimerWith": "{{requester}}님이 타이머를 설정하였습니다. ({{timer}})", + "showMassTranslationOfOriginal": "원본 보기", + "showMassTranslationOfTranslated": "번역 보기", + "showMassDetail": "전체 보기", + "readToHere": "여기까지 읽었습니다.", + "recalled": "회수된 메시지", + "scheduleTypeNew": "[이벤트] 등록", + "scheduleTypeUpdate": "[이벤트] 수정", + "scheduleTypeDelete": "[이벤트] 삭제", + "scheduleTypeDefault": "[이벤트] 조회중..", + "showPreviousEvents": "이전 대화 보기", + "moreUnreadEventsWith": "안읽은 메시지가 ({{countOfUnread}})개 더 있습니다." + }, "albumBox": { "label": "앨범함" }, @@ -223,6 +242,8 @@ "searchResult": "검색 결과", "useOnlyForSpecialCharacter": "특수문자는 {{specialCharacter}}만 사용할 수 있습니다.", "units": { + "date": "날짜", + "time": "시간", "hour": "시", "hourFrom": "시간", "minute": "분", @@ -235,6 +256,7 @@ "download": "파일 다운로드", "delete": "파일 삭제", "save": "파일 저장", + "saveAs": "파일을 다른 이름으로 저장", "saveAll": "파일 모두 저장", "downloadSelected": "선택된 파일 다운로드", "openDownloadFolder": "다운로드 폴더 열기", @@ -286,7 +308,8 @@ "closeWindow": "창 닫기", "zoomOut": "축소", "zoomIn": "확대", - "zoomReset": "원본 비율" + "zoomReset": "원본 비율", + "sirWith": "{{sir}}님" }, "paginator": { "itemsPerPage": "페이지별 갯수", diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index d4b8294d..b6927d16 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -282,6 +282,10 @@ $daesang-grey: ( } } + .load-container .loader:after { + background-color: mat-color($accent, 300); + } + .global-menu { .mat-tab-label[aria-selected='true'] { .mat-tab-label-content { diff --git a/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css b/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css index da815e5c..5788c47a 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css +++ b/projects/ucap-webmessenger-app/src/assets/scss/partials/splash.css @@ -1,17 +1,19 @@ .wrapper-splash { position: absolute; + display: flex; + justify-content: center; + justify-items: center; z-index: 99999; width: 100%; height: 100%; pointer-events: none; background-size: cover; height: 100%; - background: #eaeff1; - background: linear-gradient(to top, #93a3af, #eaeff1); + /*background: linear-gradient(to top, #93a3af, #eaeff1);*/ margin: 0; padding: 0; } -.svg-img { +/*.svg-img { position: absolute; width: 240px; height: 120px; @@ -45,4 +47,93 @@ #loop-offset { display: none; +}*/ +.load-container { + display: flex; + flex-flow: column; + justify-content: center; + justify-items: center; + transform: translateY(-60px); +} + +.load-container .loader { + font-size: 10px; + margin: 50px auto; + text-indent: -9999em; + width: 11em; + height: 11em; + border-radius: 50%; + background: #ffffff; + background: -moz-linear-gradient( + left, + #ffffff 10%, + rgba(255, 255, 255, 0) 42% + ); + background: -webkit-linear-gradient( + left, + #ffffff 10%, + rgba(255, 255, 255, 0) 42% + ); + background: -o-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%); + background: -ms-linear-gradient( + left, + #ffffff 10%, + rgba(255, 255, 255, 0) 42% + ); + background: linear-gradient(to right, #00b6d5 10%, #fb8c00, 42%); + position: relative; + -webkit-animation: load3 1.4s infinite linear; + animation: load3 1.4s infinite linear; + -webkit-transform: translateZ(0); + -ms-transform: translateZ(0); + transform: translateZ(0); +} +.load-container .loader:before { + width: 50%; + height: 50%; + background: #ffffff; + border-radius: 100% 0 0 0; + position: absolute; + top: 0; + left: 0; + content: ''; +} +.load-container .loader:after { + width: 75%; + height: 75%; + border-radius: 50%; + content: ''; + margin: auto; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; +} +.credit { + color: #ffffff; + margin: 0 auto; + font-size: 1.3em; + font-weight: 500; +} + +@-webkit-keyframes load3 { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } +} +@keyframes load3 { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } } diff --git a/projects/ucap-webmessenger-app/src/index.html b/projects/ucap-webmessenger-app/src/index.html index 05d03fa3..c2841e4c 100644 --- a/projects/ucap-webmessenger-app/src/index.html +++ b/projects/ucap-webmessenger-app/src/index.html @@ -12,8 +12,8 @@ -
- + +
+
+ Welcome to DS Talk +
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/allim.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/allim.component.html index 42969e0f..e23ecc52 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/allim.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/allim.component.html @@ -4,11 +4,11 @@