Merge pull request 'feature/create-working-docker-images' (!68 ) from feature/create-working-docker-images into master

Reviewed-on: #68
update readme
2023-09-28 13:33:02 +02:00 · 2023-09-28 13:31:26 +02:00 · 2023-09-28 13:21:54 +02:00 · 2023-09-28 13:21:54 +02:00 · 2023-09-28 13:21:54 +02:00 · 2023-09-28 13:21:54 +02:00
46 changed files with 873 additions and 530 deletions
@@ -13,8 +13,9 @@ pipeline {
            }
            agent {
                dockerfile {
-                    filename 'docker/Dockerfile-test'
+                    filename 'docker/Dockerfile'
                    dir '.'
+                    additionalBuildArgs '--target rvr_base'
                    reuseNode true
                }
            }
@@ -26,8 +27,9 @@ pipeline {
        stage('Unit Testing') {
            agent {
                dockerfile {
-                    filename 'docker/Dockerfile-test'
+                    filename 'docker/Dockerfile'
                    dir '.'
+                    additionalBuildArgs '--target rvr_base'
                    reuseNode true
                }
            }
@@ -44,8 +46,9 @@ pipeline {
        stage('Static Code Analysis') {
            agent {
                dockerfile {
-                    filename 'docker/Dockerfile-test'
+                    filename 'docker/Dockerfile'
                    dir '.'
+                    additionalBuildArgs '--target rvr_base'
                    reuseNode true
                }
            }
@@ -58,5 +61,46 @@ pipeline {
                }
            }
        }
+
+        stage('Prepare Docker release') {
+            environment {
+                COMPOSER_HOME="${WORKSPACE}/.composer"
+                npm_config_cache="${WORKSPACE}/.npm"
+            }
+            agent {
+                dockerfile {
+                    filename 'docker/Dockerfile'
+                    dir '.'
+                    additionalBuildArgs '--target rvr_base'
+                    reuseNode true
+                }
+            }
+            steps {
+                script {
+                    sh script: 'git clean -ffdx', label: 'Clean repository'
+                    env.VERSION = sh(script: 'git describe --tags --always --match "Release_*" HEAD', returnStdout: true).trim()
+                    sh script: 'docker/scripts/release.sh', label: 'Release script'
+                    sh script: "rm -rf ${env.COMPOSER_HOME} ${env.npm_config_cache}"
+                }
+            }
+        }
+
+        stage('Release Docker image') {
+            steps {
+                script {
+                    withDockerRegistry([credentialsId: 'gitea-system-user', url: 'https://git.esoko.eu/']) {
+                        sh script: 'docker buildx create --use --bootstrap --platform=linux/arm64,linux/amd64 --name multi-platform-builder'
+                        sh script: """docker buildx build \
+                                        --platform linux/amd64,linux/arm64 \
+                                        -f docker/Dockerfile \
+                                        --target rvr_release \
+                                        -t git.esoko.eu/esoko/rvr:${env.VERSION} \
+                                        --push \
+                                        .""",
+                           label: 'Build Docker image'
+                    }
+                }
+            }
+        }
    }
 }
@@ -2,81 +2,81 @@

 [![Build Status](https://ci.esoko.eu/job/rvr-nextgen/job/master/badge/icon)](https://ci.esoko.eu/job/rvr-nextgen/job/master/)

-This is the RVR Application project. This is a game about guessing where you are based on a street view panorama - inspired by existing applications.
+This is the RVR Application project.

 ## Installation

-### Clone the Git repository
+### Set environment variables

-The first step is obviously cloning the repository to your machine:
+The `.env` file contains several environment variables that are needed by the application to work properly. These should be configured for your environment. Check `.env.example` for reference.
+
+**Important: `DEV` should NOT be set for production! See section Development if you want to use the application in development mode.**
+
+### Docker Compose
+
+Create a `docker-compose.yml` file. The example code below assumes that `.env` is placed in the same folder.
+
+```yml
+version: '3'
+services:
+    app:
+        image: git.esoko.eu/esoko/rvr:latest
+        depends_on:
+            mariadb:
+                condition: service_healthy
+        ports:
+            - 80:80
+        volumes:
+            - .env:/var/www/rvr/.env
+    mariadb:
+        image: mariadb:10.3
+        volumes:
+            - mysql:/var/lib/mysql
+        environment:
+            MYSQL_ROOT_PASSWORD: 'root'
+            MYSQL_DATABASE: 'rvr'
+            MYSQL_USER: 'rvr'
+            MYSQL_PASSWORD: 'rvr'
+        healthcheck:
+            test: ["CMD-SHELL", "mysqladmin -u $$MYSQL_USER -p$$MYSQL_PASSWORD ping -h localhost || exit 1"]
+            start_period: 5s
+            start_interval: 1s
+            interval: 5s
+            timeout: 5s
+            retries: 5
+volumes:
+    mysql:

-```
-git clone https://git.esoko.eu/esoko/rvr-nextgen.git
 ```

-All the commands listed here should be executed from the repository root.
-
-### Setup Docker stack (recommended)
-
-The easiest way to build up a fully working application with web server and database is to use Docker Compose with the included `docker-compose.yml`.
-
-All you have to do is executing the following command:
-
-```
+Execute the following command:
+```bash
 docker compose up -d
 ```

-Attach shell to the container of `rvr-nextgen-app`:

-```
-docker exec -it rvr-nextgen-app bash
-```
-
-All of the following commands should be executed there.
-
-### Manual setup (alternative)
-
-If you don't use the Docker stack you need to install your environment manually. Check `docker-compose.yml` and `docker/Dockerfile` to see the system requirements.
-
-### Initialize project
-
-This command installes all of the Composer requirements and creates a copy of the example `.env` file.
-
-```
-composer create-project
-```
-
-### Set environment variables
-
-The `.env` file contains several environment variables that are needed by the application to work properly. These should be configured for your environment.
-
-One very important variable is `DEV`. This indicates that the application operates in development (staging) and not in production mode.
-
-**Hint:** If you install the application in the Docker stack for development (staging) environment, only the variables for external dependencies (API keys, map attribution, etc.) should be adapted. All other variables (for DB connection, static root, mailing, multiplayer, etc.) are fine with the default value.
-
-### (Production only) Create cron job
-
-To maintain database (delete inactive users, old sessions etc.), the command `db:maintain` should be regularly executed. It is recommended to create a cron job that runs every hour:
-
-```
-0 * * * * /path/to/your/installation/rvr db:maintain >>/var/log/cron-rvr.log 2>&1
-```
-
-### Finalize installation
-
-After you followed the above steps, execute the following command:
-
-```
-scripts/install.sh
-```
-
-**And you are done!** The application is ready to use and develop. In development mode an administrative user is also created by the installation script, email is **rvr@rvr.dev**, password is **123456**. In production mode you should create the first administrative user with the following command:
+**And you are done!** The application is ready to use. You can create the first administrative user with the following command after attaching to the `app` container:

 ```
 ./rvr user:add EMAIL PASSWORD admin
 ```

-If you installed it in the Docker stack, you can reach it on http://localhost. The mails that are sent by the application can be found on http://localhost:8080/. If needed, the database server can be directly reached on localhost:3306.
+## Development
+
+### Set environment variables
+
+`.env.example` should be copied to `.env` into the repo root. Only the variables for external dependencies (API keys, map attribution, etc.) should be adapted. All other variables (for DB connection, static root, mailing, multiplayer, etc.) are fine with the default value. **`DEV=1` should be set for development!**
+
+### Docker Compose
+
+Execute the following command from the repo root:
+```bash
+docker compose up -d
+```
+
+**And you are done!** You can reach the application on http://localhost. The mails that are sent by the application can be found on http://localhost:8080. If needed, the database server can be directly reached on localhost:3306, or you can use Adminer web interface on http://localhost:9090
+
+You might have to attach to the `app` container, e.g. for creating users, `composer update`, etc.

 ---

@@ -10,7 +10,7 @@
    }
  ],
  "require": {
-    "esoko/soko-web": "0.12.1",
+    "esoko/soko-web": "0.14.1",
    "firebase/php-jwt": "^6.4"
  },
  "require-dev": {
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "a6f50b31b14027eec094629b13cc4097",
+    "content-hash": "2fdc479615518ac79d67b0a3f72ea2cb",
    "packages": [
        {
            "name": "cocur/slugify",
@@ -82,11 +82,11 @@
        },
        {
            "name": "esoko/soko-web",
-            "version": "v0.12.1",
+            "version": "v0.14.1",
            "source": {
                "type": "git",
                "url": "https://git.esoko.eu/esoko/soko-web.git",
-                "reference": "bda12177ebc201f04fdad5493b93039676a983ca"
+                "reference": "7210b24aa31f47a55125a7c1f74267313f372559"
            },
            "require": {
                "cocur/slugify": "^4.3",
@@ -108,7 +108,7 @@
                "GNU GPL 3.0"
            ],
            "description": "Lightweight web framework",
-            "time": "2023-05-28T13:56:14+00:00"
+            "time": "2023-09-26T22:26:55+00:00"
        },
        {
            "name": "firebase/php-jwt",
@@ -3152,5 +3152,5 @@
    "prefer-lowest": false,
    "platform": [],
    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
@@ -11,8 +11,3 @@ CREATE TABLE `events` (
  UNIQUE KEY `slug` (`slug`),
  CONSTRAINT `events_community_id` FOREIGN KEY (`community_id`) REFERENCES `communities` (`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
-
-ALTER TABLE `transactions`
-ADD `event_id` int(10) unsigned NULL,
-ADD KEY `event_id` (`event_id`) AFTER `community_id`,
-ADD CONSTRAINT `transactions_event_id` FOREIGN KEY (`event_id`) REFERENCES `events` (`id`);
@@ -0,0 +1,4 @@
+ALTER TABLE `transactions`
+ADD `event_id` int(10) unsigned NULL AFTER `community_id`,
+ADD KEY `event_id` (`event_id`),
+ADD CONSTRAINT `transactions_event_id` FOREIGN KEY (`event_id`) REFERENCES `events` (`id`);
@@ -0,0 +1,11 @@
+CREATE TABLE `transaction_payees` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `transaction_id` int(10) unsigned NOT NULL,
+  `user_id` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique_user_for_transaction` (`transaction_id`, `user_id`),
+  KEY `transaction_id` (`transaction_id`),
+  KEY `user_id` (`user_id`),
+  CONSTRAINT `transaction_payees_transaction_id` FOREIGN KEY (`transaction_id`) REFERENCES `transactions` (`id`),
+  CONSTRAINT `transaction_payees_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
@@ -2,12 +2,17 @@ version: '3'
 services:
    app:
        build:
-            context: ./docker
-            dockerfile: Dockerfile-app
+            context: .
+            dockerfile: docker/Dockerfile
+            target: rvr_dev
+        depends_on:
+            mariadb:
+                condition: service_healthy
        ports:
            - 80:80
        volumes:
            - .:/var/www/rvr
+        working_dir: /var/www/rvr
    mariadb:
        image: mariadb:10.3
        ports:
@@ -19,6 +24,13 @@ services:
            MYSQL_DATABASE: 'rvr'
            MYSQL_USER: 'rvr'
            MYSQL_PASSWORD: 'rvr'
+        healthcheck:
+            test: ["CMD-SHELL", "mysqladmin -u $$MYSQL_USER -p$$MYSQL_PASSWORD ping -h localhost || exit 1"]
+            start_period: 5s
+            start_interval: 1s
+            interval: 5s
+            timeout: 5s
+            retries: 5
    adminer:
        image: adminer:4.8.1-standalone
        ports:
@@ -0,0 +1,44 @@
+FROM ubuntu:focal AS rvr_base
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update --fix-missing && apt install -y sudo curl git unzip mariadb-client nginx \
+    php-apcu php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
+
+RUN mkdir -p /run/php
+COPY docker/configs/nginx.conf /etc/nginx/sites-available/default
+
+COPY docker/scripts/install-composer.sh install-composer.sh
+RUN ./install-composer.sh
+
+COPY docker/scripts/install-nodejs.sh install-nodejs.sh
+RUN ./install-nodejs.sh
+RUN npm install -g uglify-js clean-css-cli svgo yarn
+
+
+FROM rvr_base AS rvr_dev
+
+RUN apt update --fix-missing && apt install -y php-xdebug
+
+RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/mods-available/xdebug.ini &&\
+    echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/mods-available/xdebug.ini &&\
+    echo "xdebug.remote_connect_back = 1" >> /etc/php/7.4/mods-available/xdebug.ini
+
+EXPOSE 80
+EXPOSE 5000
+EXPOSE 8090
+EXPOSE 9229
+ENTRYPOINT docker/scripts/entry-point-dev.sh
+
+
+FROM rvr_base AS rvr_release
+
+RUN apt update --fix-missing && apt install -y cron
+
+WORKDIR /var/www/rvr
+COPY ./ /var/www/rvr
+RUN rm -rf /var/www/rvr/.git
+
+EXPOSE 80
+EXPOSE 8090
+ENTRYPOINT docker/scripts/entry-point.sh
@@ -1,30 +0,0 @@
-FROM ubuntu:focal
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install Nginx, PHP and further necessary packages
-RUN apt update --fix-missing
-RUN apt install -y curl git unzip mariadb-client nginx \
-    php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
-
-# Configure Nginx with PHP
-RUN mkdir -p /run/php
-COPY configs/nginx.conf /etc/nginx/sites-available/default
-RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/mods-available/xdebug.ini
-RUN echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/mods-available/xdebug.ini
-RUN echo "xdebug.remote_connect_back = 1" >> /etc/php/7.4/mods-available/xdebug.ini
-
-# Install Composer
-COPY scripts/install-composer.sh install-composer.sh
-RUN ./install-composer.sh
-
-# Install Node.js and required packages
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt install -y nodejs
-RUN npm install -g uglify-js clean-css-cli svgo yarn
-
-EXPOSE 80
-VOLUME /var/www/rvr
-WORKDIR /var/www/rvr
-
-ENTRYPOINT /usr/sbin/php-fpm7.4 -F & /usr/sbin/nginx -g 'daemon off;'
@@ -1,6 +0,0 @@
-FROM ubuntu:focal
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt update && apt install -y curl git unzip php7.4-cli php7.4-mbstring php7.4-xml
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
@@ -0,0 +1 @@
+0 * * * * /var/www/rvr/rvr db:maintain
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+echo "Installing Composer packages..."
+if [ -f .env ]; then
+    composer install
+else
+    composer create-project
+fi
+
+echo "Installing Yarn packages..."
+(cd public/static && yarn install)
+
+echo "Migrating DB..."
+./rvr db:migrate
+
+echo "Set runner user based on owner of .env..."
+USER_UID=$(stat -c "%u" .env)
+USER_GID=$(stat -c "%g" .env)
+groupadd --gid $USER_GID rvr
+useradd --uid $USER_UID --gid $USER_GID rvr
+sed -i -e "s/^user = .*$/user = rvr/g" -e "s/^group = .*$/group = rvr/g" /etc/php/7.4/fpm/pool.d/www.conf
+
+set +e
+
+/usr/sbin/php-fpm7.4 -F &
+/usr/sbin/nginx -g 'daemon off;' &
+
+wait -n
+
+exit $?
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+echo "Migrating DB..."
+./rvr db:migrate
+
+echo "Installing crontab..."
+/usr/bin/crontab docker/scripts/cron
+
+echo "Set runner user based on owner of .env..."
+USER_UID=$(stat -c "%u" .env)
+USER_GID=$(stat -c "%g" .env)
+groupadd --gid $USER_GID rvr
+useradd --uid $USER_UID --gid $USER_GID rvr
+chown -R rvr:rvr cache
+sed -i -e "s/^user = .*$/user = rvr/g" -e "s/^group = .*$/group = rvr/g" /etc/php/7.4/fpm/pool.d/www.conf
+
+set +e
+
+/usr/sbin/cron -f &
+/usr/sbin/php-fpm7.4 -F &
+/usr/sbin/nginx -g 'daemon off;' &
+
+wait -n
+
+exit $?
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+apt update
+apt install -y ca-certificates curl gnupg
+mkdir -p /etc/apt/keyrings
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+
+NODE_MAJOR=18
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+
+apt update
+apt install -y nodejs
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+echo "Installing Composer packages..."
+composer create-project --no-dev
+
+echo "Installing Yarn packages..."
+(cd public/static && yarn install)
+
+echo "Updating version info..."
+VERSION=$(git describe --tags --always --match "Release_*" HEAD)
+REVISION=$(git rev-parse --short HEAD)
+REVISION_DATE=$(git show -s --format=%aI HEAD)
+sed -i -E "s/const VERSION = '(.*)';/const VERSION = '${VERSION}';/" app.php
+sed -i -E "s/const REVISION = '(.*)';/const REVISION = '${REVISION}';/" app.php
+sed -i -E "s/const REVISION_DATE = '(.*)';/const REVISION_DATE = '${REVISION_DATE}';/" app.php
+
+echo "Minifying JS, CSS and SVG files..."
+find public/static/js -type f -iname '*.js' -exec uglifyjs {} -c -m -o {} \;
+find public/static/css -type f -iname '*.css' -exec cleancss {} -o {} \;
+find public/static/img -type f -iname '*.svg' -exec svgo {} -o {} \;
+
+echo "Linking view files..."
+./rvr view:link
+
+rm .env
@@ -1,162 +0,0 @@
-#!/usr/bin/python3
-
-# Usage: ./deploy-to-multiple-worktrees.py REPO_PATH WORKTREE_DEVELOPMENT_PATH WORKTREE_PRODUCTION_PATH
-
-import sys
-import os
-import subprocess
-import re
-
-WORKTREE_REGEX = r"^worktree (.*)\nHEAD ([a-f0-9]*)\n(?:branch refs\/heads\/(.*)|detached)$"
-
-if len(sys.argv) < 4:
-    print("Usage: ./deploy-to-multiple-worktrees.py REPO_PATH WORKTREE_DEVELOPMENT_PATH WORKTREE_PRODUCTION_PATH")
-    exit(1)
-
-REPO = os.path.abspath(sys.argv[1])
-WORKTREE_DEVELOPMENT = os.path.abspath(sys.argv[2])
-WORKTREE_PRODUCTION = os.path.abspath(sys.argv[3])
-
-class Worktree:
-    def __init__(self, path, branch, revision, version):
-        self.path = path
-        self.branch = branch
-        self.revision = revision
-        self.version = version
-        self.newRevision = None
-        self.newVersion = None
-
-def getDataForWorktrees():
-    ret = subprocess.check_output(["git", "worktree", "list", "--porcelain"], cwd=REPO).decode().strip()
-    blocks = ret.split("\n\n")
-
-    worktrees = []
-
-    for block in blocks:
-        matches = re.search(WORKTREE_REGEX, block)
-
-        if matches:
-            path = matches.group(1)
-            revision = matches.group(2)
-            branch = matches.group(3)
-            version = getVersion(revision)
-
-            worktrees.append(Worktree(path, branch, revision, version))
-
-    return worktrees
-
-def findWorktree(path):
-    for worktree in worktrees:
-        if worktree.path == path:
-            return worktree
-
-    return None
-
-def getVersion(branch):
-    return subprocess.check_output(["git", "describe", "--tags", "--always", "--match", "Release_*", branch], cwd=REPO).decode().strip()
-
-def getRevisionForRef(ref):
-    return subprocess.check_output(["git", "rev-list", "-1", ref], cwd=REPO).decode().strip()
-
-def getLatestReleaseTag():
-    process = subprocess.Popen(["git", "for-each-ref", "refs/tags/Release*", "--sort=-creatordate", "--format=%(refname:short)"], stdout=subprocess.PIPE, cwd=REPO)
-
-    for line in process.stdout:
-        tag = line.decode().rstrip()
-
-        if isTagVerified(tag):
-            return tag
-
-        print(f"[WARNING] Tag '{tag}' is not verified, skipping.")
-
-    raise Exception("No verified 'Release*' tag found!")
-
-def isTagVerified(tag):
-    process = subprocess.run(["git", "tag", "--verify", tag], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=REPO)
-
-    return process.returncode == 0
-
-def updateRepoFromRemote():
-    subprocess.call(["git", "fetch", "origin", "--prune", "--prune-tags"], cwd=REPO)
-
-def checkoutWorktree(worktreePath, ref):
-    subprocess.call(["git", "checkout", "-f", ref], cwd=worktreePath)
-
-def cleanWorktree(worktreePath):
-    subprocess.call(["git", "clean", "-f", "-d"], cwd=worktreePath)
-
-def updateAppInWorktree(worktreePath):
-    subprocess.call([worktreePath + "/scripts/update.sh"], cwd=worktreePath)
-
-def updateAppVersionInWorktree(worktreePath):
-    subprocess.call([worktreePath + "/scripts/update-version.sh"], cwd=worktreePath)
-
-worktrees = getDataForWorktrees()
-
-updateRepoFromRemote()
-
-print("Repo is updated from origin")
-
-print("----------------------------------------------")
-print("----------------------------------------------")
-
-developmentWorktree = findWorktree(WORKTREE_DEVELOPMENT)
-
-developmentWorktree.newRevision = getRevisionForRef(developmentWorktree.branch)
-developmentWorktree.newVersion = getVersion(developmentWorktree.revision)
-
-print("DEVELOPMENT (" + developmentWorktree.path + ") is on branch " + developmentWorktree.branch)
-print(developmentWorktree.revision + " = " + developmentWorktree.branch + " (" + developmentWorktree.version + ")")
-print(developmentWorktree.newRevision + " = origin/" + developmentWorktree.branch + " (" + developmentWorktree.newVersion + ")")
-
-if developmentWorktree.revision != developmentWorktree.newRevision:
-    print("-> DEVELOPMENT (" + developmentWorktree.path + ") will be UPDATED")
-    print("----------------------------------------------")
-
-    checkoutWorktree(developmentWorktree.path, developmentWorktree.branch)
-    cleanWorktree(developmentWorktree.path)
-
-    print(developmentWorktree.path + " is checked out to " + developmentWorktree.branch + " and cleaned")
-
-    updateAppInWorktree(developmentWorktree.path)
-    updateAppVersionInWorktree(developmentWorktree.path)
-
-    print("RVR is updated in " + developmentWorktree.path)
-elif developmentWorktree.version != developmentWorktree.newVersion:
-    print("-> DEVELOPMENT " + developmentWorktree.path + "'s version info will be UPDATED")
-
-    updateAppVersionInWorktree(developmentWorktree.path)
-
-    print("RVR version is updated in " + developmentWorktree.path)
-else:
-    print("-> DEVELOPMENT (" + developmentWorktree.path + ") WON'T be updated")
-
-print("----------------------------------------------")
-print("----------------------------------------------")
-
-productionWorktree = findWorktree(WORKTREE_PRODUCTION)
-
-productionWorktree.newVersion = getLatestReleaseTag()
-productionWorktree.newRevision = getRevisionForRef(productionWorktree.newVersion)
-
-print("PRODUCTION (" + productionWorktree.path + ")")
-print(productionWorktree.revision + " = " + productionWorktree.version)
-print(productionWorktree.newRevision + " = " + productionWorktree.newVersion)
-
-if productionWorktree.revision != productionWorktree.newRevision:
-    print("-> PRODUCTION (" + productionWorktree.path + ") will be UPDATED")
-
-    checkoutWorktree(productionWorktree.path, productionWorktree.newRevision)
-    cleanWorktree(productionWorktree.path)
-
-    print(productionWorktree.path + " is checked out to " + productionWorktree.newRevision + " and cleaned")
-
-    updateAppInWorktree(productionWorktree.path)
-    updateAppVersionInWorktree(productionWorktree.path)
-
-    print("RVR is updated in " + productionWorktree.path)
-else:
-    print("-> PRODUCTION (" + productionWorktree.path + ") WON'T be updated")
-
-print("----------------------------------------------")
-print("----------------------------------------------")
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR=$(dirname $(readlink -f "$0"))/..
-
-. ${ROOT_DIR}/.env
-
-if [ -f ${ROOT_DIR}/installed ]; then
-    echo "RVR is already installed! To force reinstall, delete file 'installed' from the root directory!"
-    exit 1
-fi
-
-echo "Installing Yarn packages..."
-(cd ${ROOT_DIR}/public/static && yarn install)
-
-echo "Installing RVR DB..."
-mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${ROOT_DIR}/database/rvr.sql
-
-echo "Migrating DB..."
-(cd ${ROOT_DIR} && ./rvr db:migrate)
-
-if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
-    echo "Minifying JS, CSS and SVG files..."
-    ${ROOT_DIR}/scripts/minify.sh
-
-    echo "Linking view files..."
-    (cd ${ROOT_DIR} && ./rvr view:link)
-else
-    echo "Creating the first user..."
-    (cd ${ROOT_DIR} && ./rvr user:add rvr@rvr.dev 123456 admin)
-fi
-
-touch ${ROOT_DIR}/installed
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR=$(dirname $(readlink -f "$0"))/..
-
-. ${ROOT_DIR}/.env
-
-find ${ROOT_DIR}/public/static/js -type f -iname '*.js' -exec uglifyjs {} -c -m -o {} \;
-
-find ${ROOT_DIR}/public/static/css -type f -iname '*.css' -exec cleancss {} -o {} \;
-
-find ${ROOT_DIR}/public/static/img -type f -iname '*.svg' -exec svgo {} -o {} \;
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR=$(dirname $(readlink -f "$0"))/..
-
-. ${ROOT_DIR}/.env
-
-cd ${ROOT_DIR}
-
-echo "Updating version info..."
-
-VERSION=$(git describe --tags --always --match "Release_*" HEAD)
-REVISION=$(git rev-parse --short HEAD)
-REVISION_DATE=$(git show -s --format=%aI HEAD)
-
-sed -i -E "s/const VERSION = '(.*)';/const VERSION = '${VERSION}';/" app.php
-sed -i -E "s/const REVISION = '(.*)';/const REVISION = '${REVISION}';/" app.php
-sed -i -E "s/const REVISION_DATE = '(.*)';/const REVISION_DATE = '${REVISION_DATE}';/" app.php
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR=$(dirname $(readlink -f "$0"))/..
-
-. ${ROOT_DIR}/.env
-
-echo "Installing Composer packages..."
-if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
-    (cd ${ROOT_DIR} && composer install --no-dev)
-else
-    (cd ${ROOT_DIR} && composer install --dev)
-fi
-
-echo "Installing Yarn packages..."
-(cd ${ROOT_DIR}/public/static && yarn install)
-
-echo "Migrating DB..."
-(cd ${ROOT_DIR} && ./rvr db:migrate)
-
-if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
-    echo "Minifying JS, CSS and SVG files..."
-    ${ROOT_DIR}/scripts/minify.sh
-
-    echo "Linking view files..."
-    (cd ${ROOT_DIR} && ./rvr view:link)
-fi
@@ -19,6 +19,8 @@ class MigrateDatabaseCommand extends Command
    {
        $db = \Container::$dbConnection;

+        $this->createBaseDb();
+
        $db->startTransaction();

        $success = [];
@@ -62,10 +64,8 @@ class MigrateDatabaseCommand extends Command
        return 0;
    }

-    private function readDir(string $type): array
+    private function createBaseDb()
    {
-        $done = [];
-
        $migrationTableExists = \Container::$dbConnection->query('SELECT count(*)
            FROM information_schema.tables
            WHERE table_schema = \'' . $_ENV['DB_NAME'] . '\'
@@ -73,16 +73,25 @@ class MigrateDatabaseCommand extends Command
            ->fetch(IResultSet::FETCH_NUM)[0];

        if ($migrationTableExists != 0) {
-            $select = new Select(\Container::$dbConnection, 'migrations');
-            $select->columns(['migration']);
-            $select->where('type', '=', $type);
-            $select->orderBy('migration');
+            return;
+        }

-            $result = $select->execute();
+        \Container::$dbConnection->multiQuery(file_get_contents(ROOT . '/database/rvr.sql'));
+    }

-            while ($migration = $result->fetch(IResultSet::FETCH_ASSOC)) {
-                $done[] = $migration['migration'];
-            }
+    private function readDir(string $type): array
+    {
+        $done = [];
+
+        $select = new Select(\Container::$dbConnection, 'migrations');
+        $select->columns(['migration']);
+        $select->where('type', '=', $type);
+        $select->orderBy('migration');
+
+        $result = $select->execute();
+
+        while ($migration = $result->fetch(IResultSet::FETCH_ASSOC)) {
+            $done[] = $migration['migration'];
        }

        $path = ROOT . '/database/migrations/' . $type;
@@ -59,32 +59,21 @@ class CommunityController implements IAuthenticationRequired

        \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;
+        /**
+        * @var User $user
+        */
+        $user = \Container::$request->user();
+        $balanceCalculator = new BalanceCalculator($community, $user);
+        $balance = $balanceCalculator->calculate();

        return new HtmlContent('communities/community', [
            'community' => $community,
-            'upcomingEvents' => iterator_to_array($this->eventRepository->getUpcomingByCommunity($community, new DateTime(), 3)),
-            'debtItems' => $debtItems,
-            'debtBalance' => $debtBalance,
-            'outstandingItems' => $outstandingItems,
-            'outstandingBalance' => $outstandingBalance,
-            'balance' => $balance,
+            'upcomingAndRecentEvents' => iterator_to_array($this->eventRepository->getUpcomingAndRecentByCommunity($community, new DateTime(), 30, 3)),
+            'debtItems' => $balance['debtItems'],
+            'debtBalance' => $balance['debtBalance'],
+            'outstandingItems' => $balance['outstandingItems'],
+            'outstandingBalance' => $balance['outstandingBalance'],
+            'balance' => $balance['absoluteBalance'],
            'editPermission' => $ownCommunityMember->getOwner()
        ]);
    }
@@ -176,6 +165,43 @@ class CommunityController implements IAuthenticationRequired
        ]);
    }

+    public function deleteCommunity(): ?IContent
+    {
+        if (!$this->checkPermission(\Container::$request->query('communitySlug'), true, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        if ($this->transactionRepository->countAllByCommunity($community) > 0) {
+            return new JsonContent([
+                'error' => ['errorText' => 'There are transactions for this community!']
+            ]);
+        }
+
+        if ($this->eventRepository->countAllByCommunity($community) > 0) {
+            return new JsonContent([
+                'error' => ['errorText' => 'There are events for this community!']
+            ]);
+        }
+
+        foreach ($this->communityMemberRepository->getAllByCommunity($community) as $communityMember) {
+            \Container::$persistentDataManager->deleteFromDb($communityMember);
+        }
+
+        $community->setMainCurrencyId(null);
+        \Container::$persistentDataManager->saveToDb($community);
+
+        foreach ($this->currencyRepository->getAllByCommunity($community) as $currency) {
+            foreach ($this->currencyExchangeRatesRepository->getAllByCurrency($currency) as $currencyExchangeRate) {
+                \Container::$persistentDataManager->deleteFromDb($currencyExchangeRate);
+            }
+            \Container::$persistentDataManager->deleteFromDb($currency);
+        }
+
+        \Container::$persistentDataManager->deleteFromDb($community);
+
+        return new JsonContent(['success' => true]);
+    }
+
    public function getMembersEdit(): ?IContent
    {
        if (!$this->checkPermission(\Container::$request->query('communitySlug'), true, $community, $ownCommunityMember)) {
@@ -2,6 +2,7 @@

 use Container;
 use DateTime;
+use RVR\Finance\BalanceCalculator;
 use RVR\Finance\ExchangeRateCalculator;
 use RVR\PersistentData\Model\Community;
 use RVR\PersistentData\Model\CommunityMember;
@@ -68,17 +69,16 @@ class EventController implements IAuthenticationRequired, ISecured
    {
        $itemsPerPage = 10;
        $numberOfEvents = $this->eventRepository->countAllByCommunity($this->community);
-        $pages = ceil($numberOfEvents / $itemsPerPage);
-        $currentPage = Container::$request->query('page') ?: 0;
+        $currentPage = Container::$request->query('page') ?: 1;
        $events = $this->eventRepository->getPagedByCommunity(
            $this->community,
-            $currentPage * $itemsPerPage,
+            $currentPage,
            $itemsPerPage
        );

        return new HtmlContent('events/events', [
            'community' => $this->community,
-            'pages' => $pages,
+            'pages' => ceil($numberOfEvents / $itemsPerPage),
            'currentPage' => $currentPage,
            'numberOfEvents' => $numberOfEvents,
            'events' => $events
@@ -106,10 +106,22 @@ class EventController implements IAuthenticationRequired, ISecured
        }
        Container::$persistentDataManager->loadRelationsFromDb($this->community, true, ['main_currency']);

+        /**
+        * @var User $user
+        */
+        $user = \Container::$request->user();
+        $balanceCalculator = new BalanceCalculator($this->community, $user, $event);
+        $balance = $balanceCalculator->calculate();
+
        return new HtmlContent('events/event', [
            'community' => $this->community,
            'event' => $event,
-            'totalCost' => $this->sumTransactions($event)
+            'totalCost' => $this->sumTransactions($event),
+            'debtItems' => $balance['debtItems'],
+            'debtBalance' => $balance['debtBalance'],
+            'outstandingItems' => $balance['outstandingItems'],
+            'outstandingBalance' => $balance['outstandingBalance'],
+            'balance' => $balance['absoluteBalance'],
        ]);
    }

@@ -0,0 +1,70 @@
+<?php namespace RVR\Controller;
+
+use DateTime;
+use Container;
+use RVR\PersistentData\Model\Event;
+use RVR\PersistentData\Model\User;
+use RVR\Repository\EventRepository;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Response\IRedirect;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\Redirect;
+
+class EventRedirectController implements IAuthenticationRequired
+{
+    private EventRepository $eventRepository;
+
+    public function __construct()
+    {
+        $this->eventRepository = new EventRepository();
+    }
+
+    public function isAuthenticationRequired(): bool
+    {
+        return true;
+    }
+
+    public function getEvent()
+    {
+        $currentEvent = $this->getCurrentEvent();
+        if ($currentEvent === null) {
+            return new HtmlContent('event_redirect/no_event');
+        }
+
+        return new Redirect(
+            \Container::$routeCollection->getRoute('community.event')
+                ->generateLink([
+                    'communitySlug' => $currentEvent->getCommunity()->getSlug(),
+                    'eventSlug' => $currentEvent->getSlug()
+                ]),
+            IRedirect::TEMPORARY
+        );
+    }
+
+    public function getEventNewTransaction()
+    {
+        $currentEvent = $this->getCurrentEvent();
+        if ($currentEvent === null) {
+            return new HtmlContent('event_redirect/no_event');
+        }
+
+        return new Redirect(
+            \Container::$routeCollection->getRoute('community.transactions.new')
+                ->generateLink([
+                    'communitySlug' => $currentEvent->getCommunity()->getSlug(),
+                    'event' => $currentEvent->getSlug()
+                ]),
+            IRedirect::TEMPORARY
+        );
+    }
+
+    private function getCurrentEvent(): ?Event
+    {
+        /**
+         * @var User $user
+         */
+        $user = Container::$request->user();
+
+        return $this->eventRepository->getCurrentByUser($user, new DateTime(), 30, true, ['community']);
+    }
+}
@@ -44,7 +44,7 @@ class HomeController implements IAuthenticationRequired

        return new HtmlContent('home', [
            'communities' => $communities,
-            'upcomingEvents' => iterator_to_array($this->eventRepository->getUpcomingByUser($user, new DateTime(), 3, true, ['community']))
+            'upcomingAndRecentEvents' => iterator_to_array($this->eventRepository->getUpcomingAndRecentByUser($user, new DateTime(), 30, 3, true, ['community']))
        ]);
    }
 }
@@ -6,11 +6,13 @@ use RVR\Finance\ExchangeRateCalculator;
 use RVR\PersistentData\Model\Community;
 use RVR\PersistentData\Model\CommunityMember;
 use RVR\PersistentData\Model\Transaction;
+use RVR\PersistentData\Model\TransactionPayee;
 use RVR\PersistentData\Model\User;
 use RVR\Repository\CommunityMemberRepository;
 use RVR\Repository\CommunityRepository;
 use RVR\Repository\CurrencyRepository;
 use RVR\Repository\TransactionRepository;
+use RVR\Repository\TransactionPayeeRepository;
 use RVR\Repository\EventRepository;
 use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Authorization\ISecured;
@@ -28,6 +30,8 @@ class TransactionController implements IAuthenticationRequired, ISecured

    private TransactionRepository $transactionRepository;

+    private TransactionPayeeRepository $transactionPayeeRepository;
+
    private EventRepository $eventRepository;

    private ?Community $community;
@@ -40,6 +44,7 @@ class TransactionController implements IAuthenticationRequired, ISecured
        $this->communityMemberRepository = new CommunityMemberRepository();
        $this->currencyRepository = new CurrencyRepository();
        $this->transactionRepository = new TransactionRepository();
+        $this->transactionPayeeRepository = new TransactionPayeeRepository();
        $this->eventRepository = new EventRepository();
    }

@@ -84,32 +89,35 @@ class TransactionController implements IAuthenticationRequired, ISecured
        $numberOfTransactions = $event ?
            $this->transactionRepository->countAllByEvent($event) :
            $this->transactionRepository->countAllByCommunity($this->community);
-        $pages = ceil($numberOfTransactions / $itemsPerPage);
-        $currentPage = Container::$request->query('page') ?: 0;
+        $currentPage = Container::$request->query('page') ?: 1;
        $transactions = $event ?
            $this->transactionRepository->getPagedByEvent(
                $event,
-                $currentPage * $itemsPerPage,
+                $currentPage,
                $itemsPerPage,
                true,
-                ['currency', 'payer_user', 'payee_user']
+                ['currency', 'payer_user']
            ) :
            $this->transactionRepository->getPagedByCommunity(
                $this->community,
-                $currentPage * $itemsPerPage,
+                $currentPage,
                $itemsPerPage,
                true,
-                ['event', 'currency', 'payer_user', 'payee_user']
+                ['event', 'currency', 'payer_user']
            );

+        $transactions = iterator_to_array($transactions);
+        Container::$persistentDataManager->loadMultiRelationsFromDb($transactions, 'payees', true, ['user']);
+
        return new HtmlContent('communities/transactions', [
            'community' => $this->community,
            'event' => $event,
            'exchangeRateCalculator' => $exchangeRateCalculator,
-            'pages' => $pages,
+            'pages' => ceil($numberOfTransactions / $itemsPerPage),
            'currentPage' => $currentPage,
            'numberOfTransactions' => $numberOfTransactions,
-            'transactions' => $transactions
+            'transactions' => $transactions,
+            'members' => $this->getMembers($this->community)
        ]);
    }

@@ -123,6 +131,10 @@ class TransactionController implements IAuthenticationRequired, ISecured
            }
            Container::$persistentDataManager->loadRelationsFromDb($transaction, false, ['event']);
            $event = $transaction->getEvent();
+            $payeeUserIds = [];
+            foreach ($this->transactionPayeeRepository->getAllByTransaction($transaction) as $payee) {
+                $payeeUserIds[] = $payee->getUserId();
+            }
        } else {
            $transaction = null;
            $eventSlug = Container::$request->query('event');
@@ -131,11 +143,13 @@ class TransactionController implements IAuthenticationRequired, ISecured
            } else {
                $event = null;
            }
+            $payeeUserIds = [];
        }

        return new HtmlContent('communities/transaction_edit', [
            'community' => $this->community,
            'transaction' => $transaction,
+            'payeeUserIds' => $payeeUserIds,
            'event' => $event,
            'members' => $this->getMembers($this->community),
            'currencies' => $this->getCurrencies($this->community)
@@ -155,18 +169,48 @@ class TransactionController implements IAuthenticationRequired, ISecured
        $transaction->setEventId(Container::$request->post('event_id') ?: null);
        $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);

+        $payeeUserIds = array_unique(Container::$request->post('payee_user_ids'));
+        if (count($payeeUserIds) === $this->communityMemberRepository->countAllByCommunity($this->community)) {
+            $payeeUserIds = [];
+        }
+
+        $currentPayees = [];
+        foreach ($payeeUserIds as $payeeUserId) {
+            $payee = new TransactionPayee();
+            $payee->setTransaction($transaction);
+            $payee->setUserId((int)$payeeUserId);
+            $currentPayees[(int)$payeeUserId] = $payee;
+        }
+        $existingPayees = [];
+        if ($transactionId) {
+            foreach ($this->transactionPayeeRepository->getAllByTransaction($transaction) as $payee) {
+                $existingPayees[$payee->getUserId()] = $payee;
+            }
+        }
+
+        foreach (array_diff_key($currentPayees, $existingPayees) as $newPayee) {
+            Container::$persistentDataManager->saveToDb($newPayee);
+        }
+        foreach (array_diff_key($existingPayees, $currentPayees) as $deletedPayee) {
+            Container::$persistentDataManager->deleteFromDb($deletedPayee);
+        }
+
        return new JsonContent(['success' => true]);
    }

    public function deleteTransaction(): IContent
    {
        $transaction = $this->transactionRepository->getById(Container::$request->query('transactionId'));
+
+        foreach ($this->transactionPayeeRepository->getAllByTransaction($transaction) as $payee) {
+            Container::$persistentDataManager->deleteFromDb($payee);
+        }
+
        Container::$persistentDataManager->deleteFromDb($transaction);

        return new JsonContent(['success' => true]);
@@ -1,6 +1,9 @@
 <?php namespace RVR\Finance;

+use Container;
 use RVR\PersistentData\Model\Community;
+use RVR\PersistentData\Model\Event;
+use RVR\PersistentData\Model\User;
 use RVR\Repository\CommunityMemberRepository;
 use RVR\Repository\TransactionRepository;

@@ -8,6 +11,10 @@ class BalanceCalculator
 {
    private Community $community;

+    private User $user;
+
+    private ?Event $event;
+
    private TransactionRepository $transactionRepository;

    private CommunityMemberRepository $communityMemberRepository;
@@ -18,9 +25,13 @@ class BalanceCalculator

    private array $payments;

-    public function __construct(Community $community)
+    private array $actualDebts;
+
+    public function __construct(Community $community, User $user, ?Event $event = null)
    {
        $this->community = $community;
+        $this->user = $user;
+        $this->event = $event;
        $this->transactionRepository = new TransactionRepository();
        $this->communityMemberRepository = new CommunityMemberRepository();
        $this->exchangeRateCalculator = new ExchangeRateCalculator($this->community->getMainCurrency());
@@ -31,7 +42,8 @@ class BalanceCalculator
        $this->collectMembers();
        $this->createPaymentsMatrix();
        $this->sumTransactions();
-        return $this->calculateActualDebts();
+        $this->calculateActualDebts();
+        return $this->calculateBalanceForUser();
    }

    private function collectMembers(): void
@@ -56,13 +68,22 @@ class BalanceCalculator
    private function sumTransactions(): void
    {
        $membersCount = count($this->members);
-        $transactions = $this->transactionRepository->getAllByCommunity($this->community, true, ['currency']);
+        if ($this->event !== null) {
+            $transactions = iterator_to_array($this->transactionRepository->getAllByEvent($this->event, true, ['currency']));
+        } else {
+            $transactions = iterator_to_array($this->transactionRepository->getAllByCommunity($this->community, true, ['currency']));
+        }
+        Container::$persistentDataManager->loadMultiRelationsFromDb($transactions, 'payees');

        foreach ($transactions as $transaction) {
            $sum = $this->exchangeRateCalculator->calculate($transaction->getSum(), $transaction->getCurrency(), $transaction->getTimeDate());
+            $payees = $transaction->getPayees();
+            $payeeCount = count($payees);

-            if ($transaction->getPayeeUserId()) {
-                $this->payments[$transaction->getPayerUserId()][$transaction->getPayeeUserId()] += $sum;
+            if ($payeeCount > 0) {
+                foreach ($payees as $payee) {
+                    $this->payments[$transaction->getPayerUserId()][$payee->getUserId()] += $sum / $payeeCount;
+                }
            } else {
                foreach ($this->members as $payeeUserId => $member) {
                    $this->payments[$transaction->getPayerUserId()][$payeeUserId] += $sum / $membersCount;
@@ -71,20 +92,45 @@ class BalanceCalculator
        }
    }

-    private function calculateActualDebts(): array
+    private function calculateActualDebts(): void
    {
-        $actualDebts = [];
+        $this->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];
+                    $this->actualDebts[] = ['payer' => $this->members[$payerUserId], 'payee' => $this->members[$payeeUserId], 'amount' => $actualDebt];
                }
            }
        }
+    }

-        return $actualDebts;
+    private function calculateBalanceForUser(): array
+    {
+        $debtItems = [];
+        $debtBalance = 0.0;
+        $outstandingItems = [];
+        $outstandingBalance = 0.0;
+        foreach ($this->actualDebts as $debt) {
+            if ($debt['payer']->getId() === $this->user->getId()) {
+                $debtBalance += $debt['amount'];
+                $debtItems[] = $debt;
+            }
+            if ($debt['payee']->getId() === $this->user->getId()) {
+                $outstandingBalance += $debt['amount'];
+                $outstandingItems[] = $debt;
+            }
+        }
+        $absoluteBalance = $outstandingBalance - $debtBalance;
+
+        return [
+            'absoluteBalance' => $absoluteBalance,
+            'debtItems' => $debtItems,
+            'debtBalance' => $debtBalance,
+            'outstandingItems' => $outstandingItems,
+            'outstandingBalance' => $outstandingBalance
+        ];
    }
 }
@@ -33,12 +33,12 @@ class Community extends ModelWithSlug
        $this->currency = $currency;
    }

-    public function setMainCurrency(Currency $mainCurrency): void
+    public function setMainCurrency(?Currency $mainCurrency): void
    {
        $this->mainCurrency = $mainCurrency;
    }

-    public function setMainCurrencyId(int $mainCurrencyId): void
+    public function setMainCurrencyId(?int $mainCurrencyId): void
    {
        $this->mainCurrencyId = $mainCurrencyId;
    }
@@ -17,6 +17,10 @@ class Transaction extends Model
        'payee_user' => User::class
    ];

+    protected static array $multiRelations = [
+        'payees' => [TransactionPayee::class, 'transaction']
+    ];
+
    private ?Community $community = null;

    private int $communityId;
@@ -37,6 +41,8 @@ class Transaction extends Model

    private ?int $payeeUserId = null;

+    private ?array $payees = null;
+
    private string $description = '';

    private float $sum = 0.0;
@@ -93,6 +99,11 @@ class Transaction extends Model
        $this->payeeUserId = $payeeUserId;
    }

+    public function setPayees(array $payees): void
+    {
+        $this->payees = $payees;
+    }
+
    public function setDescription(string $description): void
    {
        $this->description = $description;
@@ -163,6 +174,11 @@ class Transaction extends Model
        return $this->payeeUserId;
    }

+    public function getPayees(): ?array
+    {
+        return $this->payees;
+    }
+
    public function getDescription(): string
    {
        return $this->description;
@@ -0,0 +1,60 @@
+<?php namespace RVR\PersistentData\Model;
+
+use SokoWeb\PersistentData\Model\Model;
+
+class TransactionPayee extends Model
+{
+    protected static string $table = 'transaction_payees';
+
+    protected static array $fields = ['transaction_id', 'user_id'];
+
+    protected static array $relations = ['transaction' => Transaction::class, 'user' => User::class];
+
+    private ?Transaction $transaction = null;
+
+    private ?int $transactionId = null;
+
+    private ?User $user = null;
+
+    private ?int $userId = null;
+
+    public function setTransaction(Transaction $transaction): void
+    {
+        $this->transaction = $transaction;
+    }
+
+    public function setTransactionId(int $transactionId): void
+    {
+        $this->transactionId = $transactionId;
+    }
+
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    public function setUserId(int $userId): void
+    {
+        $this->userId = $userId;
+    }
+
+    public function getTransaction(): ?Transaction
+    {
+        return $this->transaction;
+    }
+
+    public function getTransactionId(): ?int
+    {
+        return $this->transactionId;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function getUserId(): ?int
+    {
+        return $this->userId;
+    }
+}
@@ -15,12 +15,16 @@ class CommunityMemberRepository

    public function getAllByCommunity(Community $community, bool $useRelations = false, array $withRelations = []): Generator
    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('community_id', '=', $community->getId());
+        $select = $this->selectAllByCommunity($community);

        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, CommunityMember::class, $useRelations, $withRelations);
    }

+    public function countAllByCommunity(Community $community): int
+    {
+        return $this->selectAllByCommunity($community)->count();
+    }
+
    public function getAllByUser(User $user, bool $useRelations = false, array $withRelations = []): Generator
    {
        $select = new Select(\Container::$dbConnection);
@@ -37,4 +41,11 @@ class CommunityMemberRepository

        return \Container::$persistentDataManager->selectFromDb($select, CommunityMember::class);
    }
+
+    private function selectAllByCommunity(Community $community): Select
+    {
+        $select = new Select(\Container::$dbConnection, CommunityMember::getTable());
+        $select->where('community_id', '=', $community->getId());
+        return $select;
+    }
 }
@@ -2,6 +2,7 @@

 use Container;
 use DateTime;
+use DateInterval;
 use Generator;
 use RVR\PersistentData\Model\Community;
 use RVR\PersistentData\Model\Event;
@@ -22,48 +23,67 @@ class EventRepository

    public function getAllByCommunity(Community $community, bool $useRelations = false, array $withRelations = []): Generator
    {
-        $select = $this->selectAllByCommunity($community);
+        $select = new Select(Container::$dbConnection, Event::getTable());
+        $this->selectAllByCommunity($select, $community);

        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
    }

    public function countAllByCommunity(Community $community): int
    {
-        return $this->selectAllByCommunity($community)->count();
+        $select = new Select(Container::$dbConnection, Event::getTable());
+        $this->selectAllByCommunity($select, $community);
+
+        return $select->count();
    }

-    public function getUpcomingByCommunity(Community $community, DateTime $from, int $limit, bool $useRelations = false, array $withRelations = []): Generator
+    public function getUpcomingAndRecentByCommunity(Community $community, DateTime $from, int $days, int $limit, bool $useRelations = false, array $withRelations = []): Generator
    {
-        $select = $this->selectAllByCommunity($community);
-        $select->where('end', '>', $from->format('Y-m-d H:i:s'));
-        $select->orderBy('start', 'ASC');
-        $select->limit($limit, 0);
-
-        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
-    }
-
-    public function getUpcomingByUser(User $user, DateTime $from, int $limit, bool $useRelations = false, array $withRelations = []): Generator
-    {
-        $select = $this->selectAllByUser($user);
-        $select->where('end', '>', $from->format('Y-m-d H:i:s'));
-        $select->orderBy('start', 'ASC');
-        $select->limit($limit, 0);
-
-        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
-    }
-
-    public function getPagedByCommunity(Community $community, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
-    {
-        $select = $this->selectAllByCommunity($community);
+        $select = new Select(Container::$dbConnection, Event::getTable());
+        $this->selectAllByCommunity($select, $community);
+        $this->selectUpcomingAndRecent($select, $from, $days);
        $select->orderBy('start', 'DESC');
-        $select->limit($limit, $start);
+        $select->limit($limit, 0);
+
+        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
+    }
+
+    public function getUpcomingAndRecentByUser(User $user, DateTime $from, int $days, int $limit, bool $useRelations = false, array $withRelations = []): Generator
+    {
+        $select = new Select(Container::$dbConnection, Event::getTable());
+        $this->selectAllByUser($select, $user);
+        $this->selectUpcomingAndRecent($select, $from, $days);
+        $select->orderBy('start', 'DESC');
+        $select->limit($limit, 0);
+
+        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
+    }
+
+    public function getCurrentByUser(User $user, DateTime $from, int $days, bool $useRelations = false, array $withRelations = []): ?Event
+    {
+        $select = new Select(Container::$dbConnection, Event::getTable());
+        $this->selectAllByUser($select, $user);
+        $this->selectUpcomingAndRecent($select, $from, $days);
+        $select->orderBy('start', 'DESC');
+        $select->limit(1, 0);
+
+        return Container::$persistentDataManager->selectFromDb($select, Event::class, $useRelations, $withRelations);
+    }
+
+    public function getPagedByCommunity(Community $community, int $page, int $itemsPerPage, bool $useRelations = false, array $withRelations = []): Generator
+    {
+        $select = new Select(Container::$dbConnection, Event::getTable());
+        $this->selectAllByCommunity($select, $community);
+        $select->orderBy('start', 'DESC');
+        $select->paginate($page, $itemsPerPage);

        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
    }

    public function searchByTitle(Community $community, string $title): Generator
    {
-        $select = $this->selectAllByCommunity($community);
+        $select = new Select(Container::$dbConnection, Event::getTable());
+        $this->selectAllByCommunity($select, $community);
        $select->where('title', 'LIKE', '%' . $title . '%');
        $select->orderBy('start', 'DESC');
        $select->limit(10);
@@ -71,19 +91,29 @@ class EventRepository
        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class);
    }

-    private function selectAllByCommunity(Community $community)
+    private function selectAllByCommunity(Select $select, Community $community): void
    {
-        $select = new Select(Container::$dbConnection, Event::getTable());
        $select->where('community_id', '=', $community->getId());
-        return $select;
    }

-    private function selectAllByUser(User $user)
+    private function selectAllByUser(Select $select, User $user): void
    {
-        $select = new Select(Container::$dbConnection, Event::getTable());
        $select->innerJoin('communities', ['communities', 'id'], '=', ['events', 'community_id']);
        $select->innerJoin('community_members', ['communities', 'id'], '=', ['community_members', 'community_id']);
        $select->where(['community_members', 'user_id'], '=', $user->getId());
-        return $select;
+    }
+
+    private function selectUpcomingAndRecent(Select $select, DateTime $from, int $days): void
+    {
+        $select->where(function (Select $select) use ($from, $days) {
+            $select->where(function (Select $select) use ($from, $days) {
+                $select->where('start', '<', (clone $from)->add(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s'));
+                $select->where('end', '>', $from->format('Y-m-d H:i:s'));
+            });
+            $select->orWhere(function (Select $select) use ($from, $days) {
+                $select->where('end', '>', (clone $from)->sub(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s'));
+                $select->where('start', '<', $from->format('Y-m-d H:i:s'));
+            });
+        });
    }
 }
@@ -0,0 +1,23 @@
+<?php namespace RVR\Repository;
+
+use Container;
+use Generator;
+use RVR\PersistentData\Model\Transaction;
+use RVR\PersistentData\Model\TransactionPayee;
+use SokoWeb\Database\Query\Select;
+
+class TransactionPayeeRepository
+{
+    public function getById(int $id): ?TransactionPayee
+    {
+        return Container::$persistentDataManager->selectFromDbById($id, TransactionPayee::class);
+    }
+
+    public function getAllByTransaction(Transaction $transaction, bool $useRelations = false, array $withRelations = []): Generator
+    {
+        $select = new Select(Container::$dbConnection);
+        $select->where('transaction_id', '=', $transaction->getId());
+
+        yield from Container::$persistentDataManager->selectMultipleFromDb($select, TransactionPayee::class, $useRelations, $withRelations);
+    }
+}
@@ -66,20 +66,20 @@ class TransactionRepository
        return $select->count() > 0;
    }

-    public function getPagedByCommunity(Community $community, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
+    public function getPagedByCommunity(Community $community, int $page, int $itemsPerPage, bool $useRelations = false, array $withRelations = []): Generator
    {
        $select = $this->selectAllByCommunity($community);
        $select->orderBy('time', 'DESC');
-        $select->limit($limit, $start);
+        $select->paginate($page, $itemsPerPage);

        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Transaction::class, $useRelations, $withRelations);
    }

-    public function getPagedByEvent(Event $event, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
+    public function getPagedByEvent(Event $event, int $page, int $itemsPerPage, bool $useRelations = false, array $withRelations = []): Generator
    {
        $select = $this->selectAllByEvent($event);
        $select->orderBy('time', 'DESC');
-        $select->limit($limit, $start);
+        $select->paginate($page, $itemsPerPage);

        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Transaction::class, $useRelations, $withRelations);
    }
@@ -12,16 +12,16 @@

    <div class="gridContainer marginTop">
        <div>
-            <h3 class="marginBottom">Upcoming events</h3>
-            <?php if (count($upcomingEvents) > 0): ?>
-                <?php foreach ($upcomingEvents as $event): ?>
+            <h3 class="marginBottom">Upcoming and recent events</h3>
+            <?php if (count($upcomingAndRecentEvents) > 0): ?>
+                <?php foreach ($upcomingAndRecentEvents as $event): ?>
                    <p>
                        <a href="<?= Container::$routeCollection->getRoute('community.event')->generateLink(['communitySlug' => $community->getSlug(), 'eventSlug' => $event->getSlug()]) ?>"><?= $event->getTitle() ?></a>
                        <span class="small"><?= $event->getStartDate()->format('Y-m-d') ?> – <?= $event->getEndDate()->format('Y-m-d') ?></span>
                    </p>
                <?php endforeach; ?>
            <?php else: ?>
-                <p>There is no upcoming event.</p>
+                <p>There is no event to show.</p>
            <?php endif; ?>
            <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug()]) ?>">All events</a> | <a href="<?= Container::$routeCollection->getRoute('community.events.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New event</a></p>
        </div>
@@ -25,9 +25,15 @@
                <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">
+            <div class="right marginTop" style="font-size: 0;">
                <button type="submit" name="submit_button"><?= isset($community) ? '<i class="fa-regular fa-floppy-disk"></i> Save' : '<i class="fa-regular fa-plus"></i> Create' ?></button>
+                <?php if (isset($community)): ?>
+                    <button type="submit" form="deleteCommunity" name="submit_button" data-confirmation="Are you sure you want to delete this community?" class="red marginLeft"><i class="fa-regular fa-trash-can"></i> Delete</button>
+                <?php endif; ?>
            </div>
        </form>
+        <?php if (isset($community)): ?>
+            <form id="deleteCommunity" action="<?= Container::$routeCollection->getRoute('community.delete-action')->generateLink(['communitySlug' => $community->getSlug()]) ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('home')->generateLink() ?>"></form>
+        <?php endif; ?>
    </div>
@endsection
@@ -1,5 +1,5 @@
-@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)
+@css(node_modules/tom-select/dist/css/tom-select.min.css)
+@js(node_modules/tom-select/dist/js/tom-select.base.min.js)
@js(js/communities/community_members.js)

@extends(templates/layout_normal)
@@ -1,5 +1,5 @@
-@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)
+@css(node_modules/tom-select/dist/css/tom-select.min.css)
+@js(node_modules/tom-select/dist/js/tom-select.base.min.js)
@js(js/communities/transaction.js)

@extends(templates/layout_normal)
@@ -7,11 +7,11 @@
@section(main)
    <h2>
        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communitySlug' => $community->getSlug()]) ?>"><?= $community->getName() ?></a> »
-        <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug()]) ?>">Transactions</a> »
        <?php if (isset($event)): ?>
            <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug()]) ?>">Events</a> »
            <a href="<?= Container::$routeCollection->getRoute('community.event')->generateLink(['communitySlug' => $community->getSlug(), 'eventSlug' => $event->getSlug()]) ?>"><?= $event->getTitle() ?></a> »
        <?php endif; ?>
+        <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'event' => isset($event) ? $event->getSlug() : null]) ?>">Transactions</a> »
        <?php if (isset($transaction)): ?>
            Edit transaction
        <?php else: ?>
@@ -36,16 +36,23 @@
            <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>
+                    <option value="<?= $member->getUser()->getId() ?>"
+                        <?= isset($transaction) ?
+                            ($transaction->getPayerUserId() === $member->getUser()->getId() ? 'selected' : '') :
+                            (Container::$request->user()->getUniqueId() == $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>
+            <p class="formLabel marginTop">Payee(s)</p>
+            <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(100px, 1fr)); grid-gap: 10px;">
                <?php foreach ($members as $member): ?>
-                    <option value="<?= $member->getUser()->getId() ?>" <?= isset($transaction) && $transaction->getPayeeUserId() === $member->getUser()->getId() ? 'selected' : '' ?>><?= $member->getUser()->getDisplayName() ?></option>
+                    <div style="text-align: center;">
+                        <input id="payee_<?= $member->getUserId() ?>" type="checkbox" name="payee_user_ids[]" value="<?= $member->getUserId() ?>" <?= !isset($transaction) || count($payeeUserIds) === 0 || in_array($member->getUserId(), $payeeUserIds) ? 'checked' : '' ?>><!--
+                     --><label for="payee_<?= $member->getUserId() ?>"><?= $member->getUser()->getDisplayName() ?></label>
+                    </div>
                <?php endforeach; ?>
-            </select>
+            </div>
            <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>
@@ -13,20 +13,13 @@
    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communitySlug' => $community->getSlug(), 'event' => isset($event) ? $event->getSlug() : null]) ?>">New transaction</a></p>

    <?php if ($numberOfTransactions > 0): ?>
+        <?php
+        $paginationRouteId = 'community.transactions';
+        $paginationRouteParams = ['communitySlug' => $community->getSlug()];
+        ?>
+
        <?php if ($pages > 1): ?>
-            <p class="paginateContainer marginTop">
-                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => 0]) ?>">«</a>
-                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), '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(['communitySlug' => $community->getSlug(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
-                    <?php endif; ?>
-                <?php endfor; ?>
-                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
-                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $pages - 1]) ?>">»</a>
-            </p>
+            @include(templates/pagination)
        <?php endif; ?>

        <?php foreach ($transactions as $transaction): ?>
@@ -37,7 +30,29 @@
                        <p><span class="label"><?= $transaction->getEvent()->getTitle() ?></span></p>
                    <?php endif; ?>
                    <p style="font-weight: bold;"><?= $transaction->getDescription() ?></p>
-                    <p class="small"><?= $transaction->getPayerUser()->getDisplayName() ?> <i class="fa-solid fa-caret-right"></i> <?= $transaction->getPayeeUser() ? $transaction->getPayeeUser()->getDisplayName() : '[common]' ?></p>
+                    <p class="small">
+                        <?= $transaction->getPayerUser()->getDisplayName() ?>
+                        <i class="fa-solid fa-caret-right"></i>
+                        <?php foreach ($members as $member): ?>
+                            <?php
+                            if (count($transaction->getPayees()) > 0) {
+                                $found = false;
+                                foreach ($transaction->getPayees() as $payee) {
+                                    if ($member->getUserId() === $payee->getUserId()) {
+                                        $found = true;
+                                    }
+                                }
+                            } else {
+                                $found = true;
+                            }
+                            ?>
+                            <?php if ($found): ?>
+                                <?= $member->getUser()->getDisplayName() ?>
+                            <?php else: ?>
+                                <span class="gray" style="text-decoration: line-through;"><?= $member->getUser()->getDisplayName() ?></span>
+                            <?php endif; ?>
+                        <?php endforeach; ?>
+                    </p>
                    <p class="small"><?= $transaction->getTimeDate()->format('Y-m-d H:i') ?></p>
                </div>
                <div style="text-align: right;">
@@ -51,19 +66,7 @@
        <?php endforeach; ?>

        <?php if ($pages > 1): ?>
-            <p class="paginateContainer marginTop">
-                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => 0]) ?>">«</a>
-                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), '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(['communitySlug' => $community->getSlug(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
-                    <?php endif; ?>
-                <?php endfor; ?>
-                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
-                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $pages - 1]) ?>">»</a>
-            </p>
+            @include(templates/pagination)
        <?php endif; ?>

        <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communitySlug' => $community->getSlug(), 'event' => isset($event) ? $event->getSlug() : null]) ?>">New transaction</a></p>
@@ -0,0 +1,8 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>No event found</h2>
+    <div class="box compactBox">
+        <p class="error justify">No upcoming or recent event was found. <a href="<?= Container::$routeCollection->getRoute('home')->generateLink() ?>" title="<?= $_ENV['APP_NAME'] ?>">Back to start.</a></p>
+    </div>
+@endsection
@@ -22,6 +22,33 @@
                    <td class="mono" style="text-align: right;"><?= number_format($totalCost, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
                </tr>
            </table>
+            <table class="fullWidth marginTop">
+                <tr>
+                    <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 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 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>
+            <p class="small right">* Virtual balance only for this event. Check <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communitySlug' => $community->getSlug()]) ?>">community</a> finances for your real balance.</p>
        </div>
    </div>
@endsection
@@ -9,20 +9,13 @@
    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.events.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New event</a></p>

    <?php if ($numberOfEvents > 0): ?>
+        <?php
+        $paginationRouteId = 'community.events';
+        $paginationRouteParams = ['communitySlug' => $community->getSlug()];
+        ?>
+
        <?php if ($pages > 1): ?>
-            <p class="paginateContainer marginTop">
-                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => 0]) ?>">«</a>
-                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), '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.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
-                    <?php endif; ?>
-                <?php endfor; ?>
-                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
-                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $pages - 1]) ?>">»</a>
-            </p>
+            @include(templates/pagination)
        <?php endif; ?>

        <?php foreach ($events as $event): ?>
@@ -36,19 +29,7 @@
        <?php endforeach; ?>

        <?php if ($pages > 1): ?>
-            <p class="paginateContainer marginTop">
-                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => 0]) ?>">«</a>
-                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), '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.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
-                    <?php endif; ?>
-                <?php endfor; ?>
-                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
-                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $pages - 1]) ?>">»</a>
-            </p>
+            @include(templates/pagination)
        <?php endif; ?>

        <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.events.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New event</a></p>
@@ -16,9 +16,9 @@
            <?php endif; ?>
        </div>
        <div>
-            <h3 class="marginBottom">Upcoming events</h3>
-            <?php if (count($upcomingEvents) > 0): ?>
-                <?php foreach ($upcomingEvents as $event): ?>
+            <h3 class="marginBottom">Upcoming and recent events</h3>
+            <?php if (count($upcomingAndRecentEvents) > 0): ?>
+                <?php foreach ($upcomingAndRecentEvents as $event): ?>
                    <p>
                        <a href="<?= Container::$routeCollection->getRoute('community.event')->generateLink(['communitySlug' => $event->getCommunity()->getSlug(), 'eventSlug' => $event->getSlug()]) ?>"><?= $event->getTitle() ?></a>
                        <span class="small">
@@ -28,7 +28,7 @@
                    </p>
                <?php endforeach; ?>
            <?php else: ?>
-                <p>There is no upcoming event.</p>
+                <p>There is no event to show.</p>
            <?php endif; ?>
        </div>
    </div>
@@ -0,0 +1,31 @@
+<p class="paginateContainer marginTop">
+    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => 1])) ?>">«</a>
+    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => max(1, $currentPage - 1)])) ?>">‹</a>
+    <?php
+    $maxPages = 7;
+    if ($pages <= $maxPages) {
+        $start = 1;
+        $end = $pages;
+    } else {
+        $maxAdditionalPages = $maxPages - 1;
+        $maxAdditionalPagesHalf = ceil($maxAdditionalPages / 2);
+        $start = $currentPage - $maxAdditionalPagesHalf > 1 ?
+            ($currentPage - $maxAdditionalPagesHalf < $pages - $maxAdditionalPages ?
+                $currentPage - $maxAdditionalPagesHalf :
+                $pages - $maxAdditionalPages) :
+            1;
+        $end = $start + $maxAdditionalPages < $pages ?
+            $start + $maxAdditionalPages :
+            $pages;
+    }
+    ?>
+    <?php for ($i = $start; $i <= $end; $i++): ?>
+        <?php if ($currentPage == $i): ?>
+            <span class="selected"><?= $i ?></span>
+        <?php else: ?>
+            <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => $i])) ?>"><?= $i ?></a>
+        <?php endif; ?>
+    <?php endfor; ?>
+    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => min($pages, $currentPage + 1)])) ?>">›</a>
+    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => $pages])) ?>">»</a>
+</p>
@@ -13,6 +13,7 @@ use RVR\Controller\UserController;
 use RVR\Controller\UserSearchController;
 use RVR\Controller\CommunityController;
 use RVR\Controller\TransactionController;
+use RVR\Controller\EventRedirectController;
 use RVR\Controller\EventController;
 use RVR\Repository\UserRepository;

@@ -62,6 +63,10 @@ Container::$routeCollection->group('account', function (RouteCollection $routeCo
    $routeCollection->get('account.googleAuthenticate-action', 'googleAuthenticate/code', [UserController::class, 'authenticateWithGoogle']);
 });
 Container::$routeCollection->get('searchUser', 'searchUser', [UserSearchController::class, 'searchUser']);
+Container::$routeCollection->group('now', function (RouteCollection $routeCollection) {
+    $routeCollection->get('now.event', '', [EventRedirectController::class, 'getEvent']);
+    $routeCollection->get('now.transactions.new', 'transaction', [EventRedirectController::class, 'getEventNewTransaction']);
+});
 Container::$routeCollection->group('communities', function (RouteCollection $routeCollection) {
    $routeCollection->get('community.new', 'new', [CommunityController::class, 'getCommunityNew']);
    $routeCollection->post('community.new-action', 'new', [CommunityController::class, 'saveCommunity']);
@@ -70,6 +75,7 @@ Container::$routeCollection->group('communities', function (RouteCollection $rou
        $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->post('community.delete-action', 'delete', [CommunityController::class, 'deleteCommunity']);
        $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']);
Author	SHA1	Message	Date
bence	37ba0ec172	Merge pull request 'feature/create-working-docker-images' (!68 ) from feature/create-working-docker-images into master rvr-nextgen/pipeline/head This commit looks good Details rvr-nextgen/pipeline/tag This commit looks good Details Reviewed-on: #68	2023-09-28 13:33:02 +02:00
bence	9ffde6bccb	update readme rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-09-28 13:31:26 +02:00
bence	0ce1c4f28a	update soko-web	2023-09-28 13:21:54 +02:00
bence	0d1e4a3d1c	update docker-compose	2023-09-28 13:21:54 +02:00
bence	cbf62d1c4a	add docker release stage to pipeline	2023-09-28 13:21:54 +02:00
bence	5eeac18b4c	use the new dockerfile in pipeline	2023-09-28 13:21:54 +02:00
bence	c4dce94f5e	delete deprecated dockerfiles	2023-09-28 13:21:54 +02:00
bence	147b7690ac	add new dockerfile with dev and release stages	2023-09-28 13:21:54 +02:00
bence	bdfa46b838	add entry point for dev docker	2023-09-28 13:21:54 +02:00
bence	27fe883f59	add entry point for release docker	2023-09-28 13:21:54 +02:00
bence	1718dfca9e	install base database in MigrateDatabaseCommand	2023-09-28 13:21:54 +02:00
bence	6870d08c21	remove deprecated scripts	2023-09-28 13:21:54 +02:00
bence	eba674bfbc	add cron for db:maintain	2023-09-28 13:21:54 +02:00
bence	832170b1e1	add release generator script	2023-09-28 13:21:54 +02:00
bence	8dfea0993b	add nodejs installer script	2023-09-28 13:21:54 +02:00
bence	6146641eed	Merge pull request 'fix selectUpcomingAndRecent when used with other selects' (!67 ) from bugfix/upcoming-events-are-multiplicated into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #67	2023-08-06 22:09:33 +02:00
bence	7cb406cc49	fix selectUpcomingAndRecent when used with other selects rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-08-06 22:06:42 +02:00
bence	2d2cf9c6f0	Merge pull request 'make short new transaction url even shorter' (!66 ) from feature/change-short-new-transaction-url into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #66	2023-07-24 21:43:39 +02:00
bence	ca069d0795	make short new transaction url even shorter rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-07-24 21:42:27 +02:00
bence	17d9437a50	Merge pull request 'fix select to avoid getting all events as upcoming/recent' (!65 ) from bugfix/fix-select-for-upcoming-and-recent-events into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #65	2023-07-24 02:12:15 +02:00
bence	aed4548c7b	fix select to avoid getting all events as upcoming/recent rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-07-24 02:11:27 +02:00
bence	0d6d152b82	Merge pull request 'create endpoints to get current event and current event new transaction' (!64 ) from feature/create-endpoint-for-currect-event-redirection into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #64	2023-07-24 02:08:11 +02:00
bence	7beec510a1	create endpoints to get current event and current event new transaction rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-07-24 02:00:59 +02:00
bence	22b849a1c8	Merge pull request 'select current user as payer by default for new transaction' (!63 ) from feature/default-payer-is-current-user into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #63	2023-07-24 01:31:22 +02:00
bence	492aa9fcef	select current user as payer by default for new transaction rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-07-24 01:29:53 +02:00
bence	b6da70e015	Merge pull request 'fix transaction edit header' (!62 ) from bugfix/fix-transaction-edit-header into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #62	2023-07-12 00:40:06 +02:00
bence	afead7fd61	Merge pull request 'show balance for events' (!61 ) from feature/show-balance-for-events into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #61	2023-07-12 00:38:17 +02:00
bence	69acbf708b	fix transaction edit header rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-07-12 00:32:55 +02:00
bence	08ebfae030	show balance for events rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-07-12 00:26:59 +02:00
bence	a597839379	Merge pull request 'feature/RVRNEXT-45-show-recent-events-as-well' (!60 ) from feature/RVRNEXT-45-show-recent-events-as-well into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #60	2023-07-08 14:44:35 +02:00
bence	e0fe6a8622	RVRNEXT-45 update soko-web to 0.13.1 rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-07-08 14:42:09 +02:00
bence	5ebce653dc	RVRNEXT-45 show recent events as well with upcoming events	2023-07-08 13:52:24 +02:00
bence	61eb2404a2	Merge pull request 'feature/RVRNEXT-43-split-transactions' (!59 ) from feature/RVRNEXT-43-split-transactions into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #59	2023-06-17 14:59:09 +02:00
bence	e199dfccc7	RVRNEXT-43 update soko-web rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-06-17 14:35:00 +02:00
bence	1d0a2b09d5	RVRNEXT-43 adapt balance calculations to multiple payees	2023-06-17 13:47:05 +02:00
bence	1886257b63	RVRNEXT-43 adapt views to multiple payees	2023-06-17 13:46:43 +02:00
bence	eda1415e86	RVRNEXT-43 implement multiple payees in transaction controller	2023-06-17 13:46:13 +02:00
bence	4e9c7f8c3c	RVRNEXT-43 extend community member repository with count	2023-06-17 13:17:29 +02:00
bence	eebf4aff00	RVRNEXT-43 add multi relation for transaction	2023-06-17 13:16:53 +02:00
bence	6dae33507f	RVRNEXT-43 add repository for transaction payees	2023-06-17 13:15:54 +02:00
bence	96d5aa2219	RVRNEXT-43 add model for transaction payee	2023-06-17 13:14:43 +02:00
bence	6c326b89e2	RVRNEXT-43 add migration for transaction payees	2023-06-17 13:14:33 +02:00
bence	6c821d41b4	Merge pull request 'feature/RVRNEXT-39-delete-communities' (!58 ) from feature/RVRNEXT-39-delete-communities into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #58	2023-06-16 21:39:45 +02:00
bence	ade02f4736	RVRNEXT-39 add endpoint for community delete rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-06-16 21:38:27 +02:00
bence	bb5b510315	RVRNEXT-39 add delete button for communities	2023-06-16 21:38:27 +02:00
bence	1267cb3d95	RVRNEXT-39 implement community delete	2023-06-16 21:38:26 +02:00
bence	c7641b85e7	RVRNEXT-39 make main currency nullable	2023-06-16 21:28:42 +02:00
bence	ee4b8e9d65	Merge pull request 'bugfix/RVRNEXT-31-allow-special-characters-for-local-assets' (!57 ) from bugfix/RVRNEXT-31-allow-special-characters-for-local-assets into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #57	2023-05-28 22:31:21 +02:00
bence	58d4f982e9	RVRNEXT-31 remove hack for assets of tom-select rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-05-28 22:30:00 +02:00
bence	ad06cfaa58	RVRNEXT-31 update soko-web	2023-05-28 22:30:00 +02:00
bence	aa2e0e9b4a	Merge pull request 'feature/RVRNEXT-22-add-pagination-template' (!56 ) from feature/RVRNEXT-22-add-pagination-template into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #56	2023-05-28 20:46:22 +02:00
bence	d1c926541a	RVRNEXT-22 use the new repository methods in controllers rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-05-28 20:34:07 +02:00
bence	9929e00a3f	RVRNEXT-22 use Select::paginate in repositories	2023-05-28 20:34:07 +02:00
bence	bf415a2a46	RVRNEXT-22 use pagination template	2023-05-28 20:34:00 +02:00
bence	c0bfa5b334	RVRNEXT-22 add pagination template	2023-05-28 20:33:59 +02:00
bence	e122248a97	Merge pull request 'fix sql statement for table transactions' (!55 ) from bugfix/fix-buggy-migration into master rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #55	2023-05-28 17:03:11 +02:00
bence	d2bb1d4936	fix sql statement for table transactions rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-05-28 17:01:19 +02:00