Merge pull request #55 from eapowertools/point-release

point-release updates
eapowertools-archive · Feb 16, 2017 · 7d65166 · 7d65166
2 parents 71e6093 + 6babfbd
commit 7d65166
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 55 deletions.
diff --git a/app/main.html b/app/main.html
@@ -11,10 +11,10 @@
     <link rel="stylesheet" type="text/css" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="bower_components/ng-dialog/css/ngDialog.min.css">
     <link rel="stylesheet" type="text/css" href="bower_components/chosen/chosen.css">
-    <link rel="stylesheet" type="text/css" href="public/css/leonardo-ui.css">
+    <link rel="stylesheet" type="text/css" href="node_modules/leonardo-ui/dist/leonardo-ui.css">
     <link rel="stylesheet" type="text/css" href="public/css/prism.css">
     <link rel="stylesheet" type="text/css" href="public/css/menu.css">
-    <link rel="image_src"  type="img/png" href="bower_components/chosen/chosen-sprite.png">
+    <link rel="image_src" type="img/png" href="bower_components/chosen/chosen-sprite.png">
     <script src="public/js/leonardo-ui.js"></script>
     <script src="bower_components/jquery/dist/jquery.min.js"></script>
     <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
@@ -29,9 +29,10 @@
     <script src="bower_components/angular-chosen-localytics/dist/angular-chosen.min.js"></script>
     <script src="bower_components/angular-socket-io/socket.min.js"></script>
     <script src="node_modules/socket.io-client/dist/socket.io.min.js"></script>
+    <script src="node_modules/leonardo-ui/dist/leonardo-ui.min.js"></script>
     <script src="app/main.js"></script>
     <script src="app/menu-list.component.js"></script>
-    
+
 </head>
 
 <body>
@@ -41,7 +42,7 @@
         <!-- Sidebar -->
         <!--Page-content Wrapper-->
         <div class="container-fluid">
-           <!-- <ng-view></ng-view> -->
+            <!-- <ng-view></ng-view> -->
             <ui-view></ui-view>
         </div>
     </div>

diff --git a/config/config.js b/config/config.js
@@ -6,15 +6,15 @@ var testConfig;
 
 var configPath = path.join(__dirname, '/../config/');
 var dir = fs.readdirSync(configPath);
-dir.forEach(function (file) {
-	if (file === 'installConfig.js') {
-		installConfig = require('./installConfig');
-	}
+dir.forEach(function(file) {
+    if (file === 'installConfig.js') {
+        installConfig = require('./installConfig');
+    }
 
-	// if(file==='testConfig.js')
-	// {
-	//     testConfig = require('./testConfig');
-	// }
+    // if(file==='testConfig.js')
+    // {
+    //     testConfig = require('./testConfig');
+    // }
 })
 
 
@@ -30,58 +30,58 @@ var qrsHostname;
 var certPathBackup;
 var qsocksHostname;
 if (certPathBackup !== undefined) {
-	certPath = certPathBackup;
+    certPath = certPathBackup;
 } else {
-	certPath = path.join(process.env.programdata, '/Qlik/Sense/Repository/Exported Certificates/.Local Certificates');
+    certPath = path.join(process.env.programdata, '/Qlik/Sense/Repository/Exported Certificates/.Local Certificates');
 }
 
 var config = {
-	certificates: {
-		certPath: certPath,
-		client: path.resolve(certPath, 'client.pem'),
-		client_key: path.resolve(certPath, 'client_key.pem'),
-		server: path.resolve(certPath, 'server.pem'),
-		server_key: path.resolve(certPath, 'server_key.pem'),
-		root: path.resolve(certPath, 'root.pem')
-	},
-	logging: {
-		logPath: logPath,
-		logFile: logFile,
-		logLevel: 'info'
-	},
-	thisServer: {
-		port: 9945,
-		hostname: friendlyHostname !== undefined ? friendlyHostname : globalHostname,
-		routePath: path.join(__dirname, '/../routes/'),
-		publicPath: path.join(__dirname, '/../public/'),
-		bowerPath: path.join(__dirname, '/../bower_components/'),
-		nodeModulesPath: path.join(__dirname, '/../node_modules/'),
-		dataPath: path.join(__dirname, '/../data/'),
-		appPath: path.join(__dirname, '/../app/'),
-		pluginPath: path.join(__dirname, '/../plugins/')
-	},
-	qsocks: {
-		host: qsocksHostname !== undefined ? qsocksHostname : globalHostname,
-		port: 4747,
-		isSecure: true,
-		origin: "https://" + (qsocksHostname !== undefined ? qsocksHostname : globalHostname),
-		rejectUnauthorized: false
-	},
-	qrs: {
-		hostname: qrsHostname !== undefined ? qrsHostname : globalHostname
-	},
-	version: "2.0.1"
+    certificates: {
+        certPath: certPath,
+        client: path.resolve(certPath, 'client.pem'),
+        client_key: path.resolve(certPath, 'client_key.pem'),
+        server: path.resolve(certPath, 'server.pem'),
+        server_key: path.resolve(certPath, 'server_key.pem'),
+        root: path.resolve(certPath, 'root.pem')
+    },
+    logging: {
+        logPath: logPath,
+        logFile: logFile,
+        logLevel: 'info'
+    },
+    thisServer: {
+        port: 9945,
+        hostname: friendlyHostname !== undefined ? friendlyHostname : globalHostname,
+        routePath: path.join(__dirname, '/../routes/'),
+        publicPath: path.join(__dirname, '/../public/'),
+        bowerPath: path.join(__dirname, '/../bower_components/'),
+        nodeModulesPath: path.join(__dirname, '/../node_modules/'),
+        dataPath: path.join(__dirname, '/../data/'),
+        appPath: path.join(__dirname, '/../app/'),
+        pluginPath: path.join(__dirname, '/../plugins/')
+    },
+    qsocks: {
+        host: qsocksHostname !== undefined ? qsocksHostname : globalHostname,
+        port: 4747,
+        isSecure: true,
+        origin: "https://" + (qsocksHostname !== undefined ? qsocksHostname : globalHostname),
+        rejectUnauthorized: false
+    },
+    qrs: {
+        hostname: qrsHostname !== undefined ? qrsHostname : globalHostname
+    },
+    version: "2.0.2"
 }
 
 
 if (friendlyHostname !== undefined || qrsHostname !== undefined || certPathBackup !== undefined) {
-	var mergedConfig = config;
+    var mergedConfig = config;
 } else if (installConfig !== undefined) {
-	var mergedConfig = extend(true, config, installConfig);
+    var mergedConfig = extend(true, config, installConfig);
 } else if (testConfig !== undefined) {
-	var mergedConfig = extend(true, config, testConfig);
+    var mergedConfig = extend(true, config, testConfig);
 } else {
-	var mergedConfig = config;
+    var mergedConfig = config;
 }
 
-module.exports = mergedConfig;
+module.exports = mergedConfig;
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "extend": "^3.0.0",
     "fs": "0.0.2",
     "https": "^1.0.0",
+    "leonardo-ui": "^1.0.2",
     "multer": "^1.2.0",
     "multer-autoreap": "^0.1.2",
     "path": "^0.12.7",

diff --git a/tmp/createServiceDispatcher.bat b/tmp/createServiceDispatcher.bat
@@ -3,9 +3,13 @@ sc query "QlikEAPowerToolsServiceDispatcher"
 IF %ERRORLEVEL% EQU 0 (GOTO END) ELSE (GOTO ADDSERVICE)
 
 :ADDSERVICE
-sc create QlikEAPowerToolsServiceDispatcher binPath= "%~1\PowerToolsServiceDispatcher\PowerToolsService.exe" DisplayName= "Qlik EAPowerTools Service Dispatcher" start= auto obj= %2 password= %3
+sc create QlikEAPowerToolsServiceDispatcher binPath= "%~1" DisplayName= "Qlik EAPowerTools Service Dispatcher" start= auto
 sc description "QlikEAPowerToolsServiceDispatcher" "Service Dispatcher for running EA Powertools" 
 
+sc start QlikEAPowerToolsServiceDispatcher
+
+TIMEOUT /T 10
+
 :END