ashpie/tabs
ashpie/tabs
1
0
Fork 0
Code Issues 12 Pull Requests Releases 49 Wiki Activity

Add error page on connection error

Browse Source
This commit is contained in:
Alice Gaudon 2020-07-14 10:31:09 +02:00
parent 05acd44e98
commit ae1c343560
5 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/config.json
View File

@ -3,6 +3,7 @@
"files": "ts/files.ts", "files": "ts/files.ts",
"layout": "sass/layout.scss", "layout": "sass/layout.scss",
"index": "sass/index.scss", "index": "sass/index.scss",
"error": "sass/error.scss",
"service-settings": "sass/service-settings.scss" "service-settings": "sass/service-settings.scss"
} }
} }

22
frontend/error.html Normal file
View File

@ -0,0 +1,22 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>An error occured</title>
<meta http-equiv="Content-Security-Policy"
content="style-src 'self' 'unsafe-inline' https://use.fontawesome.com; font-src 'self' https://use.fontawesome.com; script-src 'self'">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css"
integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
<link rel="stylesheet" href="css/layout.css">
<link rel="stylesheet" href="css/error.css">
</head>
<body>
<h1>Oops</h1>
<p>An error has occurred while loading this document.</p>
<p>Please check your internet connection and this service's URL.</p>
<p>If you can load the actual URL in your favorite web browser, please file us a bug report.</p>
</body>
</html>

9
frontend/sass/error.scss Normal file
View File

@ -0,0 +1,9 @@
html, body {
height: 100%;
}
body {
display: flex;
flex-direction: column;
justify-content: center;
align-self: center;
}

10
frontend/ts/index.ts
View File

@ -26,7 +26,7 @@ let securityButton: HTMLElement | null,
backButton: HTMLElement | null, backButton: HTMLElement | null,
refreshButton: HTMLElement | null; refreshButton: HTMLElement | null;
let addButton, settingsButton; let addButton, settingsButton;
let emptyPage: string; let emptyPage: string, errorPage: string;
let urlPreview: HTMLElement | null; let urlPreview: HTMLElement | null;
let serviceSelector: HTMLElement | null; let serviceSelector: HTMLElement | null;
@ -128,7 +128,7 @@ function openServiceContextMenu(event: Event, serviceId: number) {
} }
ipcRenderer.on('data', (event, appData, iconSets, actualSelectedService, emptyUrl, config) => { ipcRenderer.on('data', (event, appData, iconSets, actualSelectedService, emptyUrl, errorUrl, config) => {
// App info // App info
appInfo.title = appData.title; appInfo.title = appData.title;
@ -179,6 +179,7 @@ ipcRenderer.on('data', (event, appData, iconSets, actualSelectedService, emptyUr
// Empty // Empty
emptyPage = emptyUrl; emptyPage = emptyUrl;
errorPage = errorUrl;
// Url preview element // Url preview element
urlPreview = document.getElementById("url-preview"); urlPreview = document.getElementById("url-preview");
@ -477,6 +478,11 @@ function loadService(serviceId: number, service: any) {
// eventual future human mistakes. // eventual future human mistakes.
service.view.setAttribute('webpreferences', 'contextIsolation=yes'); service.view.setAttribute('webpreferences', 'contextIsolation=yes');
// Error handling
service.view.addEventListener('did-fail-load', (e: Event) => {
service.view.setAttribute('src', errorPage);
});
// Append element to DOM // Append element to DOM
document.querySelector('#services')?.appendChild(service.view); document.querySelector('#services')?.appendChild(service.view);

1
src/windows/MainWindow.ts
View File

@ -147,6 +147,7 @@ export default class MainWindow extends Window {
Meta.ICON_SETS, Meta.ICON_SETS,
this.activeService, this.activeService,
path.resolve(Meta.RESOURCES_PATH, 'empty.html'), path.resolve(Meta.RESOURCES_PATH, 'empty.html'),
path.resolve(Meta.RESOURCES_PATH, 'error.html'),
this.config this.config
); );
} }