Skip to content

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

Edit password in user profile

parent c2d3fe27
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 57 deletions
.idea/workspace.xml
View file @ dcfd0fe8
......@@ -2,8 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<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/layouts/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user.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$/resources/views/pages/profile/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -31,7 +30,7 @@
<entry key="css" value="3" />
<entry key="env" value="1" />
<entry key="ico" value="1" />
<entry key="php" value="85" />
<entry key="php" value="86" />
<entry key="png" value="4" />
<entry key="svg" value="1" />
<entry key="woff2" value="1" />
......@@ -39,7 +38,7 @@
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="Blade" value="37" />
<entry key="Blade" value="38" />
<entry key="CSS" value="3" />
<entry key="Image" value="5" />
<entry key="PHP" value="48" />
......@@ -51,12 +50,12 @@
<counts>
<entry key="css" value="12" />
<entry key="env" value="15" />
<entry key="php" value="14888" />
<entry key="php" value="14966" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Blade" value="8452" />
<entry key="Blade" value="8530" />
<entry key="CSS" value="12" />
<entry key="PHP" value="6436" />
<entry key="PLAIN_TEXT" value="15" />
......@@ -75,15 +74,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/about.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor">
......@@ -96,8 +86,8 @@
<file pinned="false" current-in-tab="false">
<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 relative-caret-position="-648">
<caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
</state>
</provider>
</entry>
......@@ -105,24 +95,35 @@
<file pinned="false" current-in-tab="false">
<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" />
<state relative-caret-position="1098">
<caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="35" column="28" lean-forward="true" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
</state>
</provider>
</entry>
</file>
<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="396">
<caret line="28" column="29" selection-start-line="28" selection-start-column="29" selection-end-line="28" selection-end-column="29" />
<caret line="58" column="134" selection-start-line="58" selection-start-column="134" selection-end-line="58" selection-end-column="134" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<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" />
<caret line="290" column="64" selection-start-line="290" selection-start-column="64" selection-end-line="290" selection-end-column="64" />
</state>
</provider>
</entry>
......@@ -130,8 +131,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="702">
<caret line="57" column="31" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="31" />
<state relative-caret-position="234">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
</state>
</provider>
</entry>
......@@ -148,7 +149,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<state relative-caret-position="-324">
<caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
</state>
</provider>
......@@ -228,9 +229,9 @@
<option value="$PROJECT_DIR$/public/css/style.css" />
<option value="$PROJECT_DIR$/resources/views/about.blade.php" />
<option value="$PROJECT_DIR$/resources/views/contacts.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.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>
</option>
</component>
......@@ -402,6 +403,13 @@
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" 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="layouts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
......@@ -469,12 +477,12 @@
<workItem from="1559392286763" duration="1822000" />
<workItem from="1559405496483" duration="10478000" />
<workItem from="1560035206797" duration="23000" />
<workItem from="1560092291448" duration="14335000" />
<workItem from="1560092291448" duration="15875000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="88532000" />
<option name="totallyTimeSpent" value="90072000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
......@@ -535,9 +543,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/mstile-150x150.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/favicon-32x32.png">
<provider selected="true" editor-type-id="images" />
</entry>
......@@ -806,13 +811,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="702">
<caret line="57" column="31" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/about.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state>
......@@ -820,13 +818,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
......@@ -841,36 +832,59 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-788" />
<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/pages/profile/user.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.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 relative-caret-position="455">
<caret line="290" column="64" selection-start-line="290" selection-start-column="64" selection-end-line="290" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/main.blade.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 relative-caret-position="-324">
<caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
</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 relative-caret-position="-648">
<caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.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 relative-caret-position="630">
<caret line="35" column="28" lean-forward="true" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
</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="1098">
<caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
</state>
</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="58" column="134" selection-start-line="58" selection-start-column="134" selection-end-line="58" selection-end-column="134" />
</state>
</provider>
</entry>
......
app/Http/Controllers/ProfileController.php
View file @ dcfd0fe8
......@@ -286,6 +286,10 @@ class ProfileController extends Controller
$user->email = $request->input('email');
$user->phone = $request->input('phone');
if ($request->has('password') && $request->has('password_confirmation')) {
$user->password = Hash::make($request->input('password'));
}
$user->update();
} catch (Exception $ex) {
return redirect()->back()->with('error', $ex->getMessage());
......
resources/views/pages/profile/user.blade.php
View file @ dcfd0fe8
......@@ -52,6 +52,17 @@
<input class="form-input" id="forms-check-postcode1" type="text" name="phone" value="{{ Auth::user()->phone }}" placeholder="Phone..." data-constraints="@Required">
</div>
</div>
<div class="col-xs-12 col-sm-6 right-col">
<div class="form-wrap">
<input class="form-input" id="password" type="text" name="password" value="" placeholder="Password" data-constraints="@Required">
</div>
</div>
<div class="col-xs-12 col-sm-6 left-col">
<div class="form-wrap">
<input class="form-input" id="password_confirmation" type="text" name="password_confirmation" value="" placeholder="Password Confirmation" data-constraints="@Required">
</div>
</div>
</div>
<button class="btn btn-primary btn-xs" >Save</button>
</form>
......
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