Removed build from docker-compose, and fixed localhost bug

2020-05-25 12:19:52 +02:00
parent f497b1acc6
commit 5815dbe5ed
3 changed files with 8 additions and 7 deletions
@@ -37,11 +37,13 @@ import { createMuiTheme } from '@material-ui/core/styles';
 import AlertTemplate from "react-alert-template-basic";
 import { positions, Provider } from "react-alert";

-// Testing - localhost
-//const globalUrl = "http://192.168.3.6:5001"
-
 // Production - backend proxy forwarding in nginx
-const globalUrl = window.location.origin
+var globalUrl = window.location.origin
+if (window.location.protocol == "http:" && window.location.port === "3000") {
+	globalUrl = "http://192.168.3.6:5001"
+}
+console.log(window.location)
+console.log(globalUrl)

 const surfaceColor = "#27292D"
 const inputColor = "#383B40"