From 66a5bfd0ca044c3716ff5cbf49186792aa3d5507 Mon Sep 17 00:00:00 2001
From: 37b7 <matheo.thierry.63@gmail.com>
Date: Mon, 19 May 2025 07:46:18 +0200
Subject: [PATCH] 15934

---
 .drone.yml                                        |  5 ++++-
 {public => assets}/ts/components/footer.ts        |  0
 {public => assets}/ts/error/error.ts              |  0
 {public => assets}/ts/error/handle.ts             |  0
 {public => assets}/ts/project/useProjectDetail.ts |  2 +-
 {public/ts/project => assets/ts}/useTheme.ts      |  0
 components/TheFooter.vue                          |  2 +-
 docker/Dockerfile                                 | 10 ++--------
 nuxt.config.ts                                    | 11 ++++-------
 9 files changed, 12 insertions(+), 18 deletions(-)
 rename {public => assets}/ts/components/footer.ts (100%)
 rename {public => assets}/ts/error/error.ts (100%)
 rename {public => assets}/ts/error/handle.ts (100%)
 rename {public => assets}/ts/project/useProjectDetail.ts (98%)
 rename {public/ts/project => assets/ts}/useTheme.ts (100%)

diff --git a/.drone.yml b/.drone.yml
index 937951a..08a5229 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,6 +12,9 @@ steps:
     settings:
       dockerfile: docker/Dockerfile
       context: .
+      environment:
+        - NODE_ENV=production
+        - BASE_PATH=/containers/matheothierry-portfolio_nuxt
       registry: hub.codefirst.iut.uca.fr
       mirror: https://proxy.iut.uca.fr:8443
       repo: hub.codefirst.iut.uca.fr/matheo.thierry/portfolio_nuxt
@@ -26,4 +29,4 @@ steps:
         IMAGENAME: hub.codefirst.iut.uca.fr/matheo.thierry/portfolio_nuxt:latest
         CONTAINERNAME: portfolio_nuxt
         COMMAND: create
-        OVERWRITE: true
+        OVERWRITE: true
\ No newline at end of file
diff --git a/public/ts/components/footer.ts b/assets/ts/components/footer.ts
similarity index 100%
rename from public/ts/components/footer.ts
rename to assets/ts/components/footer.ts
diff --git a/public/ts/error/error.ts b/assets/ts/error/error.ts
similarity index 100%
rename from public/ts/error/error.ts
rename to assets/ts/error/error.ts
diff --git a/public/ts/error/handle.ts b/assets/ts/error/handle.ts
similarity index 100%
rename from public/ts/error/handle.ts
rename to assets/ts/error/handle.ts
diff --git a/public/ts/project/useProjectDetail.ts b/assets/ts/project/useProjectDetail.ts
similarity index 98%
rename from public/ts/project/useProjectDetail.ts
rename to assets/ts/project/useProjectDetail.ts
index d09b90b..a9d5312 100644
--- a/public/ts/project/useProjectDetail.ts
+++ b/assets/ts/project/useProjectDetail.ts
@@ -1,5 +1,5 @@
 import { ref, onMounted, onUnmounted } from 'vue';
-import { handleImageError, handleIconError, handleLightboxImageError } from '~/public/ts/error/handle';
+import { handleImageError, handleIconError, handleLightboxImageError } from '~/assets/ts/error/handle';
 import { TEXTS } from '~/config/content';
 import { PATHS } from '~/config/paths';
 import { projects } from '~/config/projects';
diff --git a/public/ts/project/useTheme.ts b/assets/ts/useTheme.ts
similarity index 100%
rename from public/ts/project/useTheme.ts
rename to assets/ts/useTheme.ts
diff --git a/components/TheFooter.vue b/components/TheFooter.vue
index 6cc6de1..b6d7e7e 100644
--- a/components/TheFooter.vue
+++ b/components/TheFooter.vue
@@ -22,7 +22,7 @@
 <script setup lang="ts">
 import { TEXTS } from '~/config/content';
 import { PATHS } from '~/config/paths';
-import { handleIconError } from '~/public/ts/components/footer';
+import { handleIconError } from '~/assets/ts/components/footer';
 
 const { $theme } = useNuxtApp();
 const currentYear = new Date().getFullYear();
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b8c8910..9e05f32 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,27 +3,21 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
+COPY .env* ./
 RUN npm run build
 
 FROM node:18-alpine
 WORKDIR /app
-
-# Copy all necessary files from builder
 COPY --from=builder /app/.output ./.output
 COPY --from=builder /app/package*.json ./
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/.nuxt ./.nuxt
-
-# Install production dependencies
+COPY --from=builder /app/.env* ./
 RUN npm install --production
-
-# Set environment variables
 ENV NODE_ENV=production
 ENV BASE_PATH=/containers/matheothierry-portfolio_nuxt
 ENV HOST=0.0.0.0
 ENV PORT=3000
-ENV NUXT_HOST=0.0.0.0
-ENV NUXT_PORT=3000
 
 EXPOSE 3000
 CMD ["node", ".output/server/index.mjs"]
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 3370aa7..7af842c 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -26,13 +26,11 @@ export default defineNuxtConfig({
         {
           rel: 'icon',
           type: 'image/x-icon',
-          href: process.env.NODE_ENV === 'production'
-            ? process.env.BASE_PATH + '/favicon.ico'
-            : '/favicon.ico'
+          href: '/favicon.ico'
         }
       ],
     },
-    buildAssetsDir: process.env.NODE_ENV === 'production' ? process.env.BASE_PATH + '/_nuxt/' : '/_nuxt/',
+    baseURL: process.env.BASE_PATH || '',
   },
 
   modules: ['@nuxt/image'],
@@ -60,13 +58,12 @@ export default defineNuxtConfig({
     alias: {},
     ipx: {
       maxAge: 60 * 60 * 24 * 30
-    },
-    baseURL: process.env.NODE_ENV === 'production' ? process.env.BASE_PATH : '',
+    }
   },
 
   runtimeConfig: {
     public: {
-      basePath: process.env.BASE_PATH || (process.env.NODE_ENV === 'production' ? process.env.BASE_PATH : '')
+      basePath: process.env.BASE_PATH || ''
     }
   }
 })
\ No newline at end of file