Skip to content

Merge develop into main: actualizar submódulo estático y documentación CI/CD#2

Open
ardelperal wants to merge 8 commits into
mainfrom
develop
Open

Merge develop into main: actualizar submódulo estático y documentación CI/CD#2
ardelperal wants to merge 8 commits into
mainfrom
develop

Conversation

@ardelperal

Copy link
Copy Markdown
Owner

Este PR fusiona la rama develop en main para:

  • Actualizar el puntero del submódulo external/catequesis a 86a7c06e (últimos cambios en estáticos)
  • Añadir documentación de versionado por tags (CI-CD-Setup.md y README)

Notas:

  • Durante el intento de merge local, se detectaron conflictos en varios archivos de web/ (env.example, tests, api routes, jest.config.js, auth.ts, pdf.ts, next.config.mjs, etc.).
  • Abrimos este PR para resolver los conflictos directamente en GitHub y asegurar que se conserven los cambios deseados.

Sugerencias de resolución:

  • Mantener los cambios de develop para el submódulo y documentación.
  • Revisar con cuidado los archivos del web/ y decidir si prevalece main o develop en cada caso.

Una vez resueltos los conflictos y hecho el merge, el workflow de CI/CD se activará y desplegará en el NAS automáticamente.

ardelperal and others added 8 commits September 18, 2025 18:38
…Gotenberg para exportación PDF

- Escapar símbolos $ en hash Argon2 en .env.local para evitar expansión de variables
- Configurar variables de entorno para autenticación admin
- Resolver error 'Servicio de generación PDF no disponible'
- Agregar archivos de configuración y tokens de preview generados durante testing
- Sistema de login funcionando correctamente con credenciales admin/admin123
- Encabezados con colores distintivos y espaciado mejorado
- H1 con subrayado azul y tamaño 28pt
- H2 numerados con color morado y tamaño 22pt
- Listas con indentación progresiva y sangría francesa
- Casillas de verificación con mejor alineación
- Párrafos con espaciado optimizado para legibilidad
- Márgenes del documento ajustados (25mm superior/inferior)
…tos de variables, añadir verificaciones de entorno de build, y corregir pre-renderizado de rutas API
- Creada estructura de carpetas docs/ con subcarpetas por categoría
- Movida documentación técnica, de despliegue y seguridad a docs/
- Organizados scripts en subcarpetas por funcionalidad
- Limpiados archivos temporales y de prueba
- Mejorado README principal con estructura profesional
- Actualizado .gitignore con mejor organización y comentarios
- Eliminados archivos de prueba innecesarios del directorio web
Copilot AI review requested due to automatic review settings October 6, 2025 16:46
@gitguardian

gitguardian Bot commented Oct 6, 2025

Copy link
Copy Markdown

⚠️ GitGuardian has uncovered 177 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
21184546 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/8bcd46cace27f38e54036355c2585f854fd6fd9dd467711e88412537c825b773.json View secret
21045423 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/6d2422d9cc9c80e9d81370ec8bd27aa4d8d09b59c0db6810ea50d07d79ff979d.json View secret
21045424 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/c4302a90f375f1408939f62c2713fc273c3ee76709a6de18d083c4cb04bad025.json View secret
21184547 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/41970f16d0e38d0f8588b85122ed58054df503398299a6ad7eb2df53a626c641.json View secret
21184548 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/d441b6a799cf69e0d789c9dd08cd7b425606aa389ed270371e69e7c0ecaea6a3.json View secret
21184549 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/a4a1386277e5e1d5ff637b29c416b85a30e29f821e14c0466ea716e1bb40be78.json View secret
21184550 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/66f4a899ea09f472a42d6cf0df515d62f8fb4ee3b0287c70f7df9aee7d50867b.json View secret
21184551 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/9cde8abde6b0f92488ce089b4098df2b0a9204595906299f5995273c380f53ec.json View secret
21184552 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/10158fa75b1d331aaecf5e190cb31da2b44db8d83e53a531b45a04109d5c8a4c.json View secret
21184553 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/759ace4920ab9d6d4b065c3474b1cc4c6d78a53e903cab2da6baab6282c5dde8.json View secret
21184554 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/a16b16ce1b8add031dae0233feff73fc9edeeeed0687c8064580bf7ce5ba70a8.json View secret
21184555 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/8ca352cbc782d937784c48930b05f2f8c745665fecd6a692b0aa76311fc4c37e.json View secret
21184556 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/97220c20a5dffdb4008fc8653e199a746b3e3cfe69a0ff049ab7488b961dcee7.json View secret
21184557 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/53ef0612d7ae4b612b1e6f24a5e78182c346ff42f4ec6829b59179be1e52ab1b.json View secret
21184558 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/ee89d65e00138cc34637d94cd816394e4c843bec2a14c78eb4e341d0cb9f4cf0.json View secret
21184559 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/9937349b3ea7c51ba36ca95d014c1c4d1185a6337d3d310d280352daa05b2737.json View secret
21184560 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/16d40436a10d1652d7122e0472bf8991dedddc26e0308e8dc19413dc95d95354.json View secret
21184561 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/1756f6a9d3f01369618732cd52f3ef91cb2296445079fdc1367e00af92c70819.json View secret
21184562 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/a40c7625ec30e8e3caaf898a32a78b5b995b22d8f884a0fdbfdf6cfb42fbc421.json View secret
21184563 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/b046388d850f61346900668bebb9e994910a2f37a6ddabe00250f3d4f973bbc2.json View secret
21045425 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/597b2652025802947969dae37f495257274df133c19c1d85d38f1a6c5139c630.json View secret
21184564 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/2eba6a64ca2363dbbddd93467fa5fc3c22db4fec02039f6c5260121628b425d0.json View secret
21184565 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/63d6f692c55de2addca9efa8e552edf2c1a8d81467486851f10806e6d8f076f8.json View secret
21184566 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/fa0ef32f34b3693b6b9ad1bb3082aa6aaf43eea28bcc607c0d848343fbae2269.json View secret
21184567 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/15ee33b002dfeb45c278b14fff0bd8147fc23c3c6599c754b8b50f73f59ad00b.json View secret
21184568 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/e31fa58d8f204bff66607662538d7efffcfb07843be38ef023d64e49a7291b08.json View secret
21184569 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/a7028d63b32add5a69acdda22f23063a7281733a6b2302044343d314a29b5356.json View secret
21184570 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/06696bef95374786b42fbbacc1955778b10f12b2088a77dbab52526a18f6a964.json View secret
21184571 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/143a44bffbf162c7e50ef1faf2b25dc3db10e8aad890b4cac250818d85c094e3.json View secret
21184572 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/48cc53aa26fde885cc0355ca02d61162c493a85cd2ba952cfb63e29ad061ef57.json View secret
21045426 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/a5d307c92d3bb4e6c58bc1582db4ffeefa051d12069a1e15bf59ed7afd4e7402.json View secret
21184573 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/4a45f3d457f701637b3374a0533a9442ef146ee3976523fc70456c39a3161161.json View secret
21184574 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/52771602b361e65e532bb02ea799b36b9321027c0e183e99389bc504142fb332.json View secret
21184575 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/594b581d29c51031bbcb009e83a4d7c0b2f92dba26d72ec25c5ff6945f03205c.json View secret
21184576 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/a7fd8f4cd4952ad2358ebe68b6c0d17e72ba6af569a8a2de0728f2985fc8b408.json View secret
21184577 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/67f8b51d8c7fdf397a767f441dbe4b34d62d09fef388405626f295d025e6bc7d.json View secret
21184578 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/b4a23d8dababdea4887303f384b74fe0f7c065bbf80756a961a48c08bc989a19.json View secret
21184579 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/432a71a553f4a4c9c3770804592173719d9ac5fe20f2352d0c890ec972361767.json View secret
21045427 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/3fbf660ae3b25cf050844c44388f72e6c389fb6ef5cab89f42e800451213f30d.json View secret
21184580 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/9cfb7212dd43de1ea1c7ac883c27726a138e4c7ab5595060b06230951ec5bc84.json View secret
21184581 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/f07e26b42134a3b15ee1fd2e9aa02661c70a2385c71d41704b7aeae46e7c17d2.json View secret
21184582 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/e94d5b8c85e8774c5c69a7ba176d94b967eeb9c8a92bb0f2bcbb88f8d30c9b55.json View secret
21184583 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/ffd68cea2269f62e9e9a434df5fe5b8fbdb6b249ba2dc64f9b66adaf1ddd7f23.json View secret
21184584 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/7821661f257adb0a4ff0d3262880fa62b7ca6520d152a68cb51fb924a2bc0ebb.json View secret
21184585 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/00321ae0c7a971e5178e8bb37ff157da185058d728355a8da77c07bf8842eebf.json View secret
21045428 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/e61a9b0d9fa35db1d26035f0a1e006fb96c52c11e18166439270b956d4f76b0b.json View secret
21184586 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/345576ebf4dfa171278235537904430fdf2d5cbf38f30e424809fc3047694f76.json View secret
21045429 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/374d0ec3ada91aa9dc091a3d3f88ee7cc6681721f80eb0a464b44612e4421ec8.json View secret
21184587 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/17a272dc99671365acc63ccc28de101165d3072689a94e803e1bbc7581e023eb.json View secret
21184588 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/a5732bad6bdbf6eb2de5f2da9d8cf17130fc1683f23f4b42fa7beda34d1744f2.json View secret
21045430 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/96621696d6ff28cda6f7dc83f6d6be363e98dddeaa7601a220f79d125c128a14.json View secret
21184589 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/320928c0c387c538a5fba078945782b51414eda22125afc8dba2fc9d859d0201.json View secret
21184590 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/7b67d0d5c2b37814d1b13dcf948d148983b1c1eba474de04f07492beaa1aa6fc.json View secret
21184591 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/3acae48dbea115f4d12f210c87ea8d11cf519cb8dc3752046027175b50080ef2.json View secret
21045431 Triggered Username Password 84a67e0 web/test-login.json View secret
21184592 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/68b164d6fdb7e8a479fcc1b8aa05927c5e7be3a2b4d9d4bad958d59e29a3e83e.json View secret
21184593 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/5eb9d4779f19b5b73fe4fb34277da1b4cea79b90eb3fd820d8f54748ac611144.json View secret
21184594 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/174c23551dfa6b8dbeb5ea203436b157318cf1bd7f07f9711ff4adb1c9e69b8a.json View secret
21184595 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/6cf49cb0f95edb0d613ef9840d053a39eed1063dbae10c06b3ea830c0cd12670.json View secret
21184596 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/8265be9cdc6d6704a2a7ebe29b09ba25aff6b0833910ce44fc3bc693f7107397.json View secret
21184597 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/2ede45e3eda149b3e659abc2db20939c0d5fdc3075ec28907c1608af996691ef.json View secret
21045432 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/b579ba34fa552b76e848496c2a9eb19c919f73d4a8892d48826a34783637ccb5.json View secret
21045433 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/3c52bc4e49af568f416a7eddd1b982abd18b84a5acad9e1999183e98c879e508.json View secret
21184598 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/0f332092004f12bf04fe47b9888db49620f714c9349da59f5dc57be4a19e1de2.json View secret
21184599 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/9f0b77cf704996b55b684d7aed9be85d89224eb3ff6c8974258e5a36e86b14b8.json View secret
21045434 Triggered Generic High Entropy Secret 84a67e0 web/data/preview-tokens/368a6246ad6a639b410b8371d66dfc5351c0e76ff4102e4e36d7e087181a1e0d.json View secret
21184600 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/05b3d232f0e0fd1130fca641b4331851f8d3e20661d924218dc20ef3ebcf1869.json View secret
21184601 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/f609dcec8066a7850e23b50bd97ece4ac8a8ad8b164cc7cc515d462ac3d35c32.json View secret
21184602 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/4a7fb41814c2fac38db1cd1d0e08f71c021160b83d168318c054a76968a28f0c.json View secret
21184603 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/74f27f0b031bbbf5151880380188462e1c789525dde9a549a0ed1cb03af8b20d.json View secret
21184604 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/fc768de4d84626014d3e15182a266dd46eb96096fde9f1a0ec41739933d06ad1.json View secret
21184605 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/0afbc8c7959300bf228e6f178c66adea66273d3d07e8c60c224115bc3bca1b1c.json View secret
21205937 Triggered Username Password ad00eae scripts/export-all-sessions-pdf.ps1 View secret
21184606 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/a45a89a34ebbcff057719cf9dbac14ce57be21d9d5e1bba657d4b5ec2b5e8c30.json View secret
21184607 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/941421a1c99ea54a734755b96db2cbfed360c86abcf8fc2cee3ed4dba804277d.json View secret
21184608 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/3433577d21fbc27e8c4d27fd0fdf2fa9c79cfb28023698e6b01adcc67f3a5a2e.json View secret
21184609 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/710d1918f644a870ff49b766772949850dfe41ed5b6c1d61423341fa2baee147.json View secret
21184610 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/2c2672f2a14f4da7d9026d650948fd00b87bc2039907f8c770681fdd9d7d77e3.json View secret
21184611 Triggered Generic High Entropy Secret 34e5659 web/data/preview-tokens/a63059d5cf55547a7fe13d1d3c8e86f7878999ee67840ce4398b5579ac5f74a7.json View secret
21184612 Triggered Generic High Entropy Secret 893b9f9 web/data/preview-tokens/c727851b0bf304ca60bb67ae12f02a3bf126a62d5f4cf2f08e9ddcf0947cd6d5.json View secret

and 97 others.

🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR merges the develop branch into main to update the static submodule pointer to 86a7c06e and add documentation for tag-based versioning (CI-CD-Setup.md and README). The merge resolves conflicts across multiple files in the web/ directory including configuration files, API routes, and components.

  • Updated build system configuration to use Tailwind v4 and new PostCSS setup
  • Migrated from Gotenberg to Playwright for PDF generation
  • Updated package dependencies and removed unused parameters
  • Simplified print styling and enhanced error handling

Reviewed Changes

Copilot reviewed 270 out of 420 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
web/postcss.config.js Modernized PostCSS configuration for Tailwind v4 compatibility
web/package.json Updated dependencies, added Tailwind v4 and build optimizations
web/next.config.js Enhanced Next.js configuration for better Docker and standalone support
web/lib/pdf.ts Migrated from Gotenberg to Playwright for PDF generation
web/lib/markdownParser.ts Added robust fallback processor for environments without dependencies
web/lib/fsSafe.ts Enhanced file system utilities with better content root detection
web/components/SessionView.tsx Simplified print layout to avoid duplication
web/app/globals.css Updated to use Tailwind v4 import syntax
Comments suppressed due to low confidence (1)

web/lib/markdownParser.ts:1

  • Using eval() to dynamically require modules can introduce security vulnerabilities and bypasses static analysis. Consider using a try-catch with direct require or conditional imports.
// Importaciones condicionales para Jest

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

const module = config.modules.find(m => m.code === moduleCode);
const moduleInfo = config.modules.find(m => m.code === moduleCode);

if (!module) {

Copilot AI Oct 6, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Variable module is referenced but was renamed to moduleInfo on line 140. This will cause a ReferenceError at runtime.

Suggested change
if (!module) {
if (!moduleInfo) {

Copilot uses AI. Check for mistakes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants