From a1eadfd4681a4bb9d0c45f4f24b651ba649e42da Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Sun, 26 Oct 2025 19:53:07 +0100 Subject: [PATCH 01/26] Manage JS frontend libraries with yarn --- .github/jobs/baseinstall.sh | 7 +++++++ doc/manual/develop.rst | 2 +- webapp/.gitignore | 1 + webapp/Makefile | 11 +++++++++-- webapp/package.json | 3 +++ webapp/yarn.lock | 4 ++++ 6 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 webapp/package.json create mode 100644 webapp/yarn.lock diff --git a/.github/jobs/baseinstall.sh b/.github/jobs/baseinstall.sh index 50db376a52..40d1ab2103 100755 --- a/.github/jobs/baseinstall.sh +++ b/.github/jobs/baseinstall.sh @@ -28,6 +28,13 @@ composer install --no-scripts |tee "$ARTIFACTS"/composer_out.txt cd .. section_end +section_start "Install JS frontend dependencies" +cd webapp +apt-get update; apt-get install -y yarnpkg +yarnpkg install +cd .. +section_end + section_start "Set simple admin password" echo "password" > ./etc/initial_admin_password.secret echo "default login admin password password" > ~/.netrc diff --git a/doc/manual/develop.rst b/doc/manual/develop.rst index 10952ad37f..f7c7471990 100644 --- a/doc/manual/develop.rst +++ b/doc/manual/develop.rst @@ -41,7 +41,7 @@ already listed under sudo apt install autoconf automake bats \ python3-sphinx python3-sphinx-rtd-theme fontconfig python3-yaml \ - latexmk texlive-latex-recommended texlive-latex-extra tex-gyre + latexmk yarnpkg texlive-latex-recommended texlive-latex-extra tex-gyre For Fedora use:: diff --git a/webapp/.gitignore b/webapp/.gitignore index 70a4c6b3b2..dedaef8acc 100644 --- a/webapp/.gitignore +++ b/webapp/.gitignore @@ -8,6 +8,7 @@ /var/log/* !var/log/.gitkeep /vendor/ +/node_modules/ ###> phpunit/phpunit ### /phpunit.xml diff --git a/webapp/Makefile b/webapp/Makefile index 5eac62ea13..4578e6c1da 100644 --- a/webapp/Makefile +++ b/webapp/Makefile @@ -12,7 +12,7 @@ SUBDIRS = config domserver: composer-dump-autoload # Install PHP dependencies -composer-dependencies: +composer-dependencies: node-dependencies ifeq (, $(shell command -v composer 2> /dev/null)) $(error "'composer' command not found in $(PATH), install it via your package manager or https://getcomposer.org/download/") endif @@ -20,7 +20,7 @@ endif # not generated yet, which is needed to run the post-install scripts. composer $(subst 1,-q,$(QUIET)) install --prefer-dist -o -a --no-scripts --no-plugins -composer-dependencies-dev: +composer-dependencies-dev: node-dependencies composer $(subst 1,-q,$(QUIET)) install --prefer-dist --no-scripts --no-plugins # Dump autoload dependencies (including plugins) @@ -36,6 +36,13 @@ vendor/autoload_runtime.php: composer-dump-autoload-dev: composer $(subst 1,-q,$(QUIET)) dump-autoload +node-dependencies: +ifeq (, $(shell command -v yarn || command -v yarnpkg 2> /dev/null)) + $(error "neither 'yarnpkg' nor 'yarn' command found in $(PATH), install it via your package manager or https://yarnpkg.com/cli/node") +endif + @YARN_CMD=$(shell command -v yarn || command -v yarnpkg); \ + $$YARN_CMD install + # Run Symfony in dev mode (for maintainer-mode): .env.local: @echo "Creating file '$@'..." diff --git a/webapp/package.json b/webapp/package.json new file mode 100644 index 0000000000..18a1e415e5 --- /dev/null +++ b/webapp/package.json @@ -0,0 +1,3 @@ +{ + "dependencies": {} +} diff --git a/webapp/yarn.lock b/webapp/yarn.lock new file mode 100644 index 0000000000..fb57ccd13a --- /dev/null +++ b/webapp/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 0cf9afbb4605a17f095770dd4bbeb86ac1f79120 Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Sun, 14 Sep 2025 16:53:34 +0200 Subject: [PATCH 02/26] Display some unrelated formula for easier testing --- webapp/templates/jury/clarification.html.twig | 9 +++++++++ webapp/templates/jury/menu.html.twig | 2 ++ 2 files changed, 11 insertions(+) diff --git a/webapp/templates/jury/clarification.html.twig b/webapp/templates/jury/clarification.html.twig index e7e7c4d24b..b04d3ab454 100644 --- a/webapp/templates/jury/clarification.html.twig +++ b/webapp/templates/jury/clarification.html.twig @@ -18,7 +18,16 @@ {% endif %} + + {% for clar in list %} +
+