diff --git a/Gemfile b/Gemfile
index b67c4e6..4ab53f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,11 +2,13 @@ ruby("2.2.2")
source("https://rubygems.org")
gem("aasm")
+gem("devise")
gem("haml")
gem("haml-rails")
gem("jbuilder", "~> 2.0")
gem("jquery-rails")
gem("jquery-ui-rails")
+gem("paperclip")
gem("pg")
gem("rack-cors")
gem("rails", "4.2.1")
diff --git a/Gemfile.lock b/Gemfile.lock
index 5a91ee9..406a140 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,6 +42,7 @@ GEM
ast (2.1.0)
astrolabe (1.3.1)
parser (~> 2.2)
+ bcrypt (3.1.10)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
@@ -58,7 +59,11 @@ GEM
xpath (~> 2.0)
childprocess (0.5.6)
ffi (~> 1.0, >= 1.0.11)
+ climate_control (0.0.3)
+ activesupport (>= 3.0)
cliver (0.3.2)
+ cocaine (0.5.7)
+ climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
@@ -82,6 +87,13 @@ GEM
rails (>= 3, < 5)
database_cleaner (1.4.1)
debug_inspector (0.0.2)
+ devise (3.5.2)
+ bcrypt (~> 3.0)
+ orm_adapter (~> 0.1)
+ railties (>= 3.2.6, < 5)
+ responders
+ thread_safe (~> 0.1)
+ warden (~> 1.2.3)
diff-lcs (1.2.5)
dotenv (2.0.2)
easy_translate (0.5.0)
@@ -162,6 +174,7 @@ GEM
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.6.1)
+ mimemagic (0.3.0)
mini_portile (0.6.2)
minitest (5.8.0)
multi_json (1.11.2)
@@ -172,6 +185,13 @@ GEM
notiffany (0.0.7)
nenv (~> 0.1)
shellany (~> 0.0)
+ orm_adapter (0.5.0)
+ paperclip (4.3.1)
+ activemodel (>= 3.2.0)
+ activesupport (>= 3.2.0)
+ cocaine (~> 0.5.5)
+ mime-types
+ mimemagic (= 0.3.0)
parser (2.2.2.6)
ast (>= 1.1, < 3.0)
pg (0.18.2)
@@ -220,6 +240,8 @@ GEM
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdoc (4.2.0)
+ responders (2.1.0)
+ railties (>= 4.2.0, < 5)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
@@ -283,6 +305,8 @@ GEM
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
+ warden (1.2.3)
+ rack (>= 1.0)
web-console (2.2.1)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
@@ -304,6 +328,7 @@ DEPENDENCIES
byebug
cucumber-rails
database_cleaner
+ devise
dotenv
faker
foreman
@@ -317,6 +342,7 @@ DEPENDENCIES
jquery-rails
jquery-ui-rails
launchy
+ paperclip
pg
poltergeist
puma
diff --git a/app/assets/stylesheets/forms.css b/app/assets/stylesheets/forms.css
index b6c0215..a88931b 100644
--- a/app/assets/stylesheets/forms.css
+++ b/app/assets/stylesheets/forms.css
@@ -7,7 +7,7 @@ input {
font-family: 'Open Sans Condensed', sans-serif;
}
-.fill-me-in {
+.fill-me-in, .upload-me {
background-color: rgba(255, 255, 255, 0.03);
padding: 0.2em 1em;
margin-bottom: 0.6em;
@@ -20,7 +20,7 @@ input {
width: 30%;
}
-.fill-me-in input[type=text],input[type=number] {
+.fill-me-in input[type=text],input[type=number],input[type=email],input[type=password] {
width: 60%;
position: absolute;
padding: 0.5em 5%;
@@ -33,6 +33,35 @@ input {
color: rgba(255, 255, 255, 0.6);
}
+.upload-me label {
+ margin-right: 1em;
+ display: inline-block;
+ width: 30%;
+}
+
+.upload-me input[type=file]::-webkit-file-upload-button {
+ visibility: hidden;
+}
+.upload-me input[type=file]{
+ width: 60%;
+ position: absolute;
+ padding: 0.5em 5%;
+ font-size: 1em;
+ top: -0.2em;
+ bottom: -0.2em;
+ right: -0.2em;
+ text-decoration: none;
+ color: rgba(255, 255, 255, 0.8);
+ border: 1px dashed rgba(255, 255, 255, 0.2);
+ background-color: rgba(114, 166, 73, 0.60);
+ transition: 0.4s;
+ display: inline-block;
+ background-image:
+ linear-gradient(60deg, rgba(0,0,0,.1) 25%, transparent 25%, transparent 75%, rgba(0,0,0,.1) 75%, rgba(0,0,0,.1)),
+ linear-gradient(120deg, rgba(0,0,0,.1) 25%, transparent 25%, transparent 75%, rgba(0,0,0,.1) 75%, rgba(0,0,0,.1));
+ background-size: 70px 120px;
+}
+
.fill-me-in input:valid {
color: rgba(255, 255, 255, 1);
background-color: rgba(255, 255, 255, 0.1);
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 852bb80..c60f72f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,4 +2,11 @@ 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?
+
+ def configure_permitted_parameters
+ devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(:avatar, :email, :name, :password, :password_confirmation, :remember_me) }
+ devise_parameter_sanitizer.for(:account_update) { |u| u.permit(:avatar, :email, :name, :password, :password_confirmation, :current_password) }
+ end
end
diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 0000000..bf47ac5
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,11 @@
+class User < ActiveRecord::Base
+ # Include default devise modules. Others available are:
+ # :confirmable, :lockable, :timeoutable and :omniauthable
+ devise :database_authenticatable, :registerable,
+ :recoverable, :rememberable, :trackable, :validatable
+
+ validates :name, presence: true
+
+ has_attached_file :avatar, styles: { medium: "300x300>", thumb: "100x100>" }, default_url: "/images/:style/missing.png"
+ validates_attachment :avatar, content_type: { content_type: ["image/jpeg", "image/gif", "image/png"] }
+end
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
new file mode 100644
index 0000000..fbed6bc
--- /dev/null
+++ b/app/views/devise/confirmations/new.html.erb
@@ -0,0 +1,16 @@
+Resend confirmation instructions
+
+<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
+
+
+
+ <%= f.submit "Resend confirmation instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
new file mode 100644
index 0000000..dc55f64
--- /dev/null
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -0,0 +1,5 @@
+Welcome <%= @email %>!
+
+You can confirm your account email through the link below:
+
+<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
new file mode 100644
index 0000000..f667dc1
--- /dev/null
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -0,0 +1,8 @@
+Hello <%= @resource.email %>!
+
+Someone has requested a link to change your password. You can do this through the link below.
+
+<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>
+
+If you didn't request this, please ignore this email.
+Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
new file mode 100644
index 0000000..41e148b
--- /dev/null
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -0,0 +1,7 @@
+Hello <%= @resource.email %>!
+
+Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+
+Click the link below to unlock your account:
+
+<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
new file mode 100644
index 0000000..75006ba
--- /dev/null
+++ b/app/views/devise/passwords/edit.html.erb
@@ -0,0 +1,25 @@
+Change your password
+
+<%= 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 %>
+
+
+ <%= f.label :password, "New password" %>
+ <% if @minimum_password_length %>
+ (<%= @minimum_password_length %> characters minimum)
+ <% end %>
+ <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+
+
+
+ <%= f.label :password_confirmation, "Confirm new password" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %>
+
+
+
+ <%= f.submit "Change my password" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
new file mode 100644
index 0000000..d32b652
--- /dev/null
+++ b/app/views/devise/passwords/new.html.erb
@@ -0,0 +1,16 @@
+Forgot your password?
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %>
+
+
+
+ <%= f.submit "Send me reset password instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml
new file mode 100644
index 0000000..f828b87
--- /dev/null
+++ b/app/views/devise/registrations/edit.html.haml
@@ -0,0 +1,23 @@
+= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
+ = devise_error_messages!
+ .fill-me-in
+ = f.label t("devise.name")
+ = f.text_field :name
+ .fill-me-in
+ = f.label t("devise.email")
+ %br/
+ = f.email_field :email
+ .fill-me-in
+ = f.label t("devise.edit.password")
+ = f.password_field :password
+ .fill-me-in
+ = f.label t("devise.password_confirmation")
+ = f.password_field :password_confirmation
+ .fill-me-in
+ = f.label t("devise.edit.current_password")
+ = f.password_field :current_password
+ .upload-me
+ = f.label t("devise.image")
+ = f.file_field :avatar
+ .actions
+ = f.submit t("devise.update")
\ No newline at end of file
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
new file mode 100644
index 0000000..e018b67
--- /dev/null
+++ b/app/views/devise/registrations/new.html.haml
@@ -0,0 +1,22 @@
+%h2
+ = t("devise.signup")
+= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+ = devise_error_messages!
+ .fill-me-in
+ = f.label t("devise.name")
+ = f.text_field :name, autofocus: true
+ .fill-me-in
+ = f.label t("devise.email")
+ = f.email_field :email, autofocus: "off"
+ .fill-me-in
+ = f.label t("devise.password")
+ = f.password_field :password, autocomplete: "off"
+ .fill-me-in
+ = f.label t("devise.password_confirmation")
+ = f.password_field :password_confirmation, autocomplete: "off"
+ .upload-me
+ = f.label t("devise.image")
+ = f.file_field :avatar
+ .actions
+ = f.submit t("devise.signup")
+= render "devise/shared/links"
\ No newline at end of file
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
new file mode 100644
index 0000000..6ffd2cd
--- /dev/null
+++ b/app/views/devise/sessions/new.html.haml
@@ -0,0 +1,13 @@
+%h2
+ = t("devise.signin")
+= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+ = devise_error_messages!
+ .fill-me-in
+ = f.label t("devise.email")
+ = f.email_field :email, autofocus: true
+ .fill-me-in
+ = f.label t("devise.password")
+ = f.password_field :password, autocomplete: "off"
+ .actions
+ = f.submit t("devise.signin")
+ = render "devise/shared/links"
diff --git a/app/views/devise/shared/_links.html.haml b/app/views/devise/shared/_links.html.haml
new file mode 100644
index 0000000..fd74d0d
--- /dev/null
+++ b/app/views/devise/shared/_links.html.haml
@@ -0,0 +1,15 @@
+- if devise_mapping.registerable? && controller_name != 'registrations'
+ = link_to t("devise.signup"), new_registration_path(resource_name)
+%br/
+- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
+ = link_to t("devise.forgot_your_password"), new_password_path(resource_name)
+%br/
+- if devise_mapping.confirmable? && controller_name != 'confirmations'
+ = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
+%br/
+- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+ = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
+%br/
+- if devise_mapping.omniauthable?
+ - resource_class.omniauth_providers.each do |provider|
+ = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
new file mode 100644
index 0000000..0a32dae
--- /dev/null
+++ b/app/views/devise/unlocks/new.html.erb
@@ -0,0 +1,16 @@
+Resend unlock instructions
+
+<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %>
+
+
+
+ <%= f.submit "Resend unlock instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index f11442a..bc586ec 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,9 +1,13 @@
%section#welcome-treatment
- %h1.logo
- %span.keep KEEP
- %br
- %span.delivering DELIVERING
-
+ - if user_signed_in?
+ = image_tag current_user.avatar.url(:medium)
+ %h2
+ = t("home.welcome" , {name: current_user.name})
+ - else
+ %h1.logo
+ %span.keep KEEP
+ %br
+ %span.delivering DELIVERING
%p
- mission_link = link_to(t("home.index.description.mission_link"), glossary_path({ anchor: :mission }))
- deliverable_link = link_to(t("home.index.description.deliverable_link"), glossary_path({ anchor: :deliverable }))
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8dff45a..ce57db1 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -30,6 +30,11 @@
%ul
%li= link_to(t("nav.browse"), missions_path)
%li= link_to(t("nav.glossary"), glossary_path)
+ - if user_signed_in?
+ %li= link_to(t("nav.edit_profile"), edit_user_registration_path )
+ %li= link_to(t("nav.sign_out"), destroy_user_session_path, :method => :delete)
+ - else
+ %li= link_to(t("nav.sign_in"), new_user_session_path)
%section#content{ tabindex: -1 }
= yield
@@ -42,4 +47,4 @@
%p
- copyright1984_link = link_to("copyright1984", "http://copyright1984.com")
- = t("footer.copyright_html", { year: Time.now.year, copyright1984_link: copyright1984_link })
+ = t("footer.copyright_html", { year: Time.now.year, copyright1984_link: copyright1984_link })
\ No newline at end of file
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 7d34c0b..922398e 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -16,7 +16,8 @@ data:
# Locale files or `File.find` patterns where translations are read from:
read:
## Default:
- # - config/locales/%{locale}.yml
+ - config/locales/%{locale}.yml
+ - config/locales/*.%{locale}.yml
## More files:
# - config/locales/**/*.%{locale}.yml
## Another gem (replace %#= with %=):
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/001_backtrace_silencers.rb
similarity index 100%
rename from config/initializers/backtrace_silencers.rb
rename to config/initializers/001_backtrace_silencers.rb
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/002_cookies_serializer.rb
similarity index 100%
rename from config/initializers/cookies_serializer.rb
rename to config/initializers/002_cookies_serializer.rb
diff --git a/config/initializers/dotenv.rb b/config/initializers/003_dotenv.rb
similarity index 100%
rename from config/initializers/dotenv.rb
rename to config/initializers/003_dotenv.rb
diff --git a/config/initializers/004_devise.rb b/config/initializers/004_devise.rb
new file mode 100644
index 0000000..1a343f9
--- /dev/null
+++ b/config/initializers/004_devise.rb
@@ -0,0 +1,262 @@
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+ # The secret key used by Devise. Devise uses this key to generate
+ # random tokens. Changing this key will render invalid all existing
+ # confirmation, reset password and unlock tokens in the database.
+ # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
+ # by default. You can change it below and use your own secret key.
+ # config.secret_key = 'fc71f96e24ba289f789e46f279c60c124eb4d07205c55795b7799856cbf7792653e4e464cf8aad7459f590947c328d9d5129a18aed24bb0a88c228756876d92f'
+
+ # ==> Mailer Configuration
+ # Configure the e-mail address which will be shown in Devise::Mailer,
+ # note that it will be overwritten if you use your own mailer class
+ # with default "from" parameter.
+ config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+
+ # Configure the class responsible to send e-mails.
+ # config.mailer = 'Devise::Mailer'
+
+ # ==> ORM configuration
+ # Load and configure the ORM. Supports :active_record (default) and
+ # :mongoid (bson_ext recommended) by default. Other ORMs may be
+ # available as additional gems.
+ require 'devise/orm/active_record'
+
+ # ==> Configuration for any authentication mechanism
+ # Configure which keys are used when authenticating a user. The default is
+ # just :email. You can configure it to use [:username, :subdomain], so for
+ # authenticating a user, both parameters are required. Remember that those
+ # parameters are used only when authenticating and not when retrieving from
+ # session. If you need permissions, you should implement that in a before filter.
+ # You can also supply a hash where the value is a boolean determining whether
+ # or not authentication should be aborted when the value is not present.
+ # config.authentication_keys = [:email]
+
+ # Configure parameters from the request object used for authentication. Each entry
+ # given should be a request method and it will automatically be passed to the
+ # find_for_authentication method and considered in your model lookup. For instance,
+ # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+ # The same considerations mentioned for authentication_keys also apply to request_keys.
+ # config.request_keys = []
+
+ # Configure which authentication keys should be case-insensitive.
+ # These keys will be downcased upon creating or modifying a user and when used
+ # to authenticate or find a user. Default is :email.
+ config.case_insensitive_keys = [:email]
+
+ # Configure which authentication keys should have whitespace stripped.
+ # These keys will have whitespace before and after removed upon creating or
+ # modifying a user and when used to authenticate or find a user. Default is :email.
+ config.strip_whitespace_keys = [:email]
+
+ # Tell if authentication through request.params is enabled. True by default.
+ # It can be set to an array that will enable params authentication only for the
+ # given strategies, for example, `config.params_authenticatable = [:database]` will
+ # enable it only for database (email + password) authentication.
+ # config.params_authenticatable = true
+
+ # Tell if authentication through HTTP Auth is enabled. False by default.
+ # It can be set to an array that will enable http authentication only for the
+ # given strategies, for example, `config.http_authenticatable = [:database]` will
+ # enable it only for database authentication. The supported strategies are:
+ # :database = Support basic authentication with authentication key + password
+ # config.http_authenticatable = false
+
+ # If 401 status code should be returned for AJAX requests. True by default.
+ # config.http_authenticatable_on_xhr = true
+
+ # The realm used in Http Basic Authentication. 'Application' by default.
+ # config.http_authentication_realm = 'Application'
+
+ # It will change confirmation, password recovery and other workflows
+ # to behave the same regardless if the e-mail provided was right or wrong.
+ # Does not affect registerable.
+ # config.paranoid = true
+
+ # By default Devise will store the user in session. You can skip storage for
+ # particular strategies by setting this option.
+ # Notice that if you are skipping storage for all authentication paths, you
+ # may want to disable generating routes to Devise's sessions controller by
+ # passing skip: :sessions to `devise_for` in your config/routes.rb
+ config.skip_session_storage = [:http_auth]
+
+ # By default, Devise cleans up the CSRF token on authentication to
+ # avoid CSRF token fixation attacks. This means that, when using AJAX
+ # requests for sign in and sign up, you need to get a new CSRF token
+ # from the server. You can disable this option at your own risk.
+ # config.clean_up_csrf_token_on_authentication = true
+
+ # ==> Configuration for :database_authenticatable
+ # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+ # using other encryptors, it sets how many times you want the password re-encrypted.
+ #
+ # Limiting the stretches to just one in testing will increase the performance of
+ # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+ # a value less than 10 in other environments. Note that, for bcrypt (the default
+ # encryptor), the cost increases exponentially with the number of stretches (e.g.
+ # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+ config.stretches = Rails.env.test? ? 1 : 10
+
+ # Setup a pepper to generate the encrypted password.
+ # config.pepper = '0eb9c0d9816512ca981c481fa8a36a0e4278d4067715c4c73294009d1b4177bf90f74338740c6fcebb74034e52eb4592b0c552b9bf9d1f4e714f320ddd09a692'
+
+ # ==> Configuration for :confirmable
+ # A period that the user is allowed to access the website even without
+ # confirming their account. For instance, if set to 2.days, the user will be
+ # able to access the website for two days without confirming their account,
+ # access will be blocked just in the third day. Default is 0.days, meaning
+ # the user cannot access the website without confirming their account.
+ # config.allow_unconfirmed_access_for = 2.days
+
+ # A period that the user is allowed to confirm their account before their
+ # token becomes invalid. For example, if set to 3.days, the user can confirm
+ # their account within 3 days after the mail was sent, but on the fourth day
+ # their account can't be confirmed with the token any more.
+ # Default is nil, meaning there is no restriction on how long a user can take
+ # before confirming their account.
+ # config.confirm_within = 3.days
+
+ # If true, requires any email changes to be confirmed (exactly the same way as
+ # initial account confirmation) to be applied. Requires additional unconfirmed_email
+ # db field (see migrations). Until confirmed, new email is stored in
+ # unconfirmed_email column, and copied to email column on successful confirmation.
+ config.reconfirmable = true
+
+ # Defines which key will be used when confirming an account
+ # config.confirmation_keys = [:email]
+
+ # ==> Configuration for :rememberable
+ # The time the user will be remembered without asking for credentials again.
+ # config.remember_for = 2.weeks
+
+ # Invalidates all the remember me tokens when the user signs out.
+ config.expire_all_remember_me_on_sign_out = true
+
+ # If true, extends the user's remember period when remembered via cookie.
+ # config.extend_remember_period = false
+
+ # Options to be passed to the created cookie. For instance, you can set
+ # secure: true in order to force SSL only cookies.
+ # config.rememberable_options = {}
+
+ # ==> Configuration for :validatable
+ # Range for password length.
+ config.password_length = 8..72
+
+ # Email regex used to validate email formats. It simply asserts that
+ # one (and only one) @ exists in the given string. This is mainly
+ # to give user feedback and not to assert the e-mail validity.
+ # config.email_regexp = /\A[^@]+@[^@]+\z/
+
+ # ==> Configuration for :timeoutable
+ # The time you want to timeout the user session without activity. After this
+ # time the user will be asked for credentials again. Default is 30 minutes.
+ # config.timeout_in = 30.minutes
+
+ # ==> Configuration for :lockable
+ # Defines which strategy will be used to lock an account.
+ # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+ # :none = No lock strategy. You should handle locking by yourself.
+ # config.lock_strategy = :failed_attempts
+
+ # Defines which key will be used when locking and unlocking an account
+ # config.unlock_keys = [:email]
+
+ # Defines which strategy will be used to unlock an account.
+ # :email = Sends an unlock link to the user email
+ # :time = Re-enables login after a certain amount of time (see :unlock_in below)
+ # :both = Enables both strategies
+ # :none = No unlock strategy. You should handle unlocking by yourself.
+ # config.unlock_strategy = :both
+
+ # Number of authentication tries before locking an account if lock_strategy
+ # is failed attempts.
+ # config.maximum_attempts = 20
+
+ # Time interval to unlock the account if :time is enabled as unlock_strategy.
+ # config.unlock_in = 1.hour
+
+ # Warn on the last attempt before the account is locked.
+ # config.last_attempt_warning = true
+
+ # ==> Configuration for :recoverable
+ #
+ # Defines which key will be used when recovering the password for an account
+ # config.reset_password_keys = [:email]
+
+ # Time interval you can reset your password with a reset password key.
+ # Don't put a too small interval or your users won't have the time to
+ # change their passwords.
+ config.reset_password_within = 6.hours
+
+ # When set to false, does not sign a user in automatically after their password is
+ # reset. Defaults to true, so a user is signed in automatically after a reset.
+ # config.sign_in_after_reset_password = true
+
+ # ==> Configuration for :encryptable
+ # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+ # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+ # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+ # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+ # REST_AUTH_SITE_KEY to pepper).
+ #
+ # Require the `devise-encryptable` gem when using anything other than bcrypt
+ # config.encryptor = :sha512
+
+ # ==> Scopes configuration
+ # Turn scoped views on. Before rendering "sessions/new", it will first check for
+ # "users/sessions/new". It's turned off by default because it's slower if you
+ # are using only default views.
+ # config.scoped_views = false
+
+ # Configure the default scope given to Warden. By default it's the first
+ # devise role declared in your routes (usually :user).
+ # config.default_scope = :user
+
+ # Set this configuration to false if you want /users/sign_out to sign out
+ # only the current scope. By default, Devise signs out all scopes.
+ # config.sign_out_all_scopes = true
+
+ # ==> Navigation configuration
+ # Lists the formats that should be treated as navigational. Formats like
+ # :html, should redirect to the sign in page when the user does not have
+ # access, but formats like :xml or :json, should return 401.
+ #
+ # If you have any extra navigational formats, like :iphone or :mobile, you
+ # should add them to the navigational formats lists.
+ #
+ # The "*/*" below is required to match Internet Explorer requests.
+ # config.navigational_formats = ['*/*', :html]
+
+ # The default HTTP method used to sign out a resource. Default is :delete.
+ config.sign_out_via = :delete
+
+ # ==> OmniAuth
+ # Add a new OmniAuth provider. Check the wiki for more information on setting
+ # up on your models and hooks.
+ # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+ # ==> Warden configuration
+ # If you want to use other strategies, that are not supported by Devise, or
+ # change the failure app, you can configure them inside the config.warden block.
+ #
+ # config.warden do |manager|
+ # manager.intercept_401 = false
+ # manager.default_strategies(scope: :user).unshift :some_external_strategy
+ # end
+
+ # ==> Mountable engine configurations
+ # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+ # is mountable, there are some extra configurations to be taken into account.
+ # The following options are available, assuming the engine is mounted as:
+ #
+ # mount MyEngine, at: '/my_engine'
+ #
+ # The router that invoked `devise_for`, in the example above, would be:
+ # config.router_name = :my_engine
+ #
+ # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+ # so you need to do it manually. For the users scope, it would be:
+ # config.omniauth_path_prefix = '/my_engine/users/auth'
+end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
new file mode 100644
index 0000000..be7963f
--- /dev/null
+++ b/config/locales/devise.en.yml
@@ -0,0 +1,73 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+ devise:
+ name: "Name"
+ email: "Email"
+ password_confirmation: "Retype your Password"
+ password: "Password"
+ remember_me: "Remember me?"
+ signup: "Sign Up"
+ signin: "Sign In"
+ update: "Update"
+ forgot_your_password: "Forgot your password?"
+ edit:
+ password: "Password ( Leave it blank if not changing )"
+ current_password: "Type your current password to confirm"
+ image: "Upload an Image ( jpeg, png or gif only)"
+ confirmations:
+ confirmed: "Your email address has been successfully confirmed."
+ 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: "Confirmation instructions"
+ reset_password_instructions:
+ subject: "Reset password instructions"
+ unlock_instructions:
+ subject: "Unlock instructions"
+ 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: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+ 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:"
+ other: "%{count} errors:"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16c5237..5462ac3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -7,6 +7,9 @@ en:
nav:
browse: Browse
glossary: Glossary
+ sign_in: Sign In
+ sign_out: Sign Out
+ edit_profile: Edit Profile
actions:
delete: Delete
@@ -63,6 +66,7 @@ en:
Each requirement should represent an actionable item.
home:
+ welcome : Welcome %{name}
styleguide:
title: Styleguide
swatches: Swatches
diff --git a/config/routes.rb b/config/routes.rb
index 4bd73a7..09cc51c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,5 @@
Rails.application.routes.draw do
+ devise_for :users
get("/", { to: "home#index" })
get("/glossary", { to: "home#glossary" })
get("/styleguide", { to: "home#styleguide" })
diff --git a/db/migrate/20150830143300_devise_create_users.rb b/db/migrate/20150830143300_devise_create_users.rb
new file mode 100644
index 0000000..2d82e68
--- /dev/null
+++ b/db/migrate/20150830143300_devise_create_users.rb
@@ -0,0 +1,42 @@
+class DeviseCreateUsers < ActiveRecord::Migration
+ def change
+ create_table(:users) do |t|
+ ## Database authenticatable
+ t.string :email, null: false, 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.inet :current_sign_in_ip
+ t.inet :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
+
+
+ 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
+end
diff --git a/db/migrate/20150912220635_add_attachment_avatar_to_users.rb b/db/migrate/20150912220635_add_attachment_avatar_to_users.rb
new file mode 100644
index 0000000..1d87ba8
--- /dev/null
+++ b/db/migrate/20150912220635_add_attachment_avatar_to_users.rb
@@ -0,0 +1,11 @@
+class AddAttachmentAvatarToUsers < ActiveRecord::Migration
+ def self.up
+ change_table :users do |t|
+ t.attachment :avatar
+ end
+ end
+
+ def self.down
+ remove_attachment :users, :avatar
+ end
+end
diff --git a/db/migrate/20150912220832_add_name_to_users.rb b/db/migrate/20150912220832_add_name_to_users.rb
new file mode 100644
index 0000000..bac750e
--- /dev/null
+++ b/db/migrate/20150912220832_add_name_to_users.rb
@@ -0,0 +1,5 @@
+class AddNameToUsers < ActiveRecord::Migration
+ def change
+ add_column :users, :name, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index eb4b735..083cefe 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150816005537) do
+ActiveRecord::Schema.define(version: 20150912220832) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -50,6 +50,29 @@
add_index "requirements", ["deliverable_id"], name: "index_requirements_on_deliverable_id", using: :btree
add_index "requirements", ["ordering"], name: "index_requirements_on_ordering", using: :btree
+ create_table "users", force: :cascade do |t|
+ t.string "email", default: "", null: false
+ 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.inet "current_sign_in_ip"
+ t.inet "last_sign_in_ip"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "avatar_file_name"
+ t.string "avatar_content_type"
+ t.integer "avatar_file_size"
+ t.datetime "avatar_updated_at"
+ t.string "name"
+ end
+
+ add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+ add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+
add_foreign_key "deliverables", "missions"
add_foreign_key "requirements", "deliverables"
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
new file mode 100644
index 0000000..47a31bb
--- /dev/null
+++ b/spec/models/user_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe User, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end