Jenkinsfile

@@ -35,7 +35,7 @@ pipeline {
                 sh 'vendor/bin/phpunit --log-junit unit_test_results.xml --testdox tests'
             }
             post {
-                always {
+                success {
                     archiveArtifacts 'unit_test_results.xml'
                 }
             }
@@ -53,7 +53,7 @@ pipeline {
                 sh 'php vendor/bin/phpstan analyse -c phpstan.neon --error-format=prettyJson > static_code_analysis_results.json'
             }
             post {
-                always {
+                success {
                     archiveArtifacts 'static_code_analysis_results.json'
                 }
             }

composer.json

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

composer.lock

@@ -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": "c17dd5eb82ff8f509a17404bd4c471b8",
     "packages": [
         {
             "name": "cocur/slugify",
@@ -82,11 +82,11 @@
         },
         {
             "name": "esoko/soko-web",
-            "version": "v0.12.1",
+            "version": "v0.11",
             "source": {
                 "type": "git",
                 "url": "https://git.esoko.eu/esoko/soko-web.git",
-                "reference": "bda12177ebc201f04fdad5493b93039676a983ca"
+                "reference": "78f891fbff0dc8e5de5607529f4c8282f1dff40f"
             },
             "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-05-06T23:52:34+00:00"
         },
         {
             "name": "firebase/php-jwt",

database/migrations/structure/20230526_1551_events.sql

@@ -1,18 +0,0 @@
-CREATE TABLE `events` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `slug` varchar(255) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL,
-  `community_id` int(10) unsigned NOT NULL,
-  `start` timestamp NOT NULL DEFAULT current_timestamp(),
-  `end` timestamp NOT NULL DEFAULT current_timestamp(),
-  `title` varchar(255) NOT NULL,
-  `description` text NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `community_id` (`community_id`),
-  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`);

public/static/css/rvr.css

@@ -108,10 +108,6 @@ p.small, span.small, td.small {
     font-size: 14px;
 }
 
-p.big, span.big, td.big {
-    font-size: 18px;
-}
-
 .red {
     color: #a80908;
 }
@@ -259,11 +255,11 @@ button.red:enabled:hover, button.red:enabled:focus, a.button.red:hover, a.button
 }
 
 button.yellow, a.button.yellow {
-    background-color: #daa520;
+    background-color: #e8a349;
 }
 
 button.yellow:enabled:hover, button.yellow:enabled:focus, a.button.yellow:hover, a.button.yellow:focus {
-    background-color: #b8860b;
+    background-color: #c37713;
 }
 
 button.green, a.button.green {
@@ -401,7 +397,7 @@ header>p {
 }
 
 header>p>span {
-    padding-left: 8px;
+    padding-left: 6px;
 }
 
 header>p>span>a:link, header>p>span>a:visited {
@@ -414,7 +410,7 @@ header>p>span>a:hover, header>p>span>a:focus {
 
 header>p>span:not(:last-child) {
     border-right: solid white 1px;
-    padding-right: 8px;
+    padding-right: 6px;
 }
 
 main {
@@ -541,15 +537,6 @@ p.formLabel {
     font-size: 14px;
 }
 
-span.label {
-    border-radius: 3px;
-    background-color: #555555;
-    color: #ffffff;
-    padding: 2px 4px;
-    font-weight: bold;
-    font-size: 13px;
-}
-
 @media screen and (max-width: 424px) {
     div.gridContainer {
         grid-template-columns: auto;

public/static/js/communities/transaction.js

@@ -1,30 +0,0 @@
-(function () {
-    const element = document.getElementById('transactionForm').elements['event_id'];
-    const select = new TomSelect(element, {
-        valueField: 'value',
-        labelField: 'label',
-        searchField: 'label',
-        loadThrottle: 300,
-        load: function (query, callback) {
-            var self = this;
-            RVR.httpRequest('GET', searchEventUrl.replace('QUERY', encodeURIComponent(query)), function () {
-                self.clearOptions();
-                callback(this.response.results);
-            });
-        },
-    });
-
-    select.on('change', function (value) {
-        this.clearOptions();
-    });
-
-    select.on('blur', function (value) {
-        this.clearOptions();
-    });
-
-    select.on('type', function (value) {
-        if (value === '') {
-            this.clearOptions();
-        }
-    });
-})();

src/Controller/CommunityController.php

@@ -11,7 +11,6 @@ use RVR\Repository\CommunityRepository;
 use RVR\Repository\CommunityMemberRepository;
 use RVR\Repository\CurrencyExchangeRateRepository;
 use RVR\Repository\CurrencyRepository;
-use RVR\Repository\EventRepository;
 use RVR\Repository\TransactionRepository;
 use RVR\Repository\UserRepository;
 use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
@@ -33,8 +32,6 @@ class CommunityController implements IAuthenticationRequired
 
     private TransactionRepository $transactionRepository;
 
-    private EventRepository $eventRepository;
-
     public function __construct()
     {
         $this->userRepository = new UserRepository();
@@ -43,7 +40,6 @@ class CommunityController implements IAuthenticationRequired
         $this->currencyRepository = new CurrencyRepository();
         $this->currencyExchangeRatesRepository = new CurrencyExchangeRateRepository();
         $this->transactionRepository = new TransactionRepository();
-        $this->eventRepository = new EventRepository();
     }
 
     public function isAuthenticationRequired(): bool
@@ -79,7 +75,7 @@ class CommunityController implements IAuthenticationRequired
 
         return new HtmlContent('communities/community', [
             'community' => $community,
-            'upcomingEvents' => iterator_to_array($this->eventRepository->getUpcomingByCommunity($community, new DateTime(), 3)),
+            'upcomingEvents' => [],
             'debtItems' => $debtItems,
             'debtBalance' => $debtBalance,
             'outstandingItems' => $outstandingItems,

src/Controller/EventController.php

@@ -1,181 +0,0 @@
-<?php namespace RVR\Controller;
-
-use Container;
-use DateTime;
-use RVR\Finance\ExchangeRateCalculator;
-use RVR\PersistentData\Model\Community;
-use RVR\PersistentData\Model\CommunityMember;
-use RVR\PersistentData\Model\Event;
-use RVR\PersistentData\Model\User;
-use RVR\Repository\CommunityMemberRepository;
-use RVR\Repository\CommunityRepository;
-use RVR\Repository\EventRepository;
-use RVR\Repository\TransactionRepository;
-use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use SokoWeb\Interfaces\Authorization\ISecured;
-use SokoWeb\Interfaces\Response\IContent;
-use SokoWeb\Response\HtmlContent;
-use SokoWeb\Response\JsonContent;
-
-class EventController implements IAuthenticationRequired, ISecured
-{
-    private CommunityRepository $communityRepository;
-
-    private CommunityMemberRepository $communityMemberRepository;
-
-    private EventRepository $eventRepository;
-
-    private TransactionRepository $transactionRepository;
-
-    private ?Community $community;
-
-    private ?CommunityMember $ownCommunityMember;
-
-    public function __construct()
-    {
-        $this->communityRepository = new CommunityRepository();
-        $this->communityMemberRepository = new CommunityMemberRepository();
-        $this->eventRepository = new EventRepository();
-        $this->transactionRepository = new TransactionRepository();
-    }
-
-    public function isAuthenticationRequired(): bool
-    {
-        return true;
-    }
-
-    public function authorize(): bool
-    {
-        $communitySlug = \Container::$request->query('communitySlug');
-        $this->community = $this->communityRepository->getBySlug($communitySlug);
-        if ($this->community === null) {
-            return false;
-        }
-
-        /**
-        * @var User $user
-        */
-        $user = \Container::$request->user();
-        $this->ownCommunityMember = $this->communityMemberRepository->getByCommunityAndUser($this->community, $user);
-        if ($this->ownCommunityMember === null) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function getEvents(): IContent
-    {
-        $itemsPerPage = 10;
-        $numberOfEvents = $this->eventRepository->countAllByCommunity($this->community);
-        $pages = ceil($numberOfEvents / $itemsPerPage);
-        $currentPage = Container::$request->query('page') ?: 0;
-        $events = $this->eventRepository->getPagedByCommunity(
-            $this->community,
-            $currentPage * $itemsPerPage,
-            $itemsPerPage
-        );
-
-        return new HtmlContent('events/events', [
-            'community' => $this->community,
-            'pages' => $pages,
-            'currentPage' => $currentPage,
-            'numberOfEvents' => $numberOfEvents,
-            'events' => $events
-        ]);
-    }
-
-    public function searchEvent(): IContent
-    {
-        $events = iterator_to_array($this->eventRepository->searchByTitle($this->community, Container::$request->query('q')));
-        $results = [];
-        foreach ($events as $event) {
-            $results[] = ['value' => $event->getId(), 'label' => $event->getTitle()];
-        }
-
-        return new JsonContent([
-            'results' => $results
-        ]);
-    }
-
-    public function getEvent(): ?IContent
-    {
-        $event = $this->eventRepository->getBySlug(Container::$request->query('eventSlug'));
-        if (!$event) {
-            return null;
-        }
-        Container::$persistentDataManager->loadRelationsFromDb($this->community, true, ['main_currency']);
-
-        return new HtmlContent('events/event', [
-            'community' => $this->community,
-            'event' => $event,
-            'totalCost' => $this->sumTransactions($event)
-        ]);
-    }
-
-    public function getEventEdit(): ?IContent
-    {
-        $eventSlug = Container::$request->query('eventSlug');
-        if ($eventSlug) {
-            $event = $this->eventRepository->getBySlug($eventSlug);
-            if ($event === null) {
-                return null;
-            }
-        } else {
-            $event = null;
-        }
-
-        return new HtmlContent('events/event_edit', [
-            'community' => $this->community,
-            'event' => $event
-        ]);
-    }
-
-    public function saveEvent(): ?IContent
-    {
-        $eventSlug = Container::$request->query('eventSlug');
-        if ($eventSlug) {
-            $event = $this->eventRepository->getBySlug($eventSlug);
-        } else {
-            $event = new Event();
-            $event->setCommunity($this->community);
-        }
-
-        $event->setTitle(Container::$request->post('title'));
-        $event->setDescription(Container::$request->post('description'));
-        $event->setStartDate(new DateTime(Container::$request->post('start')));
-        $event->setEndDate(new DateTime(Container::$request->post('end')));
-        Container::$persistentDataManager->saveToDb($event);
-
-        return new JsonContent([
-            'redirect' => ['target' => \Container::$routeCollection->getRoute('community.event')->generateLink(['communitySlug' => $this->community->getSlug(), 'eventSlug' => $event->getSlug()])]
-        ]);
-    }
-
-    public function deleteEvent(): IContent
-    {
-        $event = $this->eventRepository->getBySlug(Container::$request->query('eventSlug'));
-
-        foreach ($this->transactionRepository->getAllByEvent($event) as $transaction) {
-            $transaction->setEventId(null);
-            Container::$persistentDataManager->saveToDb($transaction);
-        }
-
-        Container::$persistentDataManager->deleteFromDb($event);
-
-        return new JsonContent(['success' => true]);
-    }
-
-    private function sumTransactions(Event $event): float
-    {
-        $exchangeRateCalculator = new ExchangeRateCalculator($this->community->getMainCurrency());
-        $transactions = $this->transactionRepository->getAllByEvent($event, true, ['currency']);
-        $sum = 0.0;
-
-        foreach ($transactions as $transaction) {
-            $sum += $exchangeRateCalculator->calculate($transaction->getSum(), $transaction->getCurrency(), $transaction->getTimeDate());
-        }
-
-        return $sum;
-    }
-}

src/Controller/HomeController.php

@@ -1,10 +1,8 @@
 <?php namespace RVR\Controller;
 
-use DateTime;
 use RVR\PersistentData\Model\Community;
 use RVR\PersistentData\Model\User;
 use RVR\Repository\CommunityMemberRepository;
-use RVR\Repository\EventRepository;
 use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Response\IContent;
 use SokoWeb\Response\HtmlContent;
@@ -13,12 +11,9 @@ class HomeController implements IAuthenticationRequired
 {
     private CommunityMemberRepository $communityMemberRepository;
 
-    private EventRepository $eventRepository;
-
     public function __construct()
     {
         $this->communityMemberRepository = new CommunityMemberRepository();
-        $this->eventRepository = new EventRepository();
     }
 
     public function isAuthenticationRequired(): bool
@@ -44,7 +39,7 @@ class HomeController implements IAuthenticationRequired
 
         return new HtmlContent('home', [
             'communities' => $communities,
-            'upcomingEvents' => iterator_to_array($this->eventRepository->getUpcomingByUser($user, new DateTime(), 3, true, ['community']))
+            'upcomingEvents' => []
         ]);
     }
 }

src/Controller/TransactionController.php

@@ -11,7 +11,6 @@ use RVR\Repository\CommunityMemberRepository;
 use RVR\Repository\CommunityRepository;
 use RVR\Repository\CurrencyRepository;
 use RVR\Repository\TransactionRepository;
-use RVR\Repository\EventRepository;
 use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use SokoWeb\Interfaces\Authorization\ISecured;
 use SokoWeb\Interfaces\Response\IContent;
@@ -28,11 +27,9 @@ class TransactionController implements IAuthenticationRequired, ISecured
 
     private TransactionRepository $transactionRepository;
 
-    private EventRepository $eventRepository;
+    private Community $community;
 
-    private ?Community $community;
-
-    private ?CommunityMember $ownCommunityMember;
+    private CommunityMember $ownCommunityMember;
 
     public function __construct()
     {
@@ -40,7 +37,6 @@ class TransactionController implements IAuthenticationRequired, ISecured
         $this->communityMemberRepository = new CommunityMemberRepository();
         $this->currencyRepository = new CurrencyRepository();
         $this->transactionRepository = new TransactionRepository();
-        $this->eventRepository = new EventRepository();
     }
 
     public function isAuthenticationRequired(): bool
@@ -73,38 +69,20 @@ class TransactionController implements IAuthenticationRequired, ISecured
         Container::$persistentDataManager->loadRelationsFromDb($this->community, true, ['main_currency']);
         $exchangeRateCalculator = new ExchangeRateCalculator($this->community->getMainCurrency());
 
-        $eventSlug = Container::$request->query('event');
-        if ($eventSlug) {
-            $event = $this->eventRepository->getBySlug($eventSlug);
-        } else {
-            $event = null;
-        }
-
         $itemsPerPage = 50;
-        $numberOfTransactions = $event ?
-            $this->transactionRepository->countAllByEvent($event) :
-            $this->transactionRepository->countAllByCommunity($this->community);
+        $numberOfTransactions = $this->transactionRepository->countAllByCommunity($this->community);
         $pages = ceil($numberOfTransactions / $itemsPerPage);
         $currentPage = Container::$request->query('page') ?: 0;
-        $transactions = $event ?
-            $this->transactionRepository->getPagedByEvent(
-                $event,
-                $currentPage * $itemsPerPage,
-                $itemsPerPage,
-                true,
-                ['currency', 'payer_user', 'payee_user']
-            ) :
-            $this->transactionRepository->getPagedByCommunity(
+        $transactions = $this->transactionRepository->getPagedByCommunity(
             $this->community,
             $currentPage * $itemsPerPage,
             $itemsPerPage,
             true,
-                ['event', 'currency', 'payer_user', 'payee_user']
+            ['currency', 'payer_user', 'payee_user']
         );
 
         return new HtmlContent('communities/transactions', [
             'community' => $this->community,
-            'event' => $event,
             'exchangeRateCalculator' => $exchangeRateCalculator,
             'pages' => $pages,
             'currentPage' => $currentPage,
@@ -121,22 +99,13 @@ class TransactionController implements IAuthenticationRequired, ISecured
             if ($transaction === null) {
                 return null;
             }
-            Container::$persistentDataManager->loadRelationsFromDb($transaction, false, ['event']);
-            $event = $transaction->getEvent();
         } else {
             $transaction = null;
-            $eventSlug = Container::$request->query('event');
-            if ($eventSlug) {
-                $event = $this->eventRepository->getBySlug($eventSlug);
-            } else {
-                $event = null;
-            }
         }
 
         return new HtmlContent('communities/transaction_edit', [
             'community' => $this->community,
             'transaction' => $transaction,
-            'event' => $event,
             'members' => $this->getMembers($this->community),
             'currencies' => $this->getCurrencies($this->community)
         ]);
@@ -152,7 +121,6 @@ class TransactionController implements IAuthenticationRequired, ISecured
             $transaction->setCommunity($this->community);
         }
 
-        $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);

src/PersistentData/Model/Event.php

@@ -1,107 +0,0 @@
-<?php namespace RVR\PersistentData\Model;
-
-use DateTime;
-use SokoWeb\PersistentData\Model\ModelWithSlug;
-
-class Event extends ModelWithSlug
-{
-    protected static string $table = 'events';
-
-    protected static array $fields = ['community_id', 'start', 'end', 'title', 'description'];
-
-    protected static array $relations = ['community' => Community::class];
-
-    protected static string $slugSource = 'title';
-
-    private ?Community $community = null;
-
-    private int $communityId;
-
-    private DateTime $start;
-
-    private DateTime $end;
-
-    private string $title = '';
-
-    private string $description = '';
-
-    public function setCommunity(Community $community): void
-    {
-        $this->community = $community;
-    }
-
-    public function setCommunityId(int $communityId): void
-    {
-        $this->communityId = $communityId;
-    }
-
-    public function setStartDate(DateTime $start): void
-    {
-        $this->start = $start;
-    }
-
-    public function setStart(string $start): void
-    {
-        $this->start = new DateTime($start);
-    }
-
-    public function setEndDate(DateTime $end): void
-    {
-        $this->end = $end;
-    }
-
-    public function setEnd(string $end): void
-    {
-        $this->end = new DateTime($end);
-    }
-
-    public function setTitle(string $title): void
-    {
-        $this->title = $title;
-    }
-
-    public function setDescription(string $description): void
-    {
-        $this->description = $description;
-    }
-
-    public function getCommunity(): ?Community
-    {
-        return $this->community;
-    }
-
-    public function getCommunityId(): int
-    {
-        return $this->communityId;
-    }
-
-    public function getStartDate(): DateTime
-    {
-        return $this->start;
-    }
-
-    public function getStart(): string
-    {
-        return $this->start->format('Y-m-d H:i:s');
-    }
-
-    public function getEndDate(): DateTime
-    {
-        return $this->end;
-    }
-
-    public function getEnd(): string
-    {
-        return $this->end->format('Y-m-d H:i:s');
-    }
-
-    public function getTitle(): string
-    {
-        return $this->title;
-    }
-
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-}

src/PersistentData/Model/Transaction.php

@@ -7,11 +7,10 @@ class Transaction extends Model
 {
     protected static string $table = 'transactions';
 
-    protected static array $fields = ['community_id', 'event_id', 'currency_id', 'payer_user_id', 'payee_user_id', 'description', 'sum', 'time'];
+    protected static array $fields = ['community_id', 'currency_id', 'payer_user_id', 'payee_user_id', 'description', 'sum', 'time'];
 
     protected static array $relations = [
         'community' => Community::class,
-        'event' => Event::class,
         'currency' => Currency::class,
         'payer_user' => User::class,
         'payee_user' => User::class
@@ -21,10 +20,6 @@ class Transaction extends Model
 
     private int $communityId;
 
-    private ?Event $event = null;
-
-    private ?int $eventId = null;
-
     private ?Currency $currency = null;
 
     private int $currencyId;
@@ -53,16 +48,6 @@ class Transaction extends Model
         $this->communityId = $communityId;
     }
 
-    public function setEvent(?Event $event): void
-    {
-        $this->event = $event;
-    }
-
-    public function setEventId(?int $eventId): void
-    {
-        $this->eventId = $eventId;
-    }
-
     public function setCurrency(Currency $currency): void
     {
         $this->currency = $currency;
@@ -123,16 +108,6 @@ class Transaction extends Model
         return $this->communityId;
     }
 
-    public function getEvent(): ?Event
-    {
-        return $this->event;
-    }
-
-    public function getEventId(): ?int
-    {
-        return $this->eventId;
-    }
-
     public function getCurrency(): ?Currency
     {
         return $this->currency;

src/Repository/EventRepository.php

@@ -1,89 +0,0 @@
-<?php namespace RVR\Repository;
-
-use Container;
-use DateTime;
-use Generator;
-use RVR\PersistentData\Model\Community;
-use RVR\PersistentData\Model\Event;
-use RVR\PersistentData\Model\User;
-use SokoWeb\Database\Query\Select;
-
-class EventRepository
-{
-    public function getById(int $id): ?Event
-    {
-        return Container::$persistentDataManager->selectFromDbById($id, Event::class);
-    }
-
-    public function getBySlug(string $slug): ?Event
-    {
-        return \Container::$persistentDataManager->selectFromDbBySlug($slug, Event::class);
-    }
-
-    public function getAllByCommunity(Community $community, bool $useRelations = false, array $withRelations = []): Generator
-    {
-        $select = $this->selectAllByCommunity($community);
-
-        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
-    }
-
-    public function countAllByCommunity(Community $community): int
-    {
-        return $this->selectAllByCommunity($community)->count();
-    }
-
-    public function getUpcomingByCommunity(Community $community, DateTime $from, 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->orderBy('start', 'DESC');
-        $select->limit($limit, $start);
-
-        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
-    }
-
-    public function searchByTitle(Community $community, string $title): Generator
-    {
-        $select = $this->selectAllByCommunity($community);
-        $select->where('title', 'LIKE', '%' . $title . '%');
-        $select->orderBy('start', 'DESC');
-        $select->limit(10);
-
-        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class);
-    }
-
-    private function selectAllByCommunity(Community $community)
-    {
-        $select = new Select(Container::$dbConnection, Event::getTable());
-        $select->where('community_id', '=', $community->getId());
-        return $select;
-    }
-
-    private function selectAllByUser(User $user)
-    {
-        $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;
-    }
-}

src/Repository/TransactionRepository.php

@@ -4,7 +4,6 @@ use Container;
 use Generator;
 use RVR\PersistentData\Model\Community;
 use RVR\PersistentData\Model\Currency;
-use RVR\PersistentData\Model\Event;
 use RVR\PersistentData\Model\Transaction;
 use RVR\PersistentData\Model\User;
 use SokoWeb\Database\Query\Select;
@@ -23,23 +22,11 @@ class TransactionRepository
         yield from Container::$persistentDataManager->selectMultipleFromDb($select, Transaction::class, $useRelations, $withRelations);
     }
 
-    public function getAllByEvent(Event $event, bool $useRelations = false, array $withRelations = []): Generator
-    {
-        $select = $this->selectAllByEvent($event);
-
-        yield from Container::$persistentDataManager->selectMultipleFromDb($select, Transaction::class, $useRelations, $withRelations);
-    }
-
     public function countAllByCommunity(Community $community): int
     {
         return $this->selectAllByCommunity($community)->count();
     }
 
-    public function countAllByEvent(Event $event): int
-    {
-        return $this->selectAllByEvent($event)->count();
-    }
-
     public function isAnyForUser(User $user): bool
     {
         $select = new Select(Container::$dbConnection, Transaction::getTable());
@@ -68,16 +55,8 @@ class TransactionRepository
 
     public function getPagedByCommunity(Community $community, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
     {
-        $select = $this->selectAllByCommunity($community);
-        $select->orderBy('time', 'DESC');
-        $select->limit($limit, $start);
-
-        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
-    {
-        $select = $this->selectAllByEvent($event);
+        $select = new Select(Container::$dbConnection);
+        $select->where('community_id', '=', $community->getId());
         $select->orderBy('time', 'DESC');
         $select->limit($limit, $start);
 
@@ -90,11 +69,4 @@ class TransactionRepository
         $select->where('community_id', '=', $community->getId());
         return $select;
     }
-
-    private function selectAllByEvent(Event $event)
-    {
-        $select = new Select(Container::$dbConnection, Transaction::getTable());
-        $select->where('event_id', '=', $event->getId());
-        return $select;
-    }
 }

views/communities/community.php

@@ -15,15 +15,11 @@
             <h3 class="marginBottom">Upcoming events</h3>
             <?php if (count($upcomingEvents) > 0): ?>
                 <?php foreach ($upcomingEvents 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>
+                    <!-- todo -->
                 <?php endforeach; ?>
             <?php else: ?>
                 <p>There is no upcoming event.</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>
         <div>
             <?php
@@ -31,7 +27,7 @@
             $mainCurrencyRoundDigits = $community->getMainCurrency()->getRoundDigits();
             ?>
             <h3 class="marginBottom">Finances</h3>
-            <p><a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug()]) ?>">Transactions</a> | <a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New transaction</a></p>
+            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug()]) ?>">Transactions</a>
             <table class="fullWidth marginTop">
                 <tr>
                     <td class="bold">You owe</td>

views/communities/community_members.php

@@ -41,7 +41,7 @@
             <tr>
                 <td>
                     <form id="newMember" action="<?= Container::$routeCollection->getRoute('community.members.new-action')->generateLink(['communitySlug' => $community->getSlug()]) ?>" method="post" data-reload-on-success="true" data-observe-inputs="user_id"></form>
-                    <select form="newMember" name="user_id" required></select>
+                    <select type="text" form="newMember" name="user_id">
                 </td>
                 <td style="text-align: center;">
                     <input type="checkbox" form="newMember" name="owner" />

views/communities/transaction_edit.php

@@ -1,17 +1,9 @@
-@css(/static/node_modules/tom-select/dist/css/tom-select.min.css)
-@js(/static/node_modules/tom-select/dist/js/tom-select.base.min.js)
-@js(js/communities/transaction.js)
-
 @extends(templates/layout_normal)
 
 @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; ?>
         <?php if (isset($transaction)): ?>
             Edit transaction
         <?php else: ?>
@@ -24,15 +16,8 @@
             Container::$routeCollection->getRoute('community.transactions.edit-action')->generateLink(['communitySlug' => $community->getSlug(), 'transactionId' => $transaction->getId()]) :
             Container::$routeCollection->getRoute('community.transactions.new-action')->generateLink(['communitySlug' => $community->getSlug()]);
         ?>
-        <form id="transactionForm" action="<?= $formAction ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'event' => isset($event) ? $event->getSlug() : null]) ?>">
-            <p class="formLabel">Event</p>
-            <select name="event_id">
-                <option value="">[none]</option>
-                <?php if (isset($event)): ?>
-                    <option value="<?= $event->getId() ?>" selected><?= $event->getTitle() ?></option>
-                <?php endif; ?>
-            </select>
-            <p class="formLabel marginTop">Payer</p>
+        <form id="transactionForm" action="<?= $formAction ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug()]) ?>">
+            <p class="formLabel">Payer</p>
             <select class="big fullWidth" name="payer_user_id" required>
                 <option value="" hidden></option>
                 <?php foreach ($members as $member): ?>
@@ -72,9 +57,3 @@
         <?php endif; ?>
     </div>
 @endsection
-
-@section(pageScript)
-<script>
-    var searchEventUrl = '<?= Container::$routeCollection->getRoute('community.events.search')->generateLink(['communitySlug' => $community->getSlug(), 'q' => 'QUERY']) ?>';
-</script>
-@endsection

views/communities/transactions.php

@@ -3,14 +3,10 @@
 @section(main)
     <h2>
         <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communitySlug' => $community->getSlug()]) ?>"><?= $community->getName() ?></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; ?>
         Transactions
     </h2>
 
-    <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>
+    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New transaction</a></p>
 
     <?php if ($numberOfTransactions > 0): ?>
         <?php if ($pages > 1): ?>
@@ -33,9 +29,6 @@
             <a class="block" href="<?= Container::$routeCollection->getRoute('community.transactions.edit')->generateLink(['communitySlug' => $community->getSlug(), 'transactionId' => $transaction->getId()]) ?>">
             <div class="box transaction">
                 <div>
-                    <?php if ($transaction->getEvent()): ?>
-                        <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->getTimeDate()->format('Y-m-d H:i') ?></p>
@@ -66,7 +59,7 @@
             </p>
         <?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>
+        <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New transaction</a></p>
     <?php else: ?>
         <div class="box">
             <p>There are no transactions yet.</p>

views/events/event.php

@@ -1,27 +0,0 @@
-@extends(templates/layout_normal)
-
-@section(main)
-    <h2>
-        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communitySlug' => $community->getSlug()]) ?>"><?= $community->getName() ?></a> »
-        <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug()]) ?>">Events</a> »
-        <?= $event->getTitle() ?>
-        <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community.event.edit')->generateLink(['communitySlug' => $community->getSlug(), 'eventSlug' => $event->getSlug()]) ?>">edit</a>]</span>
-    </h2>
-
-    <div class="gridContainer marginTop">
-        <div>
-            <?php
-            $mainCurrencyCode = $community->getMainCurrency()->getCode();
-            $mainCurrencyRoundDigits = $community->getMainCurrency()->getRoundDigits();
-            ?>
-            <h3 class="marginBottom">Finances</h3>
-            <p><a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'event' => $event->getSlug()]) ?>">Transactions</a> | <a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communitySlug' => $community->getSlug(), 'event' => $event->getSlug()]) ?>">New transaction</a></p>
-            <table class="fullWidth marginTop">
-                <tr>
-                    <td class="bold">Total cost</td>
-                    <td class="mono" style="text-align: right;"><?= number_format($totalCost, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
-                </tr>
-            </table>
-        </div>
-    </div>
-@endsection

views/events/event_edit.php

@@ -1,40 +0,0 @@
-@extends(templates/layout_normal)
-
-@section(main)
-    <h2>
-        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communitySlug' => $community->getSlug()]) ?>"><?= $community->getName() ?></a> »
-        <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug()]) ?>">Events</a> »
-        <?php if (isset($event)): ?>
-            <a href="<?= Container::$routeCollection->getRoute('community.event')->generateLink(['communitySlug' => $community->getSlug(), 'eventSlug' => $event->getSlug()]) ?>"><?= $event->getTitle() ?></a> » Edit event
-        <?php else: ?>
-            New event
-        <?php endif; ?>
-    </h2>
-    <div class="box compactBox">
-        <?php
-        $formAction = isset($event) ?
-            Container::$routeCollection->getRoute('community.event.edit-action')->generateLink(['communitySlug' => $community->getSlug(), 'eventSlug' => $event->getSlug()]) :
-            Container::$routeCollection->getRoute('community.events.new-action')->generateLink(['communitySlug' => $community->getSlug()]);
-        ?>
-        <form id="eventForm" action="<?= $formAction ?>" method="post" data-redirect-on-success="true">
-            <p class="formLabel">Title</p>
-            <input type="text" class="text big fullWidth" name="title" value="<?= isset($event) ? $event->getTitle() : '' ?>" required>
-            <p class="formLabel marginTop">Description</p>
-            <textarea class="text big fullWidth" name="description" rows="3"><?= isset($event) ? $event->getDescription() : '' ?></textarea>
-            <p class="formLabel marginTop">Start</p>
-            <input type="datetime-local" class="text big fullWidth" name="start" value="<?= isset($event) ? $event->getStartDate()->format('Y-m-d\TH:i') : '' ?>" required>
-            <p class="formLabel marginTop">End</p>
-            <input type="datetime-local" class="text big fullWidth" name="end" value="<?= isset($event) ? $event->getEndDate()->format('Y-m-d\TH:i') : '' ?>" required>
-            <p class="formError justify marginTop"></p>
-            <div class="right marginTop" style="font-size: 0;">
-                <button type="submit" name="submit_button"><?= isset($event) ? '<i class="fa-regular fa-floppy-disk"></i> Save' : '<i class="fa-regular fa-plus"></i> Create' ?></button>
-                <?php if (isset($event)): ?>
-                    <button type="submit" form="deleteEvent"  name="submit_button" data-confirmation="Are you sure you want to delete this event? All linked transactions will be unlinked!" class="red marginLeft"><i class="fa-regular fa-trash-can"></i> Delete</button>
-                <?php endif; ?>
-            </div>
-        </form>
-        <?php if (isset($event)): ?>
-            <form id="deleteEvent" action="<?= Container::$routeCollection->getRoute('community.event.delete-action')->generateLink(['communitySlug' => $community->getSlug(), 'eventSlug' => $event->getSlug()]) ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug()]) ?>"></form>
-        <?php endif; ?>
-    </div>
-@endsection

views/events/events.php

@@ -1,60 +0,0 @@
-@extends(templates/layout_normal)
-
-@section(main)
-    <h2>
-        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communitySlug' => $community->getSlug()]) ?>"><?= $community->getName() ?></a> »
-        Events
-    </h2>
-
-    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.events.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New event</a></p>
-
-    <?php if ($numberOfEvents > 0): ?>
-        <?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>
-        <?php endif; ?>
-
-        <?php foreach ($events as $event): ?>
-            <a class="block" href="<?= Container::$routeCollection->getRoute('community.event')->generateLink(['communitySlug' => $community->getSlug(), 'eventSlug' => $event->getSlug()]) ?>">
-            <div class="box">
-                <p style="font-weight: bold;"><?= $event->getTitle() ?></p>
-                <p class="small"><?= $event->getStartDate()->format('Y-m-d') ?> – <?= $event->getEndDate()->format('Y-m-d') ?></p>
-                <p class="small"><?= $event->getDescription() ?></p>
-            </div>
-            </a>
-        <?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>
-        <?php endif; ?>
-
-        <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.events.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New event</a></p>
-    <?php else: ?>
-        <div class="box">
-            <p>There are no events yet.</p>
-        </div>
-    <?php endif; ?>
-@endsection

views/home.php

@@ -19,13 +19,7 @@
             <h3 class="marginBottom">Upcoming events</h3>
             <?php if (count($upcomingEvents) > 0): ?>
                 <?php foreach ($upcomingEvents as $event): ?>
-                    <p>
-                        <a href="<?= Container::$routeCollection->getRoute('community.event')->generateLink(['communitySlug' => $event->getCommunity()->getSlug(), 'eventSlug' => $event->getSlug()]) ?>"><?= $event->getTitle() ?></a>
-                        <span class="small">
-                            (<a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communitySlug' => $event->getCommunity()->getSlug()]) ?>"><?= $event->getCommunity()->getName() ?></a>)
-                            <?= $event->getStartDate()->format('Y-m-d') ?> – <?= $event->getEndDate()->format('Y-m-d') ?>
-                        </span>
-                    </p>
+                    <!-- todo -->
                 <?php endforeach; ?>
             <?php else: ?>
                 <p>There is no upcoming event.</p>

views/templates/rvr.php

@@ -5,7 +5,7 @@
     <meta name="description" content="<?= $_ENV['APP_NAME'] ?>">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#212f4d">
-    <title><?= isset($title) ? $title . ' – ' : '' ?><?= $_ENV['APP_NAME'] ?></title>
+    <title><?= $_ENV['APP_NAME'] ?></title>
     <?php if (preg_match('/^(http(s)?:)?\/\//', $_ENV['STATIC_ROOT']) === 1): ?>
         <link href="<?= $_ENV['STATIC_ROOT'] ?>" rel="preconnect">
     <?php endif; ?>

web.php

@@ -13,7 +13,6 @@ use RVR\Controller\UserController;
 use RVR\Controller\UserSearchController;
 use RVR\Controller\CommunityController;
 use RVR\Controller\TransactionController;
-use RVR\Controller\EventController;
 use RVR\Repository\UserRepository;
 
 require 'app.php';
@@ -92,18 +91,6 @@ Container::$routeCollection->group('communities', function (RouteCollection $rou
             $routeCollection->post('community.transactions.edit-action', '{transactionId}', [TransactionController::class, 'saveTransaction']);
             $routeCollection->post('community.transactions.delete-action', '{transactionId}/delete', [TransactionController::class, 'deleteTransaction']);
         });
-        $routeCollection->group('events', function (RouteCollection $routeCollection) {
-            $routeCollection->get('community.events', '', [EventController::class, 'getEvents']);
-            $routeCollection->get('community.events.new', 'new', [EventController::class, 'getEventEdit']);
-            $routeCollection->post('community.events.new-action', 'new', [EventController::class, 'saveEvent']);
-            $routeCollection->get('community.events.search', 'search', [EventController::class, 'searchEvent']);
-            $routeCollection->group('{eventSlug}', function (RouteCollection $routeCollection) {
-                $routeCollection->get('community.event', '', [EventController::class, 'getEvent']);
-                $routeCollection->get('community.event.edit', 'edit', [EventController::class, 'getEventEdit']);
-                $routeCollection->post('community.event.edit-action', 'edit', [EventController::class, 'saveEvent']);
-                $routeCollection->post('community.event.delete-action', 'delete', [EventController::class, 'deleteEvent']);
-            });
-        });
     });
 });