Skip to content
This repository has been archived by the owner on Dec 27, 2022. It is now read-only.

Enhanced error page #392

Merged
merged 3 commits into from
Apr 10, 2017
Merged

Enhanced error page #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2372c0
Handle different types of errors on error page
taravancil Apr 9, 2017
d45e658
Omit duplicated .btn.primary
taravancil Apr 9, 2017
5448c24
Adjust margin
taravancil Apr 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 57 additions & 11 deletions app/lib/error-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ body {
.btn.primary {
-webkit-font-smoothing: antialiased;
font-weight: 800;
}
.btn.primary {
background: #007aff;
color: #fff;
border: none;
Expand All @@ -69,14 +67,15 @@ a.btn span {
div.error-page-content {
max-width: 550px;
margin: auto;
margin-top: 35vh;
margin-top: 30vh;
}
div.error-page-content p {
div.error-page-content .description {
font-size: 14px;
margin: 20px 0;
}
div.error-page-content p .error {
color: #707070;

p {
margin: 20px 0;
}
}
div.error-page-content i {
margin-right: 5px;
Expand All @@ -92,16 +91,63 @@ h1 {
padding-bottom: 10px;
border-bottom: 1px solid #d9d9d9;
}
.icon {
float: right;
}
.icon.warning {
color: #e60b00;
}
`

export default function (err) {
export default function (e) {
var title = 'This site can’t be reached'
var info = ''
var icon = 'fa-info-circle'
var button = '<a class="btn" href="javascript:window.location.reload()">Try again</a>'
var errorDescription

if (typeof e === 'object') {
errorDescription = e.errorDescription
// remove trailing slash
var origin = e.validatedURL.slice(0, e.validatedURL.length - 1)

// strip protocol
if (origin.startsWith('https://')) {
origin = origin.slice(8)
} else if (origin.startsWith('http://')) {
origin = origin.slice(7)
}

switch (e.errorCode) {
case -106:
title = 'No internet connection'
info = '<p>Your computer is not connected to the internet.</p><p>Try:</p><ul><li>Resetting your Wi-Fi connection<li>Checking your router and modem.</li></ul>'
break
case -105:
info = `<p>Couldn’t resolve the DNS address for <strong>${origin}</strong></p>`
break
case -501:
title = 'Your connection is not secure'
info = `<p>Beaker cannot establish a secure connection to the server for <strong>${origin}</strong>.</p>`
icon = 'fa-warning warning'
button = '<a class="btn" href="javascript:window.history.back()">Go back</a>'
break
}
} else {
errorDescription = e
}

return `
<body>
<style>${errorPageCSS}</style>
<link rel="stylesheet" href="beaker://assets/font-awesome.css">
<div class="error-page-content">
<h1>This site can’t be reached</h1>
<p class="error">${err}</p>
<a class="btn primary" href="javascript:window.location.reload()">Try again</a>
<h1>${title} <i class="icon fa ${icon}"></i></h1>
<div class="description">
${info}
<p>${errorDescription}</p>
</div>
${button}
</div>
</body>`.replace(/\n/g,'')
}
2 changes: 1 addition & 1 deletion app/shell-window/pages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ function onDidFailLoad (e) {
}

// render failure page
var errorPageHTML = errorPage(e.errorDescription)
var errorPageHTML = errorPage(e)
page.webviewEl.getWebContents().executeJavaScript('document.documentElement.innerHTML = \''+errorPageHTML+'\'')
}
}
Expand Down