Merge branch 'main' into ddd_test

assets/controllers/activity_controller.js

@@ -30,8 +30,8 @@ export default class extends Controller {
     }
 
 
-    const mercureHubUrl = 'https://localhost/.well-known/mercure';
+    const mercureHubUrl = 'https://mangarr.test.nestor-server.fr/.well-known/mercure';
-    const eventSource = new EventSource(`${mercureHubUrl}?topic=activity`);
+    const eventSource = new EventSource(`${mercureHubUrl}?topic=activity`, {withCredentials: true});
 
     eventSource.onmessage = (event) => {
       const data = JSON.parse(event.data);

assets/controllers/chapter_progress_controller.js

@@ -11,8 +11,8 @@ export default class extends Controller {
     this.currentPage = 0;
     this.totalPages = 0;
 
-    const mercureHubUrl = 'https://localhost/.well-known/mercure';
+    const mercureHubUrl = 'https://mangarr.test.nestor-server.fr/.well-known/mercure';
-    this.eventSource = new EventSource(`${mercureHubUrl}?topic=activity`);
+    this.eventSource = new EventSource(`${mercureHubUrl}?topic=activity`, {withCredentials: true});
 
     this.eventSource.onmessage = this.handleMessage.bind(this);
   }

assets/controllers/mercure_controller.js

@@ -9,8 +9,8 @@ export default class extends Controller {
   // ...
   connect() {
     const topic = this.data.get('topic');
-    const mercureHubUrl = 'https://localhost/.well-known/mercure';
+    const mercureHubUrl = 'https://mangarr.test.nestor-server.fr/.well-known/mercure';
-    const eventSource = new EventSource(`${mercureHubUrl}?topic=${topic}`);
+    const eventSource = new EventSource(`${mercureHubUrl}?topic=${topic}`, {withCredentials: true});
 
     eventSource.onmessage = (event) => {
       const data = JSON.parse(event.data);

composer.json

@@ -105,6 +105,7 @@
     },
     "require-dev": {
         "dbrekelmans/bdi": "^1.3",
+        "deployer/deployer": "^7.5",
         "doctrine/doctrine-fixtures-bundle": "^3.5",
         "friendsofphp/php-cs-fixer": "^3.48",
         "mtdowling/jmespath.php": "^2.7",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b4e296cfb0a526abcac95fe791a98dc7",
+    "content-hash": "6258706876617c8b0c08f13c5a158fe7",
     "packages": [
         {
             "name": "api-platform/core",
@@ -9244,6 +9244,60 @@
             },
             "time": "2024-02-22T15:29:35+00:00"
         },
+        {
+            "name": "deployer/deployer",
+            "version": "v7.5.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/deployphp/deployer.git",
+                "reference": "4900fe799ce5566d54a14103cdfd6e865b7c5d72"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/deployphp/deployer/zipball/4900fe799ce5566d54a14103cdfd6e865b7c5d72",
+                "reference": "4900fe799ce5566d54a14103cdfd6e865b7c5d72",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^8.0|^7.3"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.64",
+                "pestphp/pest": "^3.3",
+                "phpstan/phpstan": "^1.4",
+                "phpunit/php-code-coverage": "^11.0",
+                "phpunit/phpunit": "^11.4"
+            },
+            "bin": [
+                "bin/dep"
+            ],
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anton Medvedev",
+                    "email": "anton@medv.io"
+                }
+            ],
+            "description": "Deployment Tool",
+            "homepage": "https://deployer.org",
+            "support": {
+                "docs": "https://deployer.org/docs",
+                "issues": "https://github.com/deployphp/deployer/issues",
+                "source": "https://github.com/deployphp/deployer"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/antonmedv",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-11-27T21:35:20+00:00"
+        },
         {
             "name": "doctrine/data-fixtures",
             "version": "1.7.0",
@@ -11998,7 +12052,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
@@ -12009,6 +12063,6 @@
         "ext-iconv": "*",
         "ext-zip": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }

src/Manager/FileSystemManager.php

@@ -52,7 +52,7 @@ class FileSystemManager
     public function createMangaDirectory(string $mangaSlug, ?int $year): string
     {
         $year = $year ?? 'unknown';
-        $directoryPath = $this->mangaDirectory.'/'.ucfirst($mangaSlug)." ($year)";
+        $directoryPath = $this->projectDir.'/'.self::CBZ_DIRECTORY.'/'.ucfirst($mangaSlug)." ($year)";
         $this->filesystem->mkdir($directoryPath, 0755);
 
         return $directoryPath;