+
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss
index 43203001..a1f03445 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss
@@ -34,6 +34,29 @@
flex-direction: row;
}
+.myprofile {
+ position: absolute;
+ display: flex;
+ flex-flow: column;
+ justify-content: center;
+ height: 80px;
+ width: 68px;
+ bottom: 10px;
+ color: #ffffff;
+ font-size: 11px;
+ text-align: center;
+
+ .myprofile-img {
+ display: block;
+ border-radius: 10px;
+ height: 42px;
+ width: 42px;
+ background-color: #efefef;
+ align-self: center;
+ margin-bottom: 6px;
+ }
+}
+
::ng-deep .organization-side {
flex-direction: column;
height: 100%;
@@ -43,7 +66,7 @@
.mat-tab-list {
.mat-tab-labels {
flex-flow: column;
- height: 280px;
+ height: 360px;
padding-top: 10px;
border-bottom: none;
.mat-tab-label {
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts
index 78352307..376eeb25 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts
@@ -35,6 +35,7 @@ export enum MainMenu {
Group = 'GROUP',
Chat = 'CAHT',
Organization = 'ORGANIZATION',
+ Message = 'MESSAGE',
Call = 'CALL',
Conversation = 'CONVERSATION'
}
@@ -52,6 +53,7 @@ export class LeftSideComponent implements OnInit, OnDestroy {
>();
@ViewChildren('tabs') tabs: QueryList
>;
+ currentTabLable: string;
badgeChatUnReadCount: number;
badgeChatUnReadCountSubscription: Subscription;
@@ -81,6 +83,7 @@ export class LeftSideComponent implements OnInit, OnDestroy {
});
this.setFabInitial(MainMenu.Group);
+ this.currentTabLable = MainMenu.Group;
}
ngOnDestroy(): void {
@@ -158,6 +161,7 @@ export class LeftSideComponent implements OnInit, OnDestroy {
onSelectedTabChange(event: MatTabChangeEvent) {
this.setFabInitial(event.tab.ariaLabel);
+ this.currentTabLable = event.tab.ariaLabel;
this.tabs.forEach(tab => {
if (`tabs-${event.index}` === tab.nativeElement.id) {
@@ -177,11 +181,6 @@ export class LeftSideComponent implements OnInit, OnDestroy {
icon: 'add',
tooltip: 'New Group Add',
divisionType: 'GROUP_NEW_ADD'
- },
- {
- icon: 'sms',
- tooltip: 'Message',
- divisionType: 'MESSAGE'
}
];
}
@@ -297,16 +296,6 @@ export class LeftSideComponent implements OnInit, OnDestroy {
this.onClickNewChat('TIMER');
}
break;
-
- case 'MESSAGE':
- {
- this.store.dispatch(
- ChatStore.selectedRightDrawer({
- req: RightDrawer.Message
- })
- );
- }
- break;
}
}
}
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
index fb6e40c6..85578952 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
@@ -92,11 +92,17 @@
새 그룹 추가
+
+