Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
max_line_length = 160
trim_trailing_whitespace = true

[*.{php,html,twig,wsdl,xml}]
indent_size = 4

[*.md]
trim_trailing_whitespace = false

[Makefile]
indent_style = tab

[COMMIT_EDITMSG]
indent_size = 4
1 change: 0 additions & 1 deletion Dockerfile_nginx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ USER nginx
WORKDIR /var/www

RUN npm ci --no-audit --no-fund --ignore-scripts
RUN npm run postinstall

CMD exec nginx -g 'daemon off;'

Expand Down
1 change: 0 additions & 1 deletion Dockerfile_phpfpm
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,5 @@ RUN composer install --prefer-dist --no-progress --no-suggest --no-scripts

RUN npm ci --no-audit --no-fund --ignore-scripts
RUN npm run build
RUN npm run postinstall

CMD ["/var/www/docker-entrypoint_phpfpm.sh"]
11 changes: 4 additions & 7 deletions Dockerfile_phpfpm_local
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ FROM php:8.2-fpm-alpine
COPY certificates/adp_rootca.crt /usr/local/share/ca-certificates/adp_rootca.crt
RUN update-ca-certificates --fresh

RUN apk update && apk upgrade

RUN apk add \
RUN apk add --no-cache \
icu-dev \
postgresql-dev \
libzip-dev \
Expand Down Expand Up @@ -50,9 +48,9 @@ COPY docker-phpfpm/www.conf /usr/local/etc/php-fpm.d

# Install dependencies and xdebug in one layer
RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} \
&& apk add --update linux-headers \
&& pecl install xdebug-3.3.0 && docker-php-ext-enable xdebug \
&& apk del pcre-dev ${PHPIZE_DEPS}
&& apk add --update linux-headers \
&& pecl install xdebug-3.4.1 && docker-php-ext-enable xdebug \
&& apk del pcre-dev ${PHPIZE_DEPS}

# Copy the Xdebug configuration file
COPY ./docker-phpfpm/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
Expand All @@ -76,6 +74,5 @@ RUN composer install --prefer-dist --no-progress --no-suggest --no-scripts

RUN npm ci --no-audit --no-fund --ignore-scripts
RUN npm run build
RUN npm run postinstall

CMD ["/var/www/docker-entrypoint_phpfpm.sh"]
17 changes: 13 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dev:

fixtures:
kubectl exec -it deploy/schulddossier-phpfpm-schulddossier -- sh -c "php bin/console --no-interaction doctrine:migrations:migrate"
kubectl exec -it deploy/schulddossier-phpfpm-schulddossier -- sh -c "php bin/console doc:fix:load --no-interaction --purge-with-truncate"
kubectl exec -it deploy/schulddossier-phpfpm-schulddossier -- sh -c "php bin/console doc:fix:load --no-interaction --purge-with-truncate"

composer-install:
docker run --rm -v .:/app -u 1000:1000 composer install --no-scripts
Expand All @@ -62,10 +62,19 @@ composer-update:
docker run --rm -v .:/app -u 1000:1000 composer update --lock

npm-install:
docker run --rm -v .:/app -w /app -u 1000:1000 node sh -c "/usr/local/bin/npm install --no-audit --no-fund"
docker run --rm -v .:/app -w /app -u 1000:1000 node:24 sh -c "/usr/local/bin/npm install --no-audit --no-fund"

npm-run-dev:
docker run --rm -v .:/app -w /app -u 1000:1000 node sh -c "/usr/local/bin/npm run dev && /usr/local/bin/npm run css:build"
docker run --rm -v .:/app -w /app -u 1000:1000 node:24 sh -c "/usr/local/bin/npm run dev && /usr/local/bin/npm run css:build"

npm-watch:
docker run -it --init --rm -v .:/app -w /app -u 1000:1000 node sh -c "/usr/local/bin/npm run watch"
docker run -it --init --rm -v .:/app -w /app -u 1000:1000 node:24 sh -c "/usr/local/bin/npm run watch"

enter-pod:
kubectl exec -it deploy/schulddossier-phpfpm-schulddossier -- sh

check-php-format:
kubectl exec -it deploy/schulddossier-phpfpm-schulddossier -- sh -c "vendor/bin/phpcs --extensions=php"

fix-php-format:
kubectl exec -it deploy/schulddossier-phpfpm-schulddossier -- sh -c "vendor/bin/phpcbf --standard=PSR12 --extensions=php src"
22 changes: 22 additions & 0 deletions assets/scss/partials/_logs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,26 @@
width: calc(100% - 100px);
}
}
}

.table {
table {
td.logboek-update-original-value{
color: $borderColor2;
}
td.logboek-update-updated-value{
color: $textColor;
font-weight: bold;
}
td.logboek-update-field{
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 200px;
}
}
}

.logboek-no-updates {
color: $borderColor2;
}
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"lcobucci/jwt": "^3.2",
"league/flysystem": "^1.0",
"markei/filesystemoperations": "dev-symfony5support",
"moment/moment": "^2.21",
"mozilla/pdf.js": "1.9.426",
"mrrio/jspdf": "1.3.5",
"nelmio/security-bundle": "^3.4",
Expand Down Expand Up @@ -64,12 +63,13 @@
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "^3.4",
"laminas/laminas-code": "^4.8.0",
"squizlabs/php_codesniffer": "*",
"symfony/debug-bundle": "^5.4",
"symfony/dotenv": "^5.4",
"symfony/stopwatch": "^5.4",
"symfony/web-profiler-bundle": "^5.4",
"symfony/web-server-bundle": "^4.4",
"laminas/laminas-code": "^4.8.0"
"symfony/web-server-bundle": "^4.4"
},
"config": {
"platform": {
Expand Down Expand Up @@ -133,8 +133,7 @@
["mkdir", "public/vendor"],
["mirror", "vendor/mozilla/pdf.js", "public/vendor/mozilla/pdf.js", null, {"delete": true}],
["mirror", "vendor/mrrio/jspdf", "public/vendor/mrrio/jspdf", null, {"delete": true}],
["mirror", "vendor/jshjohnson/choices", "public/vendor/jshjohnson/choices", null, {"delete": true}],
["mirror", "vendor/moment/moment", "public/vendor/moment/moment", null, {"delete": true}]
["mirror", "vendor/jshjohnson/choices", "public/vendor/jshjohnson/choices", null, {"delete": true}]
]
},
"repositories": [
Expand Down
Loading
Loading