Dragonfly - Mariya Mokrynska #25
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -42,7 +42,8 @@ | |
|
|
||
| #App #heartWidget { | ||
| font-size: 1.5em; | ||
| margin: 1em; | ||
| color: black; | ||
| } | ||
|
|
||
| #App span { | ||
|
|
||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,20 +1,31 @@ | ||
| import './ChatEntry.css'; | ||
| import TimeStamp from './TimeStamp'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
|
|
||
| const ChatEntry = (props) => { | ||
| let heart = props.liked ? '❤️' : '🤍'; | ||
| const messageClassName='chat-entry '+(props.isLocal?'local':'remote'); | ||
|
|
||
| return ( | ||
| <div className={messageClassName}> | ||
| <h2 className="entry-name">{props.sender}</h2> | ||
| <section className="entry-bubble"> | ||
| <p>{props.body}</p> | ||
| <p className="entry-time"><TimeStamp time={props.timeStamp}/></p> | ||
|
There was a problem hiding this comment. Nice job using the provided |
||
| <button className="like" onClick={() => props.onLikedToggle(props.id)} >{heart}</button> | ||
| </section> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| ChatEntry.propTypes = { | ||
| id: PropTypes.number.isRequired, | ||
| sender: PropTypes.string.isRequired, | ||
| body: PropTypes.string.isRequired, | ||
| timeStamp: PropTypes.string.isRequired, | ||
| liked: PropTypes.bool.isRequired, | ||
| onLikedToggle: PropTypes.func.isRequired, | ||
| isLocal:PropTypes.bool.isRequired | ||
| }; | ||
| export default ChatEntry; | ||
This file contains hidden or 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,40 @@ | ||||||
| import ChatEntry from './ChatEntry'; | ||||||
| import './ChatLog.css'; | ||||||
| import PropTypes from 'prop-types'; | ||||||
|
|
||||||
|
|
||||||
| const ChatLog = ({entries,onItemLikedToggle}) => { | ||||||
|
There was a problem hiding this comment. Nitpick: fix up whitespacing In industry, when you're creating a pull request for review, be sure that your code is neat, the style conforms to the style guide, stray comments are removed. Typically, a teammate will not review a PR until the code styling issues are fixed up. Code with styling issues are not allowed to be merged into main because it would introduce inconsistencies in a codebase that compromises readability and the maintenance of a project.
Suggested change
|
||||||
| if (entries.length === 0) return null; | ||||||
| const localName = entries[0].sender; | ||||||
|
Comment on lines
+7
to
+8
There was a problem hiding this comment. The reason your test was failing was because if |
||||||
| return entries.map(entry => { | ||||||
| return ( | ||||||
| <ChatEntry | ||||||
| key={entry.id} | ||||||
| id={entry.id} | ||||||
| sender={entry.sender} | ||||||
| body={entry.body} | ||||||
| timeStamp={entry.timeStamp} | ||||||
| liked={entry.liked} | ||||||
| onLikedToggle={onItemLikedToggle} | ||||||
| isLocal={entry.sender==localName} | ||||||
| /> | ||||||
| ); | ||||||
| }); | ||||||
| }; | ||||||
|
|
||||||
|
|
||||||
|
|
||||||
| ChatLog.propTypes = { | ||||||
| entries: PropTypes.arrayOf( | ||||||
| PropTypes.shape({ | ||||||
| id: PropTypes.number.isRequired, | ||||||
| sender: PropTypes.string.isRequired, | ||||||
| body: PropTypes.string.isRequired, | ||||||
| timeStamp: PropTypes.string.isRequired, | ||||||
| liked: PropTypes.bool.isRequired, | ||||||
| }) | ||||||
| ).isRequired, | ||||||
| onItemLikedToggle: PropTypes.func.isRequired | ||||||
| }; | ||||||
|
|
||||||
| export default ChatLog; | ||||||
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.
This data is already in
data/messages.json. Instead of copy and pasting the values here which repeats many lines of code in the codebase and makesApp.jsxlonger than it needs to be, we should import the data: