diff --git a/frontend/src/components/Chat.js b/frontend/src/components/Chat.js index 506c45d..68fcea2 100644 --- a/frontend/src/components/Chat.js +++ b/frontend/src/components/Chat.js @@ -97,8 +97,8 @@ function Chat(props) { } return ( -
  • - history.push(`/user/${userId?._id}`)} avatar src={userId?.avatar} style={{ background: 'white' }} /> +
  • setShowReactions(false)}> + history.push(`/chat/${userId?.postId}`)} avatar src={userId?.avatar} style={{ background: 'white' }} />
    {userId?.name} {moment(createdAt).fromNow()}

    {message}

    @@ -108,7 +108,7 @@ function Chat(props) { : null} -
    +
    {Object.keys(mostUsedEmojis).slice(0, 100).map(emoji => )}
    diff --git a/frontend/src/components/User.js b/frontend/src/components/User.js index 35ca809..9afc761 100644 --- a/frontend/src/components/User.js +++ b/frontend/src/components/User.js @@ -30,12 +30,12 @@ function User(props) {
    - {props?.userId.name} + {props?.userId?.name}
    -

    {props?.userId.points - 10} 💰

    +

    {props?.userId?.points - 10} 💰

    {/* Send Message */} - +
    diff --git a/frontend/src/components/VideoPreview/VideoPreview.js b/frontend/src/components/VideoPreview/VideoPreview.js index 41d7140..3c4c04a 100644 --- a/frontend/src/components/VideoPreview/VideoPreview.js +++ b/frontend/src/components/VideoPreview/VideoPreview.js @@ -21,7 +21,7 @@ export default function VideoPreview({ setLittleVideo }) { if (api) { const listeners = { speakerChanged: (evt) => { - console.log('evt', evt) + console.log('evt', evt, api) let largeVideo = api._getLargeVideo() console.log(largeVideo, 'largeVideo') // const avatarURL = api.getAvatarURL() @@ -44,7 +44,7 @@ export default function VideoPreview({ setLittleVideo }) { dominantSpeakerChanged: (evt) => { console.log('dominant speaker chnaged', evt) - api._setLargeVideoParticipant(evt.id); + // api._setLargeVideoParticipant(evt.id); } } @@ -85,9 +85,9 @@ export default function VideoPreview({ setLittleVideo }) { autoPlay="" id="video" ref={ref} - style={{ transform: 'none', cursor: 'pointer' }} + // style={{ transform: 'none', cursor: 'pointer' }} - // style={{ transform: 'none', display: hasVideo ? 'block' : 'none', cursor: 'pointer' }} + style={{ transform: 'none', display: hasVideo ? 'block' : 'none', cursor: 'pointer' }} muted onClick={() => { setLittleVideo(false); gotoRoom(room); }} > diff --git a/package.json b/package.json index ae1bf47..a690336 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CowBellClub", - "version": "1.5.7", + "version": "1.5.8", "description": "Electron application for Cowbell Club", "main": "./build/main.js", "productName": "CowbellClub",