just do it

xaviergmail · Jun 30, 2021 · 073c9fa · 073c9fa
1 parent c102fe3
commit 073c9fa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/frontend/src/components/Chat.js b/frontend/src/components/Chat.js
@@ -97,8 +97,8 @@ function Chat(props) {
 
         }
         return (
-            <li key={createdAt} className="message">
-                <Image onClick={() => history.push(`/user/${userId?._id}`)} avatar src={userId?.avatar} style={{ background: 'white' }} />
+            <li key={createdAt} className="message" onMouseLeave={() => setShowReactions(false)}>
+                <Image onClick={() => history.push(`/chat/${userId?.postId}`)} avatar src={userId?.avatar} style={{ background: 'white' }} />
                 <div className="msg">
                     <b className="name">{userId?.name} <i>{moment(createdAt).fromNow()}</i></b>
                     <p className="text">{message}</p>
@@ -108,7 +108,7 @@ function Chat(props) {
                             <EmojiPicker setShowReactions={setShowReactions} saveReaction={saveReaction} />
                             : null}
 
-                        <div className="emoji-options">
+                        <div className="emoji-options" >
                             <button className="reaction-btn" onClick={() => setShowReactions(!showReactions)}> <Icon name="plus circle" /></button>
 
                             <div className="pop-emojis">{Object.keys(mostUsedEmojis).slice(0, 100).map(emoji => <Emoji onClick={saveReaction} emoji={emoji} size={16} />)}</div>

diff --git a/frontend/src/components/User.js b/frontend/src/components/User.js
@@ -30,12 +30,12 @@ function User(props) {
             <section className="profile">
                 <Header as='h3'>
 
-                    {props?.userId.name}
+                    {props?.userId?.name}
                 </Header>
-                <h4>{props?.userId.points - 10} 💰</h4>
+                <h4>{props?.userId?.points - 10} 💰</h4>
                 {/* <Link to={`/chat/${props?.userId?.postId?._id}`}>Send Message</Link> */}
 
-                <Image src={props?.userId.avatar} avatar />
+                <Image src={props?.userId?.avatar} avatar />
             </section>
 
         </div>

diff --git 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); }}
       ></video>

diff --git 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",