Merge branch 'master' of https://git.atmata-group.com/ATMATA/zerp

docker-compose.yml

@@ -28,7 +28,9 @@ services:
     environment:
       PORT: 5001
       NODE_ENV: production
-      DATABASE_URL: ${DATABASE_URL}
+      # Default matches postgres service when POSTGRES_PASSWORD is unset (local/staging).
+      # Override via `.env` (Compose loads `.env`, not `.env.production`).
+      DATABASE_URL: ${DATABASE_URL:-postgresql://postgres:${POSTGRES_PASSWORD:-postgres123}@postgres:5432/mind14_crm?schema=public}
       JWT_SECRET: ${JWT_SECRET:-z-crm-jwt-secret-change-in-production-NOW}
       JWT_EXPIRES_IN: 7d
       JWT_REFRESH_EXPIRES_IN: 30d

frontend/Dockerfile

@@ -37,10 +37,10 @@ ENV NEXT_TELEMETRY_DISABLED=1
 RUN addgroup --system --gid 1001 nodejs && \
     adduser --system --uid 1001 nextjs
 
-# Copy necessary files
+# Standalone first, then static assets; public last so it is not overwritten by any nested folder in standalone.
-COPY --from=builder /app/public ./public
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+COPY --from=builder --chown=nextjs:nodejs /app/public ./public
 
 USER nextjs
 

frontend/src/app/dashboard/page.tsx

@@ -1,6 +1,8 @@
 'use client'
 
 import { useState, useEffect } from 'react'
+import Image from 'next/image'
+import logoImage from '@/assets/logo.png'
 import ProtectedRoute from '@/components/ProtectedRoute'
 import { useAuth } from '@/contexts/AuthContext'
 import { useLanguage } from '@/contexts/LanguageContext'
@@ -142,10 +144,13 @@ function DashboardContent() {
           <div className="flex items-center justify-between">
             <div className="flex items-center gap-3">
               <div className="bg-primary-600 p-2 rounded-lg">
-                <img
+                <Image
-                  src="/logo.png"
+                  src={logoImage}
                   alt="Company Logo"
+                  width={32}
+                  height={32}
                   className="h-8 w-8 object-contain"
+                  priority
                 />
               </div>
               <div>