Zoisite - Jackie Aponte

src/App.css

@@ -28,6 +28,10 @@
 
 #App header section {
  background-color: #e0ffff;
+ color: black;
+ font-size: 1.5em;
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
 }
 
 #App .widget {

src/App.js

@@ -1,16 +1,46 @@
-import React from 'react';
+import React, {useState} from 'react';
 import './App.css';
 import chatMessages from './data/messages.json';
+import ChatLog from './components/ChatLog.js'
+
 
 const App = () => {
+ const localUser = chatMessages[0].sender
+ const remoteUser = chatMessages[1].sender
+
+ const [chatData, setChatData] = useState(chatMessages);
+
+ const onUpdateChat = (updatedChat) => {
+ const messages = chatData.map(chat => {
+ if (chat.id === updatedChat.id) {
+ return updatedChat;
+ } else {
+ return chat;
+ }
+ });
+
+ setChatData(messages);
+ };
+
+ let totalLikes = 0
+ for (const message of chatData) {
+ if (message.liked) {
+ totalLikes +=1
+ };
+ };
+
+
  return (
  <div id="App">
  <header>
- <h1>Application title</h1>
+ <h1>Chat between {localUser} and {remoteUser}</h1>
+ <section>{totalLikes} ❤️s</section>
  </header>
  <main>
- {/* Wave 01: Render one ChatEntry component
- Wave 02: Render ChatLog component */}
+ <ChatLog 
+ chatData={chatData}
+ onUpdateChat={onUpdateChat}>
+ </ChatLog>
  </main>
  </div>
  );

src/components/ChatEntry.js

@@ -1,22 +1,43 @@
 import React from 'react';
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp.js';
 import PropTypes from 'prop-types';
 
 const ChatEntry = (props) => {
+ const timeEntry=props.timeStamp
+
+ const onLikeButtonClick = () => {
+ const updatedChat = {
+ id: props.id,
+ sender: props.sender,
+ body: props.body,
+ timeStamp: props.timeStamp,
+ liked: !props.liked
+ };
+
+ props.onUpdateChat(updatedChat);
+ };
+
+ const heartColor = props.liked ? '❤️' : '🤍';
+
  return (
- <div className="chat-entry local">
- <h2 className="entry-name">Replace with name of sender</h2>
+ <div className={props.chatEntry}>
+ <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={timeEntry}></TimeStamp></p>
+  <button className="like" onClick={onLikeButtonClick}>{heartColor}</button>
  </section>
  </div>
  );
 };
 
 ChatEntry.propTypes = {
- //Fill with correct proptypes
+ sender: PropTypes.string.isRequired,
+ body: PropTypes.string.isRequired,
+ timeStamp: PropTypes.string.isRequired,
+ liked: PropTypes.bool,
+ onUpdateChat: PropTypes.func.isRequired
 };
 
 export default ChatEntry;

src/components/ChatLog.js

@@ -0,0 +1,43 @@
+import React from 'react';
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry.js'
+
+const ChatLog = (props) => {
+ if (!props.chatData) {
+ return null
+ }
+ const ChatLogEntries = props.chatData.map((entry) => {
+ return (
+ <div key={entry.id}>
+ <ChatEntry 
+ id={entry.id} 
+ sender={entry.sender} 
+ timeStamp={entry.timeStamp} 
+ body={entry.body} 
+ liked={entry.liked}
+ onUpdateChat={props.onUpdateChat}
+ chatEntry={entry.sender===props.chatData[0].sender ? 'chat-entry local' : 'chat-entry remote'}
+ ></ChatEntry>
+ </div>
+ );
+ });
+
+ return (
+ <div>
+ {ChatLogEntries}
+ </div>
+ );
+};
+
+ChatLog.propTypes = {
+ chat: PropTypes.arrayOf(PropTypes.shape({
+ id: PropTypes.number.isRequired,
+ senderData: PropTypes.string.isRequired,
+ bodyData: PropTypes.string.isRequired,
+ likedData: PropTypes.bool.isRequired
+ })),
+ onUpdateChat: PropTypes.func.isRequired
+};
+
+export default ChatLog