From 744aec23b2990b89bfee60f0751a39c844a5bcbc Mon Sep 17 00:00:00 2001 From: Ambroise Maupate Date: Fri, 23 Feb 2024 14:54:10 +0100 Subject: [PATCH] styles: Upgraded Backoffice user-panel and admin-menu sub-nav items --- config/packages/roadiz_rozier.yaml | 2 +- docker-compose.yml | 2 - docker/php81-fpm-alpine/Dockerfile | 36 ---- docker/php81-fpm-alpine/crontab.txt | 12 -- docker/php81-fpm-alpine/docker-php-entrypoint | 30 --- docker/php81-fpm-alpine/php.ini | 37 ---- docker/php81-fpm-alpine/wait-for-it.sh | 182 ------------------ docker/php81-nginx-alpine/Dockerfile | 30 --- .../nginx/default.d/000-default.conf | 110 ----------- docker/php81-nginx-alpine/php.ini | 33 ---- docker/php81-nginx-alpine/supervisor.ini | 41 ---- docker/php81-nginx-alpine/zz-docker.conf | 22 --- .../src/Resources/app/less/login/login.less | 29 +-- .../panels/entries_panel/admin_entries.less | 37 ++-- .../less/panels/user_panel/user_panel.less | 69 +++---- lib/Rozier/src/Resources/app/less/vars.less | 11 +- .../views/admin/blocks/adminImage.html.twig | 2 +- .../views/admin/blocks/loginImage.html.twig | 2 +- .../views/panels/user_panel.html.twig | 14 +- .../views/partials/js-inject.html.twig | 4 +- .../views/partials/simple-js-inject.html.twig | 2 +- .../static/css/app.892de7354f4b82eed554.css | 2 +- .../css/app.892de7354f4b82eed554.css.map | 2 +- ...3492b95.js => app.8ad668c89c46f8e422da.js} | 0 ...2b95.js => simple.8ad668c89c46f8e422da.js} | 0 ...2b95.js => vendor.8ad668c89c46f8e422da.js} | 0 26 files changed, 80 insertions(+), 631 deletions(-) delete mode 100755 docker/php81-fpm-alpine/Dockerfile delete mode 100644 docker/php81-fpm-alpine/crontab.txt delete mode 100755 docker/php81-fpm-alpine/docker-php-entrypoint delete mode 100644 docker/php81-fpm-alpine/php.ini delete mode 100755 docker/php81-fpm-alpine/wait-for-it.sh delete mode 100755 docker/php81-nginx-alpine/Dockerfile delete mode 100644 docker/php81-nginx-alpine/nginx/default.d/000-default.conf delete mode 100644 docker/php81-nginx-alpine/php.ini delete mode 100644 docker/php81-nginx-alpine/supervisor.ini delete mode 100644 docker/php81-nginx-alpine/zz-docker.conf rename lib/Rozier/src/static/js/{app.e61f574696a873492b95.js => app.8ad668c89c46f8e422da.js} (100%) rename lib/Rozier/src/static/js/{simple.e61f574696a873492b95.js => simple.8ad668c89c46f8e422da.js} (100%) rename lib/Rozier/src/static/js/{vendor.e61f574696a873492b95.js => vendor.8ad668c89c46f8e422da.js} (100%) diff --git a/config/packages/roadiz_rozier.yaml b/config/packages/roadiz_rozier.yaml index 3357c217..394e4ed5 100644 --- a/config/packages/roadiz_rozier.yaml +++ b/config/packages/roadiz_rozier.yaml @@ -38,7 +38,7 @@ roadiz_rozier: roles: [ 'ROLE_ACCESS_NODES' ] subentries: all_nodes: - name: 'all.nodes' + name: 'all.nodessdfksdlf sdf sdf sdf sdf sdlksjd' route: nodesHomePage icon: uk-icon-rz-all-nodes roles: ~ diff --git a/docker-compose.yml b/docker-compose.yml index b449e900..8f126e4b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,8 +108,6 @@ services: # Need to pass all vars to docker env for Crontab and supervisor scripts env_file: "./.env.local" build: - #context: ./docker/php81-nginx-alpine - #context: ./docker/php81-fpm-alpine context: ./docker/php82-fpm-alpine args: USER_UID: ${USER_UID} diff --git a/docker/php81-fpm-alpine/Dockerfile b/docker/php81-fpm-alpine/Dockerfile deleted file mode 100755 index 3430dd39..00000000 --- a/docker/php81-fpm-alpine/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM roadiz/php81-fpm-alpine -MAINTAINER Ambroise Maupate - -ARG USER_UID=1000 -ENV COMPOSER_ALLOW_SUPERUSER=1 -ENV APP_ENV=dev -ENV APP_CACHE=0 -ENV APP_FFMPEG_PATH=/usr/bin/ffmpeg -ENV MYSQL_HOST=db -ENV MYSQL_PORT=3306 - -RUN apk add --no-cache shadow make git ffmpeg \ - && usermod -u ${USER_UID} www-data \ - && groupmod -g ${USER_UID} www-data \ - && composer --version \ - && ln -s /usr/share/zoneinfo/Europe/Paris /etc/localtime \ - && "date" \ - && echo "USER_UID: ${USER_UID}\n" \ - && version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") - -# Display errors -ADD php.ini /usr/local/etc/php/php.ini -ADD crontab.txt /crontab.txt -ADD wait-for-it.sh /wait-for-it.sh -ADD docker-php-entrypoint /usr/local/bin/docker-php-entrypoint - -VOLUME /var/www/html -WORKDIR /var/www/html - -RUN chown -R www-data:www-data /var/www/html/ - -RUN ln -s /var/www/html/bin/console /usr/local/bin/console \ - && /usr/bin/crontab -u www-data /crontab.txt \ - && chmod +x /wait-for-it.sh \ - && chmod +x /usr/local/bin/docker-php-entrypoint \ - && chown -R www-data:www-data /var/www/html/ diff --git a/docker/php81-fpm-alpine/crontab.txt b/docker/php81-fpm-alpine/crontab.txt deleted file mode 100644 index 4c2e5964..00000000 --- a/docker/php81-fpm-alpine/crontab.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Roadiz maintenance tasks - -### Update Solr index -0 0 * * * cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console solr:reindex --no-debug -n -q - -### Maintenance tasks: erase +6 months logs and keeps only 20 node-source versions -0 8 * * 1 cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console documents:file:size -q -0 1 * * * cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console logs:cleanup --erase -n -q -0 2 * * * cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console versions:purge -c 20 -n -q -0 3 * * * cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console custom-form-answer:prune -n -q -### Empty node trashcan every month -0 0 1 * * cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console nodes:empty-trash -n -q diff --git a/docker/php81-fpm-alpine/docker-php-entrypoint b/docker/php81-fpm-alpine/docker-php-entrypoint deleted file mode 100755 index 433251b9..00000000 --- a/docker/php81-fpm-alpine/docker-php-entrypoint +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -set -e - -# -# Override default entrypoint to add some maintenance DEV only. -# DO NOT CALL THIS SCRIPT FOR WORKERS AND CRON containers (see docker-compose.yml) -# - -# Fix volume permissions -/bin/chown -R www-data:www-data /var/www/html/var || true; -/bin/chown -R www-data:www-data /var/www/html/public || true; -/bin/chown -R www-data:www-data /var/www/html/config || true; - -# Print local env vars to .env.xxx.php file for performances and crontab jobs -/usr/bin/sudo -u www-data -- bash -c "/var/www/html/bin/console cache:clear -n" -/usr/bin/sudo -u www-data -- bash -c "/var/www/html/bin/console cache:pool:clear cache.global_clearer -n" -/usr/bin/sudo -u www-data -- bash -c "/var/www/html/bin/console assets:install -n" -/usr/bin/sudo -u www-data -- bash -c "/var/www/html/bin/console themes:assets:install -n Rozier --relative --symlink" - -# -# Wait for database to be ready for next commands and migrations -# -/wait-for-it.sh -t 0 -s ${MYSQL_HOST}:${MYSQL_PORT} - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- php-fpm "$@" -fi - -exec "$@" diff --git a/docker/php81-fpm-alpine/php.ini b/docker/php81-fpm-alpine/php.ini deleted file mode 100644 index d0b7dc25..00000000 --- a/docker/php81-fpm-alpine/php.ini +++ /dev/null @@ -1,37 +0,0 @@ -error_reporting = E_ALL & ~E_DEPRECATED -html_errors = On - -apc.enable_cli = 0 -date.timezone = Europe/Paris -session.auto_start = Off -; Session ID cannot be passed through URLs -session.use_only_cookies = On -; Uses a secure connection (HTTPS) if possible -; session.cookie_secure = On -; Do not accept uninitialized session ID -session.use_strict_mode = On -; Do not make session cookie available to JS -session.cookie_httponly = On -short_open_tag = Off - -; http://symfony.com/doc/current/performance.html -; Configure OPcache for Maximum Performance -opcache.enable=1 -opcache.memory_consumption=256 -opcache.max_accelerated_files = 20000 -; Don't Check PHP Files Timestamps -opcache.revalidate_freq=0 -opcache.validate_timestamps=1 -opcache.fast_shutdown=1 -; Configure the PHP realpath Cache -realpath_cache_size = 4096K -realpath_cache_ttl = 600 -memory_limit = 512M -post_max_size = 256M -upload_max_filesize = 128M -expose_php = On -display_errors = On - -# Sessions -;session.save_handler = redis -;session.save_path = "tcp://redis:6379" diff --git a/docker/php81-fpm-alpine/wait-for-it.sh b/docker/php81-fpm-alpine/wait-for-it.sh deleted file mode 100755 index d990e0d3..00000000 --- a/docker/php81-fpm-alpine/wait-for-it.sh +++ /dev/null @@ -1,182 +0,0 @@ -#!/usr/bin/env bash -# Use this script to test if a given TCP host/port are available - -WAITFORIT_cmdname=${0##*/} - -echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } - -usage() -{ - cat << USAGE >&2 -Usage: - $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] - -h HOST | --host=HOST Host or IP under test - -p PORT | --port=PORT TCP port under test - Alternatively, you specify the host and port as host:port - -s | --strict Only execute subcommand if the test succeeds - -q | --quiet Don't output any status messages - -t TIMEOUT | --timeout=TIMEOUT - Timeout in seconds, zero for no timeout - -- COMMAND ARGS Execute command with args after the test finishes -USAGE - exit 1 -} - -wait_for() -{ - if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then - echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" - else - echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" - fi - WAITFORIT_start_ts=$(date +%s) - while : - do - if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then - nc -z $WAITFORIT_HOST $WAITFORIT_PORT - WAITFORIT_result=$? - else - (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 - WAITFORIT_result=$? - fi - if [[ $WAITFORIT_result -eq 0 ]]; then - WAITFORIT_end_ts=$(date +%s) - echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" - break - fi - sleep 1 - done - return $WAITFORIT_result -} - -wait_for_wrapper() -{ - # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 - if [[ $WAITFORIT_QUIET -eq 1 ]]; then - timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & - else - timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & - fi - WAITFORIT_PID=$! - trap "kill -INT -$WAITFORIT_PID" INT - wait $WAITFORIT_PID - WAITFORIT_RESULT=$? - if [[ $WAITFORIT_RESULT -ne 0 ]]; then - echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" - fi - return $WAITFORIT_RESULT -} - -# process arguments -while [[ $# -gt 0 ]] -do - case "$1" in - *:* ) - WAITFORIT_hostport=(${1//:/ }) - WAITFORIT_HOST=${WAITFORIT_hostport[0]} - WAITFORIT_PORT=${WAITFORIT_hostport[1]} - shift 1 - ;; - --child) - WAITFORIT_CHILD=1 - shift 1 - ;; - -q | --quiet) - WAITFORIT_QUIET=1 - shift 1 - ;; - -s | --strict) - WAITFORIT_STRICT=1 - shift 1 - ;; - -h) - WAITFORIT_HOST="$2" - if [[ $WAITFORIT_HOST == "" ]]; then break; fi - shift 2 - ;; - --host=*) - WAITFORIT_HOST="${1#*=}" - shift 1 - ;; - -p) - WAITFORIT_PORT="$2" - if [[ $WAITFORIT_PORT == "" ]]; then break; fi - shift 2 - ;; - --port=*) - WAITFORIT_PORT="${1#*=}" - shift 1 - ;; - -t) - WAITFORIT_TIMEOUT="$2" - if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi - shift 2 - ;; - --timeout=*) - WAITFORIT_TIMEOUT="${1#*=}" - shift 1 - ;; - --) - shift - WAITFORIT_CLI=("$@") - break - ;; - --help) - usage - ;; - *) - echoerr "Unknown argument: $1" - usage - ;; - esac -done - -if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then - echoerr "Error: you need to provide a host and port to test." - usage -fi - -WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} -WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} -WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} -WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} - -# Check to see if timeout is from busybox? -WAITFORIT_TIMEOUT_PATH=$(type -p timeout) -WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) - -WAITFORIT_BUSYTIMEFLAG="" -if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then - WAITFORIT_ISBUSY=1 - # Check if busybox timeout uses -t flag - # (recent Alpine versions don't support -t anymore) - if timeout &>/dev/stdout | grep -q -e '-t '; then - WAITFORIT_BUSYTIMEFLAG="-t" - fi -else - WAITFORIT_ISBUSY=0 -fi - -if [[ $WAITFORIT_CHILD -gt 0 ]]; then - wait_for - WAITFORIT_RESULT=$? - exit $WAITFORIT_RESULT -else - if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then - wait_for_wrapper - WAITFORIT_RESULT=$? - else - wait_for - WAITFORIT_RESULT=$? - fi -fi - -if [[ $WAITFORIT_CLI != "" ]]; then - if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then - echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" - exit $WAITFORIT_RESULT - fi - exec "${WAITFORIT_CLI[@]}" -else - exit $WAITFORIT_RESULT -fi diff --git a/docker/php81-nginx-alpine/Dockerfile b/docker/php81-nginx-alpine/Dockerfile deleted file mode 100755 index 6e11dada..00000000 --- a/docker/php81-nginx-alpine/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM roadiz/php81-nginx-alpine -MAINTAINER Ambroise Maupate - -ARG USER_UID=1000 -ENV COMPOSER_ALLOW_SUPERUSER=1 -ENV APP_ENV=dev -ENV APP_CACHE=0 -ENV APP_FFMPEG_PATH=/usr/bin/ffmpeg - -RUN apk add --no-cache shadow make git ffmpeg \ - && usermod -u ${USER_UID} www-data \ - && groupmod -g ${USER_UID} www-data \ - && composer --version \ - && ln -s /usr/share/zoneinfo/Europe/Paris /etc/localtime \ - && "date" - -# Display errors -ADD php.ini /usr/local/etc/php/php.ini -# Added Roadiz messenger for async tasks -ADD supervisor.ini /etc/supervisor.d/services.ini -ADD zz-docker.conf /usr/local/etc/php-fpm.d/zz-docker.conf -ADD nginx /etc/nginx - -VOLUME /var/www/html -WORKDIR /var/www/html - -RUN ln -s /usr/share/nginx/html/bin/roadiz /usr/local/bin/roadiz \ - && chown -R www-data:www-data /var/www/html/ - -ENTRYPOINT exec /usr/bin/supervisord -n -c /etc/supervisord.conf diff --git a/docker/php81-nginx-alpine/nginx/default.d/000-default.conf b/docker/php81-nginx-alpine/nginx/default.d/000-default.conf deleted file mode 100644 index 8632df5e..00000000 --- a/docker/php81-nginx-alpine/nginx/default.d/000-default.conf +++ /dev/null @@ -1,110 +0,0 @@ -server { - listen [::]:80 default_server ipv6only=off; - # Use Roadiz Standard Edition real root. - root /var/www/html/public; - - client_body_temp_path /tmp/client_body 1 2; - fastcgi_temp_path /tmp/fastcgi 1 2; - - index index.php; - - add_header X-Frame-Options "SAMEORIGIN"; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Content-Type-Options "nosniff"; - - # Kick wordpress brute force attack before it - # fills Roadiz logs with not-found resources. - location ~ ^/wp\-(includes|admin|login\.php) { - return 404; - } - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - location ~ /\.ht { - deny all; - } - location ~ /\.git { - deny all; - } - - location ~ ^/themes/(.+)\.(php|yml|twig|xlf|rzn|rzt|rzg)$ { - deny all; - } - # Enable Expire on Themes public assets - location ~* ^/(?:themes|files|assets)/*.*\.(?:ico|css|js|woff2?|eot|ttf|otf|svg|gif|jpe?g|png|webp|mp4|webm)$ { - # Serve not found files with PHP - try_files $uri $uri/ /index.php$is_args$args; - - expires 30d; - access_log off; - add_header "Pragma" "public"; - add_header "Cache-Control" "public"; - add_header "Vary" "Accept-Encoding"; - add_header "X-Frame-Options" "SAMEORIGIN"; - add_header "X-XSS-Protection" "1; mode=block"; - add_header "X-Content-Type-Options" "nosniff"; - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS'; - add_header 'Access-Control-Allow-Headers' 'DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; - } - - location / { - # First attempt to serve request as file, then - # as directory, then fall back to front-end controller - # (do not forget to pass GET parameters). - try_files $uri $uri/ /index.php$is_args$args; - } - - location ~ /install.php/ { - try_files $uri $uri/ /install.php$is_args$args; - } - location ~ /dev.php/ { - try_files $uri $uri/ /dev.php$is_args$args; - } - location ~ /preview.php/ { - try_files $uri $uri/ /preview.php$is_args$args; - } - location ~ /clear_cache.php/ { - try_files $uri $uri/ /clear_cache.php$is_args$args; - } - - # - # Production entry point. - # - location ~ ^/index\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass unix:/var/run/php-fpm.sock; - fastcgi_index index.php; - fastcgi_split_path_info ^(.+\.php)(.*)$; - include fastcgi_params; - try_files $uri =404; - # Prevents URIs that include the front controller. This will 404: - # http://domain.tld/app.php/some-path - # Remove the internal directive to allow URIs like this - internal; - - ## TUNE buffers to avoid error ## - fastcgi_buffers 16 32k; - fastcgi_buffer_size 64k; - fastcgi_busy_buffers_size 64k; - } - - # - # Preview, Dev and Install entry points. - # - # In production server, don't deploy dev.php or install.php - # - location ~ ^/(dev|install|preview|clear_cache)\.php(/|$) { - # Enforce file cache invalidation at each request - fastcgi_param PHP_VALUE "opcache.revalidate_freq=0"; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass unix:/var/run/php-fpm.sock; - fastcgi_split_path_info ^(.+\.php)(.*)$; - include fastcgi_params; - try_files $uri =404; - } - - # Don't log robots.txt or favicon.ico files - location = /favicon.ico { log_not_found off; access_log off; } - location = /robots.txt { allow all; access_log off; log_not_found off; } -} diff --git a/docker/php81-nginx-alpine/php.ini b/docker/php81-nginx-alpine/php.ini deleted file mode 100644 index 8eb01de5..00000000 --- a/docker/php81-nginx-alpine/php.ini +++ /dev/null @@ -1,33 +0,0 @@ -error_reporting = E_ALL -html_errors = On - -apc.enable_cli = 0 -date.timezone = Europe/Paris -session.auto_start = Off -; Session ID cannot be passed through URLs -session.use_only_cookies = On -; Uses a secure connection (HTTPS) if possible -; session.cookie_secure = On -; Do not accept uninitialized session ID -session.use_strict_mode = On -; Do not make session cookie available to JS -session.cookie_httponly = On -short_open_tag = Off - -; http://symfony.com/doc/current/performance.html -; Configure OPcache for Maximum Performance -opcache.enable=1 -opcache.memory_consumption=256 -opcache.max_accelerated_files = 20000 -; Don't Check PHP Files Timestamps -opcache.revalidate_freq=0 -opcache.validate_timestamps=1 -opcache.fast_shutdown=1 -; Configure the PHP realpath Cache -realpath_cache_size = 4096K -realpath_cache_ttl = 600 -memory_limit = 512M -post_max_size = 128M -upload_max_filesize = 128M -expose_php = On -display_errors = On diff --git a/docker/php81-nginx-alpine/supervisor.ini b/docker/php81-nginx-alpine/supervisor.ini deleted file mode 100644 index 09c05c8b..00000000 --- a/docker/php81-nginx-alpine/supervisor.ini +++ /dev/null @@ -1,41 +0,0 @@ -[program:crond] -command = crond -f -L 15 -autostart=true -autorestart=true -priority=10 - -[program:nginx] -command=nginx -autostart=true -autorestart=true -priority=10 -stdout_events_enabled=true -stderr_events_enabled=true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - -[program:php-fpm] -command = php-fpm --fpm-config /usr/local/etc/php-fpm.conf -autostart=true -autorestart=true -priority=5 -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - -;/etc/supervisor/conf.d/messenger-worker.conf -[program:messenger-consume] -command=php -d "memory_limit=-1" /var/www/html/bin/console messenger:consume async --time-limit=1800 -user=www-data -numprocs=1 -startsecs=0 -autostart=true -autorestart=true -process_name=%(program_name)s_%(process_num)02d -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php81-nginx-alpine/zz-docker.conf b/docker/php81-nginx-alpine/zz-docker.conf deleted file mode 100644 index a504c58a..00000000 --- a/docker/php81-nginx-alpine/zz-docker.conf +++ /dev/null @@ -1,22 +0,0 @@ -[global] -daemonize = no - -[www] -user = www-data -group = www-data -listen.owner = www-data -listen.group = www-data -listen.mode = 0660 - -listen = /var/run/php-fpm.sock - -; https://spot13.com/pmcalculator/ -pm.max_children = 25 -pm.start_servers = 6 -pm.min_spare_servers = 6 -pm.max_spare_servers = 18 -pm.max_requests = 1000 - -php_admin_value[error_log] = /dev/stderr -php_admin_flag[log_errors] = on -php_flag[display_errors] = on diff --git a/lib/Rozier/src/Resources/app/less/login/login.less b/lib/Rozier/src/Resources/app/less/login/login.less index fce6242f..db324872 100644 --- a/lib/Rozier/src/Resources/app/less/login/login.less +++ b/lib/Rozier/src/Resources/app/less/login/login.less @@ -115,38 +115,27 @@ width: @login-BarW; height: 70px; background-color: var(--accent-color); - top: 0px; left: 0; + top: 0; left: 0; text-align: center; @media (min-width: @screen-sm-min) { height: 116px; } - &:before { - content: ""; - display: inline-block; - height: 100%; - vertical-align: middle; - - } - .uk-icon-rz-roadiz-icon { vertical-align: middle; display: inline-block; font-size: 55px; } - picture, - img, - svg, - object { - position: relative; - max-width: 80%; - height: auto; - max-height: 100px; - vertical-align: middle; - display: inline-block; - width: auto; + img, svg, object { + display: block; + height: 100%; + width: 100%; + object-fit: contain; + object-position: center; + margin: 0 auto; + padding: 10px; } } diff --git a/lib/Rozier/src/Resources/app/less/panels/entries_panel/admin_entries.less b/lib/Rozier/src/Resources/app/less/panels/entries_panel/admin_entries.less index 2bf65f46..ec8883ce 100644 --- a/lib/Rozier/src/Resources/app/less/panels/entries_panel/admin_entries.less +++ b/lib/Rozier/src/Resources/app/less/panels/entries_panel/admin_entries.less @@ -154,25 +154,32 @@ &:before, &:after { display: none; } - i { - font-size: 20px; - } & > a { - padding: 5px 10px 5px 7px; + padding: 0; + display: flex; + gap: 10px; + align-items: center; + } + i { + font-size: 16px; + width: 16px; } .info { - display: inline-block; - background-color: transparent; - height: 43px; - line-height: 43px; - left: 28px; - font-size: @default-font-size; - color: var(--admin-entries-subnav-text-color); - .box-shadow(0px 0px 0px rgba(0,0,0,0)); + display: block; + position: relative; + background-color: transparent; + height: auto; + line-height: 1.2em; + left: 0; + padding: 5px 0; + white-space: normal; + font-size: @default-font-size; + color: var(--admin-entries-subnav-text-color); + .box-shadow(0px 0px 0px rgba(0,0,0,0)); - &:after { - display: none; - } + &:after { + display: none; + } } &:hover { background-color: #F5F5F5; diff --git a/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less b/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less index 8e7a247c..7c728f46 100644 --- a/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less +++ b/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less @@ -24,6 +24,10 @@ transition: font-size ease 1s; } + h1, h2, h3, h4, h5, h6 { + padding: 0 10px; + } + &-container{ padding-bottom:0; @@ -34,17 +38,12 @@ .uk-icon-button { text-shadow: 0 1px 0 rgba(0,0,0,.8); - font-size: 16px; - line-height: 34px; + font-size: 12px; + width: 30px; + height: 30px; + line-height: 29px; opacity: 0.3; - @media (min-width: @screen-sm-min) and (max-width: @screen-md-max) { - font-size: 12px; - width: 30px; - height: 30px; - line-height: 29px; - } - &:hover { opacity: 0.8; } @@ -109,8 +108,6 @@ } @media screen and (max-width: @screen-lg-max) { - width:90px; - #cms-version { a { display: block; @@ -125,12 +122,12 @@ } .user-actions { - padding: 15px 0px; + padding: 15px 10px; @media (max-width: @screen-xs-max) { display: block; - position:fixed; - top:50px; + position: fixed; + top: 50px; right:0; bottom:0; width:80%; @@ -154,31 +151,24 @@ .box-sizing(); padding: 0; - &:before { - content:""; - display: inline-block; - vertical-align: middle; - height: 100%; - } - a { + position: relative; font-size: 55px; color: #333333; - display: inline-block; + display: block; text-decoration: none; - opacity: 0.95; - transition: opacity ease 0.5s; - padding-left: 0px; - width: 99%; // on Firefox, prevent line-return - vertical-align: middle; + padding: 0; + height: 100%; + width: 100%; img, svg, object { display: block; - max-width: 95%; - height: auto; - width: auto; - max-height: 110px; + height: 100%; + width: 100%; + object-fit: contain; + object-position: center; margin: 0 auto; + padding: 10px; } &:hover { @@ -201,14 +191,14 @@ } .user-actions { - border-top: 1px solid var(--user-panel-border-color); - @media (min-width: @screen-sm-min) { + margin: 20px 0 0 0; + border-top: 1px solid var(--user-panel-border-color); display: flex; - flex-wrap: wrap; + flex-direction: column; align-items: center; justify-content: center; - gap: 5px; + gap: 10px; } } @@ -244,15 +234,6 @@ &:hover { border: 3px solid #333; } - @media (max-width: @screen-lg-max) { - width:56px; - height:56px; - - img{ - width:56px; - height:56px; - } - } } #cms-version { position: absolute; diff --git a/lib/Rozier/src/Resources/app/less/vars.less b/lib/Rozier/src/Resources/app/less/vars.less index 2d33951a..2e690562 100644 --- a/lib/Rozier/src/Resources/app/less/vars.less +++ b/lib/Rozier/src/Resources/app/less/vars.less @@ -73,14 +73,15 @@ /* -------- PANEL SIZES -------- */ -@user-panel-width: 150px; +@user-panel-width: 90px; @user-panel-sm-width: 90px; -@user-panel-lg-width: 120px; -@user-panel-xl-width: 150px; +@user-panel-lg-width: 90px; +@user-panel-xl-width: 90px; @entries-panel-width: 60px; @entries-panel-lg-width: 70px; @entries-panel-xl-width: 70px; + @trees-panel-width: 270px; @trees-panel-lg-width: 270px; @trees-panel-xl-width: 350px; @@ -92,8 +93,8 @@ @user-panel-color: #4d4d4d; @user-panel-text-color: #d8d8d8; @user-panel-text-alt-color: #b7b7b7; -@user-picture-size: 80px; -@user-picture-size-mini: 70px; +@user-picture-size: 56px; +@user-picture-size-mini: 56px; @user-panel-border-color: rgba(199,199,204, 0.14); diff --git a/lib/Rozier/src/Resources/views/admin/blocks/adminImage.html.twig b/lib/Rozier/src/Resources/views/admin/blocks/adminImage.html.twig index b101429b..3920352d 100644 --- a/lib/Rozier/src/Resources/views/admin/blocks/adminImage.html.twig +++ b/lib/Rozier/src/Resources/views/admin/blocks/adminImage.html.twig @@ -1,6 +1,6 @@
{% if themeServices.adminImage %} - {{ themeServices.adminImage|display({width:150}) }} + {{- themeServices.adminImage|display({ picture: true, width: 180, quality: 70 }) -}} {% else %} {% endif %} diff --git a/lib/Rozier/src/Resources/views/admin/blocks/loginImage.html.twig b/lib/Rozier/src/Resources/views/admin/blocks/loginImage.html.twig index 66c9b743..44aeb3ca 100644 --- a/lib/Rozier/src/Resources/views/admin/blocks/loginImage.html.twig +++ b/lib/Rozier/src/Resources/views/admin/blocks/loginImage.html.twig @@ -1,6 +1,6 @@