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

updated react to 16.10.1 && updated react-dom to 16.10.1 changed all … #7

Merged
merged 1 commit into from
Oct 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7,434 changes: 3,498 additions & 3,936 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"axios": "^0.18.0",
"axios": "^0.18.1",
"moment": "^2.23.0",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react": "^16.10.1",
"react-dom": "^16.10.1",
"react-scripts": "2.1.3"
},
"scripts": {
Expand All @@ -25,6 +25,6 @@
"not op_mini all"
],
"devDependencies": {
"shave": "^2.5.2"
"shave": "^2.5.4"
}
}
6 changes: 2 additions & 4 deletions src/components/App/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import React, { Component } from 'react';
import React from 'react';
import Messenger from '../Messenger';

export default class App extends Component {
render() {
export default function App() {
return (
<div className="App">
<Messenger />
</div>
);
}
}
8 changes: 3 additions & 5 deletions src/components/Compose/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, { Component } from 'react';
import React from 'react';
import './Compose.css';

export default class Compose extends Component {
render() {
export default function Compose(props) {
return (
<div className="compose">
<input
Expand All @@ -12,9 +11,8 @@ export default class Compose extends Component {
/>

{
this.props.rightItems
props.rightItems
}
</div>
);
}
}
31 changes: 10 additions & 21 deletions src/components/ConversationList/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component } from 'react';
import React, {useState, useEffect} from 'react';
import ConversationSearch from '../ConversationSearch';
import ConversationListItem from '../ConversationListItem';
import Toolbar from '../Toolbar';
Expand All @@ -7,35 +7,25 @@ import axios from 'axios';

import './ConversationList.css';

export default class ConversationList extends Component {
constructor(props) {
super(props);
this.state = {
conversations: []
};
}

componentDidMount() {
this.getConversations();
}
export default function ConversationList(props) {
const [conversations, setConversations] = useState([]);
useEffect(() => {
getConversations()
},[])

getConversations = () => {
const getConversations = () => {
axios.get('https://randomuser.me/api/?results=20').then(response => {
this.setState(prevState => {
let conversations = response.data.results.map(result => {
let newConversations = response.data.results.map(result => {
return {
photo: result.picture.large,
name: `${result.name.first} ${result.name.last}`,
text: 'Hello world! This is a long message that needs to be truncated.'
};
});

return { ...prevState, conversations };
});
setConversations([...conversations, ...newConversations])
});
}

render() {
return (
<div className="conversation-list">
<Toolbar
Expand All @@ -49,7 +39,7 @@ export default class ConversationList extends Component {
/>
<ConversationSearch />
{
this.state.conversations.map(conversation =>
conversations.map(conversation =>
<ConversationListItem
key={conversation.name}
data={conversation}
Expand All @@ -58,5 +48,4 @@ export default class ConversationList extends Component {
}
</div>
);
}
}
12 changes: 5 additions & 7 deletions src/components/ConversationListItem/index.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import React, { Component } from 'react';
import React, {useEffect} from 'react';
import shave from 'shave';

import './ConversationListItem.css';

export default class ConversationListItem extends Component {
componentDidMount() {
export default function ConversationListItem(props) {
useEffect(() => {
shave('.conversation-snippet', 20);
}
})

render() {
const { photo, name, text } = this.props.data;
const { photo, name, text } = props.data;

return (
<div className="conversation-list-item">
Expand All @@ -20,5 +19,4 @@ export default class ConversationListItem extends Component {
</div>
</div>
);
}
}
6 changes: 2 additions & 4 deletions src/components/ConversationSearch/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, { Component } from 'react';
import React from 'react';
import './ConversationSearch.css';

export default class ConversationSearch extends Component {
render() {
export default function ConversationSearch() {
return (
<div className="conversation-search">
<input
Expand All @@ -12,5 +11,4 @@ export default class ConversationSearch extends Component {
/>
</div>
);
}
}
8 changes: 3 additions & 5 deletions src/components/Message/index.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import React, { Component } from 'react';
import React from 'react';
import moment from 'moment';
import './Message.css';

export default class Message extends Component {
render() {
export default function Message(props) {
const {
data,
isMine,
startsSequence,
endsSequence,
showTimestamp
} = this.props;
} = props;

const friendlyTimestamp = moment(data.timestamp).format('LLLL');
return (
Expand All @@ -34,5 +33,4 @@ export default class Message extends Component {
</div>
</div>
);
}
}