From 43b1a39a5a93c7fd5dd5f0ab23e4d61a5b909f78 Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Fri, 2 Dec 2016 18:25:02 -0800
Subject: [PATCH] experimental electron-based desktop app support

---
 app/app/authenticators/documize.js            | 12 ++-
 app/app/components/onboard/share-folder.js    | 20 ++--
 .../components/section/code/type-editor.js    |  8 +-
 .../components/section/code/type-renderer.js  |  6 +-
 .../components/section/wysiwyg/type-editor.js | 13 ++-
 app/app/index.html                            | 22 ++---
 app/app/initializers/application.js           |  4 +-
 app/app/pods/auth/forgot/template.hbs         |  2 +-
 app/app/pods/auth/login/template.hbs          |  2 +-
 app/app/pods/auth/reset/template.hbs          |  2 +-
 app/app/pods/auth/sso/template.hbs            |  2 +-
 app/app/pods/setup/template.hbs               |  4 +-
 app/app/services/app-meta.js                  |  2 +-
 app/app/services/session.js                   |  6 +-
 .../components/document/document-files.hbs    |  2 +-
 .../components/document/document-view.hbs     |  2 +-
 .../components/document/edit-tools.hbs        |  4 +-
 .../components/document/editor-history.hbs    |  2 +-
 .../components/document/page-wizard.hbs       |  2 +-
 .../components/folder/documents-list.hbs      |  2 +-
 .../components/folder/start-document.hbs      |  2 +-
 .../components/onboard/share-folder.hbs       |  6 +-
 .../components/section/base-editor.hbs        |  2 +-
 app/config/environment.js                     |  5 +-
 app/electron.js                               | 91 +++++++++++++++++++
 app/package.json                              | 49 +++++++++-
 app/tests/electron.js                         | 33 +++++++
 app/tests/package.json                        |  4 +
 core/database/templates/db-error.html         | 24 ++---
 29 files changed, 273 insertions(+), 62 deletions(-)
 create mode 100644 app/electron.js
 create mode 100644 app/tests/electron.js
 create mode 100644 app/tests/package.json

diff --git a/app/app/authenticators/documize.js b/app/app/authenticators/documize.js
index af522f9c..b3965fdc 100644
--- a/app/app/authenticators/documize.js
+++ b/app/app/authenticators/documize.js
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -35,6 +35,12 @@ export default Base.extend({
 
 	authenticate(credentials) {
 		let domain = netUtil.getSubdomain();
+		if (is.empty(domain)) {
+			console.log(domain);
+			domain = "demo1";
+			console.log(domain);
+		}
+		
 		let encoded;
 
 		if (typeof credentials === 'object') {
@@ -63,4 +69,4 @@ export default Base.extend({
 	invalidate() {
 		return resolve();
 	}
-});
\ No newline at end of file
+});
diff --git a/app/app/components/onboard/share-folder.js b/app/app/components/onboard/share-folder.js
index b9f4fa19..7eb6322b 100644
--- a/app/app/components/onboard/share-folder.js
+++ b/app/app/components/onboard/share-folder.js
@@ -24,14 +24,20 @@ export default Ember.Component.extend({
     didRender() {
         let self = this;
 
+		let assetUrl = this.session.get('assetURL');
+		// handle desktop app
+		if (assetUrl === null) {
+			assetUrl = '';
+		}
+
         $("#stage-1-firstname").focus();
 
         // Stage 1 - person name keypress handler
         $("#stage-1-firstname, #stage-1-lastname").keyup(function() {
             if (!$("#stage-1-firstname").val() || !$("#stage-1-lastname").val()) {
-                $(".name-status").attr("src", "/assets/img/onboard/person-red.png");
+                $(".name-status").attr("src", assetUrl + "assets/img/onboard/person-red.png");
             } else {
-                $(".name-status").attr("src", "/assets/img/onboard/person-green.png");
+                $(".name-status").attr("src", assetUrl + "assets/img/onboard/person-green.png");
             }
         });
 
@@ -40,14 +46,14 @@ export default Ember.Component.extend({
             if (!$("#stage-1-firstname").val()) {
                 $("#stage-1-firstname").focus();
                 $("#stage-1-firstname").addClass("error");
-                $(".name-status").attr("src", "/assets/img/onboard/person-red.png");
+                $(".name-status").attr("src", assetUrl + "assets/img/onboard/person-red.png");
                 return;
             }
 
             if (!$("#stage-1-lastname").val()) {
                 $("#stage-1-lastname").focus();
                 $("#stage-1-lastname").addClass("error");
-                $(".name-status").attr("src", "/assets/img/onboard/person-red.png");
+                $(".name-status").attr("src", assetUrl + "assets/img/onboard/person-red.png");
                 return;
             }
 
@@ -67,9 +73,9 @@ export default Ember.Component.extend({
                 $("#stage-2-password-confirm").keyup(function() {
                     if ($("#stage-2-password").val().length < 6 || $("#stage-2-password").val().length > 50 ||
                         ($("#stage-2-password").val() !== $("#stage-2-password-confirm").val())) {
-                        $(".password-status").attr("src", "/assets/img/onboard/lock-red.png");
+                        $(".password-status").attr("src", assetUrl + "assets/img/onboard/lock-red.png");
                     } else {
-                        $(".password-status").attr("src", "/assets/img/onboard/lock-green.png");
+                        $(".password-status").attr("src", assetUrl + "assets/img/onboard/lock-green.png");
                     }
                 });
             });
@@ -91,7 +97,7 @@ export default Ember.Component.extend({
 
             if ($("#stage-2-password-confirm").val() !== $("#stage-2-password").val()) {
                 $(".mismatch").show();
-                $(".password-status").attr("src", "/assets/img/onboard/lock-red.png");
+                $(".password-status").attr("src", assetUrl + "assets/img/onboard/lock-red.png");
                 return;
             }
 
diff --git a/app/app/components/section/code/type-editor.js b/app/app/components/section/code/type-editor.js
index 14fb6f68..76e40903 100644
--- a/app/app/components/section/code/type-editor.js
+++ b/app/app/components/section/code/type-editor.js
@@ -23,7 +23,13 @@ export default Ember.Component.extend(TooltipMixin, {
 		this._super(...arguments);
 
         let self = this;
-        CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
+
+		// handle desktop app
+		if (this.session.get('assetURL') === null) {
+			CodeMirror.modeURL = "codemirror/mode/%N/%N.js";
+		} else {
+			CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
+		}
 
         let rawBody = this.get('meta.rawBody');
         let cleanBody = rawBody.replace("</pre>", "");
diff --git a/app/app/components/section/code/type-renderer.js b/app/app/components/section/code/type-renderer.js
index 742e8665..bd5d6be6 100644
--- a/app/app/components/section/code/type-renderer.js
+++ b/app/app/components/section/code/type-renderer.js
@@ -16,7 +16,11 @@ export default Ember.Component.extend({
     codeSyntax: "htmlmixed",
 
     didReceiveAttrs() {
-        CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
+		if (this.session.get('assetURL') === null) {
+			CodeMirror.modeURL = "codemirror/mode/%N/%N.js";
+		} else {
+			CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
+		}
 
         let page = this.get('page');
         let rawBody = page.get('body');
diff --git a/app/app/components/section/wysiwyg/type-editor.js b/app/app/components/section/wysiwyg/type-editor.js
index a55fb2d7..65161e14 100644
--- a/app/app/components/section/wysiwyg/type-editor.js
+++ b/app/app/components/section/wysiwyg/type-editor.js
@@ -67,9 +67,18 @@ export default Ember.Component.extend({
 		};
 
 		if (typeof tinymce === 'undefined') {
-			$.getScript("/tinymce/tinymce.min.js?v=443", function () {
+			let url = this.session.get('assetURL');
+			let tinymceBaseURL = "//" + window.location.host + "/tinymce";
+
+			// handle desktop app
+			if (url === null) {
+				url = '';
+				tinymceBaseURL = "tinymce";
+			}
+
+			$.getScript(url + "tinymce/tinymce.min.js?v=443", function () {
 				window.tinymce.dom.Event.domLoaded = true;
-				tinymce.baseURL = "//" + window.location.host + "/tinymce";
+				tinymce.baseURL = tinymceBaseURL;
 				tinymce.suffix = ".min";
 				tinymce.init(options);
 			});
diff --git a/app/app/index.html b/app/app/index.html
index 66d8284c..108084b8 100644
--- a/app/app/index.html
+++ b/app/app/index.html
@@ -11,22 +11,22 @@
 		<meta name="author" content="Documize" />
 		<meta name="description" content="Documize">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-		<link rel="shortcut icon" href="/favicon.ico?v=1.1" />
-		<link rel="icon" type="image/png" href="/favicon-32x32.png?v=1.1" sizes="32x32" />
-		<link rel="stylesheet" href="/assets/vendor.css">
-		<link rel="stylesheet" href="/assets/documize.css">
+		<link rel="shortcut icon" href="{{rootURL}}favicon.ico?v=1.1" />
+		<link rel="icon" type="image/png" href="{{rootURL}}favicon-32x32.png?v=1.1" sizes="32x32" />
+		<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+		<link rel="stylesheet" href="{{rootURL}}assets/documize.css">
 		{{content-for 'head-footer'}}
 	</head>
 
 	<body>
 		{{content-for 'body'}}
-		<script src="/assets/vendor.js"></script>
-		<script src="/assets/documize.js"></script>
-		<script src="/codemirror/lib/codemirror.js"></script>
-		<script src="/codemirror/mode/meta.js"></script>
-		<script src="/codemirror/addon/mode/loadmode.js"></script>
-		<script src="/codemirror/addon/runmode/runmode.js"></script>
-		<script src="/codemirror/addon/runmode/colorize.js"></script>
+		<script src="{{rootURL}}assets/vendor.js"></script>
+		<script src="{{rootURL}}assets/documize.js"></script>
+		<script src="{{rootURL}}codemirror/lib/codemirror.js"></script>
+		<script src="{{rootURL}}codemirror/mode/meta.js"></script>
+		<script src="{{rootURL}}codemirror/addon/mode/loadmode.js"></script>
+		<script src="{{rootURL}}codemirror/addon/runmode/runmode.js"></script>
+		<script src="{{rootURL}}codemirror/addon/runmode/colorize.js"></script>
 		{{content-for 'body-footer'}}
 	</body>
 
diff --git a/app/app/initializers/application.js b/app/app/initializers/application.js
index 11372ba4..a03ae2bb 100644
--- a/app/app/initializers/application.js
+++ b/app/app/initializers/application.js
@@ -9,7 +9,9 @@
 //
 // https://documize.com
 
-export function initialize( /*application*/ ) {
+// import env from '../config/environment';
+
+export function initialize(/*application*/) {
     // address insecure jquery defaults (kudos: @nathanhammond)
     $.globalEval = function() {};
     $.ajaxSetup({
diff --git a/app/app/pods/auth/forgot/template.hbs b/app/app/pods/auth/forgot/template.hbs
index 74fc8db1..7118e106 100644
--- a/app/app/pods/auth/forgot/template.hbs
+++ b/app/app/pods/auth/forgot/template.hbs
@@ -1,6 +1,6 @@
 <div class="auth-box">
     <div class="logo">
-        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
+        <img src="{{session.assetURL}}assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
     </div>
     <div class="login-form">
         {{forgot-password forgot=(action 'forgot')}}
diff --git a/app/app/pods/auth/login/template.hbs b/app/app/pods/auth/login/template.hbs
index 30fe58a9..e3938b87 100644
--- a/app/app/pods/auth/login/template.hbs
+++ b/app/app/pods/auth/login/template.hbs
@@ -1,6 +1,6 @@
 <div class="auth-box">
     <div class="logo">
-        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
+        <img src="{{session.assetURL}}assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
     </div>
     <div class="login-form">
         <form id="login-form" {{action 'login' on="submit"}}>
diff --git a/app/app/pods/auth/reset/template.hbs b/app/app/pods/auth/reset/template.hbs
index 5576e71d..f82dd528 100644
--- a/app/app/pods/auth/reset/template.hbs
+++ b/app/app/pods/auth/reset/template.hbs
@@ -1,6 +1,6 @@
 <div class="auth-box">
     <div class="logo">
-        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
+        <img src="{{session.assetURL}}assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
     </div>
     {{password-reset reset=(action 'reset')}}
 </div>
diff --git a/app/app/pods/auth/sso/template.hbs b/app/app/pods/auth/sso/template.hbs
index bdba4577..95db9e98 100644
--- a/app/app/pods/auth/sso/template.hbs
+++ b/app/app/pods/auth/sso/template.hbs
@@ -1,4 +1,4 @@
 <div class="sso-box">
     <p>Signing in...</p>
-    <img src="/assets/img/busy-gray.gif" />
+    <img src="{{session.assetURL}}assets/img/busy-gray.gif" />
 </div>
diff --git a/app/app/pods/setup/template.hbs b/app/app/pods/setup/template.hbs
index 13f12e68..277ab464 100644
--- a/app/app/pods/setup/template.hbs
+++ b/app/app/pods/setup/template.hbs
@@ -2,10 +2,10 @@
 	<div class="row">
 		<div class="col-lg-3 col-md-3 col-sm-3">
 			<div>
-				<img src="/assets/img/setup/logo.png" alt="Documize" class="no-select no-outline margin-top-20" />
+				<img src="{{session.assetURL}}assets/img/setup/logo.png" alt="Documize" class="no-select no-outline margin-top-20" />
 			</div>
 			<div class="margin-top-150">
-				<img src="/assets/img/setup/cogs.png" width="157" height="187" alt="Setup new database" class="no-select no-outline" />
+				<img src="{{session.assetURL}}assets/img/setup/cogs.png" width="157" height="187" alt="Setup new database" class="no-select no-outline" />
 			</div>
 		</div>
 		{{documize-setup model=model save=(action 'save')}}
diff --git a/app/app/services/app-meta.js b/app/app/services/app-meta.js
index 1c8dae9a..0e2cf0f5 100644
--- a/app/app/services/app-meta.js
+++ b/app/app/services/app-meta.js
@@ -47,7 +47,7 @@ export default Ember.Service.extend({
 				allowAnonymousAccess: true,
 				setupMode: true
 			});
-			
+
 			this.get('localStorage').clearAll();
 
 			return resolve(this);
diff --git a/app/app/services/session.js b/app/app/services/session.js
index 01c0aac0..f737a79f 100644
--- a/app/app/services/session.js
+++ b/app/app/services/session.js
@@ -11,6 +11,7 @@
 
 import Ember from 'ember';
 import SimpleAuthSession from 'ember-simple-auth/services/session';
+import config from '../config/environment';
 
 const {
 	inject: { service },
@@ -39,12 +40,15 @@ export default SimpleAuthSession.extend({
 		let data = this.get('user');
 		return data.get('global');
 	}),
+	assetURL: null,
+
 
 	init: function () {
 		this._super(...arguments);
-		
+
 		this.set('isMac', is.mac());
 		this.set('isMobile', is.mobile());
+		this.set('assetURL', config.rootURL);
 	},
 
 	user: computed('isAuthenticated', 'session.content.authenticated.user', function () {
diff --git a/app/app/templates/components/document/document-files.hbs b/app/app/templates/components/document/document-files.hbs
index 2a274815..1ae368f5 100644
--- a/app/app/templates/components/document/document-files.hbs
+++ b/app/app/templates/components/document/document-files.hbs
@@ -2,7 +2,7 @@
 	<ul class="list">
 		{{#each files key="id" as |a index|}}
 			<li class="item">
-				<img class="icon" src="/assets/img/attachments/{{document/file-icon a.extension}}" />
+				<img class="icon" src="{{session.assetURL}}assets/img/attachments/{{document/file-icon a.extension}}" />
 				<a href="{{ appMeta.endpoint }}/public/attachments/{{ appMeta.orgId }}/{{ a.id }}">
 					<span class="file">{{ a.filename }}</span>
 				</a>
diff --git a/app/app/templates/components/document/document-view.hbs b/app/app/templates/components/document/document-view.hbs
index 8cc7cafa..fb1f41fd 100644
--- a/app/app/templates/components/document/document-view.hbs
+++ b/app/app/templates/components/document/document-view.hbs
@@ -27,6 +27,6 @@
 
 {{#if noSections}}
 	<div class="empty-state-document">
-		<img src="/assets/img/empty-state-document.gif" />
+		<img src="{{session.assetURL}}assets/img/empty-state-document.gif" />
 	</div>
 {{/if}}
diff --git a/app/app/templates/components/document/edit-tools.hbs b/app/app/templates/components/document/edit-tools.hbs
index 86b977a5..2095ff28 100644
--- a/app/app/templates/components/document/edit-tools.hbs
+++ b/app/app/templates/components/document/edit-tools.hbs
@@ -31,7 +31,7 @@
 						{{#each candidates.attachments as |a|}}
 							<li class="link-item" {{ action 'setSelection' a }}>
 								{{#ui/ui-selection selected=a.selected}}
-									<img class="icon" src="/assets/img/attachments/{{document/file-icon a.context}}" />
+									<img class="icon" src="{{session.assetURL}}assets/img/attachments/{{document/file-icon a.context}}" />
 									{{ a.title }}
 								{{/ui/ui-selection}}
 							</li>
@@ -66,7 +66,7 @@
 						{{#each matches.attachments as |a|}}
 							<li class="link-item" {{ action 'setSelection' a }}>
 								{{#ui/ui-selection selected=a.selected}}
-									<img class="icon" src="/assets/img/attachments/{{document/file-icon a.context}}" />
+									<img class="icon" src="{{session.assetURL}}assets/img/attachments/{{document/file-icon a.context}}" />
 									{{ a.title }}
 								{{/ui/ui-selection}}
 							</li>
diff --git a/app/app/templates/components/document/editor-history.hbs b/app/app/templates/components/document/editor-history.hbs
index 650aa76c..a03f5ceb 100644
--- a/app/app/templates/components/document/editor-history.hbs
+++ b/app/app/templates/components/document/editor-history.hbs
@@ -33,7 +33,7 @@
             </div>
             {{#if busy}}
                 <div class="processing">
-                    <img src="/assets/img/processing.gif" />
+                    <img src="{{session.assetURL}}assets/img/processing.gif" />
                     <div class="caption">Preparing</div>
                 </div>
             {{/if}}
diff --git a/app/app/templates/components/document/page-wizard.hbs b/app/app/templates/components/document/page-wizard.hbs
index 1d6b3de5..2369df4b 100644
--- a/app/app/templates/components/document/page-wizard.hbs
+++ b/app/app/templates/components/document/page-wizard.hbs
@@ -4,7 +4,7 @@
 			{{#each sections as |section|}}
 				<li class="item" {{action 'addSection' section}}>
 					<div class="icon">
-						<img class="img" src="/sections/{{section.contentType}}.png" srcset="/sections/{{section.contentType}}@2x.png" />
+						<img class="img" src="{{session.assetURL}}sections/{{section.contentType}}.png" srcset="{{session.assetURL}}sections/{{section.contentType}}@2x.png" />
 					</div>
 					<div class="details">
 						<div class='title'>
diff --git a/app/app/templates/components/folder/documents-list.hbs b/app/app/templates/components/folder/documents-list.hbs
index 8f780f0b..89986521 100644
--- a/app/app/templates/components/folder/documents-list.hbs
+++ b/app/app/templates/components/folder/documents-list.hbs
@@ -21,6 +21,6 @@
 
 {{#if emptyState}}
 	<div class="empty-state-space">
-		<img src="/assets/img/empty-state-space.gif" />
+		<img src="{{session.assetURL}}assets/img/empty-state-space.gif" />
 	</div>
 {{/if}}
diff --git a/app/app/templates/components/folder/start-document.hbs b/app/app/templates/components/folder/start-document.hbs
index c2863efd..49ac9e59 100644
--- a/app/app/templates/components/folder/start-document.hbs
+++ b/app/app/templates/components/folder/start-document.hbs
@@ -9,7 +9,7 @@
 			{{#each savedTemplates key="id" as |template|}}
 				<li class="item">
 					<div class="icon">
-						<img class="img" src="/assets/img/{{template.img}}.png" srcset="/assets/img/{{template.img}}@2x.png" />
+						<img class="img" src="{{session.assetURL}}assets/img/{{template.img}}.png" srcset="{{session.assetURL}}assets/img/{{template.img}}@2x.png" />
 						{{#if editor}}
 							{{#unless template.locked}}
 								<div class="edit-control" {{action 'editTemplate' template}}>edit</div>
diff --git a/app/app/templates/components/onboard/share-folder.hbs b/app/app/templates/components/onboard/share-folder.hbs
index ace49dbe..f87a0ae9 100644
--- a/app/app/templates/components/onboard/share-folder.hbs
+++ b/app/app/templates/components/onboard/share-folder.hbs
@@ -1,7 +1,7 @@
 <div class="col-lg-4 col-md-4 col-sm-4">
     <div class="sidebar">
 
-        <img class="logo" src="/assets/img/logo-color.png"/>
+        <img class="logo" src="{{session.assetURL}}assets/img/logo-color.png"/>
 
         <div class="stage-1">
             <h2>Documize Sign-up</h2>
@@ -52,7 +52,7 @@
             <div class="account-name-preview">
                 <div class="nav-icon"></div>
                 <div class="title">DOCUMIZE</div>
-                <img class="name-status" src="/assets/img/onboard/person.png" />
+                <img class="name-status" src="{{session.assetURL}}assets/img/onboard/person.png" />
             </div>
         </div>
 
@@ -60,7 +60,7 @@
             <div class="account-name-preview">
                 <div class="nav-icon"></div>
                 <div class="title">DOCUMIZE</div>
-                <img class="password-status" src="/assets/img/onboard/lock.png" />
+                <img class="password-status" src="{{session.assetURL}}assets/img/onboard/lock.png" />
             </div>
         </div>
 
diff --git a/app/app/templates/components/section/base-editor.hbs b/app/app/templates/components/section/base-editor.hbs
index 4bb101fc..53d6484c 100644
--- a/app/app/templates/components/section/base-editor.hbs
+++ b/app/app/templates/components/section/base-editor.hbs
@@ -9,7 +9,7 @@
 		</div>
 		<div class="buttons pull-right">
 			{{#if busy}}
-				<img src="/assets/img/busy-gray.gif" class="busy-indicator" />
+				<img src="{{session.assetURL}}assets/img/busy-gray.gif" class="busy-indicator" />
 			{{/if}}
 			<div id="editor-cancel" class="flat-button flat-gray" {{action 'onCancel'}}>{{cancelLabel}}</div>
 			<div class="button-gap" />
diff --git a/app/config/environment.js b/app/config/environment.js
index 370dc463..81f95ba7 100644
--- a/app/config/environment.js
+++ b/app/config/environment.js
@@ -16,10 +16,9 @@ module.exports = function (environment) {
 	var ENV = {
 		modulePrefix: 'documize',
 		podModulePrefix: 'documize/pods',
-		locationType: 'auto',
+		locationType: process.env.EMBER_CLI_ELECTRON ? 'hash' : 'auto',
 		environment: environment,
-		rootURL: '/',
-		// baseURL: '/',
+		rootURL: process.env.EMBER_CLI_ELECTRON ? null : '/',
 		apiHost: '',
 		apiNamespace: '',
 		contentSecurityPolicyHeader: 'Content-Security-Policy-Report-Only',
diff --git a/app/electron.js b/app/electron.js
new file mode 100644
index 00000000..52fa7139
--- /dev/null
+++ b/app/electron.js
@@ -0,0 +1,91 @@
+/* jshint node: true */
+'use strict';
+
+const electron             = require('electron');
+const path                 = require('path');
+const app                  = electron.app;
+const BrowserWindow        = electron.BrowserWindow;
+const dirname              = __dirname || path.resolve(path.dirname());
+const emberAppLocation     = `file://${dirname}/dist/index.html`;
+
+let mainWindow = null;
+
+// Uncomment the lines below to enable Electron's crash reporter
+// For more information, see http://electron.atom.io/docs/api/crash-reporter/
+
+// electron.crashReporter.start({
+//     productName: 'YourName',
+//     companyName: 'YourCompany',
+//     submitURL: 'https://your-domain.com/url-to-submit',
+//     autoSubmit: true
+// });
+
+app.on('window-all-closed', function onWindowAllClosed() {
+    if (process.platform !== 'darwin') {
+        app.quit();
+    }
+});
+
+app.on('ready', function onReady() {
+    mainWindow = new BrowserWindow({
+        width: 1300,
+        height: 900
+    });
+
+    delete mainWindow.module;
+
+    // If you want to open up dev tools programmatically, call
+    // mainWindow.openDevTools();
+
+    // By default, we'll open the Ember App by directly going to the
+    // file system.
+    //
+    // Please ensure that you have set the locationType option in the
+    // config/environment.js file to 'hash'. For more information,
+    // please consult the ember-electron readme.
+    mainWindow.loadURL(emberAppLocation);
+
+    // If a loading operation goes wrong, we'll send Electron back to
+    // Ember App entry point
+    mainWindow.webContents.on('did-fail-load', () => {
+        mainWindow.loadURL(emberAppLocation);
+    });
+
+    mainWindow.webContents.on('crashed', () => {
+        console.log('Your Ember app (or other code) in the main window has crashed.');
+        console.log('This is a serious issue that needs to be handled and/or debugged.');
+    });
+
+    mainWindow.on('unresponsive', () => {
+        console.log('Your Ember app (or other code) has made the window unresponsive.');
+    });
+
+    mainWindow.on('responsive', () => {
+        console.log('The main window has become responsive again.');
+    });
+
+    mainWindow.on('closed', () => {
+        mainWindow = null;
+    });
+
+    // Handle an unhandled error in the main thread
+    //
+    // Note that 'uncaughtException' is a crude mechanism for exception handling intended to
+    // be used only as a last resort. The event should not be used as an equivalent to
+    // "On Error Resume Next". Unhandled exceptions inherently mean that an application is in
+    // an undefined state. Attempting to resume application code without properly recovering
+    // from the exception can cause additional unforeseen and unpredictable issues.
+    //
+    // Attempting to resume normally after an uncaught exception can be similar to pulling out
+    // of the power cord when upgrading a computer -- nine out of ten times nothing happens -
+    // but the 10th time, the system becomes corrupted.
+    //
+    // The correct use of 'uncaughtException' is to perform synchronous cleanup of allocated
+    // resources (e.g. file descriptors, handles, etc) before shutting down the process. It is
+    // not safe to resume normal operation after 'uncaughtException'.
+    process.on('uncaughtException', (err) => {
+        console.log('An exception in the main thread was not handled.');
+        console.log('This is a serious issue that needs to be handled and/or debugged.');
+        console.log(`Exception: ${err}`);
+    });
+});
diff --git a/app/package.json b/app/package.json
index fad37418..ea75a8de 100644
--- a/app/package.json
+++ b/app/package.json
@@ -13,7 +13,6 @@
     "start": "ember server",
     "test": "ember test"
   },
-  "repository": "",
   "engines": {
     "node": ">= 0.10.0"
   },
@@ -21,6 +20,10 @@
   "license": "AGPL",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
+    "devtron": "^1.4.0",
+    "electron": "^1.4.10",
+    "electron-packager": "^8.3.0",
+    "electron-rebuild": "^1.4.0",
     "ember-ajax": "^2.4.1",
     "ember-cli": "2.10.0",
     "ember-cli-app-version": "^2.0.0",
@@ -38,7 +41,9 @@
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-data": "^2.10.0",
+    "ember-electron": "1.10.8",
     "ember-export-application-global": "^1.0.5",
+    "ember-inspector": "^2.0.4",
     "ember-load-initializers": "^0.5.1",
     "ember-resolver": "^2.0.3",
     "ember-simple-auth": "git+https://github.com/documize/ember-simple-auth.git#21e638f9e33267d8944835002ee96884d34d568a",
@@ -48,5 +53,47 @@
     "paths": [
       "lib/intercom"
     ]
+  },
+  "main": "electron.js",
+  "ember-electron": {
+    "WHAT IS THIS?": "Please see the README.md",
+    "copy-files": [
+      "electron.js",
+      "package.json"
+    ],
+    "name": null,
+    "platform": null,
+    "arch": null,
+    "version": null,
+    "app-bundle-id": null,
+    "app-category-type": null,
+    "app-copyright": null,
+    "app-version": null,
+    "asar": null,
+    "asar-unpack": null,
+    "asar-unpack-dir": null,
+    "build-version": null,
+    "cache": null,
+    "extend-info": null,
+    "extra-resource": null,
+    "helper-bundle-id": null,
+    "icon": null,
+    "ignore": null,
+    "out": null,
+    "osx-sign": {
+      "identity": null,
+      "entitlements": null,
+      "entitlements-inherit": null
+    },
+    "overwrite": null,
+    "prune": null,
+    "strict-ssl": null,
+    "version-string": {
+      "CompanyName": null,
+      "FileDescription": null,
+      "OriginalFilename": null,
+      "ProductName": null,
+      "InternalName": null
+    }
   }
 }
diff --git a/app/tests/electron.js b/app/tests/electron.js
new file mode 100644
index 00000000..36ee2a88
--- /dev/null
+++ b/app/tests/electron.js
@@ -0,0 +1,33 @@
+/* jshint undef: false */
+
+const BrowserWindow = require('electron').BrowserWindow;
+const app = require('electron').app;
+
+let mainWindow = null;
+
+app.on('window-all-closed', function onWindowAllClosed() {
+    if (process.platform !== 'darwin') {
+        app.quit();
+    }
+});
+
+app.on('ready', function onReady() {
+    mainWindow = new BrowserWindow({
+        width: 800,
+        height: 600
+    });
+
+    delete mainWindow.module;
+
+    if (process.env.EMBER_ENV === 'test') {
+        mainWindow.loadURL('file://' + __dirname + '/index.html');
+    } else {
+        mainWindow.loadURL('file://' + __dirname + '/dist/index.html');
+    }
+
+    mainWindow.on('closed', function onClosed() {
+        mainWindow = null;
+    });
+});
+
+/* jshint undef: true */
diff --git a/app/tests/package.json b/app/tests/package.json
new file mode 100644
index 00000000..8c61a3ee
--- /dev/null
+++ b/app/tests/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "ember-electron-test",
+  "main": "electron.js"
+}
diff --git a/core/database/templates/db-error.html b/core/database/templates/db-error.html
index b4e9fa3e..3ab341ee 100644
--- a/core/database/templates/db-error.html
+++ b/core/database/templates/db-error.html
@@ -14,7 +14,7 @@
         html {
             -webkit-font-smoothing: antialiased;
         }
-        
+
         body {
             font-family: 'Open Sans', sans-serif;
             background-color: #1b75bb;
@@ -22,54 +22,54 @@
             color: #ffffff;
             padding-top: 50px;
         }
-        
+
         .container {
             max-width: 1200px;
             margin: 0 auto;
             text-align: center;
         }
-        
+
         .logo {
             margin: 0 15px;
         }
-        
+
         .content {
             margin: 0 15px;
         }
-        
+
         .content > div {
             margin: 50px 0;
         }
-        
+
         .content h1 {
             font-size: 24px;
             font-weight: 400;
             text-transform: uppercase;
             margin: 0 0 30px;
         }
-        
+
         .content p {
             font-size: 18px;
             line-height: 28px;
             margin: 30px 0 0 0;
         }
-        
+
         .content .image {
             text-align: center;
         }
-        
+
         .clearfix {
             overflow: auto;
             zoom: 1;
         }
-        
+
         .btn-main {
             border: 1px solid #ffffff;
             padding: 12px 20px;
             border-radius: 5px;
             margin-left: 25px;
         }
-        
+
         @media (min-width: 768px) {
             body {
                 margin-top: 100px;
@@ -119,4 +119,4 @@
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>