autokitteh · RonenMars · Mar 25, 2025 · Mar 26, 2025 · Mar 26, 2025 · Mar 26, 2025
diff --git a/.env.example b/.env.example
@@ -1,4 +1,4 @@
-VITE_HOST_URL=http://localhost:1234
+API_URL=http://localhost:1234
 VITE_DESCOPE_PROJECT_ID=descopeProjectId
 TESTS_JWT_AUTH_TOKEN=jwtAuthTokenToRunE2ETests
 OPEN_AI_KEY=openAiKey
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,29 @@
-FROM node:latest AS builder
+# Build stage
+FROM node:21-alpine AS build
 WORKDIR /app
-COPY package*.json ./
-RUN npm ci
+COPY package.json package-lock.json ./
+RUN npm ci --ignore-scripts --include=dev
 COPY . .
-RUN git submodule update --init
-RUN npm run build
-EXPOSE 8000
-CMD ["npm", "run", "dev"]
+ENV NODE_ENV=production
+RUN npm run build:prod
+RUN ls -l /app/dist && cat /app/dist/index.html
+
+# Production stage
+FROM nginx:alpine AS production
+WORKDIR /app
+COPY --from=build /app/dist /usr/share/nginx/html
+
+# Copy Nginx template (not the final config)
+COPY nginx.conf.template /app/nginx.conf.template
+
+# Copy entrypoint script
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+
+# Make entrypoint executable
+RUN chmod +x /app/docker-entrypoint.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
+
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/README.md b/README.md
@@ -44,11 +44,11 @@ Create a `.env` file in the root of the project directory and add the necessary
 
 `sh cp .env.example .env` Then edit .env with your environment-specific settings
 
-`VITE_HOST_URL`
+`API_URL`
 
 - Default: A predefined default host URL mentioned in [getApiBaseUrlFile](https://github.com/autokitteh/web-platform/blob/main/src/utilities/getApiBaseUrl.utils.ts)
 - Description: Defines the backend URL that the application will use as its host. If not set, the application will use a default host URL.
-- Example: VITE_HOST_URL=http://localhost:1234
+- Example: API_URL=http://localhost:1234
 
 `VITE_DESCOPE_PROJECT_ID`
 

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Patching index.html
+API_URL=${API_URL:-"/api"}
+sed -i 's|appBaseUrl=""|appBaseUrl="'"$API_URL"'"|' /usr/share/nginx/html/index.html
+echo "Added appBaseUrl="$API_URL" configuration for react app"
+
+# Patchng NGINX
+if [ -n "$NGNIX_PROXY_API_URL" ]; then
+    if [ "${NGNIX_PROXY_API_URL: -1}" != "/" ]; then
+        NGNIX_PROXY_API_URL="${NGNIX_PROXY_API_URL}/"
+        echo "Added trailing slash to NGNIX_PROXY_API_URL: $NGNIX_PROXY_API_URL"
+    fi
+
+    sed -i 's|https://api.autokitteh.cloud|'"${NGNIX_PROXY_API_URL}"'|' /app/nginx.conf.template
+    echo "Added NGINX API routing configuration for $NGNIX_PROXY_API_URL"
+fi
+
+cp /app/nginx.conf.template /etc/nginx/conf.d/default.conf
+
+exec "$@"
diff --git a/index.html b/index.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html lang="en">
 	<head>
+		<script>window.appBaseUrl="";</script>
 		<% if (env.VITE_GTM_ID) { %>
 		<!-- Google Tag Manager -->
 		<script>

diff --git a/nginx.conf.template b/nginx.conf.template
@@ -0,0 +1,20 @@
+server {
+    listen 80;
+
+    root /usr/share/nginx/html;
+    index index.html;
+
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;  
+
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /api/ {
+        proxy_pass https://api.autokitteh.cloud;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+}
diff --git a/src/assets/templates/kittehub.zip b/src/assets/templates/kittehub.zip
diff --git a/src/config.ts b/src/config.ts
@@ -0,0 +1,8 @@
+interface AppConfig {
+	apiBaseUrl: string;
+}
+
+const runtimeConfig = (window as any).appConfig || {};
+export const config: AppConfig = {
+	apiBaseUrl: runtimeConfig.apiBaseUrl || "",
+};
diff --git a/src/utilities/getApiBaseUrl.utils.ts b/src/utilities/getApiBaseUrl.utils.ts
@@ -1,13 +1,32 @@
+/* eslint-disable no-console */
+import { ValidateURL } from "@utilities/validateUrl.utils";
+
 export const getApiBaseUrl = (): string => {
+	if (window?.appBaseUrl) {
+		if (ValidateURL(window.appBaseUrl) || window.appBaseUrl === "/api") return window.appBaseUrl;
+		else {
+			console.error("Invalid API base URL found. Please set a valid URL in your environment variables.");
+		}
+	}
+
+	const hostUrl = import.meta.env.API_URL;
+	if (hostUrl) {
+		if (ValidateURL(hostUrl)) return hostUrl;
+		else {
+			console.error("Invalid HOST_BASE_URL found. Please set a valid URL in your environment variables.");
+			return "";
+		}
+	}
+
 	const { hostname } = window.location;
 	if (hostname === "app.autokitteh.cloud") {
 		return "https://api.autokitteh.cloud";
 	}
+
 	if (hostname.endsWith(".autokitteh.cloud")) {
 		const [env, ...rest] = hostname.split(".");
-
 		return `https://${env}-api.${rest.join(".")}`;
 	}
 
-	return import.meta.env.VITE_HOST_URL || "http://localhost:9980";
+	return "http://localhost:9980";
 };
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -8,7 +8,7 @@ interface ImportMetaEnv {
 	readonly GOOGLE_ANALYTICS_ID: string;
 	readonly TESTS_JWT_AUTH_TOKEN: string;
 	readonly SENTRY_DSN: string;
-	readonly VITE_HOST_URL: string;
+	readonly API_URL: string;
 	readonly DISPLAY_DISCORD_INTEGRATION: boolean;
 	readonly DISPLAY_SLACK_SOCKET_INTEGRATION: boolean;
 	readonly VITE_GTM_ID: string;

diff --git a/vite.config.ts b/vite.config.ts
@@ -42,7 +42,7 @@ export default defineConfig({
 		"import.meta.env.VITE_NODE_ENV": JSON.stringify(process.env.VITE_NODE_ENV),
 		"import.meta.env.VITE_DESCOPE_PROJECT_ID": JSON.stringify(process.env.VITE_DESCOPE_PROJECT_ID),
 		"import.meta.env.GOOGLE_ANALYTICS_ID": JSON.stringify(process.env.GOOGLE_ANALYTICS_ID),
-		"import.meta.env.VITE_HOST_URL": JSON.stringify(process.env.VITE_HOST_URL),
+		"import.meta.env.API_URL": JSON.stringify(process.env.API_URL),
 		"import.meta.env.DISPLAY_DISCORD_INTEGRATION": process.env.DISPLAY_DISCORD_INTEGRATION,
 		"import.meta.env.DISPLAY_SLACK_SOCKET_INTEGRATION": process.env.DISPLAY_SLACK_SOCKET_INTEGRATION,
 		"import.meta.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN),
@@ -85,13 +85,8 @@ export default defineConfig({
 									cleanupIDs: false,
 									removeUselessStrokeAndFill: false,
 									removeUnknownsAndDefaults: false,
-									convertPathData: {
-										floatPrecision: 2,
-										transformPrecision: 4,
-									},
-									cleanupNumericValues: {
-										floatPrecision: 2,
-									},
+									convertPathData: { floatPrecision: 2, transformPrecision: 4 },
+									cleanupNumericValues: { floatPrecision: 2 },
 									collapseGroups: true,
 									mergePaths: true,
 									convertTransform: true,
@@ -109,18 +104,9 @@ export default defineConfig({
 		}),
 		viteStaticCopy({
 			targets: [
-				{
-					src: "src/assets/templates/**/*",
-					dest: "assets/templates",
-				},
-				{
-					src: "src/assets/new_project_program/**/*",
-					dest: "assets/new_project_program",
-				},
-				{
-					src: "src/assets/image/pages/**/*",
-					dest: "assets/image/pages",
-				},
+				{ src: "src/assets/templates/**/*", dest: "assets/templates" },
+				{ src: "src/assets/new_project_program/**/*", dest: "assets/new_project_program" },
+				{ src: "src/assets/image/pages/**/*", dest: "assets/image/pages" },
 			],
 		}),
 		reactVirtualized(),
@@ -151,10 +137,8 @@ export default defineConfig({
 			"tailwind-config": path.resolve(__dirname, "./tailwind.config.cjs"),
 		},
 	},
-
 	server: {
-		host: process.env.VITE_APP_DOMAIN ? JSON.stringify(process.env.VITE_APP_DOMAIN) : true,
-		port: process.env.VITE_LOCAL_PORT ? Number(process.env.VITE_LOCAL_PORT) : 8000,
-		strictPort: true,
+		port: 8000,
+		host: true,
 	},
 });