Skip to content

Commit

Permalink
switch to electron-builder
Browse files Browse the repository at this point in the history
  • Loading branch information
igorls committed Jun 13, 2018
1 parent aa72058 commit 1655694
Show file tree
Hide file tree
Showing 76 changed files with 50,271 additions and 4,947 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ testem.log
.DS_Store
Thumbs.db
/.sync
/archive
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"outputPath": "ng-dist",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
Expand Down
12 changes: 4 additions & 8 deletions src/index.js → index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
const {app, BrowserWindow} = require('electron');
const path = require('path');
const url = require('url');
require('update-electron-app')();

if (require('electron-squirrel-startup')) {
app.quit();
}
require("electron-updater").autoUpdater.checkForUpdatesAndNotify();

let win, serve;
const args = process.argv.slice(1);
Expand All @@ -20,17 +16,17 @@ function createWindow() {
'min-width': 800,
'min-height': 500,
frame: true,
icon: path.join(__dirname, 'assets/icons/ico/simpleos.ico')
icon: path.join(__dirname, 'src/assets/icons/ico/simpleos.ico')
});
win.setMenu(null);
if (serve) {
require('electron-reload')(__dirname, {
electron: require(__dirname + '../node_modules/electron')
electron: require(__dirname + 'node_modules/electron')
});
win.loadURL('http://localhost:7868');
} else {
win.loadURL(url.format({
pathname: path.join(__dirname, '../dist/index.html'),
pathname: path.join(__dirname, 'ng-dist', 'index.html'),
protocol: 'file:',
slashes: true
}));
Expand Down
857 changes: 857 additions & 0 deletions ng-dist/3rdpartylicenses.txt

Large diffs are not rendered by default.

Binary file added ng-dist/assets/bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ng-dist/assets/bg2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1655694

Please sign in to comment.