diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-side.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-side.component.html index 7a015a6d..68114870 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-side.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-side.component.html @@ -1,7 +1,5 @@ -
-
-
-
+
+
slide dashboard
-
\ No newline at end of file +
diff --git a/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_36.png b/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_36.png new file mode 100644 index 00000000..1b98d1e1 Binary files /dev/null and b/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_36.png differ diff --git a/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_80.png b/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_80.png new file mode 100644 index 00000000..2f6e938f Binary files /dev/null and b/projects/ucap-webmessenger-app/src/assets/images/img_groupphoto_80.png differ diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html index e8358dcf..2a3b9e88 100644 --- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html +++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html @@ -6,6 +6,7 @@ 즐겨찾기 diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html index 35138e62..0d24b2e3 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html @@ -1,14 +1,20 @@
- + +
{{ getRoomName(roomInfo) }}
-
- noReadCnt : {{ roomInfo.noReadCnt }} +
+ {{ roomInfo.joinUserCount }}명
{{ finalEventMessage }}
@@ -17,5 +23,15 @@
{{ roomInfo.finalEventDate }}
- 1 + + +
diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss index b81e9f22..599f2ff9 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss @@ -18,7 +18,7 @@ .profile-name { font-size: 16px; - @include ellipsis(1) + @include ellipsis(1); } .profile-last-message { @@ -93,6 +93,7 @@ font-size: 12px; color: $font-mid; margin-top: 4px; + @include ellipsis(1); } } .date { @@ -126,3 +127,9 @@ @include ellipsis(1); @include border-radius(100px); } + +.notiBadge { + position: absolute !important; + right: 22px; + bottom: 22px; +} diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts index 409e037a..95e54747 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts @@ -23,15 +23,17 @@ import { export class ListItemComponent implements OnInit { @Input() loginRes: LoginResponse; - @Input() roomInfo: RoomInfo; @Input() - roomUserInfo: RoomUserInfo[] | UserInfoShort[]; + roomUserInfo: (RoomUserInfo | UserInfoShort)[]; @Input() sessionVerinfo: VersionInfo2Response; + imagePath: string; + defaultPath = 'assets/images/img_nophoto_50.png'; finalEventMessage: string; + RoomType = RoomType; constructor(private logger: NGXLogger) {} @@ -41,6 +43,30 @@ export class ListItemComponent implements OnInit { } else { this.finalEventMessage = this.roomInfo.finalEventMessage; } + + switch (this.roomInfo.roomType) { + case RoomType.Multi: + this.defaultPath = 'assets/images/img_groupphoto_80.png'; + break; + case RoomType.Mytalk: + const me = this.roomUserInfo.filter( + v => v.seq === this.loginRes.userSeq + ); + if (!!me && me.length > 0) { + this.imagePath = me[0].profileImageFile; + } + break; + case RoomType.Single: + case RoomType.Bot: + case RoomType.Allim: + const others = this.roomUserInfo.filter( + v => v.seq !== this.loginRes.userSeq + ); + if (!!others && others.length > 0) { + this.imagePath = others[0].profileImageFile; + } + break; + } } getRoomName(roomInfo: RoomInfo): string { diff --git a/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts b/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts index 1a56969f..33a792d5 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts +++ b/projects/ucap-webmessenger-ui-room/src/lib/ucap-ui-room.module.ts @@ -8,6 +8,9 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { ListItemComponent } from './components/list-item.component'; +import { MatBadgeModule } from '@angular/material'; + +import { UCapUiModule } from '@ucap-webmessenger/ui'; const COMPONENTS = [ListItemComponent]; const DIRECTIVES = []; @@ -21,7 +24,10 @@ const SERVICES = []; FlexLayoutModule, MatFormFieldModule, MatIconModule, - MatInputModule + MatInputModule, + MatBadgeModule, + + UCapUiModule ], exports: [...COMPONENTS, ...DIRECTIVES], declarations: [...COMPONENTS, ...DIRECTIVES]