diff options
| -rw-r--r-- | .idea/php.xml | 2 | ||||
| -rw-r--r-- | .idea/pollution-sensor.iml | 94 | ||||
| -rw-r--r-- | .idea/workspace.xml | 272 | ||||
| -rw-r--r-- | app/Resources/views/emails/registration.php | 6 | ||||
| -rw-r--r-- | app/config/config.yml | 2 | ||||
| -rw-r--r-- | app/config/parameters.yml.dist | 19 | ||||
| -rw-r--r-- | src/AppBundle/Controller/NewDataController.php | 36 |
7 files changed, 255 insertions, 176 deletions
diff --git a/.idea/php.xml b/.idea/php.xml index 50580b1..10d798a 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -42,5 +42,5 @@ <path value="$PROJECT_DIR$/vendor/jdorn/sql-formatter" /> </include_path> </component> - <component name="PhpProjectSharedConfiguration" php_language_level="5.5.0" /> + <component name="PhpProjectSharedConfiguration" php_language_level="7.1" /> </project>
\ No newline at end of file diff --git a/.idea/pollution-sensor.iml b/.idea/pollution-sensor.iml index bf2d349..2df1551 100644 --- a/.idea/pollution-sensor.iml +++ b/.idea/pollution-sensor.iml @@ -45,99 +45,5 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library"> - <library name="PHARS"> - <CLASSES> - <root url="phar://$MODULE_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar/" /> - </CLASSES> - <SOURCES> - <root url="phar://$MODULE_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="PHP" type="php"> - <CLASSES> - <root url="file://$MODULE_DIR$/vendor/composer" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/annotations" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/cache" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/collections" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/common" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/dbal" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/doctrine-bundle" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/doctrine-cache-bundle" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/inflector" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/instantiator" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/lexer" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/orm" /> - <root url="file://$MODULE_DIR$/vendor/fig/link-util" /> - <root url="file://$MODULE_DIR$/vendor/incenteev/composer-parameter-handler" /> - <root url="file://$MODULE_DIR$/vendor/jdorn/sql-formatter" /> - <root url="file://$MODULE_DIR$/vendor/monolog/monolog" /> - <root url="file://$MODULE_DIR$/vendor/paragonie/random_compat" /> - <root url="file://$MODULE_DIR$/vendor/psr/cache" /> - <root url="file://$MODULE_DIR$/vendor/psr/container" /> - <root url="file://$MODULE_DIR$/vendor/psr/link" /> - <root url="file://$MODULE_DIR$/vendor/psr/log" /> - <root url="file://$MODULE_DIR$/vendor/psr/simple-cache" /> - <root url="file://$MODULE_DIR$/vendor/sensio/distribution-bundle" /> - <root url="file://$MODULE_DIR$/vendor/sensio/framework-extra-bundle" /> - <root url="file://$MODULE_DIR$/vendor/sensio/generator-bundle" /> - <root url="file://$MODULE_DIR$/vendor/sensiolabs/security-checker" /> - <root url="file://$MODULE_DIR$/vendor/swiftmailer/swiftmailer" /> - <root url="file://$MODULE_DIR$/vendor/symfony/monolog-bundle" /> - <root url="file://$MODULE_DIR$/vendor/symfony/phpunit-bridge" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-apcu" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-icu" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-php70" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" /> - <root url="file://$MODULE_DIR$/vendor/symfony/swiftmailer-bundle" /> - <root url="file://$MODULE_DIR$/vendor/symfony/symfony" /> - <root url="file://$MODULE_DIR$/vendor/twig/twig" /> - </CLASSES> - <SOURCES> - <root url="file://$MODULE_DIR$/vendor/composer" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/annotations" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/cache" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/collections" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/common" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/dbal" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/doctrine-bundle" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/doctrine-cache-bundle" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/inflector" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/instantiator" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/lexer" /> - <root url="file://$MODULE_DIR$/vendor/doctrine/orm" /> - <root url="file://$MODULE_DIR$/vendor/fig/link-util" /> - <root url="file://$MODULE_DIR$/vendor/incenteev/composer-parameter-handler" /> - <root url="file://$MODULE_DIR$/vendor/jdorn/sql-formatter" /> - <root url="file://$MODULE_DIR$/vendor/monolog/monolog" /> - <root url="file://$MODULE_DIR$/vendor/paragonie/random_compat" /> - <root url="file://$MODULE_DIR$/vendor/psr/cache" /> - <root url="file://$MODULE_DIR$/vendor/psr/container" /> - <root url="file://$MODULE_DIR$/vendor/psr/link" /> - <root url="file://$MODULE_DIR$/vendor/psr/log" /> - <root url="file://$MODULE_DIR$/vendor/psr/simple-cache" /> - <root url="file://$MODULE_DIR$/vendor/sensio/distribution-bundle" /> - <root url="file://$MODULE_DIR$/vendor/sensio/framework-extra-bundle" /> - <root url="file://$MODULE_DIR$/vendor/sensio/generator-bundle" /> - <root url="file://$MODULE_DIR$/vendor/sensiolabs/security-checker" /> - <root url="file://$MODULE_DIR$/vendor/swiftmailer/swiftmailer" /> - <root url="file://$MODULE_DIR$/vendor/symfony/monolog-bundle" /> - <root url="file://$MODULE_DIR$/vendor/symfony/phpunit-bridge" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-apcu" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-icu" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-php70" /> - <root url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" /> - <root url="file://$MODULE_DIR$/vendor/symfony/swiftmailer-bundle" /> - <root url="file://$MODULE_DIR$/vendor/symfony/symfony" /> - <root url="file://$MODULE_DIR$/vendor/twig/twig" /> - </SOURCES> - </library> - </orderEntry> </component> </module>
\ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2cf848a..99597d9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,13 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="c02a68ca-4895-49ef-94e1-572ab8cf87ba" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Resources/views/default/index.html.twig" afterPath="$PROJECT_DIR$/app/Resources/views/default/index.html.twig" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/Resources/views/emails/registration.php" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/app/config/parameters.yml.dist" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/php.xml" afterPath="$PROJECT_DIR$/.idea/php.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/pollution-sensor.iml" afterPath="$PROJECT_DIR$/.idea/pollution-sensor.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config/config.yml" afterPath="$PROJECT_DIR$/app/config/config.yml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php" afterPath="$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -20,8 +26,8 @@ <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="378"> - <caret line="33" column="8" lean-forward="false" selection-start-line="33" selection-start-column="8" selection-end-line="34" selection-end-column="80" /> + <state relative-caret-position="375"> + <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" /> <folding> <element signature="e#6#87#0#PHP" expanded="true" /> <element signature="e#122#181#0#PHP" expanded="true" /> @@ -33,8 +39,8 @@ <file leaf-file-name="NewDataController.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="446"> - <caret line="37" column="40" lean-forward="false" selection-start-line="37" selection-start-column="40" selection-end-line="37" selection-end-column="40" /> + <state relative-caret-position="795"> + <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" /> <folding> <element signature="e#6#87#0#PHP" expanded="true" /> <element signature="e#122#181#0#PHP" expanded="true" /> @@ -43,20 +49,50 @@ </provider> </entry> </file> + <file leaf-file-name="registration.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/Resources/views/emails/registration.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="45"> + <caret line="3" column="46" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="parameters.yml" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/app/config/parameters.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="255"> + <caret line="17" column="50" lean-forward="false" selection-start-line="17" selection-start-column="50" selection-end-line="17" selection-end-column="50" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="config.yml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/config/config.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-90"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="34" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="index.html.twig" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="198"> + <state relative-caret-position="165"> <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="realtime.js" pinned="false" current-in-tab="true"> + <file leaf-file-name="realtime.js" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/web/js/realtime.js"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="468"> + <state relative-caret-position="390"> <caret line="26" column="25" lean-forward="false" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> <folding /> </state> @@ -66,7 +102,7 @@ <file leaf-file-name="app.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/web/app.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="216"> + <state relative-caret-position="180"> <caret line="12" column="1" lean-forward="false" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" /> <folding /> </state> @@ -103,8 +139,10 @@ <option value="$PROJECT_DIR$/bin/console" /> <option value="$PROJECT_DIR$/src/AppBundle/Controller/NewData.php" /> <option value="$PROJECT_DIR$/app/Resources/views/default/index.html.twig" /> - <option value="$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php" /> <option value="$PROJECT_DIR$/web/js/realtime.js" /> + <option value="$PROJECT_DIR$/app/config/parameters.yml.dist" /> + <option value="$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php" /> + <option value="$PROJECT_DIR$/app/Resources/views/emails/registration.php" /> </list> </option> </component> @@ -114,7 +152,7 @@ <detection-done>true</detection-done> <sorting>DEFINITION_ORDER</sorting> </component> - <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true"> + <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP 7"> <include_path> <path value="$PROJECT_DIR$/vendor/doctrine/orm" /> <path value="$PROJECT_DIR$/vendor/doctrine/dbal" /> @@ -178,38 +216,52 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <expand> <path> - <item name="pollution-sensor" type="b2602c69:ProjectViewProjectNode" /> - <item name="pollution-sensor" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="pollutometer" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollutometer" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> <path> - <item name="pollution-sensor" type="b2602c69:ProjectViewProjectNode" /> - <item name="pollution-sensor" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="pollutometer" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollutometer" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> <path> - <item name="pollution-sensor" type="b2602c69:ProjectViewProjectNode" /> - <item name="pollution-sensor" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="pollutometer" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollutometer" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> <path> - <item name="pollution-sensor" type="b2602c69:ProjectViewProjectNode" /> - <item name="pollution-sensor" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="pollutometer" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollutometer" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="Resources" type="2a2b976b:PhpTreeStructureProvider$1" /> + </path> + <path> + <item name="pollutometer" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollutometer" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="Resources" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="views" type="2a2b976b:PhpTreeStructureProvider$1" /> + </path> + <path> + <item name="pollutometer" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollutometer" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> <path> - <item name="pollution-sensor" type="b2602c69:ProjectViewProjectNode" /> - <item name="pollution-sensor" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="pollutometer" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollutometer" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="AppBundle" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> <path> - <item name="pollution-sensor" type="b2602c69:ProjectViewProjectNode" /> - <item name="pollution-sensor" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="pollutometer" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollutometer" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="AppBundle" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="Controller" type="2a2b976b:PhpTreeStructureProvider$1" /> @@ -219,13 +271,12 @@ </subPane> </pane> <pane id="Scratches" /> - <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" /> - <property name="settings.editor.selected.configurable" value="Symfony2.SettingsForm" /> + <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" /> </component> <component name="RunDashboard"> <option name="ruleStates"> @@ -263,27 +314,29 @@ <workItem from="1511347081605" duration="1264000" /> <workItem from="1511428524892" duration="6187000" /> <workItem from="1511512197156" duration="4678000" /> + <workItem from="1511785199965" duration="2001000" /> + <workItem from="1512036482812" duration="1293000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="12856000" /> + <option name="totallyTimeSpent" value="16150000" /> </component> <component name="ToolWindowManager"> - <frame x="67" y="25" width="1853" height="925" extended-state="6" /> + <frame x="293" y="47" width="1366" height="741" extended-state="6" /> <editor active="true" /> <layout> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12898003" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12884334" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39968404" sideWeight="0.5036573" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32917318" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25458997" sideWeight="0.4848485" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39968404" sideWeight="0.49634275" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25429016" sideWeight="0.4848485" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39968404" sideWeight="0.49634275" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> @@ -308,6 +361,98 @@ <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <element signature="e#6#87#0#PHP" expanded="true" /> + <element signature="e#122#181#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="585"> + <caret line="46" column="0" lean-forward="true" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" /> + <folding> + <element signature="e#6#87#0#PHP" expanded="true" /> + <element signature="e#122#181#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/web/js/realtime.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="390"> + <caret line="26" column="25" lean-forward="false" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/web/app.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="180"> + <caret line="12" column="1" lean-forward="false" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="390"> + <caret line="33" column="8" lean-forward="false" selection-start-line="33" selection-start-column="8" selection-end-line="34" selection-end-column="80" /> + <folding> + <element signature="e#6#87#0#PHP" expanded="true" /> + <element signature="e#122#181#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="450"> + <caret line="37" column="40" lean-forward="false" selection-start-line="37" selection-start-column="40" selection-end-line="37" selection-end-column="40" /> + <folding> + <element signature="e#6#87#0#PHP" expanded="true" /> + <element signature="e#122#181#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/web/app.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="180"> + <caret line="12" column="1" lean-forward="false" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/web/js/realtime.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="390"> + <caret line="26" column="25" lean-forward="false" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> <caret line="0" column="5" lean-forward="true" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" /> <folding> <element signature="e#6#87#0#PHP" expanded="true" /> @@ -328,7 +473,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="18"> <caret line="1" column="13" lean-forward="false" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -344,7 +488,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -352,7 +495,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -360,7 +502,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -368,7 +509,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="18"> <caret line="1" column="13" lean-forward="false" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -398,7 +538,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="270"> <caret line="15" column="95" lean-forward="true" selection-start-line="15" selection-start-column="95" selection-end-line="15" selection-end-column="95" /> - <folding /> </state> </provider> </entry> @@ -406,7 +545,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="288"> <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -414,29 +552,20 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="144"> <caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/.web-server-pid"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/.web-server-pid" /> <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="180"> <caret line="10" column="25" lean-forward="false" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" /> - <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/web/app.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="216"> + <state relative-caret-position="180"> <caret line="12" column="1" lean-forward="false" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" /> <folding /> </state> @@ -454,14 +583,29 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-184"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/web/js/realtime.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="390"> + <caret line="26" column="25" lean-forward="false" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="378"> - <caret line="33" column="8" lean-forward="false" selection-start-line="33" selection-start-column="8" selection-end-line="34" selection-end-column="80" /> + <state relative-caret-position="375"> + <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" /> <folding> <element signature="e#6#87#0#PHP" expanded="true" /> <element signature="e#122#181#0#PHP" expanded="true" /> @@ -471,8 +615,8 @@ </entry> <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="446"> - <caret line="37" column="40" lean-forward="false" selection-start-line="37" selection-start-column="40" selection-end-line="37" selection-end-column="40" /> + <state relative-caret-position="795"> + <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" /> <folding> <element signature="e#6#87#0#PHP" expanded="true" /> <element signature="e#122#181#0#PHP" expanded="true" /> @@ -480,18 +624,26 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig"> + <entry file="file://$PROJECT_DIR$/app/Resources/views/emails/registration.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="198"> - <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" /> + <state relative-caret-position="45"> + <caret line="3" column="46" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/web/js/realtime.js"> + <entry file="file://$PROJECT_DIR$/app/config/config.yml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="468"> - <caret line="26" column="25" lean-forward="false" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> + <state relative-caret-position="-90"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="34" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/config/parameters.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="255"> + <caret line="17" column="50" lean-forward="false" selection-start-line="17" selection-start-column="50" selection-end-line="17" selection-end-column="50" /> <folding /> </state> </provider> diff --git a/app/Resources/views/emails/registration.php b/app/Resources/views/emails/registration.php new file mode 100644 index 0000000..c2ac995 --- /dev/null +++ b/app/Resources/views/emails/registration.php @@ -0,0 +1,6 @@ +{# app/Resources/views/Emails/registration.html.twig #} +<h3>You did it! You registered!</h3> + +Hi {{ name }}! You're successfully registered. + +Thanks!
\ No newline at end of file diff --git a/app/config/config.yml b/app/config/config.yml index 1a5c147..4819c20 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -51,7 +51,7 @@ doctrine: # if using pdo_sqlite as your database driver: # 1. add the path in parameters.yml # e.g. database_path: '%kernel.project_dir%/var/data/data.sqlite' - # 2. Uncomment database_path in parameters.yml.dist + # 2. Uncomment database_path in parameters.yml # 3. Uncomment next line: #path: '%database_path%' diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist deleted file mode 100644 index 2c20ddc..0000000 --- a/app/config/parameters.yml.dist +++ /dev/null @@ -1,19 +0,0 @@ -# This file is a "template" of what your parameters.yml file should look like -# Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production. -# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration -parameters: - database_host: 127.0.0.1 - database_port: ~ - database_name: symfony - database_user: root - database_password: ~ - # You should uncomment this if you want to use pdo_sqlite - #database_path: '%kernel.project_dir%/var/data/data.sqlite' - - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: ~ - mailer_password: ~ - - # A secret key that's used to generate certain security-related tokens - secret: ThisTokenIsNotSoSecretChangeIt diff --git a/src/AppBundle/Controller/NewDataController.php b/src/AppBundle/Controller/NewDataController.php index 2e083d9..b6ed181 100644 --- a/src/AppBundle/Controller/NewDataController.php +++ b/src/AppBundle/Controller/NewDataController.php @@ -12,7 +12,6 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Component\HttpFoundation\Response; use Symfony\Bundle\FrameworkBundle\Controller\Controller; - class NewDataController extends Controller { /** @@ -38,8 +37,43 @@ class NewDataController extends Controller $response = new Response($data); $response->headers->set('Content-Type', 'application/json'); + $this->sendEmail("Marcin"); + return $response; } + public function sendEmail($name) + { + $message = (new \Swift_Message('Hello Email')) + ->setFrom('***REMOVED***') + ->setTo('***REMOVED***@edu.easj.dk') + ->setBody( + $this->renderView( + // app/Resources/views/Emails/registration.html.twig + 'Emails/registration.html.twig', + array('name' => $name) + ), + 'text/html' + ) + /* + * If you also want to include a plaintext version of the message + ->addPart( + $this->renderView( + 'Emails/registration.txt.twig', + array('name' => $name) + ), + 'text/plain' + ) + */ + ; + + //$mailer->send($message); + + // or, you can also fetch the mailer service this way + $this->get('mailer')->send($message); + + return $this->render(...); + } + } |