diff --git a/.idea/HegreEtConfort.iml b/.idea/HegreEtConfort.iml index f4221e4..af6cce8 100644 --- a/.idea/HegreEtConfort.iml +++ b/.idea/HegreEtConfort.iml @@ -3,6 +3,7 @@ + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..c17c05a --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,57 @@ + + + +<<<<<<< HEAD + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://172.20.96.1:5432/HegreEtConfort +======= +<<<<<<< HEAD +<<<<<<< HEAD + +======= +<<<<<<< HEAD + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://172.20.96.1:5432/ + $ProjectFileDir$ + + + mariadb + true + org.mariadb.jdbc.Driver + jdbc:mariadb://127.0.0.1:3306/hegreconfort +======= + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://172.20.96.1:5432/chauffageproj + $ProjectFileDir$ + + +>>>>>>> 6532d4d88b86c321a212cdc0ca43b2e4770db117 + postgresql + true + org.postgresql.Driver + jdbc:postgresql://172.20.96.1:5432/chauffageproj +>>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f +======= + + mariadb + true + org.mariadb.jdbc.Driver + jdbc:mariadb://localhost:3306/HegreConfort + + + +>>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97 +>>>>>>> d7375d330251cab10a2296bbb292fcdb7cd6e847 + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 34b9e45..86e9759 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,12 +4,16 @@ +<<<<<<< HEAD + +======= +>>>>>>> 6532d4d88b86c321a212cdc0ca43b2e4770db117 diff --git a/assets/app.js b/assets/app.js index 8725cc5..883dec4 100644 --- a/assets/app.js +++ b/assets/app.js @@ -5,6 +5,6 @@ import './bootstrap.js'; * This file will be included onto the page via the importmap() Twig function, * which should already be in your base.html.twig. */ -import './styles/app.css'; +import './styles/css/app.css'; console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉'); diff --git a/assets/styles/app.css b/assets/styles/css/app.css similarity index 100% rename from assets/styles/app.css rename to assets/styles/css/app.css diff --git a/assets/styles/css/calendrierChauffagiste.css b/assets/styles/css/calendrierChauffagiste.css new file mode 100644 index 0000000..e69de29 diff --git a/assets/styles/css/calendrierSecretaire.css b/assets/styles/css/calendrierSecretaire.css new file mode 100644 index 0000000..e69de29 diff --git a/assets/styles/css/intervention.css b/assets/styles/css/intervention.css new file mode 100644 index 0000000..e69de29 diff --git a/assets/styles/css/login.css b/assets/styles/css/login.css new file mode 100644 index 0000000..c8fb87d --- /dev/null +++ b/assets/styles/css/login.css @@ -0,0 +1,87 @@ +body { + background: url("../image/fond.png") center center / cover no-repeat; +} + +.logo { + position: absolute; + margin: 0.5% 0 0 43.5%; + height: 25%; +} + + +.titre { + position: absolute; + color: white; + margin: 15% 0 0 38%; +} + + +.logoProfile { + position: absolute; + border-radius: 10%; + margin: 20% 0 0 36%; + height: 10%; +} +.logoPassword { + position: absolute; + border-radius: 10%; + margin: 27% 0 0 36%; + height: 10%; +} +.profile { + position: absolute; + border-radius: 2%; + margin: 20% 0 0 42%; + width: 22%; + height: 5%; +} +.password { + position: absolute; + border-radius: 2%; + margin: 27% 0 0 42%; + width: 22%; + height: 5%; +} + + +.forgot { + position: absolute; + font-style: italic; + margin: 30% 0 0 52%; + font-size: 100%; + color: white; +} +#remember { + position: absolute; + margin: 33% 0 0 38%; + font-size: 100%; + color: white; +} +.remember { + position: absolute; + margin: 32.7% 0 0 39.5%; + font-size: 100%; + color: white; +} +.login { + position: absolute; + margin: 37.5% 0 0 36.6%; + width: 27%; + background-color: #243C40; + color: white; +} + + +.background { + position: absolute; + box-shadow: 0 0 30px 1px black; + border-radius: 10%; + opacity: 85%; + + margin: 7% 0 0 35%; + width: 30%; + height: 75%; + + + background: #243C40; +} \ No newline at end of file diff --git a/assets/styles/image/LogoHegreConfort_SansFond.png b/assets/styles/image/LogoHegreConfort_SansFond.png new file mode 100644 index 0000000..bd78f17 Binary files /dev/null and b/assets/styles/image/LogoHegreConfort_SansFond.png differ diff --git a/assets/styles/image/fond.png b/assets/styles/image/fond.png new file mode 100644 index 0000000..fd4e838 Binary files /dev/null and b/assets/styles/image/fond.png differ diff --git a/assets/styles/image/password.png b/assets/styles/image/password.png new file mode 100644 index 0000000..87dd915 Binary files /dev/null and b/assets/styles/image/password.png differ diff --git a/assets/styles/image/profile.png b/assets/styles/image/profile.png new file mode 100644 index 0000000..99bb380 Binary files /dev/null and b/assets/styles/image/profile.png differ diff --git a/composer.json b/composer.json index d113d15..f4ed66d 100644 --- a/composer.json +++ b/composer.json @@ -102,7 +102,7 @@ "symfony/browser-kit": "7.1.*", "symfony/css-selector": "7.1.*", "symfony/debug-bundle": "7.1.*", - "symfony/maker-bundle": "^1.0", + "symfony/maker-bundle": "^1.61", "symfony/phpunit-bridge": "^7.1", "symfony/stopwatch": "7.1.*", "symfony/web-profiler-bundle": "7.1.*" diff --git a/composer.lock b/composer.lock index 618986c..b47ebfe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cf8a9d35993fbd4e8f038bfd58abc5a5", + "content-hash": "e99a99b4ca2d6b58821cb711cb543c93", "packages": [ { "name": "composer/semver", @@ -428,16 +428,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "2.13.0", + "version": "2.13.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "ca59d84b8e63143ce1aed90cdb333ba329d71563" + "reference": "2740ad8b8739b39ab37d409c972b092f632b025a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/ca59d84b8e63143ce1aed90cdb333ba329d71563", - "reference": "ca59d84b8e63143ce1aed90cdb333ba329d71563", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/2740ad8b8739b39ab37d409c972b092f632b025a", + "reference": "2740ad8b8739b39ab37d409c972b092f632b025a", "shasum": "" }, "require": { @@ -451,7 +451,7 @@ "symfony/console": "^5.4 || ^6.0 || ^7.0", "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", "symfony/deprecation-contracts": "^2.1 || ^3", - "symfony/doctrine-bridge": "^5.4.19 || ^6.0.7 || ^7.0", + "symfony/doctrine-bridge": "^5.4.46 || ^6.4.3 || ^7.0.3", "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0", "symfony/polyfill-php80": "^1.15", "symfony/service-contracts": "^1.1.1 || ^2.0 || ^3" @@ -528,7 +528,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineBundle/issues", - "source": "https://github.com/doctrine/DoctrineBundle/tree/2.13.0" + "source": "https://github.com/doctrine/DoctrineBundle/tree/2.13.1" }, "funding": [ { @@ -544,7 +544,7 @@ "type": "tidelift" } ], - "time": "2024-09-01T09:46:40+00:00" + "time": "2024-11-08T23:27:54+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", @@ -9840,5 +9840,5 @@ "ext-iconv": "*" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/migrations/Version20241121154657.php b/migrations/Version20241121154657.php deleted file mode 100644 index 55567a9..0000000 --- a/migrations/Version20241121154657.php +++ /dev/null @@ -1,70 +0,0 @@ -addSql('CREATE SEQUENCE fault_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE SEQUENCE intervention_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE SEQUENCE skill_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE SEQUENCE stock_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE SEQUENCE "user_id_seq" INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE SEQUENCE vehicle_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE TABLE fault (id INT NOT NULL, wording VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE TABLE intervention (id INT NOT NULL, wording VARCHAR(255) NOT NULL, timestamp TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, description VARCHAR(255) NOT NULL, address VARCHAR(255) NOT NULL, status VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE TABLE skill (id INT NOT NULL, wording VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE TABLE stock (id INT NOT NULL, wording VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL, quantity VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE TABLE "user" (id INT NOT NULL, first_name VARCHAR(255) NOT NULL, last_name VARCHAR(255) NOT NULL, birth_date DATE NOT NULL, email VARCHAR(255) NOT NULL, phone VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE TABLE vehicle (id INT NOT NULL, license_plate VARCHAR(255) NOT NULL, brand VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE TABLE messenger_messages (id BIGSERIAL NOT NULL, body TEXT NOT NULL, headers TEXT NOT NULL, queue_name VARCHAR(190) NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, available_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, delivered_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(id))'); - $this->addSql('CREATE INDEX IDX_75EA56E0FB7336F0 ON messenger_messages (queue_name)'); - $this->addSql('CREATE INDEX IDX_75EA56E0E3BD61CE ON messenger_messages (available_at)'); - $this->addSql('CREATE INDEX IDX_75EA56E016BA31DB ON messenger_messages (delivered_at)'); - $this->addSql('COMMENT ON COLUMN messenger_messages.created_at IS \'(DC2Type:datetime_immutable)\''); - $this->addSql('COMMENT ON COLUMN messenger_messages.available_at IS \'(DC2Type:datetime_immutable)\''); - $this->addSql('COMMENT ON COLUMN messenger_messages.delivered_at IS \'(DC2Type:datetime_immutable)\''); - $this->addSql('CREATE OR REPLACE FUNCTION notify_messenger_messages() RETURNS TRIGGER AS $$ - BEGIN - PERFORM pg_notify(\'messenger_messages\', NEW.queue_name::text); - RETURN NEW; - END; - $$ LANGUAGE plpgsql;'); - $this->addSql('DROP TRIGGER IF EXISTS notify_trigger ON messenger_messages;'); - $this->addSql('CREATE TRIGGER notify_trigger AFTER INSERT OR UPDATE ON messenger_messages FOR EACH ROW EXECUTE PROCEDURE notify_messenger_messages();'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE SCHEMA public'); - $this->addSql('DROP SEQUENCE fault_id_seq CASCADE'); - $this->addSql('DROP SEQUENCE intervention_id_seq CASCADE'); - $this->addSql('DROP SEQUENCE skill_id_seq CASCADE'); - $this->addSql('DROP SEQUENCE stock_id_seq CASCADE'); - $this->addSql('DROP SEQUENCE "user_id_seq" CASCADE'); - $this->addSql('DROP SEQUENCE vehicle_id_seq CASCADE'); - $this->addSql('DROP TABLE fault'); - $this->addSql('DROP TABLE intervention'); - $this->addSql('DROP TABLE skill'); - $this->addSql('DROP TABLE stock'); - $this->addSql('DROP TABLE "user"'); - $this->addSql('DROP TABLE vehicle'); - $this->addSql('DROP TABLE messenger_messages'); - } -} diff --git a/migrations/Version20241128141518.php b/migrations/Version20241128141518.php new file mode 100644 index 0000000..ffcd213 --- /dev/null +++ b/migrations/Version20241128141518.php @@ -0,0 +1,31 @@ +addSql('CREATE SCHEMA public'); + } +} diff --git a/src/Controller/AuthenticationController.php b/src/Controller/AuthenticationController.php new file mode 100644 index 0000000..c6be245 --- /dev/null +++ b/src/Controller/AuthenticationController.php @@ -0,0 +1,32 @@ +getLastAuthenticationError(); + + // last username entered by the user + $lastUsername = $authenticationUtils->getLastUsername(); + + return $this->render('authentication/index.html.twig', [ + 'last_username' => $lastUsername, + 'error' => $error, + ]); + } + + #[Route(path: '/logout', name: '_logout')] + public function logout(): void + { + throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.'); + } +} \ No newline at end of file diff --git a/src/Controller/CalendrierController.php b/src/Controller/CalendrierController.php new file mode 100644 index 0000000..3fc2c78 --- /dev/null +++ b/src/Controller/CalendrierController.php @@ -0,0 +1,18 @@ +render('calendrier/index.html.twig', [ + 'controller_name' => 'CalendrierController', + ]); + } +} diff --git a/src/Controller/FaultController.php b/src/Controller/FaultController.php index dc9d09a..0f98579 100644 --- a/src/Controller/FaultController.php +++ b/src/Controller/FaultController.php @@ -30,7 +30,7 @@ class FaultController extends AbstractController $this->entityManager->persist($fault); $this->entityManager->flush(); - return $this->redirectToRoute("app_fault_list"); + return $this->redirectToRoute("fault_list"); } return $this->render('fault/add.html.twig', [ @@ -41,10 +41,10 @@ class FaultController extends AbstractController #[Route('/fault/list', name: 'fault_list')] public function list(): Response { - $fault = $this->faultRepository->findAll(); + $faults = $this->faultRepository->findAll(); return $this->render('fault/list.html.twig', [ - 'fault' => $fault, + 'faults' => $faults, ]); } } \ No newline at end of file diff --git a/src/Controller/InterventionController.php b/src/Controller/InterventionController.php index 4c9b0c6..280d5a9 100644 --- a/src/Controller/InterventionController.php +++ b/src/Controller/InterventionController.php @@ -19,33 +19,33 @@ class InterventionController extends AbstractController ) { } - #[\Symfony\Component\Routing\Annotation\Route('/intervention/add', name: 'fault_add')] + #[Route('/intervention/add', name: 'intervention_add')] public function add(Request $request): Response { - $fault = new Intervention(); - $form = $this->createForm(InterventionType::class, $fault); + $intervention = new Intervention(); + $form = $this->createForm(InterventionType::class, $intervention); $form->handleRequest($request); if($form->isSubmitted() && $form->isValid()) { - $this->entityManager->persist($fault); + $this->entityManager->persist($intervention); $this->entityManager->flush(); - return $this->redirectToRoute("app_fault_list"); + return $this->redirectToRoute("intervention_list"); } - return $this->render('fault/add.html.twig', [ + return $this->render('intervention/add.html.twig', [ 'form' => $form, ]); } - #[Route('/fault/list', name: 'fault_list')] + #[Route('/intervention/list', name: 'intervention_list')] public function list(): Response { - $fault = $this->faultRepository->findAll(); + $interventions = $this->interventionRepository->findAll(); - return $this->render('fault/list.html.twig', [ - 'fault' => $fault, + return $this->render('intervention/list.html.twig', [ + 'interventions' => $interventions, ]); } } \ No newline at end of file diff --git a/src/Controller/SkillController.php b/src/Controller/SkillController.php index c828d2a..92ed955 100644 --- a/src/Controller/SkillController.php +++ b/src/Controller/SkillController.php @@ -2,17 +2,49 @@ namespace App\Controller; +use App\Entity\Skill; +use App\Form\SkillType; +use App\Repository\SkillRepository; +use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Attribute\Route; +use Symfony\Component\Routing\Annotation\Route; class SkillController extends AbstractController { - #[Route('/skill', name: 'app_skill')] - public function index(): Response + public function __construct( + private readonly EntityManagerInterface $entityManager, + private readonly SkillRepository $skillRepository + ) { + } + + #[Route('/skill/add', name: 'skill_add')] + public function add(Request $request): Response + { + $skill = new Skill(); + $form = $this->createForm(SkillType::class, $skill); + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $this->entityManager->persist($skill); + $this->entityManager->flush(); + } + return $this->render('skill/add.html.twig', [ - 'controller_name' => 'SkillController', + 'form' => $form, ]); } -} + + #[Route('/skill/list', name: 'skill_list')] + public function list(): Response + { + $skills = $this->skillRepository->findAll(); + + return $this->render('skill/list.html.twig', [ + 'skills' => $skills, + ]); + } + +} \ No newline at end of file diff --git a/src/Controller/VehicleController.php b/src/Controller/VehicleController.php index ffc6bf0..54b8ac7 100644 --- a/src/Controller/VehicleController.php +++ b/src/Controller/VehicleController.php @@ -2,17 +2,50 @@ namespace App\Controller; +use App\Entity\Vehicle; +use App\Form\VehicleType; +use App\Repository\VehicleRepository; +use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Attribute\Route; class VehicleController extends AbstractController { - #[Route('/vehicle', name: 'app_vehicle')] - public function index(): Response + public function __construct( + private readonly EntityManagerInterface $entityManager, + private readonly VehicleRepository $vehicleRepository + ) { + } + #[\Symfony\Component\Routing\Annotation\Route('/vehicle/add', name: 'vehicle_add')] + public function add(Request $request): Response + { + $vehicle = new Vehicle(); + $form = $this->createForm(VehicleType::class, $vehicle); + $form->handleRequest($request); + + if($form->isSubmitted() && $form->isValid()) + { + $this->entityManager->persist($vehicle); + $this->entityManager->flush(); + + return $this->redirectToRoute("vehicle_list"); + } + return $this->render('vehicle/add.html.twig', [ - 'controller_name' => 'VehicleController', + 'form' => $form, ]); } -} + + #[Route('/vehicle/list', name: 'vehicle_list')] + public function list(): Response + { + $vehicles = $this->vehicleRepository->findAll(); + + return $this->render('vehicle/list.html.twig', [ + 'vehicles' => $vehicles, + ]); + } +} \ No newline at end of file diff --git a/src/Form/InterventionType.php b/src/Form/InterventionType.php new file mode 100644 index 0000000..35c3b56 --- /dev/null +++ b/src/Form/InterventionType.php @@ -0,0 +1,34 @@ +add('Wording', TextType::class) + ->add('Timestamp', DateType::class) + ->add('description', TextAreaType::class) + ->add('address', TextType::class) + ->add('Status', TextType::class) + ->add('save', SubmitType::class) + ; + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + // Configure your form options here + ]); + } +} diff --git a/src/Form/SkillType.php b/src/Form/SkillType.php new file mode 100644 index 0000000..bfee7c8 --- /dev/null +++ b/src/Form/SkillType.php @@ -0,0 +1,30 @@ +add('Wording', TextType::class) + ->add('description', TextAreaType::class) + ->add('Save', SubmitType::class) + + ; + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + // Configure your form options here + ]); + } +} diff --git a/src/Form/StockType.php b/src/Form/StockType.php index a8480f7..958daa0 100644 --- a/src/Form/StockType.php +++ b/src/Form/StockType.php @@ -7,6 +7,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\DateType; use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\FormBuilderInterface; @@ -18,7 +19,7 @@ class StockType extends AbstractType { $builder ->add('Wording', TextType::class) - ->add('Description', TextType::class) + ->add('description', TextAreaType::class) ->add('Quantity', IntegerType::class) ->add('save', SubmitType::class) ; diff --git a/src/Form/VehicleType.php b/src/Form/VehicleType.php new file mode 100644 index 0000000..47e3161 --- /dev/null +++ b/src/Form/VehicleType.php @@ -0,0 +1,30 @@ +add('LicensePlate', TextType::class) + ->add('Brand', IntegerType::class) + ->add('Save', SubmitType::class) + + ; + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + // Configure your form options here + ]); + } +} diff --git a/templates/authentication/index.html.twig b/templates/authentication/index.html.twig new file mode 100644 index 0000000..c40b41a --- /dev/null +++ b/templates/authentication/index.html.twig @@ -0,0 +1,35 @@ + + +{% block title %}Log in!{% endblock %} + +{% block body %} +
+ {% if error %} +
{{ error.messageKey|trans(error.messageData, 'security') }}
+ {% endif %} + + {% if app.user %} +
+ You are logged in as {{ app.user.userIdentifier }}, Logout +
+ {% endif %} + +

Please sign in

+ + + + + + + +
+ + +
+ + + +
+{% endblock %} \ No newline at end of file diff --git a/templates/base.html.twig b/templates/base.html.twig index 3cda30f..c71b178 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,17 +1,17 @@ - - - {% block title %}Welcome!{% endblock %} - - {% block stylesheets %} - {% endblock %} + + + {% block title %}Welcome!{% endblock %} + + {% block stylesheets %} + {% endblock %} - {% block javascripts %} - {% block importmap %}{{ importmap('app') }}{% endblock %} - {% endblock %} - - - {% block body %}{% endblock %} - - + {% block javascripts %} + {% block importmap %}{{ importmap('app') }}{% endblock %} + {% endblock %} + + +{% block body %}{% endblock %} + + \ No newline at end of file diff --git a/templates/calendrier/indexChauffagiste.html.twig b/templates/calendrier/indexChauffagiste.html.twig new file mode 100644 index 0000000..e69de29 diff --git a/templates/intervention/index.html.twig b/templates/calendrier/indexSecretaire.html.twig similarity index 55% rename from templates/intervention/index.html.twig rename to templates/calendrier/indexSecretaire.html.twig index a7ab33d..4f874cd 100644 --- a/templates/intervention/index.html.twig +++ b/templates/calendrier/indexSecretaire.html.twig @@ -1,6 +1,6 @@ {% extends 'base.html.twig' %} -{% block title %}Hello InterventionController!{% endblock %} +{% block title %}Hello CalendrierController!{% endblock %} {% block body %} -
-

Hello {{ controller_name }}! ✅

+ {% block stylesheets %} + {% endblock %} + + +
+
+
- This friendly message is coming from: -
    -
  • Your controller at E:/BTS/PhpStorm/HegreEtConfort/src/Controller/LoginController.php
    • -
  • Your template at E:/BTS/PhpStorm/HegreEtConfort/templates/login/index.html.twig
    • -
+ +

D'Hegre Et Confort

+ + Logo Profil + Logo Password + + + + +

Mot de passe oublié ?

+
-{% endblock %} + + diff --git a/templates/skill/add.html.twig b/templates/skill/add.html.twig new file mode 100644 index 0000000..9ca6ffa --- /dev/null +++ b/templates/skill/add.html.twig @@ -0,0 +1,10 @@ +{# templates/user/add.html.twig #} +{% extends 'base.html.twig' %} + +{% block title %}Ajouter une intervention {% endblock %} + +{% block body %} +

Ajouter une compétence

+ + {{ form(form) }} +{% endblock %} diff --git a/templates/skill/index.html.twig b/templates/skill/index.html.twig deleted file mode 100644 index 5d0589f..0000000 --- a/templates/skill/index.html.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block title %}Hello SkillController!{% endblock %} - -{% block body %} - - -
-

Hello {{ controller_name }}! ✅

- - This friendly message is coming from: - -
-{% endblock %} diff --git a/templates/skill/list.html.twig b/templates/skill/list.html.twig new file mode 100644 index 0000000..53899e1 --- /dev/null +++ b/templates/skill/list.html.twig @@ -0,0 +1,10 @@ +{% extends 'base.html.twig' %} + +{% block title %}Hello InterventionController!{% endblock %} + +{% block body %} + {% for skill in skills %} + {{ skill.Wording }} + {{ skill.Description }} + {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/templates/vehicle/add.html.twig b/templates/vehicle/add.html.twig new file mode 100644 index 0000000..3440b9d --- /dev/null +++ b/templates/vehicle/add.html.twig @@ -0,0 +1,10 @@ +{# templates/user/add.html.twig #} +{% extends 'base.html.twig' %} + +{% block title %}Ajouter un utilisateur{% endblock %} + +{% block body %} +

Ajouter un utilisateur

+ + {{ form(form) }} +{% endblock %} diff --git a/templates/vehicle/index.html.twig b/templates/vehicle/index.html.twig deleted file mode 100644 index bbd8f2c..0000000 --- a/templates/vehicle/index.html.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block title %}Hello VehicleController!{% endblock %} - -{% block body %} - - -
-

Hello {{ controller_name }}! ✅

- - This friendly message is coming from: - -
-{% endblock %} diff --git a/templates/vehicle/list.html.twig b/templates/vehicle/list.html.twig new file mode 100644 index 0000000..1741382 --- /dev/null +++ b/templates/vehicle/list.html.twig @@ -0,0 +1,10 @@ +{% extends 'base.html.twig' %} + +{% block title %}Hello UserController!{% endblock %} + +{% block body %} + {% for vehicle in vehicles %} + {{ vehicle.LicensePlate }} + {{ vehicle.Brand }} + {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/tests/add.html.twig b/tests/add.html.twig new file mode 100644 index 0000000..e69de29 diff --git a/tests/list.html.twig b/tests/list.html.twig new file mode 100644 index 0000000..e69de29