-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12 from NorikDavtian/light-dashboard
Refactor to reduce complexity with latest react hooks
- Loading branch information
Showing
40 changed files
with
14,232 additions
and
13,217 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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 |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ | |
|
|
||
| # misc | ||
| .DS_Store | ||
| .env* | ||
| .env | ||
| npm-debug.log* | ||
| yarn-debug.log* | ||
| yarn-error.log* | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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
This file was deleted.
Oops, something went wrong.
This file contains 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
This file contains 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
This file contains 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,6 +1,5 @@ | ||
| import * as inbox from './inbox'; | ||
| import * as email from './email'; | ||
|
|
||
| export default {}; | ||
| export { inbox, email }; | ||
| export default { inbox, email }; | ||
|
|
This file was deleted.
Oops, something went wrong.
This file contains 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,46 +1,24 @@ | ||
| import React from 'react'; | ||
| import React, { useEffect, useState } from 'react'; | ||
| import { Segment } from 'semantic-ui-react'; | ||
| import { connect } from 'react-redux'; | ||
| import { bindActionCreators } from 'redux'; | ||
| import { Link } from 'react-router-dom'; | ||
| import PropTypes from 'prop-types'; | ||
| import { requestEmail, requestInbox } from '../actions'; | ||
| import { Link } from '@reach/router'; | ||
| import './Email.css'; | ||
| import { home } from '../config'; | ||
|
|
||
| // @todo decide if will fetch data in constructor or via dispatched actions | ||
| // constructor (props) { | ||
| // super(props); | ||
| // const id = this.props.location.pathname.substring('/email/'.length); | ||
| // this.props.getEmail(id); | ||
| // } | ||
| const Email = (props) => { | ||
| const { service, emailId } = props; | ||
| const [email, setEmail] = useState({}); | ||
|
|
||
| const Email = ({ email }) => ( | ||
| <Segment basic id="content"> | ||
| <h2><Link to={`${home}/`}>Inbox</Link> / {email.subject}</h2> | ||
| <p><b>Date: </b>{email.date}</p> | ||
| <p><b>From:</b> {email.sender}</p> | ||
| <p>{email.text}</p> | ||
| </Segment> | ||
| ); | ||
| useEffect(() => { | ||
| service(emailId, setEmail); | ||
| }, [service, emailId]); | ||
|
|
||
| Email.propTypes = { | ||
| // getInbox: PropTypes.func.isRequired, | ||
| // getEmail: PropTypes.func.isRequired, | ||
| email: PropTypes.object | ||
| return ( | ||
| <Segment basic id="content"> | ||
| <h2><Link to={'/'}>Inbox</Link> / {email.subject}</h2> | ||
| <p><b>Date: </b>{email.date}</p> | ||
| <p><b>From:</b> {email.sender}</p> | ||
| <p>{email.text}</p> | ||
| </Segment> | ||
| ); | ||
| }; | ||
|
|
||
| Email.defaultProps = { | ||
| email: {} | ||
| }; | ||
|
|
||
| const mapStateToProps = state => ({ | ||
| email: state.email.details | ||
| }); | ||
|
|
||
| const mapDispatchToProps = dispatch => ({ | ||
| getInbox: bindActionCreators(requestInbox, dispatch), | ||
| getEmail: bindActionCreators(requestEmail, dispatch) | ||
| }); | ||
|
|
||
| export default connect(mapStateToProps, mapDispatchToProps)(Email); | ||
| export default Email; |
Oops, something went wrong.