Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Submission pull request #115

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
1 change: 1 addition & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* src/App.css */
#App {
background-color: #87cefa;
}
Expand Down
24 changes: 19 additions & 5 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,33 @@
import React from 'react';
import React, { useState } from 'react';
import './App.css';
import chatMessages from './data/messages.json';
import ChatLog from './components/ChatLog';

const App = () => {

Choose a reason for hiding this comment

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

Excellent!


const [totalLikes, setTotalLikes] = useState(0);

const handleLikeChange = (isLiked) => {
// Increment or decrement based on the liked status
setTotalLikes(prevTotalLikes => isLiked ? prevTotalLikes + 1 : prevTotalLikes - 1);
}

return (
<div id="App">
<header>
<h1>Application title</h1>
<h1>Chat Log</h1>
<p>{totalLikes} ❤️s</p> {/* Moved the total likes display to the top */}
</header>

<main>
{/* Wave 01: Render one ChatEntry component
Wave 02: Render ChatLog component */}
<ChatLog
entries={chatMessages}
onLike={handleLikeChange}
/>
</main>

</div>
);
};
}

export default App;
1 change: 1 addition & 0 deletions src/components/ChatEntry.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* src/components/ChatEntry.css */
button {
background: none;
color: inherit;
Expand Down
41 changes: 30 additions & 11 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 React, { useState } from 'react';
import PropTypes from 'prop-types';
import TimeStamp from './TimeStamp';
import './ChatEntry.css';

const ChatEntry = (props) => {

Choose a reason for hiding this comment

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

Great job!

const [liked, setLiked] = useState(props.liked);

const toggleLiked = () => {
const newLikedStatus = !liked;
setLiked(newLikedStatus);

// Safeguard the invocation of onLike
if (props.onLike) {
props.onLike(newLikedStatus);
}
};

return (
<div className="chat-entry local">
<h2 className="entry-name">Replace with name of sender</h2>
<section className="entry-bubble">

Choose a reason for hiding this comment

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

It looks like this section element was removed. Since it had a class attached to it, it provided specific CSS styling that helped design the page.

<p>Replace with body of ChatEntry</p>
<p className="entry-time">Replace with TimeStamp component</p>

Choose a reason for hiding this comment

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

It looks like the class entry-time was removed. This provided specific CSS styling for the timestamp.

<button className="like">🤍</button>
</section>
<div className="chat-entry">
<h3>{props.sender}</h3>
<p>{props.body}</p>
<TimeStamp time={props.timeStamp} />
<button className="like" onClick={toggleLiked}>
{liked ? '❤️' : '🤍'}
</button>
</div>
);
};

ChatEntry.propTypes = {

Choose a reason for hiding this comment

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

Yay, prop types!

//Fill with correct proptypes
sender: PropTypes.string.isRequired,
body: PropTypes.string.isRequired,
timeStamp: PropTypes.string.isRequired,
liked: PropTypes.bool.isRequired,
// Make onLike prop optional
onLike: PropTypes.func
};

export default ChatEntry;
export default ChatEntry;
1 change: 1 addition & 0 deletions src/components/ChatLog.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* src/components/ChatLog.css */
.chat-log {
margin: auto;
max-width: 50rem;
Expand Down
23 changes: 23 additions & 0 deletions src/components/ChatLog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// src/components/ChatLog.js
import React from 'react';
import './ChatLog.css';
import ChatEntry from './ChatEntry';

const ChatLog = (props) => {

Choose a reason for hiding this comment

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

Excellent!


const chatEntries = props.entries.map(entry => (
<ChatEntry
key={entry.id}
{...entry}
onLike={props.onLike}
/>
));

return (
<div className="chat-log">
{chatEntries}
</div>
);
}

Choose a reason for hiding this comment

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

This would have been a great place for prop types!

export default ChatLog;
1 change: 1 addition & 0 deletions src/components/TimeStamp.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// src/components/TimeStamp.js
import { DateTime } from 'luxon';
import PropTypes from 'prop-types';

Expand Down