From 51946809239a4c5241ed6cf3929beb798b650087 Mon Sep 17 00:00:00 2001 From: Justina Zidziunaite Date: Tue, 26 Nov 2019 00:06:30 +0200 Subject: [PATCH 1/6] Homework 3 tasks --- config/packages/easy_admin.yaml | 2 ++ src/Entity/User.php | 15 ++++++++++ src/Form/RegistrationFormType.php | 1 + src/Migrations/Version20191125215327.php | 35 +++++++++++++++++++++++ templates/base.html.twig | 3 +- templates/registration/register.html.twig | 1 + templates/security/profile.html.twig | 5 +++- 7 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 src/Migrations/Version20191125215327.php diff --git a/config/packages/easy_admin.yaml b/config/packages/easy_admin.yaml index a34b62ecb..92c039863 100644 --- a/config/packages/easy_admin.yaml +++ b/config/packages/easy_admin.yaml @@ -10,6 +10,7 @@ easy_admin: - 'username' - { property: 'roles', template: 'admin/user/roles-type-read.html.twig' } - { property: 'homepage', type: 'url' } + - { property: 'linkedin', type: 'url' } - { property: 'password', template: 'admin/user/password-read.html.twig' } form: fields: @@ -17,6 +18,7 @@ easy_admin: - { property: 'roles', type: 'collection' } - { property: 'plainPassword', type: 'password' } - { property: 'homepage', type: 'url' } + - { property: 'linkedin', type: 'url' } user: name_property_path: "email" \ No newline at end of file diff --git a/src/Entity/User.php b/src/Entity/User.php index cac6aafc7..f047d683f 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -50,6 +50,8 @@ class User implements UserInterface */ private $homepage = ""; + private $linkedin; + public function getId(): ?int { return $this->id; @@ -187,4 +189,17 @@ public function setHomepage(?string $homepage): self return $this; } + + public function setLinkedin(?string $linkedin): self + { + $this->linkedin = $linkedin; + + return $this; + } + + public function getLinkedin(): ?string + { + return $this->linkedin; + } + } diff --git a/src/Form/RegistrationFormType.php b/src/Form/RegistrationFormType.php index 31024cd40..abd32eb31 100644 --- a/src/Form/RegistrationFormType.php +++ b/src/Form/RegistrationFormType.php @@ -36,6 +36,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ], ]) ->add('homepage', UrlType::class, ['required' => false]) + ->add('linkedin', UrlType::class, ['required' => false]) ->add('agreeTerms', CheckboxType::class, [ 'mapped' => false, 'constraints' => [ diff --git a/src/Migrations/Version20191125215327.php b/src/Migrations/Version20191125215327.php new file mode 100644 index 000000000..54da1e085 --- /dev/null +++ b/src/Migrations/Version20191125215327.php @@ -0,0 +1,35 @@ +abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + + $this->addSql('ALTER TABLE user ADD linkedin VARCHAR(255) DEFAULT NULL, CHANGE roles roles JSON NOT NULL, CHANGE homepage homepage VARCHAR(255) DEFAULT NULL, CHANGE password_changed password_changed DATETIME DEFAULT NULL'); + } + + public function down(Schema $schema) : void + { + // this down() migration is auto-generated, please modify it to your needs + $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.'); + + $this->addSql('ALTER TABLE user DROP linkedin, CHANGE roles roles LONGTEXT NOT NULL COLLATE utf8mb4_bin, CHANGE password_changed password_changed DATETIME DEFAULT \'NULL\', CHANGE homepage homepage VARCHAR(255) DEFAULT \'NULL\' COLLATE utf8mb4_unicode_ci'); + } +} diff --git a/templates/base.html.twig b/templates/base.html.twig index eb61ed532..2e2b0c99c 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -32,10 +32,11 @@
  • Atsijungti
    • + {% if is_granted('ROLE_ADMIN') %}
  • Administravimas
    • - + {% endif %} {% else %}
  • diff --git a/templates/registration/register.html.twig b/templates/registration/register.html.twig index 7206a712a..76d7c8015 100644 --- a/templates/registration/register.html.twig +++ b/templates/registration/register.html.twig @@ -9,6 +9,7 @@ {{ form_row(registrationForm.email) }} {{ form_row(registrationForm.plainPassword) }} {{ form_row(registrationForm.homepage) }} + {{ form_row(registrationForm.linkedin) }} {{ form_row(registrationForm.agreeTerms) }} diff --git a/templates/security/profile.html.twig b/templates/security/profile.html.twig index 4d6fd3f0b..b69920d2b 100644 --- a/templates/security/profile.html.twig +++ b/templates/security/profile.html.twig @@ -10,7 +10,10 @@ {{ role|lower }} {% endfor %}
    - Website {{ user.homepage }} + Website {{ user.homepage }} +
    +
    + Linkedin {{ user.linkedin }}
    {% endblock %} From ae8f6fdab4f34959c4523e3f38498f8a54583d09 Mon Sep 17 00:00:00 2001 From: Justina Zidziunaite Date: Tue, 26 Nov 2019 19:22:51 +0200 Subject: [PATCH 2/6] linkedin changed to camel case --- config/packages/easy_admin.yaml | 4 ++-- src/Entity/User.php | 8 ++++---- src/Form/RegistrationFormType.php | 2 +- templates/registration/register.html.twig | 2 +- templates/security/profile.html.twig | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/packages/easy_admin.yaml b/config/packages/easy_admin.yaml index 92c039863..b4cc3170f 100644 --- a/config/packages/easy_admin.yaml +++ b/config/packages/easy_admin.yaml @@ -10,7 +10,7 @@ easy_admin: - 'username' - { property: 'roles', template: 'admin/user/roles-type-read.html.twig' } - { property: 'homepage', type: 'url' } - - { property: 'linkedin', type: 'url' } + - { property: 'linkedIn', type: 'url' } - { property: 'password', template: 'admin/user/password-read.html.twig' } form: fields: @@ -18,7 +18,7 @@ easy_admin: - { property: 'roles', type: 'collection' } - { property: 'plainPassword', type: 'password' } - { property: 'homepage', type: 'url' } - - { property: 'linkedin', type: 'url' } + - { property: 'linkedIn', type: 'url' } user: name_property_path: "email" \ No newline at end of file diff --git a/src/Entity/User.php b/src/Entity/User.php index f047d683f..44a2620ca 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -50,7 +50,7 @@ class User implements UserInterface */ private $homepage = ""; - private $linkedin; + private $linkedIn; public function getId(): ?int { @@ -190,16 +190,16 @@ public function setHomepage(?string $homepage): self return $this; } - public function setLinkedin(?string $linkedin): self + public function setLinkedin(?string $linkedIn): self { - $this->linkedin = $linkedin; + $this->linkedIn = $linkedIn; return $this; } public function getLinkedin(): ?string { - return $this->linkedin; + return $this->linkedIn; } } diff --git a/src/Form/RegistrationFormType.php b/src/Form/RegistrationFormType.php index abd32eb31..fd0da7fe1 100644 --- a/src/Form/RegistrationFormType.php +++ b/src/Form/RegistrationFormType.php @@ -36,7 +36,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ], ]) ->add('homepage', UrlType::class, ['required' => false]) - ->add('linkedin', UrlType::class, ['required' => false]) + ->add('linkedIn', UrlType::class, ['required' => false]) ->add('agreeTerms', CheckboxType::class, [ 'mapped' => false, 'constraints' => [ diff --git a/templates/registration/register.html.twig b/templates/registration/register.html.twig index 76d7c8015..e9b93d127 100644 --- a/templates/registration/register.html.twig +++ b/templates/registration/register.html.twig @@ -9,7 +9,7 @@ {{ form_row(registrationForm.email) }} {{ form_row(registrationForm.plainPassword) }} {{ form_row(registrationForm.homepage) }} - {{ form_row(registrationForm.linkedin) }} + {{ form_row(registrationForm.linkedIn) }} {{ form_row(registrationForm.agreeTerms) }} diff --git a/templates/security/profile.html.twig b/templates/security/profile.html.twig index b69920d2b..998e7cf42 100644 --- a/templates/security/profile.html.twig +++ b/templates/security/profile.html.twig @@ -13,7 +13,7 @@ Website {{ user.homepage }}
    - Linkedin {{ user.linkedin }} + LinkedIn {{ user.linkedIn }}
    {% endblock %} From e6ffd37f1d504ef2fe37d01f730a40855019e7e2 Mon Sep 17 00:00:00 2001 From: Justina Zidziunaite Date: Tue, 26 Nov 2019 19:24:56 +0200 Subject: [PATCH 3/6] code style fix --- src/Entity/User.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Entity/User.php b/src/Entity/User.php index 44a2620ca..1ad3b07ce 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -201,5 +201,4 @@ public function getLinkedin(): ?string { return $this->linkedIn; } - } From 623a91b60afbda8d690bc6893e2e240e61fdc175 Mon Sep 17 00:00:00 2001 From: Justina Zidziunaite Date: Tue, 26 Nov 2019 23:17:01 +0200 Subject: [PATCH 4/6] fixed issue --- src/Entity/User.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Entity/User.php b/src/Entity/User.php index 1ad3b07ce..4d5b3ae05 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -50,7 +50,11 @@ class User implements UserInterface */ private $homepage = ""; - private $linkedIn; + /** + * @var null|string Link to Personal LinkedIn + * @ORM\Column(type="string", length=255, nullable=true) + */ + private $linkedin; public function getId(): ?int { @@ -192,13 +196,13 @@ public function setHomepage(?string $homepage): self public function setLinkedin(?string $linkedIn): self { - $this->linkedIn = $linkedIn; + $this->linkedin = $linkedIn; return $this; } public function getLinkedin(): ?string { - return $this->linkedIn; + return $this->linkedin; } } From 070e8d9d0171924a7e0aad81a785c2963ce95f36 Mon Sep 17 00:00:00 2001 From: Justina Zidziunaite Date: Tue, 26 Nov 2019 23:28:22 +0200 Subject: [PATCH 5/6] another issue fix --- src/Form/RegistrationFormType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Form/RegistrationFormType.php b/src/Form/RegistrationFormType.php index fd0da7fe1..abd32eb31 100644 --- a/src/Form/RegistrationFormType.php +++ b/src/Form/RegistrationFormType.php @@ -36,7 +36,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ], ]) ->add('homepage', UrlType::class, ['required' => false]) - ->add('linkedIn', UrlType::class, ['required' => false]) + ->add('linkedin', UrlType::class, ['required' => false]) ->add('agreeTerms', CheckboxType::class, [ 'mapped' => false, 'constraints' => [ From 8aabf813c54ef766d3cbafb4f25a3698bb39232a Mon Sep 17 00:00:00 2001 From: Justina Zidziunaite Date: Tue, 26 Nov 2019 23:35:21 +0200 Subject: [PATCH 6/6] another issue fix --- src/Entity/User.php | 4 ++-- templates/registration/register.html.twig | 2 +- templates/security/profile.html.twig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Entity/User.php b/src/Entity/User.php index 4d5b3ae05..4764b73f7 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -194,9 +194,9 @@ public function setHomepage(?string $homepage): self return $this; } - public function setLinkedin(?string $linkedIn): self + public function setLinkedin(?string $linkedin): self { - $this->linkedin = $linkedIn; + $this->linkedin = $linkedin; return $this; } diff --git a/templates/registration/register.html.twig b/templates/registration/register.html.twig index e9b93d127..76d7c8015 100644 --- a/templates/registration/register.html.twig +++ b/templates/registration/register.html.twig @@ -9,7 +9,7 @@ {{ form_row(registrationForm.email) }} {{ form_row(registrationForm.plainPassword) }} {{ form_row(registrationForm.homepage) }} - {{ form_row(registrationForm.linkedIn) }} + {{ form_row(registrationForm.linkedin) }} {{ form_row(registrationForm.agreeTerms) }} diff --git a/templates/security/profile.html.twig b/templates/security/profile.html.twig index 998e7cf42..b9d32095b 100644 --- a/templates/security/profile.html.twig +++ b/templates/security/profile.html.twig @@ -13,7 +13,7 @@ Website {{ user.homepage }}
    - LinkedIn {{ user.linkedIn }} + LinkedIn {{ user.linkedin }}
    {% endblock %}