From 801fbf62e8b04a6be6a8e9f1743ad5a8f2e3bdb5 Mon Sep 17 00:00:00 2001
From: tenthirtyone <Spactigus@gmail.com>
Date: Mon, 21 Aug 2017 14:01:08 -0400
Subject: [PATCH] Change FE to relative request paths.

---
 app/src/providers/api/api.ts      |  2 +-
 app/src/services/blocksService.ts |  2 +-
 server/lib/api/index.js           | 35 ++++++++++++++++---------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/src/providers/api/api.ts b/app/src/providers/api/api.ts
index a15b48e..0c14cf6 100644
--- a/app/src/providers/api/api.ts
+++ b/app/src/providers/api/api.ts
@@ -11,7 +11,7 @@ import 'rxjs/add/operator/map';
 @Injectable()
 export class ApiProvider {
 
-  public apiPrefix: string = 'https://insight.bitpay.com/api/';
+  public apiPrefix: string = '/api/';
 
   constructor(public http: Http) {
   }
diff --git a/app/src/services/blocksService.ts b/app/src/services/blocksService.ts
index 724b593..6ebd7d3 100644
--- a/app/src/services/blocksService.ts
+++ b/app/src/services/blocksService.ts
@@ -11,7 +11,7 @@ export class BlocksService {
   constructor(private http: Http) {}
 
   public getLatestBlocks(): void {
-    this.http.request('https://insight.bitpay.com/api/blocks').subscribe((res: Response) => {
+    this.http.request('/api/blocks').subscribe((res: Response) => {
       const data: {
         blocks: InsightBlockObject[],
         length: number,
diff --git a/server/lib/api/index.js b/server/lib/api/index.js
index f857182..0a1caf1 100644
--- a/server/lib/api/index.js
+++ b/server/lib/api/index.js
@@ -11,18 +11,19 @@ app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
 
 // Serve insight ui front end from root dir public folder
-app.use(express.static('./public'));
-app.use('/:stuff', express.static('./public'));
-app.use('/blocks', express.static('./public'));
-app.use('/blocks/:blockhash', express.static('./public'));
-app.use('/block-index', express.static('./public'));
-app.use('/block-index/:height', express.static('./public'));
-app.use('/blocks-date/:date', express.static('./public'));
-app.use('/block/:blockhash', express.static('./public'));
-app.use('/tx/:txid', express.static('./public'));
-app.use('/address/:addr', express.static('./public'));
-app.use('/status', express.static('./public'));
-app.use('/status/:stuff', express.static('./public'));
+app.use(express.static('../app/www'));
+app.use('/:stuff', express.static('../app/www'));
+app.use('/blocks', express.static('../app/www'));
+app.use('/blocks/:blockhash', express.static('../app/www'));
+app.use('/block-index', express.static('../app/www'));
+app.use('/block-index/:height', express.static('../app/www'));
+app.use('/blocks-date/:date', express.static('../app/www'));
+app.use('/block/:blockhash', express.static('../app/www'));
+app.use('/tx/:txid', express.static('../app/www'));
+app.use('/address/:addr', express.static('../app/www'));
+app.use('/status', express.static('../app/www'));
+app.use('/status/:stuff', express.static('../app/www'));
+app.use('/status/:stuff', express.static('../app/www'));
 
 app.set('json spaces', config.api.json_spaces);
 
@@ -34,14 +35,14 @@ const StatusAPI      = require('./status')(api);
 const TransactionAPI = require('./transaction')(api);
 const MessageAPI     = require('./message')(api);
 
-app.use('/insight-api', api);
+app.use('/api', api);
 
 // 404
 app.use((req, res) => res.status(404).send({
-    status: 404,
-    url: req.originalUrl,
-    error: 'Not found',
-  }));
+  status: 404,
+  url: req.originalUrl,
+  error: 'Not found',
+}));
 
 // Socket server
 const server  = require('http').Server(app);