From d46c60da86d8268a01e717b91e4a94664fb135fc Mon Sep 17 00:00:00 2001 From: Amit Nandan P Date: Fri, 8 Jun 2018 22:38:09 -0500 Subject: [PATCH 01/10] #1556 Adding ability to open log file and log folder from help page --- src/renderer/page/help/index.js | 7 ++++++- src/renderer/page/help/view.jsx | 35 ++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/renderer/page/help/index.js b/src/renderer/page/help/index.js index 6a59becb9..cfabb784b 100644 --- a/src/renderer/page/help/index.js +++ b/src/renderer/page/help/index.js @@ -1,12 +1,14 @@ import { connect } from 'react-redux'; import { doAuthNavigate } from 'redux/actions/navigation'; import { doFetchAccessToken } from 'redux/actions/user'; +import { selectDaemonSettings } from 'redux/selectors/settings'; import { selectAccessToken, selectUser } from 'redux/selectors/user'; import HelpPage from './view'; const select = state => ({ user: selectUser(state), accessToken: selectAccessToken(state), + deamonSettings: selectDaemonSettings(state), }); const perform = dispatch => ({ @@ -14,4 +16,7 @@ const perform = dispatch => ({ fetchAccessToken: () => dispatch(doFetchAccessToken()), }); -export default connect(select, perform)(HelpPage); +export default connect( + select, + perform +)(HelpPage); diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx index eb8da4aae..d1260ca64 100644 --- a/src/renderer/page/help/view.jsx +++ b/src/renderer/page/help/view.jsx @@ -1,13 +1,19 @@ // @TODO: Customize advice based on OS import React from 'react'; +import { shell } from 'electron'; import { Lbry } from 'lbry-redux'; import Native from 'native'; import Button from 'component/button'; import BusyIndicator from 'component/common/busy-indicator'; -import Icon from 'component/common/icon'; import Page from 'component/page'; import * as icons from 'constants/icons'; +type Props = { + deamonSettings: { + data_dir: ?string, + }, +}; + class HelpPage extends React.PureComponent { constructor(props) { super(props); @@ -56,7 +62,8 @@ class HelpPage extends React.PureComponent { let platform; let newVerLink; - const { accessToken, doAuth, user } = this.props; + const { accessToken, doAuth, user, deamonSettings } = this.props; + const { data_dir: dataDirectory } = deamonSettings; if (this.state.versionInfo) { ver = this.state.versionInfo; @@ -108,12 +115,34 @@ class HelpPage extends React.PureComponent { +
+
{__('View your Log')}
+

+ {__( + 'Do you find something wrong? Have a look in your log, or send your log to support for some help.' + )} +

+
+
+
+
{__('Report a Bug or Suggest a New Feature')}

{__('Did you find something wrong? Think LBRY could add something useful and cool?')}

-