Ada-C24 · Bipentium25 · Dec 16, 2025 · Dec 16, 2025 · Dec 16, 2025 · Dec 16, 2025
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -10,4 +10,4 @@
     <div id="root"></div>
     <script type="module" src="/src/main.jsx"></script>
   </body>
-</html>
+</html>
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,14 +1,42 @@
 import './App.css';
+import chatdata from './data/messages.json';
+import { useState } from 'react';
+import ChatLog from './components/Chatlog';
+//import ChatEntry from './components/ChatEntry';
+
 
 const App = () => {
+  const [chatData, setChats] = useState(chatdata);
+  const toggleLike = (id) => {
+    setChats(chatData =>
+      chatData.map(chat =>{
+        if (chat.id === id) {
+          return{ ...chat, liked: !chat.liked };
-          return{ ...chat, liked: !chat.liked };
+          return { ...chat, liked: !chat.liked };
-          return{ ...chat, liked: !chat.liked };
+          return { ...chat, liked: !chat.liked };
+        } else {
+          return chat;
+        }
+      }
+      )
+    );
+  };
+
+  const totalLikes = () => {
+    return chatData.reduce((count, chat) => {
+      return chat.liked ? count + 1 : count;
+    }, 0);
+  };
+
+  const local = chatData[0].sender;
+  const remote = chatData.find(chat => chat.sender !== local).sender;
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat Between {local} and {remote}</h1>
+        <section><h2 className='widget'>{totalLikes()} ❤️s</h2></section>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={chatData} toggleLike={toggleLike} local={local}/>
       </main>
     </div>
   );

diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
@@ -1,21 +1,31 @@
 import './ChatEntry.css';
+import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
-const ChatEntry = () => {
+const ChatEntry = ({ id, sender, body, timeStamp, liked, toggleLike = () => {}, isLocal = false }) => {
+  const heart = liked ? '❤️' : '🤍';
   return (
     // Replace the outer tag name with a semantic element that fits our use case
-    <replace-with-relevant-semantic-element className="chat-entry local">
-      <h2 className="entry-name">Replace with name of 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>
+    <div className={`chat-entry ${isLocal ? 'local' : 'remote'}`}>
+      <h2 className='entry-name'>{sender}</h2>
+      <section className='entry-bubble'>
+        <p>{body}</p>
+        <p className='entry-time'><TimeStamp time={timeStamp}></TimeStamp></p>
+        <button className='like' onClick={() => toggleLike(id)}>{heart}</button>
       </section>
-    </replace-with-relevant-semantic-element>
+    </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,
+  toggleLike: PropTypes.func.isRequired,
+  isLocal: PropTypes.bool,
+
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.test.jsx b/src/components/ChatLog.test.jsx
@@ -1,4 +1,4 @@
-import ChatLog from './ChatLog';
+import ChatLog from './Chatlog';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 

diff --git a/src/components/Chatlog.jsx b/src/components/Chatlog.jsx
@@ -0,0 +1,42 @@
+import ChatEntry from './ChatEntry';
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+
+const ChatLog = ({entries, toggleLike = () => {}, local}) => {
+  const chatlogFromData = entries.map(chatEntry => {
+    return(
+      <ul key={chatEntry.id}>
+        <ChatEntry
+          id = {chatEntry.id}
+          sender = {chatEntry.sender}
+          body = {chatEntry.body}
+          timeStamp = {chatEntry.timeStamp}
+          liked = {chatEntry.liked}
+          toggleLike={toggleLike}
-          id = {chatEntry.id}
-          sender = {chatEntry.sender}
-          body = {chatEntry.body}
-          timeStamp = {chatEntry.timeStamp}
-          liked = {chatEntry.liked}
-          toggleLike={toggleLike}
+          id={chatEntry.id}
+          sender={chatEntry.sender}
+          body={chatEntry.body}
+          timeStamp={chatEntry.timeStamp}
+          liked={chatEntry.liked}
+          toggleLike={toggleLike}
-          id = {chatEntry.id}
-          sender = {chatEntry.sender}
-          body = {chatEntry.body}
-          timeStamp = {chatEntry.timeStamp}
-          liked = {chatEntry.liked}
-          toggleLike={toggleLike}
+          id={chatEntry.id}
+          sender={chatEntry.sender}
+          body={chatEntry.body}
+          timeStamp={chatEntry.timeStamp}
+          liked={chatEntry.liked}
+          toggleLike={toggleLike}
+          isLocal={chatEntry.sender === local}>
+        </ChatEntry>
+      </ul>
+    );
+  });
+  return(
+    <ul className="chatlog">
+      {chatlogFromData}
+    </ul>
+  );
+};
+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,
+
+  toggleLike: PropTypes.func.isRequired,
+  local: PropTypes.string.isRequired,
+};
+
+export default ChatLog;