From 0429f45d82437bfc67a74d4d3ffecd3d14512481 Mon Sep 17 00:00:00 2001
From: Camille Simiand <camille.simiand@tetras-libre.fr>
Date: Mon, 7 Feb 2022 16:36:01 +0100
Subject: [PATCH] Add a capsule group
---
...25084520.php => Version20220208141756.php} | 2 +-
migrations/Version20220208145209.php | 36 ++++++++
src/Builder/CapsuleBuilder.php | 0
src/Builder/UserBuilder.php | 0
src/Controller/.gitignore | 0
src/Controller/CapsuleController.php | 0
src/Controller/CapsuleEditorController.php | 0
src/Controller/CapsuleGroupController.php | 86 +++++++++++++++++++
src/Controller/FallbackController.php | 0
src/Controller/ProjectController.php | 0
src/Controller/RegistrationController.php | 0
src/Controller/ResetPasswordController.php | 0
src/Controller/SecurityController.php | 0
src/Controller/UserController.php | 0
src/Curl/CurlHandle.php | 0
src/DataFixtures/CapsuleFixtures.php | 0
src/DataFixtures/UserFixtures.php | 0
src/Entity/.gitignore | 0
src/Entity/Capsule.php | 37 +++++++-
src/Entity/Group.php | 81 +++++++++++++++++
src/Entity/PendingEditorInvitation.php | 0
src/Entity/ResetPasswordRequest.php | 0
src/Entity/User.php | 0
src/Exception/CapsuleNotFoundException.php | 0
src/Exception/CurlInitFailedException.php | 0
.../ZipArchiveNotOpeningException.php | 0
src/Form/CapsuleEditorsFormType.php | 0
src/Form/ChangePasswordFormType.php | 0
src/Form/CreateCapsuleFormType.php | 0
src/Form/DeleteCapsuleFormType.php | 0
src/Form/DuplicateCapsuleFormType.php | 0
src/Form/EditCapsuleGroupsFormType.php | 40 +++++++++
src/Form/EditPasswordFormType.php | 0
src/Form/EditUserProfileFormType.php | 0
src/Form/EditVideoUrlFormType.php | 0
src/Form/RegistrationFormType.php | 0
src/Form/RemoveEditorFormType.php | 0
src/Form/ResetPasswordRequestFormType.php | 0
src/Helper/ContractHelper.php | 0
src/Helper/LegacyHelper.php | 0
src/Helper/StringHelper.php | 0
src/Kernel.php | 0
src/Repository/.gitignore | 0
src/Repository/CapsuleRepository.php | 0
src/Repository/GroupRepository.php | 50 +++++++++++
.../PendingEditorInvitationRepository.php | 0
.../ResetPasswordRequestRepository.php | 0
src/Repository/UserRepository.php | 0
src/Retriever/ProjectRetriever.php | 0
src/Security/AppCustomAuthenticator.php | 0
src/Security/EmailVerifier.php | 0
src/Security/UserChecker.php | 0
templates/capsule/groups/edit.html.twig | 58 +++++++++++++
templates/capsule/index.html.twig | 14 ++-
translations/messages.en.yaml | 11 +++
translations/messages.fr.yaml | 13 ++-
translations/validators.en.yaml | 7 +-
translations/validators.fr.yaml | 7 +-
58 files changed, 427 insertions(+), 15 deletions(-)
rename migrations/{Version20220125084520.php => Version20220208141756.php} (93%)
create mode 100644 migrations/Version20220208145209.php
mode change 100644 => 100755 src/Builder/CapsuleBuilder.php
mode change 100644 => 100755 src/Builder/UserBuilder.php
mode change 100644 => 100755 src/Controller/.gitignore
mode change 100644 => 100755 src/Controller/CapsuleController.php
mode change 100644 => 100755 src/Controller/CapsuleEditorController.php
create mode 100755 src/Controller/CapsuleGroupController.php
mode change 100644 => 100755 src/Controller/FallbackController.php
mode change 100644 => 100755 src/Controller/ProjectController.php
mode change 100644 => 100755 src/Controller/RegistrationController.php
mode change 100644 => 100755 src/Controller/ResetPasswordController.php
mode change 100644 => 100755 src/Controller/SecurityController.php
mode change 100644 => 100755 src/Controller/UserController.php
mode change 100644 => 100755 src/Curl/CurlHandle.php
mode change 100644 => 100755 src/DataFixtures/CapsuleFixtures.php
mode change 100644 => 100755 src/DataFixtures/UserFixtures.php
mode change 100644 => 100755 src/Entity/.gitignore
mode change 100644 => 100755 src/Entity/Capsule.php
create mode 100755 src/Entity/Group.php
mode change 100644 => 100755 src/Entity/PendingEditorInvitation.php
mode change 100644 => 100755 src/Entity/ResetPasswordRequest.php
mode change 100644 => 100755 src/Entity/User.php
mode change 100644 => 100755 src/Exception/CapsuleNotFoundException.php
mode change 100644 => 100755 src/Exception/CurlInitFailedException.php
mode change 100644 => 100755 src/Exception/ZipArchiveNotOpeningException.php
mode change 100644 => 100755 src/Form/CapsuleEditorsFormType.php
mode change 100644 => 100755 src/Form/ChangePasswordFormType.php
mode change 100644 => 100755 src/Form/CreateCapsuleFormType.php
mode change 100644 => 100755 src/Form/DeleteCapsuleFormType.php
mode change 100644 => 100755 src/Form/DuplicateCapsuleFormType.php
create mode 100755 src/Form/EditCapsuleGroupsFormType.php
mode change 100644 => 100755 src/Form/EditPasswordFormType.php
mode change 100644 => 100755 src/Form/EditUserProfileFormType.php
mode change 100644 => 100755 src/Form/EditVideoUrlFormType.php
mode change 100644 => 100755 src/Form/RegistrationFormType.php
mode change 100644 => 100755 src/Form/RemoveEditorFormType.php
mode change 100644 => 100755 src/Form/ResetPasswordRequestFormType.php
mode change 100644 => 100755 src/Helper/ContractHelper.php
mode change 100644 => 100755 src/Helper/LegacyHelper.php
mode change 100644 => 100755 src/Helper/StringHelper.php
mode change 100644 => 100755 src/Kernel.php
mode change 100644 => 100755 src/Repository/.gitignore
mode change 100644 => 100755 src/Repository/CapsuleRepository.php
create mode 100755 src/Repository/GroupRepository.php
mode change 100644 => 100755 src/Repository/PendingEditorInvitationRepository.php
mode change 100644 => 100755 src/Repository/ResetPasswordRequestRepository.php
mode change 100644 => 100755 src/Repository/UserRepository.php
mode change 100644 => 100755 src/Retriever/ProjectRetriever.php
mode change 100644 => 100755 src/Security/AppCustomAuthenticator.php
mode change 100644 => 100755 src/Security/EmailVerifier.php
mode change 100644 => 100755 src/Security/UserChecker.php
create mode 100644 templates/capsule/groups/edit.html.twig
diff --git a/migrations/Version20220125084520.php b/migrations/Version20220208141756.php
similarity index 93%
rename from migrations/Version20220125084520.php
rename to migrations/Version20220208141756.php
index 6adb95e..253a647 100644
--- a/migrations/Version20220125084520.php
+++ b/migrations/Version20220208141756.php
@@ -10,7 +10,7 @@ use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
-final class Version20220125084520 extends AbstractMigration
+final class Version20220208141756 extends AbstractMigration
{
public function getDescription(): string
{
diff --git a/migrations/Version20220208145209.php b/migrations/Version20220208145209.php
new file mode 100644
index 0000000..e99fc5d
--- /dev/null
+++ b/migrations/Version20220208145209.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220208145209 extends AbstractMigration
+{
+ public function getDescription(): string
+ {
+ return '';
+ }
+
+ public function up(Schema $schema): void
+ {
+ // this up() migration is auto-generated, please modify it to your needs
+ $this->addSql('CREATE TABLE `group` (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB');
+ $this->addSql('CREATE TABLE group_capsule (group_id INT NOT NULL, capsule_id INT NOT NULL, INDEX IDX_4468F58FFE54D947 (group_id), INDEX IDX_4468F58F714704E9 (capsule_id), PRIMARY KEY(group_id, capsule_id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB');
+ $this->addSql('ALTER TABLE group_capsule ADD CONSTRAINT FK_4468F58FFE54D947 FOREIGN KEY (group_id) REFERENCES `group` (id) ON DELETE CASCADE');
+ $this->addSql('ALTER TABLE group_capsule ADD CONSTRAINT FK_4468F58F714704E9 FOREIGN KEY (capsule_id) REFERENCES capsule (id) ON DELETE CASCADE');
+ }
+
+ public function down(Schema $schema): void
+ {
+ // this down() migration is auto-generated, please modify it to your needs
+ $this->addSql('ALTER TABLE group_capsule DROP FOREIGN KEY FK_4468F58FFE54D947');
+ $this->addSql('DROP TABLE `group`');
+ $this->addSql('DROP TABLE group_capsule');
+ }
+}
diff --git a/src/Builder/CapsuleBuilder.php b/src/Builder/CapsuleBuilder.php
old mode 100644
new mode 100755
diff --git a/src/Builder/UserBuilder.php b/src/Builder/UserBuilder.php
old mode 100644
new mode 100755
diff --git a/src/Controller/.gitignore b/src/Controller/.gitignore
old mode 100644
new mode 100755
diff --git a/src/Controller/CapsuleController.php b/src/Controller/CapsuleController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/CapsuleEditorController.php b/src/Controller/CapsuleEditorController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/CapsuleGroupController.php b/src/Controller/CapsuleGroupController.php
new file mode 100755
index 0000000..4bd67e9
--- /dev/null
+++ b/src/Controller/CapsuleGroupController.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Controller;
+
+use App\Entity\Capsule;
+use App\Entity\Group;
+use App\Entity\User;
+use App\Form\EditCapsuleGroupsFormType;
+use App\Repository\CapsuleRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Routing\Annotation\Route;
+
+class CapsuleGroupController extends AbstractController
+{
+ private TranslatorInterface $translator;
+ private CapsuleRepository $capsule_repository;
+ private EntityManagerInterface $entity_manager;
+
+ public function __construct(
+ TranslatorInterface $translator,
+ CapsuleRepository $capsule_repository,
+ EntityManagerInterface $entity_manager
+ ) {
+ $this->translator = $translator;
+ $this->capsule_repository = $capsule_repository;
+ $this->entity_manager = $entity_manager;
+ }
+
+ /**
+ * @Route("/capsule/{capsule_id}/groups/edit", name="edit_capsule_groups")
+ */
+ public function edit(int $capsule_id, Request $request): Response
+ {
+ $current_user = $this->getUser();
+
+ if (! $current_user instanceof User) {
+ return $this->redirectToRoute('app_logout');
+ }
+
+ $form = $this->createForm(EditCapsuleGroupsFormType::class);
+ $form->handleRequest($request);
+
+ $capsule = $this->capsule_repository->findOneBy(['id' => $capsule_id]);
+
+ if (! $capsule instanceof Capsule) {
+ throw new \Exception("Capsule does not exist");
+ }
+
+ $groups = $capsule->getGroups();
+
+ if ($form->isSubmitted() && $form->isValid()) {
+ $group_name = $form->get('name')->getData();
+ $group = new Group();
+ $group->setName($group_name);
+ $this->entity_manager->persist($group);
+ $capsule->addGroup($group);
+ $this->entity_manager->persist($capsule);
+ $this->entity_manager->flush();
+
+ $this->addFlash(
+ 'success',
+ $this->translator->trans(
+ 'groups.add.success',
+ [
+ 'group_name' => $group->getName(),
+ 'capsule_name' => $capsule->getName()
+ ]
+ )
+ );
+
+ return $this->redirectToRoute('edit_capsule_groups', [
+ 'capsule_id' => $capsule_id
+ ]);
+ }
+
+ return $this->render('capsule/groups/edit.html.twig', [
+ 'editCapsuleGroupsForm' => $form->createView(),
+ 'capsule_name' => $capsule->getName(),
+ 'groups' => $groups
+ ]);
+ }
+}
diff --git a/src/Controller/FallbackController.php b/src/Controller/FallbackController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/RegistrationController.php b/src/Controller/RegistrationController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/SecurityController.php b/src/Controller/SecurityController.php
old mode 100644
new mode 100755
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
old mode 100644
new mode 100755
diff --git a/src/Curl/CurlHandle.php b/src/Curl/CurlHandle.php
old mode 100644
new mode 100755
diff --git a/src/DataFixtures/CapsuleFixtures.php b/src/DataFixtures/CapsuleFixtures.php
old mode 100644
new mode 100755
diff --git a/src/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php
old mode 100644
new mode 100755
diff --git a/src/Entity/.gitignore b/src/Entity/.gitignore
old mode 100644
new mode 100755
diff --git a/src/Entity/Capsule.php b/src/Entity/Capsule.php
old mode 100644
new mode 100755
index 08ff123..f3e6f71
--- a/src/Entity/Capsule.php
+++ b/src/Entity/Capsule.php
@@ -90,9 +90,16 @@ class Capsule
*/
private Collection $editors;
+ /**
+ * @var Collection<Group>
+ * @ORM\ManyToMany(targetEntity=Group::class, mappedBy="capsules")
+ */
+ private Collection $groups;
+
public function __construct()
{
$this->editors = new ArrayCollection();
+ $this->groups = new ArrayCollection();
}
public function getId(): int
@@ -205,14 +212,13 @@ class Capsule
}
/**
- * @return Collection<User> $editors
+ * @return Collection<User>
*/
public function getEditors(): Collection
{
return $this->editors;
}
-
public function getVideoPreviewImageLink(): ?string
{
$file_system = new Filesystem();
@@ -231,4 +237,31 @@ class Capsule
return 'https://vumbnail.com/' . $video_id . '.jpg';
}
+
+ /**
+ * @return Collection|Group[]
+ */
+ public function getGroups(): Collection
+ {
+ return $this->groups;
+ }
+
+ public function addGroup(Group $group): self
+ {
+ if (!$this->groups->contains($group)) {
+ $this->groups[] = $group;
+ $group->addCapsule($this);
+ }
+
+ return $this;
+ }
+
+ public function removeGroup(Group $group): self
+ {
+ if ($this->groups->removeElement($group)) {
+ $group->removeCapsule($this);
+ }
+
+ return $this;
+ }
}
diff --git a/src/Entity/Group.php b/src/Entity/Group.php
new file mode 100755
index 0000000..dae2d53
--- /dev/null
+++ b/src/Entity/Group.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Entity;
+
+use App\Repository\GroupRepository;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+
+/**
+ * @ORM\Entity(repositoryClass=GroupRepository::class)
+ * @ORM\Table(name="`group`")
+ * @UniqueEntity(fields={"name"}, message="group.name.unique")
+ */
+class Group
+{
+ /**
+ * @ORM\Id
+ * @ORM\GeneratedValue
+ * @ORM\Column(type="integer")
+ */
+ private int $id;
+
+ /**
+ * @ORM\Column(type="string", length=255)
+ */
+ private string $name;
+
+ /**
+ * @var Collection<Capsule>
+ * @ORM\ManyToMany(targetEntity=Capsule::class, inversedBy="groups")
+ */
+ private Collection $capsules;
+
+ public function __construct()
+ {
+ $this->capsules = new ArrayCollection();
+ }
+
+ public function getId(): int
+ {
+ return $this->id;
+ }
+
+ public function getName(): string
+ {
+ return $this->name;
+ }
+
+ public function setName(string $name): self
+ {
+ $this->name = $name;
+
+ return $this;
+ }
+
+ /**
+ * @return Collection|Capsule[]
+ */
+ public function getCapsules(): Collection
+ {
+ return $this->capsules;
+ }
+
+ public function addCapsule(Capsule $capsule): self
+ {
+ if (!$this->capsules->contains($capsule)) {
+ $this->capsules[] = $capsule;
+ }
+
+ return $this;
+ }
+
+ public function removeCapsule(Capsule $capsule): self
+ {
+ $this->capsules->removeElement($capsule);
+
+ return $this;
+ }
+}
diff --git a/src/Entity/PendingEditorInvitation.php b/src/Entity/PendingEditorInvitation.php
old mode 100644
new mode 100755
diff --git a/src/Entity/ResetPasswordRequest.php b/src/Entity/ResetPasswordRequest.php
old mode 100644
new mode 100755
diff --git a/src/Entity/User.php b/src/Entity/User.php
old mode 100644
new mode 100755
diff --git a/src/Exception/CapsuleNotFoundException.php b/src/Exception/CapsuleNotFoundException.php
old mode 100644
new mode 100755
diff --git a/src/Exception/CurlInitFailedException.php b/src/Exception/CurlInitFailedException.php
old mode 100644
new mode 100755
diff --git a/src/Exception/ZipArchiveNotOpeningException.php b/src/Exception/ZipArchiveNotOpeningException.php
old mode 100644
new mode 100755
diff --git a/src/Form/CapsuleEditorsFormType.php b/src/Form/CapsuleEditorsFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/ChangePasswordFormType.php b/src/Form/ChangePasswordFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/CreateCapsuleFormType.php b/src/Form/CreateCapsuleFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/DeleteCapsuleFormType.php b/src/Form/DeleteCapsuleFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/DuplicateCapsuleFormType.php b/src/Form/DuplicateCapsuleFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/EditCapsuleGroupsFormType.php b/src/Form/EditCapsuleGroupsFormType.php
new file mode 100755
index 0000000..848ce64
--- /dev/null
+++ b/src/Form/EditCapsuleGroupsFormType.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Form;
+
+use App\Entity\Capsule;
+use App\Entity\Group;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\NotBlank;
+
+class EditCapsuleGroupsFormType extends AbstractType
+{
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $builder
+ ->add(
+ 'name',
+ TextType::class,
+ [
+ 'constraints' => [new NotBlank(['message' => 'group.name.not_blank'])],
+ 'label' => 'groups.add.name'
+ ]
+ )
+ ->add(
+ 'validate',
+ SubmitType::class,
+ ['label' => 'groups.add.validate']
+ );
+ }
+
+ public function configureOptions(OptionsResolver $resolver): void
+ {
+ $resolver->setDefaults([
+ 'data_class' => Group::class,
+ ]);
+ }
+}
diff --git a/src/Form/EditPasswordFormType.php b/src/Form/EditPasswordFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/EditUserProfileFormType.php b/src/Form/EditUserProfileFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/EditVideoUrlFormType.php b/src/Form/EditVideoUrlFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/RegistrationFormType.php b/src/Form/RegistrationFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/RemoveEditorFormType.php b/src/Form/RemoveEditorFormType.php
old mode 100644
new mode 100755
diff --git a/src/Form/ResetPasswordRequestFormType.php b/src/Form/ResetPasswordRequestFormType.php
old mode 100644
new mode 100755
diff --git a/src/Helper/ContractHelper.php b/src/Helper/ContractHelper.php
old mode 100644
new mode 100755
diff --git a/src/Helper/LegacyHelper.php b/src/Helper/LegacyHelper.php
old mode 100644
new mode 100755
diff --git a/src/Helper/StringHelper.php b/src/Helper/StringHelper.php
old mode 100644
new mode 100755
diff --git a/src/Kernel.php b/src/Kernel.php
old mode 100644
new mode 100755
diff --git a/src/Repository/.gitignore b/src/Repository/.gitignore
old mode 100644
new mode 100755
diff --git a/src/Repository/CapsuleRepository.php b/src/Repository/CapsuleRepository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/GroupRepository.php b/src/Repository/GroupRepository.php
new file mode 100755
index 0000000..8f7d98e
--- /dev/null
+++ b/src/Repository/GroupRepository.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Repository;
+
+use App\Entity\Group;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method Group|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Group|null findOneBy(array $criteria, array $orderBy = null)
+ * @method Group[] findAll()
+ * @method Group[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class GroupRepository extends ServiceEntityRepository
+{
+ public function __construct(ManagerRegistry $registry)
+ {
+ parent::__construct($registry, Group::class);
+ }
+
+ // /**
+ // * @return Group[] Returns an array of Group objects
+ // */
+ /*
+ public function findByExampleField($value)
+ {
+ return $this->createQueryBuilder('g')
+ ->andWhere('g.exampleField = :val')
+ ->setParameter('val', $value)
+ ->orderBy('g.id', 'ASC')
+ ->setMaxResults(10)
+ ->getQuery()
+ ->getResult()
+ ;
+ }
+ */
+
+ /*
+ public function findOneBySomeField($value): ?Group
+ {
+ return $this->createQueryBuilder('g')
+ ->andWhere('g.exampleField = :val')
+ ->setParameter('val', $value)
+ ->getQuery()
+ ->getOneOrNullResult()
+ ;
+ }
+ */
+}
diff --git a/src/Repository/PendingEditorInvitationRepository.php b/src/Repository/PendingEditorInvitationRepository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/ResetPasswordRequestRepository.php b/src/Repository/ResetPasswordRequestRepository.php
old mode 100644
new mode 100755
diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php
old mode 100644
new mode 100755
diff --git a/src/Retriever/ProjectRetriever.php b/src/Retriever/ProjectRetriever.php
old mode 100644
new mode 100755
diff --git a/src/Security/AppCustomAuthenticator.php b/src/Security/AppCustomAuthenticator.php
old mode 100644
new mode 100755
diff --git a/src/Security/EmailVerifier.php b/src/Security/EmailVerifier.php
old mode 100644
new mode 100755
diff --git a/src/Security/UserChecker.php b/src/Security/UserChecker.php
old mode 100644
new mode 100755
diff --git a/templates/capsule/groups/edit.html.twig b/templates/capsule/groups/edit.html.twig
new file mode 100644
index 0000000..eec293b
--- /dev/null
+++ b/templates/capsule/groups/edit.html.twig
@@ -0,0 +1,58 @@
+{% extends 'layout.html.twig' %}
+
+{% block title %}
+ {{ 'groups.edit.title'|trans }}
+ -
+ {{ parent() }}
+{% endblock %}
+
+{% block body %}
+
+ <div>
+ <div class="row w-100 gx-0">
+ <div class="row-title-box">
+ <h3 class="row-title">
+ {{ 'groups.edit.title_with_capsule_name'|trans({'%capsule_name%': capsule_name}) }}
+ </h3>
+ </div>
+ </div>
+
+ {% for flashWarning in app.flashes('warning') %}
+ <div class="text-center alert alert-warning col-5 mx-auto my-5 mt-2" role="alert">
+ {{ flashWarning }}
+ </div>
+ {% endfor %}
+
+ {% for flashSuccess in app.flashes('success') %}
+ <div class="text-center alert alert-success col-5 mx-auto my-5 mt-2" role="alert">
+ {{ flashSuccess }}
+ </div>
+ {% endfor %}
+
+ <div class="d-flex flex-md-row flex-column justify-content-center">
+ <div class="d-flex flex-column justify-content-center ms-md-5 ms-0 order-md-2 mb-4 col-sm-8 col-md-6 col-lg-5 col-xl-4">
+ {{ form_start(editCapsuleGroupsForm, {'attr': {novalidate: 'novalidate'}}) }}
+ {{ form_row(editCapsuleGroupsForm.name, {'row_attr': {'class' : 'm-auto mb-4'}}) }}
+ {{ form_row(editCapsuleGroupsForm.validate) }}
+ {{ form_end(editCapsuleGroupsForm) }}
+ </div>
+
+ <div class="d-flex flex-row pe-md-5 pb-3 fw-normal me-0 me-md-5">
+ <div class="pe-3 pe-md-4 text-nowrap">
+ <h5>
+ {{ 'groups.list.title'|trans }}
+ </h5>
+ <ul class="ps-0">
+ {% for group in groups %}
+ <li class="text-capitalize text-secondary list-unstyled p-1">
+ {{ group.getName() }}
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/capsule/index.html.twig b/templates/capsule/index.html.twig
index 87f13c8..48b0b61 100644
--- a/templates/capsule/index.html.twig
+++ b/templates/capsule/index.html.twig
@@ -38,12 +38,10 @@
</div>
{% endfor %}
-</div>
-
<div class="d-flex flex-column align-items-center mt-4 mb-4">
{% for capsule in capsules %}
- <div class="capsule-item pb-4 col-12 col-lg-10 col-xl-8">
- <div class="d-flex flex-column flex-md-row justify-content-center align-items-center mt-sm-4">
+ <div class="capsule-item pb-4 col-12 col-sm-11 col-md-10 col-xxl-8">
+ <div class="d-flex flex-column justify-content-center align-items-center mt-sm-4">
<div class="list-item">
<a href="/capsule/preview/{{ capsule.getLinkPath() }}" class="capsule-title">
{{ capsule.getName() }}
@@ -54,7 +52,7 @@
</div>
</div>
- <div class="d-flex flex-column flex-md-row justify-content-center align-items-center">
+ <div class="d-flex flex-column flex-xl-row justify-content-center align-items-center">
<div class="m-4 ratio ratio-16x9">
{% if capsule.getVideoPreviewImageLink() is null %}
<img src="{{ asset('build/images/project_not_found.jpg') }}" alt="video preview">
@@ -82,11 +80,9 @@
<div class="list-item text-nowrap">
- <a href="#
- {#{{ path('capsules_edit_group', { 'capsule_id' : capsule.getId()}) }}#}
- " class="links text-decoration-none">
+ <a href="{{ path('edit_capsule_groups', { 'capsule_id' : capsule.getId()}) }}" class="links text-decoration-none">
<i class="fas fa-layer-group m-2"></i>
- {{ 'capsule.edit.groups.title'|trans }}
+ {{ 'groups.edit.title'|trans({'%capsule_name%': capsule.getName()}) }}
</a>
</div>
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index 10cdd6d..19966f0 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -142,3 +142,14 @@ editors:
text: You have been add by %user_name% as editor of the capsule "%capsule_name%".
You can now access and edit it. You will find the capsule in your capsule list.
link: Go to capsule edition page
+
+groups:
+ list:
+ title: Capsule groups
+ edit:
+ title: Edit capsule groups
+ title_with_capsule_name: Groups for capsule %capsule_name%
+ add:
+ name: Choose a new group name
+ validate: Create a new group
+ success: Group group_name has been added successfully to capsule capsule_name
\ No newline at end of file
diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yaml
index 010c565..a840034 100644
--- a/translations/messages.fr.yaml
+++ b/translations/messages.fr.yaml
@@ -155,4 +155,15 @@ editors:
link: Supprimer l'éditeur
success: L'utilisateur editor_email ne peut plus éditer la capsule capsule_name
error: You can't remove yourself as editor of your own capsule.
- If you want to remove the capsule from your list, go to the capsule list page and click on "delete capsule"
\ No newline at end of file
+ If you want to remove the capsule from your list, go to the capsule list page and click on "delete capsule"
+
+groups:
+ list:
+ title: Groupes de la capsule
+ edit:
+ title: Modifier les groupes
+ title_with_capsule_name: Groupes de la capsule %capsule_name%
+ add:
+ name: Choisir un nom de groupe
+ validate: Créer un nouveau groupe
+ success: Le groupe group_name a bien été ajouté à la capsule capsule_name
\ No newline at end of file
diff --git a/translations/validators.en.yaml b/translations/validators.en.yaml
index 2a4c7e7..3c257dc 100644
--- a/translations/validators.en.yaml
+++ b/translations/validators.en.yaml
@@ -21,4 +21,9 @@ capsule:
not_blank: Please enter a capsule name
unique: There is already a capsule with this name
video_url:
- not_blank: Please enter a video URL
\ No newline at end of file
+ not_blank: Please enter a video URL
+
+group:
+ name:
+ not_blank: Please enter a group name
+ unique: There is already a group with this name
\ No newline at end of file
diff --git a/translations/validators.fr.yaml b/translations/validators.fr.yaml
index e6aa605..3c494ab 100644
--- a/translations/validators.fr.yaml
+++ b/translations/validators.fr.yaml
@@ -21,4 +21,9 @@ capsule:
not_blank: Veuillez saisir le nom de la capsule
unique: Il existe déjà une capsule avec ce nom
video_url:
- not_blank: Veuillez saisir l'URL de votre vidéo
\ No newline at end of file
+ not_blank: Veuillez saisir l'URL de votre vidéo
+
+group:
+ name:
+ not_blank: Veuillez saisir le nom du groupe
+ unique: Il existe déjà un groupe avec ce nom
\ No newline at end of file
--
GitLab