Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
L
laravel-test
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
laravel-test
Commits
a3b6d773
Commit
a3b6d773
authored
Jun 22, 2023
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add translation error message
parent
af1fb744
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
27 deletions
+28
-27
UserController.php
src/app/Http/Controllers/UserController.php
+27
-24
scripts.blade.php
src/resources/views/layouts/scripts.blade.php
+1
-3
No files found.
src/app/Http/Controllers/UserController.php
View file @
a3b6d773
...
...
@@ -10,22 +10,46 @@ use Laravel\Socialite\Facades\Socialite;
class
UserController
extends
Controller
{
public
function
create
()
{
// GET
public
function
create
()
{
return
view
(
'user.create'
);
}
public
function
loginForm
()
{
return
view
(
'user.login'
);
}
public
function
loginAuth
()
{
$is_auth
=
true
;
return
view
(
'user.auth'
,
compact
(
'is_auth'
));
}
public
function
logout
(
Request
$request
)
{
Auth
::
logout
();
//return redirect()->route('login.create');
return
redirect
()
->
route
(
'home'
);
}
public
function
settings
()
{
return
view
(
'user.settings'
);
}
// POST
public
function
store
(
Request
$request
)
{
//dd($request->all());
$request
->
validate
([
'email'
=>
'required|email|unique:users'
,
'password'
=>
'required|confirmed'
,
],
[
'email.unique'
=>
'Email вже використовується.'
,
]);
$user
=
User
::
create
([
//'name' => $request->name, // || 'name' => $request->input('name'),
'email'
=>
$request
->
email
,
'email'
=>
$request
->
email
,
// 'email' => $request->input('email'),
'password'
=>
Hash
::
make
(
$request
->
password
),
'email_verified_at'
=>
NOW
(),
]);
...
...
@@ -56,15 +80,6 @@ class UserController extends Controller
return
redirect
()
->
back
()
->
with
(
'error'
,
'Виникла помилка при збереженні налаштувань'
);
}
public
function
loginForm
()
{
return
view
(
'user.login'
);
}
public
function
loginAuth
()
{
$is_auth
=
true
;
return
view
(
'user.auth'
,
compact
(
'is_auth'
));
}
public
function
login
(
Request
$request
)
{
$request
->
validate
([
...
...
@@ -81,16 +96,6 @@ class UserController extends Controller
return
redirect
()
->
back
()
->
with
(
'error'
,
'Введено невiрний Email або пароль'
);
}
public
function
logout
(
Request
$request
)
{
Auth
::
logout
();
//return redirect()->route('login.create');
return
redirect
()
->
route
(
'home'
);
}
public
function
settings
()
{
return
view
(
'user.settings'
);
}
public
function
loginGoogle
()
{
$googleUser
=
Socialite
::
driver
(
'google'
)
->
user
();
...
...
@@ -122,6 +127,4 @@ class UserController extends Controller
return
redirect
()
->
route
(
'home'
);
}
}
src/resources/views/layouts/scripts.blade.php
View file @
a3b6d773
...
...
@@ -10,9 +10,7 @@
<
script
src
=
"assets/vendor/glightbox/js/glightbox.min.js"
></
script
>
<
script
src
=
"assets/vendor/isotope-layout/isotope.pkgd.min.js"
></
script
>
<
script
src
=
"assets/vendor/swiper/swiper-bundle.min.js"
></
script
>
<
script
src
=
"//cdnjs.cloudflare.com/ajax/libs/validate.js/0.13.1/validate.min.js"
></
script
>
<
script
src
=
"assets/js/validate.min.js"
></
script
>
<
script
src
=
"assets/js/main.js"
></
script
>
<
script
src
=
"assets/js/login.js"
></
script
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment