Skip to content

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

Fixed Saving profile info

parent 82fbe7a6
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 78 deletions
.idea/workspace.xml
View file @ c2d3fe27
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
<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 beforePath="$PROJECT_DIR$/resources/views/about.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/about.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/contacts.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/contacts.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/pages/profile/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/user.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" />
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
<entry key="css" value="3" /> <entry key="css" value="3" />
<entry key="env" value="1" /> <entry key="env" value="1" />
<entry key="ico" value="1" /> <entry key="ico" value="1" />
<entry key="php" value="81" /> <entry key="php" value="85" />
<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" />
...@@ -38,10 +39,10 @@ ...@@ -38,10 +39,10 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="Blade" value="34" /> <entry key="Blade" value="37" />
<entry key="CSS" value="3" /> <entry key="CSS" value="3" />
<entry key="Image" value="5" /> <entry key="Image" value="5" />
<entry key="PHP" value="47" /> <entry key="PHP" value="48" />
<entry key="PLAIN_TEXT" value="2" /> <entry key="PLAIN_TEXT" value="2" />
<entry key="SVG" value="1" /> <entry key="SVG" value="1" />
</counts> </counts>
...@@ -50,14 +51,14 @@ ...@@ -50,14 +51,14 @@
<counts> <counts>
<entry key="css" value="12" /> <entry key="css" value="12" />
<entry key="env" value="15" /> <entry key="env" value="15" />
<entry key="php" value="14563" /> <entry key="php" value="14888" />
</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="8440" /> <entry key="Blade" value="8452" />
<entry key="CSS" value="12" /> <entry key="CSS" value="12" />
<entry key="PHP" value="6123" /> <entry key="PHP" value="6436" />
<entry key="PLAIN_TEXT" value="15" /> <entry key="PLAIN_TEXT" value="15" />
</counts> </counts>
</usages-collector> </usages-collector>
...@@ -65,16 +66,11 @@ ...@@ -65,16 +66,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/web.php"> <entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414"> <state relative-caret-position="271">
<caret line="32" column="21" selection-start-line="32" selection-start-column="21" selection-end-line="32" selection-end-column="21" /> <caret line="45" column="52" selection-start-line="45" selection-start-column="48" selection-end-line="45" selection-end-column="52" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -88,69 +84,72 @@ ...@@ -88,69 +84,72 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="616">
<caret line="14" column="29" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" /> <caret line="85" column="46" selection-start-line="85" selection-start-column="46" selection-end-line="85" selection-end-column="46" />
</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/layouts/app.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="702"> <state relative-caret-position="468">
<caret line="57" column="31" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="31" /> <caret line="107" column="54" lean-forward="true" selection-start-line="107" selection-start-column="54" selection-end-line="107" selection-end-column="54" />
</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/main.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="380"> <state relative-caret-position="-788" />
<caret line="371" column="169" selection-start-line="371" selection-start-column="143" selection-end-line="371" selection-end-column="169" />
</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/layouts/main.blade.php"> <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="558"> <state relative-caret-position="396">
<caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" /> <caret line="28" column="29" selection-start-line="28" selection-start-column="29" selection-end-line="28" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="286" column="52" selection-start-line="286" selection-start-column="52" selection-end-line="286" selection-end-column="52" />
</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$/app/Http/Controllers/HomeController.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="348"> <state relative-caret-position="702">
<caret line="28" selection-start-line="28" selection-end-line="28" /> <caret line="57" column="31" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="31" />
</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$/app/Http/Controllers/FeedbackController.php"> <entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<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="380">
<caret line="33" column="53" selection-start-line="33" selection-start-column="53" selection-end-line="33" selection-end-column="53" /> <caret line="371" column="169" selection-start-line="371" selection-start-column="143" selection-end-line="371" selection-end-column="169" />
<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>
</file> </file>
<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$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1007"> <state relative-caret-position="558">
<caret line="268" column="1" selection-start-line="268" selection-start-column="1" selection-end-line="268" selection-end-column="1" /> <caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -179,6 +178,9 @@ ...@@ -179,6 +178,9 @@
<find>.ttf</find> <find>.ttf</find>
<find>.woff</find> <find>.woff</find>
<find>/feedback/add</find> <find>/feedback/add</find>
<find>profile</find>
<find>save</find>
<find>fa-pinterest-p</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -226,6 +228,9 @@ ...@@ -226,6 +228,9 @@
<option value="$PROJECT_DIR$/public/css/style.css" /> <option value="$PROJECT_DIR$/public/css/style.css" />
<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/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -402,7 +407,15 @@ ...@@ -402,7 +407,15 @@
<item name="fazoshop" type="462c0819:PsiDirectoryNode" /> <item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" /> <item name="views" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" /> <item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="profile" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" /> <item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
...@@ -456,12 +469,12 @@ ...@@ -456,12 +469,12 @@
<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="12720000" /> <workItem from="1560092291448" duration="14335000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="86917000" /> <option name="totallyTimeSpent" value="88532000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
...@@ -522,12 +535,6 @@ ...@@ -522,12 +535,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/android-chrome-192x192.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/safari-pinned-tab.svg">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/mstile-150x150.png"> <entry file="file://$PROJECT_DIR$/public/mstile-150x150.png">
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
</entry> </entry>
...@@ -730,11 +737,6 @@ ...@@ -730,11 +737,6 @@
<state relative-caret-position="-810" /> <state relative-caret-position="-810" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1924" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/templates/declaration.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/templates/declaration.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3485"> <state relative-caret-position="3485">
...@@ -742,13 +744,6 @@ ...@@ -742,13 +744,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1007">
<caret line="268" column="1" selection-start-line="268" selection-start-column="1" selection-end-line="268" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
...@@ -811,13 +806,6 @@ ...@@ -811,13 +806,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="32" column="21" selection-start-line="32" selection-start-column="21" selection-end-line="32" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.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="702"> <state relative-caret-position="702">
...@@ -848,8 +836,41 @@ ...@@ -848,8 +836,41 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="616">
<caret line="14" column="29" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" /> <caret line="85" column="46" selection-start-line="85" selection-start-column="46" selection-end-line="85" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-788" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="28" column="29" selection-start-line="28" selection-start-column="29" selection-end-line="28" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="271">
<caret line="45" column="52" selection-start-line="45" selection-start-column="48" selection-end-line="45" selection-end-column="52" />
</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="468">
<caret line="107" column="54" lean-forward="true" selection-start-line="107" selection-start-column="54" selection-end-line="107" selection-end-column="54" />
</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="455">
<caret line="286" column="52" selection-start-line="286" selection-start-column="52" selection-end-line="286" selection-end-column="52" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
app/Http/Controllers/ProfileController.php
View file @ c2d3fe27
...@@ -258,20 +258,39 @@ class ProfileController extends Controller ...@@ -258,20 +258,39 @@ class ProfileController extends Controller
{ {
return view('address'); return view('address');
} }
public function addaddress() public function addaddress()
{ {
return view('addaddress'); return view('addaddress');
} }
public function profile() public function profile()
{ {
return view('pages.profile.user'); return view('pages.profile.user');
} }
/**
* Save user's profile information
*
* @param Request $request
* @return \Illuminate\Http\RedirectResponse
*/
public function save(Request $request) public function save(Request $request)
{ {
$user = User::find(Auth::user()->id); try {
$user->update($request->all()); $user = User::find(Auth::user()->id);
return redirect()->back(); $user->firstname = $request->input('firstname');
$user->lastname = $request->input('lastname');
$user->email = $request->input('email');
$user->phone = $request->input('phone');
$user->update();
} catch (Exception $ex) {
return redirect()->back()->with('error', $ex->getMessage());
}
return redirect()->back()->with('success', 'Информация успешно сохранена.');
} }
} }
\ No newline at end of file
resources/views/layouts/user.blade.php
View file @ c2d3fe27
...@@ -89,6 +89,24 @@ ...@@ -89,6 +89,24 @@
</header> </header>
<!-- Page Content--> <!-- Page Content-->
<main class="page-content"> <main class="page-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') @yield('content')
</main> </main>
<!-- Page Footer--> <!-- Page Footer-->
...@@ -117,9 +135,6 @@ ...@@ -117,9 +135,6 @@
<ul class="list-inline pull-sm-right offset-3"> <ul class="list-inline pull-sm-right offset-3">
<li><a class="fa-facebook" href="#"></a></li> <li><a class="fa-facebook" href="#"></a></li>
<li><a class="fa-twitter" href="#"></a></li> <li><a class="fa-twitter" href="#"></a></li>
<li><a class="fa-pinterest-p" href="#"></a></li>
<li><a class="fa-vimeo" href="#"></a></li>
<li><a class="fa-google" href="#"></a></li>
<li><a class="fa-rss" href="#"></a></li> <li><a class="fa-rss" href="#"></a></li>
</ul> </ul>
</div> </div>
......
resources/views/pages/profile/user.blade.php
View file @ c2d3fe27
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</div> </div>
<div class="col-xs-6"> <div class="col-xs-6">
<form action="{{ route('profile.save') }}" method="post" > <form action="{{ route('profile.save') }}" method="post" >
@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 right-col">
<div class="form-wrap"> <div class="form-wrap">
......
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