From 4cfee276a31340d08ae10629723ec57a9c5fffc7 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 18 Oct 2024 19:13:44 +0200 Subject: [PATCH] . --- .docker/config/httpd/httpd.conf | 553 ++++++++++++++++++ .../supervisor/conf.d/default-worker.conf | 11 + .docker/config/supervisor/supervisord.conf | 29 + .docker/cron | 1 + .docker/docker-compose.yml | 84 +++ .docker/phpdocker/README.html | 204 +++++++ .docker/phpdocker/README.md | 143 +++++ .docker/phpdocker/php-5.6-fpm/Dockerfile | 81 +++ .docker/phpdocker/php-5.6-fpm/overrides.conf | 17 + .docker/phpdocker/php-5.6-fpm/php-fpm-startup | 2 + .../php-5.6-fpm/php-ini-overrides.ini | 2 + .docker/phpdocker/php-fpm/Dockerfile | 40 ++ .../phpdocker/php-fpm/php-ini-overrides.ini | 3 + .docker/phpdocker/php-fpm/startup | 3 + .docker/update | 13 + app/Http/Controllers/FrontController.php | 7 +- app/Jobs/DownloadAudioTracks.php | 1 + app/Models/Song.php | 4 +- resources/css/app.sass | 34 +- resources/views/collection.blade.php | 6 +- resources/views/collection_song.blade.php | 3 +- resources/views/layout.blade.php | 13 +- resources/views/menu.blade.php | 32 +- resources/views/song.blade.php | 1 + startup | 3 - 25 files changed, 1258 insertions(+), 32 deletions(-) create mode 100644 .docker/config/httpd/httpd.conf create mode 100644 .docker/config/supervisor/conf.d/default-worker.conf create mode 100644 .docker/config/supervisor/supervisord.conf create mode 100644 .docker/cron create mode 100644 .docker/docker-compose.yml create mode 100644 .docker/phpdocker/README.html create mode 100644 .docker/phpdocker/README.md create mode 100644 .docker/phpdocker/php-5.6-fpm/Dockerfile create mode 100644 .docker/phpdocker/php-5.6-fpm/overrides.conf create mode 100644 .docker/phpdocker/php-5.6-fpm/php-fpm-startup create mode 100644 .docker/phpdocker/php-5.6-fpm/php-ini-overrides.ini create mode 100644 .docker/phpdocker/php-fpm/Dockerfile create mode 100644 .docker/phpdocker/php-fpm/php-ini-overrides.ini create mode 100644 .docker/phpdocker/php-fpm/startup create mode 100644 .docker/update delete mode 100644 startup diff --git a/.docker/config/httpd/httpd.conf b/.docker/config/httpd/httpd.conf new file mode 100644 index 0000000..5d483e6 --- /dev/null +++ b/.docker/config/httpd/httpd.conf @@ -0,0 +1,553 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "logs/access_log" +# with ServerRoot set to "/usr/local/apache2" will be interpreted by the +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# will be interpreted as '/logs/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "/usr/local/apache2" + +# +# Mutex: Allows you to set the mutex mechanism and mutex file directory +# for individual mutexes, or change the global defaults +# +# Uncomment and change the directory if mutexes are file-based and the default +# mutex file directory is not on a local disk or is not appropriate for some +# other reason. +# +# Mutex default:logs + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +LoadModule mpm_event_module modules/mod_mpm_event.so +#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so +#LoadModule mpm_worker_module modules/mod_mpm_worker.so +LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_dbm_module modules/mod_authn_dbm.so +#LoadModule authn_anon_module modules/mod_authn_anon.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +LoadModule authn_core_module modules/mod_authn_core.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_user_module modules/mod_authz_user.so +#LoadModule authz_dbm_module modules/mod_authz_dbm.so +#LoadModule authz_owner_module modules/mod_authz_owner.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so +LoadModule authz_core_module modules/mod_authz_core.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so +LoadModule access_compat_module modules/mod_access_compat.so +LoadModule auth_basic_module modules/mod_auth_basic.so +#LoadModule auth_form_module modules/mod_auth_form.so +#LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule allowmethods_module modules/mod_allowmethods.so +#LoadModule isapi_module modules/mod_isapi.so +#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule cache_module modules/mod_cache.so +#LoadModule cache_disk_module modules/mod_cache_disk.so +#LoadModule cache_socache_module modules/mod_cache_socache.so +#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +#LoadModule socache_redis_module modules/mod_socache_redis.so +#LoadModule watchdog_module modules/mod_watchdog.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule bucketeer_module modules/mod_bucketeer.so +#LoadModule dumpio_module modules/mod_dumpio.so +#LoadModule echo_module modules/mod_echo.so +#LoadModule example_hooks_module modules/mod_example_hooks.so +#LoadModule case_filter_module modules/mod_case_filter.so +#LoadModule case_filter_in_module modules/mod_case_filter_in.so +#LoadModule example_ipc_module modules/mod_example_ipc.so +#LoadModule buffer_module modules/mod_buffer.so +#LoadModule data_module modules/mod_data.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +LoadModule reqtimeout_module modules/mod_reqtimeout.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +#LoadModule request_module modules/mod_request.so +#LoadModule include_module modules/mod_include.so +LoadModule filter_module modules/mod_filter.so +#LoadModule reflector_module modules/mod_reflector.so +#LoadModule substitute_module modules/mod_substitute.so +#LoadModule sed_module modules/mod_sed.so +#LoadModule charset_lite_module modules/mod_charset_lite.so +#LoadModule deflate_module modules/mod_deflate.so +#LoadModule xml2enc_module modules/mod_xml2enc.so +#LoadModule proxy_html_module modules/mod_proxy_html.so +#LoadModule brotli_module modules/mod_brotli.so +LoadModule mime_module modules/mod_mime.so +#LoadModule ldap_module modules/mod_ldap.so +LoadModule log_config_module modules/mod_log_config.so +#LoadModule log_debug_module modules/mod_log_debug.so +#LoadModule log_forensic_module modules/mod_log_forensic.so +#LoadModule logio_module modules/mod_logio.so +#LoadModule lua_module modules/mod_lua.so +LoadModule env_module modules/mod_env.so +#LoadModule mime_magic_module modules/mod_mime_magic.so +#LoadModule cern_meta_module modules/mod_cern_meta.so +#LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule usertrack_module modules/mod_usertrack.so +#LoadModule unique_id_module modules/mod_unique_id.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule version_module modules/mod_version.so +LoadModule remoteip_module modules/mod_remoteip.so +LoadModule proxy_module modules/mod_proxy.so +#LoadModule proxy_connect_module modules/mod_proxy_connect.so +#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so +#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so +#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so +#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so +#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so +#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +#LoadModule proxy_express_module modules/mod_proxy_express.so +#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so +#LoadModule session_module modules/mod_session.so +#LoadModule session_cookie_module modules/mod_session_cookie.so +#LoadModule session_crypto_module modules/mod_session_crypto.so +#LoadModule session_dbd_module modules/mod_session_dbd.so +#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so +#LoadModule ssl_module modules/mod_ssl.so +#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so +#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so +#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so +#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so +#LoadModule dialup_module modules/mod_dialup.so +#LoadModule http2_module modules/mod_http2.so +#LoadModule proxy_http2_module modules/mod_proxy_http2.so +#LoadModule md_module modules/mod_md.so +#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so +LoadModule unixd_module modules/mod_unixd.so +#LoadModule heartbeat_module modules/mod_heartbeat.so +#LoadModule heartmonitor_module modules/mod_heartmonitor.so +#LoadModule dav_module modules/mod_dav.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +#LoadModule asis_module modules/mod_asis.so +#LoadModule info_module modules/mod_info.so +#LoadModule suexec_module modules/mod_suexec.so + + #LoadModule cgid_module modules/mod_cgid.so + + + #LoadModule cgi_module modules/mod_cgi.so + +#LoadModule dav_fs_module modules/mod_dav_fs.so +#LoadModule dav_lock_module modules/mod_dav_lock.so +#LoadModule vhost_alias_module modules/mod_vhost_alias.so +#LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +#LoadModule imagemap_module modules/mod_imagemap.so +#LoadModule actions_module modules/mod_actions.so +#LoadModule speling_module modules/mod_speling.so +#LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +LoadModule rewrite_module modules/mod_rewrite.so + + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User www-data +Group www-data + + + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin you@example.com + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/usr/local/apache2/htdocs" + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # AllowOverride FileInfo AuthConfig Limit + # + AllowOverride All + + # + # Controls who can get stuff from this server. + # + Require all granted + + +ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://songbook:9000/application/public/$1" timeout=1800 + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html index.php + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog /proc/self/fd/2 + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + CustomLog /proc/self/fd/1 common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + #CustomLog "logs/access_log" combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/" + + + + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock cgisock + + +# +# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied + # backend servers which have lingering "httpoxy" defects. + # 'Proxy' request header is undefined by the IETF, not listed by IANA + # + RequestHeader unset Proxy early + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig conf/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + #AddType text/html .shtml + #AddOutputFilter INCLUDES .shtml + + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +#MIMEMagicFile conf/magic + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# MaxRanges: Maximum number of Ranges in a request before +# returning the entire resource, or one of the special +# values 'default', 'none' or 'unlimited'. +# Default setting is to accept 200 Ranges. +#MaxRanges unlimited + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +#EnableSendfile on + +# Supplemental configuration +# +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as +# necessary. + +# Server-pool management (MPM specific) +#Include conf/extra/httpd-mpm.conf + +# Multi-language error messages +#Include conf/extra/httpd-multilang-errordoc.conf + +# Fancy directory listings +#Include conf/extra/httpd-autoindex.conf + +# Language settings +#Include conf/extra/httpd-languages.conf + +# User home directories +#Include conf/extra/httpd-userdir.conf + +# Real-time info on requests and configuration +#Include conf/extra/httpd-info.conf + +# Virtual hosts +#Include conf/extra/httpd-vhosts.conf + +# Local access to the Apache HTTP Server Manual +#Include conf/extra/httpd-manual.conf + +# Distributed authoring and versioning (WebDAV) +#Include conf/extra/httpd-dav.conf + +# Various default settings +#Include conf/extra/httpd-default.conf + +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include conf/extra/proxy-html.conf + + +# Secure (SSL/TLS) connections +#Include conf/extra/httpd-ssl.conf +# +# Note: The following must must be present to support +# starting without SSL on platforms with no /dev/random equivalent +# but a statically compiled-in mod_ssl. +# + +SSLRandomSeed startup builtin +SSLRandomSeed connect builtin + + diff --git a/.docker/config/supervisor/conf.d/default-worker.conf b/.docker/config/supervisor/conf.d/default-worker.conf new file mode 100644 index 0000000..47533d0 --- /dev/null +++ b/.docker/config/supervisor/conf.d/default-worker.conf @@ -0,0 +1,11 @@ +[program:default-worker] +process_name=%(program_name)s_%(process_num)02d +command=/usr/bin/php /application/artisan queue:work --queue=default --timeout=3600000 --memory=12000 +autostart=true +autorestart=true +user=www-data +group=www-data +numprocs=4 +redirect_stderr=true +stdout_logfile=/proc/self/fd/2 +stopwaitsecs=3600 diff --git a/.docker/config/supervisor/supervisord.conf b/.docker/config/supervisor/supervisord.conf new file mode 100644 index 0000000..1e48365 --- /dev/null +++ b/.docker/config/supervisor/supervisord.conf @@ -0,0 +1,29 @@ +; supervisor config file + +[unix_http_server] +file=/var/run/supervisor.sock ; (the path to the socket file) +chmod=0700 ; sockef file mode (default 0700) + +[supervisord] +logfile=/var/log/supervisord.log ; (main log file;default $CWD/supervisord.log) +pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) +childlogdir=/tmp ; ('AUTO' child log dir, default $TEMP) +user=root ; + +; the below section must remain in the config file for RPC +; (supervisorctl/web interface) to work, additional interfaces may be +; added by defining them in separate rpcinterface: sections +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[supervisorctl] +serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket + +; The [include] section can just contain the "files" setting. This +; setting can list multiple files (separated by whitespace or +; newlines). It can also contain wildcards. The filenames are +; interpreted as relative to this file. Included files *cannot* +; include files themselves. + +[include] +files = /etc/supervisor/conf.d/*.conf diff --git a/.docker/cron b/.docker/cron new file mode 100644 index 0000000..78aa2ea --- /dev/null +++ b/.docker/cron @@ -0,0 +1 @@ +* * * * * root docker exec -it songbook php /application/artisan schedule:run >> /dev/null 2>&1 diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml new file mode 100644 index 0000000..8ff45de --- /dev/null +++ b/.docker/docker-compose.yml @@ -0,0 +1,84 @@ +version: '3.1' +services: + webserver: + container_name: songbook-httpd + image: 'httpd:alpine' + working_dir: /application + volumes: + - './www/public/:/usr/local/apache2/htdocs/' + - './www/storage/app/public/:/usr/local/apache2/htdocs/storage/' + - './www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' + environment: + VIRTUAL_HOST: songbook.enhydra.fr + LETSENCRYPT_HOST: songbook.enhydra.fr + networks: + - songbook + restart: unless-stopped + + php-fpm: + container_name: songbook + build: www/.docker/phpdocker/php-fpm + working_dir: /application + volumes: + - './www:/application' + - './www/.docker/config/supervisor/:/etc/supervisor/' + - './www/.docker/phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.1/fpm/conf.d/99-overrides.ini' + tmpfs: +# - '/application/storage/framework/cache/data/cache' + - '/tmp' + networks: + - songbook + restart: unless-stopped + + adminer: + image: adminer:latest + container_name: songbook-adminer + restart: unless-stopped + environment: + ADMINER_DEFAULT_SERVER: songbook-mariadb + VIRTUAL_HOST: adminer.songbook.enhydra.fr + LETSENCRYPT_HOST: adminer.songbook.enhydra.fr + networks: + - songbook + + mariadb: + container_name: songbook-mariadb + image: 'mariadb' + environment: + MARIADB_ROOT_PASSWORD: fSzqOG47NoLk72FT + MARIADB_DATABASE: songbook + volumes: + - "./database:/var/lib/mysql" + - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql" + networks: + - songbook + restart: unless-stopped + + mysqlbackup: + image: selim13/automysqlbackup + container_name: songbook-automysqlbackup + volumes: + - "./database/backup:/backup" + environment: + USERNAME: root + PASSWORD: fSzqOG47NoLk72FT + DBHOST: songbook-mariadb + DBEXCLUDE: "performance_schema information_schema" + CRON_SCHEDULE: "0 0 * * *" + EXTRA_OPTS: "--single-transaction" + networks: + - songbook + + redis: + container_name: songbook-redis + image: redis + restart: unless-stopped + volumes: + - "./redis:/data" + networks: + - songbook + +networks: + songbook: + external: + name: songbook diff --git a/.docker/phpdocker/README.html b/.docker/phpdocker/README.html new file mode 100644 index 0000000..95d3332 --- /dev/null +++ b/.docker/phpdocker/README.html @@ -0,0 +1,204 @@ + + + PHPDocker.io Readme + + + + + + +
+
+
+

PHPDocker.io generated environment

+ +

Add to your project

+ +

Simply, unzip the file into your project, this will create docker-compose.yml on the root of your project and a folder +named phpdocker containing nginx and php-fpm config for it.

+ +

Ensure the webserver config on phpdocker/nginx/nginx.conf is correct for your project. PHPDocker.io will have +customised this file according to the front controller location relative to the docker-compose file you chose on the +generator (by default public/index.php).

+ +

Note: you may place the files elsewhere in your project. Make sure you modify the locations for the php-fpm dockerfile, +the php.ini overrides and nginx config on docker-compose.yml if you do so.

+ +

How to run

+ +

Dependencies:

+ + + +

Once you're done, simply cd to your project and run docker-compose up -d. This will initialise and start all the +containers, then leave them running in the background.

+ +

Services exposed outside your environment

+ +

You can access your application via localhost. Mailhog and nginx both respond to any hostname, in case you want to +add your own hostname on your /etc/hosts

+ + + + + + + + + + + + + + +
ServiceAddress outside containers
Webserverlocalhost:29000
+ +

Hosts within your environment

+ +

You'll need to configure your application to use any services you enabled:

+ + + + + + + + + + + + + + + + + + + + + +
ServiceHostnamePort number
php-fpmphp-fpm9000
Redisredis6379 (default)
+ +

Docker compose cheatsheet

+ +

Note: you need to cd first to where your docker-compose.yml file lives.

+ +
    +
  • Start containers in the background: docker-compose up -d
    • +
  • Start containers on the foreground: docker-compose up. You will see a stream of logs for every container running. +ctrl+c stops containers.
    • +
  • Stop containers: docker-compose stop
    • +
  • Kill containers: docker-compose kill
    • +
  • View container logs: docker-compose logs for all containers or docker-compose logs SERVICE_NAME for the logs of +all containers in SERVICE_NAME.
    • +
  • Execute command inside of container: docker-compose exec SERVICE_NAME COMMAND where COMMAND is whatever you want +to run. Examples: + +
      +
    • Shell into the PHP container, docker-compose exec php-fpm bash
      • +
    • Run symfony console, docker-compose exec php-fpm bin/console
      • +
    • Open a mysql shell, docker-compose exec mysql mysql -uroot -pCHOSEN_ROOT_PASSWORD
      • +
    • +
+ +

Application file permissions

+ +

As in all server environments, your application needs the correct file permissions to work properly. You can change the +files throughout the container, so you won't care if the user exists or has the same ID on your host.

+ +

docker-compose exec php-fpm chown -R www-data:www-data /application/public

+ +

Recommendations

+ +

It's hard to avoid file permission issues when fiddling about with containers due to the fact that, from your OS point +of view, any files created within the container are owned by the process that runs the docker engine (this is usually +root). Different OS will also have different problems, for instance you can run stuff in containers +using docker exec -it -u $(id -u):$(id -g) CONTAINER_NAME COMMAND to force your current user ID into the process, but +this will only work if your host OS is Linux, not mac. Follow a couple of simple rules and save yourself a world of +hurt.

+ +
    +
  • Run composer outside of the php container, as doing so would install all your dependencies owned by root within your +vendor folder.
    • +
  • Run commands (ie Symfony's console, or Laravel's artisan) straight inside of your container. You can easily open a +shell as described above and do your thing from there.
    • +
+ +

Simple basic Xdebug configuration with integration to PHPStorm

+ +

Xdebug 2

+ +

To configure Xdebug 2 you need add these lines in php-fpm/php-ini-overrides.ini:

+ +

For linux:

+ +
xdebug.remote_enable = 1
+xdebug.remote_connect_back = 1
+xdebug.remote_autostart = 1
+
+ +

For macOS and Windows:

+ +
xdebug.remote_enable = 1
+xdebug.remote_host = host.docker.internal
+xdebug.remote_autostart = 1
+
+ +

Xdebug 3

+ +

To configure Xdebug 3 you need add these lines in php-fpm/php-ini-overrides.ini:

+ +

For linux:

+ +
xdebug.mode = debug
+xdebug.remote_connect_back = true
+xdebug.start_with_request = yes
+
+ +

For macOS and Windows:

+ +
xdebug.mode = debug
+xdebug.remote_host = host.docker.internal
+xdebug.start_with_request = yes
+
+ +

Add the section “environment” to the php-fpm service in docker-compose.yml:

+ +
environment:
+  PHP_IDE_CONFIG: "serverName=Docker"
+
+ +

Create a server configuration in PHPStorm:

+ +
    +
  • In PHPStorm open Preferences | Languages & Frameworks | PHP | Servers
    • +
  • Add new server
    • +
  • The “Name” field should be the same as the parameter “serverName” value in “environment” in docker-compose.yml (i.e. * +Docker* in the example above)
    • +
  • A value of the "port" field should be the same as first port(before a colon) in "webserver" service in +docker-compose.yml
    • +
  • Select "Use path mappings" and set mappings between a path to your project on a host system and the Docker container.
    • +
  • Finally, add “Xdebug helper” extension in your browser, set breakpoints and start debugging
    • +
+
+
+
+ + + + diff --git a/.docker/phpdocker/README.md b/.docker/phpdocker/README.md new file mode 100644 index 0000000..9dcfed9 --- /dev/null +++ b/.docker/phpdocker/README.md @@ -0,0 +1,143 @@ +PHPDocker.io generated environment +================================== + +# Add to your project # + +Simply, unzip the file into your project, this will create `docker-compose.yml` on the root of your project and a folder +named `phpdocker` containing nginx and php-fpm config for it. + +Ensure the webserver config on `phpdocker/nginx/nginx.conf` is correct for your project. PHPDocker.io will have +customised this file according to the front controller location relative to the docker-compose file you chose on the +generator (by default `public/index.php`). + +Note: you may place the files elsewhere in your project. Make sure you modify the locations for the php-fpm dockerfile, +the php.ini overrides and nginx config on `docker-compose.yml` if you do so. + +# How to run # + +Dependencies: + +* docker. See [https://docs.docker.com/engine/installation](https://docs.docker.com/engine/installation) +* docker-compose. See [docs.docker.com/compose/install](https://docs.docker.com/compose/install/) + +Once you're done, simply `cd` to your project and run `docker-compose up -d`. This will initialise and start all the +containers, then leave them running in the background. + +## Services exposed outside your environment ## + +You can access your application via **`localhost`**. Mailhog and nginx both respond to any hostname, in case you want to +add your own hostname on your `/etc/hosts` + +Service|Address outside containers +-------|-------------------------- +Webserver|[localhost:29000](http://localhost:29000) + +## Hosts within your environment ## + +You'll need to configure your application to use any services you enabled: + +Service|Hostname|Port number +------|---------|----------- +php-fpm|php-fpm|9000 +Redis|redis|6379 (default) + +# Docker compose cheatsheet # + +**Note:** you need to cd first to where your docker-compose.yml file lives. + +* Start containers in the background: `docker-compose up -d` +* Start containers on the foreground: `docker-compose up`. You will see a stream of logs for every container running. + ctrl+c stops containers. +* Stop containers: `docker-compose stop` +* Kill containers: `docker-compose kill` +* View container logs: `docker-compose logs` for all containers or `docker-compose logs SERVICE_NAME` for the logs of + all containers in `SERVICE_NAME`. +* Execute command inside of container: `docker-compose exec SERVICE_NAME COMMAND` where `COMMAND` is whatever you want + to run. Examples: + * Shell into the PHP container, `docker-compose exec php-fpm bash` + * Run symfony console, `docker-compose exec php-fpm bin/console` + * Open a mysql shell, `docker-compose exec mysql mysql -uroot -pCHOSEN_ROOT_PASSWORD` + +# Application file permissions # + +As in all server environments, your application needs the correct file permissions to work properly. You can change the +files throughout the container, so you won't care if the user exists or has the same ID on your host. + +`docker-compose exec php-fpm chown -R www-data:www-data /application/public` + +# Recommendations # + +It's hard to avoid file permission issues when fiddling about with containers due to the fact that, from your OS point +of view, any files created within the container are owned by the process that runs the docker engine (this is usually +root). Different OS will also have different problems, for instance you can run stuff in containers +using `docker exec -it -u $(id -u):$(id -g) CONTAINER_NAME COMMAND` to force your current user ID into the process, but +this will only work if your host OS is Linux, not mac. Follow a couple of simple rules and save yourself a world of +hurt. + +* Run composer outside of the php container, as doing so would install all your dependencies owned by `root` within your + vendor folder. +* Run commands (ie Symfony's console, or Laravel's artisan) straight inside of your container. You can easily open a + shell as described above and do your thing from there. + +# Simple basic Xdebug configuration with integration to PHPStorm + +## Xdebug 2 + +To configure **Xdebug 2** you need add these lines in php-fpm/php-ini-overrides.ini: + +### For linux: + +``` +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.remote_autostart = 1 +``` + +### For macOS and Windows: + +``` +xdebug.remote_enable = 1 +xdebug.remote_host = host.docker.internal +xdebug.remote_autostart = 1 +``` + +## Xdebug 3 + +To configure **Xdebug 3** you need add these lines in php-fpm/php-ini-overrides.ini: + +### For linux: + +``` +xdebug.mode = debug +xdebug.remote_connect_back = true +xdebug.start_with_request = yes +``` + +### For macOS and Windows: + +``` +xdebug.mode = debug +xdebug.remote_host = host.docker.internal +xdebug.start_with_request = yes +``` + +## Add the section “environment” to the php-fpm service in docker-compose.yml: + +``` +environment: + PHP_IDE_CONFIG: "serverName=Docker" +``` + +### Create a server configuration in PHPStorm: + +* In PHPStorm open Preferences | Languages & Frameworks | PHP | Servers +* Add new server +* The “Name” field should be the same as the parameter “serverName” value in “environment” in docker-compose.yml (i.e. * + Docker* in the example above) +* A value of the "port" field should be the same as first port(before a colon) in "webserver" service in + docker-compose.yml +* Select "Use path mappings" and set mappings between a path to your project on a host system and the Docker container. +* Finally, add “Xdebug helper” extension in your browser, set breakpoints and start debugging + + + diff --git a/.docker/phpdocker/php-5.6-fpm/Dockerfile b/.docker/phpdocker/php-5.6-fpm/Dockerfile new file mode 100644 index 0000000..9458799 --- /dev/null +++ b/.docker/phpdocker/php-5.6-fpm/Dockerfile @@ -0,0 +1,81 @@ +FROM ubuntu:bionic AS cli + +WORKDIR "/application" + +# Fixes some weird terminal issues such as broken clear / CTRL+L +ENV TERM=linux + +# Install Ondrej repos for Ubuntu Bionic, PHP7.2, composer and selected extensions - better selection than +# the distro's packages +RUN apt-get update \ + && apt-get install -y --no-install-recommends gnupg \ + && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main" > /etc/apt/sources.list.d/ondrej-php.list \ + && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \ + && apt-get update \ + && apt-get update \ + && apt-get -y --no-install-recommends install \ + curl \ + ca-certificates \ + unzip \ + php5.6-cli \ + php5.6-curl \ + php5.6-json \ + php5.6-mbstring \ + php5.6-opcache \ + php5.6-readline \ + php5.6-xml \ + php5.6-zip \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* + +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer + +CMD ["php", "-a"] + +# If you'd like to be able to use this container on a docker-compose environment as a quiescent PHP CLI container +# you can /bin/bash into, override CMD with the following - bear in mind that this will make docker-compose stop +# slow on such a container, docker-compose kill might do if you're in a hurry +# CMD ["tail", "-f", "/dev/null"] + +FROM cli AS fpm + +# Install FPM +RUN export DEBIAN_FRONTEND=noninteractive \ + && apt-get update \ + && apt-get -y --no-install-recommends install php5.6-fpm \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* + +# PHP-FPM packages need a nudge to make them docker-friendly +COPY overrides.conf /etc/php/5.6/fpm/pool.d/z-overrides.conf + +# PHP-FPM has really dirty logs, certainly not good for dockerising +# The following startup script contains some magic to clean these up +COPY --chmod=755 php-fpm-startup /usr/bin/php-fpm +CMD /usr/bin/php-fpm + +# Open up fcgi port +EXPOSE 9000 + +RUN apt-get update; \ + apt-get -y --no-install-recommends install \ + git \ + php5.6-bz2 \ + php5.6-gd \ + php5.6-igbinary \ + php5.6-imap \ + php5.6-imagick \ + php5.6-intl \ + php5.6-memcached \ + php5.6-mysql \ + php5.6-redis \ + php5.6-soap \ + php5.6-ssh2 \ + php5.6-tidy \ + php5.6-xsl \ + php5.6-curl \ + php5.6-json \ + php5.6-mcrypt \ + less nano wget curl; \ + apt-get clean; \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; diff --git a/.docker/phpdocker/php-5.6-fpm/overrides.conf b/.docker/phpdocker/php-5.6-fpm/overrides.conf new file mode 100644 index 0000000..51c835c --- /dev/null +++ b/.docker/phpdocker/php-5.6-fpm/overrides.conf @@ -0,0 +1,17 @@ +[global] +; Override default pid file +pid = /run/php-fpm.pid + +; Avoid logs being sent to syslog +error_log = /proc/self/fd/2 + +[www] +; Access from webserver container is via network, not socket file +listen = [::]:9000 + +; Redirect logs to stdout - FPM closes /dev/std* on startup +access.log = /proc/self/fd/2 +catch_workers_output = yes + +; Required to allow config-by-environment +clear_env = no diff --git a/.docker/phpdocker/php-5.6-fpm/php-fpm-startup b/.docker/phpdocker/php-5.6-fpm/php-fpm-startup new file mode 100644 index 0000000..c7e3f5c --- /dev/null +++ b/.docker/phpdocker/php-5.6-fpm/php-fpm-startup @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +/usr/sbin/php-fpm5.6 -F -O 2>&1 | sed -u 's,.*: \"\(.*\)$,\1,'| sed -u 's,"$,,' 1>&1 diff --git a/.docker/phpdocker/php-5.6-fpm/php-ini-overrides.ini b/.docker/phpdocker/php-5.6-fpm/php-ini-overrides.ini new file mode 100644 index 0000000..bf24fef --- /dev/null +++ b/.docker/phpdocker/php-5.6-fpm/php-ini-overrides.ini @@ -0,0 +1,2 @@ +upload_max_filesize = 2G +post_max_size = 2G diff --git a/.docker/phpdocker/php-fpm/Dockerfile b/.docker/phpdocker/php-fpm/Dockerfile new file mode 100644 index 0000000..584a719 --- /dev/null +++ b/.docker/phpdocker/php-fpm/Dockerfile @@ -0,0 +1,40 @@ +FROM phpdockerio/php:8.1-fpm +WORKDIR "/application" + +RUN apt-get update; \ + apt-get -y --no-install-recommends install \ + git \ + php8.1-bz2 \ + php8.1-gd \ + php8.1-igbinary \ + php8.1-imap \ + php8.1-imagick \ + php8.1-intl \ + php8.1-memcached \ + php8.1-mysql \ + php8.1-redis \ + php8.1-soap \ + php8.1-ssh2 \ + php8.1-tidy \ + php8.1-xsl \ + php8.1-curl \ + php8.1-mcrypt \ + less nano wget curl ffmpeg soundstretch mpg123 libreoffice default-jre supervisor; \ + apt-get clean; \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; + +RUN apt-get update; \ + apt-get -y --no-install-recommends install python3-pip gcc python3-dev; \ + apt-get clean; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*; \ + /usr/bin/python3 -m pip install -U pip setuptools wheel; \ + /usr/bin/python3 -m pip install -U pip; \ + /usr/bin/python3 -m pip install -U yt-dlp; + +RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -;\ + apt-get install -y nodejs; +RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp +RUN chmod a+rx /usr/local/bin/yt-dlp + +COPY startup /usr/bin/startup +RUN chmod 755 /usr/bin/startup +CMD exec /usr/bin/startup diff --git a/.docker/phpdocker/php-fpm/php-ini-overrides.ini b/.docker/phpdocker/php-fpm/php-ini-overrides.ini new file mode 100644 index 0000000..e4d9c2c --- /dev/null +++ b/.docker/phpdocker/php-fpm/php-ini-overrides.ini @@ -0,0 +1,3 @@ +upload_max_filesize = 2G +post_max_size = 2G +memory_limit = 1G diff --git a/.docker/phpdocker/php-fpm/startup b/.docker/phpdocker/php-fpm/startup new file mode 100644 index 0000000..0ded5d1 --- /dev/null +++ b/.docker/phpdocker/php-fpm/startup @@ -0,0 +1,3 @@ +#!/bin/sh +service supervisor start +/usr/sbin/php-fpm8.1 diff --git a/.docker/update b/.docker/update new file mode 100644 index 0000000..dfcd844 --- /dev/null +++ b/.docker/update @@ -0,0 +1,13 @@ +#!/bin/sh +chmod -R 777 /docker/songbook/www/storage +chown -R www-data:www-data /docker/songbook/www/ +cd /docker/songbook +docker network create songbook +COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull +COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build +docker compose down -v +docker compose up -d +docker exec -it songbook /application/update +ln -s -f /docker/songbook/cron /etc/cron.d/songbook +chown -R www-data:www-data /docker/songbook/www/ +ufw-docker allow songbook diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php index 9702983..bc812fb 100644 --- a/app/Http/Controllers/FrontController.php +++ b/app/Http/Controllers/FrontController.php @@ -156,10 +156,15 @@ class FrontController extends Controller protected function _getSongsOfCollection($id, $lists) { /** @var Song $q */ - $q = Song::withoutGlobalScope('ownerclause')->whereRaw('json_contains(collections, \'["' . $id . '"]\')'); + $q = Song::withoutGlobalScope('ownerclause'); + if (null === backpack_user()) { + $q->where('online', '1'); + } + $q->whereRaw('json_contains(collections, \'["' . $id . '"]\')'); foreach ($lists as $list) { $q->orWhereRaw('json_contains(collections, \'["' . $id . '_' . $list->id . '"]\')'); } + return $q->orderBy('title')->get(); } diff --git a/app/Jobs/DownloadAudioTracks.php b/app/Jobs/DownloadAudioTracks.php index ccd1d03..0e16ba0 100644 --- a/app/Jobs/DownloadAudioTracks.php +++ b/app/Jobs/DownloadAudioTracks.php @@ -62,6 +62,7 @@ class DownloadAudioTracks extends Base{ $collection = $yt->download( $options ); + dd($collection); } } } diff --git a/app/Models/Song.php b/app/Models/Song.php index 36049f9..20b1f44 100644 --- a/app/Models/Song.php +++ b/app/Models/Song.php @@ -55,6 +55,7 @@ class Song extends CubistMagicAbstractModel parent::setFields(); // $this->addField('slug', 'Slug', 'Slug', ['column' => true]); + $this->addField('online', Checkbox::class, __('En ligne'), ['column' => true, 'tab' => __('Paramètres'), 'default' => 1, 'databaseDefault' => 1]); $this->addField('title', 'Text', __('Titre de la chanson'), ['column' => true, 'tab' => __('Paramètres')]); $this->addField('artist', 'Text', __('Artiste'), ['column' => true, 'tab' => __('Paramètres')]); $this->addField([ @@ -77,8 +78,9 @@ class Song extends CubistMagicAbstractModel $this->addField('key', Tone::class, __('Key'), ['column' => true, 'tab' => __('Paroles et accords')]); $this->addField('mode', Mode::class, __('Mode'), ['column' => true, 'tab' => __('Paroles et accords')]); - $this->addField('tempo', Tempo::class, __('Suggested tempo'), ['column' => true, 'default' => 80, 'tab' => __('Paroles et accords')]); + $this->addField('tempo', Tempo::class, __('Suggested tempo'), ['column' => false, 'default' => 80, 'tab' => __('Paroles et accords')]); $this->addField('partition', Files::class, __('Partition'), ['acceptedFiles' => 'application/pdf', 'when' => ['chorale' => 1], 'tab' => __('Paroles et accords')]); + $this->addField('show_chords', Checkbox::class, __('Afficher les accords'), ['column' => true, 'default' => true, 'defaultDatabase' => 1, 'when' => ['chorale' => 0], 'tab' => __('Paroles et accords')]); $this->addField('lyrics', BunchOfFieldsMultiple::class, __('Song Parts'), ['bunch' => SongPortion::class, 'add_label' => 'Nouvelle partie', 'when' => ['chorale' => 0], 'tab' => __('Paroles et accords')]); $this->addField('lyrics_doc', Files::class, __('Paroles'), ['acceptedFiles' => 'application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,text/plain,text/html', 'when' => ['chorale' => 1], 'tab' => __('Paroles et accords')]); $this->addField('audio', BunchOfFieldsMultiple::class, __('Audio tracks'), ['bunch' => AudioTrack::class, 'add_label' => 'Ajouter un audio', 'tab' => __('Audios')]); diff --git a/resources/css/app.sass b/resources/css/app.sass index f10f800..1378a1b 100644 --- a/resources/css/app.sass +++ b/resources/css/app.sass @@ -132,7 +132,7 @@ body animation-timing-function: linear main - padding: 20px 14px + padding: 20px 0 min-height: 100% @@ -159,15 +159,34 @@ main li list-style: none - margin-top: 0.25em + height: 50px + padding: 10px 14px + background-color: #fff - h3 + &:not(.sticky):hover + background-color: var(--theme-color) + + a + color: #000 + @media (prefers-color-scheme: dark) + color: #fff + + @media (prefers-color-scheme: dark) + background-color: #000 + + &.sticky position: sticky - padding-top: 1em - padding-bottom: 0.5em + top: 50px + padding: 15px 14px + z-index: 1 + + &.offline + opacity: 0.6 + text-decoration: line-through article.song font-size: 16px + padding: 0 14px section position: relative @@ -507,6 +526,11 @@ header height: 100% #menu + + li.offline + opacity: 0.5 + text-decoration: line-through + a.active color: var(--theme-color) diff --git a/resources/views/collection.blade.php b/resources/views/collection.blade.php index d873359..834a0ae 100644 --- a/resources/views/collection.blade.php +++ b/resources/views/collection.blade.php @@ -18,9 +18,9 @@ @foreach($collection_lists as $list)
    -

  • 📒 {{$list->name}}

    • +

  • 📒 {{$list->name}}

    • @foreach($collection_songs as $csong) - @if(!in_array($collection->id.'_'.$list->id, $csong->collections)) + @if((!$csong->online && !backpack_user()) || !in_array($collection->id.'_'.$list->id, $csong->collections)) @continue @endif @include('collection_song') @@ -29,7 +29,7 @@ @endforeach @if(isset($collection_lists) && count($collection_lists))
      -

    • 🎵 {{__('Tous les morceaux')}}

      • +

    • 🎵 {{__('Tous les morceaux')}}

      • @foreach($collection_songs as $csong) @include('collection_song') @endforeach diff --git a/resources/views/collection_song.blade.php b/resources/views/collection_song.blade.php index 00b7d84..57eebff 100644 --- a/resources/views/collection_song.blade.php +++ b/resources/views/collection_song.blade.php @@ -1,6 +1,7 @@ @php $songurl='/'.$collection->slug.'/'.$csong->slug.'.html'; @endphp -
    • {{$csong->title}} +
    • online) class="offline" @endif +>{{$csong->title}} {{$csong->artist}}
      • diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index 18ea613..9c22134 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -38,6 +38,7 @@ @if(isset($song)) var SONG = "{{$song->id}}"; @endif + var ADMIN = {{backpack_user()!==null?'true':'false'}}; @@ -55,11 +56,13 @@
      - - - + + + + +
      @yield('content') diff --git a/resources/views/menu.blade.php b/resources/views/menu.blade.php index 32db968..fd77eb4 100644 --- a/resources/views/menu.blade.php +++ b/resources/views/menu.blade.php @@ -42,20 +42,26 @@
    @if(isset($song)) - @if($song->hasChords()) -
  • 🎤 {{__('Show lyrics')}}
    • -
  • 🎼 {{__('Show chords')}}
    • + @if($song->hasChords() && ($song->show_chords || backpack_user()!==null)) +
  • show_chords) class="offline" @endif>🎤 {{__('Show lyrics')}} +
    • +
  • show_chords) class="offline" @endif>🎼 {{__('Show chords')}} +
    • @if($song->hasSimpleChords()) -
  • 🐣 {{__('Show simple chords')}} +
  • show_chords) class="offline" @endif>🐣 {{__('Show simple chords')}} +
    • @endif @if($collection->transpose) diff --git a/resources/views/song.blade.php b/resources/views/song.blade.php index ba52557..d22c7a4 100644 --- a/resources/views/song.blade.php +++ b/resources/views/song.blade.php @@ -1,6 +1,7 @@ @php $audioTracks=$song->getAudioTracks(); $simple=$song->hasSimpleChords(); + $admin=backpack_user()!==null; @endphp @extends('layout') diff --git a/startup b/startup deleted file mode 100644 index 8a9e458..0000000 --- a/startup +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -/usr/sbin/start-stop-daemon --start -b -m --pidfile=/var/run/schedulework.pid --startas /usr/bin/php /application/artisan schedule:work -/usr/sbin/start-stop-daemon --start -b -m --pidfile=/var/run/queuework.pid --startas /usr/bin/php /application/artisan queue:listen -- 2.39.5