[modules] Prepare for front end - next stage

.docker/dev/supervisor/supervisord.conf

@@ -25,7 +25,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 port = 0.0.0.0:9001
 
 [include]
-files = /app/var/config/supervisor/*.conf
+files = /app/var/config/supervisor/*/*.conf
 
 ; SUPERVISORD PROGRAMS
 

composer.json

@@ -62,6 +62,7 @@
         "leigh/curve25519": "^0.1",
         "mangoweb/monolog-tracy-handler": "^1.0",
         "mathsolver/mathsolver": "@dev",
+        "nette/application": "^3.1",
         "nette/bootstrap": "^3.1",
         "nette/di": "^3.0",
         "nette/utils": "^3.2",

docker-compose.yml

@@ -29,7 +29,7 @@ services:
       - ./.docker/dev/php.ini:/etc/php/8.1/fpm/php.ini:delegated
       - ./.docker/dev/php.ini:/etc/php/8.1/cli/php.ini:delegated
     ports:
-      - "${HTTP_PORT:-8000}:80"
+      - "${HTTP_PORT:-8000}:8000"
       - "${WS_PORT:-8888}:8888"
       - "${WORKER_STATUS_PORT:-9001}:9001"
     networks:

public/index.php

@@ -4,7 +4,9 @@
 
 use Dotenv\Dotenv;
 use FastyBird\Library\Bootstrap\Boot;
-use FastyBird\Plugin\WebServer\Application;
+use FastyBird\Library\Metadata;
+use FastyBird\Plugin\WebServer\Application as WebServerApplication;
+use Nette\Application as NetteApplication;
 
 if (isset($_ENV['FB_APP_DIR'])) {
 	$vendorDir = realpath($_ENV['FB_APP_DIR'] . DIRECTORY_SEPARATOR . 'vendor');
@@ -37,10 +39,21 @@
 
 	$configurator = Boot\Bootstrap::boot();
 
-	$configurator
-		->createContainer()
-		->getByType(Application\Application::class)
-		->run();
+	$isApi = substr($_SERVER['REQUEST_URI'], 0, 4) === '/' . Metadata\Constants::ROUTER_API_PREFIX;
+
+	$container = $configurator->createContainer();
+
+	if ($isApi) {
+		// WebServer application
+		$container
+			->getByType(WebServerApplication\Application::class)
+			->run();
+	} else {
+		// Nette application
+		$container
+			->getByType(NetteApplication\Application::class)
+			->run();
+	}
 
 } else {
 	echo 'Composer autoload not found!';

src/FastyBird/Library/Metadata/src/Constants.php

@@ -32,6 +32,12 @@ final class Constants
 
 	public const EXCHANGE_CHANNEL_NAME = 'fb_exchange';
 
+	/**
+	 * Routing
+	 */
+
+	public const ROUTER_API_PREFIX = 'api';
+
 	/**
 	 * App sources
 	 */

src/FastyBird/Module/Accounts/docs/index.md

@@ -61,7 +61,7 @@ found [here](https://github.com/FastyBird/accounts-module/blob/main/config/examp
 This module is using database, and need some initial data to be inserted into it.
 
 ```sh
-your-console-entrypoint fb:accounts-module:initialize
+your-console-entrypoint fb:accounts-module:install
 ```
 
 This console command is interactive and will ask for all required information.

src/FastyBird/Module/Accounts/src/Commands/Accounts/Create.php

@@ -72,27 +72,27 @@ protected function configure(): void
 			->addArgument(
 				'lastName',
 				Input\InputArgument::OPTIONAL,
-				$this->translator->translate('//commands.accountCreate.inputs.lastName.title'),
+				$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.lastName.title'),
 			)
 			->addArgument(
 				'firstName',
 				Input\InputArgument::OPTIONAL,
-				$this->translator->translate('//commands.accountCreate.inputs.firstName.title'),
+				$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.firstName.title'),
 			)
 			->addArgument(
 				'email',
 				Input\InputArgument::OPTIONAL,
-				$this->translator->translate('//commands.accountCreate.inputs.email.title'),
+				$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.email.title'),
 			)
 			->addArgument(
 				'password',
 				Input\InputArgument::OPTIONAL,
-				$this->translator->translate('//commands.accountCreate.inputs.password.title'),
+				$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.password.title'),
 			)
 			->addArgument(
 				'role',
 				Input\InputArgument::OPTIONAL,
-				$this->translator->translate('//commands.accountCreate.inputs.role.title'),
+				$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.role.title'),
 			)
 			->addOption('noconfirm', null, Input\InputOption::VALUE_NONE, 'do not ask for any confirmation')
 			->addOption('injected', null, Input\InputOption::VALUE_NONE, 'do not show all outputs')
@@ -118,30 +118,30 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 			&& $input->getArgument('lastName') !== ''
 			 ? $input->getArgument('lastName')
 			: $io->ask(
-				$this->translator->translate('//commands.accountCreate.inputs.lastName.title'),
+				$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.lastName.title'),
 			);
 
 		$firstName = $input->hasArgument('firstName')
 			&& is_string($input->getArgument('firstName'))
 			&& $input->getArgument('firstName') !== ''
 			 ? $input->getArgument('firstName')
 			: $io->ask(
-				$this->translator->translate('//commands.accountCreate.inputs.firstName.title'),
+				$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.firstName.title'),
 			);
 
 		$emailAddress = $input->hasArgument('email')
 			&& is_string($input->getArgument('email'))
 			&& $input->getArgument('email') !== ''
 			 ? $input->getArgument('email')
 			: $io->ask(
-				$this->translator->translate('//commands.accountCreate.inputs.email.title'),
+				$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.email.title'),
 			);
 
 		do {
 			if (!Utils\Validators::isEmail(strval($emailAddress))) {
 				$io->error(
 					$this->translator->translate(
-						'//commands.accountCreate.validation.email.invalid',
+						'//accounts-module.cmd.accountCreate.validation.email.invalid',
 						['email' => $emailAddress],
 					),
 				);
@@ -155,15 +155,17 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 				if ($repeat) {
 					$io->error(
 						$this->translator->translate(
-							'//commands.accountCreate.validation.email.taken',
+							'//accounts-module.cmd.accountCreate.validation.email.taken',
 							['email' => $emailAddress],
 						),
 					);
 				}
 			}
 
 			if ($repeat) {
-				$emailAddress = $io->ask($this->translator->translate('//commands.accountCreate.inputs.email.title'));
+				$emailAddress = $io->ask(
+					$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.email.title'),
+				);
 			}
 		} while ($repeat);
 
@@ -187,12 +189,16 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 		} else {
 			do {
 				$roleName = $io->choice(
-					$this->translator->translate('//commands.accountCreate.inputs.role.title'),
+					$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.role.title'),
 					[
-						'U' => $this->translator->translate('//commands.accountCreate.inputs.role.values.user'),
-						'M' => $this->translator->translate('//commands.accountCreate.inputs.role.values.manager'),
+						'U' => $this->translator->translate(
+							'//accounts-module.cmd.accountCreate.inputs.role.values.user',
+						),
+						'M' => $this->translator->translate(
+							'//accounts-module.cmd.accountCreate.inputs.role.values.manager',
+						),
 						'A' => $this->translator->translate(
-							'//commands.accountCreate.inputs.role.values.administrator',
+							'//accounts-module.cmd.accountCreate.inputs.role.values.administrator',
 						),
 					],
 					'U',
@@ -263,7 +269,7 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 
 			$io->error(
 				$this->translator->translate(
-					'//commands.accountCreate.validation.account.wasNotCreated',
+					'//accounts-module.cmd.accountCreate.validation.account.wasNotCreated',
 					['error' => $ex->getMessage()],
 				),
 			);
@@ -276,13 +282,15 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 			&& $input->getArgument('password') !== ''
 			 ? $input->getArgument('password')
 			: $io->askHidden(
-				$this->translator->translate('//commands.accountCreate.inputs.password.title'),
+				$this->translator->translate('//accounts-module.cmd.accountCreate.inputs.password.title'),
 			);
 
 		$email = $account->getEmail();
 
 		if ($email === null) {
-			$io->warning($this->translator->translate('//commands.accountCreate.validation.identity.noEmail'));
+			$io->warning(
+				$this->translator->translate('//accounts-module.cmd.accountCreate.validation.identity.noEmail'),
+			);
 
 			return 0;
 		}
@@ -313,15 +321,20 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 
 			$io->error(
 				$this->translator->translate(
-					'//commands.accountCreate.validation.identity.wasNotCreated',
+					'//accounts-module.cmd.accountCreate.validation.identity.wasNotCreated',
 					['error' => $ex->getMessage()],
 				),
 			);
 
 			return $ex->getCode();
 		}
 
-		$io->success($this->translator->translate('//commands.accountCreate.success', ['name' => $account->getName()]));
+		$io->success(
+			$this->translator->translate(
+				'//accounts-module.cmd.accountCreate.success',
+				['name' => $account->getName()],
+			),
+		);
 
 		return 0;
 	}