diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index b2ff728..ac1e0c8 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -12,7 +12,7 @@ class SessionsController < ApplicationController def delete session.delete(:user_id) - redirect_to '/welcome' + redirect_to '/welcome', notice: 'Logged out properly' end def welcome diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 386c43b..d0c62bf 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -6,12 +6,13 @@ class UsersController < ApplicationController def create @user = User.create(params.require(:user).permit(:email, :password)) session[:user_id] = @user.id - redirect_to '/welcome' + redirect_to '/welcome', notice: 'Account has been created' end def password_recovery_request @user = User.where(email: params['email']).first UserMailer.with(user: @user).password_recovery.deliver_now + redirect_to '/welcome', notice: "Recovery email sent to #{params['email']}" end def password_recovery_request_form @@ -24,13 +25,17 @@ class UsersController < ApplicationController def recover_password user = User.find(params[:user_id]) - if user.authenticate_recovery_password(params[:recovery_password]) + if user.recovery_password_digest && user.authenticate_recovery_password(params[:recovery_password]) user.password = params[:password] user.password_confirmation = params[:password_confirmation] - user.recovery_password_digest = nil if user.save - redirect_to '/welcome' + user.update(recovery_password: nil) + redirect_to '/welcome', notice: 'Password changed' + else + redirect_to '/welcome', notice: 'Passwords don\'t match' end + else + redirect_to '/welcome', notice: 'Recovery link expired or unvalid' end end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7ca2457..e3cec58 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,7 +2,7 @@ Book store - + <%= csrf_meta_tags %> <%= csp_meta_tag %> @@ -11,6 +11,12 @@ + <%= link_to 'Home', '/welcome', method: :get%> + <% flash.each do |type, msg| %> +
+ <%= msg %> +
+ <% end %> <%= yield %> diff --git a/app/views/sessions/create.html.erb b/app/views/sessions/create.html.erb deleted file mode 100644 index a7ac851..0000000 --- a/app/views/sessions/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Sessions#create

-

Find me in app/views/sessions/create.html.erb

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 4556936..23315d8 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,9 +1,9 @@ -

Login

+

Login

<%= form_tag '/login' do %> <%= label_tag :email%> <%= text_field_tag :email %> <%= label_tag :password%> <%= password_field_tag :password%> - <%= submit_tag "Login"%> + <%= submit_tag "Login", class: 'btn' %> <%end%> -<%= button_to "Password recovery", '/password_recovery_request', method: :get%> \ No newline at end of file +<%= link_to "Password recovery", '/password_recovery_request', method: :get%> \ No newline at end of file diff --git a/app/views/sessions/welcome.html.erb b/app/views/sessions/welcome.html.erb index e04edd2..2f18736 100644 --- a/app/views/sessions/welcome.html.erb +++ b/app/views/sessions/welcome.html.erb @@ -1,8 +1,8 @@ -

Welcome

+

Welcome

<% if logged_in? %> You are Logged In, <%= current_user.email %> <%= button_to "Logout", '/logout', method: :get%> -<%else%> - <%= button_to "Login", '/login', method: :get%> - <%= button_to "Sign Up", '/users/new', method: :get%> -<%end%> +<% else %> + <%= button_to "Login", '/login', method: :get, class: 'btn'%> + <%= button_to "Sign Up", '/users/new', method: :get, class: 'btn'%> +<% end %> diff --git a/app/views/users/create.html.erb b/app/views/users/create.html.erb deleted file mode 100644 index a4a1b5f..0000000 --- a/app/views/users/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Users#create

-

Find me in app/views/users/create.html.erb

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 8413e2e..d81b5bf 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,8 +1,8 @@ -

Sign Up

+

Sign Up

<%= form_for @user do |f|%> - <%= f.label :email%>
- <%= f.text_field :email%>
- <%= f.label :password%>
- <%= f.password_field :password%>
- <%= f.submit %> + <%= f.label :email%> + <%= f.text_field :email%> + <%= f.label :password%> + <%= f.password_field :password%> + <%= f.submit 'Sign up', class: 'btn' %> <%end%> \ No newline at end of file diff --git a/app/views/users/password_recovery_request.erb b/app/views/users/password_recovery_request.erb deleted file mode 100644 index 18e5a7b..0000000 --- a/app/views/users/password_recovery_request.erb +++ /dev/null @@ -1 +0,0 @@ -Recovery email sent. \ No newline at end of file diff --git a/app/views/users/password_recovery_request_form.erb b/app/views/users/password_recovery_request_form.erb index 2e22108..66a90a4 100644 --- a/app/views/users/password_recovery_request_form.erb +++ b/app/views/users/password_recovery_request_form.erb @@ -1,4 +1,7 @@ -<%= form_with url: "/password_recovery_request", method: :post do |form| %> - <%= form.text_field :email %> - <%= form.submit "Send email" %> +

Password recovery

+Provide an email to password recovery +<%= form_with url: "/password_recovery_request", method: :post do |f| %> + <%= f.label :email%>
+ <%= f.text_field :email %> + <%= f.submit 'Send email', class: 'btn' %> <% end %> \ No newline at end of file diff --git a/app/views/users/recover_password_form.html.erb b/app/views/users/recover_password_form.html.erb index a0d833f..91f0d43 100644 --- a/app/views/users/recover_password_form.html.erb +++ b/app/views/users/recover_password_form.html.erb @@ -1,9 +1,11 @@ -Recover password +

Provide new password

-<%= form_with url: "/recover_password", method: :post do |form| %> - <%= form.password_field :password %> - <%= form.password_field :password_confirmation %> - <%= form.hidden_field :recovery_password, :value => @recovery_password %> - <%= form.hidden_field :user_id, :value => @user_id %> - <%= form.submit "Change password" %> +<%= form_with url: '/recover_password', method: :post do |f| %> + <%= f.label :password%> + <%= f.password_field :password %> + <%= f.label :password_confirmation%> + <%= f.password_field :password_confirmation %> + <%= f.hidden_field :recovery_password, :value => @recovery_password %> + <%= f.hidden_field :user_id, :value => @user_id %> + <%= f.submit 'Change password', class: 'btn' %> <% end %> \ No newline at end of file diff --git a/public/404.html b/public/404.html index c0db723..3e2d224 100644 --- a/public/404.html +++ b/public/404.html @@ -58,7 +58,7 @@
-

The page you were looking for doesn't exist.

+

The page you were looking for doesn't exist.

You may have mistyped the address or the page may have moved.

If you are the application owner check the logs for more information.

diff --git a/public/422.html b/public/422.html index 5c98efa..badeeb8 100644 --- a/public/422.html +++ b/public/422.html @@ -58,7 +58,7 @@
-

The change you wanted was rejected.

+

The change you wanted was rejected.

Maybe you tried to change something you didn't have access to.

If you are the application owner check the logs for more information.

diff --git a/public/500.html b/public/500.html index 54da439..1fd70e3 100644 --- a/public/500.html +++ b/public/500.html @@ -58,7 +58,7 @@
-

We're sorry, but something went wrong.

+

We're sorry, but something went wrong.

If you are the application owner check the logs for more information.