From 2ebaa8eb6647e9f36cfebad8d580a90cf1eae6d7 Mon Sep 17 00:00:00 2001
From: Bhargav <BJP232004@GMAIL.COM>
Date: Wed, 19 Apr 2023 17:09:37 +0530
Subject: [PATCH] fix: route issue without env file (#598)

---
 web/src/services/http.ts |  9 +--------
 web/src/stores/index.ts  | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/web/src/services/http.ts b/web/src/services/http.ts
index c9c1102e66..938e048c7e 100644
--- a/web/src/services/http.ts
+++ b/web/src/services/http.ts
@@ -21,14 +21,7 @@ import config from "../aws-exports";
 const http = () => {
   const instance = axios.create({
     // timeout: 10000,
-    baseURL:
-      (import.meta.env.VITE_ZINCOBSERVE_ENDPOINT &&
-        import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.endsWith("/")
-        ? import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.slice(0, -1)
-        : import.meta.env.VITE_ZINCOBSERVE_ENDPOINT) ||
-      (window.location.origin != "http://localhost:8081"
-        ? window.location.origin
-        : "http://localhost:5080"),
+    baseURL: store.state.API_ENDPOINT,
     headers: {
       Authorization:
         config.isZincObserveCloud == "true"
diff --git a/web/src/stores/index.ts b/web/src/stores/index.ts
index b66266eb6d..7063d096d8 100644
--- a/web/src/stores/index.ts
+++ b/web/src/stores/index.ts
@@ -15,16 +15,16 @@
 import { createStore } from "vuex";
 import { useLocalOrganization, useLocalCurrentUser } from "../utils/zincutils";
 
-const API_ENDPOINT =
-  import.meta.env.VITE_ZINCOBSERVE_CLOUD &&
-  import.meta.env.VITE_ZINCOBSERVE_CLOUD == "true"
-    ? import.meta.env.VITE_ZINCOBSERVE_ENDPOINT &&
-      import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.endsWith("/")
-      ? import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.slice(0, -1)
-      : import.meta.env.VITE_ZINCOBSERVE_ENDPOINT
-    : window.location.origin != "http://localhost:8081"
-    ? window.location.origin
-    : "http://localhost:5080";
+const pos = window.location.pathname.indexOf("/web/");
+const API_ENDPOINT = import.meta.env.VITE_ZINCOBSERVE_ENDPOINT
+  ? import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.endsWith("/")
+    ? import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.slice(0, -1)
+    : import.meta.env.VITE_ZINCOBSERVE_ENDPOINT
+  : window.location.origin == "http://localhost:8081"
+  ? "/"
+  : pos > -1
+  ? window.location.pathname.slice(0, pos)
+  : window.location.pathname;
 
 export default createStore({
   state: {