From ce08fb3aadf9a845e670cb72e74300eae0a322b5 Mon Sep 17 00:00:00 2001
From: samiya <samiyai96@gmail.com>
Date: Mon, 26 Dec 2022 17:05:58 -0500
Subject: [PATCH 1/3]  Wave 1 complete

---
 src/App.js                       | 15 ++++++++++++--
 src/components/ChatEntry.js      | 18 ++++++++++++-----
 src/components/ChatEntry.test.js | 16 +++++++--------
 src/components/ChatLog.js        | 34 ++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 15 deletions(-)
 create mode 100644 src/components/ChatLog.js

diff --git a/src/App.js b/src/App.js
index c10859093..e084c77a7 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,15 +1,26 @@
 import React from 'react';
 import './App.css';
 import chatMessages from './data/messages.json';
+import ChatEntry from './components/ChatEntry';
+import ChatLog from './components/ChatLog';
+
 
 const App = () => {
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat between Vladmir and Estragon</h1>
+        <h2>ChatEntry</h2>
+        <h3>ChatLog</h3>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
+        <ChatEntry
+          sender={chatMessages[0].sender}
+          body={chatMessages[0].body}
+          timeStamp={chatMessages[0].timeStamp}
+        />
+
+        {/* Chatlog
         Wave 02: Render ChatLog component */}
       </main>
     </div>
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..b6dec1027 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,14 +1,17 @@
 import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
   return (
     <div 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>
+      <h2 className="entry-name">{props.sender}</h2>
+      <section className="entry-bubble">{props.body}
+        <p></p>
+        <p className="entry-time">
+          <TimeStamp time={props.timeStamp}/>
+        </p>
         <button className="like">🤍</button>
       </section>
     </div>
@@ -16,7 +19,12 @@ const ChatEntry = (props) => {
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  //id:PropTypes.number.isRequired,
+  sender:PropTypes.string.isRequired,
+  body:PropTypes.string.isRequired,
+  timeStamp:PropTypes.string.isRequired,
+  
 };
+//`ChatEntry` with props `sender`, `body`,  and `timeStamp`.
 
 export default ChatEntry;
diff --git a/src/components/ChatEntry.test.js b/src/components/ChatEntry.test.js
index b69270c03..4a9a2b09f 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(
       <ChatEntry
@@ -14,15 +14,15 @@ describe("Wave 01: ChatEntry", () => {
     );
   });
 
-  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 000000000..3261c0797
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import './App.css';
+//import chatMessages from './data/messages.json';
+//import PropTypes from 'prop-types';
+//import TimeStamp from './components/TimeStamp';
+import ChatEntry from './ChatEntry';
+
+
+const ChatLog=(props)=>{
+    return(
+        <ul>
+            <ChatEntry />
+        </ul>
+    )
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+export default ChatLog;

From a1517489134d603d5396736000dc78cc6521f715 Mon Sep 17 00:00:00 2001
From: samiya <samiyai96@gmail.com>
Date: Tue, 27 Dec 2022 15:13:18 -0500
Subject: [PATCH 2/3] Wave 2 done

---
 src/App.js                     |  3 ++-
 src/components/ChatLog.js      | 43 ++++++++++++++----------------
 src/components/ChatLog.test.js | 48 +++++++++++++++++-----------------
 3 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/src/App.js b/src/App.js
index e084c77a7..6d7b8c4f9 100644
--- a/src/App.js
+++ b/src/App.js
@@ -19,7 +19,8 @@ const App = () => {
           body={chatMessages[0].body}
           timeStamp={chatMessages[0].timeStamp}
         />
-
+        <ChatLog entries={chatMessages}
+        />
         {/* Chatlog
         Wave 02: Render ChatLog component */}
       </main>
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
index 3261c0797..f670d698d 100644
--- a/src/components/ChatLog.js
+++ b/src/components/ChatLog.js
@@ -1,34 +1,29 @@
 import React from 'react';
-import './App.css';
-//import chatMessages from './data/messages.json';
 //import PropTypes from 'prop-types';
-//import TimeStamp from './components/TimeStamp';
 import ChatEntry from './ChatEntry';
+import './ChatLog.css';
+
 
 
 const ChatLog=(props)=>{
+        const entries =props.entries;
     return(
-        <ul>
-            <ChatEntry />
+        <ul 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}
+
+            ></ChatEntry>
+        ))}
         </ul>
-    )
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+        
+        ); 
+};
 
 
-export default ChatLog;
+export default ChatLog;
\ No newline at end of file
diff --git a/src/components/ChatLog.test.js b/src/components/ChatLog.test.js
index 96f89ebc3..5bafee291 100644
--- a/src/components/ChatLog.test.js
+++ b/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();
   });

From 0a69e1916c698201fe525941994114ff8c79aac5 Mon Sep 17 00:00:00 2001
From: samiya <samiyai96@gmail.com>
Date: Tue, 27 Dec 2022 22:42:24 -0500
Subject: [PATCH 3/3] I've completed all waves except there's something wrong
 with the first two tests although the app is working.

---
 src/App.js                  | 28 ++++++++++++++++++----------
 src/components/ChatEntry.js | 28 +++++++++++++++++++++++++---
 src/components/ChatLog.js   |  5 +++--
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/App.js b/src/App.js
index 6d7b8c4f9..9108a8b7d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,25 +1,33 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './App.css';
 import chatMessages from './data/messages.json';
-import ChatEntry from './components/ChatEntry';
+// import ChatEntry from './components/ChatEntry';
 import ChatLog from './components/ChatLog';
 
-
+//<ChatEntry
+          //sender={chatMessages[0].sender}
+          //body={chatMessages[0].body}
+          //timeStamp={chatMessages[0].timeStamp}
+        ///>
 const App = () => {
+  const[likesCount,setLikeCount]=useState(0);
+  const updateLikes=(isLike)=>{
+    if (isLike){
+      setLikeCount(likesCount+1);
+    } else {
+        setLikeCount(likesCount-1)
+
+    }
+}
   return (
     <div id="App">
       <header>
         <h1>Chat between Vladmir and Estragon</h1>
-        <h2>ChatEntry</h2>
+        <h2>{likesCount}🤍s</h2>
         <h3>ChatLog</h3>
       </header>
       <main>
-        <ChatEntry
-          sender={chatMessages[0].sender}
-          body={chatMessages[0].body}
-          timeStamp={chatMessages[0].timeStamp}
-        />
-        <ChatLog entries={chatMessages}
+        <ChatLog entries={chatMessages}updateLikes={updateLikes}
         />
         {/* Chatlog
         Wave 02: Render ChatLog component */}
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b6dec1027..b0e939a41 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,9 +1,24 @@
-import React from 'react';
+//import React, { useState } from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
 import TimeStamp from './TimeStamp';
+import {useState} from 'react';
+
 
 const ChatEntry = (props) => {
+  const[likeButton,setLikeButton]=useState('🤍');
+    const clickedToggle=()=>{
+
+    if(likeButton==='🤍'){
+      setLikeButton('❤️')
+      props.updateLikes(true)
+    }else{
+      setLikeButton('🤍')
+      props.updateLikes(false)
+    }
+  }
+  
+  
   return (
     <div className="chat-entry local">
       <h2 className="entry-name">{props.sender}</h2>
@@ -12,17 +27,24 @@ const ChatEntry = (props) => {
         <p className="entry-time">
           <TimeStamp time={props.timeStamp}/>
         </p>
-        <button className="like">🤍</button>
+        <button className="like" onClick={clickedToggle}>{likeButton}</button>
+        
       </section>
     </div>
   );
 };
+//eventhandler (on click)====
+//for
+// const likeTotal(props)=>
+//setlikeCount,Likecount)
+//
 
 ChatEntry.propTypes = {
-  //id:PropTypes.number.isRequired,
+  id:PropTypes.number.isRequired,
   sender:PropTypes.string.isRequired,
   body:PropTypes.string.isRequired,
   timeStamp:PropTypes.string.isRequired,
+  likes:PropTypes.bool.isRequired,
   
 };
 //`ChatEntry` with props `sender`, `body`,  and `timeStamp`.
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
index f670d698d..efeec3838 100644
--- a/src/components/ChatLog.js
+++ b/src/components/ChatLog.js
@@ -1,5 +1,5 @@
 import React from 'react';
-//import PropTypes from 'prop-types';
+import PropTypes from 'prop-types';
 import ChatEntry from './ChatEntry';
 import './ChatLog.css';
 
@@ -9,13 +9,14 @@ const ChatLog=(props)=>{
         const entries =props.entries;
     return(
         <ul className='chat-log'>
-            {entries.map((entry)=>(
+            {entries.map((entry,id)=>(
             <ChatEntry
             key={entry.id}
             id={entry.id}
             sender={entry.sender}
             body={entry.body}
             timeStamp={entry.timeStamp}
+            updateLikes={props.updateLikes}
             liked={entry.liked}
 
             ></ChatEntry>