1621-frontend-upgrade-akazmie-171113

.travis.yml

@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+  - 'v8'
+install:
+  - npm install

Gruntfile.js

@@ -1,5 +1,7 @@
 'use strict';
 
+// var config = require('insight-config.json');
+
 module.exports = function(grunt) {
 
   //Load NPM tasks
@@ -10,10 +12,27 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-markdown');
   grunt.loadNpmTasks('grunt-macreload');
   grunt.loadNpmTasks('grunt-angular-gettext');
+  grunt.loadNpmTasks('grunt-replace');
 
   // Project Configuration
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
+    replace: {
+      dist: {
+        options: {
+          patterns: [
+            {
+              match: 'INSIGHT_API_PREFIX',
+              replacement: '<%= pkg.insightConfig.apiPrefix %>'
+            }
+          ],
+          usePrefix: false
+        },
+        files: [
+          {src: ['public/src/templates/api.js'], dest: 'public/src/js/services/api.js'}
+        ]
+      }
+    },
     concat: {
       options: {
         process: function(src, filepath) {
@@ -121,13 +140,13 @@ module.exports = function(grunt) {
   grunt.option('force', true);
 
   //Default task(s).
-  grunt.registerTask('default', ['watch']);
+  grunt.registerTask('default', ['replace', 'watch']);
 
   //Update .pot file
   grunt.registerTask('translate', ['nggettext_extract']);
 
   //Compile task (concat + minify)
-  grunt.registerTask('compile', ['nggettext_compile', 'concat', 'uglify', 'cssmin']);
+  grunt.registerTask('compile', ['replace', 'nggettext_compile', 'concat', 'uglify', 'cssmin']);
 
 
 };

README.md

@@ -23,24 +23,42 @@ Open a web browser to `http://localhost:3001/insight/`
 
 ## Development
 
-To run Insight UI locally in development mode:
+To build Insight UI locally:
 
-Install bower dependencies:
+```
+$ npm run build
+```
+
+A watch task is also available:
 
 ```
-$ bower install
+$ npm run watch
 ```
 
-To compile and minify the web application's assets:
+## Changing routePrefix and apiPrefix
 
+By default, the `insightConfig` in `package.json` is:
+
+```json
+  "insightConfig": {
+    "apiPrefix": "insight-api",
+    "routePrefix": "insight"
+  }
 ```
-$ grunt compile
+
+To change these routes, first make your changes to `package.json`, for example:
+
+```json
+  "insightConfig": {
+    "apiPrefix": "api",
+    "routePrefix": ""
+  }
 ```
 
-There is a convenient Gruntfile.js for automation during editing the code
+Then rebuild the `insight-ui` service:
 
 ```
-$ grunt
+$ npm run build
 ```
 
 ## Multilanguage support
@@ -74,7 +92,7 @@ For more details about the [Insight API](https://github.com/bitpay/insight-api)
 
 ## Contribute
 
-Contributions and suggestions are welcomed at the [Insight UI GitHub repository](https://github.com/bitpay/insight).
+Contributions and suggestions are welcomed at the [Insight UI GitHub repository](https://github.com/bitpay/insight-ui).
 
 
 ## License

bitcore-node/index.js

@@ -3,28 +3,35 @@
 var BaseService = require('./service');
 var inherits = require('util').inherits;
 var fs = require('fs');
+var exec = require('child_process').exec;
+var pkg = require('../package.json');
 
 var InsightUI = function(options) {
   BaseService.call(this, options);
-  if (typeof options.apiPrefix !== 'undefined') {
-    this.apiPrefix = options.apiPrefix;
-  } else {
-    this.apiPrefix = 'insight-api';
-  }
-  if (typeof options.routePrefix !== 'undefined') {
-    this.routePrefix = options.routePrefix;
-  } else {
-    this.routePrefix = 'insight';
-  }
+  this.apiPrefix = options.apiPrefix || 'api';
+  this.routePrefix = options.routePrefix || '';
 };
 
 InsightUI.dependencies = ['insight-api'];
 
 inherits(InsightUI, BaseService);
 
 InsightUI.prototype.start = function(callback) {
-  this.indexFile = this.filterIndexHTML(fs.readFileSync(__dirname + '/../public/index.html', {encoding: 'utf8'}));
-  setImmediate(callback);
+
+  var self = this;
+  pkg.insightConfig.apiPrefix = self.apiPrefix;
+  pkg.insightConfig.routePrefix = self.routePrefix;
+
+  fs.writeFileSync(__dirname + '/../package.json', JSON.stringify(pkg, null, 2));
+  exec('cd ' + __dirname + '/../;' +
+    ' npm run install-and-build', function(err) {
+    if (err) {
+      return callback(err);
+    }
+    self.indexFile = self.filterIndexHTML(fs.readFileSync(__dirname + '/../public/index-template.html', {encoding: 'utf8'}));
+    callback();
+  });
+
 };
 
 InsightUI.prototype.getRoutePrefix = function() {
@@ -33,27 +40,19 @@ InsightUI.prototype.getRoutePrefix = function() {
 
 InsightUI.prototype.setupRoutes = function(app, express) {
   var self = this;
-
-  app.use('/', function(req, res, next){
-    if (req.headers.accept && req.headers.accept.indexOf('text/html') !== -1 &&
-      req.headers["X-Requested-With"] !== 'XMLHttpRequest'
-    ) {
-      res.setHeader('Content-Type', 'text/html');
-      res.send(self.indexFile);
-    } else {
-      express.static(__dirname + '/../public')(req, res, next);
-    }
+  app.use(express.static(__dirname + '/../public'));
+  // if not in found, fall back to indexFile (404 is handled client-side)
+  app.use(function(req, res) {
+    res.setHeader('Content-Type', 'text/html');
+    res.send(self.indexFile);
   });
 };
 
 InsightUI.prototype.filterIndexHTML = function(data) {
-  var transformed = data
-    .replace(/apiPrefix = '\/api'/, "apiPrefix = '/" + this.apiPrefix + "'");
-
-  if (this.routePrefix) {
-    transformed = transformed.replace(/<base href=\"\/\"/, '<base href="/' + this.routePrefix + '/"');
+  var transformed = data;
+  if (this.routePrefix !== '') {
+    transformed = transformed.replace('<base href="/"', '<base href="/' + this.routePrefix + '/"');
   }
-
   return transformed;
 };
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Insight",
-  "version": "0.0.1",
+  "version": "5.0.0-beta.1",
   "dependencies": {
     "angular": "~1.2.13",
     "angular-resource": "~1.2.13",