Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/App.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#App {
background-color: #87cefa;
background: #87cefa;
}

#App header {
Expand All @@ -26,8 +26,10 @@
display: inline-block;
}


#App header section {
background-color: #e0ffff;
color: black;
}

#App .widget {
Expand Down
30 changes: 27 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,40 @@
import React from 'react';
import { useState } from 'react';
import './App.css';
import chatMessages from './data/messages.json';
import ChatLog from './components/ChatLog';

const App = () => {
const [messages, setMessages] = useState(chatMessages);

const toggleLike = (id) => {
setMessages(
messages.map((message) =>
message.id === id ? { ...message, liked: !message.liked } : message
)
);
};

const countLikes = () => {
let heartCount = 0;
for (let message of messages) {
if (message.liked) {
heartCount += 1;
}
}return heartCount;
};
Comment on lines +18 to +25

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great use of the chat data to calculate the total hearts! Another way we could do this is with the Array.reduce function:

let initialValue = 0;
return messages.reduce((total, message) => {
    return (chat.liked === true) ? total + 1 : total;
}, initialValue);



return (
<div id="App">
<header>
<h1>Application title</h1>
<h1>Waiting for Chat GDT</h1>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😸

<section>
<h2>{countLikes()} ❤️s</h2>
</section>
</header>
<main>
{/* Wave 01: Render one ChatEntry component
Wave 02: Render ChatLog component */}
<ChatLog entries ={messages} toggleLike={toggleLike}/>
</main>
</div>
);
Expand Down
1 change: 1 addition & 0 deletions src/components/ChatEntry.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ button {
width: fit-content;
}


.chat-entry .entry-bubble:hover {
background-color: #fefea2;
}
Expand Down
33 changes: 26 additions & 7 deletions src/components/ChatEntry.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,41 @@
import React from 'react';
import './ChatEntry.css';
import PropTypes from 'prop-types';
import TimeStamp from './TimeStamp';

const ChatEntry = (props) => {
const ChatEntry = ({id, sender, body, timeStamp, liked, toggleLike}) => {
const handleLikeClick = () => {
toggleLike(id);
};

const localOrRemote = (sender) => {
if (sender === 'Vladimir') {
return 'chat-entry local';
} else if (sender === 'Estragon') {
return 'chat-entry remote';
};
};
Comment on lines +11 to +17

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small style note: the indentation got a little messed up here, this is something we might add to a checklist of things to review our code for before opening PRs.

return (
<div className="chat-entry local">
<h2 className="entry-name">Replace with name of sender</h2>
<div className= {localOrRemote(sender)}>
Comment on lines +11 to +19

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could simplify this a little and remove the duplication of the chat-entry class name if we use an interpolated string for the class on line 19:

const localOrRemote = (sender) => {
    return (sender === 'Vladimir') ? 'local' : 'remote';
};

return (
{`chat-entry ${chatLocal}`}
    <div className= {`chat-entry ${localOrRemote(sender)}`}>
...

<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={handleLikeClick}>{liked ? '❤️' : '🤍'}</button>
</section>
</div>
);
};

ChatEntry.propTypes = {
//Fill with correct proptypes
id: PropTypes.number.isRequired,
body: PropTypes.string.isRequired,
sender: PropTypes.string.isRequired,
timeStamp: PropTypes.string.isRequired,
liked: PropTypes.bool,
toggleLike: PropTypes.func,
};

export default ChatEntry;
42 changes: 42 additions & 0 deletions src/components/ChatLog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import './ChatEntry.css'
import ChatEntry from './ChatEntry';
import PropTypes from 'prop-types';


const Chatlog = ({entries, toggleLike}) => {
const getEntries = () => {
return entries.map((entry, index) => {
return (
<ChatEntry
key={index}
id={entry.id}
sender={entry.sender}
body={entry.body}
timeStamp={entry.timeStamp}
liked={entry.liked}
toggleLike={toggleLike}
/>
);
});
}
return <main>
<section className='chat-log'>
{getEntries()}
</section>
</main>
};

Chatlog.propTypes = {
entries: PropTypes.arrayOf (
PropTypes.shape (

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice use of PropTypes.shape for more detail on what data is expected for this component =]

{
sender: PropTypes.string.isRequired,
body: PropTypes.string.isRequired,
timeStamp: PropTypes.string.isRequired,
liked: PropTypes.bool,
})
).isRequired,
toggleLike: PropTypes.func,
};

export default Chatlog;