-
Notifications
You must be signed in to change notification settings - Fork 111
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
Jamie Horvath C17 Sharks digital #109
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,36 @@ | ||
import React from 'react'; | ||
import React, { useState } from 'react'; | ||
import './App.css'; | ||
import chatMessages from './data/messages.json'; | ||
import ChatLog from './components/ChatLog.js'; | ||
import HeartCount from './components/HeartCount.js'; | ||
|
||
const App = () => { | ||
const [heart, setHeart] = useState(chatMessages); | ||
|
||
const toggleHeart = (id) => { | ||
// count = 0; | ||
console.log({ id }); | ||
const newHeartCount = heart.map((message) => { | ||
if (message.id === id) { | ||
return { ...message, liked: !message.liked }; | ||
} | ||
return message; | ||
}); | ||
setHeart(newHeartCount); | ||
}; | ||
Comment on lines
+10
to
+20
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. Nice work managing the data and returning a brand new object using the spread operator! Here's a refresher on updating state in React: React components re-render whenever there is a change/update to state data. In this case, our data is an object and we are modifying values nested within that object. Under the hood, React uses Here is an article with more info: https://www.valentinog.com/blog/react-object-is/ |
||
|
||
return ( | ||
<div id="App"> | ||
<header> | ||
<h1>Application title</h1> | ||
<h2>{HeartCount(heart)}</h2> | ||
</header> | ||
<main> | ||
{/* Wave 01: Render one ChatEntry component | ||
Wave 02: Render ChatLog component */} | ||
{ | ||
/* Wave 01: Render one ChatEntry component | ||
Wave 02: Render ChatLog component */ | ||
<ChatLog entries={heart} toggleHeartCallback={toggleHeart}></ChatLog> | ||
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. Because <ChatLog entries={heart} toggleHeartCallback={toggleHeart} /> 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. Here's more info on when to use self-closing tags: https://stackoverflow.com/questions/48991212/react-component-closing-tag |
||
} | ||
</main> | ||
</div> | ||
); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,53 +1,53 @@ | ||
import React from 'react' | ||
import App from './App' | ||
import { render, screen, fireEvent } from '@testing-library/react' | ||
import React from 'react'; | ||
import App from './App'; | ||
import { render, screen, fireEvent } from '@testing-library/react'; | ||
|
||
describe('Wave 03: clicking like button and rendering App', () => { | ||
test('that the correct number of likes is printed at the top', () => { | ||
// Arrange | ||
const { container } = render(<App />) | ||
let buttons = container.querySelectorAll('button.like') | ||
const { container } = render(<App />); | ||
let buttons = container.querySelectorAll('button.like'); | ||
|
||
// Act | ||
fireEvent.click(buttons[0]) | ||
fireEvent.click(buttons[1]) | ||
fireEvent.click(buttons[10]) | ||
fireEvent.click(buttons[0]); | ||
fireEvent.click(buttons[1]); | ||
fireEvent.click(buttons[10]); | ||
|
||
// Assert | ||
const countScreen = screen.getByText(/3 ❤️s/) | ||
expect(countScreen).not.toBeNull() | ||
}) | ||
const countScreen = screen.getByText(/3 ❤️s/); | ||
expect(countScreen).not.toBeNull(); | ||
}); | ||
|
||
test('clicking button toggles heart and does not affect other buttons', () => { | ||
// Arrange | ||
const { container } = render(<App />) | ||
const buttons = container.querySelectorAll('button.like') | ||
const firstButton = buttons[0] | ||
const lastButton = buttons[buttons.length - 1] | ||
const { container } = render(<App />); | ||
const buttons = container.querySelectorAll('button.like'); | ||
const firstButton = buttons[0]; | ||
const lastButton = buttons[buttons.length - 1]; | ||
|
||
// Act-Assert | ||
|
||
// click the first button | ||
fireEvent.click(firstButton) | ||
expect(firstButton.innerHTML).toEqual('❤️') | ||
fireEvent.click(firstButton); | ||
expect(firstButton.innerHTML).toEqual('❤️'); | ||
|
||
// check that all other buttons haven't changed | ||
for (let i = 1; i < buttons.length; i++) { | ||
expect(buttons[i].innerHTML).toEqual('🤍') | ||
expect(buttons[i].innerHTML).toEqual('🤍'); | ||
} | ||
|
||
// click the first button a few more times | ||
fireEvent.click(firstButton) | ||
expect(firstButton.innerHTML).toEqual('🤍') | ||
fireEvent.click(firstButton) | ||
expect(firstButton.innerHTML).toEqual('❤️') | ||
fireEvent.click(firstButton) | ||
expect(firstButton.innerHTML).toEqual('🤍') | ||
fireEvent.click(firstButton); | ||
expect(firstButton.innerHTML).toEqual('🤍'); | ||
fireEvent.click(firstButton); | ||
expect(firstButton.innerHTML).toEqual('❤️'); | ||
fireEvent.click(firstButton); | ||
expect(firstButton.innerHTML).toEqual('🤍'); | ||
|
||
// click the last button a couple times | ||
fireEvent.click(lastButton) | ||
expect(lastButton.innerHTML).toEqual('❤️') | ||
fireEvent.click(lastButton) | ||
expect(lastButton.innerHTML).toEqual('🤍') | ||
}) | ||
}) | ||
fireEvent.click(lastButton); | ||
expect(lastButton.innerHTML).toEqual('❤️'); | ||
fireEvent.click(lastButton); | ||
expect(lastButton.innerHTML).toEqual('🤍'); | ||
}); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,37 @@ | ||
import React from 'react'; | ||
import './ChatEntry.css'; | ||
import PropTypes from 'prop-types'; | ||
import TimeStamp from './TimeStamp.js'; | ||
|
||
const ChatEntry = (props) => { | ||
const heartType = props.liked ? '❤️' : '🤍'; | ||
const handleToggleHeart = () => { | ||
props.toggleHeartCallback(props.id); | ||
}; | ||
|
||
return ( | ||
<div className="chat-entry local"> | ||
<h2 className="entry-name">Replace with name of sender</h2> | ||
<h2 className="entry-name">{props.sender}</h2> | ||
<section className="entry-bubble"> | ||
<p>Replace with body of ChatEntry</p> | ||
<p className="entry-time">Replace with TimeStamp component</p> | ||
<button className="like">🤍</button> | ||
<p>{props.body}</p> | ||
<p className="entry-time"> | ||
<TimeStamp time={props.timeStamp}></TimeStamp> | ||
</p> | ||
<button className="like" onClick={handleToggleHeart}> | ||
{heartType} | ||
</button> | ||
</section> | ||
</div> | ||
); | ||
}; | ||
Comment on lines
6
to
26
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. Nice work handling the likes feature. I also like the way you wrote this component, in the sense of, all logic pertaining to data or invoking other functions remain in the 'brains' of the component while the 'beauty' section in the return statement is only in charge of rendering data. |
||
|
||
ChatEntry.propTypes = { | ||
//Fill with correct proptypes | ||
id: PropTypes.number, | ||
sender: PropTypes.string.isRequired, | ||
body: PropTypes.string.isRequired, | ||
timeStamp: PropTypes.string.isRequired, | ||
liked: PropTypes.bool, | ||
toggleHeartCallback: PropTypes.func.isRequired, | ||
}; | ||
Comment on lines
28
to
35
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. 👍 |
||
|
||
export default ChatEntry; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
import React from 'react'; | ||
import './ChatLog.css'; | ||
import PropTypes from 'prop-types'; | ||
import ChatEntry from './ChatEntry.js'; | ||
|
||
const ChatLog = (props) => { | ||
const chitChats = props.entries.map((message, index) => { | ||
return ( | ||
<ChatEntry | ||
key={index} | ||
id={message.id} | ||
sender={message.sender} | ||
body={message.body} | ||
timeStamp={message.timeStamp} | ||
liked={message.liked} | ||
toggleHeartCallback={props.toggleHeartCallback} | ||
></ChatEntry> | ||
); | ||
}); | ||
return <div className="chat-log">{chitChats}</div>; | ||
}; | ||
Comment on lines
+6
to
+21
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. 👍 Nice work including the |
||
|
||
ChatLog.propTypes = { | ||
entries: PropTypes.arrayOf( | ||
PropTypes.shape({ | ||
id: PropTypes.number, | ||
sender: PropTypes.string.isRequired, | ||
body: PropTypes.string.isRequired, | ||
timeStamp: PropTypes.string.isRequired, | ||
liked: PropTypes.bool, | ||
}) | ||
).isRequired, | ||
toggleHeartCallback: PropTypes.func, | ||
}; | ||
Comment on lines
+23
to
+34
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. Nice work setting up the propTypes for validating the array's nested objects. |
||
export default ChatLog; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
const HeartCount = (messages) => { | ||
let count = 0; | ||
messages.forEach((m) => (m.liked ? count++ : m)); | ||
return <div>{count} ❤️s</div>; | ||
}; | ||
export default HeartCount; | ||
Comment on lines
+1
to
+6
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. Nice helper method!!! |
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.
When you're working with teams you'll want your PR's to only contain code your teammates should 'pull' as part of the codebase. Code that's meant to test features in local environments such as print statements or console logs can all be removed, or kept in a local branch.