Commit 3219cbe5 authored by Khumoyunmirzo Sodiqov's avatar Khumoyunmirzo Sodiqov

Release 28.10.2019

(
   - Disabled Auto LogIn before Register
)
parent e25b94c8
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/laravel-debugbar" /> <excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/laravel-debugbar" />
<excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/laravel-dompdf" /> <excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/laravel-dompdf" />
<excludeFolder url="file://$MODULE_DIR$/vendor/beyondcode/laravel-dump-server" /> <excludeFolder url="file://$MODULE_DIR$/vendor/beyondcode/laravel-dump-server" />
<excludeFolder url="file://$MODULE_DIR$/vendor/braintree/braintreehttp" />
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" /> <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/dnoegel/php-xdg-base-dir" /> <excludeFolder url="file://$MODULE_DIR$/vendor/dnoegel/php-xdg-base-dir" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/inflector" /> <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/inflector" />
...@@ -43,6 +44,8 @@ ...@@ -43,6 +44,8 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/nunomaduro/collision" /> <excludeFolder url="file://$MODULE_DIR$/vendor/nunomaduro/collision" />
<excludeFolder url="file://$MODULE_DIR$/vendor/opis/closure" /> <excludeFolder url="file://$MODULE_DIR$/vendor/opis/closure" />
<excludeFolder url="file://$MODULE_DIR$/vendor/paragonie/random_compat" /> <excludeFolder url="file://$MODULE_DIR$/vendor/paragonie/random_compat" />
<excludeFolder url="file://$MODULE_DIR$/vendor/paypal/paypal-checkout-sdk" />
<excludeFolder url="file://$MODULE_DIR$/vendor/paypal/rest-api-sdk-php" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" /> <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" /> <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" /> <excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" />
......
...@@ -101,6 +101,9 @@ ...@@ -101,6 +101,9 @@
<path value="$PROJECT_DIR$/vendor/intervention/image" /> <path value="$PROJECT_DIR$/vendor/intervention/image" />
<path value="$PROJECT_DIR$/vendor/mews/captcha" /> <path value="$PROJECT_DIR$/vendor/mews/captcha" />
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" /> <path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
<path value="$PROJECT_DIR$/vendor/paypal/rest-api-sdk-php" />
<path value="$PROJECT_DIR$/vendor/paypal/paypal-checkout-sdk" />
<path value="$PROJECT_DIR$/vendor/braintree/braintreehttp" />
</include_path> </include_path>
</component> </component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.1" /> <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<change beforePath="$PROJECT_DIR$/.idea/fazoshop.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/fazoshop.iml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/fazoshop.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/fazoshop.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" 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/welcome.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/welcome.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Auth/RegisterController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Auth/RegisterController.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" />
...@@ -136,6 +136,10 @@ ...@@ -136,6 +136,10 @@
<path value="$PROJECT_DIR$/vendor/filp/whoops" /> <path value="$PROJECT_DIR$/vendor/filp/whoops" />
<path value="$PROJECT_DIR$/vendor/intervention/image" /> <path value="$PROJECT_DIR$/vendor/intervention/image" />
<path value="$PROJECT_DIR$/vendor/mews/captcha" /> <path value="$PROJECT_DIR$/vendor/mews/captcha" />
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
<path value="$PROJECT_DIR$/vendor/paypal/rest-api-sdk-php" />
<path value="$PROJECT_DIR$/vendor/paypal/paypal-checkout-sdk" />
<path value="$PROJECT_DIR$/vendor/braintree/braintreehttp" />
</include_path> </include_path>
</component> </component>
<component name="ProjectId" id="1RvHVuLiAecoShWzzuyXsxpQGtI" /> <component name="ProjectId" id="1RvHVuLiAecoShWzzuyXsxpQGtI" />
...@@ -146,7 +150,7 @@ ...@@ -146,7 +150,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="true" /> <property name="WebServerToolWindowFactoryState" value="true" />
<property name="editor.config.ad.shown" value="true" /> <property name="editor.config.ad.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/views" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/app/Models" />
<property name="node.js.detected.package.eslint" value="true" /> <property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" /> <property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" /> <property name="node.js.path.for.package.eslint" value="project" />
...@@ -159,18 +163,18 @@ ...@@ -159,18 +163,18 @@
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" /> <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\OSPanel\domains\fazo\resources\views" />
<recent name="C:\OSPanel\domains\fazo\public\video" />
<recent name="C:\OSPanel\domains\fazo\app\Http\Controllers" />
<recent name="C:\OSPanel\domains\fazo\public\assets\slider\images" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop" /> <recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles" /> <recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles\css" /> <recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles\css" />
</key> </key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\OSPanel\domains\fazo\app\Models" />
<recent name="C:\OSPanel\domains\fazo\resources\views" />
<recent name="C:\OSPanel\domains\fazo\resources\views\pages\parcels" />
<recent name="C:\OSPanel\domains\fazo\public\video" />
<recent name="C:\OSPanel\domains\fazo\app\Http\Controllers" />
</key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
...@@ -229,7 +233,8 @@ ...@@ -229,7 +233,8 @@
<workItem from="1570540679279" duration="7189000" /> <workItem from="1570540679279" duration="7189000" />
<workItem from="1570729103244" duration="651000" /> <workItem from="1570729103244" duration="651000" />
<workItem from="1571336316933" duration="11634000" /> <workItem from="1571336316933" duration="11634000" />
<workItem from="1571458855290" duration="45747000" /> <workItem from="1571458855290" duration="49658000" />
<workItem from="1572018556391" duration="40349000" />
</task> </task>
<task id="LOCAL-00001" summary="first commit (10/07/2019//11/;58)"> <task id="LOCAL-00001" summary="first commit (10/07/2019//11/;58)">
<created>1570475345391</created> <created>1570475345391</created>
...@@ -392,12 +397,92 @@ ...@@ -392,12 +397,92 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1571944244758</updated> <updated>1571944244758</updated>
</task> </task>
<option name="localTasksCounter" value="24" /> <task id="LOCAL-00024" summary="video">
<created>1571944423115</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1571944423115</updated>
</task>
<task id="LOCAL-00025" summary="video">
<created>1571947485123</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1571947485123</updated>
</task>
<task id="LOCAL-00026" summary="video">
<created>1571947869162</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1571947869162</updated>
</task>
<task id="LOCAL-00027" summary="video">
<created>1571947998807</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1571947998807</updated>
</task>
<task id="LOCAL-00028" summary="video">
<created>1571948044815</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1571948044815</updated>
</task>
<task id="LOCAL-00029" summary="video">
<created>1571949064460</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1571949064460</updated>
</task>
<task id="LOCAL-00030" summary="video">
<created>1572024410442</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1572024410442</updated>
</task>
<task id="LOCAL-00031" summary="video">
<created>1572049663885</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1572049663885</updated>
</task>
<task id="LOCAL-00032" summary="video">
<created>1572162602441</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1572162602441</updated>
</task>
<task id="LOCAL-00033" summary="Release 28.10.2019">
<created>1572210547463</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1572210547463</updated>
</task>
<option name="localTasksCounter" value="34" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="2" />
<option value="3" />
<option value="1" />
</list>
</option>
</component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES"> <option name="TAB_STATES">
<map> <map>
...@@ -431,14 +516,15 @@ ...@@ -431,14 +516,15 @@
<MESSAGE value="first commit (10/07/2019//11/;58)" /> <MESSAGE value="first commit (10/07/2019//11/;58)" />
<MESSAGE value="fix bugs" /> <MESSAGE value="fix bugs" />
<MESSAGE value="video" /> <MESSAGE value="video" />
<option name="LAST_COMMIT_MESSAGE" value="video" /> <MESSAGE value="Release 28.10.2019" />
<option name="LAST_COMMIT_MESSAGE" value="Release 28.10.2019" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<breakpoints> <breakpoints>
<line-breakpoint enabled="true" type="php"> <line-breakpoint enabled="true" type="php">
<url>file://$PROJECT_DIR$/resources/views/pages/terms.blade.php</url> <url>file://$PROJECT_DIR$/resources/views/pages/terms.blade.php</url>
<line>537</line> <line>538</line>
<option name="timeStamp" value="1" /> <option name="timeStamp" value="1" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
......
...@@ -6,6 +6,8 @@ use App\Models\ClientAuthCodes; ...@@ -6,6 +6,8 @@ use App\Models\ClientAuthCodes;
use App\User; use App\User;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Auth\Events\Registered;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
...@@ -59,6 +61,18 @@ class RegisterController extends Controller ...@@ -59,6 +61,18 @@ class RegisterController extends Controller
]); ]);
} }
public function register(Request $request)
{
$this->validator($request->all())->validate();
event(new Registered($user = $this->create($request->all())));
// $this->guard()->login($user);
return $this->registered($request, $user)
?: redirect($this->redirectPath());
}
/** /**
* Create a new user instance after a valid registration. * Create a new user instance after a valid registration.
* *
......
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