Skip to content

Commit b09b28c

Browse files
committed
feature/Add confirmable module to devise
1 parent ced50a5 commit b09b28c

File tree

7 files changed

+30
-7
lines changed

7 files changed

+30
-7
lines changed

app/models/user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class User < ApplicationRecord
99

1010
# Include default devise modules. Others available are:
1111
# :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
12-
devise :database_authenticatable, :registerable, :recoverable, :rememberable, :validatable
12+
devise :database_authenticatable, :registerable, :recoverable, :rememberable, :confirmable, :validatable
1313

1414
has_many :folders
1515
has_many :snippet_folders, through: :folders

app/views/snippets/_snippet.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class="card--container card--container-padding snippet--container"
99
>
1010
<div class="snippet--author-wrapper">
11-
<%= render partial: 'users/preview', locals: { user: snippet.user, resource: snippet } %>
11+
<%= render partial: 'users/preview', locals: { user: snippet.user, object: snippet } %>
1212
<div>
1313
<div style="display: flex; flex-direction: column;">
1414
<div style="display: flex; justify-content: flex-end; margin-bottom: 8px; align-items: center;">

app/views/snippets/_snippet_preview.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
data-snippet-url="<%= snippet_path(snippet) %>"
88
class="card--container card--container-padding snippet--container-preview">
99
<div class="snippet--author-wrapper">
10-
<%= render partial: 'users/preview', locals: { user: snippet.user, resource: snippet } %>
10+
<%= render partial: 'users/preview', locals: { user: snippet.user, object: snippet } %>
1111
<div>
1212
<div style="display: flex; flex-direction: column;">
1313
<div style="display: flex; justify-content: flex-end; margin-bottom: 8px; align-items: center;">

app/views/snippets/show.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<% @snippet.comments.each do |comment| %>
55
<div id="<%= comment.client_id %>" class="card--container card--container-padding">
66
<div class="snippet--author-wrapper">
7-
<%= render partial: 'users/preview', locals: { user: comment.user, resource: comment } %>
7+
<%= render partial: 'users/preview', locals: { user: comment.user, object: comment } %>
88
<div>
99
<div style="display: flex; flex-direction: column;">
1010
<div style="display: flex; justify-content: flex-end; margin-bottom: 8px; align-items: center;">

app/views/users/_preview.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<span class="user-preview--summary-name"><%= user.name %></span>
2323
<% end %>
2424
</div>
25-
<% if defined?(resource) && resource.present? %>
26-
<span class="user-preview--summary-time-ago"><%= time_ago_in_words(resource.created_at) %> ago</span>
25+
<% if defined?(object) %>
26+
<span class="user-preview--summary-time-ago"><%= time_ago_in_words(object.created_at) %> ago</span>
2727
<% else %>
2828
<span class="user-preview--summary-time-ago"><%= user.name %></span>
2929
<% end %>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
class AddConfirmableToUsers < ActiveRecord::Migration[6.0]
2+
def up
3+
add_column :users, :confirmation_token, :string
4+
add_column :users, :confirmed_at, :datetime, default: -> { 'NOW()' }
5+
add_column :users, :confirmation_sent_at , :datetime, default: -> { 'NOW()' }
6+
add_column :users, :unconfirmed_email, :string
7+
8+
add_index :users, :confirmation_token, :unique => true
9+
end
10+
def down
11+
remove_index :users, :confirmation_token
12+
13+
remove_column :users, :unconfirmed_email
14+
remove_column :users, :confirmation_sent_at
15+
remove_column :users, :confirmed_at
16+
remove_column :users, :confirmation_token
17+
end
18+
end

db/schema.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema.define(version: 2020_07_01_181048) do
13+
ActiveRecord::Schema.define(version: 2020_12_30_115654) do
1414

1515
# These are extensions that must be enabled in order to support this database
1616
enable_extension "plpgsql"
@@ -104,6 +104,11 @@
104104
t.datetime "updated_at", precision: 6, null: false
105105
t.string "bio", default: "This user hasn't updated their bio yet."
106106
t.string "location", default: ""
107+
t.string "confirmation_token"
108+
t.datetime "confirmed_at", default: -> { "now()" }
109+
t.datetime "confirmation_sent_at", default: -> { "now()" }
110+
t.string "unconfirmed_email"
111+
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
107112
t.index ["email"], name: "index_users_on_email", unique: true
108113
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
109114
end

0 commit comments

Comments
 (0)