Merge pull request #68 from NebulousLabs/build

Build

Author: DavidVorick

.gitignore

@@ -1,7 +1,10 @@
+# Generated Items
+release
 node_modules
-build
-*.swp
 npm-debug.log
 app/config.json
 app/dependencies
 doc/Sia-UI
+
+# Vim
+*.swp

app/assets/icon.ico

@@ -14,7 +14,7 @@
 		<!-- Header for UI -->
 		<div class="pure-g header">
 			<div class="pure-u-1-5 logo-container">
-				<img src="assets/logo/sia.svg" height="50" class="logo">
+				<img src="assets/siaLogo.svg" height="50" class="logo">
 			</div>
 			<div class='pure-u-4-5 button-container'>
 				<div class='header-button' id='update-button'>
@@ -45,18 +45,18 @@
 		</div>
 		<!-- Javascript -->
 		<script> 
-			const WebFrame = require("web-frame");
-			const RendererIPC = require("ipc");
-			const ElectronScreen = require("screen");
+			const WebFrame = require('web-frame');
+			const RendererIPC = require('ipc');
+			const ElectronScreen = require('screen');
 			const Process = require('child_process').spawn;
-			const Path = require("path");
-			const Fs = require("fs");
-			const Shell = require("shell");
-			const $ = require("jquery");
+			const Path = require('path');
+			const Fs = require('fs');
+			const Shell = require('shell');
+			const $ = require('./js/jquery.min.js');
 		</script>
-		<script src="js/daemonManager.js"></script>
-		<script src="js/pluginManager.js"></script>
-		<script src="js/uiManager.js"></script>
+		<script src='js/daemonManager.js'></script>
+		<script src='js/pluginManager.js'></script>
+		<script src='js/uiManager.js'></script>
 		<script>
 			var UI = new UIManager();
 			var Daemon = new DaemonManager();

app/assets/icon.png

@@ -18,31 +18,31 @@ var mainWindow;
 // Creates the window and loads index.html
 function startMainWindow() {
 	// Open the UI with full screen size. 'screen' can only be required after
-	// app.on('ready') 
+	// app.on('ready')
 	const ElectronScreen = require('screen');
 	var size = ElectronScreen.getPrimaryDisplay().workAreaSize;
 
 	// Give tray/taskbar icon path
-	var iconPath = Path.join(__dirname, 'app', 'assets', 'logo', 'logo.png');
+	var iconPath = Path.join(__dirname, 'assets', 'icon.png');
 	var appIcon = new Tray(iconPath);
 	var contextMenu = Menu.buildFromTemplate([
 		{ label: 'Minimize', accelerator: 'CmdOrCtrl+M', selector: 'performMiniaturize:' },
 		{ label: "Quit", accelerator: "CmdOrCtrl+Q", selector:'terminate:', click: function() { app.quit();}},
 		{ type: 'separator' },
 		{ label: 'Bring All to Front', selector: 'arrangeInFront:' }
 	]);
-	appIcon.setToolTip('A highly efficient decentralized storage network.');
+	appIcon.setToolTip('Sia - The Collaborative Cloud.');
 
 	// Create the browser
 	mainWindow = new BrowserWindow({
-		'width': size.width,
+		'width':  size.width,
 		'height': size.height,
-		'icon': iconPath,
-		'title': 'Sia-UI'
+		'icon':   iconPath,
+		'title':  'Sia-UI-beta',
 	});
 
 	// Load the index.html of the app.
-	mainWindow.loadUrl('file://' + __dirname + '/app/index.html');
+	mainWindow.loadUrl('file://' + __dirname + '/index.html');
 
 	// Emitted when the window is closed.
 	mainWindow.on('closed', function() {
@@ -61,11 +61,11 @@ function startMainWindow() {
 				submenu: [
 					{ label: "Undo", accelerator: "CmdOrCtrl+Z", selector: "undo:" },
 					{ label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
-					{ type: "separator" },
+					{ type:  "separator" },
 					{ label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
 					{ label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
 					{ label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" },
-					{ label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
+					{ label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" },
 				]
 			}
 		]);
@@ -82,7 +82,6 @@ App.on('window-all-closed', function() {
 // When Electron loading has finished, start the daemon then the UI
 App.on('ready', startMainWindow);
 
-// TODO: Set up to work with files plugin
 // Listen for if the renderer process wants to produce a dialog message
 MainIPC.on('dialog', function(event, type, options) {
 	var response;