forked from AdaGold/react-chatlog
-
Notifications
You must be signed in to change notification settings - Fork 17
Ocelots - Ya-Juan Ruan #11
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
Open
ryjpink
wants to merge
14
commits into
ada-ac2:main
Choose a base branch
from
ryjpink:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
7d39c19
Update props and propstype in ChatEntry components
ryjpink 04cd66a
Import and add ChatEntry component in app.js
ryjpink 996d504
Add ChatLog component and update App.js
ryjpink 01f4bc8
Add heartcount state and Lift state up
ryjpink 10968a2
Remove heartcount state and add getheartcount function
ryjpink c8a5e29
Update heart from state to a variable and add Proptypes
ryjpink b291a6b
Add key to ChatEntry component
ryjpink 04e5400
Update updatelike function and add heartcount variable
ryjpink 08b8481
Arrange the messages depending on the origin
ryjpink 4830176
Bring back getheartcount function
ryjpink fde8893
Add font color choice
ryjpink 303e935
Update and add proptypes
ryjpink a662595
Add key to components
ryjpink d661bd1
remove key from chatentry component
ryjpink File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,42 @@ | ||
| 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 = () => { | ||
| const [messages, setMessages] = useState(chatMessages); | ||
|
|
||
|
|
||
|
|
||
| const updateLike = (updatedmessage)=>{ | ||
| const updatedmessages = messages.map(message =>{ | ||
| if (message.id === updatedmessage.id){ | ||
| return updatedmessage; | ||
| }else{ | ||
| return message; | ||
| } | ||
| }) | ||
| setMessages(updatedmessages); | ||
| } | ||
|
|
||
| const getHeartCount = () =>{ | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Excellent, dynamic updating! |
||
| let heartCount = 0; | ||
| for (const message of messages){ | ||
| if (message.liked){ | ||
| heartCount ++; | ||
| } | ||
| } | ||
| return heartCount; | ||
| } | ||
|
|
||
| return ( | ||
| <div id="App"> | ||
| <header> | ||
| <h1>Application title</h1> | ||
| <section><span className='widget' id='heartWidget'>{getHeartCount()} ❤️s</span></section> | ||
| </header> | ||
| <main> | ||
| {/* Wave 01: Render one ChatEntry component | ||
| Wave 02: Render ChatLog component */} | ||
| <ChatLog entries={messages} onupdate={updateLike}></ChatLog> | ||
| </main> | ||
| </div> | ||
| ); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,49 @@ | ||
| import React from 'react'; | ||
| import React, { useState } from 'react'; | ||
| import './ChatEntry.css'; | ||
| import PropTypes from 'prop-types'; | ||
| import { DateTime } from 'luxon'; | ||
| import TimeStamp from './TimeStamp'; | ||
|
|
||
| const ChatEntry = (props) => { | ||
| const [heart, setHeart] = useState('🤍'); | ||
|
|
||
| const updateLike = () =>{ | ||
| const updatedmessage = { | ||
| id:props.id, | ||
| sender:props.sender, | ||
| body:props.body, | ||
| timeStamp:props.timeStamp, | ||
| liked:!props.liked, | ||
| } | ||
| props.onupdate(updatedmessage) | ||
|
|
||
| if (!props.liked){ | ||
| setHeart('❤️'); | ||
| } | ||
| else{ | ||
| setHeart('🤍'); | ||
| } | ||
| }; | ||
|
|
||
|
|
||
|
|
||
|
|
||
| return ( | ||
| <div className="chat-entry local"> | ||
| <h2 className="entry-name">Replace with name of sender</h2> | ||
| <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={props.timeStamp}/></p> | ||
| <button className="like" onClick={()=>{updateLike()}}>{heart}</button> | ||
| </section> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| ChatEntry.propTypes = { | ||
| //Fill with correct proptypes | ||
| sender:PropTypes.string.isRequired, | ||
| body:PropTypes.string.isRequired, | ||
| timeStamp:PropTypes.string.isRequired, | ||
| }; | ||
|
|
||
| export default ChatEntry; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import React from 'react'; | ||
| import './ChatLog.css'; | ||
| import ChatEntry from './ChatEntry'; | ||
|
|
||
| const ChatLog = ({entries, onupdate})=>{ | ||
|
|
||
|
|
||
| const chatentryComponents = entries.map(message =>{ | ||
| return <ChatEntry onupdate={onupdate} liked={message.liked} id={message.id}sender={message.sender} body={message.body} timeStamp={message.timeStamp}/>; | ||
| }); | ||
|
|
||
| return <section className='chat-log'>{chatentryComponents}</section>; | ||
| } | ||
|
|
||
| export default ChatLog; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, adding useState