Merge branch 'master' of https://git.dvirlabs.com/dvirlabs/navix

backend/Dockerfile

@@ -7,4 +7,3 @@ RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
 CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
 EXPOSE 8000
-

frontend/Dockerfile

@@ -3,7 +3,7 @@ FROM node:20 AS builder
 
 WORKDIR /app
 COPY . .
-RUN npm install
+RUN npm install --legacy-peer-deps
 RUN npm run build
 
 # Stage 2: Serve with nginx

frontend/nginx.conf

@@ -0,0 +1,11 @@
+server {
+  listen 80;
+  server_name _;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ /index.html;
+  }
+}

frontend/public/env.js.template

@@ -0,0 +1,6 @@
+window.ENV = {
+  API_BASE: "${API_BASE}",
+  MINIO_ENDPOINT: "${MINIO_ENDPOINT}",
+  MINIO_BUCKET: "${MINIO_BUCKET}"
+};
+

navix-helm/templates/backend-ingress.yaml

@@ -1,23 +0,0 @@
-{{- if .Values.backend.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: navix-backend
-  annotations:
-    {{- range $key, $value := .Values.backend.ingress.annotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-spec:
-  ingressClassName: {{ .Values.backend.ingress.className }}
-  rules:
-    - host: {{ .Values.backend.ingress.hosts[0].host }}
-      http:
-        paths:
-          - path: /api
-            pathType: Prefix
-            backend:
-              service:
-                name: navix-backend
-                port:
-                  number: {{ .Values.backend.service.port }}
-{{- end }}

navix-helm/templates/env-configmap.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: navix-frontend-env
+data:
+  env.js: |
+    window.ENV = {
+      API_BASE: "{{ .Values.frontend.env.API_BASE }}",
+      MINIO_ENDPOINT: "{{ .Values.frontend.env.MINIO_ENDPOINT }}",
+      MINIO_BUCKET: "{{ .Values.frontend.env.MINIO_BUCKET }}"
+    };

navix-helm/templates/frontend-env-configmap.yaml

@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: navix-frontend-env
-data:
-  env.js: |
-    window.env = {
-      VITE_API_URL: "{{ .Values.frontend.env.VITE_API_URL }}"
-    };

navix-helm/templates/frontend-ingress.yaml

@@ -1,27 +0,0 @@
-{{- if .Values.frontend.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: navix-frontend
-  annotations:
-    {{- range $key, $value := .Values.frontend.ingress.annotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-spec:
-  ingressClassName: {{ .Values.frontend.ingress.className }}
-  rules:
-    {{- range .Values.frontend.ingress.hosts }}
-    - host: {{ .host }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            pathType: {{ .pathType }}
-            backend:
-              service:
-                name: navix-frontend
-                port:
-                  number: {{ $.Values.frontend.service.port }}
-          {{- end }}
-    {{- end }}
-{{- end }}

navix-helm/templates/ingress.yaml

@@ -0,0 +1,49 @@
+{{- if .Values.frontend.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: navix-frontend
+  annotations:
+    {{- range $key, $value := .Values.frontend.ingress.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  ingressClassName: {{ .Values.frontend.ingress.className }}
+  rules:
+    - host: {{ .Values.frontend.ingress.hosts[0].host }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: navix-frontend
+                port:
+                  number: {{ .Values.frontend.service.port }}
+{{- end }}
+
+---
+
+{{- if .Values.backend.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: navix-backend
+  annotations:
+    {{- range $key, $value := .Values.backend.ingress.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  ingressClassName: {{ .Values.backend.ingress.className }}
+  rules:
+    - host: {{ .Values.backend.ingress.hosts[0].host }}
+      http:
+        paths:
+          - path: /api
+            pathType: Prefix
+            backend:
+              service:
+                name: navix-backend
+                port:
+                  number: {{ .Values.backend.service.port }}
+{{- end }}

navix-helm/values.yaml

@@ -18,7 +18,9 @@ frontend:
           - path: /
             pathType: Prefix
   env:
-    VITE_API_URL: "/api"
+    API_BASE: "https://navix.dvirlabs.com/api"
+    MINIO_ENDPOINT: "s3.dvirlabs.com"
+    MINIO_BUCKET: "navix-icons"
 
 backend:
   image: