🐲🪰 Mikaela B.

src/App.css

@@ -1,10 +1,10 @@
 #App {
-  background-color: #87cefa;
+  background-color: #fafafa;
 }
 
 #App header {
-  background-color: #222;
-  color: #fff;
+  background-color: #ffe4ec;
+  color: black;
   padding-bottom: 0.5rem;
   position: fixed;
   width: 100%;

src/App.jsx

@@ -1,14 +1,50 @@
+// Wave 1: Import ChatEntry to show one message
+// import ChatEntry from './components/ChatEntry';
 import './App.css';
+import messages from './data/messages.json';
+import ChatLog from './components/ChatLog';
+import { useState } from 'react';
+
+const calculateTotalLikes = (chatData) => {
+  return chatData.reduce((total, message) => {
+    return total + (message.liked ? 1 : 0);
+  }, 0);
+};
 
 const App = () => {
+  // Wave 1: Use first message data to render one ChatEntry
+  // const chatMessages = messages[0];
+
+  const [chatData, setChatData] = useState(messages);
+  const totalLikes = calculateTotalLikes(chatData);
+
+  const toggleLike = (id) => {
+    setChatData((chatData) =>
+      chatData.map((entry) => {
+        if (entry.id === id) {
+          return { ...entry, liked: !entry.liked };
+        } else {
+          return entry;
+        }
+      })
+    );
+  };
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>iYap</h1>
+        <h2>{totalLikes} 💖s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        {/* Wave 1: Rendered one ChatEntry
+        <ChatEntry
+          sender={chatMessages.sender}
+          body={chatMessages.body}
+          timeStamp={chatMessages.timeStamp}
+        /> */}
+        {/* Wave 2: Render all messages using ChatLog */}
+        <ChatLog entries={chatData} onLike={toggleLike} />
       </main>
     </div>
   );

src/App.test.jsx

@@ -13,7 +13,7 @@ describe('Wave 03: clicking like button and rendering App', () => {
     fireEvent.click(buttons[10]);
 
     // Assert
-    const countScreen = screen.getByText(/3 ❤️s/);
+    const countScreen = screen.getByText(/3 💖s/);
     expect(countScreen).not.toBeNull();
   });
 
@@ -28,7 +28,7 @@ describe('Wave 03: clicking like button and rendering App', () => {
 
     // click the first button
     fireEvent.click(firstButton);
-    expect(firstButton.innerHTML).toEqual('❤️');
+    expect(firstButton.innerHTML).toEqual('💖');
 
     // check that all other buttons haven't changed
     for (let i = 1; i < buttons.length; i++) {
@@ -39,13 +39,13 @@ describe('Wave 03: clicking like button and rendering App', () => {
     fireEvent.click(firstButton);
     expect(firstButton.innerHTML).toEqual('🤍');
     fireEvent.click(firstButton);
-    expect(firstButton.innerHTML).toEqual('❤️');
+    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('❤️');
+    expect(lastButton.innerHTML).toEqual('💖');
     fireEvent.click(lastButton);
     expect(lastButton.innerHTML).toEqual('🤍');
   });

src/components/ChatEntry.css

@@ -17,7 +17,7 @@ button {
 }
 
 .chat-entry .entry-bubble {
-  background-color: #ffffe0;
+  background-color: #f0f0f5;
   border-radius: 30px;
   max-width: 50rem;
   min-width: 10rem;
@@ -27,7 +27,7 @@ button {
 }
 
 .chat-entry .entry-bubble:hover {
-  background-color: #fefea2;
+  background-color: #d6d6e0;
 }
 
 .chat-entry .entry-name {
@@ -63,12 +63,12 @@ button {
 }
 
 .chat-entry.local .entry-bubble::before {
-  background-color: #ffffe0;
+  background-color: #f0f0f5;
   left: -18px;
 }
 
 .chat-entry.local .entry-bubble:hover::before {
-  background-color: #fefea2;
+  background-color: #d6d6e0;
 }
 
 /* "remote" messages are shown on the right side, in blue */
@@ -77,24 +77,24 @@ button {
 }
 
 .chat-entry.remote .entry-bubble {
-  background-color: #e0ffff;
+  background-color: #339aff;
   margin-left: auto;
   margin-right: 0;
 }
 
 .chat-entry.remote .entry-bubble:hover {
-  background-color: #a9f6f6;
+  background-color: #80bdff;
 }
 
 .chat-entry.remote .entry-time {
   text-align: left;
 }
 
 .chat-entry.remote .entry-bubble::before {
-  background-color: #e0ffff;
+  background-color: #339aff;
   right: -18px;
 }
 
 .chat-entry.remote .entry-bubble:hover::before {
-  background-color: #a9f6f6;
+  background-color: #80bdff;
 }

src/components/ChatEntry.jsx

@@ -1,20 +1,34 @@
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp';
+import PropTypes from 'prop-types';
+
+const ChatEntry = ({ id, sender, body, timeStamp, liked, onLike }) => {
+  const heartIcon = liked ? '💖' : '🤍';
+  const isLocal = sender === 'Chip';
 
-const ChatEntry = () => {
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <div className={`chat-entry ${isLocal ? 'local' : 'remote'}`}>
+      <h2 className="entry-name">{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>{body}</p>
+        <p className="entry-time">
+          <TimeStamp time={timeStamp} />
+        </p>
+        <button className="like" onClick={() => onLike(id)}>
+          {heartIcon}
+        </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.isRequired,
+  onLike: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;

src/components/ChatLog.jsx

@@ -0,0 +1,36 @@
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = ({ entries, onLike }) => {
+  return (
+    <div className="chat-log">
+      {entries.map((entry) => (
+        <ChatEntry
+          key={entry.id}
+          id={entry.id}
+          sender={entry.sender}
+          body={entry.body}
+          timeStamp={entry.timeStamp}
+          liked={entry.liked}
+          onLike={onLike}
+        />
+      ))}
+    </div>
+  );
+};
+
+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,
+  onLike: PropTypes.func.isRequired,
+};
+
+export default ChatLog;