diff --git a/symfony/src/Entity/Actor.php b/symfony/src/Entity/Actor.php index ad3b793b..a6163b15 100644 --- a/symfony/src/Entity/Actor.php +++ b/symfony/src/Entity/Actor.php @@ -152,6 +152,7 @@ class Actor * @var Collection */ #[ORM\OneToMany(targetEntity: Project::class, mappedBy: 'actor')] + #[Groups([self::ACTOR_READ_ITEM, self::ACTOR_WRITE])] private Collection $projects; #[ORM\Column(length: 255, nullable: true)] diff --git a/symfony/src/Entity/Project.php b/symfony/src/Entity/Project.php index 97c27c09..fc8c9661 100644 --- a/symfony/src/Entity/Project.php +++ b/symfony/src/Entity/Project.php @@ -2,16 +2,17 @@ namespace App\Entity; -use ApiPlatform\Metadata\ApiResource; -use App\Entity\Trait\TimestampableEntity; -use App\Enum\AdministrativeScopes; use App\Enum\Status; -use App\Repository\ProjectRepository; -use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Collections\Collection; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping as ORM; +use App\Enum\AdministrativeScopes; +use ApiPlatform\Metadata\ApiResource; +use App\Repository\ProjectRepository; +use App\Entity\Trait\TimestampableEntity; +use Doctrine\Common\Collections\Collection; use Jsor\Doctrine\PostGIS\Types\PostGISType; +use Doctrine\Common\Collections\ArrayCollection; +use Symfony\Component\Serializer\Attribute\Groups; #[ORM\Entity(repositoryClass: ProjectRepository::class)] #[ApiResource] @@ -25,6 +26,7 @@ class Project private ?int $id = null; #[ORM\Column(length: 255)] + #[Groups([Actor::ACTOR_READ_ITEM])] private ?string $title = null; #[ORM\Column(length: 255)] diff --git a/symfony/src/Entity/User.php b/symfony/src/Entity/User.php index a54a60d3..eb28cd16 100644 --- a/symfony/src/Entity/User.php +++ b/symfony/src/Entity/User.php @@ -67,7 +67,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface #[ORM\Id] #[ORM\GeneratedValue] #[ORM\Column] - #[Groups([self::GROUP_READ, self::GROUP_GETME])] + #[Groups([self::GROUP_READ, self::GROUP_GETME, Actor::ACTOR_READ_ITEM])] private ?int $id = null; #[ORM\Column(length: 255)] diff --git a/vue/src/assets/translations/fr/actors.json b/vue/src/assets/translations/fr/actors.json index 51ce5ccc..27ed498c 100644 --- a/vue/src/assets/translations/fr/actors.json +++ b/vue/src/assets/translations/fr/actors.json @@ -22,5 +22,15 @@ "admin": { "sort": "Trier par" } + }, + "actorPage": { + "description": "Activité", + "projects": "Projets", + "data": "Données", + "resources": "Ressources", + "services": "Services", + "images": "En images", + "adminScope": "Zone d'intervention", + "contact": "Point de contact" } } \ No newline at end of file diff --git a/vue/src/assets/translations/fr/common.json b/vue/src/assets/translations/fr/common.json index 86227817..09e15721 100644 --- a/vue/src/assets/translations/fr/common.json +++ b/vue/src/assets/translations/fr/common.json @@ -59,6 +59,7 @@ }, "content": { "website": "Visiter le site internet", - "mail": "Contacter par mail" + "mail": "Contacter par mail", + "edit": "Modifier" } } \ No newline at end of file diff --git a/vue/src/components/generic-components/banners/SectionBanner.vue b/vue/src/components/generic-components/banners/SectionBanner.vue new file mode 100644 index 00000000..e385af33 --- /dev/null +++ b/vue/src/components/generic-components/banners/SectionBanner.vue @@ -0,0 +1,41 @@ + + + \ No newline at end of file diff --git a/vue/src/components/generic-components/content/ContentBanner.vue b/vue/src/components/generic-components/content/ContentBanner.vue index 24e9ecb1..f472eeb8 100644 --- a/vue/src/components/generic-components/content/ContentBanner.vue +++ b/vue/src/components/generic-components/content/ContentBanner.vue @@ -1,10 +1,18 @@