From a13fd6aa2eeb07fd4bba57fbdad43418be98192e Mon Sep 17 00:00:00 2001 From: Lindsey Date: Mon, 19 Dec 2022 18:37:37 -0500 Subject: [PATCH 1/2] Passed wave 1 tests, started creating wave 2 component and prop --- src/App.js | 7 +++++-- src/components/ChatEntry.js | 33 +++++++++++++++++++++++++++----- src/components/ChatEntry.test.js | 16 ++++++++-------- src/components/ChatLog.js | 14 ++++++++++++++ src/index.js | 7 +++++++ 5 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 src/components/ChatLog.js diff --git a/src/App.js b/src/App.js index c1085909..7eaaf35e 100644 --- a/src/App.js +++ b/src/App.js @@ -1,12 +1,15 @@ import React from 'react'; import './App.css'; -import chatMessages from './data/messages.json'; +// import { useState } from 'react'; +// import chatMessages from './data/messages.json'; +// import ChatEntry from './components/ChatEntry'; +// importing my first component to be used in app const App = () => { return (
-

Application title

+

Chat with Estragon and Vladimir

{/* Wave 01: Render one ChatEntry component diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js index b92f0b7b..4904ea61 100644 --- a/src/components/ChatEntry.js +++ b/src/components/ChatEntry.js @@ -1,14 +1,21 @@ import React from 'react'; import './ChatEntry.css'; import PropTypes from 'prop-types'; +import TimeStamp from './TimeStamp'; const ChatEntry = (props) => { return ( -
-

Replace with name of sender

+
+

{props.sender}

-

Replace with body of ChatEntry

-

Replace with TimeStamp component

+

{props.body}

+

+ +

@@ -16,7 +23,23 @@ const ChatEntry = (props) => { }; ChatEntry.propTypes = { - //Fill with correct proptypes + sender: PropTypes.string.isRequired, + body: PropTypes.string.isRequired, + timeStamp: PropTypes.string.isRequired, }; export default ChatEntry; + +// (copy of above code just in case I need it) +// const ChatEntry = (props) => { +// return ( +//
+//

Replace with name of sender

+//
+//

Replace with body of ChatEntry

+//

Replace with TimeStamp component

+// +//
+//
+// ); +// }; diff --git a/src/components/ChatEntry.test.js b/src/components/ChatEntry.test.js index b69270c0..4a9a2b09 100644 --- a/src/components/ChatEntry.test.js +++ b/src/components/ChatEntry.test.js @@ -1,9 +1,9 @@ -import React from "react"; -import "@testing-library/jest-dom/extend-expect"; -import ChatEntry from "./ChatEntry"; -import { render, screen, fireEvent, waitFor } from "@testing-library/react"; +import React from 'react'; +import '@testing-library/jest-dom/extend-expect'; +import ChatEntry from './ChatEntry'; +import { render, screen, fireEvent, waitFor } from '@testing-library/react'; -describe("Wave 01: ChatEntry", () => { +describe('Wave 01: ChatEntry', () => { beforeEach(() => { render( { ); }); - test("renders without crashing and shows the sender", () => { + test('renders without crashing and shows the sender', () => { expect(screen.getByText(/Joe Biden/)).toBeInTheDocument(); }); - test("that it will display the body", () => { + test('that it will display the body', () => { expect(screen.getByText(/Get out by 8am/)).toBeInTheDocument(); }); - test("that it will display the time", () => { + test('that it will display the time', () => { expect(screen.getByText(/\d+ years ago/)).toBeInTheDocument(); }); }); diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js new file mode 100644 index 00000000..96e58166 --- /dev/null +++ b/src/components/ChatLog.js @@ -0,0 +1,14 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import './ChatLog.css'; +import ChatEntry from './ChatEntry'; + +const ChatLog = (props) => { + return
{props.entries}
; +}; + +ChatLog.propTypes = { + entries: PropTypes.array.isRequired, +}; + +export default ChatLog; diff --git a/src/index.js b/src/index.js index fae3e350..8f598c9d 100644 --- a/src/index.js +++ b/src/index.js @@ -6,3 +6,10 @@ import registerServiceWorker from './registerServiceWorker'; ReactDOM.render(, document.getElementById('root')); registerServiceWorker(); +// root.render( +// +// +// +// ); +// Not sure if I need this code but it was in the live code, code gets sent into render method and once its rendered its injected +// directly into html inside the anchor div From a19006a150e5c658ebbce0465670222d98aa01e9 Mon Sep 17 00:00:00 2001 From: Lindsey Date: Thu, 22 Dec 2022 12:37:15 -0500 Subject: [PATCH 2/2] Passed wave 2 tests & part of wave 3 --- src/App.js | 37 +++++++++++++++++++---- src/App.test.js | 60 ++++++++++++++++++------------------- src/components/ChatEntry.js | 29 +++++++++--------- src/components/ChatLog.js | 16 +++++++++- 4 files changed, 90 insertions(+), 52 deletions(-) diff --git a/src/App.js b/src/App.js index 7eaaf35e..f9291064 100644 --- a/src/App.js +++ b/src/App.js @@ -1,19 +1,44 @@ import React from 'react'; import './App.css'; -// import { useState } from 'react'; -// import chatMessages from './data/messages.json'; -// import ChatEntry from './components/ChatEntry'; -// importing my first component to be used in app +import { useState } from 'react'; +import chatMessages from './data/messages.json'; +import ChatLog from './components/ChatLog'; const App = () => { + const [entries, setEntries] = useState(chatMessages); + + const updateLike = () => { + let likeCount = 0; + + for (const entry of entries) { + if (entry.liked === true) { + likeCount += 1; + } + } + return likeCount; + }; + + const toggleHeart = (id) => { + const newEntries = []; + + for (const entry of entries) { + const newEntry = { ...entry }; + if (newEntry.id === id) { + newEntry.liked = !newEntry.liked; + } + newEntries.push(newEntry); + } + setEntries(newEntries); + }; + return (

Chat with Estragon and Vladimir

+
{updateLike()}❤️s
- {/* Wave 01: Render one ChatEntry component - Wave 02: Render ChatLog component */} +
); diff --git a/src/App.test.js b/src/App.test.js index ca75c71d..87814890 100644 --- a/src/App.test.js +++ b/src/App.test.js @@ -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() - let buttons = container.querySelectorAll('button.like') + const { container } = render(); + 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() - const buttons = container.querySelectorAll('button.like') - const firstButton = buttons[0] - const lastButton = buttons[buttons.length - 1] + const { container } = render(); + 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('🤍'); + }); +}); diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js index 4904ea61..54e80441 100644 --- a/src/components/ChatEntry.js +++ b/src/components/ChatEntry.js @@ -4,6 +4,10 @@ import PropTypes from 'prop-types'; import TimeStamp from './TimeStamp'; const ChatEntry = (props) => { + const flipHeart = () => { + props.toggleHeartCallback(props.id); + }; + return (
{

- +
); }; ChatEntry.propTypes = { + id: PropTypes.number, sender: PropTypes.string.isRequired, body: PropTypes.string.isRequired, timeStamp: PropTypes.string.isRequired, + liked: PropTypes.bool, + toggleHeartCallback: PropTypes.func, }; -export default ChatEntry; +ChatEntry.defaultProps = { + toggleHeartCallback: () => {}, +}; -// (copy of above code just in case I need it) -// const ChatEntry = (props) => { -// return ( -//
-//

Replace with name of sender

-//
-//

Replace with body of ChatEntry

-//

Replace with TimeStamp component

-// -//
-//
-// ); -// }; +export default ChatEntry; diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js index 96e58166..ed118dab 100644 --- a/src/components/ChatLog.js +++ b/src/components/ChatLog.js @@ -4,7 +4,21 @@ import './ChatLog.css'; import ChatEntry from './ChatEntry'; const ChatLog = (props) => { - return
{props.entries}
; + const chatEntryComponents = props.entries.map((entry) => { + return ( + + ); + }); + + return
{chatEntryComponents}
; }; ChatLog.propTypes = {