fix build

marhaupe · Oct 10, 2024 · 939f1d3 · 939f1d3
1 parent de13445
commit 939f1d3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,6 +6,8 @@ COPY packages/frontend/pnpm-lock.yaml .
 RUN pnpm install --frozen-lockfile
 COPY packages/frontend/ .
 RUN pnpm build
+RUN sed -i 's|<!--#echo var="configscript" -->|<script>window.config = {"backendURL": "https://uitail-demo.api.marhaupe.com"};</script>|' dist/index.html
+
 
 FROM golang:1.23
 WORKDIR /app

diff --git a/packages/cli/internal/static/static.go b/packages/cli/internal/static/static.go
@@ -39,11 +39,11 @@ func (s *Static) Handler() iris.Handler {
 				return
 			}
 			config := struct {
-				Command string `json:"command"`
-				Port    int    `json:"port"`
+				Command    string `json:"command"`
+				BackendURL string `json:"backendURL"`
 			}{
-				Command: s.Command,
-				Port:    s.Port,
+				Command:    s.Command,
+				BackendURL: fmt.Sprintf("http://localhost:%d", s.Port),
 			}
 			configJSON, err := json.Marshal(config)
 			if err != nil {

diff --git a/packages/frontend/src/App.tsx b/packages/frontend/src/App.tsx
@@ -22,7 +22,7 @@ export function App() {
   const logListRef = useRef<LogListRef>(null);
 
   useEffect(() => {
-    const url = new URL(`http://localhost:${config.port}${config.routes.events}`);
+    const url = new URL(`${config.backendURL}${config.routes.events}`);
     url.searchParams.set("stream", nanoid());
     if (filterState.message) {
       url.searchParams.set("filter", filterState.message);
@@ -61,7 +61,7 @@ export function App() {
 
   async function handleClear() {
     try {
-      const response = await fetch(`http://localhost:${config.port}${config.routes.clear}`, {
+      const response = await fetch(`${config.backendURL}${config.routes.clear}`, {
         method: "POST",
       });
       if (response.ok) {
@@ -75,7 +75,7 @@ export function App() {
 
   async function handleRestart() {
     try {
-      const response = await fetch(`http://localhost:${config.port}${config.routes.restart}`, {
+      const response = await fetch(`${config.backendURL}${config.routes.restart}`, {
         method: "POST",
       });
       if (response.ok) {

diff --git a/packages/frontend/src/config.ts b/packages/frontend/src/config.ts
@@ -1,7 +1,7 @@
 declare global {
   interface Window {
     config: {
-      port: number;
+      backendURL: string;
       command: string;
     };
   }
@@ -14,7 +14,7 @@ export const config = {
     clear: "/clear",
   },
   ...(window.config || {
-    port: 8765,
+    backendURL: "http://localhost:8765",
     command: "",
   }),
 };