From 2d025468cb870ce14772deda5eb060fdde827259 Mon Sep 17 00:00:00 2001 From: "R. Eric Wheeler" Date: Tue, 25 Apr 2017 15:45:32 -0700 Subject: [PATCH] VichUploaderBundle --- app/AppKernel.php | 2 + .../ChangePassword/change_password.html.twig | 6 +- .../views/Profile/show_content.html.twig | 13 +- .../views/Resetting/request_content.html.twig | 15 +- .../views/Connect/login.html.twig | 1 + .../views/Connect/registration.html.twig | 63 +- app/Resources/views/base.html.twig | 59 +- app/Resources/views/default/index.html.twig | 12 +- app/Resources/views/index.html.twig | 8 - app/Resources/views/our_story.html.twig | 21 + app/config/config.yml | 24 +- app/config/config_dev.yml | 2 +- app/config/easy_admin.yml | 49 + app/config/routing.yml | 7 +- app/config/security.yml | 19 +- app/config/services.yml | 5 + app/logs/development.log | 88166 ++++++++++++++++ build/js/doughnut.js | 2 +- .../Controller/DefaultController.php | 11 + ...geController.php => GalleryController.php} | 16 +- .../Controller/RouterCollector.php | 43 - .../Controller/RsvpController.php | 42 +- .../DoughnutWeddingBundle/Entity/Image.php | 189 +- .../Entity/ImageCategory.php | 128 - .../DoughnutWeddingBundle/Entity/ImageTag.php | 128 - .../DoughnutWeddingBundle/Entity/Rsvp.php | 4 + .../DoughnutWeddingBundle/Entity/User.php | 668 +- .../UserRedirectOnLoggedInListener.php | 7 +- .../Form/ChangePasswordFormType.php | 24 + .../Form/GalleryUploadType.php | 31 + .../Form/ProfileEditType.php | 17 +- .../Form/RegistrationType.php | 21 +- .../DoughnutWeddingBundle/Form/RsvpType.php | 6 +- .../Resources/views/Image/upload.html.twig | 13 +- 34 files changed, 89001 insertions(+), 821 deletions(-) delete mode 100644 app/Resources/views/index.html.twig create mode 100644 app/Resources/views/our_story.html.twig create mode 100644 app/config/easy_admin.yml create mode 100644 app/logs/development.log rename src/Sikofitt/DoughnutWeddingBundle/Controller/{ImageController.php => GalleryController.php} (77%) delete mode 100644 src/Sikofitt/DoughnutWeddingBundle/Controller/RouterCollector.php delete mode 100644 src/Sikofitt/DoughnutWeddingBundle/Entity/ImageCategory.php delete mode 100644 src/Sikofitt/DoughnutWeddingBundle/Entity/ImageTag.php create mode 100644 src/Sikofitt/DoughnutWeddingBundle/Form/ChangePasswordFormType.php create mode 100644 src/Sikofitt/DoughnutWeddingBundle/Form/GalleryUploadType.php diff --git a/app/AppKernel.php b/app/AppKernel.php index cdf59b6..919be84 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -18,6 +18,7 @@ * along with this program. If not, see . */ +use JavierEguiluz\Bundle\EasyAdminBundle\EasyAdminBundle; use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\HttpKernel\Kernel; @@ -39,6 +40,7 @@ class AppKernel extends Kernel new \FOS\UserBundle\FOSUserBundle(), new Knp\Bundle\GaufretteBundle\KnpGaufretteBundle(), new Vich\UploaderBundle\VichUploaderBundle(), + new EasyAdminBundle(), new Sikofitt\DoughnutWeddingBundle\SikofittDoughnutWeddingBundle(), ]; diff --git a/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig b/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig index cdcd10d..827ef6f 100644 --- a/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig +++ b/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig @@ -1,5 +1,5 @@ -{% extends "@FOSUser/layout.html.twig" %} +{% extends "base.html.twig" %} -{% block fos_user_content %} +{% block body %} {% include "@FOSUser/ChangePassword/change_password_content.html.twig" %} -{% endblock fos_user_content %} +{% endblock body %} diff --git a/app/Resources/FOSUserBundle/views/Profile/show_content.html.twig b/app/Resources/FOSUserBundle/views/Profile/show_content.html.twig index 6648fe1..a00d8d8 100644 --- a/app/Resources/FOSUserBundle/views/Profile/show_content.html.twig +++ b/app/Resources/FOSUserBundle/views/Profile/show_content.html.twig @@ -1,7 +1,7 @@ {% trans_default_domain 'SikofittDoughnutweddingBundle' %}

User Information

-
+

{{ 'profile.name'|trans }}

{{ user.name }}

@@ -11,9 +11,14 @@

{{ 'profile.rsvp'|trans }}

{% if user.rsvp is not null %}{{ user.rsvp.guests }}{% else %}0{% endif %}

-
- Edit Information
-
+ +
+
+ You can change your password here. +
+
+ Edit Information +
    diff --git a/app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig b/app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig index 3d1211b..d7c6494 100644 --- a/app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig +++ b/app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig @@ -1,11 +1,12 @@ {% trans_default_domain 'FOSUserBundle' %} +

    Reset your password

    +
    - -
    - - -
    -
    - + +
    + +
    +
    +
    diff --git a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig index 29a91a3..eeba7d7 100644 --- a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig +++ b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig @@ -1,6 +1,7 @@ {% extends 'HWIOAuthBundle::layout.html.twig' %} {% block hwi_oauth_content %} + {{ dump() }} {% if error is defined and error %} {{ error }} {% endif %} diff --git a/app/Resources/HWIOAuthBundle/views/Connect/registration.html.twig b/app/Resources/HWIOAuthBundle/views/Connect/registration.html.twig index dacb541..c441a26 100644 --- a/app/Resources/HWIOAuthBundle/views/Connect/registration.html.twig +++ b/app/Resources/HWIOAuthBundle/views/Connect/registration.html.twig @@ -1,29 +1,58 @@ {% extends 'base.html.twig' %} {% block body %} -
    - {{ dump(form) }} +
    + {% if userInformation.resourceOwner.name == 'yahoo' %} - {% set name = userInformation.nickname %} + {% set name = userInformation.nickname %} {% else %} - {% set name = userInformation.email %} + {% set name = userInformation.email %} {% endif %}

    {{ 'header.register' | trans({'%name%': name }, 'HWIOAuthBundle') }}

    - {{ form_start(form, {'action': path('hwi_oauth_connect_registration', {'key': key}), 'attr': {'class': 'hwi_oauth_registration_register uk-form uk-form-horizontal'}}) }} - {{ form_widget(form) }} -
    - - {{ 'connect.registration.cancel' | trans({}, 'HWIOAuthBundle') }} -
    - {{ form_end(form) }} - - - {% if userInformation.profilePicture is not empty %} - - {% endif %} - + {{ form_start(form, {'action': path('hwi_oauth_connect_registration', {'key': key}), 'attr': {'class': 'hwi_oauth_registration_register uk-form uk-form-horizontal'}}) }} + {{ form_label(form.name, 'Name', {'label_attr':{'class':'uk-form-label uk-visible@m'}}) }} +
    + {{ form_widget(form.name, {'attr':{'class':'uk-input uk-form-large', 'placeholder':'Your name'}}) }}
    + {{ form_label(form.email, 'Email address', {'label_attr':{'class':'uk-form-label uk-visible@m'}}) }} +
    + {{ form_widget(form.email, {'attr':{'class':'uk-input uk-form-large', 'placeholder':'Email address'}}) }} +
    + {{ form_label(form.plainPassword.first, 'Password', {'label_attr':{'class':'uk-form-label uk-visible@m'}}) }} +
    + {{ form_widget(form.plainPassword.first, {'attr':{'class':'uk-input uk-form-large', 'placeholder':'Create password'}}) }} +
    + {{ form_label(form.plainPassword.second, 'Repeat password', {'label_attr':{'class':'uk-form-label uk-visible@m'}}) }} +
    + {{ form_widget(form.plainPassword.second, {'attr':{'class':'uk-input uk-form-large', 'placeholder':'Repeat password'}}) }} +
    + {{ form_label(form.rsvp, 'Number of guests? (including yourself)', {'label_attr':{'class':'uk-form-label uk-visible@m'}}) }} +
    + {{ form_widget(form.rsvp, {'attr':{'placeholder':'Guest\'s including yourself.'}}) }} +
    + {{ form_label(form.comment) }} +
    + {{ form_widget(form.comment) }} +
    +
    +
    + +
    + +
    + {{ form_end(form) }} + + + {% if userInformation.profilePicture is not empty %} + + {% endif %} + +
    {% endblock body %} diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index c5cd9f2..b87f368 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -20,17 +20,17 @@
    -