diff options
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/vcs.xml | 6 | ||||
| -rw-r--r-- | .idea/workspace.xml | 208 |
2 files changed, 151 insertions, 63 deletions
diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> + </component> +</project>
\ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3a04178..d581ca7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="c02a68ca-4895-49ef-94e1-572ab8cf87ba" name="Default" comment="" /> + <list default="true" id="c02a68ca-4895-49ef-94e1-572ab8cf87ba" name="Default" comment=""> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/AppBundle/Controller/DefaultController.php" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Resources/views/default/index.html.twig" afterPath="$PROJECT_DIR$/app/Resources/views/default/index.html.twig" /> + </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -15,40 +19,44 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="composer.json" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/composer.json"> + <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php"> <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" /> + <state relative-caret-position="194"> + <caret line="37" column="60" lean-forward="false" selection-start-line="37" selection-start-column="60" selection-end-line="37" selection-end-column="60" /> <folding> - <marker date="1511347709204" expanded="true" signature="514:1028" ph="{"php": ">=5.5.9"...}" /> - <marker date="1511347709204" expanded="true" signature="1049:1140" ph="{"sensio/generator-bundle": "^3.0"...}" /> - <marker date="1511347709204" expanded="true" signature="1157:1888" ph="{...}" /> - <marker date="1511347709204" expanded="true" signature="1186:1739" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1769:1811" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1904:1941" ph="{"sort-packages": true...}" /> + <element signature="e#122#181#0#PHP" expanded="true" /> + <element signature="e#1088#1113#0#PHP" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="AppKernel.php" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/app/AppKernel.php"> + <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="231"> - <caret line="26" column="82" lean-forward="false" selection-start-line="26" selection-start-column="82" selection-end-line="26" selection-end-column="82" /> - <folding /> + <state relative-caret-position="190"> + <caret line="17" column="16" lean-forward="false" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> + <folding> + <element signature="e#12#26#0#Twig" expanded="true" /> + </folding> </state> </provider> </entry> </file> </leaf> </component> + <component name="Git.Settings"> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> + </component> <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> <option value="$PROJECT_DIR$/composer.json" /> <option value="$PROJECT_DIR$/app/AppKernel.php" /> + <option value="$PROJECT_DIR$/src/AppBundle/View/Home.php" /> + <option value="$PROJECT_DIR$/app/Resources/views/default/index.html.twig" /> + <option value="$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php" /> </list> </option> </component> @@ -103,9 +111,10 @@ <component name="ProjectFrameBounds"> <option name="x" value="293" /> <option name="y" value="47" /> - <option name="width" value="1400" /> - <option name="height" value="883" /> + <option name="width" value="957" /> + <option name="height" value="741" /> </component> + <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="" version="1"> <flattenPackages /> @@ -131,7 +140,28 @@ <path> <item name="pollution-sensor" type="b2602c69:ProjectViewProjectNode" /> <item name="pollution-sensor" type="2a2b976b:PhpTreeStructureProvider$1" /> - <item name="web" 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="app" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="Resources" type="2a2b976b:PhpTreeStructureProvider$1" /> + </path> + <path> + <item name="pollution-sensor" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollution-sensor" 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="pollution-sensor" type="b2602c69:ProjectViewProjectNode" /> + <item name="pollution-sensor" 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" /> + <item name="default" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> </expand> <select /> @@ -158,6 +188,14 @@ </list> </option> </component> + <component name="RunManager" selected="JavaScript Debug.HomeController.php"> + <configuration name="HomeController.php" type="JavascriptDebugType" factoryName="JavaScript Debug" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/pollution-sensor/Controller/HomeController.php" /> + <recent_temporary> + <list size="1"> + <item index="0" class="java.lang.String" itemvalue="JavaScript Debug.HomeController.php" /> + </list> + </recent_temporary> + </component> <component name="ShelveChangesManager" show_recycled="false"> <option name="remove_strategy" value="false" /> </component> @@ -172,25 +210,27 @@ <workItem from="1511346151555" duration="377000" /> <workItem from="1511346717882" duration="176000" /> <workItem from="1511347081605" duration="1264000" /> + <workItem from="1511428524892" duration="5724000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="1991000" /> + <option name="totallyTimeSpent" value="7715000" /> </component> <component name="ToolWindowManager"> - <frame x="293" y="47" width="1400" height="883" extended-state="0" /> + <frame x="293" y="47" width="957" height="741" extended-state="0" /> + <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.25" 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.24973877" 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="true" show_stripe_button="true" weight="0.32903227" sideWeight="0.5114286" order="7" side_tool="true" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32903227" sideWeight="0.48857144" order="7" 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.328594" 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.4" sideWeight="0.5" order="3" 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="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" /> @@ -207,22 +247,33 @@ <option name="myLimit" value="2678400000" /> </component> <component name="XDebuggerManager"> - <breakpoint-manager /> + <breakpoint-manager> + <option name="time" value="1" /> + </breakpoint-manager> <watches-manager /> </component> <component name="editorHistoryManager"> <entry file="file://$PROJECT_DIR$/composer.json"> <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> + <entry file="file://$PROJECT_DIR$/app/AppKernel.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="468"> + <caret line="26" column="82" lean-forward="false" selection-start-line="26" selection-start-column="82" selection-end-line="26" selection-end-column="82" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/composer.json"> + <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> - <marker date="1511347709204" expanded="true" signature="514:1028" ph="{"php": ">=5.5.9"...}" /> - <marker date="1511347709204" expanded="true" signature="1049:1140" ph="{"sensio/generator-bundle": "^3.0"...}" /> - <marker date="1511347709204" expanded="true" signature="1157:1888" ph="{...}" /> - <marker date="1511347709204" expanded="true" signature="1186:1739" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1769:1811" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1904:1941" ph="{"sort-packages": true...}" /> - </folding> + <folding /> </state> </provider> </entry> @@ -230,14 +281,7 @@ <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> - <marker date="1511347709204" expanded="true" signature="514:1028" ph="{"php": ">=5.5.9"...}" /> - <marker date="1511347709204" expanded="true" signature="1049:1140" ph="{"sensio/generator-bundle": "^3.0"...}" /> - <marker date="1511347709204" expanded="true" signature="1157:1888" ph="{...}" /> - <marker date="1511347709204" expanded="true" signature="1186:1739" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1769:1811" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1904:1941" ph="{"sort-packages": true...}" /> - </folding> + <folding /> </state> </provider> </entry> @@ -245,14 +289,7 @@ <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> - <marker date="1511347709204" expanded="true" signature="514:1028" ph="{"php": ">=5.5.9"...}" /> - <marker date="1511347709204" expanded="true" signature="1049:1140" ph="{"sensio/generator-bundle": "^3.0"...}" /> - <marker date="1511347709204" expanded="true" signature="1157:1888" ph="{...}" /> - <marker date="1511347709204" expanded="true" signature="1186:1739" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1769:1811" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1904:1941" ph="{"sort-packages": true...}" /> - </folding> + <folding /> </state> </provider> </entry> @@ -260,14 +297,7 @@ <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> - <marker date="1511347709204" expanded="true" signature="514:1028" ph="{"php": ">=5.5.9"...}" /> - <marker date="1511347709204" expanded="true" signature="1049:1140" ph="{"sensio/generator-bundle": "^3.0"...}" /> - <marker date="1511347709204" expanded="true" signature="1157:1888" ph="{...}" /> - <marker date="1511347709204" expanded="true" signature="1186:1739" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1769:1811" ph="[...]" /> - <marker date="1511347709204" expanded="true" signature="1904:1941" ph="{"sort-packages": true...}" /> - </folding> + <folding /> </state> </provider> </entry> @@ -276,6 +306,21 @@ <state /> </provider> </entry> + <entry file="file://$PROJECT_DIR$/web/app_dev.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" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/AppKernel.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="18"> + <caret line="26" column="82" lean-forward="false" selection-start-line="26" selection-start-column="82" selection-end-line="26" selection-end-column="82" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/web/app.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> @@ -284,7 +329,23 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/web/app_dev.php"> + <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/DefaultController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="82"> + <caret line="11" column="34" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="34" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/AppBundle/View/Home.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="126"> + <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/AppBundle/AppBundle.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" /> @@ -292,13 +353,34 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/AppKernel.php"> + <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="231"> - <caret line="26" column="82" lean-forward="false" selection-start-line="26" selection-start-column="82" selection-end-line="26" selection-end-column="82" /> + <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$/app/Resources/views/default/index.html.twig"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="190"> + <caret line="17" column="16" lean-forward="false" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> + <folding> + <element signature="e#12#26#0#Twig" expanded="true" /> + </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="194"> + <caret line="37" column="60" lean-forward="false" selection-start-line="37" selection-start-column="60" selection-end-line="37" selection-end-column="60" /> + <folding> + <element signature="e#122#181#0#PHP" expanded="true" /> + <element signature="e#1088#1113#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> </project>
\ No newline at end of file |