rename routes

2023-05-02 00:02:38 +02:00 · 2023-05-02 00:02:38 +02:00 · b958a2f5b3
commit b958a2f5b3
parent 2da0ccb09b
14 changed files with 62 additions and 63 deletions
--- a/src/Controller/LoginController.php
+++ b/src/Controller/LoginController.php
@ -53,7 +53,7 @@ class LoginController
        $oAuth = new GoogleOAuth(new Request());
        $url = $oAuth->getDialogUrl(
            $state,
-            \Container::$request->getBase() . \Container::$routeCollection->getRoute('login-google-action')->generateLink(),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('login.google-action')->generateLink(),
            $nonce
        );

@ -106,7 +106,7 @@ class LoginController
            return new JsonContent([
                'error' => [
                    'errorText' => 'No user found with the given email address / username or the given password is wrong. You can <a href="' .
-                        \Container::$routeCollection->getRoute('password-requestReset')->generateLink(['email' => \Container::$request->post('email')]) . '" title="Request password reset">request password reset</a>!'
+                        \Container::$routeCollection->getRoute('password.requestReset')->generateLink(['email' => \Container::$request->post('email')]) . '" title="Request password reset">request password reset</a>!'
                ]
            ]);
        }
@ -119,7 +119,7 @@ class LoginController

    public function loginWithGoogle()
    {
-        $defaultError = 'Authentication with Google failed. Please <a href="' . \Container::$routeCollection->getRoute('login-google')->generateLink() . '" title="Login with Google">try again</a>!';
+        $defaultError = 'Authentication with Google failed. Please <a href="' . \Container::$routeCollection->getRoute('login.google')->generateLink() . '" title="Login with Google">try again</a>!';

        if (\Container::$request->user() !== null) {
            $this->deleteRedirectUrl();
@ -133,7 +133,7 @@ class LoginController
        $oAuth = new GoogleOAuth(new Request());
        $tokenData = $oAuth->getToken(
            \Container::$request->query('code'),
-            \Container::$request->getBase() . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('login.google-action')->generateLink()
        );

        if (!isset($tokenData['id_token'])) {
@ -246,7 +246,7 @@ class LoginController
        if ($resetter === null || $resetter->getExpiresDate() < new DateTime()) {
            return new JsonContent([
                'redirect' => [
-                    'target' => \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token])
+                    'target' => \Container::$routeCollection->getRoute('password.reset')->generateLink(['token' => $token])
                ]
            ]);
        }
@ -281,10 +281,10 @@ class LoginController
        $mail = new Mail();
        $mail->addRecipient($email);
        $mail->setSubject($_ENV['APP_NAME'] . ' - Password reset');
-        $mail->setBodyFromTemplate('password-reset', [
+        $mail->setBodyFromTemplate('password.reset', [
            'EMAIL' => $email,
            'RESET_LINK' => \Container::$request->getBase() .
-                \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token]),
+                \Container::$routeCollection->getRoute('password.reset')->generateLink(['token' => $token]),
            'EXPIRES' => $expires->format('Y-m-d H:i T')
        ]);
        $mail->send();
--- a/src/Controller/OAuthController.php
+++ b/src/Controller/OAuthController.php
@ -104,10 +104,10 @@ class OAuthController
    {
        return new JsonContent([
            'issuer' => $_ENV['APP_URL'],
-            'authorization_endpoint' => \Container::$request->getBase() . \Container::$routeCollection->getRoute('oauth-auth')->generateLink(),
-            'token_endpoint' => \Container::$request->getBase() . \Container::$routeCollection->getRoute('oauth-token')->generateLink(),
-            'userinfo_endpoint' => \Container::$request->getBase() . \Container::$routeCollection->getRoute('oauth-userinfo')->generateLink(),
-            'jwks_uri' => \Container::$request->getBase() . \Container::$routeCollection->getRoute('oauth-certs')->generateLink(),
+            'authorization_endpoint' => \Container::$request->getBase() . \Container::$routeCollection->getRoute('oauth.auth')->generateLink(),
+            'token_endpoint' => \Container::$request->getBase() . \Container::$routeCollection->getRoute('oauth.token')->generateLink(),
+            'userinfo_endpoint' => \Container::$request->getBase() . \Container::$routeCollection->getRoute('oauth.userinfo')->generateLink(),
+            'jwks_uri' => \Container::$request->getBase() . \Container::$routeCollection->getRoute('oauth.certs')->generateLink(),
            'response_types_supported' =>
            [
                'code',
--- a/views/communities/community.php
+++ b/views/communities/community.php
@ -4,7 +4,7 @@
    <h2>
        <?= $community->getName() ?>
        <?php if ($editPermission): ?>
-            <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-edit')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
+            <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community.edit')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
        <?php endif; ?>
    </h2>

--- a/views/communities/community_currencies.php
+++ b/views/communities/community_currencies.php
@ -18,8 +18,8 @@
            <?php foreach ($currencies as $currency): ?>
                <tr>
                    <td>
-                        <form id="editCurrency_<?= $currency->getId() ?>" action="<?= Container::$routeCollection->getRoute('community-currencies-edit')->generateLink(['communityId' => $community->getId(), 'currency_id' => $currency->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="code,round_digits"></form>
-                        <form id="deleteCurrency_<?= $currency->getId() ?>" action="<?= Container::$routeCollection->getRoute('community-currencies-delete')->generateLink(['communityId' => $community->getId(), 'currency_id' => $currency->getId()]) ?>" method="post" data-reload-on-success="true"></form>
+                        <form id="editCurrency_<?= $currency->getId() ?>" action="<?= Container::$routeCollection->getRoute('community.currencies.edit-action')->generateLink(['communityId' => $community->getId(), 'currency_id' => $currency->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="code,round_digits"></form>
+                        <form id="deleteCurrency_<?= $currency->getId() ?>" action="<?= Container::$routeCollection->getRoute('community.currencies.delete-action')->generateLink(['communityId' => $community->getId(), 'currency_id' => $currency->getId()]) ?>" method="post" data-reload-on-success="true"></form>
                        <input type="text" form="editCurrency_<?= $currency->getId() ?>" class="text fullWidth" name="code" value="<?= $currency->getCode() ?>" maxlength="3" required>
                    </td>
                    <td>
@ -35,7 +35,7 @@
            <?php endforeach; ?>
            <tr>
                <td>
-                    <form id="newCurrency" action="<?= Container::$routeCollection->getRoute('community-currencies-new')->generateLink(['communityId' => $community->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="code,round_digits"></form>
+                    <form id="newCurrency" action="<?= Container::$routeCollection->getRoute('community.currencies.new-action')->generateLink(['communityId' => $community->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="code,round_digits"></form>
                    <input type="text" form="newCurrency" class="text fullWidth" name="code" placeholder="Currency" maxlength="3" required>
                </td>
                <td>
--- a/views/communities/community_edit.php
+++ b/views/communities/community_edit.php
@ -12,8 +12,8 @@
    <div class="box compactBox">
        <?php
        $formAction = isset($community) ?
-            Container::$routeCollection->getRoute('community-edit-action')->generateLink(['communityId' => $community->getId()]) :
-            Container::$routeCollection->getRoute('community-new-action')->generateLink();
+            Container::$routeCollection->getRoute('community.edit-action')->generateLink(['communityId' => $community->getId()]) :
+            Container::$routeCollection->getRoute('community.new-action')->generateLink();
        ?>
        <form id="communityForm" action="<?= $formAction ?>" method="post" data-redirect-on-success="true">
            <input type="text" class="text big fullWidth" name="name" placeholder="Name" value="<?= isset($community) ? $community->getName() : '' ?>" required>
--- a/views/communities/community_members.php
+++ b/views/communities/community_members.php
@ -23,8 +23,8 @@
                <?php $editable = $member->getUserId() !== Container::$request->user()->getUniqueId(); ?>
                <tr>
                    <td>
-                        <form id="editMember_<?= $member->getId() ?>" action="<?= Container::$routeCollection->getRoute('community-members-edit')->generateLink(['communityId' => $community->getId(), 'community_member_id' => $member->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="owner"></form>
-                        <form id="deleteMember_<?= $member->getId() ?>" action="<?= Container::$routeCollection->getRoute('community-members-delete')->generateLink(['communityId' => $community->getId(), 'community_member_id' => $member->getId()]) ?>" method="post" data-reload-on-success="true"></form>
+                        <form id="editMember_<?= $member->getId() ?>" action="<?= Container::$routeCollection->getRoute('community.members.edit-action')->generateLink(['communityId' => $community->getId(), 'community_member_id' => $member->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="owner"></form>
+                        <form id="deleteMember_<?= $member->getId() ?>" action="<?= Container::$routeCollection->getRoute('community.members.delete-action')->generateLink(['communityId' => $community->getId(), 'community_member_id' => $member->getId()]) ?>" method="post" data-reload-on-success="true"></form>
                        <?= $member->getUser()->getDisplayName() ?>
                    </td>
                    <td style="text-align: center;">
@ -40,7 +40,7 @@
            <?php endforeach; ?>
            <tr>
                <td>
-                    <form id="newMember" action="<?= Container::$routeCollection->getRoute('community-members-new')->generateLink(['communityId' => $community->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="user_id"></form>
+                    <form id="newMember" action="<?= Container::$routeCollection->getRoute('community.members.new-action')->generateLink(['communityId' => $community->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="user_id"></form>
                    <select type="text" form="newMember" name="user_id">
                </td>
                <td style="text-align: center;">
--- a/views/communities/community_settings.php
+++ b/views/communities/community_settings.php
@ -11,7 +11,7 @@
            <h3 class="marginBottom">
                Members
                <?php if ($editPermission): ?>
-                    <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-members')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
+                    <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community.members')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
                <?php endif; ?>
            </h3>
            <?php foreach ($members as $member): ?>
@ -22,7 +22,7 @@
            <h3 class="marginBottom">
                Currencies
                <?php if ($editPermission): ?>
-                    <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-currencies')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
+                    <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community.currencies')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
                <?php endif; ?>
            </h3>
            <?php foreach ($currencies as $currency): ?>
@ -30,7 +30,7 @@
                    <?php if ($currency->getId() === $community->getMainCurrencyId()): ?>
                        <b><?= $currency->getCode() ?></b>
                    <?php else: ?>
-                        <a href="<?= Container::$routeCollection->getRoute('community-currency-exchange-rates')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode()]) ?>"><?= $currency->getCode() ?></a>
+                        <a href="<?= Container::$routeCollection->getRoute('community.currencyExchangeRates')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode()]) ?>"><?= $currency->getCode() ?></a>
                    <?php endif; ?>
                </p>
            <?php endforeach; ?>
--- a/views/communities/currency_exchange_rates.php
+++ b/views/communities/currency_exchange_rates.php
@ -24,8 +24,8 @@
                <tr>
                    <?php if ($editPermission): ?>
                        <td>
-                            <form id="editExchangeRate_<?= $currencyExchangeRate->getId() ?>" action="<?= Container::$routeCollection->getRoute('community-currency-exchange-rates-edit')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode(), 'currency_exchange_rate_id' => $currencyExchangeRate->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="exchange_rate,valid_from"></form>
-                            <form id="deleteCurrency_<?= $currencyExchangeRate->getId() ?>" action="<?= Container::$routeCollection->getRoute('community-currency-exchange-rates-delete')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode(), 'currency_exchange_rate_id' => $currencyExchangeRate->getId()]) ?>" method="post" data-reload-on-success="true"></form>
+                            <form id="editExchangeRate_<?= $currencyExchangeRate->getId() ?>" action="<?= Container::$routeCollection->getRoute('community.currencyExchangeRates.edit-action')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode(), 'currency_exchange_rate_id' => $currencyExchangeRate->getId()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="exchange_rate,valid_from"></form>
+                            <form id="deleteCurrency_<?= $currencyExchangeRate->getId() ?>" action="<?= Container::$routeCollection->getRoute('community.currencyExchangeRates.delete-action')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode(), 'currency_exchange_rate_id' => $currencyExchangeRate->getId()]) ?>" method="post" data-reload-on-success="true"></form>
                            <input type="number" form="editExchangeRate_<?= $currencyExchangeRate->getId() ?>" class="text fullWidth" name="exchange_rate" value="<?= $currencyExchangeRate->getExchangeRate() ?>" min="0" step="0.000000001" required>
                        </td>
                        <td>
@ -44,7 +44,7 @@
            <?php if ($editPermission): ?>
                <tr>
                    <td>
-                        <form id="newExchangeRate" action="<?= Container::$routeCollection->getRoute('community-currency-exchange-rates-new')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="exchange_rate,valid_from"></form>
+                        <form id="newExchangeRate" action="<?= Container::$routeCollection->getRoute('community.currencyExchangeRates.new-action')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="exchange_rate,valid_from"></form>
                        <input type="number" form="newExchangeRate" class="text fullWidth" name="exchange_rate" placeholder="Exchange rate" min="0" step="0.000000001" required>
                    </td>
                    <td>
--- a/views/communities/transaction_edit.php
+++ b/views/communities/transaction_edit.php
@ -47,7 +47,7 @@
            </div>
        </form>
        <?php if (isset($transaction)): ?>
-            <form id="deleteTransaction" action="<?= Container::$routeCollection->getRoute('community.transactions.delete')->generateLink(['communityId' => $community->getId(), 'transactionId' => $transaction->getId()]) ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId()]) ?>"></form>
+            <form id="deleteTransaction" action="<?= Container::$routeCollection->getRoute('community.transactions.delete-action')->generateLink(['communityId' => $community->getId(), 'transactionId' => $transaction->getId()]) ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId()]) ?>"></form>
        <?php endif; ?>
    </div>
@endsection
--- a/views/home.php
+++ b/views/home.php
@ -5,7 +5,7 @@
        <div>
            <h3 class="marginBottom">
                Communities
-                <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-new')->generateLink() ?>">new</a>]</span>
+                <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community.new')->generateLink() ?>">new</a>]</span>
            </h3>
            <?php if (count($communities) > 0): ?>
                <?php foreach ($communities as $community): ?>
--- a/views/login/login.php
+++ b/views/login/login.php
@ -10,10 +10,10 @@
            <div class="right marginTop">
                <button type="submit">Login</button>
            </div>
-            <p class="center marginTop"><a href="<?= Container::$routeCollection->getRoute('password-requestReset')->generateLink() ?>" title="Request password reset">Forgot your password?</a></p>
+            <p class="center marginTop"><a href="<?= Container::$routeCollection->getRoute('password.requestReset')->generateLink() ?>" title="Request password reset">Forgot your password?</a></p>
            <hr>
            <div class="center">
-                <a class="button yellow" href="<?= Container::$routeCollection->getRoute('login-google')->generateLink() ?>" title="Login with Google">Login with Google</a>
+                <a class="button yellow" href="<?= Container::$routeCollection->getRoute('login.google')->generateLink() ?>" title="Login with Google">Login with Google</a>
            </div>
        </form>
    </div>
--- a/views/login/password_reset_request.php
+++ b/views/login/password_reset_request.php
@ -5,7 +5,7 @@
@section(main)
    <h2>Request password reset</h2>
    <div class="box compactBox">
-        <form id="passwordResetForm" action="<?= Container::$routeCollection->getRoute('password-requestReset-action')->generateLink() ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('password-requestReset.success')->generateLink() ?>">
+        <form id="passwordResetForm" action="<?= Container::$routeCollection->getRoute('password.requestReset-action')->generateLink() ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('password.requestReset.success')->generateLink() ?>">
            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= isset($email) ? $email : '' ?>" required autofocus>
            <?php if (!empty($_ENV['RECAPTCHA_SITEKEY'])): ?>
                <div class="marginTop">
--- a/views/login/reset_password.php
+++ b/views/login/reset_password.php
@ -4,7 +4,7 @@
    <h2>Reset password</h2>
    <div class="box compactBox">
        <?php if ($success) : ?>
-            <form id="resetPasswordForm" action="<?= Container::$routeCollection->getRoute('password-reset.action')->generateLink(['token' => $token]) ?>"" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
+            <form id="resetPasswordForm" action="<?= Container::$routeCollection->getRoute('password.reset-action')->generateLink(['token' => $token]) ?>"" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
                <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6" autofocus>
                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" required minlength="6">
@ -14,7 +14,7 @@
                </div>
            </form>
        <?php else: ?>
-            <p class="error justify">Confirming your identity failed. Please check the link you entered, or retry <a href="<?= Container::$routeCollection->getRoute('password-requestReset')->generateLink() ?>" title="Request password reset">requesting password reset</a>!</p>
+            <p class="error justify">Confirming your identity failed. Please check the link you entered, or retry <a href="<?= Container::$routeCollection->getRoute('password.requestReset')->generateLink() ?>" title="Request password reset">requesting password reset</a>!</p>
        <?php endif; ?>
    </div>
@endsection
--- a/web.php
+++ b/web.php
@ -27,26 +27,25 @@ if (!empty($_ENV['DEV'])) {
 Container::$routeCollection = new RouteCollection();

 Container::$routeCollection->get('home', '', [HomeController::class, 'getHome']);
-Container::$routeCollection->get('startSession', 'startSession.json', [HomeController::class, 'startSession']);
 Container::$routeCollection->group('login', function (RouteCollection $routeCollection) {
    $routeCollection->get('login', '', [LoginController::class, 'getLoginForm']);
    $routeCollection->post('login-action', '', [LoginController::class, 'login']);
-    $routeCollection->get('login-google', 'google', [LoginController::class, 'getGoogleLoginRedirect']);
-    $routeCollection->get('login-google-action', 'google/code', [LoginController::class, 'loginWithGoogle']);
+    $routeCollection->get('login.google', 'google', [LoginController::class, 'getGoogleLoginRedirect']);
+    $routeCollection->get('login.google-action', 'google/code', [LoginController::class, 'loginWithGoogle']);
 });
 Container::$routeCollection->group('oauth', function (RouteCollection $routeCollection) {
-    $routeCollection->get('oauth-auth', 'auth', [OAuthAuthController::class, 'auth']);
-    $routeCollection->post('oauth-token', 'token', [OAuthController::class, 'getToken']);
-    $routeCollection->get('oauth-userinfo', 'userinfo', [OAuthController::class, 'getUserInfo']);
-    $routeCollection->get('oauth-config', '.well-known/openid-configuration', [OAuthController::class, 'getConfig']);
-    $routeCollection->get('oauth-certs', 'certs', [OAuthController::class, 'getCerts']);
+    $routeCollection->get('oauth.auth', 'auth', [OAuthAuthController::class, 'auth']);
+    $routeCollection->post('oauth.token', 'token', [OAuthController::class, 'getToken']);
+    $routeCollection->get('oauth.userinfo', 'userinfo', [OAuthController::class, 'getUserInfo']);
+    $routeCollection->get('oauth.config', '.well-known/openid-configuration', [OAuthController::class, 'getConfig']);
+    $routeCollection->get('oauth.certs', 'certs', [OAuthController::class, 'getCerts']);
 });
 Container::$routeCollection->group('password', function (RouteCollection $routeCollection) {
-    $routeCollection->get('password-requestReset', 'requestReset', [LoginController::class, 'getRequestPasswordResetForm']);
-    $routeCollection->post('password-requestReset-action', 'requestReset', [LoginController::class, 'requestPasswordReset']);
-    $routeCollection->get('password-requestReset.success', 'requestReset/success', [LoginController::class, 'getRequestPasswordResetSuccess']);
-    $routeCollection->get('password-reset', 'reset/{token}', [LoginController::class, 'getResetPasswordForm']);
-    $routeCollection->post('password-reset.action', 'reset/{token}', [LoginController::class, 'resetPassword']);
+    $routeCollection->get('password.requestReset', 'requestReset', [LoginController::class, 'getRequestPasswordResetForm']);
+    $routeCollection->post('password.requestReset-action', 'requestReset', [LoginController::class, 'requestPasswordReset']);
+    $routeCollection->get('password.requestReset.success', 'requestReset/success', [LoginController::class, 'getRequestPasswordResetSuccess']);
+    $routeCollection->get('password.reset', 'reset/{token}', [LoginController::class, 'getResetPasswordForm']);
+    $routeCollection->post('password.reset-action', 'reset/{token}', [LoginController::class, 'resetPassword']);
 });
 Container::$routeCollection->get('logout', 'logout', [LoginController::class, 'logout']);
 Container::$routeCollection->group('account', function (RouteCollection $routeCollection) {
@ -57,26 +56,26 @@ Container::$routeCollection->group('account', function (RouteCollection $routeCo
 });
 Container::$routeCollection->get('searchUser', 'searchUser', [UserSearchController::class, 'searchUser']);
 Container::$routeCollection->group('communities', function (RouteCollection $routeCollection) {
-    $routeCollection->get('community-new', 'new', [CommunityController::class, 'getCommunityNew']);
-    $routeCollection->post('community-new-action', 'new', [CommunityController::class, 'saveCommunity']);
+    $routeCollection->get('community.new', 'new', [CommunityController::class, 'getCommunityNew']);
+    $routeCollection->post('community.new-action', 'new', [CommunityController::class, 'saveCommunity']);
    $routeCollection->group('{communityId}', function (RouteCollection $routeCollection) {
        $routeCollection->get('community', '', [CommunityController::class, 'getCommunityHome']);
        $routeCollection->get('community.settings', 'settings', [CommunityController::class, 'getCommunitySettings']);
-        $routeCollection->get('community-edit', 'edit', [CommunityController::class, 'getCommunityEdit']);
-        $routeCollection->post('community-edit-action', 'edit', [CommunityController::class, 'saveCommunity']);
-        $routeCollection->get('community-members', 'members', [CommunityController::class, 'getMembersEdit']);
-        $routeCollection->post('community-members-new', 'newMember', [CommunityController::class, 'saveMember']);
-        $routeCollection->post('community-members-edit', 'editMember', [CommunityController::class, 'saveMember']);
-        $routeCollection->post('community-members-delete', 'deleteMember', [CommunityController::class, 'deleteMember']);
-        $routeCollection->get('community-currencies', 'currencies', [CommunityController::class, 'getCurrenciesEdit']);
-        $routeCollection->post('community-currencies-new', 'newCurrency', [CommunityController::class, 'saveCurrency']);
-        $routeCollection->post('community-currencies-edit', 'editCurrency', [CommunityController::class, 'saveCurrency']);
-        $routeCollection->post('community-currencies-delete', 'deleteCurrency', [CommunityController::class, 'deleteCurrency']);
+        $routeCollection->get('community.edit', 'edit', [CommunityController::class, 'getCommunityEdit']);
+        $routeCollection->post('community.edit-action', 'edit', [CommunityController::class, 'saveCommunity']);
+        $routeCollection->get('community.members', 'members', [CommunityController::class, 'getMembersEdit']);
+        $routeCollection->post('community.members.new-action', 'members/new', [CommunityController::class, 'saveMember']);
+        $routeCollection->post('community.members.edit-action', 'members/edit', [CommunityController::class, 'saveMember']);
+        $routeCollection->post('community.members.delete-action', 'members/delete', [CommunityController::class, 'deleteMember']);
+        $routeCollection->get('community.currencies', 'currencies', [CommunityController::class, 'getCurrenciesEdit']);
+        $routeCollection->post('community.currencies.new-action', 'currencies/new', [CommunityController::class, 'saveCurrency']);
+        $routeCollection->post('community.currencies.edit-action', 'currencies/edit', [CommunityController::class, 'saveCurrency']);
+        $routeCollection->post('community.currencies.delete-action', 'currencies/delete', [CommunityController::class, 'deleteCurrency']);
        $routeCollection->group('currencyExchangeRates', function (RouteCollection $routeCollection) {
-            $routeCollection->get('community-currency-exchange-rates', '{code}', [CommunityController::class, 'getCurrencyExchangeRates']);
-            $routeCollection->post('community-currency-exchange-rates-new', '{code}/new', [CommunityController::class, 'saveCurrencyExchangeRate']);
-            $routeCollection->post('community-currency-exchange-rates-edit', '{code}/edit', [CommunityController::class, 'saveCurrencyExchangeRate']);
-            $routeCollection->post('community-currency-exchange-rates-delete', '{code}/delete', [CommunityController::class, 'deleteCurrencyExchangeRate']);
+            $routeCollection->get('community.currencyExchangeRates', '{code}', [CommunityController::class, 'getCurrencyExchangeRates']);
+            $routeCollection->post('community.currencyExchangeRates.new-action', '{code}/new', [CommunityController::class, 'saveCurrencyExchangeRate']);
+            $routeCollection->post('community.currencyExchangeRates.edit-action', '{code}/edit', [CommunityController::class, 'saveCurrencyExchangeRate']);
+            $routeCollection->post('community.currencyExchangeRates.delete-action', '{code}/delete', [CommunityController::class, 'deleteCurrencyExchangeRate']);
        });
        $routeCollection->group('transactions', function (RouteCollection $routeCollection) {
            $routeCollection->get('community.transactions', '', [TransactionController::class, 'getTransactions']);
@ -84,7 +83,7 @@ Container::$routeCollection->group('communities', function (RouteCollection $rou
            $routeCollection->post('community.transactions.new-action', 'new', [TransactionController::class, 'saveTransaction']);
            $routeCollection->get('community.transactions.edit', '{transactionId}', [TransactionController::class, 'getTransactionEdit']);
            $routeCollection->post('community.transactions.edit-action', '{transactionId}', [TransactionController::class, 'saveTransaction']);
-            $routeCollection->post('community.transactions.delete', '{transactionId}/delete', [TransactionController::class, 'deleteTransaction']);
+            $routeCollection->post('community.transactions.delete-action', '{transactionId}/delete', [TransactionController::class, 'deleteTransaction']);
        });
    });
 });