iut/herbarium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update interface (#17)

Browse Source 
Co-authored-by: bastien ollier <bastien.ollier@etu.uca.fr>
Reviewed-on: https://codefirst.iut.uca.fr/git/clement.freville2/herbarium/pulls/17
Reviewed-by: Clément FRÉVILLE <clement.freville2@etu.uca.fr>
Co-authored-by: Bastien OLLIER <bastien.ollier@noreply.codefirst.iut.uca.fr>
Co-committed-by: Bastien OLLIER <bastien.ollier@noreply.codefirst.iut.uca.fr>
This commit is contained in:
Bastien OLLIER
2024-06-13 09:30:25 +02:00
committed by Clément FRÉVILLE
parent bc6951d0a5
commit 0beb0cd95f
14 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Controller/PostController.php
View File

@@ -34,16 +34,13 @@ class PostController extends AbstractController
]); ]);
} }
#[Route('/post', name: 'app_post_index', methods: ['GET'])] #[Route('/posts', name: 'app_post_index', methods: ['GET'])]
public function table(PostRepository $repository): Response public function table(PostRepository $repository): Response
{ {
$posts = $repository->findAll(); return $this->redirectToRoute('app_posts', [], Response::HTTP_SEE_OTHER);
return $this->render('post/table.html.twig', [
'posts' => $posts,
]);
} }
#[Route('/post/new', name: 'app_post_new', methods: ['GET', 'POST'])] #[Route('/posts/new', name: 'app_post_new', methods: ['GET', 'POST'])]
#[IsGranted('ROLE_USER')] #[IsGranted('ROLE_USER')]
public function new(Request $request, EntityManagerInterface $entityManager): Response public function new(Request $request, EntityManagerInterface $entityManager): Response
{ {
@@ -64,7 +61,7 @@ class PostController extends AbstractController
]); ]);
} }
#[Route('/post/{id}', name: 'app_post_show', methods: ['GET'])] #[Route('/posts/{id}', name: 'app_post_show', methods: ['GET'])]
public function show(Post $post): Response public function show(Post $post): Response
{ {
$form = $this->createForm(CommentType::class, new Comment(), [ $form = $this->createForm(CommentType::class, new Comment(), [
@@ -76,7 +73,7 @@ class PostController extends AbstractController
]); ]);
} }
#[Route('/post/{id}/edit', name: 'app_post_edit', methods: ['GET', 'POST'])] #[Route('/posts/{id}/edit', name: 'app_post_edit', methods: ['GET', 'POST'])]
#[IsGranted('ROLE_USER')] #[IsGranted('ROLE_USER')]
public function edit(Request $request, Post $post, EntityManagerInterface $entityManager): Response public function edit(Request $request, Post $post, EntityManagerInterface $entityManager): Response
{ {
@@ -95,7 +92,7 @@ class PostController extends AbstractController
]); ]);
} }
#[Route('/post/{id}', name: 'app_post_delete', methods: ['POST'])] #[Route('/posts/{id}', name: 'app_post_delete', methods: ['POST'])]
#[IsGranted('ROLE_USER')] #[IsGranted('ROLE_USER')]
public function delete(Request $request, Post $post, EntityManagerInterface $entityManager): Response public function delete(Request $request, Post $post, EntityManagerInterface $entityManager): Response
{ {
@@ -107,7 +104,7 @@ class PostController extends AbstractController
return $this->redirectToRoute('app_posts', [], Response::HTTP_SEE_OTHER); return $this->redirectToRoute('app_posts', [], Response::HTTP_SEE_OTHER);
} }
#[Route('/post/{id}/comment', name: 'app_post_comment', methods: ['POST'])] #[Route('/posts/{id}/comment', name: 'app_post_comment', methods: ['POST'])]
public function publishComment(Request $request, Post $post, EntityManagerInterface $entityManager, #[CurrentUser] User $user): Response public function publishComment(Request $request, Post $post, EntityManagerInterface $entityManager, #[CurrentUser] User $user): Response
{ {
$comment = new Comment(); $comment = new Comment();

2
src/Controller/SpeciesController.php
View File

@@ -18,7 +18,7 @@ class SpeciesController extends AbstractController
#[Route('/', name: 'app_species_index', methods: ['GET'])] #[Route('/', name: 'app_species_index', methods: ['GET'])]
public function table(SpeciesRepository $speciesRepository): Response public function table(SpeciesRepository $speciesRepository): Response
{ {
return $this->render('species/table.html.twig', [ return $this->render('species/index.html.twig', [
'species' => $speciesRepository->findAll(), 'species' => $speciesRepository->findAll(),
]); ]);
} }

23
templates/base.html.twig
View File

@@ -15,7 +15,28 @@
<body data-turbo="false"> <body data-turbo="false">
<nav class="navbar navbar-expand-lg bg-body-tertiary"> <nav class="navbar navbar-expand-lg bg-body-tertiary">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="{{ path('app_species_index') }}">Herbarium</a> <a class="navbar-brand" href="{{ path('app_posts') }}">Herbarium</a>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="{{ path('app_posts') }}">{{ 'posts'|trans }}</a>
</li>
{% if app.user %}
<li class="nav-item">
<a class="nav-link" href="{{ path('app_post_new') }}">{{ 'create_new_post'|trans }}</a>
</li>
{% endif %}
<li class="nav-item">
<a class="nav-link" href="{{ path('app_species_index') }}">{{ 'species'|trans }}</a>
</li>
{% if app.user %}
<li class="nav-item">
<a class="nav-link" href="{{ path('app_species_new') }}">{{ 'create_new_species'|trans }}</a>
</li>
{% endif %}
</ul>
</div>
<div class="navbar-nav ms-auto"> <div class="navbar-nav ms-auto">
<a class="nav-link" href="{{ path('app_setting_locale', { 'locale': 'en' }) }}">English</a> <a class="nav-link" href="{{ path('app_setting_locale', { 'locale': 'en' }) }}">English</a>
<a class="nav-link" href="{{ path('app_setting_locale', { 'locale': 'fr' }) }}">Français</a> <a class="nav-link" href="{{ path('app_setting_locale', { 'locale': 'fr' }) }}">Français</a>

2
templates/post/edit.html.twig
View File

@@ -6,7 +6,7 @@
<h1>{{ 'edit_post'|trans }}</h1> <h1>{{ 'edit_post'|trans }}</h1>
{{ include('post/_form.html.twig', {'button_label': 'update'|trans}) }} {{ include('post/_form.html.twig', {'button_label': 'update'|trans}) }}
<a href="{{ path('app_post_index') }}">{{ 'back_to_list'|trans }}</a> <a class="btn btn-warning mb-4 mt-4" href="{{ path('app_post_index') }}">{{ 'back_to_list'|trans }}</a>
{{ include('post/_delete_form.html.twig') }} {{ include('post/_delete_form.html.twig') }}
{% endblock %} {% endblock %}

2
templates/post/new.html.twig
View File

@@ -7,5 +7,5 @@
{{ include('post/_form.html.twig') }} {{ include('post/_form.html.twig') }}
<a href="{{ path('app_post_index') }}">{{ 'back_to_list'|trans }}</a> <a class="btn btn-warning mb-4 mt-4" href="{{ path('app_post_index') }}">{{ 'back_to_list'|trans }}</a>
{% endblock %} {% endblock %}

4
templates/post/show.html.twig
View File

@@ -44,9 +44,9 @@
</tbody> </tbody>
</table> </table>
<a href="{{ path('app_post_index') }}">{{ 'back_to_list'|trans }}</a> <a class="btn btn-warning mb-4 mt-4" href="{{ path('app_post_index') }}">{{ 'back_to_list'|trans }}</a>
<a href="{{ path('app_post_edit', {'id': post.id}) }}">{{ 'edit'|trans }}</a> <a class="btn btn-success mb-4 mt-4" href="{{ path('app_post_edit', {'id': post.id}) }}">{{ 'edit'|trans }}</a>
{{ include('post/_delete_form.html.twig') }} {{ include('post/_delete_form.html.twig') }}

2
templates/post/table.html.twig
View File

@@ -30,7 +30,7 @@
<td>{{ post.commentary }}</td> <td>{{ post.commentary }}</td>
<td> <td>
<a href="{{ path('app_post_show', {'id': post.id}) }}">{{ 'show'|trans }}</a> <a href="{{ path('app_post_show', {'id': post.id}) }}">{{ 'show'|trans }}</a>
<a href="{{ path('app_post_edit', {'id': post.id}) }}">{{ 'edit'|trans }}</a> <a class="btn btn-success mb-4 mt-4" href="{{ path('app_post_edit', {'id': post.id}) }}">{{ 'edit'|trans }}</a>
</td> </td>
</tr> </tr>
{% else %} {% else %}

2
templates/species/_form.html.twig
View File

@@ -1,4 +1,4 @@
{{ form_start(form) }} {{ form_start(form) }}
{{ form_widget(form) }} {{ form_widget(form) }}
<button class="btn">{{ button_label|default('save'|trans) }}</button> <button class="btn btn-primary">{{ button_label|default('save'|trans) }}</button>
{{ form_end(form) }} {{ form_end(form) }}

2
templates/species/edit.html.twig
View File

@@ -6,7 +6,7 @@
<h1>{{ 'edit_species'|trans }}</h1> <h1>{{ 'edit_species'|trans }}</h1>
{{ include('species/_form.html.twig', {'button_label': 'update'|trans}) }} {{ include('species/_form.html.twig', {'button_label': 'update'|trans}) }}
<a href="{{ path('app_species_index') }}">{{ 'back_to_list'|trans }}</a> <a class="btn btn-warning mb-4 mt-4" href="{{ path('app_species_index') }}">{{ 'back_to_list'|trans }}</a>
{{ include('species/_delete_form.html.twig') }} {{ include('species/_delete_form.html.twig') }}
{% endblock %} {% endblock %}

2
templates/species/new.html.twig
View File

@@ -7,5 +7,5 @@
{{ include('species/_form.html.twig') }} {{ include('species/_form.html.twig') }}
<a href="{{ path('app_species_index') }}">{{ 'back_to_list'|trans }}</a> <a class="btn btn-warning mb-4 mt-4" href="{{ path('app_species_index') }}">{{ 'back_to_list'|trans }}</a>
{% endblock %} {% endblock %}

4
templates/species/show.html.twig
View File

@@ -27,9 +27,9 @@
</div> </div>
{% endfor %} {% endfor %}
<a href="{{ path('app_species_index') }}">{{ 'back_to_list'|trans }}</a> <a class="btn btn-warning mb-4 mt-4" href="{{ path('app_species_index') }}">{{ 'back_to_list'|trans }}</a>
<a href="{{ path('app_species_edit', {'id': species.id}) }}">{{ 'edit'|trans }}</a> <a class="btn btn-success mb-4 mt-4" href="{{ path('app_species_edit', {'id': species.id}) }}">{{ 'edit'|trans }}</a>
{{ include('species/_delete_form.html.twig') }} {{ include('species/_delete_form.html.twig') }}
</div> </div>

6
tests/Controller/PostControllerTest.php
View File

@@ -15,7 +15,7 @@ class PostControllerTest extends WebTestCase
private KernelBrowser $client; private KernelBrowser $client;
private EntityManagerInterface $manager; private EntityManagerInterface $manager;
private PostRepository $repository; private PostRepository $repository;
private string $path = '/post/'; private string $path = '/posts/';
protected function setUp(): void protected function setUp(): void
{ {
@@ -40,10 +40,10 @@ class PostControllerTest extends WebTestCase
public function testIndex(): void public function testIndex(): void
{ {
$crawler = $this->client->request('GET', '/post'); $crawler = $this->client->request('GET', '/');
self::assertResponseStatusCodeSame(200); self::assertResponseStatusCodeSame(200);
self::assertPageTitleContains('Post index'); self::assertPageTitleContains('Posts');
// Use the $crawler to perform additional assertions e.g. // Use the $crawler to perform additional assertions e.g.
// self::assertSame('Some text on the page', $crawler->filter('.p')->first()); // self::assertSame('Some text on the page', $crawler->filter('.p')->first());

2
tests/Controller/SpeciesControllerTest.php
View File

@@ -42,7 +42,7 @@ class SpeciesControllerTest extends WebTestCase
$crawler = $this->client->request('GET', $this->path); $crawler = $this->client->request('GET', $this->path);
self::assertResponseStatusCodeSame(200); self::assertResponseStatusCodeSame(200);
self::assertPageTitleContains('Species index'); self::assertPageTitleContains('Species');
// Use the $crawler to perform additional assertions e.g. // Use the $crawler to perform additional assertions e.g.
// self::assertSame('Some text on the page', $crawler->filter('.p')->first()); // self::assertSame('Some text on the page', $crawler->filter('.p')->first());

2
translations/messages.fr.xlf
View File

@@ -31,7 +31,7 @@
</trans-unit> </trans-unit>
<trans-unit id="qO7xvGM" resname="create_new_post"> <trans-unit id="qO7xvGM" resname="create_new_post">
<source>create_new_post</source> <source>create_new_post</source>
<target>Création d'une nouvelle publication</target> <target>Créer une nouvelle publication</target>
</trans-unit> </trans-unit>
<trans-unit id="6tlp1bV" resname="back_to_list"> <trans-unit id="6tlp1bV" resname="back_to_list">
<source>back_to_list</source> <source>back_to_list</source>