From e51bd37b8a6300519d5b3954c3e4ed3f09c43802 Mon Sep 17 00:00:00 2001 From: Zakarya BENJABALLAH Date: Tue, 7 Feb 2023 17:57:52 +0100 Subject: [PATCH 1/3] navBar debut bootstrap CRUD --- assets/styles/app.css | 3 -- src/Controller/PagesController.php | 2 +- templates/atelier/_delete_form.html.twig | 2 +- templates/atelier/_form.html.twig | 2 +- templates/atelier/edit.html.twig | 2 +- templates/atelier/index.html.twig | 19 ++++---- templates/atelier/new.html.twig | 2 +- templates/atelier/show.html.twig | 10 +++-- templates/base.html.twig | 55 +++++++++++++++++------- 9 files changed, 62 insertions(+), 35 deletions(-) diff --git a/assets/styles/app.css b/assets/styles/app.css index cb33b13..e69de29 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -1,3 +0,0 @@ -body { - background-color: lightgray; -} diff --git a/src/Controller/PagesController.php b/src/Controller/PagesController.php index bbed3df..277b38c 100644 --- a/src/Controller/PagesController.php +++ b/src/Controller/PagesController.php @@ -8,7 +8,7 @@ use Symfony\Component\Routing\Annotation\Route; class PagesController extends AbstractController { - #[Route('/pages', name: 'app_pages')] + #[Route('/', name: 'app_index')] public function index(): Response { return $this->render('pages/index.html.twig', [ diff --git a/templates/atelier/_delete_form.html.twig b/templates/atelier/_delete_form.html.twig index 4eb7ce9..16a3c06 100644 --- a/templates/atelier/_delete_form.html.twig +++ b/templates/atelier/_delete_form.html.twig @@ -1,4 +1,4 @@
- +
diff --git a/templates/atelier/_form.html.twig b/templates/atelier/_form.html.twig index bf20b98..1e6b21a 100644 --- a/templates/atelier/_form.html.twig +++ b/templates/atelier/_form.html.twig @@ -1,4 +1,4 @@ {{ form_start(form) }} {{ form_widget(form) }} - + {{ form_end(form) }} diff --git a/templates/atelier/edit.html.twig b/templates/atelier/edit.html.twig index c844be6..a302ccc 100644 --- a/templates/atelier/edit.html.twig +++ b/templates/atelier/edit.html.twig @@ -7,7 +7,7 @@ {{ include('atelier/_form.html.twig', {'button_label': 'Update'}) }} - back to list + back to list {{ include('atelier/_delete_form.html.twig') }} {% endblock %} diff --git a/templates/atelier/index.html.twig b/templates/atelier/index.html.twig index f243327..281f6d9 100644 --- a/templates/atelier/index.html.twig +++ b/templates/atelier/index.html.twig @@ -8,10 +8,10 @@ - - - - + + + + @@ -19,10 +19,13 @@ - + {% else %} @@ -33,5 +36,5 @@
IdNomDescriptionactionsIdNomDescriptionActions
{{ atelier.id }} {{ atelier.nom }}{{ atelier.description }}{{ atelier.description }} - show - edit +
+ show + edit +
+
- Create new + Create new {% endblock %} diff --git a/templates/atelier/new.html.twig b/templates/atelier/new.html.twig index 72b08fe..baa6f72 100644 --- a/templates/atelier/new.html.twig +++ b/templates/atelier/new.html.twig @@ -7,5 +7,5 @@ {{ include('atelier/_form.html.twig') }} - back to list + back to list {% endblock %} diff --git a/templates/atelier/show.html.twig b/templates/atelier/show.html.twig index 5b0e05f..7bf0f31 100644 --- a/templates/atelier/show.html.twig +++ b/templates/atelier/show.html.twig @@ -22,9 +22,13 @@ - back to list +
+ + back to list + edit + {{ include('atelier/_delete_form.html.twig') }} + +
- edit - {{ include('atelier/_delete_form.html.twig') }} {% endblock %} diff --git a/templates/base.html.twig b/templates/base.html.twig index 1576ae0..7c62423 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,20 +1,43 @@ - - - {% block title %}Welcome!{% endblock %} - - - {# Run `composer require symfony/webpack-encore-bundle` to start using Symfony UX #} - {% block stylesheets %} - {{ encore_entry_link_tags('app') }} - {% endblock %} + + + {% block title %}Welcome!{% endblock %} + + + {# Run `composer require symfony/webpack-encore-bundle` to start using Symfony UX #} + {% block stylesheets %} + {{ encore_entry_link_tags('app') }} + {% endblock %} - {% block javascripts %} - {{ encore_entry_script_tags('app') }} - {% endblock %} - - - {% block body %}{% endblock %} - + {% block javascripts %} + {{ encore_entry_script_tags('app') }} + {% endblock %} + + + +
{% block body %}{% endblock %}
+ + + From 68973c14fdcdf38c578b1ace5f4855f6ddd850da Mon Sep 17 00:00:00 2001 From: Zakarya BENJABALLAH Date: Tue, 7 Feb 2023 18:32:56 +0100 Subject: [PATCH 2/3] fix btn question 5 --- templates/atelier/_delete_form.html.twig | 2 +- templates/atelier/_form.html.twig | 6 +++- templates/atelier/edit.html.twig | 8 ++--- templates/atelier/index.html.twig | 27 +++++++++-------- templates/atelier/new.html.twig | 8 ++--- templates/atelier/show.html.twig | 37 +++++++++++------------- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/templates/atelier/_delete_form.html.twig b/templates/atelier/_delete_form.html.twig index 16a3c06..0402463 100644 --- a/templates/atelier/_delete_form.html.twig +++ b/templates/atelier/_delete_form.html.twig @@ -1,4 +1,4 @@
- +
diff --git a/templates/atelier/_form.html.twig b/templates/atelier/_form.html.twig index 1e6b21a..a92724f 100644 --- a/templates/atelier/_form.html.twig +++ b/templates/atelier/_form.html.twig @@ -1,4 +1,8 @@ {{ form_start(form) }} {{ form_widget(form) }} - +
+ + + Retour à la liste +
{{ form_end(form) }} diff --git a/templates/atelier/edit.html.twig b/templates/atelier/edit.html.twig index a302ccc..1ce67c6 100644 --- a/templates/atelier/edit.html.twig +++ b/templates/atelier/edit.html.twig @@ -1,13 +1,11 @@ {% extends 'base.html.twig' %} -{% block title %}Edit Atelier{% endblock %} +{% block title %}Modifier l'atelier{% endblock %} {% block body %} -

Edit Atelier

+

Modifier l'atelier

- {{ include('atelier/_form.html.twig', {'button_label': 'Update'}) }} - - back to list + {{ include('atelier/_form.html.twig', {'button_label': 'Mettre à jour'}) }} {{ include('atelier/_delete_form.html.twig') }} {% endblock %} diff --git a/templates/atelier/index.html.twig b/templates/atelier/index.html.twig index 281f6d9..f4867a2 100644 --- a/templates/atelier/index.html.twig +++ b/templates/atelier/index.html.twig @@ -7,25 +7,26 @@ - - - - - - + + + + + + {% for atelier in ateliers %} - + {% else %} @@ -36,5 +37,7 @@
IdNomDescriptionActions
IdNomDescriptionActions
{{ atelier.id }} {{ atelier.nom }}{{ atelier.description }}{{ atelier.description }} -
- show - edit +
+ Afficher + Modifier
-
- Create new +
+ Créer atelier +
{% endblock %} diff --git a/templates/atelier/new.html.twig b/templates/atelier/new.html.twig index baa6f72..a442ac7 100644 --- a/templates/atelier/new.html.twig +++ b/templates/atelier/new.html.twig @@ -1,11 +1,9 @@ {% extends 'base.html.twig' %} -{% block title %}New Atelier{% endblock %} +{% block title %}Nouvel atelier{% endblock %} {% block body %} -

Create new Atelier

+

Créer un nouvel atelier

- {{ include('atelier/_form.html.twig') }} - - back to list + {{ include('atelier/_form.html.twig', {'button_label': 'Sauvegarder'}) }} {% endblock %} diff --git a/templates/atelier/show.html.twig b/templates/atelier/show.html.twig index 7bf0f31..84c1878 100644 --- a/templates/atelier/show.html.twig +++ b/templates/atelier/show.html.twig @@ -7,28 +7,25 @@ - - - - - - - - - - - - + + + + + + + + + + + +
Id{{ atelier.id }}
Nom{{ atelier.nom }}
Description{{ atelier.description }}
Id{{ atelier.id }}
Nom{{ atelier.nom }}
Description{{ atelier.description }}
-
- - back to list - edit - {{ include('atelier/_delete_form.html.twig') }} - +
+ Modifier + Retour à la liste + {{ include('atelier/_delete_form.html.twig') }}
- - {% endblock %} + From 650fbdce4043e75dac99d5bdae70fb1cea9898f2 Mon Sep 17 00:00:00 2001 From: Zakarya BENJABALLAH Date: Tue, 7 Feb 2023 18:34:54 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Mise=20=C3=A0=20jour=20readme.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 7437e1e..3b3e1ee 100644 --- a/README.md +++ b/README.md @@ -45,4 +45,9 @@ symfony console doctrine:fixtures:load ### Question 4 ```bash symfony console make:crud Atelier +``` + +### Question 5 +```bash +npm run dev ``` \ No newline at end of file