spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #344 from gabrielburnworth/master 

add additional troubleshooting note
pull/345/head
Gabriel Burnworth 2017-08-10 14:07:14 -07:00 committed by GitHub
parent 95fd9be166 da2df5efc8
commit 7d105a3031
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/css/main.scss
View File

@ -21,4 +21,23 @@ h1,
h2 {
font-weight: 100;
text-align: center;
}
}
.portal-problem-note {
display: block;
margin: auto;
width: 75%;
text-align: center;
margin-top: 7rem;
font-weight: normal;
font-size: 2rem
}
.portal-problem-note h3 {
font-weight: 300;
}
.portal-problem-note p {
font-weight: 300;
}
.portal-problem-note a {
color: white;
font-weight: 400;
}

31
web/ts/main.tsx
View File

@ -27,6 +27,21 @@ interface FormState {
connecting?: boolean;
}
const TEXT_CONFIGURATION_COMPLETE =
`FarmBot will now restart and attempt to connect to the web app.
Login to your web app account to verify that FarmBot has connected.
If it fails, the configurator will automatically restart and you can try again.`
const TEXT_CONFIGURATION_TROUBLE =
`Your web browser is having trouble connecting to the configurator.
Are you using a modern updated browser?
If so, your OS might be corrupted and need to be re-flashed.`;
const TEXT_PORTAL_PROBLEM =
`The automatic pop-up window for connecting to networks on Mac computers
does not work with the FarmBot WiFi configurator.
Please open the full Safari or Chrome web browser and navigate to `;
@observer
export class Main extends React.Component<MainProps, FormState> {
constructor(props: MainProps) {
@ -368,7 +383,7 @@ export class Main extends React.Component<MainProps, FormState> {
let webPasswordIsShown = this.state.showWebPassword ? "text" : "password";
let icon = this.state.urlIsOpen ? "minus" : "cog";
let header = this.state.connecting ? "Configuration is Complete!" : "Configure Your FarmBot";
let text = this.state.connecting ? "FarmBot will now restart and attempt to connect to the web app. Login to your web app account to verify that FarmBot has connected. If it fails, the configurator will automatically restart and you can try again." : "Your web browser is having trouble connecting to the configurator. Are you using a modern updated browser? If so, your OS might be corrupted and need to be re-flashed";
let text = this.state.connecting ? TEXT_CONFIGURATION_COMPLETE : TEXT_CONFIGURATION_TROUBLE;
let logMessage = mainState.logs[mainState.logs.length - 1].message
let finalMessage = (logMessage.length > 80 && !this.state.logExpanded) ?
_.truncate(logMessage, { length: 80 }) : logMessage;
@ -393,7 +408,17 @@ export class Main extends React.Component<MainProps, FormState> {
}
}}>{header}</h1>
<h2 hidden={mainState.connected}> {text} </h2>
{/* Display if the bot is disconnected */}
<div hidden={mainState.connected}>
<h2 > {text} </h2>
<div hidden={this.state.connecting} className="portal-problem-note">
<h3>Note:</h3>
<p>
{TEXT_PORTAL_PROBLEM}
<a href="http://farmbot.io/setup" target="_blank">FarmBot.io/setup</a>
</p>
</div>
</div>
{/* Only display if the bot is connected */}
<div hidden={!mainState.connected} className={`col-md-offset-3 col-md-6
@ -483,7 +508,7 @@ export class Main extends React.Component<MainProps, FormState> {
</div>
<div className="widget-content log-message">
{finalMessage}
<i className={`fa fa-${logIcon} expand-logs-icon
<i className={`fa fa-${logIcon} expand-logs-icon
is-expanded-${this.state.logExpanded}`}
onClick={this.toggleExpandedLog.bind(this)}></i>
</div>