diff --git a/package.json b/package.json index b22e17ca..fa3f0254 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "@types/webpack": "^4.39.5", "@types/webpack-merge": "^4.1.5", "@types/webpack-node-externals": "^1.6.3", + "angular-split": "^3.0.2", "awesome-node-loader": "^1.1.1", "awesome-typescript-loader": "^5.2.1", "classlist.js": "^1.1.20150312", diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html index 979983c7..4004a64d 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html @@ -1,3 +1,17 @@ +
+ {{ selectedRightDrawer }} + + + +
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.ts index e0712a21..65945641 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.ts @@ -20,6 +20,8 @@ export class RightDrawerComponent implements OnInit { openProfile = new EventEmitter< UserInfo | UserInfoSS | UserInfoF | UserInfoDN >(); + @Output() + closeRightDrawer = new EventEmitter(); RightDrawer = RightDrawer; @@ -30,4 +32,8 @@ export class RightDrawerComponent implements OnInit { onClickOpenProfile(userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN) { this.openProfile.emit(userInfo); } + + onClickClose() { + this.closeRightDrawer.emit(); + } } diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html index a2c6940b..29a0e328 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html @@ -1,38 +1,57 @@
-
- -
- - -
- - - -
- + - - - -
+
+ +
+ + + + +
+ + + +
+ + + + +
+
+