diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
index 3e972fa7..0650f8c1 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
@@ -232,7 +232,6 @@ export class GroupComponent implements OnInit, OnDestroy {
}
onSelectBuddy(buddy: UserInfo) {
- this.logger.debug('onSelectBuddy', buddy);
if (buddy.seq === this.loginRes.userSeq) {
this.store.dispatch(
ChatStore.openRoom({ userSeqList: [this.loginRes.talkWithMeBotSeq] })
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
index f890a17a..c93be4d8 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
@@ -7,10 +7,35 @@
+
+
-
-
-
-
-
- -
-
-
-
- {{ link.title }}
-
-
-
-
-
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss
index 64f50889..d7a6f564 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss
@@ -132,58 +132,3 @@
}
}
}
-
-.weblink {
- position: absolute;
- width: 350px;
- height: 40%;
- top: 60px;
- right: 15px;
- background: #fff;
- border-radius: 5px;
- border: 1px solid #666;
- z-index: 2;
- padding: 10px;
- display: none;
-
- .container {
- display: flex;
- padding: 0 10px;
- height: 100%;
- overflow-y: auto;
- flex-wrap: wrap;
-
- .img-item {
- cursor: pointer;
- margin-bottom: 10px;
- margin-right: 9px;
- position: relative;
- height: 150px;
-
- ul {
- li {
- list-style: none;
- float: left;
- margin: 0 10px 20px 10px;
-
- .icon {
- height: 50px;
- width: 50px;
- line-height: 50px;
- }
- .description {
- width: 50px;
- text-align: center;
- }
- .ellipsis {
- display: block;
- text-overflow: ellipsis;
- white-space: nowrap;
- word-wrap: normal;
- overflow: hidden;
- }
- }
- }
- }
- }
-}
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
index 3e89267e..d2717d49 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
@@ -50,9 +50,9 @@ export class TopBarComponent implements OnInit, OnDestroy {
updateInfo$: Observable;
- showWeblink = false;
loginInfo: LoginInfo;
weblink: WebLink[] = [];
+ weblinkBadgeTypes: WebLink[] = [];
webLinkBadgeMail = 0;
webLinkBadgePayment = 0;
@@ -78,8 +78,6 @@ export class TopBarComponent implements OnInit, OnDestroy {
KEY_LOGIN_INFO
);
- this.showWeblink = false;
-
// WebLink init..
this.initWebLink();
})
@@ -114,10 +112,20 @@ export class TopBarComponent implements OnInit, OnDestroy {
weblink =>
urlInfo.webLinkAllowedList
.filter(
- type => type !== 'WebLinkMailCnt' && type !== 'WebLinkPaymentCnt'
+ type =>
+ type !== 'WebLinkMailCnt' &&
+ type !== 'WebLinkPaymentCnt' &&
+ type !== 'WebLinkMail' &&
+ type !== 'WebLinkPayment'
)
.filter(type => type === weblink.key).length > 0
);
+ this.weblinkBadgeTypes = urlInfo.webLink.filter(
+ weblink =>
+ urlInfo.webLinkAllowedList
+ .filter(type => type === 'WebLinkMail' || type === 'WebLinkPayment')
+ .filter(type => type === weblink.key).length > 0
+ );
if (urlInfo.webLinkAllowedList.indexOf('WebLinkMail') > -1) {
// 메일 카운트 체크.
@@ -223,9 +231,7 @@ export class TopBarComponent implements OnInit, OnDestroy {
);
}
- onToggleWebLinkSelector(): void {
- this.showWeblink = !this.showWeblink;
- }
+ /** About WebLink */
onClickWebLink(link: WebLink): void {
const appUserInfo = this.localStorageService.encGet(
KEY_APP_USER_INFO,