.

diff --git a/app/Models/Collection.php b/app/Models/Collection.php
index a51403ef07bb18d539400c3e87b756f64346d589..6430f24d44a011494b5ddc599dad6edf1eb59a21 100644 (file)
--- a/app/Models/Collection.php
+++ b/app/Models/Collection.php
@@ -42,6 +42,7 @@ class Collection extends CubistMagicAbstractModel {
         $this->addField('slug', Slug::class, 'Slug', ['column' => true]);
         $this->addField('icon', Images::class, 'Icône');
         $this->addField('theme_color', Color::class, 'Couleur d\'accentuation');
+        $this->addField('theme_dark_color', Color::class, 'Couleur d\'accentuation sur thème sombre');
         $this->addField('splashscreen_color', Color::class, 'Couleur de fond du splashscreen');
         $this->addField('password', Text::class, 'Mot de passe', ['hint' => 'Laisser vide pour désactiver']);
         $this->addField('transpose', Checkbox::class, 'Activer la transposition', ['default' => true, 'database_default' => true]);

diff --git a/composer.json b/composer.json
index 1d62d8d7b1923bb0047ff69517c4b85ecd4e5b59..c0a259e488cb1df75f0324e55fd95b74a2d5caa1 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -28,23 +28,23 @@
         "ext-zip": "*",
         "cubist/cms-back": "dev-backpack4.1",
         "fruitcake/laravel-cors": "^2.2",
-        "guzzlehttp/psr7": "^2.0",
-        "league/csv": "^9.8",
+        "guzzlehttp/psr7": "^2.8",
+        "league/csv": "^9.27",
         "mariosimao/notion-sdk-php": "dev-parent-block-fix",
-        "mxl/laravel-job": "^1.3",
+        "mxl/laravel-job": "^1.7",
         "php-ffmpeg/php-ffmpeg": "^0.18.0",
-        "phpoffice/phpspreadsheet": "^1.25"
+        "phpoffice/phpspreadsheet": "^1.30"
     },
     "replace": {
         "cviebrock/laravel-elasticsearch": "*"
     },
     "require-dev": {
-        "barryvdh/laravel-ide-helper": "^2.10",
-        "facade/ignition": "^2.3",
-        "filp/whoops": "^2.14",
-        "laravel/tinker": "^2.1",
-        "mockery/mockery": "^1.4",
-        "nunomaduro/collision": "^4.2",
+        "barryvdh/laravel-ide-helper": "^2.14",
+        "facade/ignition": "^2.17",
+        "filp/whoops": "^2.18",
+        "laravel/tinker": "^2.10",
+        "mockery/mockery": "^1.6",
+        "nunomaduro/collision": "^4.3",
         "phpunit/phpunit": "^8.5"
     },
     "config": {

diff --git a/dockerterminal.bat b/dockerterminal.bat
index 9c94b63c04ba1b508e1f59f97678da960cdc26c5..f11b243ad47a13ae6d2646190c608d36552c4012 100644 (file)
--- a/dockerterminal.bat
+++ b/dockerterminal.bat
@@ -1,3 +1,3 @@
 @echo off
 cls
-C:\tools\cygwin\bin\ssh.exe -t root@her2.cubedesigners.com 'docker exec -it songbook /bin/bash'
+C:\tools\cygwin\bin\ssh.exe -t root@cloudatlas.cubedesigners.com 'docker exec -it songbook /bin/bash'

diff --git a/resources/css/app.sass b/resources/css/app.sass
index 1378a1b72a25e05c0177e3dd4e6e752b31de3821..2152b00ff2429eafa3704b5e9b93c2b241ca9277 100644 (file)
--- a/resources/css/app.sass
+++ b/resources/css/app.sass
@@ -152,6 +152,9 @@ main
             @media (prefers-color-scheme: dark)
                 color: #fff
             font-size: 0.65em
+            font-weight: 300
+            position: relative
+            top: -6px
 
             &.order
                 font-size: 1em
@@ -159,7 +162,7 @@ main
 
     li
         list-style: none
-        height: 50px
+        height: 60px
         padding: 10px 14px
         background-color: #fff
 

diff --git a/resources/views/collection_song.blade.php b/resources/views/collection_song.blade.php
index 57eebffe833a3bc672018008fb8056b820e1f35e..75ac3f01bf32aab688aaaf95ee4c1e50d4a83760 100644 (file)
--- a/resources/views/collection_song.blade.php
+++ b/resources/views/collection_song.blade.php
@@ -3,5 +3,5 @@
 @endphp
 <li @if(!$csong->online) class="offline" @endif
 ><a href="/{{$collection->slug}}/{{$csong->slug}}.html">{{$csong->title}}
-        <span>{{$csong->artist}}</span></a>
+        <br><span>{{$csong->artist}}</span></a>
 </li>

diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index 9c22134b42eddf16dd8519b543a378d5b751966d..dc2857f491c60c60a459bb3a54e2f482f9ac49e7 100644 (file)
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -12,6 +12,9 @@
     <style>
         body {
             --theme-color: {{$collection->theme_color}};
+            @media (prefers-color-scheme: dark) {
+                --theme-color: {{$collection->theme_dark_color?:$collection->theme_color}};
+            }
             --plyr-color-main: {{$collection->theme_color}};
         }
     </style>
@@ -33,6 +36,7 @@
           content="default-src * 'self' data: gap: cdvfile: 'unsafe-eval' 'unsafe-inline' https: http: wss: ws:; style-src 'self' 'unsafe-inline'; img-src * filesystem: cdvfile: data:; media-src * blob:">
     <meta name="google" content="notranslate">
     <meta name="theme-color" content="{{$collection->theme_color}}">
+    <meta name="theme-dark-color" content="{{$collection->theme_dark_color}}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script>var THEME_COLOR = '{{$collection->theme_color}}';
         @if(isset($song))

diff --git a/resources/views/menu.blade.php b/resources/views/menu.blade.php
index fd77eb485a5ac45b25469e8d236ac0b844bc3933..31ab117bc05d488e1dbe76fc8689783629d0a257 100644 (file)
--- a/resources/views/menu.blade.php
+++ b/resources/views/menu.blade.php
@@ -31,13 +31,15 @@
                                 </ul>
                             </li>
                         @endforeach
-                        <li><span>🎵 {{__('Tous les morceaux')}}</span>
-                            <ul>
-                                @foreach($collection_songs as $csong)
-                                    @include('menu_song')
-                                @endforeach
-                            </ul>
-                        </li>
+                        @if(count($collection_lists)>0)
+                            <li><span>🎵 {{__('Tous les morceaux')}}</span>
+                                <ul>
+                                    @foreach($collection_songs as $csong)
+                                        @include('menu_song')
+                                    @endforeach
+                                </ul>
+                            </li>
+                        @endif
                     @endif
                 </ul>
             </li>