Skip to content

F
fazo
Commit 30604346 authored by Ruslan's avatar Ruslan
Browse files
Options

Changes style

parent 4e1568f5
Show whitespace changes
Inline Side-by-side
Showing with 328 additions and 315 deletions
.idea/workspace.xml
View file @ 30604346
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment=""> <list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/addpackage.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/addpackage.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/addpackage.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/addpackage.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/profile.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/profile.blade.php" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -20,11 +21,12 @@ ...@@ -20,11 +21,12 @@
<session id="1125383165"> <session id="1125383165">
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
<counts> <counts>
<entry key="project.closed" value="4" /> <entry key="project.closed" value="5" />
<entry key="project.open.time.0" value="3" /> <entry key="project.open.time.0" value="3" />
<entry key="project.open.time.1" value="1" /> <entry key="project.open.time.1" value="1" />
<entry key="project.open.time.13" value="1" />
<entry key="project.open.time.2" value="1" /> <entry key="project.open.time.2" value="1" />
<entry key="project.opened" value="5" /> <entry key="project.opened" value="6" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
...@@ -32,7 +34,7 @@ ...@@ -32,7 +34,7 @@
<entry key="css" value="5" /> <entry key="css" value="5" />
<entry key="env" value="1" /> <entry key="env" value="1" />
<entry key="ico" value="1" /> <entry key="ico" value="1" />
<entry key="php" value="111" /> <entry key="php" value="113" />
<entry key="png" value="4" /> <entry key="png" value="4" />
<entry key="svg" value="1" /> <entry key="svg" value="1" />
<entry key="woff2" value="1" /> <entry key="woff2" value="1" />
...@@ -40,7 +42,7 @@ ...@@ -40,7 +42,7 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="Blade" value="55" /> <entry key="Blade" value="57" />
<entry key="CSS" value="5" /> <entry key="CSS" value="5" />
<entry key="Image" value="5" /> <entry key="Image" value="5" />
<entry key="PHP" value="56" /> <entry key="PHP" value="56" />
...@@ -52,12 +54,12 @@ ...@@ -52,12 +54,12 @@
<counts> <counts>
<entry key="css" value="14" /> <entry key="css" value="14" />
<entry key="env" value="15" /> <entry key="env" value="15" />
<entry key="php" value="15867" /> <entry key="php" value="16670" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="Blade" value="9213" /> <entry key="Blade" value="10016" />
<entry key="CSS" value="14" /> <entry key="CSS" value="14" />
<entry key="PHP" value="6654" /> <entry key="PHP" value="6654" />
<entry key="PLAIN_TEXT" value="15" /> <entry key="PLAIN_TEXT" value="15" />
...@@ -66,13 +68,11 @@ ...@@ -66,13 +68,11 @@
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.6295302">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-149"> <state relative-caret-position="2227">
<caret line="141" column="38" selection-start-line="141" selection-start-column="38" selection-end-line="141" selection-end-column="38" /> <caret line="141" column="38" selection-start-line="141" selection-start-column="38" selection-end-line="141" selection-end-column="38" />
</state> </state>
</provider> </provider>
...@@ -81,26 +81,17 @@ ...@@ -81,26 +81,17 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-142"> <state relative-caret-position="3893">
<caret line="241" column="47" selection-start-line="241" selection-start-column="47" selection-end-line="241" selection-end-column="47" /> <caret line="241" column="47" selection-start-line="241" selection-start-column="47" selection-end-line="241" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="120" column="20" selection-start-line="120" selection-start-column="20" selection-end-line="120" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3009"> <state relative-caret-position="162">
<caret line="177" column="18" selection-start-line="177" selection-start-column="18" selection-end-line="177" selection-end-column="18" /> <caret line="9" column="51" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -108,7 +99,7 @@ ...@@ -108,7 +99,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/frontend/css/style.css"> <entry file="file://$PROJECT_DIR$/public/frontend/css/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23999"> <state relative-caret-position="1615">
<caret column="95065" selection-start-column="95065" selection-end-column="95065" /> <caret column="95065" selection-start-column="95065" selection-end-column="95065" />
<folding> <folding>
<element signature="e#282724#356207#2" expanded="true" /> <element signature="e#282724#356207#2" expanded="true" />
...@@ -120,28 +111,37 @@ ...@@ -120,28 +111,37 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/register_package.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1877"> <state relative-caret-position="1598">
<caret line="225" column="11" selection-start-line="134" selection-end-line="225" selection-end-column="11" /> <caret line="94" selection-start-line="88" selection-end-line="94" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/packages/register_package.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="2295">
<caret line="21" column="80" selection-start-line="21" selection-start-column="80" selection-end-line="21" selection-end-column="80" /> <caret line="135" column="12" selection-start-line="135" selection-start-column="12" selection-end-line="135" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="7" column="47" selection-start-line="7" selection-start-column="47" selection-end-line="7" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493"> <state relative-caret-position="2278">
<caret line="38" column="26" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="26" /> <caret line="134" selection-start-line="134" selection-end-line="134" selection-end-column="23" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -149,35 +149,25 @@ ...@@ -149,35 +149,25 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453"> <state relative-caret-position="545">
<caret line="94" column="10" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" /> <caret line="51" column="9" selection-start-line="51" selection-start-column="9" selection-end-line="51" selection-end-column="23" />
<folding>
<element signature="e#4545#4551#0#HTML" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
</leaf> <file pinned="false" current-in-tab="false">
</split-first> <entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<split-second>
<leaf>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167"> <state relative-caret-position="108">
<caret line="39" column="59" selection-start-line="39" selection-start-column="59" selection-end-line="39" selection-end-column="59" /> <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
</leaf> </leaf>
</split-second>
</splitter>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>adminstyles</find>
<find>images</find> <find>images</find>
<find>Dashboard</find> <find>Dashboard</find>
<find>David</find> <find>David</find>
...@@ -206,6 +196,7 @@ ...@@ -206,6 +196,7 @@
<find>pending_packages</find> <find>pending_packages</find>
<find>register</find> <find>register</find>
<find>exists</find> <find>exists</find>
<find>sign</find>
<find>Декларация</find> <find>Декларация</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
...@@ -251,15 +242,16 @@ ...@@ -251,15 +242,16 @@
<option value="$PROJECT_DIR$/resources/views/about.blade.php" /> <option value="$PROJECT_DIR$/resources/views/about.blade.php" />
<option value="$PROJECT_DIR$/resources/views/contacts.blade.php" /> <option value="$PROJECT_DIR$/resources/views/contacts.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" /> <option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
<option value="$PROJECT_DIR$/public/css/style.css" /> <option value="$PROJECT_DIR$/public/css/style.css" />
<option value="$PROJECT_DIR$/public/frontend/css/style.css" /> <option value="$PROJECT_DIR$/public/frontend/css/style.css" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/resources/views/profile.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" />
<option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" /> <option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -371,11 +363,10 @@ ...@@ -371,11 +363,10 @@
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-debugbar" /> <path value="$PROJECT_DIR$/vendor/barryvdh/laravel-debugbar" />
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds">
<option name="x" value="-9" /> <option name="x" value="2607" />
<option name="y" value="-9" /> <option name="width" value="1240" />
<option name="width" value="1938" /> <option name="height" value="1047" />
<option name="height" value="1048" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -541,18 +532,19 @@ ...@@ -541,18 +532,19 @@
<workItem from="1559392286763" duration="1822000" /> <workItem from="1559392286763" duration="1822000" />
<workItem from="1559405496483" duration="10478000" /> <workItem from="1559405496483" duration="10478000" />
<workItem from="1560035206797" duration="23000" /> <workItem from="1560035206797" duration="23000" />
<workItem from="1560092291448" duration="36137000" /> <workItem from="1560092291448" duration="41602000" />
<workItem from="1560524548209" duration="563000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="110334000" /> <option name="totallyTimeSpent" value="116362000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> <frame x="2607" y="0" width="1240" height="1047" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22550336" /> <window_info content_ui="combo" id="Project" order="0" weight="0.28196445" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -565,7 +557,7 @@ ...@@ -565,7 +557,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" /> <window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.21702127" /> <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.21905805" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.2776204" /> <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.2776204" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
...@@ -675,9 +667,6 @@ ...@@ -675,9 +667,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51"> <state relative-caret-position="51">
<caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="39" /> <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="39" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -699,9 +688,6 @@ ...@@ -699,9 +688,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51"> <state relative-caret-position="51">
<caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" /> <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -709,9 +695,6 @@ ...@@ -709,9 +695,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="221">
<caret line="18" column="7" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" /> <caret line="18" column="7" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -733,9 +716,6 @@ ...@@ -733,9 +716,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306"> <state relative-caret-position="306">
<caret line="23" column="4" selection-start-line="23" selection-start-column="4" selection-end-line="26" selection-end-column="5" /> <caret line="23" column="4" selection-start-line="23" selection-start-column="4" selection-end-line="26" selection-end-column="5" />
<folding>
<element signature="e#115#154#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -792,10 +772,6 @@ ...@@ -792,10 +772,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486"> <state relative-caret-position="486">
<caret line="33" column="53" selection-start-line="33" selection-start-column="53" selection-end-line="33" selection-end-column="53" /> <caret line="33" column="53" selection-start-line="33" selection-start-column="53" selection-end-line="33" selection-end-column="53" />
<folding>
<element signature="e#6#91#0#PHP" expanded="true" />
<element signature="e#126#150#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -827,13 +803,6 @@ ...@@ -827,13 +803,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Package.php"> <entry file="file://$PROJECT_DIR$/app/Models/Package.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="378">
...@@ -848,13 +817,6 @@ ...@@ -848,13 +817,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="568">
<caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="591"> <state relative-caret-position="591">
...@@ -900,20 +862,6 @@ ...@@ -900,20 +862,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/register_package.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1877">
<caret line="225" column="11" selection-start-line="134" selection-end-line="225" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-149">
<caret line="141" column="38" selection-start-line="141" selection-start-column="38" selection-end-line="141" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/Core/Core_c.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/Core/Core_c.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175"> <state relative-caret-position="175">
...@@ -935,23 +883,30 @@ ...@@ -935,23 +883,30 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php"> <entry file="file://$PROJECT_DIR$/public/css/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-142"> <state relative-caret-position="222">
<caret line="241" column="47" selection-start-line="241" selection-start-column="47" selection-end-line="241" selection-end-column="47" /> <caret column="152275" lean-forward="true" selection-start-column="152275" selection-end-column="152275" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="2227">
<caret line="21" column="80" selection-start-line="21" selection-start-column="80" selection-end-line="21" selection-end-column="80" /> <caret line="141" column="38" selection-start-line="141" selection-start-column="38" selection-end-line="141" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3893">
<caret line="241" column="47" selection-start-line="241" selection-start-column="47" selection-end-line="241" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/frontend/css/style.css"> <entry file="file://$PROJECT_DIR$/public/frontend/css/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23999"> <state relative-caret-position="1615">
<caret column="95065" selection-start-column="95065" selection-end-column="95065" /> <caret column="95065" selection-start-column="95065" selection-end-column="95065" />
<folding> <folding>
<element signature="e#282724#356207#2" expanded="true" /> <element signature="e#282724#356207#2" expanded="true" />
...@@ -961,39 +916,52 @@ ...@@ -961,39 +916,52 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/css/style.css"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222"> <state relative-caret-position="1598">
<caret column="152275" lean-forward="true" selection-start-column="152275" selection-end-column="152275" /> <caret line="94" selection-start-line="88" selection-end-line="94" />
<folding>
<element signature="e#282726#356209#2" expanded="true" />
<element signature="e#441207#442576#2" expanded="true" />
<element signature="e#442731#444096#2" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/packages/register_package.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2295">
<caret line="135" column="12" selection-start-line="135" selection-start-column="12" selection-end-line="135" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2278">
<caret line="134" selection-start-line="134" selection-end-line="134" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3009"> <state relative-caret-position="108">
<caret line="177" column="18" selection-start-line="177" selection-start-column="18" selection-end-line="177" selection-end-column="18" /> <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453"> <state relative-caret-position="545">
<caret line="94" column="10" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" /> <caret line="51" column="9" selection-start-line="51" selection-start-column="9" selection-end-line="51" selection-end-column="23" />
<folding>
<element signature="e#4545#4551#0#HTML" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="9" column="51" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493"> <state relative-caret-position="126">
<caret line="38" column="26" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="26" /> <caret line="7" column="47" selection-start-line="7" selection-start-column="47" selection-end-line="7" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
resources/views/addpackage.blade.php
View file @ 30604346
...@@ -4,13 +4,16 @@ ...@@ -4,13 +4,16 @@
<section class="section section-inset-1"> <section class="section section-inset-1">
<div class="container"> <div class="container">
<form action="{{ url('/packages/register') }}" method="POST" class="needs-validation border border-primary bg-white p-5" novalidate> <div class="row">
<div class="col-12">
{{ csrf_field() }}
<h4 class="mb-5"> <h4 class="mb-5">
<span class="text-muted">Регистрация новой входящей посылки</span> <span class="text-top-title">Регистрация новой входящей посылки</span>
</h4> </h4>
</div>
</div>
<form action="{{ url('/packages/register') }}" method="POST" class="needs-validation border border-1 bg-white p-5" novalidate>
{{ csrf_field() }}
<div class="row"> <div class="row">
<div class="col-md-6 mb-3"> <div class="col-md-6 mb-3">
...@@ -107,7 +110,8 @@ ...@@ -107,7 +110,8 @@
</div> </div>
</div> </div>
<button class="btn btn-success btn-lg btn-block" type="submit">Зарегистрировать</button> <br /><br />
<button class="btn btn-success btn-lg btn-block mt-4" type="submit">Зарегистрировать</button>
</form> </form>
</div> </div>
</section> </section>
......
resources/views/layouts/user_new.blade.php
View file @ 30604346
...@@ -31,67 +31,110 @@ ...@@ -31,67 +31,110 @@
} }
} }
nav.top-menu > a {
position: relative;
display: inline-block;
padding: 6px 10px 7px;
color: #688cea!important;
font-size: 16px;
font-family: ubuntu,sans-serif;
font-weight: 600;
line-height: 1.2;
border-radius: 4px;
}
nav.top-menu > a:hover {
color: #2c638c!important;
text-decoration: none;
}
footer{
background-color: #fff;
}
.text-top-title { color: #6b8eea!important }
</style> </style>
<!-- Custom styles for this template -->
<link href="pricing.css" rel="stylesheet">
</head> </head>
<body> <body>
<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom shadow-sm">
<h5 class="my-0 mr-md-auto font-weight-normal">Fazoshop</h5> <div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-5 bg-white border-bottom shadow-sm sticky-top">
<nav class="my-2 my-md-0 mr-md-3"> <a class="navbar-brand mr-md-auto" href="#">
<img src="{{ url('/assets/img/icon/logo.png') }}" width="30" height="30" alt="" class="mr-1">
<strong>Fazoshop</strong>
</a>
<nav class="my-2 my-md-0 mr-md-3 top-menu">
<a class="p-2 text-dark" href="#">На главную</a> <a class="p-2 text-dark" href="#">На главную</a>
<a class="p-2 text-dark" href="{{ route('package') }}">Посылки</a> <a class="p-2 text-dark" href="{{ route('package') }}">Посылки</a>
<a class="p-2 text-dark" href="{{ route('address') }}">Адреса</a> <a class="p-2 text-dark" href="{{ route('address') }}">Адреса</a>
<a class="p-2 text-dark" href="{{ url('/profile') }}">Профиль</a> <a class="p-2 text-dark" href="{{ url('/profile') }}">Профиль</a>
</nav> </nav>
<a class="btn btn-outline-primary" href="#">Sign up</a>
</div> </div>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@yield('content') @if( Session::has( 'success' ))
<div class="alert alert-success alert-dismissible fade show mt-3" role="alert">
<strong>Успешно! </strong>
{{ Session::get( 'success' ) }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
@elseif( Session::has( 'error' ))
<div class="alert alert-danger alert-dismissible fade show mt-3" role="alert">
<strong>Ошибка! </strong>
{{ Session::get( 'error' ) }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
@endif
@yield('content')
</div>
</div>
</div>
<footer class="pt-4 my-md-5 pt-md-5 border-top"> <footer class="pt-4 mt-5 pt-md-5 pb-5 border-top">
<div class="container">
<div class="row"> <div class="row">
<div class="col-12 col-md"> <div class="col-12 col-md">
<img class="mb-2" src="/docs/4.3/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24"> <img class="mb-2" src="/docs/4.3/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24">
<small class="d-block mb-3 text-muted">&copy; 2017-2019</small> <small class="d-block mb-3 text-muted">&copy; 2017-2019</small>
</div> </div>
<div class="col-6 col-md"> <div class="col-6 col-md">
<h5>Features</h5> <h5>Клиентам</h5>
<ul class="list-unstyled text-small"> <ul class="list-unstyled text-small">
<li><a class="text-muted" href="#">Cool stuff</a></li> <li><a class="text-muted" href="#">Справка</a></li>
<li><a class="text-muted" href="#">Random feature</a></li> <li><a class="text-muted" href="#">Новости</a></li>
<li><a class="text-muted" href="#">Team feature</a></li> <li><a class="text-muted" href="#">Акции</a></li>
<li><a class="text-muted" href="#">Stuff for developers</a></li>
<li><a class="text-muted" href="#">Another one</a></li>
<li><a class="text-muted" href="#">Last time</a></li>
</ul> </ul>
</div> </div>
<div class="col-6 col-md"> <div class="col-6 col-md">
<h5>Resources</h5> <h5>FazoShop</h5>
<ul class="list-unstyled text-small"> <ul class="list-unstyled text-small">
<li><a class="text-muted" href="#">Resource</a></li> <li><a class="text-muted" href="#">О компании</a></li>
<li><a class="text-muted" href="#">Resource name</a></li> <li><a class="text-muted" href="#">Вакансии</a></li>
<li><a class="text-muted" href="#">Another resource</a></li> <li><a class="text-muted" href="#">Privacy</a></li>
<li><a class="text-muted" href="#">Final resource</a></li> <li><a class="text-muted" href="#">Обратная связь</a></li>
</ul> </ul>
</div> </div>
<div class="col-6 col-md"> <div class="col-6 col-md">
<h5>About</h5> <h5>Контакты</h5>
<ul class="list-unstyled text-small"> <ul class="list-unstyled text-small">
<li><a class="text-muted" href="#">Team</a></li> <li><a class="text-muted" href="#">Адреса</a></li>
<li><a class="text-muted" href="#">Locations</a></li> <li><a class="text-muted" href="#">Акции</a></li>
<li><a class="text-muted" href="#">Privacy</a></li>
<li><a class="text-muted" href="#">Terms</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</footer>
</div>
</div>
</div> </div>
</footer>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
@yield('custom_script')
</body> </body>
</html> </html>
resources/views/pages/profile/user.blade.php
View file @ 30604346
@extends('layouts.user') @extends('layouts.user_new')
@section('content') @section('content')
<section class="bg-light section-lg">
<ol class="breadcrumb">
<li><a href="{{ route('home') }}">Home</a></li>
<li>Profile
</li>
<li class="active">Info</li>
</ol>
</section>
<section class="grid">
<section class="section section-inset-1">
<div class="container"> <div class="container">
<h5 class="text-center">Profile</h5> <div class="row">
<hr> <div class="col-12">
<div class="row offset-5"> <h4 class="mb-5">
<div class="col-xs-4"> <span class="text-top-title">Редактирование профиля</span>
<div class="well4 bg-light"> </h4>
<h5>{{ Auth::user()->lastname }} {{ Auth::user()->firstname }}</h5> </div>
<p class="text-sm-left">97 Quentin Road,</p> </div>
<p class="text-sm-left">ID {{ Auth::user()->id }}-FZ</p>
<p class="text-sm-left">Brooklyn, NY 11234</p> <div class="row">
<p class="text-sm-left">(347) 547-9797</p> <div class="col-4">
</div> <div class="card bg-white border-primary mb-3">
</div> <div class="card-body">
<div class="col-xs-6"> <h5 class="card-title">{{ Auth::user()->lastname }} {{ Auth::user()->firstname }}</h5>
<form action="{{ route('profile.save') }}" method="post" > <p class="card-text">
@csrf 97 Quentin Road, <br />
ID {{ Auth::user()->id }}-FZ <br />
Brooklyn, NY 11234
(347) 547-9797
</p>
</div>
</div>
</div>
<div class="col-8">
<form action="{{ route('profile.save') }}" method="post" class="border border-1 bg-white p-5">
@csrf
<div class="row row-10"> <div class="row row-10">
<div class="col-xs-12 col-sm-6 right-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-country1">Firstname...</label> <label for="forms-check-country1">Имя</label>
<input class="form-input" id="forms-check-country1" value="{{ Auth::user()->firstname }}" type="text" name="firstname" data-constraints="@Required"> <input class="form-control" id="forms-check-country1" value="{{ Auth::user()->firstname }}" type="text" name="firstname" data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 left-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-country1">Lastname...</label> <label for="forms-check-country1">Фамилия</label>
<input class="form-input" id="forms-check-country1" <input class="form-control" id="forms-check-country1" value="{{ Auth::user()->lastname }}" type="text" name="lastname" data-constraints="@Required">
value="{{ Auth::user()->lastname }}" type="text" name="lastname"
data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 right-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-postcode1">Email...</label> <label for="forms-check-postcode1">Email</label>
<input class="form-input" id="forms-check-postcode1" type="text" name="email" value="{{ Auth::user()->email }}" data-constraints="@Required"> <input class="form-control" id="forms-check-postcode1" type="text" name="email" value="{{ Auth::user()->email }}" data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 left-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-postcode1">Phone...</label> <label for="forms-check-postcode1">Телефон</label>
<input class="form-input" id="forms-check-postcode1" type="text" name="phone" value="{{ Auth::user()->phone }}" placeholder="Phone..." data-constraints="@Required"> <input class="form-control" id="forms-check-postcode1" type="text" name="phone" value="{{ Auth::user()->phone }}" placeholder="Phone..." data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 right-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="password">Password...</label> <label for="password">Пароль</label>
<input class="form-input" id="password" type="password" name="password" > <input class="form-control" id="password" type="password" name="password">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-6 left-col"> <div class="col-xs-12 col-sm-6 form-group">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="password_confirmation">Password Confirmation...</label> <label for="password_confirmation">Подтверждение пароля</label>
<input class="form-input" id="password_confirmation" type="password" name="password_confirmation" > <input class="form-control" id="password_confirmation" type="password" name="password_confirmation">
</div> </div>
</div> </div>
</div> </div>
<button class="btn btn-primary btn-xs" >Save</button>
<br /><br />
<button class="btn btn-primary btn-xs">Сохранить</button>
</form> </form>
</div> </div>
...@@ -75,6 +75,4 @@ ...@@ -75,6 +75,4 @@
</div> </div>
</div> </div>
</section>
</section>
@endsection @endsection
resources/views/profile.blade.php
View file @ 30604346
@extends('layouts.user') @extends('layouts.user_new')
@section('content') @section('content')
<section class="bg-light section-lg"> <section class="bg-light section-lg">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment