Otters - Jodi Denney

src/App.js

@@ -1,16 +1,36 @@
-import React from 'react';
 import './App.css';
 import chatMessages from './data/messages.json';
+import ChatLog from './components/ChatLog';
+import { useState } from 'react';
 
 const App = () => {
+  const [entries, setEntries] = useState(chatMessages);
+  const [likes, setLikes] = useState(0);
+
+  const toggleHeart = (id) => {
+    let currentLikes = 0;
+    const newEntries = entries.map((entry) => {
+      const newEntry = { ...entry };
+      if (newEntry.id === id) {
+        newEntry.liked = !newEntry.liked;
+      }
+      if (newEntry.liked === true) {
+        currentLikes += 1;
+      }
+      return newEntry;
+    });
+    setEntries(newEntries);
+    setLikes(currentLikes);
+  };
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat between Vladimir and Estragon</h1>
+        <h2>{likes} ❤️s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={entries} toggleHeartCallback={toggleHeart} />
       </main>
     </div>
   );

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(<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('🤍');
+  });
+});

src/components/ChatEntry.js

@@ -1,22 +1,33 @@
-import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
+  const toggleHeart = () => {
+    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} />
+        </p>
+        <button className="like" onClick={toggleHeart}>
+          {props.liked ? '❤️' : '🤍'}
+        </button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  id: PropTypes.number.isRequired,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool,
 };
 
 export default ChatEntry;

src/components/ChatEntry.test.js

@@ -1,28 +1,28 @@
-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(
       <ChatEntry
         sender="Joe Biden"
-        body="Get out by 8am.  I'll count the silverware"
+        body="Get out by 8am.  I will count the silverware"
         timeStamp="2018-05-18T22:12:03Z"
       />
     );
   });
 
-  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();
   });
 });

src/components/ChatLog.js

@@ -0,0 +1,28 @@
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = (props) => {
+  const chatComponents = props.entries.map((message) => {
+    return (
+      <li key={message.id}>
+        <ChatEntry
+          id={message.id}
+          sender={message.sender}
+          body={message.body}
+          timeStamp={message.timeStamp}
+          liked={message.liked}
+          toggleHeartCallback={props.toggleHeartCallback}
+        />
+      </li>
+    );
+  });
+
+  return <ul>{chatComponents}</ul>;
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.array.isRequired,
+};
+
+export default ChatLog;

src/components/ChatLog.test.js

@@ -1,49 +1,49 @@
-import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import ChatLog from "./ChatLog";
-import { render, screen } from "@testing-library/react";
+import React from 'react';
+import '@testing-library/jest-dom/extend-expect';
+import ChatLog from './ChatLog';
+import { render, screen } from '@testing-library/react';
 
 const LOG = [
   {
-    sender: "Vladimir",
-    body: "why are you arguing with me",
-    timeStamp: "2018-05-29T22:49:06+00:00",
+    sender: 'Vladimir',
+    body: 'why are you arguing with me',
+    timeStamp: '2018-05-29T22:49:06+00:00',
   },
   {
-    sender: "Estragon",
-    body: "Because you are wrong.",
-    timeStamp: "2018-05-29T22:49:33+00:00",
+    sender: 'Estragon',
+    body: 'Because you are wrong.',
+    timeStamp: '2018-05-29T22:49:33+00:00',
   },
   {
-    sender: "Vladimir",
-    body: "because I am what",
-    timeStamp: "2018-05-29T22:50:22+00:00",
+    sender: 'Vladimir',
+    body: 'because I am what',
+    timeStamp: '2018-05-29T22:50:22+00:00',
   },
   {
-    sender: "Estragon",
-    body: "A robot.",
-    timeStamp: "2018-05-29T22:52:21+00:00",
+    sender: 'Estragon',
+    body: 'A robot.',
+    timeStamp: '2018-05-29T22:52:21+00:00',
   },
   {
-    sender: "Vladimir",
-    body: "Notabot",
-    timeStamp: "2019-07-23T22:52:21+00:00",
+    sender: 'Vladimir',
+    body: 'Notabot',
+    timeStamp: '2019-07-23T22:52:21+00:00',
   },
 ];
 
-describe("Wave 02: ChatLog", () => {
+describe('Wave 02: ChatLog', () => {
   beforeEach(() => {
     render(<ChatLog entries={LOG} />);
   });
 
-  test("renders without crashing and shows all the names", () => {
+  test('renders without crashing and shows all the names', () => {
     [
       {
-        name: "Vladimir",
+        name: 'Vladimir',
         numChats: 3,
       },
       {
-        name: "Estragon",
+        name: 'Estragon',
         numChats: 2,
       },
     ].forEach((person) => {
@@ -56,7 +56,7 @@ describe("Wave 02: ChatLog", () => {
     });
   });
 
-  test("renders an empty list without crashing", () => {
+  test('renders an empty list without crashing', () => {
     const element = render(<ChatLog entries={[]} />);
     expect(element).not.toBeNull();
   });

src/index.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';