From 84947b0798620203ed79f7e0260250f8836e4f2b Mon Sep 17 00:00:00 2001 From: Michel NAUD Date: Wed, 10 Feb 2021 21:12:44 +0100 Subject: [PATCH 1/2] add user view --- composer.json | 1 + composer.lock | 68 +++++++++++++- config/bundles.php | 1 + src/Controller/Admin/UserController.php | 21 +++++ src/Controller/ResetPasswordController.php | 17 ++-- src/Entity/User.php | 24 ++++- src/Form/UserType.php | 51 ++++++++++ symfony.lock | 3 + templates/admin/layout.html.twig | 2 +- templates/admin/user/_list.html.twig | 2 +- templates/admin/user/view.html.twig | 104 +++++++++++++++++++++ 11 files changed, 284 insertions(+), 10 deletions(-) create mode 100644 src/Form/UserType.php create mode 100644 templates/admin/user/view.html.twig diff --git a/composer.json b/composer.json index a274897..d285680 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "doctrine/orm": "^2.8", "karser/karser-recaptcha3-bundle": "^0.1.15", "kilik/table": "^2.5", + "knplabs/knp-time-bundle": "^1.15", "phpdocumentor/reflection-docblock": "^5.2", "sensio/framework-extra-bundle": "^5.1", "symfony/asset": "4.4.*", diff --git a/composer.lock b/composer.lock index 6f34ff6..2adbb57 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": "36bc382df52477340676c9cd355d7f7c", + "content-hash": "c993b23ecd2575cf2488ca278b0431d8", "packages": [ { "name": "composer/package-versions-deprecated", @@ -1707,6 +1707,72 @@ ], "time": "2021-02-03T10:36:28+00:00" }, + { + "name": "knplabs/knp-time-bundle", + "version": "v1.15.0", + "source": { + "type": "git", + "url": "https://github.com/KnpLabs/KnpTimeBundle.git", + "reference": "96bc6523babd1a85988f8b4ecd2730c3aa064b8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/KnpLabs/KnpTimeBundle/zipball/96bc6523babd1a85988f8b4ecd2730c3aa064b8c", + "reference": "96bc6523babd1a85988f8b4ecd2730c3aa064b8c", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "symfony/config": "~3.4|^4.3|^5.0", + "symfony/dependency-injection": "~3.4|^4.3|^5.0", + "symfony/translation": "^4.3|^5.0" + }, + "require-dev": { + "symfony/framework-bundle": "^4.3|^5.0", + "symfony/phpunit-bridge": "^4.3|^5.0", + "symfony/templating": "~3.4|^4.3|^5.0", + "symfony/twig-bundle": "^4.3|^5.0" + }, + "suggest": { + "symfony/twig-bundle": "to use the Twig `time_diff()` function or `|ago` filter" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Knp\\Bundle\\TimeBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KnpLabs Team", + "homepage": "http://knplabs.com" + }, + { + "name": "Symfony Community", + "homepage": "http://github.com/KnpLabs/KnpTimeBundle/contributors" + } + ], + "description": "Making your dates look sensible and descriptive", + "homepage": "http://github.com/KnpLabs/KnpTimeBundle", + "keywords": [ + "bundle", + "date", + "descriptive time", + "knp", + "knplabs", + "time" + ], + "time": "2021-01-15T18:15:43+00:00" + }, { "name": "laminas/laminas-code", "version": "4.0.0", diff --git a/config/bundles.php b/config/bundles.php index 7044f19..69091ca 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -18,4 +18,5 @@ Kilik\TableBundle\KilikTableBundle::class => ['all' => true], Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true], Karser\Recaptcha3Bundle\KarserRecaptcha3Bundle::class => ['all' => true], + Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true], ]; diff --git a/src/Controller/Admin/UserController.php b/src/Controller/Admin/UserController.php index e6c089a..0b4d9f2 100644 --- a/src/Controller/Admin/UserController.php +++ b/src/Controller/Admin/UserController.php @@ -129,4 +129,25 @@ public function _listAction(TableService $tableService, Request $request) { return $tableService->handleRequest($this->getTable(), $request); } + + /** + * @Route("/{user}", name="admin_user_view") + */ + public function view(User $user): Response + { + return $this->render('admin/user/view.html.twig', [ + 'user' => $user, + ]); + } + + /** + * @Route("/{user}/edit", name="admin_user_edit") + */ + public function edit(User $user): Response + { + return $this->render('admin/user/edit.html.twig', [ + 'user' => $user, + ]); + } + } diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php index bf787bd..8bf3069 100644 --- a/src/Controller/ResetPasswordController.php +++ b/src/Controller/ResetPasswordController.php @@ -5,6 +5,7 @@ use App\Entity\User; use App\Form\NewPasswordType; use App\Form\PasswordRequestType; +use App\Manager\UserManager; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -33,8 +34,10 @@ public function __construct(string $mailFrom) public function reset( Request $request, EntityManagerInterface $entityManager, - \Swift_Mailer $mailer - ) { + \Swift_Mailer $mailer, + UserManager $userManager + ) + { $form = $this->createForm(PasswordRequestType::class); $form->handleRequest($request); @@ -45,7 +48,7 @@ public function reset( if ($user instanceof User) { $token = bin2hex(random_bytes(32)); $user->setPasswordRequestToken($token); - $entityManager->flush(); + $userManager->save($user, true, true); // send your email with SwiftMailer or anything else here $this->addFlash('success', 'Si l\'adresse email est correcte, vous allez recevoir un email'); @@ -95,8 +98,10 @@ public function confirm( EntityManagerInterface $entityManager, UserPasswordEncoderInterface $encoder, TokenStorageInterface $tokenStorage, - SessionInterface $session - ) { + SessionInterface $session, + UserManager $userManager + ) + { $user = $entityManager->getRepository(User::class)->findOneBy(['passwordRequestToken' => $token]); if (!$token || !$user instanceof User) { @@ -113,7 +118,7 @@ public function confirm( $password = $encoder->encodePassword($user, $plainPassword); $user->setPassword($password); $user->setPasswordRequestToken(null); - $entityManager->flush(); + $userManager->save($user, true, true); $token = new UsernamePasswordToken($user, $password, 'main'); $tokenStorage->setToken($token); diff --git a/src/Entity/User.php b/src/Entity/User.php index 30a6eb6..c7fd3f1 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -48,6 +48,23 @@ class User implements UserInterface self::STATUS_PRESIDENT, ]; + const STATUSES_OFFICE = [ + self::STATUS_SECRETARY_DEPUTY, + self::STATUS_SECRETARY, + self::STATUS_TREASURER_DEPUTY, + self::STATUS_TREASURER, + self::STATUS_PRESIDENT_DEPUTY, + self::STATUS_PRESIDENT, + ]; + + const ROLE_USER = 'user'; + const ROLE_ADMIN = 'admin'; + + const ROLES = [ + self::ROLE_USER, + self::ROLE_ADMIN, + ]; + /** * @ORM\Id * @ORM\GeneratedValue @@ -301,7 +318,7 @@ public function getStatus(): ?int public function getStatusAsString(): string { - $statuses=self::STATUSES; + $statuses = self::STATUSES; if (isset($statuses[$this->status])) { return $statuses[$this->status]; } @@ -319,4 +336,9 @@ public function isMember(): ?bool { return in_array($this->status, self::STATUSES_MEMBER); } + + public function isOffice(): ?bool + { + return in_array($this->status, self::STATUSES_OFFICE); + } } diff --git a/src/Form/UserType.php b/src/Form/UserType.php new file mode 100644 index 0000000..c92b90f --- /dev/null +++ b/src/Form/UserType.php @@ -0,0 +1,51 @@ +add('email', EmailType::class) + ->add('roles', ChoiceType::class, + [ + 'choices' => $roles, + ]) + ->add('password') + ->add('passwordRequestToken') + ->add('nickname') + ->add('createdAt') + ->add('updatedAt') + ->add('simBms', CheckboxType::class) + ->add('simDcs', CheckboxType::class) + ->add('status')// ->add('player') + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => User::class, + ]); + } +} diff --git a/symfony.lock b/symfony.lock index 6c22941..66dadb5 100644 --- a/symfony.lock +++ b/symfony.lock @@ -146,6 +146,9 @@ "kilik/table": { "version": "2.5.0" }, + "knplabs/knp-time-bundle": { + "version": "v1.15.0" + }, "laminas/laminas-code": { "version": "4.0.0" }, diff --git a/templates/admin/layout.html.twig b/templates/admin/layout.html.twig index c61077a..c1cdca7 100644 --- a/templates/admin/layout.html.twig +++ b/templates/admin/layout.html.twig @@ -343,7 +343,7 @@
  • - + {{ parent() }} {% endblock tableBodyStdColumns %} \ No newline at end of file diff --git a/templates/admin/user/view.html.twig b/templates/admin/user/view.html.twig new file mode 100644 index 0000000..9cd9751 --- /dev/null +++ b/templates/admin/user/view.html.twig @@ -0,0 +1,104 @@ +{% extends 'admin/layout.html.twig' %} +{% set libKilikTable=true %} +{% set section="admin" %} +{% set subSection="user" %} + +{% block pageContent %} +
    +
    +
    +
    +

    Consulter l'utilisateur

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Email: + + {{ user.email }} +
    + Pseudo: + + {{ user.nickname }} +
    + DCS: + + {% if user.simDcs %} + + {% else %} + + {% endif %} +
    + BMS: + + {% if user.simBms %} + + {% else %} + + {% endif %} +
    + Statut: + + {% if user.office %} +
    {{ user.statusAsString }}
    + {% elseif user.member %} +
    {{ user.statusAsString }}
    + {% else %} + {{ user.statusAsString }} + {% endif %} +
    + Créé le: + +
    + {{ user.createdAt | ago }} +
    +
    + Modifié le: + +
    + {{ user.updatedAt | ago }} +
    +
    +
    +
    + Retour liste +
    +
    + Modifier +
    +
    +
    +
    +
    +
    +
    +{% endblock pageContent %} From 28a85e32ead6ad2ce780f65ab8700ca8f975d1b0 Mon Sep 17 00:00:00 2001 From: Michel NAUD Date: Wed, 10 Feb 2021 22:23:35 +0100 Subject: [PATCH 2/2] add user edit form + fix CSS + refactor migrations --- config/packages/framework.yaml | 1 + fixtures/user.yaml | 8 +-- migrations/Version20210207121750.php | 1 + migrations/Version20210209220324.php | 31 -------- ...08184131.php => Version20210210205251.php} | 10 ++- public/css/custom.css | 26 +++++-- src/Controller/Admin/UserController.php | 16 ++++- src/Controller/RegistrationController.php | 2 +- src/Entity/User.php | 5 ++ src/Form/UserType.php | 25 +++---- templates/admin/layout.html.twig | 2 +- templates/admin/user/edit.html.twig | 34 +++++++++ templates/admin/user/view.html.twig | 16 +++-- templates/base.html.twig | 71 +++++++++---------- templates/layout.html.twig | 58 ++++++++------- templates/security/login.html.twig | 5 +- 16 files changed, 183 insertions(+), 128 deletions(-) delete mode 100644 migrations/Version20210209220324.php rename migrations/{Version20210208184131.php => Version20210210205251.php} (58%) create mode 100644 templates/admin/user/edit.html.twig diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index cad7f78..9e55c5e 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -3,6 +3,7 @@ framework: secret: '%env(APP_SECRET)%' #csrf_protection: true #http_method_override: true + default_locale: fr # Enables session support. Note that the session will ONLY be started if you read or write from it. # Remove or comment this section to explicitly disable session support. diff --git a/fixtures/user.yaml b/fixtures/user.yaml index bb8ab0c..c543697 100644 --- a/fixtures/user.yaml +++ b/fixtures/user.yaml @@ -30,7 +30,7 @@ App\Entity\User: # test1234 password: '\$2y\$10\$rXysKOG/6HEW9acoV3gISuaxQ6yX5K6aN/.ogx3lQtdsD8R6.E3Ry' roles: [ROLE_USER] - nickname: 'zip' + nickname: 'fifi' createdAt: "" updatedAt: "" simBms: false @@ -42,7 +42,7 @@ App\Entity\User: # test1234 password: '\$2y\$10\$rXysKOG/6HEW9acoV3gISuaxQ6yX5K6aN/.ogx3lQtdsD8R6.E3Ry' roles: [ROLE_USER] - nickname: 'user' + nickname: 'lost' createdAt: "" updatedAt: "" simBms: false @@ -174,7 +174,7 @@ App\Entity\User: # test1234 password: '\$2y\$10\$rXysKOG/6HEW9acoV3gISuaxQ6yX5K6aN/.ogx3lQtdsD8R6.E3Ry' roles: [ROLE_USER] - nickname: 'sky' + nickname: 'mge' createdAt: "" updatedAt: "" simBms: true @@ -186,7 +186,7 @@ App\Entity\User: # test1234 password: '\$2y\$10\$rXysKOG/6HEW9acoV3gISuaxQ6yX5K6aN/.ogx3lQtdsD8R6.E3Ry' roles: [ROLE_USER] - nickname: 'firstName' + nickname: '' createdAt: "" updatedAt: "" simBms: true diff --git a/migrations/Version20210207121750.php b/migrations/Version20210207121750.php index 069fa1d..45da562 100644 --- a/migrations/Version20210207121750.php +++ b/migrations/Version20210207121750.php @@ -41,6 +41,7 @@ public function up(Schema $schema) : void $this->addSql('ALTER TABLE pe_OnlinePlayers ADD CONSTRAINT FK_676CFD2FB0467609 FOREIGN KEY (pe_OnlinePlayers_id) REFERENCES pe_DataPlayers (pe_DataPlayers_id)'); $this->addSql('ALTER TABLE pe_OnlinePlayers ADD CONSTRAINT FK_676CFD2FC31A124 FOREIGN KEY (pe_OnlinePlayers_instance) REFERENCES pe_OnlineStatus (pe_OnlineStatus_instance)'); $this->addSql('ALTER TABLE user ADD CONSTRAINT FK_8D93D64999E6F5DF FOREIGN KEY (player_id) REFERENCES pe_DataPlayers (pe_DataPlayers_id)'); + $this->addSql('CREATE TABLE pe_LogEvent (pe_LogEvent_id BIGINT AUTO_INCREMENT NOT NULL, pe_LogEvent_datetime DATETIME DEFAULT CURRENT_TIMESTAMP, pe_LogEvent_missionhash_id BIGINT DEFAULT NULL, pe_LogEvent_type VARCHAR(100) CHARACTER SET utf8 NOT NULL COLLATE `utf8_general_ci`, pe_LogEvent_content TEXT CHARACTER SET utf8 NOT NULL COLLATE `utf8_general_ci`, pe_LogEvent_arg1 VARCHAR(150) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_general_ci`, pe_LogEvent_arg2 VARCHAR(150) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_general_ci`, pe_LogEvent_argPlayers VARCHAR(150) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_general_ci`, INDEX pe_LogEvent_datetime (pe_LogEvent_datetime), INDEX pe_LogEvent_type_2 (pe_LogEvent_type), INDEX pe_LogEvent_missionhash_id (pe_LogEvent_missionhash_id), PRIMARY KEY(pe_LogEvent_id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); } public function down(Schema $schema) : void diff --git a/migrations/Version20210209220324.php b/migrations/Version20210209220324.php deleted file mode 100644 index 7a35022..0000000 --- a/migrations/Version20210209220324.php +++ /dev/null @@ -1,31 +0,0 @@ -addSql('ALTER TABLE user ADD sim_bms TINYINT(1) NOT NULL, ADD sim_dcs TINYINT(1) NOT NULL, ADD status INT DEFAULT NULL'); - } - - public function down(Schema $schema) : void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE user DROP sim_bms, DROP sim_dcs, DROP status'); - } -} diff --git a/migrations/Version20210208184131.php b/migrations/Version20210210205251.php similarity index 58% rename from migrations/Version20210208184131.php rename to migrations/Version20210210205251.php index 7b5096e..e5270ed 100644 --- a/migrations/Version20210208184131.php +++ b/migrations/Version20210210205251.php @@ -10,7 +10,7 @@ /** * Auto-generated Migration: Please modify to your needs! */ -final class Version20210208184131 extends AbstractMigration +final class Version20210210205251 extends AbstractMigration { public function getDescription() : string { @@ -20,12 +20,16 @@ public function getDescription() : string public function up(Schema $schema) : void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE user ADD password_request_token VARCHAR(255) DEFAULT NULL, ADD created_at DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, ADD updated_at DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL'); + $this->addSql('ALTER TABLE user ADD password_request_token VARCHAR(255) DEFAULT NULL, ADD created_at DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, ADD updated_at DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, ADD sim_bms TINYINT(1) NOT NULL, ADD sim_dcs TINYINT(1) NOT NULL, ADD status INT DEFAULT NULL'); + $this->addSql('CREATE UNIQUE INDEX nickname_idx ON user (nickname)'); + $this->addSql('ALTER TABLE user RENAME INDEX uniq_8d93d649e7927c74 TO email_idx'); } public function down(Schema $schema) : void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE user DROP password_request_token, DROP created_at, DROP updated_at'); + $this->addSql('DROP INDEX nickname_idx ON user'); + $this->addSql('ALTER TABLE user DROP password_request_token, DROP created_at, DROP updated_at, DROP sim_bms, DROP sim_dcs, DROP status'); + $this->addSql('ALTER TABLE user RENAME INDEX email_idx TO UNIQ_8D93D649E7927C74'); } } diff --git a/public/css/custom.css b/public/css/custom.css index eea2449..93e698c 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -1,10 +1,13 @@ body { padding-top: 100px; - background-color:white; - background-image:url(https://cdn.veaf.org/website/dev/img/background-01-blur.jpg); - background-attachment:fixed; + background-color: white; + background-image: url(https://cdn.veaf.org/website/dev/img/background-01-blur.jpg); + background-attachment: fixed; background-repeat: no-repeat; - min-height: 100%; +} + +body, html { + height: 100%; } pre { @@ -152,6 +155,10 @@ iframe { margin-bottom: 10px } +#main { + min-height: 100%; +} + #footer { margin: 1em 0 } @@ -167,6 +174,17 @@ iframe { margin-bottom: 0 } +#footer { + padding-top: 10px; + padding-left: 50px; + padding-right: 50px; + /*height:150px;*/ + /*position:absolute;*/ + width: 100%; + bottom: 0; + background-color: rgba(255, 255, 255, .5); +} + .splash { padding: 12em 0 6em; background: #349aed; diff --git a/src/Controller/Admin/UserController.php b/src/Controller/Admin/UserController.php index 0b4d9f2..20810bd 100644 --- a/src/Controller/Admin/UserController.php +++ b/src/Controller/Admin/UserController.php @@ -3,6 +3,8 @@ namespace App\Controller\Admin; use App\Entity\User; +use App\Form\UserType; +use App\Manager\UserManager; use Kilik\TableBundle\Components\Column; use Kilik\TableBundle\Components\Filter; use Kilik\TableBundle\Components\FilterSelect; @@ -143,9 +145,21 @@ public function view(User $user): Response /** * @Route("/{user}/edit", name="admin_user_edit") */ - public function edit(User $user): Response + public function edit(UserManager $userManager, Request $request, User $user): Response { + $form = $this->createForm(UserType::class, $user); + + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $userManager->save($user, true, true); + $this->addFlash('success', 'L\'utilisateur a été enregistré'); + + return $this->redirectToRoute('admin_user_view', ['user' => $user->getId()]); + } + return $this->render('admin/user/edit.html.twig', [ + 'form' => $form->createView(), 'user' => $user, ]); } diff --git a/src/Controller/RegistrationController.php b/src/Controller/RegistrationController.php index 99ada5c..d6382a7 100644 --- a/src/Controller/RegistrationController.php +++ b/src/Controller/RegistrationController.php @@ -43,7 +43,7 @@ public function register( $tokenStorage->setToken($token); $session->set('_security_main', serialize($token)); - return $this->redirectToRoute('home'); + return $this->redirectToRoute('app_login'); } return $this->render( diff --git a/src/Entity/User.php b/src/Entity/User.php index c7fd3f1..b9046ad 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -10,6 +10,11 @@ use Symfony\Component\Validator\Constraints as Assert; /** + * @ORM\Table(uniqueConstraints={ + * @ORM\UniqueConstraint(name="email_idx", columns={"email"}), + * @ORM\UniqueConstraint(name="nickname_idx", columns={"nickname"}) + * }) + * * @ORM\Entity(repositoryClass=UserRepository::class) * @UniqueEntity("email") * @UniqueEntity("nickname") diff --git a/src/Form/UserType.php b/src/Form/UserType.php index c92b90f..0741faa 100644 --- a/src/Form/UserType.php +++ b/src/Form/UserType.php @@ -27,19 +27,20 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('email', EmailType::class) - ->add('roles', ChoiceType::class, - [ - 'choices' => $roles, - ]) - ->add('password') - ->add('passwordRequestToken') +// ->add('roles', ChoiceType::class, +// [ +// 'choices' => $roles, +// ]) ->add('nickname') - ->add('createdAt') - ->add('updatedAt') - ->add('simBms', CheckboxType::class) - ->add('simDcs', CheckboxType::class) - ->add('status')// ->add('player') - ; + ->add('simDcs', CheckboxType::class, [ + 'required' => false + ]) + ->add('simBms', CheckboxType::class, [ + 'required' => false + ]) + ->add('status', ChoiceType::class, [ + 'choices' => array_flip(User::STATUSES) + ]); } public function configureOptions(OptionsResolver $resolver) diff --git a/templates/admin/layout.html.twig b/templates/admin/layout.html.twig index c1cdca7..61f0763 100644 --- a/templates/admin/layout.html.twig +++ b/templates/admin/layout.html.twig @@ -65,7 +65,7 @@
  • - Joueurs DCS + Joueurs
    • diff --git a/templates/admin/user/edit.html.twig b/templates/admin/user/edit.html.twig new file mode 100644 index 0000000..44911fb --- /dev/null +++ b/templates/admin/user/edit.html.twig @@ -0,0 +1,34 @@ +{% extends 'admin/layout.html.twig' %} +{% set libKilikTable=true %} +{% set section="admin" %} +{% set subSection="user" %} + +{% block pageContent %} +
    +
    +
    +
    +

    Modifier l'utilisateur

    +
    + {{ form_start(form) }} + {{ form_rest(form) }} + {{ form_errors(form) }} +
    +
    + + Annuler + +
    +
    + +
    +
    + {{ form_end(form) }} +
    +
    +
    +
    + {% endblock pageContent %} diff --git a/templates/admin/user/view.html.twig b/templates/admin/user/view.html.twig index 9cd9751..f36f96c 100644 --- a/templates/admin/user/view.html.twig +++ b/templates/admin/user/view.html.twig @@ -34,6 +34,10 @@ {% if user.simDcs %} + {% if user.player is not null %} + {# @todo add link to DCS player #} + détails + {% endif %} {% else %} {% endif %} @@ -45,7 +49,7 @@ {% if user.simBms %} - + {% else %} {% endif %} @@ -67,20 +71,22 @@ - Créé le: + Créé: -
    +
    {{ user.createdAt | ago }}
    - Modifié le: + Modifié: -
    +
    {{ user.updatedAt | ago }}
    diff --git a/templates/base.html.twig b/templates/base.html.twig index 88648cc..d6966d0 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -33,45 +33,44 @@ {% block header %} {% endblock header %} - {% block pageContent %} - {% endblock pageContent %} +
    + {% block pageContent %} + {% endblock pageContent %} +
    {% block footer %} - {% endblock footer %} - - {% block javascript %} - -{% endblock %} -{% endblock body %} +{% endblock %} {% endblock body %} diff --git a/templates/layout.html.twig b/templates/layout.html.twig index 28195be..ea648e5 100644 --- a/templates/layout.html.twig +++ b/templates/layout.html.twig @@ -33,10 +33,12 @@ Les nouvelles
  • - Forum + + Forum
  • - Association + Association
    Présentation @@ -49,7 +51,8 @@
  • - Webs TV + Webs TV
    @@ -85,7 +88,8 @@
    • {% else %}
  • - Connexion + + Connexion
    • {% endif %} @@ -101,29 +105,29 @@ {% endblock pageContent %} {% block footer %} -
    - + {#
    #} {% endblock footer %} diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig index 00e939f..674623e 100644 --- a/templates/security/login.html.twig +++ b/templates/security/login.html.twig @@ -16,11 +16,10 @@ {% if app.user %}
    - You are logged in as {{ app.user.username }}, Logout + Vous êtes déjà connecté en tant que {{ app.user.username }}, me déconnecter
    {% endif %} -

    Please sign in

    - +