Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VenJob
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Đường Sỹ Hoàng
VenJob
Commits
c3933c99
Commit
c3933c99
authored
Dec 26, 2019
by
Đường Sỹ Hoàng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix devise default view
parent
89ccbb41
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
50 additions
and
24 deletions
+50
-24
app/controllers/application_controller.rb
+12
-0
app/views/devise/registrations/new.html.erb
+15
-0
app/views/devise/sessions/new.html.erb
+13
-20
app/views/devise/shared/_links.html.erb
+3
-2
app/views/layouts/_header.html.erb
+3
-0
config/routes.rb
+2
-2
db/migrate/20191226070737_add_encrypted_password_to_user.rb
+1
-0
db/schema.rb
+1
-0
No files found.
app/controllers/application_controller.rb
View file @
c3933c99
class
ApplicationController
<
ActionController
::
Base
# Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.
protect_from_forgery
with: :exception
before_action
:configure_permitted_parameters
,
if: :devise_controller?
protected
def
configure_permitted_parameters
added_attrs
=
[
:remember_me
,
:username
,
:first_name
,
:last_name
]
devise_parameter_sanitizer
.
permit
:sign_up
,
keys:
added_attrs
devise_parameter_sanitizer
.
permit
:account_update
,
keys:
added_attrs
end
end
app/views/devise/registrations/new.html.erb
View file @
c3933c99
...
...
@@ -9,6 +9,21 @@
</div>
<div
class=
"field"
>
<%=
f
.
label
:username
%>
<br
/>
<%=
f
.
text_field
:username
,
autofocus:
true
%>
</div>
<div
class=
"field"
>
<%=
f
.
label
:first_name
%>
<br
/>
<%=
f
.
text_field
:first_name
,
autofocus:
true
%>
</div>
<div
class=
"field"
>
<%=
f
.
label
:last_name
%>
<br
/>
<%=
f
.
text_field
:last_name
,
autofocus:
true
%>
</div>
<div
class=
"field"
>
<%=
f
.
label
:password
%>
<%
if
@minimum_password_length
%>
<em>
(
<%=
@minimum_password_length
%>
characters minimum)
</em>
...
...
app/views/devise/sessions/new.html.erb
View file @
c3933c99
<div
class=
"container"
>
<div
class=
"d-flex justify-content-center h-100"
>
<div
class=
"card"
>
...
...
@@ -7,36 +5,31 @@
<h2>
Log in
</h2>
</div>
<div
class=
"card-body-form"
>
<form>
<div
class=
"input-group form-group"
>
<%=
form_for
(
resource
,
as:
resource_name
,
url:
session_path
(
resource_name
))
do
|
f
|
%>
<div
class=
"field"
>
<%=
f
.
label
:email
%>
<br
/>
<%=
f
.
email_field
:email
,
autofocus:
true
,
autocomplete:
"email"
,
:class
=>
'form-control'
%>
<%=
f
.
email_field
:email
,
autofocus:
true
,
autocomplete:
"email"
%>
</div>
</div>
<div
class=
"input-group form-group"
>
<div
class=
"field"
>
<%=
f
.
label
:password
%>
<br
/>
<%=
f
.
password_field
:password
,
autocomplete:
"current-password"
,
:class
=>
'form-control'
%>
<%=
f
.
password_field
:password
,
autocomplete:
"current-password"
%>
</div>
<%
if
devise_mapping
.
rememberable?
%>
<div
class=
"field"
>
<%=
f
.
check_box
:remember_me
%>
<%=
f
.
label
:remember_me
%>
</div>
<%=
render
"devise/shared/links"
%>
<div
class=
"card-footer-form"
>
<div
class=
"d-flex justify-content-center"
>
<div
class=
"actions"
>
<%=
f
.
submit
"Log in"
,
class:
'btn float-left login_btn'
%>
</div>
<%
end
%>
<div
class=
"actions"
>
<%=
f
.
submit
"Register"
,
class:
'btn float-right login_btn'
%>
<%=
f
.
submit
"Log in"
%>
</div>
<%
end
%>
</div>
</div>
</form>
<%=
render
"devise/shared/links"
%>
</div>
</div>
</div>
</div>
</br>
app/views/devise/shared/_links.html.erb
View file @
c3933c99
...
...
@@ -2,12 +2,13 @@
<%=
link_to
"Log in"
,
new_session_path
(
resource_name
)
%>
<br
/>
<%
end
%>
<%-
if
devise_mapping
.
registerable?
&&
controller_name
!=
'registrations'
%>
<%=
link_to
"Register"
,
new_registration_path
(
resource_name
)
%>
<br
/>
<%
end
%>
<div
class=
"d-flex justify-content-center"
>
<%-
if
devise_mapping
.
recoverable?
&&
controller_name
!=
'passwords'
&&
controller_name
!=
'registrations'
%>
<%=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
)
%>
<br
/>
<%
end
%>
</div>
<%-
if
devise_mapping
.
confirmable?
&&
controller_name
!=
'confirmations'
%>
<%=
link_to
"Didn't receive confirmation instructions?"
,
new_confirmation_path
(
resource_name
)
%>
<br
/>
...
...
app/views/layouts/_header.html.erb
View file @
c3933c99
...
...
@@ -7,6 +7,9 @@
<button
class=
"btn btn-outline-success"
type=
"button"
>
Register
</button>
<button
class=
"btn btn-outline-success"
type=
"button"
>
Favorite
</button>
<button
class=
"btn btn-outline-success"
type=
"button"
>
History
</button>
<%
if
user_signed_in?
%>
<%=
link_to
"Log out"
,
destroy_user_session_path
,
method: :delete
%>
<%
end
%>
</form>
</nav>
<%=
link_to
image_tag
(
"banner.jpg"
,
id:
"banner"
,
alt:
"Venjob banner"
)
%>
...
...
config/routes.rb
View file @
c3933c99
...
...
@@ -6,7 +6,7 @@ Rails.application.routes.draw do
devise_for
:users
as
:user
do
get
"login"
=>
"devise/sessions#new"
post
"login"
=>
"devise/sessions#create"
delete
"logout"
=>
"devise/sessions#destroy"
#
post "login" => "devise/sessions#create"
#
delete "logout" => "devise/sessions#destroy"
end
end
db/migrate/20191226070737_add_encrypted_password_to_user.rb
View file @
c3933c99
class
AddEncryptedPasswordToUser
<
ActiveRecord
::
Migration
[
6.0
]
def
change
add_column
:users
,
:encrypted_password
,
:string
add_column
:users
,
:remember_created_at
,
:datetime
end
end
db/schema.rb
View file @
c3933c99
...
...
@@ -99,6 +99,7 @@ ActiveRecord::Schema.define(version: 2019_12_26_070737) do
t
.
datetime
"created_at"
,
precision:
6
,
null:
false
t
.
datetime
"updated_at"
,
precision:
6
,
null:
false
t
.
string
"encrypted_password"
t
.
datetime
"remember_created_at"
t
.
index
[
"email"
],
name:
"index_users_on_email"
,
unique:
true
t
.
index
[
"reset_digest"
],
name:
"index_users_on_reset_digest"
,
unique:
true
t
.
index
[
"username"
],
name:
"index_users_on_username"
,
unique:
true
...
...
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