-
-
Notifications
You must be signed in to change notification settings - Fork 2
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 #13 from ojdon/ui
Code Night #1 Changes
- Loading branch information
Showing
3 changed files
with
205 additions
and
62 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,27 @@ | ||
| [ | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/", "timeout": 3000 }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.example.com/" } | ||
| ] | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://bbc.co.uk/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://getbootstrap.com/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.ebay.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.getbootstrap.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/" }, | ||
| { "siteName": "Jordan Hall", "pageName": "Homepage", "url": "http://jordanhall.co.uk/" }, | ||
| { "siteName": "Example.com", "pageName": "Homepage", "url": "http://www.google.com/", "testError": true } | ||
| ] |
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,44 +1,53 @@ | ||
| var app = require('app'); // Module to control application life. | ||
|
|
||
| app.commandLine.appendSwitch('disable-http-cache'); | ||
|
|
||
| var BrowserWindow = require('browser-window'); // Module to create native browser window. | ||
| const electron = require('electron'); | ||
| // Module to control application life. | ||
|
|
||
| // Report crashes to our server. | ||
| require('crash-reporter').start(); | ||
| const {app} = electron; | ||
| // Module to create native browser window. | ||
| const {BrowserWindow} = electron; | ||
|
|
||
| // Keep a global reference of the window object, if you don't, the window will | ||
| // be closed automatically when the javascript object is GCed. | ||
| var mainWindow = null; | ||
|
|
||
| // Quit when all windows are closed. | ||
| app.on('window-all-closed', function() { | ||
| if (process.platform != 'darwin') { | ||
| app.quit(); | ||
| } | ||
| }); | ||
|
|
||
| // This method will be called when Electron has done everything | ||
| // initialization and ready for creating browser windows. | ||
| app.on('ready', function() { | ||
|
|
||
| // Create the browser window. | ||
| mainWindow = new BrowserWindow({width: 1000, height: 700, icon: 'g', fullscreen: false}); | ||
| // be closed automatically when the JavaScript object is garbage collected. | ||
| let win; | ||
| app.commandLine.appendSwitch('disable-http-cache'); | ||
| function createWindow() { | ||
| // Create the browser window. | ||
| win = new BrowserWindow({width: 800, height: 600}); | ||
|
|
||
| // Maximize | ||
| mainWindow.maximize(); | ||
| // and load the index.html of the app. | ||
| win.loadURL(`file://${__dirname}/index.html`); | ||
|
|
||
| // and load the index.html of the app. | ||
| mainWindow.loadUrl('file://' + __dirname + '/index.html'); | ||
| // Open the DevTools. | ||
| win.webContents.openDevTools(); | ||
|
|
||
| // Open the devtools. | ||
| //mainWindow.openDevTools(); | ||
| // Emitted when the window is closed. | ||
| win.on('closed', () => { | ||
|
|
||
| // Emitted when the window is closed. | ||
| mainWindow.on('closed', function() { | ||
| // Dereference the window object, usually you would store windows | ||
| // in an array if your app supports multi windows, this is the time | ||
| // when you should delete the corresponding element. | ||
| mainWindow = null; | ||
| win = null; | ||
| }); | ||
| } | ||
|
|
||
| // This method will be called when Electron has finished | ||
| // initialization and is ready to create browser windows. | ||
| // Some APIs can only be used after this event occurs. | ||
| app.on('ready', createWindow); | ||
|
|
||
| // Quit when all windows are closed. | ||
| app.on('window-all-closed', () => { | ||
| // On OS X it is common for applications and their menu bar | ||
| // to stay active until the user quits explicitly with Cmd + Q | ||
| if (process.platform !== 'darwin') { | ||
| app.quit(); | ||
| } | ||
| }); | ||
|
|
||
| app.on('activate', () => { | ||
| // On OS X it's common to re-create a window in the app when the | ||
| // dock icon is clicked and there are no other windows open. | ||
| if (win === null) { | ||
| createWindow(); | ||
| } | ||
| }); |