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

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
-COPY --from=builder /app/public ./public
+# Standalone first, then static assets; public last so it is not overwritten by any nested folder in standalone.
 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
-                  src="/logo.png"
+                <Image
+                  src={logoImage}
                   alt="Company Logo"
+                  width={32}
+                  height={32}
                   className="h-8 w-8 object-contain"
+                  priority
                 />
               </div>
               <div>