From e1f46424e1ba72d0d2e08d89c793f43c730b01b1 Mon Sep 17 00:00:00 2001
From: Michael Wieland <git@selfcoders.com>
Date: Wed, 22 Jul 2026 22:13:59 +0200
Subject: [PATCH 1/3] Implement user defined collections (#28)

---
 migrations/Version20260722201120.php          |  29 +++++
 .../php/tracky/UserCollectionItemType.php     |  11 ++
 .../controller/UserCollectionController.php   | 120 ++++++++++++++++++
 src/main/php/tracky/model/UserCollection.php  |  77 +++++++++++
 .../php/tracky/model/UserCollectionItem.php   |  91 +++++++++++++
 .../php/tracky/orm/AbstractRepository.php     |  20 +++
 src/main/php/tracky/orm/EpisodeRepository.php |  19 +--
 src/main/php/tracky/orm/MovieRepository.php   |  19 +--
 .../php/tracky/orm/MovieSetRepository.php     |  19 +--
 .../orm/ScrobbleQueueItemRepository.php       |   3 +-
 src/main/php/tracky/orm/SeasonRepository.php  |   3 +-
 src/main/php/tracky/orm/SettingRepository.php |   3 +-
 src/main/php/tracky/orm/ShowRepository.php    |  19 +--
 .../orm/UserCollectionItemRepository.php      |  13 ++
 .../tracky/orm/UserCollectionRepository.php   |  13 ++
 src/main/php/tracky/orm/UserRepository.php    |   3 +-
 src/main/php/tracky/orm/ViewRepository.php    |   3 +-
 .../resources/lang/messages+intl-icu.de.yaml  |   8 ++
 .../resources/lang/messages+intl-icu.en.yaml  |  14 ++
 templates/components/macros.twig              |  18 +++
 templates/page.twig                           |  36 ++----
 templates/user/collections/collection.twig    |  31 +++++
 templates/user/collections/collections.twig   |  47 +++++++
 templates/user/page.twig                      |  20 ++-
 24 files changed, 529 insertions(+), 110 deletions(-)
 create mode 100644 migrations/Version20260722201120.php
 create mode 100644 src/main/php/tracky/UserCollectionItemType.php
 create mode 100644 src/main/php/tracky/controller/UserCollectionController.php
 create mode 100644 src/main/php/tracky/model/UserCollection.php
 create mode 100644 src/main/php/tracky/model/UserCollectionItem.php
 create mode 100644 src/main/php/tracky/orm/AbstractRepository.php
 create mode 100644 src/main/php/tracky/orm/UserCollectionItemRepository.php
 create mode 100644 src/main/php/tracky/orm/UserCollectionRepository.php
 create mode 100644 templates/user/collections/collection.twig
 create mode 100644 templates/user/collections/collections.twig

diff --git a/migrations/Version20260722201120.php b/migrations/Version20260722201120.php
new file mode 100644
index 0000000..f5a63ad
--- /dev/null
+++ b/migrations/Version20260722201120.php
@@ -0,0 +1,29 @@
+<?php
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260722201120 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return "Add user collections";
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE usercollectionitems (id INT AUTO_INCREMENT NOT NULL, collection INT NOT NULL, type ENUM(\'show\', \'season\', \'episode\', \'movie\', \'movieset\') NOT NULL, item INT NOT NULL, addedAt DATETIME NOT NULL, INDEX IDX_41B0376EFC4D6532 (collection), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE usercollections (id INT AUTO_INCREMENT NOT NULL, user INT NOT NULL, name VARCHAR(255) NOT NULL, createdAt DATETIME NOT NULL, INDEX IDX_1709E57A8D93D649 (user), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE usercollectionitems ADD CONSTRAINT FK_41B0376EFC4D6532 FOREIGN KEY (collection) REFERENCES usercollections (id)');
+        $this->addSql('ALTER TABLE usercollections ADD CONSTRAINT FK_1709E57A8D93D649 FOREIGN KEY (user) REFERENCES users (id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE usercollectionitems DROP FOREIGN KEY FK_41B0376EFC4D6532');
+        $this->addSql('ALTER TABLE usercollections DROP FOREIGN KEY FK_1709E57A8D93D649');
+        $this->addSql('DROP TABLE usercollectionitems');
+        $this->addSql('DROP TABLE usercollections');
+    }
+}
diff --git a/src/main/php/tracky/UserCollectionItemType.php b/src/main/php/tracky/UserCollectionItemType.php
new file mode 100644
index 0000000..ba2ae85
--- /dev/null
+++ b/src/main/php/tracky/UserCollectionItemType.php
@@ -0,0 +1,11 @@
+<?php
+namespace tracky;
+
+enum UserCollectionItemType: string
+{
+    case SHOW = "show";
+    case SEASON = "season";
+    case EPISODE = "episode";
+    case MOVIE = "movie";
+    case MOVIE_SET = "movieset";
+}
diff --git a/src/main/php/tracky/controller/UserCollectionController.php b/src/main/php/tracky/controller/UserCollectionController.php
new file mode 100644
index 0000000..5e19ed8
--- /dev/null
+++ b/src/main/php/tracky/controller/UserCollectionController.php
@@ -0,0 +1,120 @@
+<?php
+namespace tracky\controller;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+use tracky\datetime\DateTime;
+use tracky\model\BaseEntity;
+use tracky\model\User;
+use tracky\model\UserCollection;
+use tracky\model\UserCollectionItem;
+use tracky\orm\EpisodeRepository;
+use tracky\orm\MovieRepository;
+use tracky\orm\MovieSetRepository;
+use tracky\orm\SeasonRepository;
+use tracky\orm\ShowRepository;
+use tracky\orm\UserCollectionRepository;
+use tracky\UserCollectionItemType;
+
+class UserCollectionController extends AbstractController
+{
+    #[Route("/users/{username}/collections", name: "user_profile_collections_page", methods: ["GET"])]
+    public function getListPage(User $user, UserCollectionRepository $userCollectionRepository): Response
+    {
+        return $this->render("user/collections/collections.twig", [
+            "user" => $user,
+            "collections" => $userCollectionRepository->findBy(["user" => $user])
+        ]);
+    }
+
+    #[Route("/users/{username}/collections/{collection}", name: "user_profile_collection_page", methods: ["GET"])]
+    public function getCollectionPage(
+        User               $user,
+        UserCollection     $collection,
+        ShowRepository     $showRepository,
+        SeasonRepository   $seasonRepository,
+        EpisodeRepository  $episodeRepository,
+        MovieRepository    $movieRepository,
+        MovieSetRepository $movieSetRepository
+    ): Response
+    {
+        $typeToRepositoryMap = [
+            UserCollectionItemType::SHOW->value => $showRepository,
+            UserCollectionItemType::SEASON->value => $seasonRepository,
+            UserCollectionItemType::EPISODE->value => $episodeRepository,
+            UserCollectionItemType::MOVIE->value => $movieRepository,
+            UserCollectionItemType::MOVIE_SET->value => $movieSetRepository
+        ];
+
+        /**
+         * @var array<string, array<int, UserCollectionItem>>
+         */
+        $perTypeItems = [];
+
+        foreach ($collection->getItems() as $item) {
+            $type = $item->getType()->value;
+
+            if (!isset($perTypeItems[$type])) {
+                $perTypeItems[$type] = [];
+            }
+
+            $perTypeItems[$type][$item->getId()] = $item;
+        }
+
+        foreach ($perTypeItems as $type => $items) {
+            $itemIds = array_map(fn($item) => $item->getItem(), $items);
+
+            /**
+             * @var BaseEntity $resolvedItem
+             */
+            foreach ($typeToRepositoryMap[$type]->findByIds($itemIds) as $resolvedItem) {
+                $index = array_search($resolvedItem->getId(), $itemIds);
+                $items[$index]->setResolvedItem($resolvedItem);
+            }
+        }
+
+        return $this->render("user/collections/collection.twig", [
+            "user" => $user,
+            "collection" => $collection
+        ]);
+    }
+
+    #[Route("/users/{username}/collections", name: "user_profile_collection_create_action", methods: ["POST"])]
+    #[IsGranted("IS_AUTHENTICATED")]
+    public function createCollection(User $user, Request $request, UserCollectionRepository $userCollectionRepository, EntityManagerInterface $entityManagerInterface): Response
+    {
+        /**
+         * @var User
+         */
+        $currentUser = $this->getUser();
+
+        if ($user->getId() !== $currentUser->getId()) {
+            throw new AccessDeniedHttpException;
+        }
+
+        $name = trim($request->request->getString("name"));
+
+        if ($name === "") {
+            return $this->redirectToRoute("user_profile_collections_page", ["username" => $user->getUsername(), "flash" => "error", "error" => "empty-name", "name" => $name]);
+        }
+
+        if ($userCollectionRepository->count(["user" => $user, "name" => $name])) {
+            return $this->redirectToRoute("user_profile_collections_page", ["username" => $user->getUsername(), "flash" => "error", "error" => "duplicate-collection", "name" => $name]);
+        }
+
+        $collection = new UserCollection;
+        $collection->setUser($user);
+        $collection->setName($name);
+        $collection->setCreatedAt(new DateTime);
+
+        $entityManagerInterface->persist($collection);
+        $entityManagerInterface->flush();
+
+        return $this->redirectToRoute("user_profile_collections_page", ["username" => $user->getUsername(), "flash" => "success", "name" => $name]);
+    }
+}
diff --git a/src/main/php/tracky/model/UserCollection.php b/src/main/php/tracky/model/UserCollection.php
new file mode 100644
index 0000000..fce803c
--- /dev/null
+++ b/src/main/php/tracky/model/UserCollection.php
@@ -0,0 +1,77 @@
+<?php
+namespace tracky\model;
+
+use Doctrine\ORM\Mapping as ORM;
+use tracky\datetime\DateTime;
+use tracky\orm\UserCollectionRepository;
+
+#[ORM\Entity(repositoryClass: UserCollectionRepository::class)]
+#[ORM\Table(name: "usercollections")]
+class UserCollection extends BaseEntity
+{
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(name: "user", referencedColumnName: "id", nullable: false)]
+    protected User $user;
+
+    #[ORM\Column(type: "string", nullable: false)]
+    private string $name;
+
+    #[ORM\Column(name: "createdAt", type: "datetime", nullable: false)]
+    private DateTime $createdAt;
+
+    #[ORM\OneToMany(mappedBy: "collection", targetEntity: UserCollectionItem::class, cascade: ["persist"])]
+    private mixed $items = [];
+
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    public function setUser(User $user): self
+    {
+        $this->user = $user;
+        return $this;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    public function getCreatedAt(): DateTime
+    {
+        return $this->createdAt;
+    }
+
+    public function setCreatedAt(DateTime $date): self
+    {
+        $this->createdAt = $date;
+        return $this;
+    }
+
+    /**
+     * @return UserCollectionItem[]
+     */
+    public function getItems(): mixed
+    {
+        return $this->items;
+    }
+
+    public function setItems(mixed $items): self
+    {
+        $this->items = $items;
+        return $this;
+    }
+
+    public function addItem(UserCollectionItem $item): self
+    {
+        $this->items[] = $item;
+        return $this;
+    }
+}
diff --git a/src/main/php/tracky/model/UserCollectionItem.php b/src/main/php/tracky/model/UserCollectionItem.php
new file mode 100644
index 0000000..f2f8221
--- /dev/null
+++ b/src/main/php/tracky/model/UserCollectionItem.php
@@ -0,0 +1,91 @@
+<?php
+namespace tracky\model;
+
+use Doctrine\ORM\Mapping as ORM;
+use tracky\datetime\DateTime;
+use tracky\orm\UserCollectionItemRepository;
+use tracky\UserCollectionItemType;
+
+#[ORM\Entity(repositoryClass: UserCollectionItemRepository::class)]
+#[ORM\Table(
+    name: "usercollectionitems",
+    uniqueConstraints: [
+        new ORM\UniqueConstraint(
+            name: "unique_collection_type_item",
+            columns: ["collection", "type", "item"]
+        )
+    ]
+)]
+class UserCollectionItem extends BaseEntity
+{
+    #[ORM\ManyToOne(targetEntity: UserCollection::class)]
+    #[ORM\JoinColumn(name: "collection", referencedColumnName: "id", nullable: false)]
+    private UserCollection $collection;
+
+    #[ORM\Column(name: "type", enumType: UserCollectionItemType::class, type: "string", columnDefinition: "ENUM('show', 'season', 'episode', 'movie', 'movieset') NOT NULL")]
+    protected UserCollectionItemType $type;
+
+    #[ORM\Column(name: "item", type: "integer", nullable: false)]
+    protected int $item;
+
+    #[ORM\Column(name: "addedAt", type: "datetime", nullable: false)]
+    protected DateTime $addedAt;
+
+    protected ?BaseEntity $resolvedItem = null;
+
+    public function getCollection(): UserCollection
+    {
+        return $this->collection;
+    }
+
+    public function setCollection(UserCollection $collection): self
+    {
+        $this->collection = $collection;
+        return $this;
+    }
+
+    public function getType(): UserCollectionItemType
+    {
+        return $this->type;
+    }
+
+    public function setType(UserCollectionItemType $type): self
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    public function getItem(): int
+    {
+        return $this->item;
+    }
+
+    public function setItem(Show|Season|Episode|Movie|MovieSet $item): self
+    {
+        $this->item = $item->getId();
+        $this->resolvedItem = $item;
+        return $this;
+    }
+
+    public function getAddedAt(): DateTime
+    {
+        return $this->addedAt;
+    }
+
+    public function setAddedAt(DateTime $date): self
+    {
+        $this->addedAt = $date;
+        return $this;
+    }
+
+    public function getResolvedItem(): BaseEntity
+    {
+        return $this->resolvedItem;
+    }
+
+    public function setResolvedItem(Show|Season|Episode|Movie|MovieSet $item): self
+    {
+        $this->resolvedItem = $item;
+        return $this;
+    }
+}
diff --git a/src/main/php/tracky/orm/AbstractRepository.php b/src/main/php/tracky/orm/AbstractRepository.php
new file mode 100644
index 0000000..9c878ef
--- /dev/null
+++ b/src/main/php/tracky/orm/AbstractRepository.php
@@ -0,0 +1,20 @@
+<?php
+namespace tracky\orm;
+
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+
+abstract class AbstractRepository extends ServiceEntityRepository
+{
+    public function findByIds(array $ids): array
+    {
+        if (empty($ids)) {
+            return [];
+        }
+
+        $queryBuilder = $this->createQueryBuilder("entity");
+
+        $queryBuilder->where($queryBuilder->expr()->in("entity.id", $ids));
+
+        return $queryBuilder->getQuery()->getResult();
+    }
+}
diff --git a/src/main/php/tracky/orm/EpisodeRepository.php b/src/main/php/tracky/orm/EpisodeRepository.php
index a804c61..c1adc87 100644
--- a/src/main/php/tracky/orm/EpisodeRepository.php
+++ b/src/main/php/tracky/orm/EpisodeRepository.php
@@ -1,11 +1,10 @@
 <?php
 namespace tracky\orm;
 
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use tracky\model\Episode;
 
-class EpisodeRepository extends ServiceEntityRepository
+class EpisodeRepository extends AbstractRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
@@ -34,20 +33,4 @@ public function search(string $query, ?int $showId = null)
             ->getQuery()
             ->getResult();
     }
-
-    /**
-     * @return Episode[]
-     */
-    public function findByIds(array $ids): array
-    {
-        if (empty($ids)) {
-            return [];
-        }
-
-        $queryBuilder = $this->createQueryBuilder("episode");
-
-        $queryBuilder->where($queryBuilder->expr()->in("episode.id", $ids));
-
-        return $queryBuilder->getQuery()->getResult();
-    }
 }
diff --git a/src/main/php/tracky/orm/MovieRepository.php b/src/main/php/tracky/orm/MovieRepository.php
index 71608d3..702f742 100644
--- a/src/main/php/tracky/orm/MovieRepository.php
+++ b/src/main/php/tracky/orm/MovieRepository.php
@@ -1,11 +1,10 @@
 <?php
 namespace tracky\orm;
 
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use tracky\model\Movie;
 
-class MovieRepository extends ServiceEntityRepository
+class MovieRepository extends AbstractRepository
 {
     use SearchTrait;
 
@@ -13,20 +12,4 @@ public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Movie::class);
     }
-
-    /**
-     * @return Movie[]
-     */
-    public function findByIds(array $ids): array
-    {
-        if (empty($ids)) {
-            return [];
-        }
-
-        $queryBuilder = $this->createQueryBuilder("movie");
-
-        $queryBuilder->where($queryBuilder->expr()->in("movie.id", $ids));
-
-        return $queryBuilder->getQuery()->getResult();
-    }
 }
diff --git a/src/main/php/tracky/orm/MovieSetRepository.php b/src/main/php/tracky/orm/MovieSetRepository.php
index 86deb65..13b485a 100644
--- a/src/main/php/tracky/orm/MovieSetRepository.php
+++ b/src/main/php/tracky/orm/MovieSetRepository.php
@@ -1,12 +1,11 @@
 <?php
 namespace tracky\orm;
 
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\Persistence\ManagerRegistry;
 use tracky\model\MovieSet;
 
-class MovieSetRepository extends ServiceEntityRepository
+class MovieSetRepository extends AbstractRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
@@ -28,20 +27,4 @@ public function findAllWithMovies(): array
 
         return $query->getResult();
     }
-
-    /**
-     * @return MovieSet[]
-     */
-    public function findByIds(array $ids): array
-    {
-        if (empty($ids)) {
-            return [];
-        }
-
-        $queryBuilder = $this->createQueryBuilder("movieset");
-
-        $queryBuilder->where($queryBuilder->expr()->in("movieset.id", $ids));
-
-        return $queryBuilder->getQuery()->getResult();
-    }
 }
diff --git a/src/main/php/tracky/orm/ScrobbleQueueItemRepository.php b/src/main/php/tracky/orm/ScrobbleQueueItemRepository.php
index a15affb..b54a654 100644
--- a/src/main/php/tracky/orm/ScrobbleQueueItemRepository.php
+++ b/src/main/php/tracky/orm/ScrobbleQueueItemRepository.php
@@ -1,11 +1,10 @@
 <?php
 namespace tracky\orm;
 
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use tracky\model\ScrobbleQueueItem;
 
-class ScrobbleQueueItemRepository extends ServiceEntityRepository
+class ScrobbleQueueItemRepository extends AbstractRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
diff --git a/src/main/php/tracky/orm/SeasonRepository.php b/src/main/php/tracky/orm/SeasonRepository.php
index 48e5c3f..2ec5f76 100644
--- a/src/main/php/tracky/orm/SeasonRepository.php
+++ b/src/main/php/tracky/orm/SeasonRepository.php
@@ -1,11 +1,10 @@
 <?php
 namespace tracky\orm;
 
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use tracky\model\Season;
 
-class SeasonRepository extends ServiceEntityRepository
+class SeasonRepository extends AbstractRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
diff --git a/src/main/php/tracky/orm/SettingRepository.php b/src/main/php/tracky/orm/SettingRepository.php
index 4f5125d..0809454 100644
--- a/src/main/php/tracky/orm/SettingRepository.php
+++ b/src/main/php/tracky/orm/SettingRepository.php
@@ -1,11 +1,10 @@
 <?php
 namespace tracky\orm;
 
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use tracky\model\UserSetting;
 
-class SettingRepository extends ServiceEntityRepository
+class SettingRepository extends AbstractRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
diff --git a/src/main/php/tracky/orm/ShowRepository.php b/src/main/php/tracky/orm/ShowRepository.php
index 2900079..b05bf6b 100644
--- a/src/main/php/tracky/orm/ShowRepository.php
+++ b/src/main/php/tracky/orm/ShowRepository.php
@@ -1,14 +1,13 @@
 <?php
 namespace tracky\orm;
 
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\Persistence\ManagerRegistry;
 use tracky\model\Episode;
 use tracky\model\Season;
 use tracky\model\Show;
 
-class ShowRepository extends ServiceEntityRepository
+class ShowRepository extends AbstractRepository
 {
     use SearchTrait;
 
@@ -77,20 +76,4 @@ public function findByIdWithEpisodesAndViews(int $showId, int $userId): Show
 
         return $query->getOneOrNullResult();
     }
-
-    /**
-     * @return Show[]
-     */
-    public function findByIds(array $ids): array
-    {
-        if (empty($ids)) {
-            return [];
-        }
-
-        $queryBuilder = $this->createQueryBuilder("show");
-
-        $queryBuilder->where($queryBuilder->expr()->in("show.id", $ids));
-
-        return $queryBuilder->getQuery()->getResult();
-    }
 }
diff --git a/src/main/php/tracky/orm/UserCollectionItemRepository.php b/src/main/php/tracky/orm/UserCollectionItemRepository.php
new file mode 100644
index 0000000..4c6b923
--- /dev/null
+++ b/src/main/php/tracky/orm/UserCollectionItemRepository.php
@@ -0,0 +1,13 @@
+<?php
+namespace tracky\orm;
+
+use Doctrine\Persistence\ManagerRegistry;
+use tracky\model\UserCollectionItem;
+
+class UserCollectionItemRepository extends AbstractRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, UserCollectionItem::class);
+    }
+}
diff --git a/src/main/php/tracky/orm/UserCollectionRepository.php b/src/main/php/tracky/orm/UserCollectionRepository.php
new file mode 100644
index 0000000..a29b784
--- /dev/null
+++ b/src/main/php/tracky/orm/UserCollectionRepository.php
@@ -0,0 +1,13 @@
+<?php
+namespace tracky\orm;
+
+use Doctrine\Persistence\ManagerRegistry;
+use tracky\model\UserCollection;
+
+class UserCollectionRepository extends AbstractRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, UserCollection::class);
+    }
+}
diff --git a/src/main/php/tracky/orm/UserRepository.php b/src/main/php/tracky/orm/UserRepository.php
index 11e337a..ae12db1 100644
--- a/src/main/php/tracky/orm/UserRepository.php
+++ b/src/main/php/tracky/orm/UserRepository.php
@@ -1,13 +1,12 @@
 <?php
 namespace tracky\orm;
 
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
 use tracky\model\User;
 
-class UserRepository extends ServiceEntityRepository implements PasswordUpgraderInterface
+class UserRepository extends AbstractRepository implements PasswordUpgraderInterface
 {
     public function __construct(ManagerRegistry $registry)
     {
diff --git a/src/main/php/tracky/orm/ViewRepository.php b/src/main/php/tracky/orm/ViewRepository.php
index c926e8f..6c93483 100644
--- a/src/main/php/tracky/orm/ViewRepository.php
+++ b/src/main/php/tracky/orm/ViewRepository.php
@@ -1,7 +1,6 @@
 <?php
 namespace tracky\orm;
 
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
 use tracky\datetime\DateRange;
@@ -10,7 +9,7 @@
 use tracky\ViewType;
 use tracky\watchstats\WatchStatsCollection;
 
-class ViewRepository extends ServiceEntityRepository
+class ViewRepository extends AbstractRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
diff --git a/src/main/resources/lang/messages+intl-icu.de.yaml b/src/main/resources/lang/messages+intl-icu.de.yaml
index fd36f2d..4c10311 100644
--- a/src/main/resources/lang/messages+intl-icu.de.yaml
+++ b/src/main/resources/lang/messages+intl-icu.de.yaml
@@ -68,6 +68,14 @@ user:
   logout: "Logout"
   login: "Login"
   no-history-available: "Kein Verlauf verfügbar."
+  collections:
+    title: "Sammlungen"
+    create-collection: "Sammlung erstellen"
+    no-collections-available: "Keine Sammlungen verfügbar."
+    no-items-available: "Keine Elemente verfügbar."
+    name: "Name"
+    items: "Elemente"
+    creation-date: "Erstelldatum"
 
 search:
   title: "Suche"
diff --git a/src/main/resources/lang/messages+intl-icu.en.yaml b/src/main/resources/lang/messages+intl-icu.en.yaml
index 5597332..e782d43 100644
--- a/src/main/resources/lang/messages+intl-icu.en.yaml
+++ b/src/main/resources/lang/messages+intl-icu.en.yaml
@@ -66,6 +66,20 @@ user:
   logout: "Logout"
   login: "Login"
   no-history-available: "No history available."
+  collections:
+    title: "Collections"
+    create:
+      title: "Create collection"
+      submit-response:
+        success: "Collection ''{name}'' created."
+        error:
+          empty-name: "No name specified!"
+          duplicate-collection: "Another collection with the name ''{name}'' already exists!"
+    no-collections-available: "No collections available."
+    no-items-available: "No items available."
+    name: "Name"
+    items: "Items"
+    creation-date: "Creation date"
 
 search:
   title: "Search"
diff --git a/templates/components/macros.twig b/templates/components/macros.twig
index 7aeeb19..7052093 100644
--- a/templates/components/macros.twig
+++ b/templates/components/macros.twig
@@ -62,3 +62,21 @@
         <span class="mx-1 flex-shrink-1 progress-text-right">{{ ((watchedEpisodes / episodes|length) * 100)|round }}%</span>
     </div>
 {% endmacro %}
+
+{% macro navItem(path, title, icon_classes = null, route_starts_with = null, parameters = {}) %}
+    {% if route_starts_with != null and app.request.attributes.get("_route") starts with route_starts_with %}
+        {% set active = true %}
+    {% elseif app.request.attributes.get("_route") == path %}
+        {% set active = true %}
+    {% else %}
+        {% set active = false %}
+    {% endif %}
+    <li class="nav-item">
+        <a class="{{ html_classes("nav-link", {"active": active}) }}" href="{{ path(path, parameters) }}">
+            {% if icon_classes != null %}
+                <i class="{{ icon_classes }}"></i>
+            {% endif %}
+            {{ title }}
+        </a>
+    </li>
+{% endmacro %}
diff --git a/templates/page.twig b/templates/page.twig
index 33e8c8b..5b1c102 100644
--- a/templates/page.twig
+++ b/templates/page.twig
@@ -1,15 +1,4 @@
-{% macro navItem(icon_classes, path, title, route_starts_with = null, parameters = {}) %}
-    {% if route_starts_with != null and app.request.attributes.get("_route") starts with route_starts_with %}
-        {% set active = true %}
-    {% elseif app.request.attributes.get("_route") == path %}
-        {% set active = true %}
-    {% else %}
-        {% set active = false %}
-    {% endif %}
-    <li class="nav-item">
-        <a class="{{ html_classes("nav-link", {"active": active}) }}" href="{{ path(path, parameters) }}"><i class="{{ icon_classes }}"></i> {{ title }}</a>
-    </li>
-{% endmacro %}
+{% from "components/macros.twig" import navItem %}
 
 <!DOCTYPE html>
 <html lang="en" data-bs-theme="dark">
@@ -53,11 +42,11 @@
 
                 <div class="flex-grow-1 overflow-y-auto">
                     <ul class="nav nav-pills flex-column mb-auto">
-                        {{ _self.navItem(icon_classes: "fa-solid fa-tv", path: "shows_page", route_starts_with: "shows_", title: "navbar.shows"|trans) }}
-                        {{ _self.navItem(icon_classes: "fa-solid fa-film", path: "movies_page", route_starts_with: "movies_", title: "navbar.movies"|trans) }}
-                        {{ _self.navItem(icon_classes: "fa-solid fa-layer-group", path: "moviesets_page", route_starts_with: "moviesets_", title: "navbar.movie-sets"|trans) }}
+                        {{ navItem(icon_classes: "fa-solid fa-tv", path: "shows_page", route_starts_with: "shows_", title: "navbar.shows"|trans) }}
+                        {{ navItem(icon_classes: "fa-solid fa-film", path: "movies_page", route_starts_with: "movies_", title: "navbar.movies"|trans) }}
+                        {{ navItem(icon_classes: "fa-solid fa-layer-group", path: "moviesets_page", route_starts_with: "moviesets_", title: "navbar.movie-sets"|trans) }}
                         {% if is_granted("IS_AUTHENTICATED") %}
-                            {{ _self.navItem(icon_classes: "fa-solid fa-wrench", path: "library_management_page", route_starts_with: "library_", title: "library-management.title"|trans) }}
+                            {{ navItem(icon_classes: "fa-solid fa-wrench", path: "library_management_page", route_starts_with: "library_", title: "library-management.title"|trans) }}
                         {% endif %}
                     </ul>
 
@@ -67,9 +56,10 @@
                         {% set profile_page_parameters = {"username": app.user.username} %}
 
                         <ul class="nav nav-pills flex-column mb-auto">
-                            {{ _self.navItem(icon_classes: "fa-solid fa-user", path: "user_profile_page", parameters: profile_page_parameters, title: "user.profile"|trans) }}
-                            {{ _self.navItem(icon_classes: "fa-solid fa-calendar-days", path: "user_profile_history_page", parameters: profile_page_parameters, title: "user.history"|trans) }}
-                            {{ _self.navItem(icon_classes: "fa-solid fa-bars-progress", path: "user_profile_show_progress_page", parameters: profile_page_parameters, title: "user.show-progress"|trans) }}
+                            {{ navItem(icon_classes: "fa-solid fa-user", path: "user_profile_page", parameters: profile_page_parameters, title: "user.profile"|trans) }}
+                            {{ navItem(icon_classes: "fa-solid fa-calendar-days", path: "user_profile_history_page", parameters: profile_page_parameters, title: "user.history"|trans) }}
+                            {{ navItem(icon_classes: "fa-solid fa-bars-progress", path: "user_profile_show_progress_page", parameters: profile_page_parameters, title: "user.show-progress"|trans) }}
+                            {{ navItem(icon_classes: "fa-solid fa-layer-group", path: "user_profile_collections_page", route_starts_with: "user_profile_collection", parameters: profile_page_parameters, title: "user.collections.title"|trans) }}
                         </ul>
                     {% endif %}
                 </div>
@@ -77,15 +67,15 @@
                 <div>
                     <ul class="nav nav-pills flex-column mb-auto">
                         {% if app.user %}
-                            {{ _self.navItem(icon_classes: "fa-solid fa-gear", path: "settings_page", title: "settings.title"|trans) }}
-                            {{ _self.navItem(icon_classes: "fa-solid fa-arrow-right-from-bracket", path: "logout", title: "user.logout"|trans) }}
+                            {{ navItem(icon_classes: "fa-solid fa-gear", path: "settings_page", title: "settings.title"|trans) }}
+                            {{ navItem(icon_classes: "fa-solid fa-arrow-right-from-bracket", path: "logout", title: "user.logout"|trans) }}
                         {% else %}
-                            {{ _self.navItem(icon_classes: "fa-solid fa-arrow-right-to-bracket", path: "login_page", title: "user.login"|trans) }}
+                            {{ navItem(icon_classes: "fa-solid fa-arrow-right-to-bracket", path: "login_page", title: "user.login"|trans) }}
                         {% endif %}
 
                         <hr/>
 
-                        {{ _self.navItem(icon_classes: "fa-solid fa-circle-info", path: "about_page", title: "about.navbar-text"|trans) }}
+                        {{ navItem(icon_classes: "fa-solid fa-circle-info", path: "about_page", title: "about.navbar-text"|trans) }}
                     </ul>
                 </div>
             </div>
diff --git a/templates/user/collections/collection.twig b/templates/user/collections/collection.twig
new file mode 100644
index 0000000..1d35c2b
--- /dev/null
+++ b/templates/user/collections/collection.twig
@@ -0,0 +1,31 @@
+{% extends "user/page.twig" %}
+
+{% block title %}{{ collection.name }} - {{ user.username }}{% endblock %}
+
+{% block profileContent %}
+    <h2 class="mb-3">{{ collection.name }}</h2>
+
+    {% if collection.items|length %}
+        {% set UserCollectionItemType = enum("tracky\\UserCollectionItemType") %}
+
+        <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-4">
+            {% for item in collection.items %}
+                <div class="col">
+                    {% if item.type == UserCollectionItemType.SHOW %}
+                        {% include "components/show-card-small.twig" with {"show": item.resolvedItem} %}
+                    {% elseif item.type == UserCollectionItemType.SEASON %}
+                        {% include "components/season-card-small.twig" with {"season": item.resolvedItem} %}
+                    {% elseif item.type == UserCollectionItemType.EPISODE %}
+                        {% include "components/episode-card-small.twig" with {"episode": item.resolvedItem} %}
+                    {% elseif item.type == UserCollectionItemType.MOVIE %}
+                        {% include "components/movie-card-small.twig" with {"movie": item.resolvedItem} %}
+                    {% elseif item.type == UserCollectionItemType.MOVIE_SET %}
+                        {% include "components/movieset-card-small.twig" with {"movieSet": item.resolvedItem} %}
+                    {% endif %}
+                </div>
+            {% endfor %}
+        </div>
+    {% else %}
+        <div class="alert alert-warning">{{ "user.collections.no-items-available"|trans }}</div>
+    {% endif %}
+{% endblock %}
diff --git a/templates/user/collections/collections.twig b/templates/user/collections/collections.twig
new file mode 100644
index 0000000..ef1588e
--- /dev/null
+++ b/templates/user/collections/collections.twig
@@ -0,0 +1,47 @@
+{% extends "user/page.twig" %}
+
+{% block title %}{{ "user.collections.title"|trans }} - {{ user.username }}{% endblock %}
+
+{% block profileContent %}
+    <h2 class="mb-3">{{ "user.collections.title"|trans }}</h2>
+
+    {% if user == app.user %}
+        {% if app.request.query.get("flash") == "success" %}
+            <div class="alert alert-success">{{ "user.collections.create.submit-response.success"|trans({"name": app.request.query.get("name")}) }}</div>
+        {% elseif app.request.query.get("flash") == "error" %}
+            <div class="alert alert-danger">{{ ("user.collections.create.submit-response.error." ~ app.request.query.get("error"))|trans({"name": app.request.query.get("name")}) }}</div>
+        {% endif %}
+
+        <form class="d-flex flex-column flex-sm-row gap-3 mb-3" action="{{ path("user_profile_collection_create_action", {"username": user.username}) }}" method="post">
+            <div class="flex-grow-1">
+                <input type="text" id="new-user-collection-name" name="name" class="form-control" placeholder="{{ "user.collections.name"|trans }}" required></input>
+            </div>
+            <button type="submit" class="btn btn-primary user-collection-create">{{ "user.collections.create.title"|trans }}</button>
+        </form>
+    {% endif %}
+
+    {% if collections %}
+        <table class="table table-striped">
+            <thead>
+                <tr>
+                    <th>#</th>
+                    <th>{{ "user.collections.name"|trans }}</th>
+                    <th>{{ "user.collections.items"|trans }}</th>
+                    <th>{{ "user.collections.creation-date"|trans }}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for collection in collections %}
+                    <tr>
+                        <td>{{ loop.index }}</td>
+                        <td><a class="text-reset text-decoration-none" href="{{ path("user_profile_collection_page", {"username": user.username, "collection": collection.id}) }}">{{ collection.name }}</a></td>
+                        <td>{{ collection.items|length }}</td>
+                        <td>{{ collection.createdAt.formatForDisplay }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% else %}
+        <div class="alert alert-warning">{{ "user.collections.no-collections-available"|trans }}</div>
+    {% endif %}
+{% endblock %}
diff --git a/templates/user/page.twig b/templates/user/page.twig
index 7a7e5fa..7474310 100644
--- a/templates/user/page.twig
+++ b/templates/user/page.twig
@@ -1,8 +1,17 @@
+{% from "components/macros.twig" import navItem %}
+
 {% extends "page.twig" %}
 
-{% macro navItem(path, parameters, title) %}
+{% macro navItem(path, title, route_starts_with = null, parameters = {}) %}
+    {% if route_starts_with != null and app.request.attributes.get("_route") starts with route_starts_with %}
+        {% set active = true %}
+    {% elseif app.request.attributes.get("_route") == path %}
+        {% set active = true %}
+    {% else %}
+        {% set active = false %}
+    {% endif %}
     <li class="nav-item">
-        <a class="{{ html_classes("nav-link", {"active": app.request.attributes.get("_route") == path}) }}" href="{{ path(path, parameters) }}">{{ title }}</a>
+        <a class="{{ html_classes("nav-link", {"active": active}) }}" href="{{ path(path, parameters) }}">{{ title }}</a>
     </li>
 {% endmacro %}
 
@@ -10,9 +19,10 @@
     <h1>{{ user.username }}</h1>
 
     <ul class="nav nav-underline mb-3">
-        {{ _self.navItem("user_profile_page", {"username": user.username}, "user.profile"|trans) }}
-        {{ _self.navItem("user_profile_history_page", {"username": user.username}, "user.history"|trans) }}
-        {{ _self.navItem("user_profile_show_progress_page", {"username": user.username}, "user.show-progress"|trans) }}
+        {{ navItem(icon_classes: "fa-solid fa-user", path: "user_profile_page", parameters: {"username": user.username}, title: "user.profile"|trans) }}
+        {{ navItem(icon_classes: "fa-solid fa-calendar-days", path: "user_profile_history_page", parameters: {"username": user.username}, title: "user.history"|trans) }}
+        {{ navItem(icon_classes: "fa-solid fa-bars-progress", path: "user_profile_show_progress_page", parameters: {"username": user.username}, title: "user.show-progress"|trans) }}
+        {{ navItem(icon_classes: "fa-solid fa-layer-group", path: "user_profile_collections_page", route_starts_with: "user_profile_collection", parameters: {"username": user.username}, title: "user.collections.title"|trans) }}
     </ul>
 
     {% block profileContent %}{% endblock %}

From 9d04f15afb0d65e58c79add105c8a24a57ccd828 Mon Sep 17 00:00:00 2001
From: Michael Wieland <git@selfcoders.com>
Date: Thu, 23 Jul 2026 23:12:53 +0200
Subject: [PATCH 2/3] Fix missing unique contraint in usercollectionitems table

---
 migrations/Version20260722201120.php             |  2 +-
 src/main/php/tracky/model/UserCollectionItem.php | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/migrations/Version20260722201120.php b/migrations/Version20260722201120.php
index f5a63ad..b1feefe 100644
--- a/migrations/Version20260722201120.php
+++ b/migrations/Version20260722201120.php
@@ -13,7 +13,7 @@ public function getDescription(): string
 
     public function up(Schema $schema): void
     {
-        $this->addSql('CREATE TABLE usercollectionitems (id INT AUTO_INCREMENT NOT NULL, collection INT NOT NULL, type ENUM(\'show\', \'season\', \'episode\', \'movie\', \'movieset\') NOT NULL, item INT NOT NULL, addedAt DATETIME NOT NULL, INDEX IDX_41B0376EFC4D6532 (collection), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE usercollectionitems (id INT AUTO_INCREMENT NOT NULL, collection INT NOT NULL, type ENUM(\'show\', \'season\', \'episode\', \'movie\', \'movieset\') NOT NULL, item INT NOT NULL, addedAt DATETIME NOT NULL, INDEX IDX_41B0376EFC4D6532 (collection), UNIQUE INDEX unique_collection_type_item (collection, type, item), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE usercollections (id INT AUTO_INCREMENT NOT NULL, user INT NOT NULL, name VARCHAR(255) NOT NULL, createdAt DATETIME NOT NULL, INDEX IDX_1709E57A8D93D649 (user), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('ALTER TABLE usercollectionitems ADD CONSTRAINT FK_41B0376EFC4D6532 FOREIGN KEY (collection) REFERENCES usercollections (id)');
         $this->addSql('ALTER TABLE usercollections ADD CONSTRAINT FK_1709E57A8D93D649 FOREIGN KEY (user) REFERENCES users (id)');
diff --git a/src/main/php/tracky/model/UserCollectionItem.php b/src/main/php/tracky/model/UserCollectionItem.php
index f2f8221..bc6feba 100644
--- a/src/main/php/tracky/model/UserCollectionItem.php
+++ b/src/main/php/tracky/model/UserCollectionItem.php
@@ -7,15 +7,8 @@
 use tracky\UserCollectionItemType;
 
 #[ORM\Entity(repositoryClass: UserCollectionItemRepository::class)]
-#[ORM\Table(
-    name: "usercollectionitems",
-    uniqueConstraints: [
-        new ORM\UniqueConstraint(
-            name: "unique_collection_type_item",
-            columns: ["collection", "type", "item"]
-        )
-    ]
-)]
+#[ORM\Table(name: "usercollectionitems")]
+#[ORM\UniqueConstraint(name: "unique_collection_type_item", columns: ["collection", "type", "item"])]
 class UserCollectionItem extends BaseEntity
 {
     #[ORM\ManyToOne(targetEntity: UserCollection::class)]

From 8c4f5841b2e9030d38114ad9bab1152ab25128b9 Mon Sep 17 00:00:00 2001
From: Michael Wieland <git@selfcoders.com>
Date: Thu, 23 Jul 2026 23:14:16 +0200
Subject: [PATCH 3/3] Implement adding items to collections Currently, there
 are only buttons for movies and episodes

---
 .../php/tracky/UserCollectionItemType.php     | 20 ++++
 .../controller/UserCollectionController.php   | 99 +++++++++++++++----
 .../php/tracky/model/UserCollectionItem.php   |  2 +
 src/main/resources/assets/script/main.ts      |  1 +
 .../assets/script/usercollections.ts          | 76 ++++++++++++++
 .../resources/lang/messages+intl-icu.en.yaml  |  5 +
 templates/components/view-buttons.twig        |  1 +
 templates/page.twig                           | 19 ++++
 8 files changed, 205 insertions(+), 18 deletions(-)
 create mode 100644 src/main/resources/assets/script/usercollections.ts

diff --git a/src/main/php/tracky/UserCollectionItemType.php b/src/main/php/tracky/UserCollectionItemType.php
index ba2ae85..1fe57de 100644
--- a/src/main/php/tracky/UserCollectionItemType.php
+++ b/src/main/php/tracky/UserCollectionItemType.php
@@ -1,6 +1,13 @@
 <?php
 namespace tracky;
 
+use tracky\model\BaseEntity;
+use tracky\model\Episode;
+use tracky\model\Movie;
+use tracky\model\MovieSet;
+use tracky\model\Season;
+use tracky\model\Show;
+
 enum UserCollectionItemType: string
 {
     case SHOW = "show";
@@ -8,4 +15,17 @@ enum UserCollectionItemType: string
     case EPISODE = "episode";
     case MOVIE = "movie";
     case MOVIE_SET = "movieset";
+
+    public static function fromEntity(BaseEntity $entity): ?self
+    {
+        $typeMap = [
+            Show::class => self::SHOW,
+            Season::class => self::SEASON,
+            Episode::class => self::EPISODE,
+            Movie::class => self::MOVIE,
+            MovieSet::class => self::MOVIE_SET
+        ];
+
+        return $typeMap[$entity::class] ?? null;
+    }
 }
diff --git a/src/main/php/tracky/controller/UserCollectionController.php b/src/main/php/tracky/controller/UserCollectionController.php
index 5e19ed8..3ae377e 100644
--- a/src/main/php/tracky/controller/UserCollectionController.php
+++ b/src/main/php/tracky/controller/UserCollectionController.php
@@ -6,6 +6,9 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use tracky\datetime\DateTime;
@@ -13,44 +16,64 @@
 use tracky\model\User;
 use tracky\model\UserCollection;
 use tracky\model\UserCollectionItem;
+use tracky\orm\AbstractRepository;
 use tracky\orm\EpisodeRepository;
 use tracky\orm\MovieRepository;
 use tracky\orm\MovieSetRepository;
 use tracky\orm\SeasonRepository;
 use tracky\orm\ShowRepository;
+use tracky\orm\UserCollectionItemRepository;
 use tracky\orm\UserCollectionRepository;
 use tracky\UserCollectionItemType;
 
 class UserCollectionController extends AbstractController
 {
-    #[Route("/users/{username}/collections", name: "user_profile_collections_page", methods: ["GET"])]
-    public function getListPage(User $user, UserCollectionRepository $userCollectionRepository): Response
-    {
-        return $this->render("user/collections/collections.twig", [
-            "user" => $user,
-            "collections" => $userCollectionRepository->findBy(["user" => $user])
-        ]);
-    }
+    /**
+     * @var array<string, AbstractRepository>
+     */
+    private array $typeToRepositoryMap;
 
-    #[Route("/users/{username}/collections/{collection}", name: "user_profile_collection_page", methods: ["GET"])]
-    public function getCollectionPage(
-        User               $user,
-        UserCollection     $collection,
+    public function __construct(
         ShowRepository     $showRepository,
         SeasonRepository   $seasonRepository,
         EpisodeRepository  $episodeRepository,
         MovieRepository    $movieRepository,
         MovieSetRepository $movieSetRepository
-    ): Response
+    )
     {
-        $typeToRepositoryMap = [
+        $this->typeToRepositoryMap = [
             UserCollectionItemType::SHOW->value => $showRepository,
             UserCollectionItemType::SEASON->value => $seasonRepository,
             UserCollectionItemType::EPISODE->value => $episodeRepository,
             UserCollectionItemType::MOVIE->value => $movieRepository,
             UserCollectionItemType::MOVIE_SET->value => $movieSetRepository
         ];
+    }
+
+    #[Route("/users/{username}/collections", name: "user_profile_collections_page", methods: ["GET"])]
+    public function getListPage(User $user, UserCollectionRepository $userCollectionRepository): Response
+    {
+        return $this->render("user/collections/collections.twig", [
+            "user" => $user,
+            "collections" => $userCollectionRepository->findBy(["user" => $user])
+        ]);
+    }
+
+    #[Route("/users/{username}/collections.json", name: "user_profile_collections_json", methods: ["GET"])]
+    public function getCollectionsJson(User $user, UserCollectionRepository $userCollectionRepository): Response
+    {
+        $data = [];
+
+        foreach ($userCollectionRepository->findBy(["user" => $user]) as $collection) {
+            $data[$collection->getId()] = $collection->getName();
+        }
+
+        return $this->json($data);
+    }
 
+    #[Route("/users/{username}/collections/{collection}", name: "user_profile_collection_page", methods: ["GET"])]
+    public function getCollectionPage(User $user, UserCollection $collection): Response
+    {
         /**
          * @var array<string, array<int, UserCollectionItem>>
          */
@@ -72,7 +95,7 @@ public function getCollectionPage(
             /**
              * @var BaseEntity $resolvedItem
              */
-            foreach ($typeToRepositoryMap[$type]->findByIds($itemIds) as $resolvedItem) {
+            foreach ($this->typeToRepositoryMap[$type]->findByIds($itemIds) as $resolvedItem) {
                 $index = array_search($resolvedItem->getId(), $itemIds);
                 $items[$index]->setResolvedItem($resolvedItem);
             }
@@ -86,7 +109,7 @@ public function getCollectionPage(
 
     #[Route("/users/{username}/collections", name: "user_profile_collection_create_action", methods: ["POST"])]
     #[IsGranted("IS_AUTHENTICATED")]
-    public function createCollection(User $user, Request $request, UserCollectionRepository $userCollectionRepository, EntityManagerInterface $entityManagerInterface): Response
+    public function createCollection(User $user, Request $request, UserCollectionRepository $userCollectionRepository, EntityManagerInterface $entityManager): Response
     {
         /**
          * @var User
@@ -112,9 +135,49 @@ public function createCollection(User $user, Request $request, UserCollectionRep
         $collection->setName($name);
         $collection->setCreatedAt(new DateTime);
 
-        $entityManagerInterface->persist($collection);
-        $entityManagerInterface->flush();
+        $entityManager->persist($collection);
+        $entityManager->flush();
 
         return $this->redirectToRoute("user_profile_collections_page", ["username" => $user->getUsername(), "flash" => "success", "name" => $name]);
     }
+
+    #[Route("/users/{username}/collections/{collection}/add-item", name: "user_profile_collection_add_item_action", methods: ["POST"])]
+    #[IsGranted("IS_AUTHENTICATED")]
+    public function addItemToCollection(User $user, UserCollection $collection, Request $request, UserCollectionItemRepository $userCollectionItemRepository, EntityManagerInterface $entityManager): Response
+    {
+        /**
+         * @var User
+         */
+        $currentUser = $this->getUser();
+
+        if ($collection->getUser()->getId() !== $user->getId() or $user->getId() !== $currentUser->getId()) {
+            throw new AccessDeniedHttpException;
+        }
+
+        $payload = $request->getPayload();
+
+        $type = UserCollectionItemType::tryFrom($payload->getString("type"));
+        if ($type === null) {
+            throw new BadRequestHttpException("Invalid type!");
+        }
+
+        $item = $this->typeToRepositoryMap[$type->value]->findOneBy(["id" => $payload->getInt("item")]);
+        if ($item === null) {
+            throw new NotFoundHttpException("Item not found!");
+        }
+
+        if ($userCollectionItemRepository->count(["collection" => $collection->getId(), "type" => $type->value, "item" => $item->getId()])) {
+            throw new UnprocessableEntityHttpException("Item already exists in collection!");
+        }
+
+        $collectionItem = new UserCollectionItem;
+        $collectionItem->setCollection($collection);
+        $collectionItem->setItem($item);
+        $collectionItem->setAddedAt(new DateTime);
+
+        $entityManager->persist($collectionItem);
+        $entityManager->flush();
+
+        return new Response("Item added");
+    }
 }
diff --git a/src/main/php/tracky/model/UserCollectionItem.php b/src/main/php/tracky/model/UserCollectionItem.php
index bc6feba..d3386ff 100644
--- a/src/main/php/tracky/model/UserCollectionItem.php
+++ b/src/main/php/tracky/model/UserCollectionItem.php
@@ -55,8 +55,10 @@ public function getItem(): int
 
     public function setItem(Show|Season|Episode|Movie|MovieSet $item): self
     {
+        $this->type = UserCollectionItemType::fromEntity($item);
         $this->item = $item->getId();
         $this->resolvedItem = $item;
+
         return $this;
     }
 
diff --git a/src/main/resources/assets/script/main.ts b/src/main/resources/assets/script/main.ts
index 57ba5b4..86bd9aa 100644
--- a/src/main/resources/assets/script/main.ts
+++ b/src/main/resources/assets/script/main.ts
@@ -1,6 +1,7 @@
 import "./common";
 import "./history";
 import "./library-management";
+import "./usercollections";
 import "./view";
 
 import missingImagePoster from "../images/missing-image-poster.svg";
diff --git a/src/main/resources/assets/script/usercollections.ts b/src/main/resources/assets/script/usercollections.ts
new file mode 100644
index 0000000..223d098
--- /dev/null
+++ b/src/main/resources/assets/script/usercollections.ts
@@ -0,0 +1,76 @@
+import {createPopper} from "@popperjs/core";
+
+interface Dictionary {
+  [key: string]: string;
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+    let username = document.querySelector<HTMLMetaElement>('meta[name="username"]')?.content;
+    let addCollectionItemTooltipElement = document.querySelector<HTMLElement>("#add-collection-item-tooltip")!;
+    let collections: Dictionary | null = null;
+    let activeAddCollectionItemEntry: DOMStringMap | null = null;
+
+    function loadCollections() {
+        if (collections === null) {
+            fetch(`/users/${username}/collections.json`)
+                .then((response) => response.json())
+                .then((json) => {
+                    collections = json as Dictionary;
+
+                    let selectElement = document.querySelector<HTMLSelectElement>("#add-collection-item-tooltip-collection");
+
+                    Object.entries(collections).forEach(([id, name]) => {
+                        let optionElement = document.createElement("option");
+                        optionElement.value = id;
+                        optionElement.textContent = name;
+                        selectElement?.add(optionElement);
+                    });
+                });
+        }
+    }
+
+    document.querySelectorAll<HTMLElement>(".add-to-collection").forEach((buttonElement) => {
+        buttonElement.addEventListener("click", () => {
+            loadCollections();
+
+            createPopper(buttonElement, addCollectionItemTooltipElement, {
+                placement: "bottom"
+            });
+
+            addCollectionItemTooltipElement.style.display = "block";
+            activeAddCollectionItemEntry = buttonElement.dataset;
+        });
+    });
+
+    document.querySelector<HTMLFormElement>("#add-collection-item-tooltip-form")?.addEventListener("submit", (event) => {
+        event.preventDefault();
+
+        if (activeAddCollectionItemEntry === null) {
+            return;
+        }
+
+        let selectElement = document.querySelector<HTMLSelectElement>("#add-collection-item-tooltip-collection");
+        let collectionId = selectElement?.selectedOptions.item(0)?.value ?? null;
+
+        if (collectionId === null) {
+            return;
+        }
+
+        fetch(`/users/${username}/collections/${collectionId}/add-item`, {
+            method: "POST",
+            body: JSON.stringify({
+                type: activeAddCollectionItemEntry.type,
+                item: activeAddCollectionItemEntry.item
+            })
+        });
+
+        // Hide the modal
+        addCollectionItemTooltipElement.style.display = "none";
+        activeAddCollectionItemEntry = null;
+    });
+
+    document.querySelector("#add-collection-item-tooltip-cancel")?.addEventListener("click", () => {
+        addCollectionItemTooltipElement.style.display = "none";
+        activeAddCollectionItemEntry = null;
+    });
+});
diff --git a/src/main/resources/lang/messages+intl-icu.en.yaml b/src/main/resources/lang/messages+intl-icu.en.yaml
index e782d43..7996985 100644
--- a/src/main/resources/lang/messages+intl-icu.en.yaml
+++ b/src/main/resources/lang/messages+intl-icu.en.yaml
@@ -75,6 +75,11 @@ user:
         error:
           empty-name: "No name specified!"
           duplicate-collection: "Another collection with the name ''{name}'' already exists!"
+    add-item:
+      header: "Add item to collection"
+      ok: "OK"
+      cancel: "Cancel"
+    add-to-collection: "Add to collection"
     no-collections-available: "No collections available."
     no-items-available: "No items available."
     name: "Name"
diff --git a/templates/components/view-buttons.twig b/templates/components/view-buttons.twig
index 024898f..9891890 100644
--- a/templates/components/view-buttons.twig
+++ b/templates/components/view-buttons.twig
@@ -5,6 +5,7 @@
         {% set attributes = {"data-show-id": item.season.show.id, "data-season": item.season.number, "data-episode": item.number} %}
     {% endif %}
     <div class="btn-group">
+        <button class="btn btn-primary btn-sm add-to-collection" data-type="{{ type }}" data-item="{{ item.id }}" title="{{ "user.collections.add-to-collection"|trans }}"><i class="fa-solid fa-folder-plus"></i></button>
         <button class="btn btn-primary btn-sm add-view" data-type="{{ type }}" {% for key, value in attributes %} {{ key }}="{{ value }}"{% endfor %} title="{{ "views.add-view"|trans }}"><i class="fa-regular fa-eye"></i></button>
         <a class="btn btn-secondary btn-sm" href="{{ path("user_profile_history_page", {"username": app.user.username, "type": type, "item": item.id}) }}" title="{{ "views.show-all-views"|trans }}"><i class="fa-regular fa-calendar-days"></i></a>
     </div>
diff --git a/templates/page.twig b/templates/page.twig
index 5b1c102..4096fb9 100644
--- a/templates/page.twig
+++ b/templates/page.twig
@@ -6,6 +6,10 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
 
+        {% if app.user %}
+            <meta name="username" content="{{ app.user.username }}"/>
+        {% endif %}
+
         {% set pageTitle = block("title") %}
         <title>{% if pageTitle is not empty %}{{ pageTitle|raw }} - {% endif %}Tracky</title>
 
@@ -134,6 +138,21 @@
             </div>
         </div>
 
+        <div id="add-collection-item-tooltip" class="popper">
+            <div data-popper-arrow></div>
+
+            <div class="card">
+                <div class="card-header">{{ "user.collections.add-item.header"|trans }}</div>
+                <form class="card-body form" id="add-collection-item-tooltip-form">
+                    <select class="form-select mb-3" id="add-collection-item-tooltip-collection"></select>
+                    <div>
+                        <button class="btn btn-sm btn-primary" type="submit">{{ "user.collections.add-item.ok"|trans }}</button>
+                        <button class="btn btn-sm btn-secondary" id="add-collection-item-tooltip-cancel" type="button">{{ "user.collections.add-item.cancel"|trans }}</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+
         {% block additional_content %}{% endblock %}
 
         <datalist id="translations">