diff --git a/public/static/style.css b/public/static/style.css index 39b8f80..4fd2214 100644 --- a/public/static/style.css +++ b/public/static/style.css @@ -31,6 +31,7 @@ nav { nav ul { display: flex; + margin: -1px 0 0 0; padding: 0 1.5em; border: 0; border-bottom: 1px solid #000000; diff --git a/src/Dependencies.php b/src/Dependencies.php index 9f2e901..ac6fbb4 100644 --- a/src/Dependencies.php +++ b/src/Dependencies.php @@ -5,6 +5,8 @@ namespace MailAccountAdmin; use DI\Container; use MailAccountAdmin\Common\UserHelper; +use MailAccountAdmin\Frontend\Accounts\AccountController; +use MailAccountAdmin\Frontend\Domains\DomainController; use MailAccountAdmin\Frontend\Login\LoginController; use MailAccountAdmin\Frontend\Dashboard\DashboardController; use MailAccountAdmin\Repositories\AdminUserRepository; @@ -64,7 +66,7 @@ class Dependencies ); }); - // Login page + // Frontend controllers $container->set(LoginController::class, function (ContainerInterface $c) { return new LoginController( $c->get(self::TWIG), @@ -72,14 +74,24 @@ class Dependencies $c->get(AdminUserRepository::class), ); }); - - // Dashboard $container->set(DashboardController::class, function (ContainerInterface $c) { return new DashboardController( $c->get(self::TWIG), $c->get(UserHelper::class), ); }); + $container->set(DomainController::class, function (ContainerInterface $c) { + return new DomainController( + $c->get(self::TWIG), + $c->get(UserHelper::class), + ); + }); + $container->set(AccountController::class, function (ContainerInterface $c) { + return new AccountController( + $c->get(self::TWIG), + $c->get(UserHelper::class), + ); + }); return $container; } diff --git a/src/Frontend/Accounts/AccountController.php b/src/Frontend/Accounts/AccountController.php new file mode 100644 index 0000000..d948371 --- /dev/null +++ b/src/Frontend/Accounts/AccountController.php @@ -0,0 +1,19 @@ +view->render($response, 'accounts.html.twig', $renderData); + } +} diff --git a/src/Frontend/Dashboard/DashboardController.php b/src/Frontend/Dashboard/DashboardController.php index 7538686..9e9717e 100644 --- a/src/Frontend/Dashboard/DashboardController.php +++ b/src/Frontend/Dashboard/DashboardController.php @@ -11,13 +11,6 @@ class DashboardController extends BaseController { public function showDashboard(Request $request, Response $response): Response { - $currentUser = $this->userHelper->getCurrentUser(); - - $renderData = [ - 'username' => $currentUser->getUsername(), - 'user' => $currentUser, - ]; - - return $this->view->render($response, 'dashboard.html.twig', $renderData); + return $this->view->render($response, 'dashboard.html.twig'); } } diff --git a/src/Frontend/Domains/DomainController.php b/src/Frontend/Domains/DomainController.php new file mode 100644 index 0000000..172e25f --- /dev/null +++ b/src/Frontend/Domains/DomainController.php @@ -0,0 +1,19 @@ +view->render($response, 'domains.html.twig', $renderData); + } +} diff --git a/src/Routes.php b/src/Routes.php index a90372f..03e0b4a 100644 --- a/src/Routes.php +++ b/src/Routes.php @@ -3,7 +3,9 @@ declare(strict_types=1); namespace MailAccountAdmin; +use MailAccountAdmin\Frontend\Accounts\AccountController; use MailAccountAdmin\Frontend\Dashboard\DashboardController; +use MailAccountAdmin\Frontend\Domains\DomainController; use MailAccountAdmin\Frontend\Login\LoginController; use Slim\App; @@ -18,5 +20,13 @@ class Routes // Dashboard $app->get('/', DashboardController::class . ':showDashboard'); + + // Domains + $app->get('/domains', DomainController::class . ':showDomains'); + $app->get('/domains/{foo}', DomainController::class . ':showDomains'); + + // Accounts + $app->get('/accounts', AccountController::class . ':showAccounts'); + $app->get('/accounts/{foo}', AccountController::class . ':showAccounts'); } } diff --git a/templates/accounts.html.twig b/templates/accounts.html.twig new file mode 100644 index 0000000..ecfaddd --- /dev/null +++ b/templates/accounts.html.twig @@ -0,0 +1,10 @@ +{% extends "base.html.twig" %} + +{% block title %}Accounts{% endblock %} + +{% block content %} +

Accounts

+ +

List of accounts ... TODO

+

Test

+{% endblock %} diff --git a/templates/base.html.twig b/templates/base.html.twig index fde124d..852e9ff 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -18,9 +18,15 @@ diff --git a/templates/dashboard.html.twig b/templates/dashboard.html.twig index 2a6f139..36ee56f 100644 --- a/templates/dashboard.html.twig +++ b/templates/dashboard.html.twig @@ -5,5 +5,5 @@ {% block content %}

Dashboard

-

Hello, {{ username }}!

+

Hello, {{ current_user_name }}!

{% endblock %} diff --git a/templates/domains.html.twig b/templates/domains.html.twig new file mode 100644 index 0000000..6ac7814 --- /dev/null +++ b/templates/domains.html.twig @@ -0,0 +1,10 @@ +{% extends "base.html.twig" %} + +{% block title %}Domains{% endblock %} + +{% block content %} +

Domains

+ +

List of domains ... TODO

+

Test

+{% endblock %}