-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[MODI-294] feat- 채팅리스트 페이지의 레이아웃 구현 #142
Open
DorrKim
wants to merge
5
commits into
develop
Choose a base branch
from
feat/MODI-294
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ea2bc3a
feat: chatPage 라우팅 처리
DorrKim ef999b3
feat: ChatRoomList, ChatRoomListItem 컴포넌트 기본 레이아웃 구성
DorrKim 6136121
style: ListItemButton 적용
DorrKim 40eaa09
style: ListItem, ListItemButton 마진 및 패딩 조절
DorrKim 78fd1f0
style: 공통된 sx를 추출하여 textOverflowEllipsisSx로 통합
DorrKim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
import { List } from '@mui/material'; | ||
|
||
import ChatRoomListItem from './ChatRoomListItem'; | ||
const CHAT_ROOM_LIST_DUMMY = { | ||
chatListItemArray: [ | ||
{ | ||
partyId: 1, | ||
ottName: '넷플릭스', | ||
partyLeaderName: '조용한 사슴', | ||
latestMessageText: | ||
'오늘부터 공유계정의 비밀번호를 변경하였습니다. 확인부탁드립니다.', | ||
countNotReadMessage: 100, | ||
}, | ||
{ | ||
partyId: 2, | ||
ottName: '쿠팡 플레이', | ||
partyLeaderName: '살찐 고양이', | ||
latestMessageText: | ||
'비매너 행동을 하는 멤버가 있는 것 같은데 주의부탁드립니다. ', | ||
countNotReadMessage: 3, | ||
}, | ||
{ | ||
partyId: 3, | ||
ottName: '라프텔', | ||
partyLeaderName: '언짢은 강아지', | ||
latestMessageText: | ||
'오늘부터 같이 파티를 하게 되었네요! 잘 부탁드려요 ㅋㅋㅋ ', | ||
countNotReadMessage: 0, | ||
}, | ||
{ | ||
partyId: 4, | ||
ottName: '아마존 프라임', | ||
partyLeaderName: '조용한 사슴', | ||
latestMessageText: '아 자꾸 비매너 행동하시는데 계속 이러시면 신고합니다', | ||
countNotReadMessage: 122, | ||
}, | ||
{ | ||
partyId: 1, | ||
ottName: '웨이브', | ||
partyLeaderName: '좋은 카멜레온', | ||
latestMessageText: '혹시 지금 저만 계정 접속이 안되나요??', | ||
countNotReadMessage: 83, | ||
}, | ||
], | ||
}; | ||
|
||
const ChatRoomList = () => { | ||
return ( | ||
<List> | ||
{CHAT_ROOM_LIST_DUMMY.chatListItemArray.map( | ||
({ | ||
partyId, | ||
ottName, | ||
partyLeaderName, | ||
latestMessageText, | ||
countNotReadMessage, | ||
}) => ( | ||
<ChatRoomListItem | ||
key={partyId} | ||
ottName={ottName} | ||
partyLeaderName={partyLeaderName} | ||
latestMessageText={latestMessageText} | ||
countNotReadMessage={countNotReadMessage} | ||
/> | ||
), | ||
)} | ||
</List> | ||
); | ||
}; | ||
|
||
export default ChatRoomList; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
import { | ||
Badge, | ||
Box, | ||
ListItem, | ||
ListItemAvatar, | ||
ListItemText, | ||
ListItemButton, | ||
Typography, | ||
} from '@mui/material'; | ||
import OttLogo from 'components/Ott/OttLogo'; | ||
import PropTypes from 'prop-types'; | ||
|
||
const ChatRoomListItem = ({ | ||
ottName, | ||
partyLeaderName, | ||
latestMessageText, | ||
countNotReadMessage, | ||
}) => { | ||
const textOverflowEllipsisSx = { | ||
overflow: 'hidden', | ||
whiteSpace: 'nowrap', | ||
textOverflow: 'ellipsis', | ||
}; | ||
|
||
return ( | ||
<> | ||
<ListItem disableGutters disablePadding divider> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 엇 여기에 divider 프롭을 넣으면 구분줄이 생기는군요 알림 리스트에도 적용해야겠어요!! 감사합니다! |
||
<ListItemButton | ||
sx={{ | ||
width: '100%', | ||
background: 'transparent', | ||
pt: 2, | ||
pb: 2, | ||
}} | ||
> | ||
<ListItemAvatar> | ||
<OttLogo ottName={ottName} size={45} /> | ||
</ListItemAvatar> | ||
<ListItemText | ||
disableTypography | ||
sx={{ | ||
width: '100%', | ||
}} | ||
> | ||
<Box | ||
sx={{ | ||
display: 'flex', | ||
justifyContent: 'space-between', | ||
alignItems: 'center', | ||
}} | ||
> | ||
<Box | ||
sx={{ | ||
width: '80%', | ||
}} | ||
> | ||
<Typography | ||
variant="smallB" | ||
component="div" | ||
mb={0.5} | ||
sx={textOverflowEllipsisSx} | ||
> | ||
{`${partyLeaderName}의 ${ottName}`} | ||
</Typography> | ||
<Typography | ||
variant="micro" | ||
component="div" | ||
sx={textOverflowEllipsisSx} | ||
> | ||
{latestMessageText} | ||
</Typography> | ||
</Box> | ||
<Badge | ||
badgeContent={countNotReadMessage} | ||
color="primary" | ||
sx={{ | ||
mr: 2, | ||
}} | ||
/> | ||
</Box> | ||
</ListItemText> | ||
</ListItemButton> | ||
</ListItem> | ||
</> | ||
); | ||
}; | ||
|
||
ChatRoomListItem.propTypes = { | ||
ottName: PropTypes.oneOf([ | ||
'넷플릭스', | ||
'왓챠', | ||
'웨이브', | ||
'티빙', | ||
'디즈니 플러스', | ||
'라프텔', | ||
'쿠팡 플레이', | ||
'아마존 프라임', | ||
'', | ||
]), | ||
partyLeaderName: PropTypes.string, | ||
latestMessageText: PropTypes.string, | ||
countNotReadMessage: PropTypes.number, | ||
}; | ||
|
||
export default ChatRoomListItem; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import ChatRoomList from 'components/Chat/ChatRoomList'; | ||
import PageContainer from 'components/Common/PageContainer'; | ||
import PageContents from 'components/Common/PageContents'; | ||
import PageHeader from 'components/Common/PageHeader'; | ||
|
||
const ChatPage = () => { | ||
return ( | ||
<PageContainer> | ||
<PageHeader title="메세지" /> | ||
<PageContents> | ||
<ChatRoomList /> | ||
</PageContents> | ||
</PageContainer> | ||
); | ||
}; | ||
|
||
export default ChatPage; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
flagment tag로 감싼 이유가 있을까요?