diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d71483e..7d97e6f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,9 +36,4 @@ jobs: context: . file: ./docker/apache/Dockerfile push: true - tags: ghcr.io/${{ github.repository_owner }}/mcserverwebsite:latest - - - name: Déclenche le redéploiement Portainer - run: | - curl -s -X POST "${{ secrets.PORTAINER_WEBHOOK_URL }}" - # PORTAINER_WEBHOOK_URL est un secret GitHub (voir étapes d'installation) + tags: ghcr.io/${{ github.repository_owner }}/mcserverwebsite:latest \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore index 2372b9f..abd0fcf 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -22,3 +22,5 @@ /src/uploads /public/uploads + +secrets diff --git a/app/assets/images/background/bg-dark.avif b/app/assets/images/background/bg-dark.avif new file mode 100644 index 0000000..46044ff Binary files /dev/null and b/app/assets/images/background/bg-dark.avif differ diff --git a/app/assets/images/background/bg-dark.webp b/app/assets/images/background/bg-dark.webp new file mode 100644 index 0000000..14b64c0 Binary files /dev/null and b/app/assets/images/background/bg-dark.webp differ diff --git a/app/assets/images/background/bg-light.avif b/app/assets/images/background/bg-light.avif new file mode 100644 index 0000000..8d193b1 Binary files /dev/null and b/app/assets/images/background/bg-light.avif differ diff --git a/app/assets/images/background/bg-light.webp b/app/assets/images/background/bg-light.webp new file mode 100644 index 0000000..6bacec2 Binary files /dev/null and b/app/assets/images/background/bg-light.webp differ diff --git a/app/assets/images/bg-dark.png b/app/assets/images/bg-dark.png deleted file mode 100644 index 03f3974..0000000 Binary files a/app/assets/images/bg-dark.png and /dev/null differ diff --git a/app/assets/images/bg-light.png b/app/assets/images/bg-light.png deleted file mode 100644 index 5f0013d..0000000 Binary files a/app/assets/images/bg-light.png and /dev/null differ diff --git a/app/assets/images/logo/favicon.svg b/app/assets/images/logo/favicon.svg new file mode 100644 index 0000000..3281bc1 --- /dev/null +++ b/app/assets/images/logo/favicon.svg @@ -0,0 +1,74 @@ + + + Ploush — icone + + + + + + + + + + + + diff --git a/app/assets/images/logo-dark.svg b/app/assets/images/logo/logo-dark.svg similarity index 100% rename from app/assets/images/logo-dark.svg rename to app/assets/images/logo/logo-dark.svg diff --git a/app/assets/images/logo-light.svg b/app/assets/images/logo/logo-light.svg similarity index 100% rename from app/assets/images/logo-light.svg rename to app/assets/images/logo/logo-light.svg diff --git a/app/assets/styles/app.css b/app/assets/styles/app.css index b5715c9..6e5864a 100644 --- a/app/assets/styles/app.css +++ b/app/assets/styles/app.css @@ -56,7 +56,7 @@ html, body { } body { - background-image: url('../images/bg-light.png'); + background-image: url('../images/background/bg-light.avif'); background-size: cover; background-position: center; background-attachment: fixed; @@ -68,7 +68,16 @@ body { } [data-theme="dark"] body { - background-image: url('../images/bg-dark.png'); + background-image: url('../images/background/bg-dark.webp'); +} + +@supports not (background-image: url('../images/background/bg-light.avif')) { + body { + background-image: url('../images/background/bg-light.webp'); + } + [data-theme="dark"] body { + background-image: url('../images/background/bg-dark.webp'); + } } main { diff --git a/app/templates/base.html.twig b/app/templates/base.html.twig index b8439df..8600879 100644 --- a/app/templates/base.html.twig +++ b/app/templates/base.html.twig @@ -3,7 +3,7 @@ {% block title %}Ploush{% endblock %} - + {# Anti-flash - DOIT être avant tout le reste #} @@ -32,9 +32,7 @@ {# id="page-body" + data-bg pour le changement de fond #} - + {% include 'partials/_header.html.twig' %}
diff --git a/app/templates/partials/_header.html.twig b/app/templates/partials/_header.html.twig index 73e6521..3d9bd38 100644 --- a/app/templates/partials/_header.html.twig +++ b/app/templates/partials/_header.html.twig @@ -11,8 +11,8 @@