diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index c85d345..b78c6b4 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -21,15 +21,10 @@ jobs: run: | npm ci - - name: Prepare dist directory - run: | - rm -rf dist - cp -r public dist - ls -la dist/ - - name: Build Vue app run: | npm run build + ls -la dist/ ls -la dist/assets/dist/ - name: Deploy via FTP diff --git a/public/content/1_cohesion-des-mondes/5_test-avec-geoformat/narrative.txt b/public/content/1_cohesion-des-mondes/5_test-avec-geoformat/narrative.txt index 5883431..862e5b5 100644 --- a/public/content/1_cohesion-des-mondes/5_test-avec-geoformat/narrative.txt +++ b/public/content/1_cohesion-des-mondes/5_test-avec-geoformat/narrative.txt @@ -26,6 +26,7 @@ body { font-family: "DM Sans", sans-serif; text-align: left; color: rgb(190, 9, 9); + background: blue; } p { @@ -39,7 +40,18 @@ p { padding-right: 20mm; padding-bottom: 20mm; padding-left: 20mm; - padding: 0mm; +} + +h1 { + font-family: DM Sans; + font-style: normal; + font-weight: 700; + font-size: 48px; + text-align: start; + color: rgb(0, 0, 0); + background: rgba(113, 54, 255, 0.1); + margin: 32.16px; + padding: 0px; } ---- diff --git a/vite.config.js b/vite.config.js index 3611bf3..9abed31 100644 --- a/vite.config.js +++ b/vite.config.js @@ -4,26 +4,22 @@ import vue from '@vitejs/plugin-vue'; // https://vite.dev/config/ export default defineConfig({ plugins: [vue()], - publicDir: false, // Les assets statiques sont gérés par Kirby dans public/ + base: '/', build: { - outDir: 'dist/assets/dist', - emptyOutDir: true, - manifest: false, + outDir: 'dist', + minify: false, rollupOptions: { output: { - entryFileNames: 'index.js', - chunkFileNames: '[name].js', + entryFileNames: 'assets/dist/index.js', + chunkFileNames: 'assets/dist/[name].js', assetFileNames: (assetInfo) => { // Le CSS principal doit s'appeler index.css pour correspondre à header.php if (assetInfo.name && assetInfo.name.endsWith('.css')) { - return 'index.css'; + return 'assets/dist/index.css'; } - return '[name].[ext]'; + return 'assets/dist/[name].[ext]'; }, }, }, - build: { - minify: false, - }, }, });