From fbb6e8217720f83bbfcf505d626d3c62ebb7051d Mon Sep 17 00:00:00 2001
From: James Ketrenos <james_git@ketrenos.com>
Date: Mon, 17 Feb 2020 16:54:11 -0800
Subject: [PATCH] Adjusted routing so it will host main app from base and dev
 from base + 1

Signed-off-by: James Ketrenos <james_git@ketrenos.com>
---
 index.html     | 2 +-
 server/app.js  | 1 +
 webpack.dev.js | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/index.html b/index.html
index ed93a91..da16c95 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<link rel="icon" href="./frontend/icons-192.png" sizes="192x192">
+<link rel="icon" href="./icons-192.png" sizes="192x192">
 <script>'<base href="BASEPATH">';</script>
 <style>
 body {
diff --git a/server/app.js b/server/app.js
index 592034c..0d1cc79 100755
--- a/server/app.js
+++ b/server/app.js
@@ -40,6 +40,7 @@ app.use(basePath, require("./routes/basepath.js"));
 
 /* Handle static files first so excessive logging doesn't occur */
 app.use(basePath, express.static("frontend", { index: false }));
+app.use(basePath + "dist", express.static("dist", { index: false }));
 
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({
diff --git a/webpack.dev.js b/webpack.dev.js
index 07892f5..a0b4b59 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -11,7 +11,7 @@ const proxy = {
 }
 
 proxy[`${base}/`] = {
-  target: "http://localhost:8766",
+  target: "http://localhost:8765",
   bypass: function(req, res, proxyOptions) {
     console.log(req.url);
     if (req.url.match(new RegExp(base.replace(/\//g, "\\/") + "\/identities[/?]?"))) {
@@ -26,7 +26,7 @@ module.exports = merge(common, {
   mode: "development",
   devServer: {
     contentBase: path.join(__dirname, "/"),
-    port: 8765,
+    port: 8766,
     publicPath: `http://localhost:8765${base}/dist/`,
     hotOnly: true,
     disableHostCheck: true,
