Merge pull request 'feature/RVRNEXT-34-use-text-labels-instead-of-placeholders-in-forms' (!47) from feature/RVRNEXT-34-use-text-labels-instead-of-placeholders-in-forms into master

Reviewed-on: #47

app.php

@@ -15,9 +15,13 @@ $dotenv->load();
 class Container
 {
     static SokoWeb\Interfaces\Database\IConnection $dbConnection;
-    static SokoWeb\Routing\RouteCollection $routeCollection;
-    static SokoWeb\Interfaces\Session\ISessionHandler $sessionHandler;
-    static SokoWeb\Interfaces\Request\IRequest $request;
+    static SokoWeb\Interfaces\Database\IAuditLogger $auditLogger;
+    static SokoWeb\Interfaces\PersistentData\IPersistentDataManager $persistentDataManager;
+    static ?SokoWeb\Interfaces\Routing\IRouteCollection $routeCollection = null;
+    static ?SokoWeb\Interfaces\Session\ISessionHandler $sessionHandler = null;
+    static ?SokoWeb\Interfaces\Request\IRequest $request = null;
 }
 
 Container::$dbConnection = new SokoWeb\Database\Mysql\Connection($_ENV['DB_HOST'], $_ENV['DB_USER'], $_ENV['DB_PASSWORD'], $_ENV['DB_NAME']);
+Container::$auditLogger = new RVR\Database\AuditLogger(Container::$dbConnection, 'audit_log');
+Container::$persistentDataManager = new SokoWeb\PersistentData\PersistentDataManager(Container::$dbConnection, Container::$auditLogger);

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "esoko/soko-web": "0.4",
+    "esoko/soko-web": "0.10",
     "firebase/php-jwt": "^6.4"
   },
   "require-dev": {

composer.lock

@@ -4,15 +4,15 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f7786e07bcb0373560ae67549fa28f0b",
+    "content-hash": "607b383c44826c6307dd79b0362ca320",
     "packages": [
         {
             "name": "esoko/soko-web",
-            "version": "v0.4",
+            "version": "0.10",
             "source": {
                 "type": "git",
                 "url": "https://git.esoko.eu/esoko/soko-web.git",
-                "reference": "948b36c80d324e07339a543d97b9e629487f3a45"
+                "reference": "fd286c9cffadc4a26609bfa00944f8014a2f3f59"
             },
             "require": {
                 "phpmailer/phpmailer": "^6.8",
@@ -33,7 +33,7 @@
                 "GNU GPL 3.0"
             ],
             "description": "Lightweight web framework",
-            "time": "2023-04-16T18:52:06+00:00"
+            "time": "2023-05-02T10:55:47+00:00"
         },
         {
             "name": "firebase/php-jwt",

database/migrations/data/20230428_1826_community_main_currency.php

@@ -0,0 +1,19 @@
+<?php
+
+use RVR\PersistentData\Model\Community;
+use RVR\PersistentData\Model\Currency;
+use SokoWeb\Database\Query\Select;
+
+$select = new Select(Container::$dbConnection);
+$communities = Container::$persistentDataManager->selectMultipleFromDb($select, Community::class);
+
+foreach ($communities as $community) {
+    $mainCurrency = new Currency();
+    $mainCurrency->setCommunity($community);
+    $mainCurrency->setCode($community->getCurrency());
+    $mainCurrency->setRoundDigits(0);
+    Container::$persistentDataManager->saveToDb($mainCurrency);
+
+    $community->setMainCurrency($mainCurrency);
+    Container::$persistentDataManager->saveToDb($community);
+}

database/migrations/structure/20230417_0158_audit_log.sql

@@ -0,0 +1,12 @@
+CREATE TABLE `audit_log` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `local_table` varchar(255) NOT NULL,
+  `local_id` int(10) unsigned NOT NULL,
+  `type` enum('insert','update','delete') NOT NULL,
+  `date` timestamp NOT NULL DEFAULT current_timestamp(),
+  `modifier_id` int(10) unsigned NULL,
+  `column` varchar(255) NULL,
+  `old` text NULL,
+  `new` text NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

database/migrations/structure/20230421_2234_currencies.sql

@@ -0,0 +1,10 @@
+CREATE TABLE `currencies` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `community_id` int(10) unsigned NOT NULL,
+  `code` varchar(3) NOT NULL,
+  `round_digits` tinyint(1) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique_currency_for_community` (`community_id`, `code`),
+  KEY `community_id` (`community_id`),
+  CONSTRAINT `currencies_community_id` FOREIGN KEY (`community_id`) REFERENCES `communities` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20230423_2022_currency_exchange_rates.sql

@@ -0,0 +1,10 @@
+CREATE TABLE `currency_exchange_rates` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `currency_id` int(10) unsigned NOT NULL,
+  `exchange_rate` decimal(19,9) unsigned NOT NULL,
+  `valid_from` timestamp NOT NULL DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `currency_id` (`currency_id`),
+  INDEX `valid_from` (`valid_from`),
+  CONSTRAINT `currency_exchange_rates_currency_id` FOREIGN KEY (`currency_id`) REFERENCES `currencies` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20230428_1826_community_main_currency.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `communities`
+ADD `main_currency_id` int(10) unsigned DEFAULT NULL,
+ADD KEY `main_currency_id` (`main_currency_id`),
+ADD CONSTRAINT `communities_main_currency_id` FOREIGN KEY (`main_currency_id`) REFERENCES `currencies` (`id`);

database/migrations/structure/20230428_2150_transactions.sql

@@ -0,0 +1,19 @@
+CREATE TABLE `transactions` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `community_id` int(10) unsigned NOT NULL,
+  `currency_id` int(10) unsigned NOT NULL,
+  `payer_user_id` int(10) unsigned NOT NULL,
+  `payee_user_id` int(10) unsigned NULL,
+  `description` varchar(255) NOT NULL,
+  `sum` decimal(19,9) NOT NULL,
+  `time` timestamp NOT NULL DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `community_id` (`community_id`),
+  KEY `currency_id` (`currency_id`),
+  KEY `payer_user_id` (`payer_user_id`),
+  KEY `payee_user_id` (`payee_user_id`),
+  CONSTRAINT `transactions_community_id` FOREIGN KEY (`community_id`) REFERENCES `communities` (`id`),
+  CONSTRAINT `transactions_currency_id` FOREIGN KEY (`currency_id`) REFERENCES `currencies` (`id`),
+  CONSTRAINT `transactions_payer_user_id` FOREIGN KEY (`payer_user_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `transactions_payee_user_id` FOREIGN KEY (`payee_user_id`) REFERENCES `users` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

public/static/css/rvr.css

@@ -31,6 +31,10 @@ main {
     color: #ffffff;
 }
 
+::placeholder, select > option[value=""], .gray {
+    color: #8e8e8e;
+}
+
 p, h1, h2, h3, input, textarea, select, button, a, table, label {
     font-family: 'Oxygen', sans-serif;
 }
@@ -63,7 +67,7 @@ p, h2, h3 {
     line-height: 150%;
 }
 
-p {
+p, th, td {
     font-weight: 400;
     font-size: 16px;
 }
@@ -100,10 +104,23 @@ hr {
     font-weight: 700;
 }
 
-p.small, span.small {
+p.small, span.small, td.small {
     font-size: 14px;
 }
 
+.red {
+    color: #a80908;
+}
+
+.green {
+    color: #008000;
+}
+
+.mono {
+    font-family: 'Oxygen Mono', mono;
+    font-weight: 400;
+}
+
 .justify {
     text-align: justify;
 }
@@ -113,7 +130,7 @@ p.small, span.small {
 }
 
 .marginLeft {
-    margin-left: 10px;
+    margin-left: 5px;
 }
 
 .marginBottom {
@@ -121,7 +138,7 @@ p.small, span.small {
 }
 
 .marginRight {
-    margin-right: 10px;
+    margin-right: 5px;
 }
 
 .center {
@@ -150,6 +167,12 @@ a:hover, a:focus {
     text-decoration: underline;
 }
 
+a.block {
+    color: initial;
+    font-weight: initial;
+    text-decoration: initial;
+}
+
 button, a.button {
     cursor: pointer;
     font-size: 16px;
@@ -215,6 +238,7 @@ button.noRightRadius, a.button.noRightRadius {
 
 button.gray, a.button.gray {
     background-color: #808080;
+    color: #ffffff;
 }
 
 button.gray:enabled:hover, button.gray:enabled:focus, a.button.gray:hover, a.button.gray:focus {
@@ -223,6 +247,7 @@ button.gray:enabled:hover, button.gray:enabled:focus, a.button.gray:hover, a.but
 
 button.red, a.button.red {
     background-color: #aa5e5e;
+    color: #ffffff;
 }
 
 button.red:enabled:hover, button.red:enabled:focus, a.button.red:hover, a.button.red:focus {
@@ -421,7 +446,6 @@ div.buttonContainer>button {
 }
 
 div.box {
-    width: 576px;
     background-color: #eeeef4;
     border-radius: 3px;
     margin: 10px auto;
@@ -429,6 +453,15 @@ div.box {
     box-sizing: border-box;
 }
 
+div.compactBox {
+    width: 576px;
+}
+
+div.transaction {
+    display: grid;
+    grid-template-columns: auto auto;
+}
+
 div.gridContainer {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, 1fr));
@@ -451,16 +484,53 @@ table.fullWidth {
 }
 
 table th {
-    font-weight: bold;
+    font-weight: 700;
 }
 
 table th, table td {
-    padding: 2px 0;
+    padding: 3px 0;
     vertical-align: middle;
 }
 
-.choices__inner {
-    box-sizing: border-box;
+table th:not(:first-child), table td:not(:first-child) {
+    padding-left: 3px;
+}
+
+table th:not(:last-child), table td:not(:last-child) {
+    padding-right: 3px;
+}
+
+p.paginateContainer {
+    font-size: 0;
+}
+
+p.paginateContainer > * {
+    font-size: initial;
+    background-color: #5e77aa;
+    border: solid #5e77aa 1px;
+    color: #ffffff;
+    font-weight: 700;
+    padding: 3px 6px;
+    text-align: center;
+    display: inline-block;
+    height: 25px;
+    line-height: 25px;
+    width: 25px;
+}
+
+p.paginateContainer > a:hover, p.paginateContainer > .selected {
+    background-color: #3b5998;
+    border: solid #29457f 1px;
+    text-decoration: none;
+}
+
+p.paginateContainer > *:not(:last-child) {
+    border-right: solid #869ab9 1px;
+}
+
+p.formLabel {
+    font-weight: 700;
+    font-size: 14px;
 }
 
 @media screen and (max-width: 424px) {
@@ -477,6 +547,7 @@ table th, table td {
         margin-top: 4px;
     }
     button, a.button {
+        margin: 3px 0;
         padding: 0;
         width: 100%;
     }
@@ -492,7 +563,7 @@ table th, table td {
         padding-left: 15px;
         padding-right: 15px;
     }
-    div.box {
+    div.compactBox {
         width: initial;
     }
 }

public/static/js/communities/community_members.js

@@ -1,62 +1,30 @@
 (function () {
-    const element = document.getElementById('new_member_user_id');
-    const choices = new Choices(element, {
-        noResultsText: 'No users found',
-        noChoicesText: 'Start typing to search users'
+    const element = document.getElementById('newMember').elements['user_id'];
+    const select = new TomSelect(element, {
+        valueField: 'value',
+        labelField: 'label',
+        searchField: 'label',
+        loadThrottle: 300,
+        load: function (query, callback) {
+            var self = this;
+            RVR.httpRequest('GET', searchUserUrl.replace('QUERY', encodeURIComponent(query)), function () {
+                self.clearOptions();
+                callback(this.response.results);
+            });
+        },
     });
 
-    element.addEventListener('search', RVR.debounce(async function (e) {
-        RVR.httpRequest('GET', searchUserUrl.replace('QUERY', encodeURIComponent(e.detail.value)), function () {
-            choices.setChoices(this.response.results, 'value', 'label', true);
-        });
-    }));
-
-    element.addEventListener('choice', function () {
-        choices.setChoices([], 'value', 'label', true);
-        document.getElementById('new_member_button').disabled = false;
+    select.on('change', function (value) {
+        this.clearOptions();
     });
 
-    document.getElementById('new_member_button').addEventListener('click', function () {
-        document.getElementById('loading').style.visibility = 'visible';
-
-        let data = new FormData();
-        data.append('user_id', document.getElementById('new_member_user_id').value);
-
-        RVR.httpRequest('POST', newMemberUrl, function () {
-            window.location.reload();
-        }, data);
+    select.on('blur', function (value) {
+        this.clearOptions();
     });
 
-    const ownerCheckboxesButtons = document.getElementsByClassName('member_owner');
-    for (const ownerCheckboxesButton of ownerCheckboxesButtons) {
-        ownerCheckboxesButton.addEventListener('change', function () {
-            document.getElementById('loading').style.visibility = 'visible';
-
-            let data = new FormData();
-            data.append('community_member_id', this.dataset.id);
-            data.append('owner', this.checked ? 1 : 0);
-
-            RVR.httpRequest('POST', editMemberUrl, function () {
-                document.getElementById('loading').style.visibility = 'hidden';
-
-                if (!this.response.success) {
-                    ownerCheckboxesButton.checked = !ownerCheckboxesButton.checked;
+    select.on('type', function (value) {
+        if (value === '') {
+            this.clearOptions();
         }
-            }, data);
     });
-    };
-
-    const deleteButtons = document.getElementsByClassName('delete_member');
-    for (const deleteButton of deleteButtons) {
-        deleteButton.addEventListener('click', function () {
-            document.getElementById('loading').style.visibility = 'visible';
-
-            let data = new FormData();
-            data.append('community_member_id', this.dataset.id);
-
-            RVR.httpRequest('POST', deleteMemberUrl, function () {
-                window.location.reload();
-            }, data);
-        });
-    };
 })();

public/static/js/rvr.js

@@ -49,7 +49,7 @@ var RVR = {
             document.getElementById('loading').style.visibility = 'visible';
 
             var formData = new FormData(form);
-            var formError = form.getElementsByClassName('formError')[0];
+            var formError = document.getElementsByClassName('formError')[0];
             var pageLeaveOnSuccess = form.dataset.redirectOnSuccess || form.dataset.reloadOnSuccess;
 
             RVR.httpRequest('POST', form.action, function () {
@@ -88,6 +88,28 @@ var RVR = {
         }
     },
 
+    setOnclickForFormConfirmation: function (button) {
+        button.onclick = function(e) {
+            e.preventDefault();
+
+            var self = this;
+
+            RVR.showModalWithContent('Confirmation', this.dataset.confirmation, [
+                {
+                    type: 'button',
+                    text: self.textContent,
+                    classNames: ['red'],
+                    onclick: function() {
+                        var event = new Event('submit', {'bubbles': true, 'cancelable': true});
+                        self.form.dispatchEvent(event);
+
+                        RVR.hideModal();
+                    }
+                }
+            ]);
+        };
+    },
+
     showModal: function (id) {
         document.getElementById(id).style.visibility = 'visible';
         document.getElementById('cover').style.visibility = 'visible';
@@ -163,12 +185,18 @@ var RVR = {
 
         for (var i = 0; i < observedInputs.length; i++) {
             var input = form.elements[observedInputs[i]];
+            if (input.type === 'checkbox') {
+                if (input.defaultChecked !== input.checked) {
+                    anyChanged = true;
+                }
+            } else {
                 if (input.defaultValue !== input.value) {
                     anyChanged = true;
                 }
             }
+        }
 
-        form.elements.submit.disabled = !anyChanged;
+        form.elements['submit_button'].disabled = !anyChanged;
     },
 
     observeInputsInForm: function (form, observedInputs) {
@@ -191,7 +219,7 @@ var RVR = {
         }
 
         form.onreset = function () {
-            form.elements.submit.disabled = true;
+            form.elements['submit_button'].disabled = true;
         }
     },
 
@@ -228,6 +256,10 @@ var RVR = {
         if (form.dataset.observeInputs) {
             RVR.observeInputsInForm(form, form.dataset.observeInputs.split(','));
         }
+
+        if (form.elements['submit_button'] && form.elements['submit_button'].dataset.confirmation) {
+            RVR.setOnclickForFormConfirmation(form.elements['submit_button']);
+        }
     }
 
     document.getElementById('cover').onclick = function () {

public/static/package-lock.json

@@ -2,33 +2,18 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
-    "@babel/runtime": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
-      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
+    "@orchidjs/sifter": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@orchidjs/sifter/-/sifter-1.0.3.tgz",
+      "integrity": "sha512-zCZbwKegHytfsPm8Amcfh7v/4vHqTAaOu6xFswBYcn8nznBOuseu6COB2ON7ez0tFV0mKL0nRNnCiZZA+lU9/g==",
       "requires": {
-        "regenerator-runtime": "^0.13.11"
+        "@orchidjs/unicode-variants": "^1.0.4"
       }
     },
-    "choices.js": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/choices.js/-/choices.js-10.2.0.tgz",
-      "integrity": "sha512-8PKy6wq7BMjNwDTZwr3+Zry6G2+opJaAJDDA/j3yxvqSCnvkKe7ZIFfIyOhoc7htIWFhsfzF9tJpGUATcpUtPg==",
-      "requires": {
-        "deepmerge": "^4.2.2",
-        "fuse.js": "^6.6.2",
-        "redux": "^4.2.0"
-      }
-    },
-    "deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
-    },
-    "fuse.js": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz",
-      "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA=="
+    "@orchidjs/unicode-variants": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@orchidjs/unicode-variants/-/unicode-variants-1.0.4.tgz",
+      "integrity": "sha512-NvVBRnZNE+dugiXERFsET1JlKZfM5lJDEpSMilKW4bToYJ7pxf0Zne78xyXB2ny2c2aHfJ6WLnz1AaTNHAmQeQ=="
     },
     "leaflet": {
       "version": "1.9.3",
@@ -40,18 +25,14 @@
       "resolved": "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz",
       "integrity": "sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA=="
     },
-    "redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+    "tom-select": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tom-select/-/tom-select-2.2.2.tgz",
+      "integrity": "sha512-igGah1yY6yhrnN2h/Ky8I5muw/nE/YQxIsEZoYu5qaA4bsRibvKto3s8QZZosKpOd0uO8fNYhRfAwgHB4IAYew==",
       "requires": {
-        "@babel/runtime": "^7.9.2"
+        "@orchidjs/sifter": "^1.0.3",
+        "@orchidjs/unicode-variants": "^1.0.4"
       }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     }
   }
 }

public/static/package.json

@@ -2,6 +2,6 @@
   "dependencies": {
     "leaflet": "^1.6.0",
     "leaflet.markercluster": "^1.4.1",
-    "choices.js": "^10.2.0"
+    "tom-select": "^2.2.2"
   }
 }

scripts/gitHooks/prepare-commit-msg

@@ -7,7 +7,7 @@ if [[ "${BRANCH_NAME}" =~ $BRANCH_PATTERN ]]; then
     TICKET_ID=$(echo $BRANCH_NAME | sed -E "s@$BRANCH_PATTERN@\\2@")
 
     COMMIT_MESSAGE=$(head -n 1 $1)
-    COMMIT_MESSAGE_REGEX="^$TICKET_ID .*"
+    COMMIT_MESSAGE_REGEX="^(fixup! )?$TICKET_ID .*"
 
     if [[ ! "${COMMIT_MESSAGE}" =~ $COMMIT_MESSAGE_REGEX ]]; then
         sed -i.bak -e "1s/^/$TICKET_ID /" $1

src/Cli/AddOAuthClientCommand.php

@@ -1,7 +1,6 @@
 <?php namespace RVR\Cli;
 
 use DateTime;
-use SokoWeb\PersistentData\PersistentDataManager;
 use RVR\PersistentData\Model\OAuthClient;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -33,8 +32,7 @@ class AddOAuthClientCommand extends Command
         }
 
         try {
-            $pdm = new PersistentDataManager();
-            $pdm->saveToDb($oAuthClient);
+            \Container::$persistentDataManager->saveToDb($oAuthClient);
         } catch (\Exception $e) {
             $output->writeln('<error>Adding OAuth client failed!</error>');
             $output->writeln('');

src/Cli/AddOAuthRedirectUriCommand.php

@@ -1,6 +1,5 @@
 <?php namespace RVR\Cli;
 
-use SokoWeb\PersistentData\PersistentDataManager;
 use RVR\Repository\OAuthClientRepository;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -32,8 +31,7 @@ class AddOAuthRedirectUriCommand extends Command
         $oAuthClient->setRedirectUrisArray($redirectUris);
 
         try {
-            $pdm = new PersistentDataManager();
-            $pdm->saveToDb($oAuthClient);
+            \Container::$persistentDataManager->saveToDb($oAuthClient);
         } catch (\Exception $e) {
             $output->writeln('<error>Adding redirect URI failed!</error>');
             $output->writeln('');

src/Cli/AddUserCommand.php

@@ -1,7 +1,6 @@
 <?php namespace RVR\Cli;
 
 use DateTime;
-use SokoWeb\PersistentData\PersistentDataManager;
 use RVR\PersistentData\Model\User;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -36,8 +35,7 @@ class AddUserCommand extends Command
         }
 
         try {
-            $pdm = new PersistentDataManager();
-            $pdm->saveToDb($user);
+            \Container::$persistentDataManager->saveToDb($user);
         } catch (\Exception $e) {
             $output->writeln('<error>Adding user failed!</error>');
             $output->writeln('');

src/Cli/MaintainDatabaseCommand.php

@@ -4,7 +4,6 @@ use DateTime;
 use SokoWeb\Database\Query\Modify;
 use SokoWeb\Database\Query\Select;
 use SokoWeb\Interfaces\Database\IResultSet;
-use SokoWeb\PersistentData\PersistentDataManager;
 use RVR\Repository\UserPasswordResetterRepository;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -12,15 +11,12 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class MaintainDatabaseCommand extends Command
 {
-    private PersistentDataManager $pdm;
-
     private UserPasswordResetterRepository $userPasswordResetterRepository;
 
     public function __construct()
     {
         parent::__construct();
 
-        $this->pdm = new PersistentDataManager();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
     }
 
@@ -54,7 +50,7 @@ class MaintainDatabaseCommand extends Command
     private function deleteExpiredPasswordResetters(): void
     {
         foreach ($this->userPasswordResetterRepository->getAllExpired() as $passwordResetter) {
-            $this->pdm->deleteFromDb($passwordResetter);
+            \Container::$persistentDataManager->deleteFromDb($passwordResetter);
         }
     }
 

src/Cli/RemoveOAuthRedirectUriCommand.php

@@ -1,6 +1,5 @@
 <?php namespace RVR\Cli;
 
-use SokoWeb\PersistentData\PersistentDataManager;
 use RVR\Repository\OAuthClientRepository;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -32,8 +31,7 @@ class RemoveOAuthRedirectUriCommand extends Command
         $oAuthClient->setRedirectUrisArray($redirectUris);
 
         try {
-            $pdm = new PersistentDataManager();
-            $pdm->saveToDb($oAuthClient);
+            \Container::$persistentDataManager->saveToDb($oAuthClient);
         } catch (\Exception $e) {
             $output->writeln('<error>Removing redirect URI failed!</error>');
             $output->writeln('');

src/Controller/CommunityController.php

@@ -1,38 +1,45 @@
 <?php namespace RVR\Controller;
 
 use DateTime;
+use RVR\Finance\BalanceCalculator;
 use RVR\PersistentData\Model\Community;
 use RVR\PersistentData\Model\CommunityMember;
+use RVR\PersistentData\Model\Currency;
+use RVR\PersistentData\Model\CurrencyExchangeRate;
 use RVR\PersistentData\Model\User;
 use RVR\Repository\CommunityRepository;
 use RVR\Repository\CommunityMemberRepository;
+use RVR\Repository\CurrencyExchangeRateRepository;
+use RVR\Repository\CurrencyRepository;
+use RVR\Repository\TransactionRepository;
 use RVR\Repository\UserRepository;
 use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
-use SokoWeb\PersistentData\PersistentDataManager;
 use SokoWeb\Response\HtmlContent;
 use SokoWeb\Response\JsonContent;
 
 class CommunityController implements IAuthenticationRequired
 {
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private UserRepository $userRepository;
 
     private CommunityRepository $communityRepository;
 
     private CommunityMemberRepository $communityMemberRepository;
 
-    public function __construct(IRequest $request)
+    private CurrencyRepository $currencyRepository;
+
+    private CurrencyExchangeRateRepository $currencyExchangeRatesRepository;
+
+    private TransactionRepository $transactionRepository;
+
+    public function __construct()
     {
-        $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->userRepository = new UserRepository();
         $this->communityRepository = new CommunityRepository();
         $this->communityMemberRepository = new CommunityMemberRepository();
+        $this->currencyRepository = new CurrencyRepository();
+        $this->currencyExchangeRatesRepository = new CurrencyExchangeRateRepository();
+        $this->transactionRepository = new TransactionRepository();
     }
 
     public function isAuthenticationRequired(): bool
@@ -42,15 +49,52 @@ class CommunityController implements IAuthenticationRequired
 
     public function getCommunityHome(): ?IContent
     {
-        if (!$this->checkPermission($this->request->query('communityId'), false, $community, $ownCommunityMember)) {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), false, $community, $ownCommunityMember)) {
             return null;
         }
 
+        \Container::$persistentDataManager->loadRelationsFromDb($community, false, ['main_currency']);
+
+        $balanceCalculator = new BalanceCalculator($community);
+        $debts = $balanceCalculator->calculate();
+        $debtItems = [];
+        $debtBalance = 0.0;
+        $outstandingItems = [];
+        $outstandingBalance = 0.0;
+        foreach ($debts as $debt) {
+            if ($debt['payer']->getId() === \Container::$request->user()->getUniqueId()) {
+                $debtBalance += $debt['amount'];
+                $debtItems[] = $debt;
+            }
+            if ($debt['payee']->getId() === \Container::$request->user()->getUniqueId()) {
+                $outstandingBalance += $debt['amount'];
+                $outstandingItems[] = $debt;
+            }
+        }
+        $balance = $outstandingBalance - $debtBalance;
+
         return new HtmlContent('communities/community', [
             'community' => $community,
-            'members' => $this->getMembers($community),
-            'currencyNames' => [],
             'upcomingEvents' => [],
+            'debtItems' => $debtItems,
+            'debtBalance' => $debtBalance,
+            'outstandingItems' => $outstandingItems,
+            'outstandingBalance' => $outstandingBalance,
+            'balance' => $balance,
+            'editPermission' => $ownCommunityMember->getOwner()
+        ]);
+    }
+
+    public function getCommunitySettings(): ?IContent
+    {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), false, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        return new HtmlContent('communities/community_settings', [
+            'community' => $community,
+            'members' => $this->getMembers($community),
+            'currencies' => $this->getCurrencies($community),
             'editPermission' => $ownCommunityMember->getOwner()
         ]);
     }
@@ -62,7 +106,7 @@ class CommunityController implements IAuthenticationRequired
 
     public function getCommunityEdit(): ?IContent
     {
-        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
             return null;
         }
 
@@ -71,9 +115,66 @@ class CommunityController implements IAuthenticationRequired
         ]);
     }
 
+    public function saveCommunity(): ?IContent
+    {
+        $name = \Container::$request->post('name');
+        if (strlen($name) === 0) {
+            return new JsonContent([
+                'error' => ['errorText' => 'Please fill all required fields!']
+            ]);
+        }
+
+        $communityId = \Container::$request->query('communityId');
+        if ($communityId){
+            if (!$this->checkPermission($communityId, true, $community, $ownCommunityMember)) {
+                return null;
+            }
+        } else {
+            $mainCurrencyCode = \Container::$request->post('main_currency_code');
+            $mainCurrencyRoundDigits = \Container::$request->post('main_currency_round_digits');
+            if (strlen($mainCurrencyCode) === 0 || strlen($mainCurrencyCode) > 3 || $mainCurrencyRoundDigits < 0 || $mainCurrencyRoundDigits > 9) {
+                return new JsonContent([
+                    'error' => ['errorText' => 'Please fill all required fields!']
+                ]);
+            }
+
+            $community = new Community();
+            $community->setCreatedDate(new DateTime());
+        }
+
+        $community->setName($name);
+        \Container::$persistentDataManager->saveToDb($community);
+
+        if (!$communityId) {
+            /**
+            * @var User $user
+            */
+            $user = \Container::$request->user();
+
+            $communityMember = new CommunityMember();
+            $communityMember->setCommunity($community);
+            $communityMember->setUser($user);
+            $communityMember->setOwner(true);
+            \Container::$persistentDataManager->saveToDb($communityMember);
+
+            $mainCurrency = new Currency();
+            $mainCurrency->setCommunity($community);
+            $mainCurrency->setCode($mainCurrencyCode);
+            $mainCurrency->setRoundDigits($mainCurrencyRoundDigits);
+            \Container::$persistentDataManager->saveToDb($mainCurrency);
+
+            $community->setMainCurrency($mainCurrency);
+            \Container::$persistentDataManager->saveToDb($community);
+        }
+
+        return new JsonContent([
+            'redirect' => ['target' => \Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()])]
+        ]);
+    }
+
     public function getMembersEdit(): ?IContent
     {
-        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
             return null;
         }
 
@@ -83,113 +184,236 @@ class CommunityController implements IAuthenticationRequired
         ]);
     }
 
-    private function getMembers(Community $community): array
+    public function saveMember(): ?IContent
     {
-        $members = iterator_to_array($this->communityMemberRepository->getAllByCommunity($community, true));
-        usort($members, function($a, $b) {
-            return strnatcmp($a->getUser()->getDisplayName(), $b->getUser()->getDisplayName());
-        });
-        return $members;
-    }
-
-
-    public function newMember(): ?IContent
-    {
-        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
             return null;
         }
 
-        $user = $this->userRepository->getById($this->request->post('user_id'));
-
-        $communityMember = new CommunityMember();
-        $communityMember->setCommunity($community);
-        $communityMember->setUser($user);
-        $this->pdm->saveToDb($communityMember);
-
-        return new JsonContent(['success' => true]);
-    }
-
-    public function editMember(): ?IContent
-    {
-        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
-            return null;
-        }
-
-        $communityMember = $this->communityMemberRepository->getById($this->request->post('community_member_id'));
-        if ($communityMember->getUserId() === $this->request->user()->getUniqueId()) {
+        $communityMemberId = \Container::$request->query('community_member_id');
+        if ($communityMemberId) {
+            $communityMember = $this->communityMemberRepository->getById($communityMemberId);
+            if ($communityMember->getUserId() === $ownCommunityMember->getUserId()) {
                 return new JsonContent([
                     'error' => ['errorText' => 'Own user cannot be edited.']
                 ]);
             }
+        } else {
+            if ($this->transactionRepository->isAnyCommon()) {
+                return new JsonContent([
+                    'error' => ['errorText' => 'There are transactions with common payee!']
+                ]);
+            }
 
-        $communityMember->setOwner($this->request->post('owner'));
-        $this->pdm->saveToDb($communityMember);
+            $user = $this->userRepository->getById(\Container::$request->post('user_id'));
+            if ($this->communityMemberRepository->getByCommunityAndUser($community, $user) !== null) {
+                return new JsonContent([
+                    'error' => ['errorText' => 'This user is already a member of this community.']
+                ]);
+            }
+
+            $communityMember = new CommunityMember();
+            $communityMember->setCommunity($community);
+            $communityMember->setUser($user);
+        }
+
+        $communityMember->setOwner((bool)\Container::$request->post('owner'));
+        \Container::$persistentDataManager->saveToDb($communityMember);
 
         return new JsonContent(['success' => true]);
     }
 
     public function deleteMember(): ?IContent
     {
-        if (!$this->checkPermission($this->request->query('communityId'), true, $community, $ownCommunityMember)) {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
             return null;
         }
 
-        $communityMember = $this->communityMemberRepository->getById($this->request->post('community_member_id'));
-        if ($communityMember->getUserId() === $this->request->user()->getUniqueId()) {
+        $communityMember = $this->communityMemberRepository->getById(\Container::$request->query('community_member_id'));
+        if ($communityMember->getUserId() === \Container::$request->user()->getUniqueId()) {
             return new JsonContent([
                 'error' => ['errorText' => 'Own user cannot be deleted.']
             ]);
         }
 
-        $this->pdm->deleteFromDb($communityMember);
+        \Container::$persistentDataManager->loadRelationsFromDb($communityMember, false, ['user']);
+        if ($this->transactionRepository->isAnyForUser($communityMember->getUser())) {
+            return new JsonContent([
+                'error' => ['errorText' => 'There are transactions where the member is payer or payee!']
+            ]);
+        }
+
+        \Container::$persistentDataManager->deleteFromDb($communityMember);
 
         return new JsonContent(['success' => true]);
     }
 
-    public function saveCommunity(): ?IContent
+    public function getCurrenciesEdit(): ?IContent
     {
-        $communityId = $this->request->query('communityId');
-        if ($communityId){
-            if (!$this->checkPermission($communityId, true, $community, $ownCommunityMember)) {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
             return null;
         }
-        } else {
-            $community = new Community();
+
+        return new HtmlContent('communities/community_currencies', [
+            'community' => $community,
+            'currencies' => $this->getCurrencies($community)
+        ]);
     }
 
-        $name = $this->request->post('name');
-        $currency = $this->request->post('currency');
-        if (strlen($name) === 0 || strlen($currency) === 0 || strlen($currency) > 3) {
+    public function saveCurrency(): ?IContent
+    {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        $code = \Container::$request->post('code');
+        $roundDigits = (int)\Container::$request->post('round_digits');
+        if (strlen($code) === 0 || strlen($code) > 3 || $roundDigits < 0 || $roundDigits > 9) {
             return new JsonContent([
                 'error' => ['errorText' => 'Please fill all required fields!']
             ]);
         }
 
-        $community->setName($name);
-        $community->setCurrency($currency);
-        if (!$communityId) {
-            $community->setCreatedDate(new DateTime());
-        }
-        $this->pdm->saveToDb($community);
-
-        if (!$communityId) {
-            /**
-            * @var User $user
-            */
-            $user = $this->request->user();
-
-            $communityMember = new CommunityMember();
-            $communityMember->setCommunity($community);
-            $communityMember->setUser($user);
-            $communityMember->setOwner(true);
-            $this->pdm->saveToDb($communityMember);
+        $currencyId = \Container::$request->query('currency_id');
+        if ($currencyId){
+            $currency = $this->currencyRepository->getById($currencyId);
+        } else {
+            $currency = new Currency();
+            $currency->setCommunity($community);
         }
 
+        $existingCurrency = $this->currencyRepository->getByCommunityAndCurrencyCode($community, $code);
+        if ($existingCurrency !== null && $currency->getId() !== $existingCurrency->getId()) {
             return new JsonContent([
-            'redirect' => ['target' => \Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()])]
+                'error' => ['errorText' => 'A currency with the same code exists for this community.']
             ]);
         }
 
+        $currency->setCode($code);
+        $currency->setRoundDigits($roundDigits);
+        \Container::$persistentDataManager->saveToDb($currency);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function deleteCurrency(): ?IContent
+    {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        $currency = $this->currencyRepository->getById(\Container::$request->query('currency_id'));
+        if ($currency->getId() === $community->getMainCurrencyId()) {
+            return null;
+        }
+
+        if ($this->transactionRepository->isAnyForCurrency($currency)) {
+            return new JsonContent([
+                'error' => ['errorText' => 'There are transactions with this currency!']
+            ]);
+        }
+
+        foreach ($this->currencyExchangeRatesRepository->getAllByCurrency($currency) as $currencyExchangeRate) {
+            \Container::$persistentDataManager->deleteFromDb($currencyExchangeRate);
+        }
+
+        \Container::$persistentDataManager->deleteFromDb($currency);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function getCurrencyExchangeRates(): ?IContent
+    {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        $currency = $this->currencyRepository->getByCommunityAndCurrencyCode($community, \Container::$request->query('code'));
+        if ($currency === null || $currency->getId() === $community->getMainCurrencyId()) {
+            return null;
+        }
+
+        $currencyExchangeRates = $this->currencyExchangeRatesRepository->getAllByCurrency($currency);
+
+        return new HtmlContent('communities/currency_exchange_rates', [
+            'community' => $community,
+            'currency' => $currency,
+            'currencyExchangeRates' => $currencyExchangeRates,
+            'editPermission' => $ownCommunityMember->getOwner()
+        ]);
+    }
+
+    public function saveCurrencyExchangeRate(): ?IContent
+    {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        $currency = $this->currencyRepository->getByCommunityAndCurrencyCode($community, \Container::$request->query('code'));
+        if ($currency === null) {
+            return null;
+        }
+
+        $exchangeRate = (float)\Container::$request->post('exchange_rate');
+        if ($exchangeRate < 0) {
+            return new JsonContent([
+                'error' => ['errorText' => 'Please fill all required fields!']
+            ]);
+        }
+
+        $currencyExchangeRateId = \Container::$request->query('currency_exchange_rate_id');
+        if ($currencyExchangeRateId){
+            $currencyExchangeRate = $this->currencyExchangeRatesRepository->getById($currencyExchangeRateId);
+        } else {
+            $currencyExchangeRate = new CurrencyExchangeRate();
+            $currencyExchangeRate->setCurrency($currency);
+        }
+
+        $currencyExchangeRate->setExchangeRate($exchangeRate);
+        $currencyExchangeRate->setValidFromDate(new DateTime(\Container::$request->post('valid_from')));
+        \Container::$persistentDataManager->saveToDb($currencyExchangeRate);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function deleteCurrencyExchangeRate(): ?IContent
+    {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        $currency = $this->currencyRepository->getByCommunityAndCurrencyCode($community, \Container::$request->query('code'));
+        if ($currency === null) {
+            return null;
+        }
+
+        $currencyExchangeRate = $this->currencyExchangeRatesRepository->getById(\Container::$request->query('currency_exchange_rate_id'));
+        \Container::$persistentDataManager->deleteFromDb($currencyExchangeRate);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    private function getMembers(Community $community): array
+    {
+        $members = iterator_to_array($this->communityMemberRepository->getAllByCommunity($community, true, ['user']));
+        usort($members, function($a, $b) {
+            return strnatcmp($a->getUser()->getDisplayName(), $b->getUser()->getDisplayName());
+        });
+        return $members;
+    }
+
+    private function getCurrencies(Community $community): array
+    {
+        $currencies = iterator_to_array($this->currencyRepository->getAllByCommunity($community));
+        usort($currencies, function($a, $b) {
+            return strnatcmp($a->getCode(), $b->getCode());
+        });
+        usort($currencies, function($a, $b) use ($community) {
+            return (int)($b->getId() === $community->getMainCurrencyId()) - (int)($a->getId() === $community->getMainCurrencyId());
+        });
+        return $currencies;
+    }
+
     private function checkPermission(
         int $communityId,
         bool $needToBeOwner,
@@ -204,7 +428,7 @@ class CommunityController implements IAuthenticationRequired
         /**
         * @var User $user
         */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         $ownCommunityMember = $this->communityMemberRepository->getByCommunityAndUser($community, $user);
         if ($ownCommunityMember === null || ($needToBeOwner && !$ownCommunityMember->getOwner())) {

src/Controller/HomeController.php

@@ -1,21 +1,18 @@
 <?php namespace RVR\Controller;
 
+use RVR\PersistentData\Model\Community;
 use RVR\PersistentData\Model\User;
 use RVR\Repository\CommunityMemberRepository;
 use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
 use SokoWeb\Response\HtmlContent;
 
 class HomeController implements IAuthenticationRequired
 {
-    private IRequest $request;
-
     private CommunityMemberRepository $communityMemberRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
         $this->communityMemberRepository = new CommunityMemberRepository();
     }
 
@@ -29,9 +26,9 @@ class HomeController implements IAuthenticationRequired
         /**
         * @var User $user
         */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
-        $ownCommunityMembers = $this->communityMemberRepository->getAllByUser($user, true);
+        $ownCommunityMembers = $this->communityMemberRepository->getAllByUser($user, true, ['community']);
         $communities = [];
         foreach ($ownCommunityMembers as $ownCommunityMember) {
             $communities[] = $ownCommunityMember->getCommunity();

src/Controller/LoginController.php

@@ -2,13 +2,11 @@
 
 use DateTime;
 use SokoWeb\Http\Request;
-use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
 use SokoWeb\Interfaces\Response\IRedirect;
 use SokoWeb\Mailing\Mail;
 use SokoWeb\OAuth\GoogleOAuth;
 use RVR\PersistentData\Model\UserPasswordResetter;
-use SokoWeb\PersistentData\PersistentDataManager;
 use RVR\Repository\UserPasswordResetterRepository;
 use RVR\Repository\UserRepository;
 use SokoWeb\Response\HtmlContent;
@@ -19,30 +17,24 @@ use SokoWeb\Util\JwtParser;
 
 class LoginController
 {
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private UserRepository $userRepository;
 
     private UserPasswordResetterRepository $userPasswordResetterRepository;
 
     private string $redirectUrl;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->userRepository = new UserRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
-        $this->redirectUrl = $this->request->session()->has('redirect_after_login') ?
-            $this->request->session()->get('redirect_after_login') :
+        $this->redirectUrl = \Container::$request->session()->has('redirect_after_login') ?
+            \Container::$request->session()->get('redirect_after_login') :
             \Container::$routeCollection->getRoute('home')->generateLink();
     }
 
     public function getLoginForm()
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
             $this->deleteRedirectUrl();
             return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
@@ -55,13 +47,13 @@ class LoginController
         $state = bin2hex(random_bytes(16));
         $nonce = bin2hex(random_bytes(16));
 
-        $this->request->session()->set('oauth_state', $state);
-        $this->request->session()->set('oauth_nonce', $nonce);
+        \Container::$request->session()->set('oauth_state', $state);
+        \Container::$request->session()->set('oauth_nonce', $nonce);
 
         $oAuth = new GoogleOAuth(new Request());
         $url = $oAuth->getDialogUrl(
             $state,
-            $this->request->getBase() . \Container::$routeCollection->getRoute('login-google-action')->generateLink(),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('login.google-action')->generateLink(),
             $nonce
         );
 
@@ -70,12 +62,12 @@ class LoginController
 
     public function getRequestPasswordResetForm()
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
             $this->deleteRedirectUrl();
             return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        return new HtmlContent('login/password_reset_request', ['email' => $this->request->query('email')]);
+        return new HtmlContent('login/password_reset_request', ['email' => \Container::$request->query('email')]);
     }
 
     public function getRequestPasswordResetSuccess(): IContent
@@ -85,12 +77,12 @@ class LoginController
 
     public function getResetPasswordForm()
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
             $this->deleteRedirectUrl();
             return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        $token = $this->request->query('token');
+        $token = \Container::$request->query('token');
         $resetter = $this->userPasswordResetterRepository->getByToken($token);
 
         if ($resetter === null || $resetter->getExpiresDate() < new DateTime()) {
@@ -104,22 +96,22 @@ class LoginController
 
     public function login(): IContent
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
             $this->deleteRedirectUrl();
             return new JsonContent(['success' => true]);
         }
 
-        $user = $this->userRepository->getByEmailOrUsername($this->request->post('email'));
-        if ($user === null || !$user->checkPassword($this->request->post('password'))) {
+        $user = $this->userRepository->getByEmailOrUsername(\Container::$request->post('email'));
+        if ($user === null || !$user->checkPassword(\Container::$request->post('password'))) {
             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' => $this->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>!'
                 ]
             ]);
         }
 
-        $this->request->setUser($user);
+        \Container::$request->setUser($user);
 
         $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
@@ -127,21 +119,21 @@ 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 ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
             $this->deleteRedirectUrl();
             return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
+        if (\Container::$request->query('state') !== \Container::$request->session()->get('oauth_state')) {
             return new HtmlContent('login/google_login_error', ['error' => $defaultError]);
         }
 
         $oAuth = new GoogleOAuth(new Request());
         $tokenData = $oAuth->getToken(
-            $this->request->query('code'),
-            $this->request->getBase() . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
+            \Container::$request->query('code'),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('login.google-action')->generateLink()
         );
 
         if (!isset($tokenData['id_token'])) {
@@ -151,7 +143,7 @@ class LoginController
         $jwtParser = new JwtParser($tokenData['id_token']);
         $idToken = $jwtParser->getPayload();
 
-        if ($idToken['nonce'] !== $this->request->session()->get('oauth_nonce')) {
+        if ($idToken['nonce'] !== \Container::$request->session()->get('oauth_nonce')) {
             return new HtmlContent('login/google_login_error', ['error' => $defaultError]);
         }
 
@@ -164,7 +156,7 @@ class LoginController
             return new HtmlContent('login/google_login_error', ['error' => 'No user found for this Google account.']);
         }
 
-        $this->request->setUser($user);
+        \Container::$request->setUser($user);
 
         $this->deleteRedirectUrl();
         return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
@@ -172,14 +164,14 @@ class LoginController
 
     public function logout(): IRedirect
     {
-        $this->request->setUser(null);
+        \Container::$request->setUser(null);
 
         return new Redirect(\Container::$routeCollection->getRoute('home')->generateLink(), IRedirect::TEMPORARY);
     }
 
     public function requestPasswordReset(): IContent
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
             $this->deleteRedirectUrl();
             return new JsonContent([
                 'redirect' => [
@@ -189,18 +181,18 @@ class LoginController
         }
 
         if (!empty($_ENV['RECAPTCHA_SITEKEY'])) {
-            if (!$this->request->post('g-recaptcha-response')) {
+            if (!\Container::$request->post('g-recaptcha-response')) {
                 return new JsonContent(['error' => ['errorText' => 'Please check "I\'m not a robot" in the reCAPTCHA box!']]);
             }
 
             $captchaValidator = new CaptchaValidator();
-            $captchaResponse = $captchaValidator->validate($this->request->post('g-recaptcha-response'));
+            $captchaResponse = $captchaValidator->validate(\Container::$request->post('g-recaptcha-response'));
             if (!$captchaResponse['success']) {
                 return new JsonContent(['error' => ['errorText' => 'reCAPTCHA challenge failed. Please try again!']]);
             }
         }
 
-        $user = $this->userRepository->getByEmailOrUsername($this->request->post('email'));
+        $user = $this->userRepository->getByEmailOrUsername(\Container::$request->post('email'));
         if ($user === null) {
             return new JsonContent([
                 'error' => [
@@ -226,15 +218,11 @@ class LoginController
         $passwordResetter->setToken($token);
         $passwordResetter->setExpiresDate($expires);
 
-        \Container::$dbConnection->startTransaction();
-
         if ($existingResetter !== null) {
-            $this->pdm->deleteFromDb($existingResetter);
+            \Container::$persistentDataManager->deleteFromDb($existingResetter);
         }
 
-        $this->pdm->saveToDb($passwordResetter);
-
-        \Container::$dbConnection->commit();
+        \Container::$persistentDataManager->saveToDb($passwordResetter);
 
         $this->sendPasswordResetEmail($user->getEmail(), $token, $expires);
 
@@ -243,7 +231,7 @@ class LoginController
 
     public function resetPassword(): IContent
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
             $this->deleteRedirectUrl();
             return new JsonContent([
                 'redirect' => [
@@ -252,18 +240,18 @@ class LoginController
             ]);
         }
 
-        $token = $this->request->query('token');
+        $token = \Container::$request->query('token');
         $resetter = $this->userPasswordResetterRepository->getByToken($token);
 
         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])
                 ]
             ]);
         }
 
-        if (strlen($this->request->post('password')) < 6) {
+        if (strlen(\Container::$request->post('password')) < 6) {
             return new JsonContent([
                 'error' => [
                     'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
@@ -271,22 +259,18 @@ class LoginController
             ]);
         }
 
-        if ($this->request->post('password') !== $this->request->post('password_confirm')) {
+        if (\Container::$request->post('password') !== \Container::$request->post('password_confirm')) {
             return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
         }
 
-        \Container::$dbConnection->startTransaction();
-
-        $this->pdm->deleteFromDb($resetter);
+        \Container::$persistentDataManager->deleteFromDb($resetter);
 
         $user = $this->userRepository->getById($resetter->getUserId());
-        $user->setPlainPassword($this->request->post('password'));
+        $user->setPlainPassword(\Container::$request->post('password'));
 
-        $this->pdm->saveToDb($user);
+        \Container::$persistentDataManager->saveToDb($user);
 
-        \Container::$dbConnection->commit();
-
-        $this->request->setUser($user);
+        \Container::$request->setUser($user);
 
         $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
@@ -297,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' => $this->request->getBase() .
-                \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token]),
+            'RESET_LINK' => \Container::$request->getBase() .
+                \Container::$routeCollection->getRoute('password.reset')->generateLink(['token' => $token]),
             'EXPIRES' => $expires->format('Y-m-d H:i T')
         ]);
         $mail->send();
@@ -308,6 +292,6 @@ class LoginController
 
     private function deleteRedirectUrl(): void
     {
-        $this->request->session()->delete('redirect_after_login');
+        \Container::$request->session()->delete('redirect_after_login');
     }
 }

src/Controller/OAuthAuthController.php

@@ -5,24 +5,16 @@ use RVR\PersistentData\Model\OAuthToken;
 use RVR\PersistentData\Model\User;
 use RVR\Repository\OAuthClientRepository;
 use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IRedirect;
 use SokoWeb\Response\Redirect;
-use SokoWeb\PersistentData\PersistentDataManager;
 use SokoWeb\Response\HtmlContent;
 
 class OAuthAuthController implements IAuthenticationRequired
 {
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private OAuthClientRepository $oAuthClientRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->oAuthClientRepository = new OAuthClientRepository();
     }
 
@@ -33,11 +25,11 @@ class OAuthAuthController implements IAuthenticationRequired
 
     public function auth()
     {
-        $redirectUri = $this->request->query('redirect_uri');
-        $clientId = $this->request->query('client_id');
-        $scope = $this->request->query('scope') ? $this->request->query('scope'): '';
-        $state = $this->request->query('state');
-        $nonce = $this->request->query('nonce') ? $this->request->query('nonce'): '';
+        $redirectUri = \Container::$request->query('redirect_uri');
+        $clientId = \Container::$request->query('client_id');
+        $scope = \Container::$request->query('scope') ? \Container::$request->query('scope'): '';
+        $state = \Container::$request->query('state');
+        $nonce = \Container::$request->query('nonce') ? \Container::$request->query('nonce'): '';
 
         if (!$clientId || !$redirectUri || !$state) {
             return new HtmlContent('oauth/oauth_error', ['error' => 'An invalid request was made. Please start authentication again.']);
@@ -62,7 +54,7 @@ class OAuthAuthController implements IAuthenticationRequired
         /**
         * @var ?User $user
         */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
         $code = bin2hex(random_bytes(16));
         $accessToken = bin2hex(random_bytes(16));
 
@@ -74,7 +66,7 @@ class OAuthAuthController implements IAuthenticationRequired
         $token->setAccessToken($accessToken);
         $token->setCreatedDate(new DateTime());
         $token->setExpiresDate(new DateTime('+5 minutes'));
-        $this->pdm->saveToDb($token);
+        \Container::$persistentDataManager->saveToDb($token);
 
         $redirectUriQuery = array_merge($redirectUriQuery, [
             'state' => $state,

src/Controller/OAuthController.php

@@ -6,23 +6,19 @@ use RVR\Repository\OAuthTokenRepository;
 use RVR\Repository\UserRepository;
 use RVR\PersistentData\Model\User;
 use RVR\Repository\OAuthClientRepository;
-use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
 use SokoWeb\Response\JsonContent;
 
 class OAuthController
 {
-    private IRequest $request;
-
     private OAuthClientRepository $oAuthClientRepository;
 
     private OAuthTokenRepository $oAuthTokenRepository;
 
     private UserRepository $userRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
         $this->oAuthClientRepository = new OAuthClientRepository();
         $this->oAuthTokenRepository = new OAuthTokenRepository();
         $this->userRepository = new UserRepository();
@@ -30,9 +26,9 @@ class OAuthController
 
     public function getToken(): ?IContent
     {
-        $clientId = $this->request->post('client_id');
-        $clientSecret = $this->request->post('client_secret');
-        $code = $this->request->post('code');
+        $clientId = \Container::$request->post('client_id');
+        $clientSecret = \Container::$request->post('client_secret');
+        $code = \Container::$request->post('code');
 
         if (!$clientId || !$clientSecret || !$code) {
             return new JsonContent([
@@ -80,7 +76,7 @@ class OAuthController
 
     public function getUserInfo() : IContent
     {
-        $authorization = $this->request->header('Authorization');
+        $authorization = \Container::$request->header('Authorization');
         if ($authorization === null) {
             return new JsonContent([
                 'error' => 'No Authorization header was sent.'
@@ -108,10 +104,10 @@ class OAuthController
     {
         return new JsonContent([
             'issuer' => $_ENV['APP_URL'],
-            'authorization_endpoint' => $this->request->getBase() . \Container::$routeCollection->getRoute('oauth-auth')->generateLink(),
-            'token_endpoint' => $this->request->getBase() . \Container::$routeCollection->getRoute('oauth-token')->generateLink(),
-            'userinfo_endpoint' => $this->request->getBase() . \Container::$routeCollection->getRoute('oauth-userinfo')->generateLink(),
-            'jwks_uri' => $this->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',

src/Controller/TransactionController.php

@@ -0,0 +1,163 @@
+<?php namespace RVR\Controller;
+
+use Container;
+use DateTime;
+use RVR\Finance\ExchangeRateCalculator;
+use RVR\PersistentData\Model\Community;
+use RVR\PersistentData\Model\CommunityMember;
+use RVR\PersistentData\Model\Transaction;
+use RVR\PersistentData\Model\User;
+use RVR\Repository\CommunityMemberRepository;
+use RVR\Repository\CommunityRepository;
+use RVR\Repository\CurrencyRepository;
+use RVR\Repository\TransactionRepository;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
+
+class TransactionController implements IAuthenticationRequired, ISecured
+{
+    private CommunityRepository $communityRepository;
+
+    private CommunityMemberRepository $communityMemberRepository;
+
+    private CurrencyRepository $currencyRepository;
+
+    private TransactionRepository $transactionRepository;
+
+    private Community $community;
+
+    private CommunityMember $ownCommunityMember;
+
+    public function __construct()
+    {
+        $this->communityRepository = new CommunityRepository();
+        $this->communityMemberRepository = new CommunityMemberRepository();
+        $this->currencyRepository = new CurrencyRepository();
+        $this->transactionRepository = new TransactionRepository();
+    }
+
+    public function isAuthenticationRequired(): bool
+    {
+        return true;
+    }
+
+    public function authorize(): bool
+    {
+        $communityId = \Container::$request->query('communityId');
+        $this->community = $this->communityRepository->getById($communityId);
+        if ($this->community === null) {
+            return false;
+        }
+
+        /**
+        * @var User $user
+        */
+        $user = \Container::$request->user();
+        $this->ownCommunityMember = $this->communityMemberRepository->getByCommunityAndUser($this->community, $user);
+        if ($this->ownCommunityMember === null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function getTransactions(): IContent
+    {
+        Container::$persistentDataManager->loadRelationsFromDb($this->community, true, ['main_currency']);
+        $exchangeRateCalculator = new ExchangeRateCalculator($this->community->getMainCurrency());
+
+        $itemsPerPage = 50;
+        $numberOfTransactions = $this->transactionRepository->countAllByCommunity($this->community);
+        $pages = ceil($numberOfTransactions / $itemsPerPage);
+        $currentPage = Container::$request->query('page') ?: 0;
+        $transactions = $this->transactionRepository->getPagedByCommunity(
+            $this->community,
+            $currentPage * $itemsPerPage,
+            $itemsPerPage,
+            true,
+            ['currency', 'payer_user', 'payee_user']
+        );
+
+        return new HtmlContent('communities/transactions', [
+            'community' => $this->community,
+            'exchangeRateCalculator' => $exchangeRateCalculator,
+            'pages' => $pages,
+            'currentPage' => $currentPage,
+            'numberOfTransactions' => $numberOfTransactions,
+            'transactions' => $transactions
+        ]);
+    }
+
+    public function getTransactionEdit(): ?IContent
+    {
+        $transactionId = Container::$request->query('transactionId');
+        if ($transactionId) {
+            $transaction = $this->transactionRepository->getById($transactionId);
+            if ($transaction === null) {
+                return null;
+            }
+        } else {
+            $transaction = null;
+        }
+
+        return new HtmlContent('communities/transaction_edit', [
+            'community' => $this->community,
+            'transaction' => $transaction,
+            'members' => $this->getMembers($this->community),
+            'currencies' => $this->getCurrencies($this->community)
+        ]);
+    }
+
+    public function saveTransaction(): ?IContent
+    {
+        $transactionId = Container::$request->query('transactionId');
+        if ($transactionId) {
+            $transaction = $this->transactionRepository->getById($transactionId);
+        } else {
+            $transaction = new Transaction();
+            $transaction->setCommunity($this->community);
+        }
+
+        $transaction->setCurrencyId(Container::$request->post('currency_id'));
+        $transaction->setPayerUserId(Container::$request->post('payer_user_id'));
+        $transaction->setPayeeUserId(Container::$request->post('payee_user_id') ?: null);
+        $transaction->setDescription(Container::$request->post('description'));
+        $transaction->setSum(Container::$request->post('sum'));
+        $transaction->setTimeDate(new DateTime(Container::$request->post('time')));
+        Container::$persistentDataManager->saveToDb($transaction);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function deleteTransaction(): IContent
+    {
+        $transaction = $this->transactionRepository->getById(Container::$request->query('transactionId'));
+        Container::$persistentDataManager->deleteFromDb($transaction);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    private function getMembers(Community $community): array
+    {
+        $members = iterator_to_array($this->communityMemberRepository->getAllByCommunity($community, true, ['user']));
+        usort($members, function($a, $b) {
+            return strnatcmp($a->getUser()->getDisplayName(), $b->getUser()->getDisplayName());
+        });
+        return $members;
+    }
+
+    private function getCurrencies(Community $community): array
+    {
+        $currencies = iterator_to_array($this->currencyRepository->getAllByCommunity($community));
+        usort($currencies, function($a, $b) {
+            return strnatcmp($a->getCode(), $b->getCode());
+        });
+        usort($currencies, function($a, $b) use ($community) {
+            return (int)($b->getId() === $community->getMainCurrencyId()) - (int)($a->getId() === $community->getMainCurrencyId());
+        });
+        return $currencies;
+    }
+}

src/Controller/UserController.php

@@ -3,11 +3,9 @@
 use DateTime;
 use SokoWeb\Http\Request;
 use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
 use SokoWeb\Interfaces\Response\IRedirect;
 use SokoWeb\OAuth\GoogleOAuth;
-use SokoWeb\PersistentData\PersistentDataManager;
 use RVR\PersistentData\Model\User;
 use SokoWeb\Response\HtmlContent;
 use SokoWeb\Response\JsonContent;
@@ -17,16 +15,10 @@ use RVR\Repository\UserRepository;
 
 class UserController implements IAuthenticationRequired
 {
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private UserRepository $userRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->userRepository = new UserRepository();
     }
 
@@ -40,7 +32,7 @@ class UserController implements IAuthenticationRequired
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         return new HtmlContent('account/account', ['user' => $user->toArray()]);
     }
@@ -50,19 +42,19 @@ class UserController implements IAuthenticationRequired
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         $state = bin2hex(random_bytes(16));
         $nonce = bin2hex(random_bytes(16));
 
-        $this->request->session()->set('oauth_state', $state);
-        $this->request->session()->set('oauth_nonce', $nonce);
+        \Container::$request->session()->set('oauth_state', $state);
+        \Container::$request->session()->set('oauth_nonce', $nonce);
 
         $oAuth = new GoogleOAuth(new Request());
 
         $url = $oAuth->getDialogUrl(
             $state,
-            $this->request->getBase() . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink(),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink(),
             $nonce,
             $user->getEmail()
         );
@@ -75,16 +67,16 @@ class UserController implements IAuthenticationRequired
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
-        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
+        if (\Container::$request->query('state') !== \Container::$request->session()->get('oauth_state')) {
             return new HtmlContent('account/google_authenticate', ['success' => false]);
         }
 
         $oAuth = new GoogleOAuth(new Request());
         $tokenData = $oAuth->getToken(
-            $this->request->query('code'),
-            $this->request->getBase() . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
+            \Container::$request->query('code'),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
         );
 
         if (!isset($tokenData['id_token'])) {
@@ -94,7 +86,7 @@ class UserController implements IAuthenticationRequired
         $jwtParser = new JwtParser($tokenData['id_token']);
         $idToken = $jwtParser->getPayload();
 
-        if ($idToken['nonce'] !== $this->request->session()->get('oauth_nonce')) {
+        if ($idToken['nonce'] !== \Container::$request->session()->get('oauth_nonce')) {
             return new HtmlContent('account/google_authenticate', ['success' => false]);
         }
 
@@ -106,7 +98,7 @@ class UserController implements IAuthenticationRequired
         }
 
         $authenticatedWithGoogleUntil = new DateTime('+45 seconds');
-        $this->request->session()->set('authenticated_with_google_until', $authenticatedWithGoogleUntil);
+        \Container::$request->session()->set('authenticated_with_google_until', $authenticatedWithGoogleUntil);
 
         return new HtmlContent('account/google_authenticate', [
             'success' => true,
@@ -119,18 +111,18 @@ class UserController implements IAuthenticationRequired
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         if (!$this->confirmUserIdentity(
             $user,
-            $this->request->session()->get('authenticated_with_google_until'),
-            $this->request->post('password'),
+            \Container::$request->session()->get('authenticated_with_google_until'),
+            \Container::$request->post('password'),
             $error
         )) {
             return new JsonContent(['error' => ['errorText' => $error]]);
         }
 
-        $newEmail = $this->request->post('email');
+        $newEmail = \Container::$request->post('email');
         if ($newEmail !== $user->getEmail()) {
             if (!filter_var($newEmail, FILTER_VALIDATE_EMAIL)) {
                 return new JsonContent(['error' => ['errorText' => 'Please provide a valid email address.']]);
@@ -143,7 +135,7 @@ class UserController implements IAuthenticationRequired
             $user->setEmail($newEmail);
         }
 
-        $newUsername = $this->request->post('username');
+        $newUsername = \Container::$request->post('username');
         if ($newUsername !== $user->getUsername()) {
             if (strlen($newUsername) > 0) {
                 if (filter_var($newUsername, FILTER_VALIDATE_EMAIL)) {
@@ -160,7 +152,7 @@ class UserController implements IAuthenticationRequired
             }
         }
 
-        $newPassword = $this->request->post('password_new');
+        $newPassword = \Container::$request->post('password_new');
         if (strlen($newPassword) > 0) {
             if (strlen($newPassword) < 6) {
                 return new JsonContent([
@@ -170,7 +162,7 @@ class UserController implements IAuthenticationRequired
                 ]);
             }
 
-            if ($newPassword !== $this->request->post('password_new_confirm')) {
+            if ($newPassword !== \Container::$request->post('password_new_confirm')) {
                 return new JsonContent([
                     'error' => [
                         'errorText' => 'The given new passwords do not match.'
@@ -181,13 +173,13 @@ class UserController implements IAuthenticationRequired
             $user->setPlainPassword($newPassword);
         }
 
-        $user->setNickname($this->request->post('nickname'));
-        $user->setPhone($this->request->post('phone'));
-        $user->setIdNumber($this->request->post('id_number'));
+        $user->setNickname(\Container::$request->post('nickname'));
+        $user->setPhone(\Container::$request->post('phone'));
+        $user->setIdNumber(\Container::$request->post('id_number'));
 
-        $this->pdm->saveToDb($user);
+        \Container::$persistentDataManager->saveToDb($user);
 
-        $this->request->session()->delete('authenticated_with_google_until');
+        \Container::$request->session()->delete('authenticated_with_google_until');
 
         return new JsonContent(['success' => true]);
     }

src/Controller/UserSearchController.php

@@ -2,19 +2,15 @@
 
 use RVR\Repository\UserRepository;
 use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use SokoWeb\Interfaces\Request\IRequest;
 use SokoWeb\Interfaces\Response\IContent;
 use SokoWeb\Response\JsonContent;
 
 class UserSearchController implements IAuthenticationRequired
 {
-    private IRequest $request;
-
     private UserRepository $userRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
         $this->userRepository = new UserRepository();
     }
 
@@ -25,7 +21,7 @@ class UserSearchController implements IAuthenticationRequired
 
     public function searchUser(): IContent
     {
-        $users = iterator_to_array($this->userRepository->searchByName($this->request->query('q')));
+        $users = iterator_to_array($this->userRepository->searchByName(\Container::$request->query('q')));
         usort($users, function($a, $b) {
             return strnatcmp($a->getDisplayName(), $b->getDisplayName());
         });

src/Database/AuditLogger.php

@@ -0,0 +1,18 @@
+<?php namespace RVR\Database;
+
+use SokoWeb\Database\AuditLoggerBase;
+
+class AuditLogger extends AuditLoggerBase
+{
+    protected function getModifierId()
+    {
+        if (\Container::$request === null) {
+            return null;
+        }
+        $user = \Container::$request->user();
+        if ($user === null) {
+            return null;
+        }
+        return $user->getUniqueId();
+    }
+}

src/Finance/BalanceCalculator.php

@@ -0,0 +1,90 @@
+<?php namespace RVR\Finance;
+
+use RVR\PersistentData\Model\Community;
+use RVR\Repository\CommunityMemberRepository;
+use RVR\Repository\TransactionRepository;
+
+class BalanceCalculator
+{
+    private Community $community;
+
+    private TransactionRepository $transactionRepository;
+
+    private CommunityMemberRepository $communityMemberRepository;
+
+    private ExchangeRateCalculator $exchangeRateCalculator;
+
+    private array $members;
+
+    private array $payments;
+
+    public function __construct(Community $community)
+    {
+        $this->community = $community;
+        $this->transactionRepository = new TransactionRepository();
+        $this->communityMemberRepository = new CommunityMemberRepository();
+        $this->exchangeRateCalculator = new ExchangeRateCalculator($this->community->getMainCurrency());
+    }
+
+    public function calculate(): array
+    {
+        $this->collectMembers();
+        $this->createPaymentsMatrix();
+        $this->sumTransactions();
+        return $this->calculateActualDebts();
+    }
+
+    private function collectMembers(): void
+    {
+        $this->members = [];
+        foreach ($this->communityMemberRepository->getAllByCommunity($this->community, true, ['user']) as $member) {
+            $this->members[$member->getUserId()] = $member;
+        }
+    }
+
+    private function createPaymentsMatrix(): void
+    {
+        $this->payments = [];
+        foreach ($this->members as $payerUserId => $member) {
+            $this->payments[$payerUserId] = [];
+            foreach ($this->members as $payeeUserId => $member) {
+                $this->payments[$payerUserId][$payeeUserId] = 0;
+            }
+        }
+    }
+
+    private function sumTransactions(): void
+    {
+        $membersCount = count($this->members);
+        $transactions = $this->transactionRepository->getAllByCommunity($this->community, true, ['currency']);
+
+        foreach ($transactions as $transaction) {
+            $sum = $this->exchangeRateCalculator->calculate($transaction->getSum(), $transaction->getCurrency(), $transaction->getTimeDate());
+
+            if ($transaction->getPayeeUserId()) {
+                $this->payments[$transaction->getPayerUserId()][$transaction->getPayeeUserId()] += $sum;
+            } else {
+                foreach ($this->members as $payeeUserId => $member) {
+                    $this->payments[$transaction->getPayerUserId()][$payeeUserId] += $sum / $membersCount;
+                }
+            }
+        }
+    }
+
+    private function calculateActualDebts(): array
+    {
+        $actualDebts = [];
+
+        foreach ($this->payments as $payerUserId => $paymentsOfPayer) {
+            foreach ($paymentsOfPayer as $payeeUserId => $sum) {
+                $actualDebt = $this->payments[$payeeUserId][$payerUserId] - $sum;
+
+                if (round($actualDebt, $this->community->getMainCurrency()->getRoundDigits()) > 0.0) {
+                    $actualDebts[] = ['payer' => $this->members[$payerUserId], 'payee' => $this->members[$payeeUserId], 'amount' => $actualDebt];
+                }
+            }
+        }
+
+        return $actualDebts;
+    }
+}

src/Finance/ExchangeRateCalculator.php

@@ -0,0 +1,52 @@
+<?php namespace RVR\Finance;
+
+use DateTime;
+use RVR\PersistentData\Model\Currency;
+use RVR\PersistentData\Model\CurrencyExchangeRate;
+use RVR\Repository\CurrencyExchangeRateRepository;
+
+class ExchangeRateCalculator
+{
+    private Currency $mainCurrency;
+
+    private CurrencyExchangeRateRepository $currencyExchangeRateRepository;
+
+    private array $exchangeRates = [];
+
+    public function __construct(Currency $mainCurrency)
+    {
+        $this->mainCurrency = $mainCurrency;
+        $this->currencyExchangeRateRepository = new CurrencyExchangeRateRepository();
+    }
+
+    public function calculate(float $sumInCurrency, Currency $currency, DateTime $time): float
+    {
+        if ($currency->getId() === $this->mainCurrency->getId()) {
+            return $sumInCurrency;
+        }
+
+        $currentExchangeRate = $this->getCurrentExchangeRate($currency, $time);
+        if ($currentExchangeRate === null) {
+            return 0.0;
+        }
+
+        return $sumInCurrency * $currentExchangeRate->getExchangeRate();
+    }
+
+    private function getCurrentExchangeRate(Currency $currency, DateTime $time): ?CurrencyExchangeRate
+    {
+        if (!isset($this->exchangeRates[$currency->getId()])) {
+            $this->exchangeRates[$currency->getId()] = iterator_to_array($this->currencyExchangeRateRepository->getAllByCurrency($currency));
+        }
+
+        $currentExchangeRate = null;
+        foreach ($this->exchangeRates[$currency->getId()] as $exchangeRate) {
+            if ($exchangeRate->getValidFrom() > $time) {
+                break;
+            }
+            $currentExchangeRate = $exchangeRate;
+        }
+
+        return $currentExchangeRate;
+    }
+}

src/PersistentData/Model/Community.php

@@ -7,12 +7,18 @@ class Community extends Model
 {
     protected static string $table = 'communities';
 
-    protected static array $fields = ['name', 'currency', 'created'];
+    protected static array $fields = ['name', 'currency', 'main_currency_id', 'created'];
+
+    protected static array $relations = ['main_currency' => Currency::class];
 
     private string $name = '';
 
     private string $currency = '';
 
+    private ?Currency $mainCurrency = null;
+
+    private ?int $mainCurrencyId = null;
+
     private DateTime $created;
 
     public function setName(string $name): void
@@ -25,6 +31,16 @@ class Community extends Model
         $this->currency = $currency;
     }
 
+    public function setMainCurrency(Currency $mainCurrency): void
+    {
+        $this->mainCurrency = $mainCurrency;
+    }
+
+    public function setMainCurrencyId(int $mainCurrencyId): void
+    {
+        $this->mainCurrencyId = $mainCurrencyId;
+    }
+
     public function setCreatedDate(DateTime $created): void
     {
         $this->created = $created;
@@ -45,6 +61,16 @@ class Community extends Model
         return $this->currency;
     }
 
+    public function getMainCurrency(): ?Currency
+    {
+        return $this->mainCurrency;
+    }
+
+    public function getMainCurrencyId(): ?int
+    {
+        return $this->mainCurrencyId;
+    }
+
     public function getCreatedDate(): DateTime
     {
         return $this->created;

src/PersistentData/Model/Currency.php

@@ -0,0 +1,60 @@
+<?php namespace RVR\PersistentData\Model;
+
+use SokoWeb\PersistentData\Model\Model;
+
+class Currency extends Model
+{
+    protected static string $table = 'currencies';
+
+    protected static array $fields = ['community_id', 'code', 'round_digits'];
+
+    protected static array $relations = ['community' => Community::class];
+
+    private ?Community $community = null;
+
+    private ?int $communityId = null;
+
+    private string $code = '';
+
+    private int $roundDigits = 0;
+
+    public function setCommunity(Community $community): void
+    {
+        $this->community = $community;
+    }
+
+    public function setCommunityId(int $communityId): void
+    {
+        $this->communityId = $communityId;
+    }
+
+    public function setCode(string $code): void
+    {
+        $this->code = $code;
+    }
+
+    public function setRoundDigits(int $roundDigits): void
+    {
+        $this->roundDigits = $roundDigits;
+    }
+
+    public function getCommunity(): ?Community
+    {
+        return $this->community;
+    }
+
+    public function getCommunityId(): ?int
+    {
+        return $this->communityId;
+    }
+
+    public function getCode(): string
+    {
+        return $this->code;
+    }
+
+    public function getRoundDigits(): int
+    {
+        return $this->roundDigits;
+    }
+}

src/PersistentData/Model/CurrencyExchangeRate.php

@@ -0,0 +1,71 @@
+<?php namespace RVR\PersistentData\Model;
+
+use DateTime;
+use SokoWeb\PersistentData\Model\Model;
+
+class CurrencyExchangeRate extends Model
+{
+    protected static string $table = 'currency_exchange_rates';
+
+    protected static array $fields = ['currency_id', 'exchange_rate', 'valid_from'];
+
+    protected static array $relations = ['currency' => Currency::class];
+
+    private ?Currency $currency = null;
+
+    private ?int $currencyId = null;
+
+    private float $exchangeRate = 0.0;
+
+    private DateTime $validFrom;
+
+    public function setCurrency(Currency $currency): void
+    {
+        $this->currency = $currency;
+    }
+
+    public function setCurrencyId(int $currencyId): void
+    {
+        $this->currencyId = $currencyId;
+    }
+
+    public function setExchangeRate(float $exchangeRate): void
+    {
+        $this->exchangeRate = $exchangeRate;
+    }
+
+    public function setValidFromDate(DateTime $validFrom): void
+    {
+        $this->validFrom = $validFrom;
+    }
+
+    public function setValidFrom(string $validFrom): void
+    {
+        $this->validFrom = new DateTime($validFrom);
+    }
+
+    public function getCurrency(): ?Currency
+    {
+        return $this->currency;
+    }
+
+    public function getCurrencyId(): ?int
+    {
+        return $this->currencyId;
+    }
+
+    public function getExchangeRate(): float
+    {
+        return $this->exchangeRate;
+    }
+
+    public function getValidFromDate(): DateTime
+    {
+        return $this->validFrom;
+    }
+
+    public function getValidFrom(): string
+    {
+        return $this->validFrom->format('Y-m-d H:i:s');
+    }
+}

src/PersistentData/Model/Transaction.php

@@ -0,0 +1,160 @@
+<?php namespace RVR\PersistentData\Model;
+
+use DateTime;
+use SokoWeb\PersistentData\Model\Model;
+
+class Transaction extends Model
+{
+    protected static string $table = 'transactions';
+
+    protected static array $fields = ['community_id', 'currency_id', 'payer_user_id', 'payee_user_id', 'description', 'sum', 'time'];
+
+    protected static array $relations = [
+        'community' => Community::class,
+        'currency' => Currency::class,
+        'payer_user' => User::class,
+        'payee_user' => User::class
+    ];
+
+    private ?Community $community = null;
+
+    private int $communityId;
+
+    private ?Currency $currency = null;
+
+    private int $currencyId;
+
+    private ?User $payerUser = null;
+
+    private int $payerUserId;
+
+    private ?User $payeeUser = null;
+
+    private ?int $payeeUserId = null;
+
+    private string $description = '';
+
+    private float $sum = 0.0;
+
+    private DateTime $time;
+
+    public function setCommunity(Community $community): void
+    {
+        $this->community = $community;
+    }
+
+    public function setCommunityId(int $communityId): void
+    {
+        $this->communityId = $communityId;
+    }
+
+    public function setCurrency(Currency $currency): void
+    {
+        $this->currency = $currency;
+    }
+
+    public function setCurrencyId(int $currencyId): void
+    {
+        $this->currencyId = $currencyId;
+    }
+
+    public function setPayerUser(User $payerUser): void
+    {
+        $this->payerUser = $payerUser;
+    }
+
+    public function setPayerUserId(int $payerUserId): void
+    {
+        $this->payerUserId = $payerUserId;
+    }
+
+    public function setPayeeUser(?User $payeeUser): void
+    {
+        $this->payeeUser = $payeeUser;
+    }
+
+    public function setPayeeUserId(?int $payeeUserId): void
+    {
+        $this->payeeUserId = $payeeUserId;
+    }
+
+    public function setDescription(string $description): void
+    {
+        $this->description = $description;
+    }
+
+    public function setSum(float $sum): void
+    {
+        $this->sum = $sum;
+    }
+
+    public function setTimeDate(DateTime $time): void
+    {
+        $this->time = $time;
+    }
+
+    public function setTime(string $time): void
+    {
+        $this->time = new DateTime($time);
+    }
+
+    public function getCommunity(): ?Community
+    {
+        return $this->community;
+    }
+
+    public function getCommunityId(): int
+    {
+        return $this->communityId;
+    }
+
+    public function getCurrency(): ?Currency
+    {
+        return $this->currency;
+    }
+
+    public function getCurrencyId(): int
+    {
+        return $this->currencyId;
+    }
+
+    public function getPayerUser(): ?User
+    {
+        return $this->payerUser;
+    }
+
+    public function getPayerUserId(): int
+    {
+        return $this->payerUserId;
+    }
+
+    public function getPayeeUser(): ?User
+    {
+        return $this->payeeUser;
+    }
+
+    public function getPayeeUserId(): ?int
+    {
+        return $this->payeeUserId;
+    }
+
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    public function getSum(): float
+    {
+        return $this->sum;
+    }
+
+    public function getTimeDate(): DateTime
+    {
+        return $this->time;
+    }
+
+    public function getTime(): string
+    {
+        return $this->time->format('Y-m-d H:i:s');
+    }
+}

src/Repository/CommunityMemberRepository.php

@@ -5,36 +5,28 @@ use RVR\PersistentData\Model\Community;
 use RVR\PersistentData\Model\CommunityMember;
 use RVR\PersistentData\Model\User;
 use SokoWeb\Database\Query\Select;
-use SokoWeb\PersistentData\PersistentDataManager;
 
 class CommunityMemberRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $id): ?CommunityMember
     {
-        return $this->pdm->selectFromDbById($id, CommunityMember::class);
+        return \Container::$persistentDataManager->selectFromDbById($id, CommunityMember::class);
     }
 
-    public function getAllByCommunity(Community $community, bool $useRelations = false): Generator
+    public function getAllByCommunity(Community $community, bool $useRelations = false, array $withRelations = []): Generator
     {
         $select = new Select(\Container::$dbConnection);
         $select->where('community_id', '=', $community->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, CommunityMember::class, $useRelations);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, CommunityMember::class, $useRelations, $withRelations);
     }
 
-    public function getAllByUser(User $user, bool $useRelations = false): Generator
+    public function getAllByUser(User $user, bool $useRelations = false, array $withRelations = []): Generator
     {
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $user->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, CommunityMember::class, $useRelations);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, CommunityMember::class, $useRelations, $withRelations);
     }
 
     public function getByCommunityAndUser(Community $community, User $user) : ?CommunityMember
@@ -43,6 +35,6 @@ class CommunityMemberRepository
         $select->where('community_id', '=', $community->getId());
         $select->where('user_id', '=', $user->getId());
 
-        return $this->pdm->selectFromDb($select, CommunityMember::class);
+        return \Container::$persistentDataManager->selectFromDb($select, CommunityMember::class);
     }
 }

src/Repository/CommunityRepository.php

@@ -1,19 +1,11 @@
 <?php namespace RVR\Repository;
 
 use RVR\PersistentData\Model\Community;
-use SokoWeb\PersistentData\PersistentDataManager;
 
 class CommunityRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $id): ?Community
     {
-        return $this->pdm->selectFromDbById($id, Community::class);
+        return \Container::$persistentDataManager->selectFromDbById($id, Community::class);
     }
 }

src/Repository/CurrencyExchangeRateRepository.php

@@ -0,0 +1,24 @@
+<?php namespace RVR\Repository;
+
+use Generator;
+use Container;
+use RVR\PersistentData\Model\Currency;
+use RVR\PersistentData\Model\CurrencyExchangeRate;
+use SokoWeb\Database\Query\Select;
+
+class CurrencyExchangeRateRepository
+{
+    public function getById(int $id): ?CurrencyExchangeRate
+    {
+        return \Container::$persistentDataManager->selectFromDbById($id, CurrencyExchangeRate::class);
+    }
+
+    public function getAllByCurrency(Currency $currency): Generator
+    {
+        $select = new Select(Container::$dbConnection);
+        $select->where('currency_id', '=', $currency->getId());
+        $select->orderBy('valid_from');
+
+        yield from Container::$persistentDataManager->selectMultipleFromDb($select, CurrencyExchangeRate::class);
+    }
+}

src/Repository/CurrencyRepository.php

@@ -0,0 +1,32 @@
+<?php namespace RVR\Repository;
+
+use Generator;
+use Container;
+use RVR\PersistentData\Model\Community;
+use RVR\PersistentData\Model\Currency;
+use SokoWeb\Database\Query\Select;
+
+class CurrencyRepository
+{
+    public function getById(int $id): ?Currency
+    {
+        return \Container::$persistentDataManager->selectFromDbById($id, Currency::class);
+    }
+
+    public function getAllByCommunity(Community $community, bool $useRelations = false): Generator
+    {
+        $select = new Select(Container::$dbConnection);
+        $select->where('community_id', '=', $community->getId());
+
+        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Currency::class, $useRelations);
+    }
+
+    public function getByCommunityAndCurrencyCode(Community $community, string $code): ?Currency
+    {
+        $select = new Select(Container::$dbConnection);
+        $select->where('community_id', '=', $community->getId());
+        $select->where('code', '=', $code);
+
+        return Container::$persistentDataManager->selectFromDb($select, Currency::class);
+    }
+}

src/Repository/OAuthClientRepository.php

@@ -2,20 +2,12 @@
 
 use SokoWeb\Database\Query\Select;
 use RVR\PersistentData\Model\OAuthClient;
-use SokoWeb\PersistentData\PersistentDataManager;
 
 class OAuthClientRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $id): ?OAuthClient
     {
-        return $this->pdm->selectFromDbById($id, OAuthClient::class);
+        return \Container::$persistentDataManager->selectFromDbById($id, OAuthClient::class);
     }
 
     public function getByClientId(string $clientId): ?OAuthClient
@@ -23,6 +15,6 @@ class OAuthClientRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('client_id', '=', $clientId);
 
-        return $this->pdm->selectFromDb($select, OAuthClient::class);
+        return \Container::$persistentDataManager->selectFromDb($select, OAuthClient::class);
     }
 }

src/Repository/OAuthTokenRepository.php

@@ -4,20 +4,12 @@ use DateTime;
 use Generator;
 use SokoWeb\Database\Query\Select;
 use RVR\PersistentData\Model\OAuthToken;
-use SokoWeb\PersistentData\PersistentDataManager;
 
 class OAuthTokenRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $id): ?OAuthToken
     {
-        return $this->pdm->selectFromDbById($id, OAuthToken::class);
+        return \Container::$persistentDataManager->selectFromDbById($id, OAuthToken::class);
     }
 
     public function getByCode(string $code): ?OAuthToken
@@ -25,7 +17,7 @@ class OAuthTokenRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('code', '=', $code);
 
-        return $this->pdm->selectFromDb($select, OAuthToken::class);
+        return \Container::$persistentDataManager->selectFromDb($select, OAuthToken::class);
     }
 
     public function getByAccessToken(string $accessToken): ?OAuthToken
@@ -33,7 +25,7 @@ class OAuthTokenRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('access_token', '=', $accessToken);
 
-        return $this->pdm->selectFromDb($select, OAuthToken::class);
+        return \Container::$persistentDataManager->selectFromDb($select, OAuthToken::class);
     }
 
     public function getAllExpired(): Generator
@@ -41,6 +33,6 @@ class OAuthTokenRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('expires', '<', (new DateTime())->format('Y-m-d H:i:s'));
 
-        yield from $this->pdm->selectMultipleFromDb($select, OAuthToken::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, OAuthToken::class);
     }
 }

src/Repository/TransactionRepository.php

@@ -0,0 +1,72 @@
+<?php namespace RVR\Repository;
+
+use Container;
+use Generator;
+use RVR\PersistentData\Model\Community;
+use RVR\PersistentData\Model\Currency;
+use RVR\PersistentData\Model\Transaction;
+use RVR\PersistentData\Model\User;
+use SokoWeb\Database\Query\Select;
+
+class TransactionRepository
+{
+    public function getById(int $id): ?Transaction
+    {
+        return Container::$persistentDataManager->selectFromDbById($id, Transaction::class);
+    }
+
+    public function getAllByCommunity(Community $community, bool $useRelations = false, array $withRelations = []): Generator
+    {
+        $select = $this->selectAllByCommunity($community);
+
+        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Transaction::class, $useRelations, $withRelations);
+    }
+
+    public function countAllByCommunity(Community $community): int
+    {
+        return $this->selectAllByCommunity($community)->count();
+    }
+
+    public function isAnyForUser(User $user): bool
+    {
+        $select = new Select(Container::$dbConnection, Transaction::getTable());
+        $select->where('payer_user_id', '=', $user->getId());
+        $select->orWhere('payee_user_id', '=', $user->getId());
+        $select->orWhere('payee_user_id', '=', null);
+
+        return $select->count() > 0;
+    }
+
+    public function isAnyCommon(): bool
+    {
+        $select = new Select(Container::$dbConnection, Transaction::getTable());
+        $select->where('payee_user_id', '=', null);
+
+        return $select->count() > 0;
+    }
+
+    public function isAnyForCurrency(Currency $currency): bool
+    {
+        $select = new Select(Container::$dbConnection, Transaction::getTable());
+        $select->where('currency_id', '=', $currency->getId());
+
+        return $select->count() > 0;
+    }
+
+    public function getPagedByCommunity(Community $community, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
+    {
+        $select = new Select(Container::$dbConnection);
+        $select->where('community_id', '=', $community->getId());
+        $select->orderBy('time', 'DESC');
+        $select->limit($limit, $start);
+
+        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Transaction::class, $useRelations, $withRelations);
+    }
+
+    private function selectAllByCommunity(Community $community)
+    {
+        $select = new Select(Container::$dbConnection, Transaction::getTable());
+        $select->where('community_id', '=', $community->getId());
+        return $select;
+    }
+}

src/Repository/UserPasswordResetterRepository.php

@@ -5,20 +5,12 @@ use Generator;
 use SokoWeb\Database\Query\Select;
 use RVR\PersistentData\Model\User;
 use RVR\PersistentData\Model\UserPasswordResetter;
-use SokoWeb\PersistentData\PersistentDataManager;
 
 class UserPasswordResetterRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $userConfirmationId): ?UserPasswordResetter
     {
-        return $this->pdm->selectFromDbById($userConfirmationId, UserPasswordResetter::class);
+        return \Container::$persistentDataManager->selectFromDbById($userConfirmationId, UserPasswordResetter::class);
     }
 
     public function getByToken(string $token): ?UserPasswordResetter
@@ -26,7 +18,7 @@ class UserPasswordResetterRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('token', '=', $token);
 
-        return $this->pdm->selectFromDb($select, UserPasswordResetter::class);
+        return \Container::$persistentDataManager->selectFromDb($select, UserPasswordResetter::class);
     }
 
     public function getByUser(User $user): ?UserPasswordResetter
@@ -34,7 +26,7 @@ class UserPasswordResetterRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $user->getId());
 
-        return $this->pdm->selectFromDb($select, UserPasswordResetter::class);
+        return \Container::$persistentDataManager->selectFromDb($select, UserPasswordResetter::class);
     }
 
     public function getAllExpired(): Generator
@@ -42,6 +34,6 @@ class UserPasswordResetterRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('expires', '<', (new DateTime())->format('Y-m-d H:i:s'));
 
-        yield from $this->pdm->selectMultipleFromDb($select, UserPasswordResetter::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserPasswordResetter::class);
     }
 }

src/Repository/UserRepository.php

@@ -4,20 +4,12 @@ use Generator;
 use SokoWeb\Interfaces\Repository\IUserRepository;
 use SokoWeb\Database\Query\Select;
 use RVR\PersistentData\Model\User;
-use SokoWeb\PersistentData\PersistentDataManager;
 
 class UserRepository implements IUserRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $userId): ?User
     {
-        return $this->pdm->selectFromDbById($userId, User::class);
+        return \Container::$persistentDataManager->selectFromDbById($userId, User::class);
     }
 
     public function getByEmail(string $email): ?User
@@ -25,7 +17,7 @@ class UserRepository implements IUserRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('email', '=', $email);
 
-        return $this->pdm->selectFromDb($select, User::class);
+        return \Container::$persistentDataManager->selectFromDb($select, User::class);
     }
 
     public function getByUsername(string $username): ?User
@@ -33,7 +25,7 @@ class UserRepository implements IUserRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('username', '=', $username);
 
-        return $this->pdm->selectFromDb($select, User::class);
+        return \Container::$persistentDataManager->selectFromDb($select, User::class);
     }
 
     public function getByEmailOrUsername(string $emailOrUsername): ?User
@@ -50,7 +42,7 @@ class UserRepository implements IUserRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('google_sub', '=', $sub);
 
-        return $this->pdm->selectFromDb($select, User::class);
+        return \Container::$persistentDataManager->selectFromDb($select, User::class);
     }
 
     public function searchByName(string $name): Generator
@@ -60,6 +52,6 @@ class UserRepository implements IUserRepository
         $select->orWhere('nickname', 'LIKE', '%' . $name . '%');
         $select->limit(10);
 
-        yield from $this->pdm->selectMultipleFromDb($select, User::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, User::class);
     }
 }

views/account/account.php

@@ -4,17 +4,17 @@
 
 @section(main)
     <h2>Account</h2>
-    <div class="box">
+    <div class="box compactBox">
         <form id="accountForm" action="<?= Container::$routeCollection->getRoute('account-action')->generateLink() ?>" method="post" data-reload-on-success="true" data-observe-inputs="email,username,password_new,password_new_confirm,nickname,phone,id_number">
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to modify your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" class="text" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text" name="password" autocomplete="current-password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to modify your account.</p>
-                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" autocomplete="current-password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to modify your account.</p>
                 <div class="inputWithButton">
@@ -23,18 +23,26 @@
                 </div>
             <?php endif; ?>
             <hr>
-            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $user['email'] ?>">
-            <input type="text" class="text big fullWidth marginTop" name="username" placeholder="Username" value="<?= $user['username'] ?>">
-            <input type="password" class="text big fullWidth marginTop" name="password_new" placeholder="New password" minlength="6">
-            <input type="password" class="text big fullWidth marginTop" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
+            <p class="formLabel">Email address</p>
+            <input type="email" class="text big fullWidth" name="email" autocomplete="username" value="<?= $user['email'] ?>">
+            <p class="formLabel marginTop">Username</p>
+            <input type="text" class="text big fullWidth" name="username" value="<?= $user['username'] ?>">
+            <p class="formLabel marginTop">New password</p>
+            <input type="password" class="text big fullWidth" name="password_new" autocomplete="new-password" minlength="6">
+            <p class="formLabel marginTop">New password confirmation</p>
+            <input type="password" class="text big fullWidth" name="password_new_confirm" autocomplete="new-password" minlength="6">
             <hr>
-            <input type="text" class="text big fullWidth marginTop" name="full_name" placeholder="Full name" value="<?= $user['full_name'] ?>" disabled>
-            <input type="text" class="text big fullWidth marginTop" name="nickname" placeholder="Nickname" value="<?= $user['nickname'] ?>">
-            <input type="text" class="text big fullWidth marginTop" name="phone" placeholder="Phone" value="<?= $user['phone'] ?>">
-            <input type="text" class="text big fullWidth marginTop" name="id_number" placeholder="ID number" value="<?= $user['id_number'] ?>">
+            <p class="formLabel marginTop">Full name</p>
+            <input type="text" class="text big fullWidth" name="full_name" value="<?= $user['full_name'] ?>" disabled>
+            <p class="formLabel marginTop marginTop">Nickname</p>
+            <input type="text" class="text big fullWidth" name="nickname" value="<?= $user['nickname'] ?>">
+            <p class="formLabel marginTop marginTop">Phone</p>
+            <input type="text" class="text big fullWidth" name="phone" value="<?= $user['phone'] ?>">
+            <p class="formLabel marginTop marginTop">ID number</p>
+            <input type="text" class="text big fullWidth" name="id_number" value="<?= $user['id_number'] ?>">
             <p id="accountFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
-                <button type="submit" name="submit" disabled>Save</button>
+                <button type="submit" name="submit_button" disabled>Save</button>
             </div>
         </form>
     </div>

views/account/google_authenticate.php

@@ -5,7 +5,7 @@
 @section(main)
     <h2>Authenticate with Google</h2>
     <?php if (!$success): ?>
-    <div class="box">
+    <div class="box compactBox">
         <p class="error justify">
             <?php if (isset($errorText)): ?>
                 <?= $errorText ?>

views/communities/community.php

@@ -1,24 +1,16 @@
 @extends(templates/layout_normal)
 
 @section(main)
-    <h2><?= $community->getName() ?> <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-edit')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span></h2>
+    <h2>
+        <?= $community->getName() ?>
+        <?php if ($editPermission): ?>
+            <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community.edit')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
+        <?php endif; ?>
+    </h2>
+
+    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.settings')->generateLink(['communityId' => $community->getId()]) ?>">Settings</a></p>
 
     <div class="gridContainer marginTop">
-        <div>
-            <h3 class="marginBottom">Members</h3>
-            <?php foreach ($members as $member): ?>
-                <p><?= $member->getUser()->getDisplayName() ?></p>
-            <?php endforeach; ?>
-            <?php if ($editPermission): ?>
-                <hr>
-                <p><a href="<?= Container::$routeCollection->getRoute('community-members')->generateLink(['communityId' => $community->getId()]) ?>">Edit members</a></p>
-            <?php endif; ?>
-        </div>
-        <div>
-            <h3 class="marginBottom">Currencies</h3>
-            <p>Main currency: <b><?= $community->getCurrency() ?></b></p>
-            <p>Further currencies: <b><?= implode(', ', $currencyNames) ?></b></p>
-        </div>
         <div>
             <h3 class="marginBottom">Upcoming events</h3>
             <?php if (count($upcomingEvents) > 0): ?>
@@ -30,19 +22,36 @@
             <?php endif; ?>
         </div>
         <div>
+            <?php
+            $mainCurrencyCode = $community->getMainCurrency()->getCode();
+            $mainCurrencyRoundDigits = $community->getMainCurrency()->getRoundDigits();
+            ?>
             <h3 class="marginBottom">Finances</h3>
-            <table class="fullWidth">
+            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId()]) ?>">Transactions</a>
+            <table class="fullWidth marginTop">
                 <tr>
-                    <td>You owe</td>
-                    <td style="text-align: right; color: red;">0 <?= $community->getCurrency() ?></td>
+                    <td class="bold">You owe</td>
+                    <td class="mono red" style="text-align: right;"><?= number_format($debtBalance, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
                 </tr>
+                <?php foreach ($debtItems as $item): ?>
                     <tr>
-                    <td>You're owed</td>
-                    <td style="text-align: right; color: green;">0 <?= $community->getCurrency() ?></td>
+                        <td class="small"><?= $item['payee']->getUser()->getDisplayName() ?></td>
+                        <td class="small mono red" style="text-align: right;"><?= number_format($item['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
                     </tr>
+                <?php endforeach; ?>
                 <tr>
-                    <td>Your balance</td>
-                    <td style="text-align: right;">0 <?= $community->getCurrency() ?></td>
+                    <td class="bold">You're owed</td>
+                    <td class="mono green" style="text-align: right;"><?= number_format($outstandingBalance, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
+                </tr>
+                <?php foreach ($outstandingItems as $item): ?>
+                    <tr>
+                        <td class="small"><?= $item['payer']->getUser()->getDisplayName() ?></td>
+                        <td class="small mono green" style="text-align: right;"><?= number_format($item['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
+                    </tr>
+                <?php endforeach; ?>
+                <tr>
+                    <td class="bold">Your balance</td>
+                    <td class="mono <?= $balance < 0 ? 'red' : ($balance > 0 ? 'green' : '') ?>" style="text-align: right;;"><?= number_format($balance, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
                 </tr>
             </table>
         </div>

views/communities/community_currencies.php

@@ -0,0 +1,51 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>
+        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        <a href="<?= Container::$routeCollection->getRoute('community.settings')->generateLink(['communityId' => $community->getId()]) ?>">Settings</a> »
+        Edit currencies
+    </h2>
+    <div class="box compactBox">
+        <table class="fullWidth">
+            <thead>
+                <tr>
+                    <th style="width: calc(100% / 3); text-align: left;">Code</th>
+                    <th style="width: calc(100% / 3); text-align: left;">Round digits</th>
+                    <th style="width: calc(100% / 3);"></th>
+                </tr>
+            </thead>
+            <?php foreach ($currencies as $currency): ?>
+                <tr>
+                    <td>
+                        <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>
+                        <input type="number" form="editCurrency_<?= $currency->getId() ?>" class="text fullWidth" name="round_digits" value="<?= $currency->getRoundDigits() ?>" min="0" max="9" required>
+                    </td>
+                    <td style="text-align: right; font-size: 0;">
+                        <button type="submit" form="editCurrency_<?= $currency->getId() ?>" name="submit_button" class="small" disabled>Save</button>
+                        <?php if ($currency->getId() !== $community->getMainCurrencyId()): ?>
+                            <button type="submit" form="deleteCurrency_<?= $currency->getId() ?>" name="submit_button" data-confirmation="Are you sure you want to delete this currency?" class="small red marginLeft">Delete</button>
+                        <?php endif; ?>
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+            <tr>
+                <td>
+                    <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" maxlength="3" required>
+                </td>
+                <td>
+                    <input type="number" form="newCurrency" class="text fullWidth" name="round_digits" min="0" max="9" required>
+                </td>
+                <td style="text-align: right;">
+                    <button type="submit" form="newCurrency" name="submit_button" class="small" disabled>Add</button>
+                </td>
+            </tr>
+        </table>
+        <p class="formError justify marginTop"></p>
+    </div>
+@endsection

views/communities/community_edit.php

@@ -1,19 +1,32 @@
 @extends(templates/layout_normal)
 
 @section(main)
-    <h2><?= isset($community) ? $community->getName() . ' - Edit' : 'New community' ?></h2>
-    <div class="box">
+    <h2>
+        <?php if (isset($community)): ?>
+            <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+            Edit
+        <?php else: ?>
+            New community
+        <?php endif; ?>
+    </h2>
+    <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>
-            <input type="text" class="text big fullWidth marginTop" name="currency" value="<?= isset($community) ? $community->getCurrency() : '' ?>" placeholder="Default currency" maxlength="3" required>
-            <p id="accountFormError" class="formError justify marginTop"></p>
+            <p class="formLabel">Name</p>
+            <input type="text" class="text big fullWidth" name="name" value="<?= isset($community) ? $community->getName() : '' ?>" required>
+            <?php if (!isset($community)): ?>
+                <p class="formLabel marginTop">Main currency code</p>
+                <input type="text" class="text big fullWidth" name="main_currency_code" maxlength="3" required>
+                <p class="formLabel marginTop">Main currency round digits</p>
+                <input type="number" class="text big fullWidth" name="main_currency_round_digits" min="0" max="9" required>
+            <?php endif; ?>
+            <p id="communityFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
-                <button type="submit" name="submit"><?= isset($community) ? 'Save' : 'Create' ?></button>
+                <button type="submit" name="submit_button"><?= isset($community) ? 'Save' : 'Create' ?></button>
             </div>
         </form>
     </div>

views/communities/community_members.php

@@ -1,16 +1,20 @@
-@css(node_modules/choices.js/public/assets/styles/choices.min.css)
-@js(node_modules/choices.js/public/assets/scripts/choices.js)
+@css(/static/node_modules/tom-select/dist/css/tom-select.min.css)
+@js(/static/node_modules/tom-select/dist/js/tom-select.base.min.js)
 @js(js/communities/community_members.js)
 
 @extends(templates/layout_normal)
 
 @section(main)
-    <h2><?= $community->getName() ?> - Edit members</h2>
-    <div class="box">
+    <h2>
+        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        <a href="<?= Container::$routeCollection->getRoute('community.settings')->generateLink(['communityId' => $community->getId()]) ?>">Settings</a> »
+        Edit members
+    </h2>
+    <div class="box compactBox">
         <table class="fullWidth">
             <thead>
                 <tr>
-                    <th style="width: 50%;"></th>
+                    <th style="width: 50%;">User</th>
                     <th style="width: 25%; text-align: center;">Owner</th>
                     <th style="width: 25%;"></th>
                 </tr>
@@ -18,25 +22,41 @@
             <?php foreach ($members as $member): ?>
                 <?php $editable = $member->getUserId() !== Container::$request->user()->getUniqueId(); ?>
                 <tr>
-                    <td><?= $member->getUser()->getDisplayName() ?></td>
-                    <td style="text-align: center;"><input type="checkbox" class="member_owner" data-id="<?= $member->getId() ?>" <?= $member->getOwner() ? 'checked' : '' ?> <?= !$editable ? 'disabled' : '' ?> /></td>
-                    <td style="text-align: right;"><button type="button" class="small red delete_member" data-id="<?= $member->getId() ?>" <?= !$editable ? 'disabled' : '' ?>>Delete</button></td>
+                    <td>
+                        <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;">
+                        <input type="checkbox" form="editMember_<?= $member->getId() ?>" name="owner" <?= $member->getOwner() ? 'checked' : '' ?> <?= !$editable ? 'disabled' : '' ?> />
+                    </td>
+                    <td style="text-align: right;">
+                        <?php if ($editable): ?>
+                            <button type="submit" form="editMember_<?= $member->getId() ?>" name="submit_button" class="small marginRight" disabled>Save</button><!--
+                         --><button type="submit" form="deleteMember_<?= $member->getId() ?>" name="submit_button" data-confirmation="Are you sure you want to delete this member?" class="small red">Delete</button>
+                        <?php endif; ?>
+                    </td>
                 </tr>
             <?php endforeach; ?>
             <tr>
-                <td><select type="text" id="new_member_user_id"></td>
-                <td></td>
-                <td style="text-align: right;"><button type="button" class="small" id="new_member_button" disabled>Add</button></td>
+                <td>
+                    <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;">
+                    <input type="checkbox" form="newMember" name="owner" />
+                </td>
+                <td style="text-align: right;">
+                    <button type="submit" form="newMember" name="submit_button" class="small" disabled>Add</button>
+                </td>
             </tr>
         </table>
+        <p class="formError justify marginTop"></p>
     </div>
 @endsection
 
 @section(pageScript)
 <script>
     var searchUserUrl = '<?= Container::$routeCollection->getRoute('searchUser')->generateLink(['q' => 'QUERY']) ?>';
-    var newMemberUrl = '<?= Container::$routeCollection->getRoute('community-members-new')->generateLink(['communityId' => $community->getId()]) ?>';
-    var editMemberUrl = '<?= Container::$routeCollection->getRoute('community-members-edit')->generateLink(['communityId' => $community->getId()]) ?>';
-    var deleteMemberUrl = '<?= Container::$routeCollection->getRoute('community-members-delete')->generateLink(['communityId' => $community->getId()]) ?>';
 </script>
 @endsection

views/communities/community_settings.php

@@ -0,0 +1,39 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>
+        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        Settings
+    </h2>
+
+    <div class="gridContainer marginTop">
+        <div>
+            <h3 class="marginBottom">
+                Members
+                <?php if ($editPermission): ?>
+                    <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): ?>
+                <p><?= $member->getUser()->getDisplayName() ?></p>
+            <?php endforeach; ?>
+        </div>
+        <div>
+            <h3 class="marginBottom">
+                Currencies
+                <?php if ($editPermission): ?>
+                    <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): ?>
+                <p>
+                    <?php if ($currency->getId() === $community->getMainCurrencyId()): ?>
+                        <b><?= $currency->getCode() ?></b>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community.currencyExchangeRates')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode()]) ?>"><?= $currency->getCode() ?></a>
+                    <?php endif; ?>
+                </p>
+            <?php endforeach; ?>
+        </div>
+    </div>
+@endsection

views/communities/currency_exchange_rates.php

@@ -0,0 +1,61 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>
+        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        <a href="<?= Container::$routeCollection->getRoute('community.settings')->generateLink(['communityId' => $community->getId()]) ?>">Settings</a> »
+        Exchange rates for <?= $currency->getCode() ?>
+    </h2>
+    <div class="box compactBox">
+        <table class="fullWidth">
+            <thead>
+                <tr>
+                    <?php if ($editPermission): ?>
+                        <th style="width: 25%; text-align: left;">Exchange rate</th>
+                        <th style="width: 50%; text-align: left;">Valid from</th>
+                        <th style="width: 25%;"></th>
+                    <?php else: ?>
+                        <th style="width: 35%; text-align: left;">Exchange rate</th>
+                        <th style="width: 65%; text-align: left;">Valid from</th>
+                    <?php endif; ?>
+                </tr>
+            </thead>
+            <?php foreach ($currencyExchangeRates as $currencyExchangeRate): ?>
+                <tr>
+                    <?php if ($editPermission): ?>
+                        <td>
+                            <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>
+                            <input type="datetime-local" form="editExchangeRate_<?= $currencyExchangeRate->getId() ?>" class="text fullWidth" name="valid_from" value="<?= $currencyExchangeRate->getValidFromDate()->format('Y-m-d\TH:i') ?>" required>
+                        </td>
+                        <td style="text-align: right;">
+                            <button type="submit" form="editExchangeRate_<?= $currencyExchangeRate->getId() ?>" name="submit_button" class="small marginRight" disabled>Save</button><!--
+                         --><button type="submit" form="deleteCurrency_<?= $currencyExchangeRate->getId() ?>" name="submit_button" data-confirmation="Are you sure you want to delete this exchange rate?" class="small red">Delete</button>
+                        </td>
+                    <?php else: ?>
+                        <td><?= $currencyExchangeRate->getExchangeRate() ?></td>
+                        <td><?= $currencyExchangeRate->getValidFromDate()->format('Y-m-d H:i') ?></td>
+                    <?php endif; ?>
+                </tr>
+            <?php endforeach; ?>
+            <?php if ($editPermission): ?>
+                <tr>
+                    <td>
+                        <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" min="0" step="0.000000001" required>
+                    </td>
+                    <td>
+                        <input type="datetime-local" form="newExchangeRate" class="text fullWidth" name="valid_from" required>
+                    </td>
+                    <td style="text-align: right;">
+                        <button type="submit" form="newExchangeRate" name="submit_button" class="small" disabled>Add</button>
+                    </td>
+                </tr>
+            <?php endif; ?>
+        </table>
+        <p class="formError justify marginTop"></p>
+    </div>
+@endsection

views/communities/transaction_edit.php

@@ -0,0 +1,59 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>
+        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId()]) ?>">Transactions</a> »
+        <?php if (isset($transaction)): ?>
+            Edit transaction
+        <?php else: ?>
+            New transaction
+        <?php endif; ?>
+    </h2>
+    <div class="box compactBox">
+        <?php
+        $formAction = isset($transaction) ?
+            Container::$routeCollection->getRoute('community.transactions.edit-action')->generateLink(['communityId' => $community->getId(), 'transactionId' => $transaction->getId()]) :
+            Container::$routeCollection->getRoute('community.transactions.new-action')->generateLink(['communityId' => $community->getId()]);
+        ?>
+        <form id="transactionForm" action="<?= $formAction ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId()]) ?>">
+            <p class="formLabel">Payer</p>
+            <select class="big fullWidth" name="payer_user_id" required>
+                <option value="" hidden></option>
+                <?php foreach ($members as $member): ?>
+                    <option value="<?= $member->getUser()->getId() ?>" <?= isset($transaction) && $transaction->getPayerUserId() === $member->getUser()->getId() ? 'selected' : '' ?>><?= $member->getUser()->getDisplayName() ?></option>
+                <?php endforeach; ?>
+            </select>
+            <p class="formLabel marginTop">Payee</p>
+            <select class="big fullWidth" name="payee_user_id">
+                <option value="">[common]</option>
+                <?php foreach ($members as $member): ?>
+                    <option value="<?= $member->getUser()->getId() ?>" <?= isset($transaction) && $transaction->getPayeeUserId() === $member->getUser()->getId() ? 'selected' : '' ?>><?= $member->getUser()->getDisplayName() ?></option>
+                <?php endforeach; ?>
+            </select>
+            <p class="formLabel marginTop">Description</p>
+            <input type="text" class="text big fullWidth" name="description" value="<?= isset($transaction) ? $transaction->getDescription() : '' ?>" required>
+            <p class="formLabel marginTop">Sum</p>
+            <input type="number" class="text big fullWidth" name="sum" value="<?= isset($transaction) ? $transaction->getSum() : '' ?>" min="0" step="0.000000001" required>
+            <p class="formLabel marginTop">Currency</p>
+            <select class="big fullWidth" name="currency_id" required>
+                <option value="" hidden></option>
+                <?php foreach ($currencies as $currency): ?>
+                    <option value="<?= $currency->getId() ?>" <?= isset($transaction) && $transaction->getCurrencyId() === $currency->getId() ? 'selected' : '' ?>><?= $currency->getCode() ?></option>
+                <?php endforeach; ?>
+            </select>
+            <p class="formLabel marginTop">Time</p>
+            <input type="datetime-local" class="text big fullWidth" name="time" value="<?= isset($transaction) ? $transaction->getTimeDate()->format('Y-m-d\TH:i') : (new DateTime())->format('Y-m-d\TH:i') ?>" required>
+            <p class="formError justify marginTop"></p>
+            <div class="right marginTop" style="font-size: 0;">
+                <button type="submit" name="submit_button"><?= isset($transaction) ? 'Save' : 'Create' ?></button>
+                <?php if (isset($transaction)): ?>
+                    <button type="submit" form="deleteTransaction"  name="submit_button" data-confirmation="Are you sure you want to delete this transaction?" class="red marginRight">Delete</button>
+                <?php endif; ?>
+            </div>
+        </form>
+        <?php if (isset($transaction)): ?>
+            <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

views/communities/transactions.php

@@ -0,0 +1,68 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>
+        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        Transactions
+    </h2>
+
+    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communityId' => $community->getId()]) ?>">New transaction</a></p>
+
+    <?php if ($numberOfTransactions > 0): ?>
+        <?php if ($pages > 1): ?>
+            <p class="paginateContainer marginTop">
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => 0]) ?>">«</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
+                <?php for ($i = 0; $i < $pages; $i++): ?>
+                    <?php if ($currentPage == $i): ?>
+                        <span class="selected"><?= $i + 1 ?></span>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
+                    <?php endif; ?>
+                <?php endfor; ?>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $pages - 1]) ?>">»</a>
+            </p>
+        <?php endif; ?>
+
+        <?php foreach ($transactions as $transaction): ?>
+            <a class="block" href="<?= Container::$routeCollection->getRoute('community.transactions.edit')->generateLink(['communityId' => $community->getId(), 'transactionId' => $transaction->getId()]) ?>">
+            <div class="box transaction">
+                <div>
+                    <p style="font-weight: bold;"><?= $transaction->getDescription() ?></p>
+                    <p class="small"><?= $transaction->getPayerUser()->getDisplayName() ?> ► <?= $transaction->getPayeeUser() ? $transaction->getPayeeUser()->getDisplayName() : '[common]' ?></p>
+                    <p class="small"><?= $transaction->getTimeDate()->format('Y-m-d H:i') ?></p>
+                </div>
+                <div style="text-align: right;">
+                    <h3><?= number_format($exchangeRateCalculator->calculate($transaction->getSum(), $transaction->getCurrency(), $transaction->getTimeDate()), $community->getMainCurrency()->getRoundDigits()) ?> <?= $community->getMainCurrency()->getCode() ?></h3>
+                    <?php if ($community->getMainCurrencyId() !== $transaction->getCurrencyId()): ?>
+                        <p style="color: #8e8e8e; font-weight: bold;"><?= number_format($transaction->getSum(), $transaction->getCurrency()->getRoundDigits()) ?> <?= $transaction->getCurrency()->getCode() ?></p>
+                    <?php endif; ?>
+                </div>
+            </div>
+            </a>
+        <?php endforeach; ?>
+
+        <?php if ($pages > 1): ?>
+            <p class="paginateContainer marginTop">
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => 0]) ?>">«</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
+                <?php for ($i = 0; $i < $pages; $i++): ?>
+                    <?php if ($currentPage == $i): ?>
+                        <span class="selected"><?= $i + 1 ?></span>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
+                    <?php endif; ?>
+                <?php endfor; ?>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $pages - 1]) ?>">»</a>
+            </p>
+        <?php endif; ?>
+
+        <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communityId' => $community->getId()]) ?>">New transaction</a></p>
+    <?php else: ?>
+        <div class="box">
+            <p>There are no transactions yet.</p>
+        </div>
+    <?php endif; ?>
+@endsection

views/error/500.php

@@ -0,0 +1,11 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>500 | Internal server error</h2>
+    <p>An error occured during processing your request. <a href="<?= Container::$routeCollection->getRoute('home')->generateLink() ?>" title="<?= $_ENV['APP_NAME'] ?>">Back to start.</a></p>
+    <?php if (isset($exceptionToPrint)): ?>
+            <pre class="marginTop">
+<?= $exceptionToPrint ?>
+            </pre>
+    <?php endif; ?>
+@endsection

views/home.php

@@ -3,7 +3,10 @@
 @section(main)
     <div class="gridContainer">
         <div>
-            <h3 class="marginBottom">Communities</h3>
+            <h3 class="marginBottom">
+                Communities
+                <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): ?>
                     <p><a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a></p>
@@ -11,8 +14,6 @@
             <?php else: ?>
                 <p>You have no community.</p>
             <?php endif; ?>
-            <hr>
-            <p><a href="<?= Container::$routeCollection->getRoute('community-new')->generateLink() ?>">New community</a></p>
         </div>
         <div>
             <h3 class="marginBottom">Upcoming events</h3>

views/login/google_login_error.php

@@ -2,7 +2,7 @@
 
 @section(main)
     <h2>Login up with Google</h2>
-    <div class="box">
+    <div class="box compactBox">
         <p class="error justify"><?= $error ?></p>
     </div>
 @endsection

views/login/login.php

@@ -2,18 +2,20 @@
 
 @section(main)
     <h2>Login</h2>
-    <div class="box">
+    <div class="box compactBox">
         <form id="loginForm" action="<?= Container::$routeCollection->getRoute('login-action')->generateLink() ?>" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
-            <input type="text" class="text big fullWidth" name="email" placeholder="Email address / Username" required autofocus>
-            <input type="password"  class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6">
+            <p class="formLabel">Email address / Username</p>
+            <input type="text" class="text big fullWidth" name="email" autocomplete="username" required autofocus>
+            <p class="formLabel marginTop">Password</p>
+            <input type="password" class="text big fullWidth" name="password" autocomplete="current-password" required minlength="6">
             <p id="loginFormError" class="formError justify marginTop"></p>
             <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>

views/login/password_reset_request.php

@@ -4,9 +4,10 @@
 
 @section(main)
     <h2>Request password reset</h2>
-    <div class="box">
-        <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>
+    <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() ?>">
+            <p class="formLabel">Email address</p>
+            <input type="email" class="text big fullWidth" name="email" value="<?= isset($email) ? $email : '' ?>" required autofocus>
             <?php if (!empty($_ENV['RECAPTCHA_SITEKEY'])): ?>
                 <div class="marginTop">
                     <div class="g-recaptcha" data-sitekey="<?= $_ENV['RECAPTCHA_SITEKEY'] ?>"></div>

views/login/password_reset_request_success.php

@@ -2,7 +2,7 @@
 
 @section(main)
     <h2>Request password reset</h2>
-    <div class="box">
+    <div class="box compactBox">
         <p class="justify">Password reset was successfully requested. Please check your email and click on the link to reset your password!</p>
     </div>
 @endsection

views/login/reset_password.php

@@ -2,19 +2,22 @@
 
 @section(main)
     <h2>Reset password</h2>
-    <div class="box">
+    <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 ?>">
-                <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">
+            <form id="resetPasswordForm" action="<?= Container::$routeCollection->getRoute('password.reset-action')->generateLink(['token' => $token]) ?>"" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
+                <p class="formLabel">Email address</p>
+                <input type="text" class="text big fullWidth" name="email" autocomplete="username" value="<?= $email ?>" disabled>
+                <p class="formLabel marginTop">Password</p>
+                <input type="password" class="text big fullWidth" name="password" autocomplete="new-password" required minlength="6" autofocus>
+                <p class="formLabel marginTop">Password confirmation</p>
+                <input type="password" class="text big fullWidth" name="password_confirm"  autocomplete="new-password" required minlength="6">
                 <p id="resetPasswordFormError" class="formError justify marginTop"></p>
                 <div class="right">
                     <button class="marginTop" type="submit">Reset password</button>
                 </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

views/oauth/oauth_error.php

@@ -2,7 +2,7 @@
 
 @section(main)
     <h2>OAuth error</h2>
-    <div class="box">
+    <div class="box compactBox">
         <p class="error justify"><?= $error ?></p>
     </div>
 @endsection

views/templates/rvr.php

@@ -9,13 +9,14 @@
     <?php if (preg_match('/^(http(s)?:)?\/\//', $_ENV['STATIC_ROOT']) === 1): ?>
         <link href="<?= $_ENV['STATIC_ROOT'] ?>" rel="preconnect">
     <?php endif; ?>
-    <link href="https://fonts.gstatic.com" rel="preconnect">
+    <link href="https://fonts.googleapis.com" rel="preconnect">
+    <link href="https://fonts.gstatic.com" rel="preconnect" crossorigin>
     <?php if (!empty($_ENV['GOOGLE_ANALITICS_ID'])): ?>
         <link href="https://www.googletagmanager.com" rel="preconnect">
         <link href="https://www.google-analytics.com" rel="preconnect">
     <?php endif; ?>
-    <link href="https://fonts.googleapis.com/css2?family=Oxygen:wght@400;700&amp;display=swap" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css2?family=Oxygen+Mono:wght@400&amp;display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Oxygen:wght@400;700&amp;display=block" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Oxygen+Mono:wght@400&amp;display=block" rel="stylesheet">
     <link href="<?= $_ENV['STATIC_ROOT'] ?>/css/rvr.css?rev=<?= REVISION ?>" rel="stylesheet">
     @yields('externalCss')
     @yields('inlineCss')

web.php

@@ -1,10 +1,10 @@
 <?php
 
-use Container;
 use SokoWeb\Response\HttpResponse;
 use SokoWeb\Routing\RouteCollection;
 use SokoWeb\Session\DatabaseSessionHandler;
 use SokoWeb\Request\Request;
+use SokoWeb\Request\Session;
 use RVR\Controller\HomeController;
 use RVR\Controller\LoginController;
 use RVR\Controller\OAuthAuthController;
@@ -12,6 +12,7 @@ use RVR\Controller\OAuthController;
 use RVR\Controller\UserController;
 use RVR\Controller\UserSearchController;
 use RVR\Controller\CommunityController;
+use RVR\Controller\TransactionController;
 use RVR\Repository\UserRepository;
 
 require 'app.php';
@@ -27,26 +28,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,46 +57,59 @@ 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-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, 'newMember']);
-        $routeCollection->post('community-members-edit', 'editMember', [CommunityController::class, 'editMember']);
-        $routeCollection->post('community-members-delete', 'deleteMember', [CommunityController::class, 'deleteMember']);
+        $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-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.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']);
+            $routeCollection->get('community.transactions.new', 'new', [TransactionController::class, 'getTransactionEdit']);
+            $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-action', '{transactionId}/delete', [TransactionController::class, 'deleteTransaction']);
+        });
     });
 });
 
-Container::$sessionHandler = new DatabaseSessionHandler();
+Container::$sessionHandler = new DatabaseSessionHandler(
+    Container::$dbConnection,
+    'sessions',
+    new DateTime('-7 days')
+);
 
 session_set_save_handler(Container::$sessionHandler, true);
 session_start([
     'gc_probability' => 0, // old sessions are deleted by MaintainDatabaseCommand
-    'cookie_lifetime' => 604800,
+    'cookie_lifetime' => 0,
     'cookie_path' => '/',
     'cookie_httponly' => true,
     'cookie_samesite' => 'Lax'
 ]);
 
-if (isset($_COOKIE[session_name()])) {
-    // extend session cookie lifetime is cookie already exists
-    setcookie(session_name(), session_id(), [
-        'expires' => time() + 604800,
-        'path' => '/',
-        'httponly' => true,
-        'samesite' => 'Lax'
-    ]);
-}
-
 Container::$request = new Request(
     $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'],
     $_GET,
     $_POST,
     getallheaders(),
-    $_SESSION,
+    new Session($_SESSION),
     new UserRepository()
 );
 
@@ -107,13 +120,15 @@ if (!Container::$request->session()->has('anti_csrf_token')) {
 $appConfig = [
     'antiCsrfTokenName' => 'anti_csrf_token',
     'antiCsrfTokenErrorResponse' => ['error' => 'no_valid_anti_csrf_token'],
-    'antiCsrfTokenExceptions' => ['oauth/token'],
+    'antiCsrfTokenExceptions' => ['/oauth/token'],
     'loginRouteId' => 'login',
-    'error404View' => 'error/404'
+    'error404View' => 'error/404',
+    'error500View' => 'error/500'
 ];
 
 $httpReponse = new HttpResponse(
     Container::$request,
+    Container::$dbConnection,
     Container::$routeCollection,
     $appConfig,
     $_SERVER['REQUEST_METHOD'],