Commit e738a3f7 by Tan Phat Nguyen

Merge branch 'hungpt_register_and_login' into 'master'

Hungpt register and login

See merge request !3
parents b03a88fd aafbdb3b
......@@ -17,3 +17,6 @@
/yarn-error.log
.byebug_history
# Ignore application configuration
/config/application.yml
......@@ -44,14 +44,16 @@ end
group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'web-console', '>= 3.3.0'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'better_errors'
gem 'binding_of_caller'
gem 'devise'
gem 'figaro'
gem 'rubyzip'
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
......
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.1)
actionpack (= 5.1.1)
actioncable (5.1.2)
actionpack (= 5.1.2)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.1)
actionpack (= 5.1.1)
actionview (= 5.1.1)
activejob (= 5.1.1)
actionmailer (5.1.2)
actionpack (= 5.1.2)
actionview (= 5.1.2)
activejob (= 5.1.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.1)
actionview (= 5.1.1)
activesupport (= 5.1.1)
actionpack (5.1.2)
actionview (= 5.1.2)
activesupport (= 5.1.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.1)
activesupport (= 5.1.1)
actionview (5.1.2)
activesupport (= 5.1.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.1)
activesupport (= 5.1.1)
activejob (5.1.2)
activesupport (= 5.1.2)
globalid (>= 0.3.6)
activemodel (5.1.1)
activesupport (= 5.1.1)
activerecord (5.1.1)
activemodel (= 5.1.1)
activesupport (= 5.1.1)
activemodel (5.1.2)
activesupport (= 5.1.2)
activerecord (5.1.2)
activemodel (= 5.1.2)
activesupport (= 5.1.2)
arel (~> 8.0)
activesupport (5.1.1)
activesupport (5.1.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
......@@ -51,14 +51,14 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (9.0.6)
capybara (2.14.3)
capybara (2.14.4)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.7.0)
childprocess (0.7.1)
ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
coderay (1.1.1)
......@@ -71,10 +71,18 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
debug_inspector (0.0.3)
erubi (1.6.0)
devise (4.3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.2)
responders
warden (~> 1.2.3)
erubi (1.6.1)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.9.18)
figaro (1.1.1)
thor (~> 0.14)
globalid (0.4.0)
activesupport (>= 4.2.0)
i18n (0.8.4)
......@@ -96,42 +104,46 @@ GEM
mini_portile2 (2.2.0)
minitest (5.10.2)
multi_json (1.12.1)
mysql2 (0.4.6)
mysql2 (0.4.7)
nio4r (2.1.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
orm_adapter (0.5.0)
public_suffix (2.0.5)
puma (3.9.1)
rack (2.0.3)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.1.1)
actioncable (= 5.1.1)
actionmailer (= 5.1.1)
actionpack (= 5.1.1)
actionview (= 5.1.1)
activejob (= 5.1.1)
activemodel (= 5.1.1)
activerecord (= 5.1.1)
activesupport (= 5.1.1)
rails (5.1.2)
actioncable (= 5.1.2)
actionmailer (= 5.1.2)
actionpack (= 5.1.2)
actionview (= 5.1.2)
activejob (= 5.1.2)
activemodel (= 5.1.2)
activerecord (= 5.1.2)
activesupport (= 5.1.2)
bundler (>= 1.3.0, < 2.0)
railties (= 5.1.1)
railties (= 5.1.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.1.1)
actionpack (= 5.1.1)
activesupport (= 5.1.1)
railties (5.1.2)
actionpack (= 5.1.2)
activesupport (= 5.1.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
ruby_dep (1.5.0)
rubyzip (1.2.1)
sass (3.4.24)
......@@ -166,6 +178,8 @@ GEM
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
warden (1.2.7)
rack (>= 1.0)
web-console (3.5.1)
actionview (>= 5.0)
activemodel (>= 5.0)
......@@ -189,6 +203,8 @@ DEPENDENCIES
byebug
capybara (~> 2.13)
coffee-rails (~> 4.2)
devise
figaro
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
mysql2 (>= 0.3.18, < 0.5)
......
......@@ -14,3 +14,10 @@
*= require_self
*= require bootstrap
*/
.alert-alert {
@extend .alert-warning;
}
.alert-notice {
@extend .alert-info;
}
......@@ -31,3 +31,36 @@ input {
.total_jobs {
text-align: center;
}
.errors_panel {
margin-top: 50px;
}
.alert-error {
background-color: #f2dede;
border-color: #eed3d7;
color: #b94a48;
text-align: left;
}
.alert-alert {
background-color: #f2dede;
border-color: #eed3d7;
color: #b94a48;
text-align: left;
}
.alert-success {
background-color: #dff0d8;
border-color: #d6e9c6;
color: #468847;
text-align: left;
}
.alert-notice {
background-color: #dff0d8;
border-color: #d6e9c6;
color: #468847;
text-align: left;
}
// Place all the styles related to the Users controller here.
// Place all the styles related to the Jobs controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
class ConfirmationsController < Devise::ConfirmationsController
def update_confirm
@user = User.find_by(params[:user][:id])
@user.skip_password_validation = false
@user.skip_fullname_validation = false
if @user.update_attributes(user_params)
@user.update_attribute(:cv_name, params[:user][:cv_name].original_filename)
@user.save_file(params[:user][:cv_name])
set_flash_message!(:notice, :confirmed)
redirect_to root_path
else
render 'devise/confirmations/information', resource: @user
end
end
# GET /resource/confirmation?confirmation_token=abcdef
def show
self.resource = resource_class.confirm_by_token(params[:confirmation_token])
yield resource if block_given?
if resource.errors.empty?
set_flash_message!(:notice, :confirmed)
respond_with_navigational(resource){ render 'devise/confirmations/information', resource: resource }
else
respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
end
end
protected
def after_confirmation_path_for(resource_name, resource)
render 'devise/confirmations/information', resource: resource
end
private
def user_params
params.require(:user).permit(:email, :fullname, :password)
end
end
class JobsController < ApplicationController
def applied_jobs
@applied_jobs = Apply.where(user_id: current_user.id)
render :applied_jobs
end
end
class RegistrationsController < Devise::RegistrationsController
# POST /resource
def create
build_resource(sign_up_params)
resource.skip_password_validation = true
resource.skip_fullname_validation = true
resource.save
yield resource if block_given?
if resource.persisted?
if resource.active_for_authentication?
set_flash_message! :notice, :signed_up
sign_up(resource_name, resource)
respond_with resource, location: after_sign_up_path_for(resource)
else
set_flash_message! :notice, :"signed_up_but_#{resource.inactive_message}"
expire_data_after_sign_in!
respond_with resource, location: after_inactive_sign_up_path_for(resource)
end
else
clean_up_passwords resource
set_minimum_password_length
respond_with resource
end
end
def show
render :show
end
def download_file
send_file("#{Rails.root}/app/upload/#{current_user.cv_name}", filename: current_user.cv_name)
end
protected
def after_sign_up_path_for(resource)
new_user_registration_path
end
def after_inactive_sign_up_path_for(resource)
new_user_registration_path
end
end
class UsersController < ApplicationController
def new
@user = User.new
end
def create
@user = User.new(user_params)
if @user.save
# TODO
else
render 'new'
end
end
private
def user_params
params.require(:user).permit(:email, :password)
end
end
module DeviseHelper
def devise_error_messages!
return '' if resource.errors.empty?
messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
html = <<-HTML
<div class="alert alert-error alert-danger"> <button type="button"
class="close" data-dismiss="alert">×</button>
#{messages}
</div>
HTML
html.html_safe
end
end
class User < ApplicationRecord
validates :name, presence: true, length: { maximum: 50 }
attr_accessor :skip_password_validation, :skip_fullname_validation, :upload
# Include default devise modules. Others available are:
# :confirmable, :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable,
:confirmable, :lockable
VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
validates :email, presence: true, length: { maximum: 255 }, format: { with: VALID_EMAIL_REGEX }
validates :email, length: { maximum: 255 }, format: { with: VALID_EMAIL_REGEX }, uniqueness: true
validates_presence_of :fullname, message: "can't be empty", unless: :skip_fullname_validation
validates_presence_of :password, message: "can't be empty", unless: :skip_fullname_validation
def save_file(upload)
file_name = upload.original_filename if upload != ''
file = upload.read
upload_root = "#{Rails.root}/app/upload/"
File.open(upload_root + file_name, 'wb') do |f|
f.write(file)
end
end
end
<%- provide(:title, 'Complete information') -%>
<div class="well">
<h2>Register</h2>
<%= form_for(resource, url: confirmations_update_confirm_path(resource), html: { method: :post }, multipart: true) do |f| %>
<%= devise_error_messages! %>
<div class="form-group">
<%= f.label :email %>
<%= f.email_field :email, readonly: true, class: 'form-control' %>
<%= f.hidden_field :id %>
</div>
<div class="form-group">
<%= f.label :fullname, 'Full name' %>
<%= f.text_field :fullname, autofocus: true, class: 'form-control' %>
</div>
<div class="form-group">
<%= f.label :password %><br />
<%= f.password_field :password, autocomplete: "off", class: 'form-control' %>
</div>
<div class="form-group">
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation, autocomplete: "off", class: 'form-control' %>
</div>
<div class="form-group">
<%= f.label :cv_name %>
<%= f.file_field :cv_name, class: 'form-control' %>
</div>
<div class="actions">
<%= f.submit "Register", class: 'btn btn-primary' %>
</div>
<%- end -%>
</div>
<%- provide(:title, 'Invalid link') -%>
<div class="well">
<h2>Register</h2>
<p>
Link invalid
</p>
</div>
<p>You're on your way!</p>
<p>Let's confirm your email address.</p>
<p> By clicking on the following link, you are confirming your email address and agreeing to VeNJOB's Terms of Service. </p>
<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
<p>Hello <%= @email %>!</p>
<% if @resource.try(:unconfirmed_email?) %>
<p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p>
<% else %>
<p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p>
<% end %>
<p>Dear <%= @resource.email %>,</p>
<p>You have a new password!</p>
<p>Your password for signing in to VenJOB was recently changed. If you made this change, then we're all set. </p>
<p>If you did not make this change, please reset your password to secure your account. Then reply to this email to notify us.</p>
<p>Either way, feel free to reach out with any questions you might have. We're here to help.</p>
<p>Best,</p>
<p>We received a request to reset the password associated with this e-mail address. If you made this request, please follow the instructions below.</p>
<p>Click the link below to reset your password using our secure server:</p>
<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
<p>If you did not request to have your password reset you can safely ignore this email. Rest assured your account is safe.</p>
<p>Please also be noted that the above link is valid for 24 hours.</p>
<p>
Best,
</p>
<p>Hello <%= @resource.email %>!</p>
<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
<p>Click the link below to unlock your account:</p>
<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
<%- provide(:title, 'Change password') -%>
<div class="well">
<h2>Change your password</h2>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
<%= devise_error_messages! %>
<%= f.hidden_field :reset_password_token %>
<div class="form-group">
<%= f.label :password, "New password" %>
<%= f.password_field :password, autofocus: true, autocomplete: "off", class: 'form-control' %>
</div>
<div class="form-group">
<%= f.label :password_confirmation, "Confirm new password" %>
<%= f.password_field :password_confirmation, autocomplete: "off", class: 'form-control' %>
</div>
<div class="actions">
<%= f.submit "Change my password", class: 'btn btn-primary' %>
</div>
<% end %>
</div>
<%- provide(:title, 'Forgot password') -%>
<div class="well">
<h2>Forgot your password?</h2>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>
<div class="form-group">
<%= f.label :email %>
<%= f.email_field :email, autofocus: true, class: 'form-control' %>
</div>
<div class="actions">
<%= f.submit "Send", class: 'btn btn-primary' %>
</div>
<% end %>
</div>
<%- provide(:title, 'My Page') -%>
<div class="well">
<h2>My Page</h2>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
<%= devise_error_messages! %>
<div class="form-group">
<%= f.label :email %><br />
<%= f.email_field :email, autofocus: true, class: 'form-control' %>
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
<div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
<% end %>
</div>
<div class="form-group">
<%= f.label :fullname %>
<%= f.text_field :fullname, class: 'form-control' %>
</div>
<div class="form-group">
<%= f.label :cv_name %>
<%= f.file_field :cv_name, class: 'form-control' %>
</div>
<div class="form-group">
<%= f.label :password, 'New password' %><br />
<%= f.password_field :password, autocomplete: "off", class: 'form-control' %>
</div>
<div class="form-group">
<%= f.label :current_password, 'Old password' %>
<%= f.password_field :current_password, autocomplete: "off", class: 'form-control' %>
</div>
<%= f.submit "Update", class: 'btn btn-primary' %>
<% end %>
</div>
<%- provide(:title, 'Register') -%>
<div class="well">
<h2>Register</h2>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
<div class="form-group">
<%= f.label :email %><br />
<%= f.email_field :email, autofocus: true, class: 'form-control' %>
</div>
<div class="actions">
<%= f.submit "Confirm your email", class: 'btn btn-primary' %>
</div>
<% end %>
</div>
<%- provide(:title, 'My Page') -%>
<div class="well">
<h2>My Page</h2>
<div class="form-group">
<label>Email</label><br />
<input type="text" value="<%= current_user.email %>", class="form-control", readonly/>
</div>
<div class="form-group">
<label>Full name</label><br />
<input type="text" value="<%= current_user.fullname %>", class="form-control", readonly/>
</div>
<div class="form-group">
<label>Cv name</label><br />
<%= link_to current_user.cv_name, registrations_download_file_path %>
</div>
<div class="form-group">
<a class="btn btn-primary" href="<%= edit_user_registration_path %>">Update</a>
<a class="btn btn-primary" href="<%= jobs_applied_jobs_path %>">My Jobs</a>
</div>
</div>
<%- provide(:title, 'Login') -%>
<div class="well">
<h2>Log in</h2>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="form-group">
<%= f.label :email %>
<%= f.email_field :email, autofocus: true, class: 'form-control' %>
</div>
<div class="form-group">
<%= f.label :password %><br />
<%= f.password_field :password, autocomplete: "off", class: 'form-control' %>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
<%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
<% end -%>
</div>
<div class="form_group">
<%= f.submit "Log in", class: 'btn btn-primary' %>
<%= link_to 'Register', new_user_registration_path, class: 'btn btn-primary'%>
</div>
<% end %>
</div>
<%- if controller_name != 'sessions' %>
<%= link_to "Log in", new_session_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.omniauthable? %>
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
<% end -%>
<h2>Resend unlock instructions</h2>
<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>
<div class="field">
<%= f.label :email %><br />
<%= f.email_field :email, autofocus: true %>
</div>
<div class="actions">
<%= f.submit "Resend unlock instructions" %>
</div>
<% end %>
<%= render "devise/shared/links" %>
<%- provide(:title, 'Applied jobs') -%>
<div class="well">
<h2>Applied Jobs</h2>
<%- @applied_jobs.each do |apply| -%>
<div class="row">
<%= apply.job.name %>
</div>
<div class="row">
<%= truncate(apply.job.description, length: 250) %>
</div>
<div class="row">
<div class="col-md-4">
<%= apply.job.city.name unless job.city.nil? %>
</div>
<div class="col-md-4">
<%= apply.job.salary %>
</div>
<div class="col-md-4">
<%= apply.job.applied_at %>
</div>
</div>
<%- end -%>
</div>
......@@ -3,8 +3,13 @@
<%= link_to image_tag('', alt: 'veNJOB'), root_path, id: 'logo' %>
<nav>
<ul class="nav navbar-nav navbar-right">
<li> <%= link_to 'Login', login_path %> </li>
<li> <%= link_to 'Register', register_path %> </li>
<%- if user_signed_in? -%>
<li> <%= link_to 'My profile', registrations_show_path %> </li>
<li> <%= link_to 'Log out', destroy_user_session_path, method: :delete %> </li>
<%- else -%>
<li> <%= link_to 'Login', new_user_session_path %> </li>
<li> <%= link_to 'Register', new_user_registration_path %> </li>
<%- end -%>
<li> <%= link_to 'Favorite', '#' %> </li>
<li> <%= link_to 'History', '#' %> </li>
</ul>
......
......@@ -11,6 +11,14 @@
<body>
<%= render 'layouts/header' %>
<div class="container">
<div class="errors_panel">
<% flash.each do |key, value| %>
<div class="alert alert-<%= key %>">
<%= value %>
</div>
<% end %>
</div>
<%= yield %>
<%= render 'layouts/footer' %>
</div>
......
......@@ -23,7 +23,7 @@
<%= job.salary %>
</div>
<div class="col-md-3">
<%= job.city.name %>
<%= job.city.name unless job.city.nil? %>
</div>
<div class="col-md-4">
<%= truncate(job.description, length: 250) %>
......
<%- provide(:title, 'Register') -%>
<div class="well">
<h2>Register</h2>
<%= form_for(@user) do |f| %>
<div class="row">
<div class="col-md-6 col-md-offset-3">
<%= f.label :email%>
<%= f.email_field :email, size: 50, maxlength: 255 %>
</div>
</div>
<div class="row">
<div class="col-md-6 col-md-offset-5">
<%= f.submit 'Confirm your email', class: 'btn btn-primary' %>
</div>
</div>
<%- end -%>
</div>
USER_NAME
USER_PASSWORD
......@@ -27,7 +27,20 @@ Rails.application.configure do
end
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false
config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = true
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
config.action_mailer.delivery_method = :smtp
config.action_mailer.default charset: 'utf-8'
config.action_mailer.smtp_settings = {
address: 'smtp.gmail.com',
port: 587,
domain: 'zigexn.vn',
user_name: ENV['USER_NAME'],
password: ENV['USER_PASSWORD'],
authentication: 'plain',
enable_starttls_auto: true
}
config.action_mailer.perform_caching = false
......
# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
en:
devise:
confirmations:
confirmed: "Your email address has been successfully confirmed. Please update information to complete!"
send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
failure:
already_authenticated: "You are already signed in."
inactive: "Your account is not activated yet."
invalid: "Invalid %{authentication_keys} or password."
locked: "Your account is locked."
last_attempt: "You have one more attempt before your account is locked."
not_found_in_database: "Invalid %{authentication_keys} or password."
timeout: "Your session expired. Please sign in again to continue."
unauthenticated: "You need to sign in or sign up before continuing."
unconfirmed: "You have to confirm your email address before continuing."
mailer:
confirmation_instructions:
subject: "Welcome To VeNJOB! Confirm Your Email"
reset_password_instructions:
subject: "VeNJOB Password Assistance"
unlock_instructions:
subject: "Unlock instructions"
email_changed:
subject: "Email Changed"
password_change:
subject: "VeNJOB Password Assistance: Your password has been reset"
omniauth_callbacks:
failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
success: "Successfully authenticated from %{kind} account."
passwords:
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
updated: "Your password has been changed successfully. You are now signed in."
updated_not_active: "Your password has been changed successfully."
registrations:
destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
signed_up: "Welcome! You have signed up successfully."
signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
signed_up_but_unconfirmed: "Thank you for register our service, an confirmation email with registration linkhas been sent to your email. Please check your email within 24 hours. Please note that the registration link is only valid for 24 hours. Over that period, you will have to register your email again."
update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
updated: "Your account has been updated successfully."
sessions:
signed_in: "Signed in successfully."
signed_out: "Signed out successfully."
already_signed_out: "Signed out successfully."
unlocks:
send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
unlocked: "Your account has been unlocked successfully. Please sign in to continue."
errors:
messages:
already_confirmed: "was already confirmed, please try signing in"
confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
expired: "has expired, please request a new one"
not_found: "not found"
not_locked: "was not locked"
not_saved:
one: "1 error prohibited this %{resource} from being saved:"
other: "%{count} errors prohibited this %{resource} from being saved:"
......@@ -30,4 +30,8 @@
# available at http://guides.rubyonrails.org/i18n.html.
en:
hello: "Hello world"
activerecord:
attributes:
user:
fullname: "Full Name"
current_password: 'Old password'
......@@ -2,18 +2,17 @@ Rails.application.routes.draw do
root 'static_pages#home'
get 'static_pages/home'
get '/register', to: 'users#new'
post '/register', to: 'users#create'
get '/cities', to: 'cities#show'
get '/categories', to: 'categories#show'
get 'jobs/applied_jobs'
get '/login', to: 'sessions#new'
post '/login', to: 'sessions#create'
delete '/logout', to: 'sessions#destroy'
resource :users
resource :cities
devise_scope :user do
post '/confirmations/update_confirm', to: 'confirmations#update_confirm'
get '/registrations/show', to: 'registrations#show'
get '/registrations/download_file', to: 'registrations#download_file'
end
devise_for :users, controllers: { registrations: 'registrations',
confirmations: 'confirmations' }
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
end
class CreateUsers < ActiveRecord::Migration[5.1]
def change
create_table :users do |t|
t.string :email
t.string :password
t.string :fullname
t.string :reset_digest
t.datetime :reset_sent_at
t.string :activation_digest
t.boolean :activated
t.datetime :activated_at
t.boolean :admin
t.string :cv_name
......
class AddDeviseToUsers < ActiveRecord::Migration[5.1]
def self.up
change_table :users do |t|
## Database authenticatable
t.string :email, default: ''
t.string :encrypted_password, null: false, default: ''
## Recoverable
t.string :reset_password_token
t.datetime :reset_password_sent_at
## Rememberable
t.datetime :remember_created_at
## Trackable
t.integer :sign_in_count, default: 0, null: false
t.datetime :current_sign_in_at
t.datetime :last_sign_in_at
t.string :current_sign_in_ip
t.string :last_sign_in_ip
## Confirmable
t.string :confirmation_token
t.datetime :confirmed_at
t.datetime :confirmation_sent_at
t.string :unconfirmed_email # Only if using reconfirmable
## Lockable
t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
t.string :unlock_token # Only if unlock strategy is :email or :both
t.datetime :locked_at
# Uncomment below if timestamps were not included in your original model.
# t.timestamps null: false
end
add_index :users, :email, unique: true
add_index :users, :reset_password_token, unique: true
add_index :users, :confirmation_token, unique: true
add_index :users, :unlock_token, unique: true
end
def self.down
# By default, we don't want to make any assumption about how to roll back a migration when your
# model already existed. Please edit below which fields you would like to remove in this migration.
raise ActiveRecord::IrreversibleMigration
end
end
......@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20170628020034) do
ActiveRecord::Schema.define(version: 20170705034837) do
create_table "applies", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
t.bigint "user_id"
......@@ -124,18 +124,33 @@ ActiveRecord::Schema.define(version: 20170628020034) do
end
create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
t.string "email"
t.string "password"
t.string "fullname"
t.string "reset_digest"
t.datetime "reset_sent_at"
t.string "activation_digest"
t.boolean "activated"
t.datetime "activated_at"
t.boolean "admin"
t.string "cv_name"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "email", default: ""
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.string "confirmation_token"
t.datetime "confirmed_at"
t.datetime "confirmation_sent_at"
t.string "unconfirmed_email"
t.integer "failed_attempts", default: 0, null: false
t.string "unlock_token"
t.datetime "locked_at"
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
t.index ["unlock_token"], name: "index_users_on_unlock_token", unique: true
end
end
This source diff could not be displayed because it is too large. You can view the blob instead.
require 'test_helper'
class UsersControllerTest < ActionDispatch::IntegrationTest
test "should get new" do
get users_new_url
class JobsControllerTest < ActionDispatch::IntegrationTest
test "should get applied_jobs" do
get jobs_applied_jobs_url
assert_response :success
end
......
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