From c6bd6ba54940d2e3659cab48d1430703ee5164fb Mon Sep 17 00:00:00 2001 From: "ext.jeremy.guillot@maxicoffee.domains" Date: Sat, 1 Feb 2025 18:16:46 +0100 Subject: [PATCH 1/6] fix: mercureUrl for prod --- assets/controllers/activity_controller.js | 2 +- assets/controllers/chapter_progress_controller.js | 2 +- assets/controllers/mercure_controller.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/controllers/activity_controller.js b/assets/controllers/activity_controller.js index 981a7ea..1193686 100644 --- a/assets/controllers/activity_controller.js +++ b/assets/controllers/activity_controller.js @@ -30,7 +30,7 @@ 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`); eventSource.onmessage = (event) => { diff --git a/assets/controllers/chapter_progress_controller.js b/assets/controllers/chapter_progress_controller.js index 0481c11..c8d4414 100644 --- a/assets/controllers/chapter_progress_controller.js +++ b/assets/controllers/chapter_progress_controller.js @@ -11,7 +11,7 @@ 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.onmessage = this.handleMessage.bind(this); diff --git a/assets/controllers/mercure_controller.js b/assets/controllers/mercure_controller.js index e9befcf..860f8c9 100644 --- a/assets/controllers/mercure_controller.js +++ b/assets/controllers/mercure_controller.js @@ -9,7 +9,7 @@ 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}`); eventSource.onmessage = (event) => { From d62907a38c56003ae51b0d520dc45c7ee755eb78 Mon Sep 17 00:00:00 2001 From: "ext.jeremy.guillot@maxicoffee.domains" Date: Sat, 1 Feb 2025 18:40:59 +0100 Subject: [PATCH 2/6] fix: mercureUrl for prod --- assets/controllers/activity_controller.js | 2 +- assets/controllers/chapter_progress_controller.js | 2 +- assets/controllers/mercure_controller.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/controllers/activity_controller.js b/assets/controllers/activity_controller.js index 1193686..94b65e7 100644 --- a/assets/controllers/activity_controller.js +++ b/assets/controllers/activity_controller.js @@ -30,7 +30,7 @@ export default class extends Controller { } - const mercureHubUrl = 'https://mangarr.test.nestor-server.fr/.well-known/mercure'; + const mercureHubUrl = 'https://mercure.test.nestor-server.fr/.well-known/mercure'; const eventSource = new EventSource(`${mercureHubUrl}?topic=activity`); eventSource.onmessage = (event) => { diff --git a/assets/controllers/chapter_progress_controller.js b/assets/controllers/chapter_progress_controller.js index c8d4414..0c951b8 100644 --- a/assets/controllers/chapter_progress_controller.js +++ b/assets/controllers/chapter_progress_controller.js @@ -11,7 +11,7 @@ export default class extends Controller { this.currentPage = 0; this.totalPages = 0; - const mercureHubUrl = 'https://mangarr.test.nestor-server.fr/.well-known/mercure'; + const mercureHubUrl = 'https://mercure.test.nestor-server.fr/.well-known/mercure'; this.eventSource = new EventSource(`${mercureHubUrl}?topic=activity`); this.eventSource.onmessage = this.handleMessage.bind(this); diff --git a/assets/controllers/mercure_controller.js b/assets/controllers/mercure_controller.js index 860f8c9..64812b6 100644 --- a/assets/controllers/mercure_controller.js +++ b/assets/controllers/mercure_controller.js @@ -9,7 +9,7 @@ export default class extends Controller { // ... connect() { const topic = this.data.get('topic'); - const mercureHubUrl = 'https://mangarr.test.nestor-server.fr/.well-known/mercure'; + const mercureHubUrl = 'https://mercure.test.nestor-server.fr/.well-known/mercure'; const eventSource = new EventSource(`${mercureHubUrl}?topic=${topic}`); eventSource.onmessage = (event) => { From 59cf4cd3c13fb5978dfac28f389b3ebe63dc5ae6 Mon Sep 17 00:00:00 2001 From: "ext.jeremy.guillot@maxicoffee.domains" Date: Sat, 1 Feb 2025 18:53:27 +0100 Subject: [PATCH 3/6] fix: mercureUrl for prod --- assets/controllers/activity_controller.js | 2 +- assets/controllers/chapter_progress_controller.js | 2 +- assets/controllers/mercure_controller.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/controllers/activity_controller.js b/assets/controllers/activity_controller.js index 94b65e7..1193686 100644 --- a/assets/controllers/activity_controller.js +++ b/assets/controllers/activity_controller.js @@ -30,7 +30,7 @@ export default class extends Controller { } - const mercureHubUrl = 'https://mercure.test.nestor-server.fr/.well-known/mercure'; + const mercureHubUrl = 'https://mangarr.test.nestor-server.fr/.well-known/mercure'; const eventSource = new EventSource(`${mercureHubUrl}?topic=activity`); eventSource.onmessage = (event) => { diff --git a/assets/controllers/chapter_progress_controller.js b/assets/controllers/chapter_progress_controller.js index 0c951b8..c8d4414 100644 --- a/assets/controllers/chapter_progress_controller.js +++ b/assets/controllers/chapter_progress_controller.js @@ -11,7 +11,7 @@ export default class extends Controller { this.currentPage = 0; this.totalPages = 0; - const mercureHubUrl = 'https://mercure.test.nestor-server.fr/.well-known/mercure'; + const mercureHubUrl = 'https://mangarr.test.nestor-server.fr/.well-known/mercure'; this.eventSource = new EventSource(`${mercureHubUrl}?topic=activity`); this.eventSource.onmessage = this.handleMessage.bind(this); diff --git a/assets/controllers/mercure_controller.js b/assets/controllers/mercure_controller.js index 64812b6..860f8c9 100644 --- a/assets/controllers/mercure_controller.js +++ b/assets/controllers/mercure_controller.js @@ -9,7 +9,7 @@ export default class extends Controller { // ... connect() { const topic = this.data.get('topic'); - const mercureHubUrl = 'https://mercure.test.nestor-server.fr/.well-known/mercure'; + const mercureHubUrl = 'https://mangarr.test.nestor-server.fr/.well-known/mercure'; const eventSource = new EventSource(`${mercureHubUrl}?topic=${topic}`); eventSource.onmessage = (event) => { From 447f1fbe846ffdf006981c3395fe327714e23962 Mon Sep 17 00:00:00 2001 From: "ext.jeremy.guillot@maxicoffee.domains" Date: Sat, 1 Feb 2025 19:08:50 +0100 Subject: [PATCH 4/6] fix: mercure credentials for prod --- assets/controllers/activity_controller.js | 2 +- assets/controllers/chapter_progress_controller.js | 2 +- assets/controllers/mercure_controller.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/controllers/activity_controller.js b/assets/controllers/activity_controller.js index 1193686..259a8f7 100644 --- a/assets/controllers/activity_controller.js +++ b/assets/controllers/activity_controller.js @@ -31,7 +31,7 @@ export default class extends Controller { 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); diff --git a/assets/controllers/chapter_progress_controller.js b/assets/controllers/chapter_progress_controller.js index c8d4414..76b9d7a 100644 --- a/assets/controllers/chapter_progress_controller.js +++ b/assets/controllers/chapter_progress_controller.js @@ -12,7 +12,7 @@ export default class extends Controller { this.totalPages = 0; 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); } diff --git a/assets/controllers/mercure_controller.js b/assets/controllers/mercure_controller.js index 860f8c9..27983fb 100644 --- a/assets/controllers/mercure_controller.js +++ b/assets/controllers/mercure_controller.js @@ -10,7 +10,7 @@ export default class extends Controller { connect() { const topic = this.data.get('topic'); 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); From 9318d0a9a077a9bb5132e24c35f56b0483316c98 Mon Sep 17 00:00:00 2001 From: "ext.jeremy.guillot@maxicoffee.domains" Date: Sat, 1 Feb 2025 22:41:41 +0100 Subject: [PATCH 5/6] fix: cbz path is now in public/cbz --- src/Manager/FileSystemManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Manager/FileSystemManager.php b/src/Manager/FileSystemManager.php index 16de11d..df11a6d 100644 --- a/src/Manager/FileSystemManager.php +++ b/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; From 0482ec9f7f37637b83de7c89082283b4495405fe Mon Sep 17 00:00:00 2001 From: "ext.jeremy.guillot@maxicoffee.domains" Date: Sun, 2 Feb 2025 18:05:08 +0100 Subject: [PATCH 6/6] fix: listening on port 8081 + deployer --- compose.yaml | 2 +- composer.json | 1 + composer.lock | 60 ++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 59 insertions(+), 4 deletions(-) diff --git a/compose.yaml b/compose.yaml index f5e815a..d109c66 100644 --- a/compose.yaml +++ b/compose.yaml @@ -25,7 +25,7 @@ services: ports: # HTTP - target: 80 - published: ${HTTP_PORT:-80} + published: ${HTTP_PORT:-8081} protocol: tcp # HTTPS - target: 443 diff --git a/composer.json b/composer.json index 8b12956..416f248 100644 --- a/composer.json +++ b/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", diff --git a/composer.lock b/composer.lock index fe35cc4..17101f5 100644 --- a/composer.lock +++ b/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" }