Skip to content

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

Added password in profile form

parent 83d1b63e
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 86 deletions
.idea/workspace.xml
View file @ bf7501a1
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<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$/.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" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/parcels/index.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" />
...@@ -31,7 +29,7 @@ ...@@ -31,7 +29,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="91" /> <entry key="php" value="95" />
<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" />
...@@ -39,7 +37,7 @@ ...@@ -39,7 +37,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="41" /> <entry key="Blade" value="45" />
<entry key="CSS" value="3" /> <entry key="CSS" value="3" />
<entry key="Image" value="5" /> <entry key="Image" value="5" />
<entry key="PHP" value="50" /> <entry key="PHP" value="50" />
...@@ -51,12 +49,12 @@ ...@@ -51,12 +49,12 @@
<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="15266" /> <entry key="php" value="15332" />
</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="8666" /> <entry key="Blade" value="8732" />
<entry key="CSS" value="12" /> <entry key="CSS" value="12" />
<entry key="PHP" value="6600" /> <entry key="PHP" value="6600" />
<entry key="PLAIN_TEXT" value="15" /> <entry key="PLAIN_TEXT" value="15" />
...@@ -69,8 +67,8 @@ ...@@ -69,8 +67,8 @@
<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="364"> <state relative-caret-position="378">
<caret line="41" column="49" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="49" /> <caret line="46" column="24" selection-start-line="46" selection-start-column="24" selection-end-line="46" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -93,69 +91,65 @@ ...@@ -93,69 +91,65 @@
</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/pages/parcels/index.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="424"> <state relative-caret-position="486">
<caret line="33" column="59" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" /> <caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" />
</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/addpackage.blade.php"> <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="357"> <state relative-caret-position="568">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" /> <caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" />
</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/user.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="406"> <state relative-caret-position="591">
<caret line="45" column="26" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" /> <caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
<folding>
<element signature="n#link#5;n#head#0;n#html#0;n#!!top" />
<marker date="1560289990171" expanded="true" signature="1184:1238" ph="..." />
</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$/resources/views/pages/profile/user.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="935"> <state relative-caret-position="112">
<caret line="55" column="38" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="38" /> <caret line="75" column="57" lean-forward="true" selection-start-line="75" selection-start-column="57" selection-end-line="75" selection-end-column="57" />
</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/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465"> <state relative-caret-position="357">
<caret line="303" column="58" lean-forward="true" selection-start-line="303" selection-start-column="58" selection-end-line="303" selection-end-column="58" /> <caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
</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/address.blade.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="306"> <state relative-caret-position="357">
<caret line="18" column="45" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" /> <caret line="297" column="42" lean-forward="true" selection-start-line="297" selection-start-column="42" selection-end-line="297" selection-end-column="42" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.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="221"> <state relative-caret-position="36">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" /> <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -187,9 +181,10 @@ ...@@ -187,9 +181,10 @@
<find>fa-pinterest-p</find> <find>fa-pinterest-p</find>
<find>save</find> <find>save</find>
<find>Адреса</find> <find>Адреса</find>
<find>profile</find>
<find>address</find> <find>address</find>
<find>addr</find> <find>addr</find>
<find>profile</find>
<find>ProfileController@profile</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -235,13 +230,13 @@ ...@@ -235,13 +230,13 @@
<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/pages/profile/user.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
<option value="$PROJECT_DIR$/routes/web.php" /> <option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" /> <option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.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" />
</list> </list>
</option> </option>
</component> </component>
...@@ -502,12 +497,12 @@ ...@@ -502,12 +497,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="23439000" /> <workItem from="1560092291448" duration="24209000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="97636000" /> <option name="totallyTimeSpent" value="98406000" />
</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" />
...@@ -831,13 +826,6 @@ ...@@ -831,13 +826,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="616">
<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/layouts/main.blade.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="-324"> <state relative-caret-position="-324">
...@@ -845,27 +833,6 @@ ...@@ -845,27 +833,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="595">
<caret line="35" column="28" 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="1037">
<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="935">
<caret line="55" column="38" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/address.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/address.blade.php">
<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">
...@@ -898,38 +865,66 @@ ...@@ -898,38 +865,66 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/routes/web.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="364"> <state relative-caret-position="663">
<caret line="41" column="49" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="49" /> <caret line="229" column="21" lean-forward="true" selection-start-line="229" selection-start-column="21" selection-end-line="229" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.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="465"> <state relative-caret-position="378">
<caret line="303" column="58" lean-forward="true" selection-start-line="303" selection-start-column="58" selection-end-line="303" selection-end-column="58" /> <caret line="51" column="31" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="31" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663"> <state relative-caret-position="486">
<caret line="229" column="21" lean-forward="true" selection-start-line="229" selection-start-column="21" selection-end-line="229" selection-end-column="21" /> <caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Models/Package.php"> <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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="591">
<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/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="75" column="57" lean-forward="true" selection-start-line="75" selection-start-column="57" selection-end-line="75" selection-end-column="57" />
</state>
</provider>
</entry>
<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="378"> <state relative-caret-position="378">
<caret line="51" column="31" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="31" /> <caret line="46" column="24" selection-start-line="46" selection-start-column="24" selection-end-line="46" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.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="424"> <state relative-caret-position="357">
<caret line="33" column="59" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" /> <caret line="297" column="42" lean-forward="true" selection-start-line="297" selection-start-column="42" selection-end-line="297" selection-end-column="42" />
</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="36">
<caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
resources/views/pages/profile/user.blade.php
View file @ bf7501a1
@extends('layouts.user') @extends('layouts.user')
@section('content') @section('content')
<div class="alert alert-danger" role="alert">
A simple danger alert—check it out!
</div>
<section class="bg-light section-lg"> <section class="bg-light section-lg">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="{{ route('home') }}">Home</a></li> <li><a href="{{ route('home') }}">Home</a></li>
...@@ -40,7 +37,9 @@ ...@@ -40,7 +37,9 @@
<div class="col-xs-12 col-sm-6 left-col"> <div class="col-xs-12 col-sm-6 left-col">
<div class="form-wrap"> <div class="form-wrap">
<label class="form-label" for="forms-check-country1">Lastname...</label> <label class="form-label" for="forms-check-country1">Lastname...</label>
<input class="form-input" id="forms-check-country1" value="{{ Auth::user()->lastname }}" type="text" name="lastname" data-constraints="@Required"> <input class="form-input" id="forms-check-country1"
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 right-col">
...@@ -55,6 +54,18 @@ ...@@ -55,6 +54,18 @@
<input class="form-input" id="forms-check-postcode1" type="text" name="phone" value="{{ Auth::user()->phone }}" placeholder="Phone..." data-constraints="@Required"> <input class="form-input" 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="form-wrap">
<label class="form-label" for="password">Password...</label>
<input class="form-input" id="password" type="password" name="password" >
</div>
</div>
<div class="col-xs-12 col-sm-6 left-col">
<div class="form-wrap">
<label class="form-label" for="password_confirmation">Password Confirmation...</label>
<input class="form-input" id="password_confirmation" type="password" name="password_confirmation" >
</div>
</div>
</div> </div>
<button class="btn btn-primary btn-xs" >Save</button> <button class="btn btn-primary btn-xs" >Save</button>
</form> </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