From dace874f4f75218b6ebc4644dd4afa9e6b897e49 Mon Sep 17 00:00:00 2001
From: Karol Selak <karol.selak@gmail.com>
Date: Sun, 21 Mar 2021 11:40:53 +0100
Subject: [PATCH] UI and naming changes

---
 app/assets/stylesheets/application.scss        | 4 ++++
 app/controllers/users_controller.rb            | 6 +++---
 app/views/sessions/create.html.erb             | 2 +-
 app/views/sessions/new.html.erb                | 5 +++--
 app/views/sessions/welcome.html.erb            | 5 ++---
 app/views/users/create.html.erb                | 2 +-
 app/views/users/new.html.erb                   | 2 +-
 app/views/users/recover_password_form.html.erb | 6 +++---
 config/routes.rb                               | 2 +-
 public/404.html                                | 2 +-
 public/422.html                                | 2 +-
 public/500.html                                | 2 +-
 12 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e1a69d8..e1ecc73 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,2 +1,6 @@
 @import "materialize";
 @import "https://fonts.googleapis.com/icon?family=Material+Icons";
+
+body {
+  margin: 100px;
+}
\ No newline at end of file
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f37956e..386c43b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -18,15 +18,15 @@ class UsersController < ApplicationController
   end
 
   def recover_password_form
-    @recovery_code = params[:recovery_code]
+    @recovery_password = params[:recovery_password]
     @user_id = params[:id]
   end
 
   def recover_password
     user = User.find(params[:user_id])
-    if user.authenticate_recovery_password(params[:recovery_code])
+    if user.authenticate_recovery_password(params[:recovery_password])
       user.password = params[:password]
-      user.password_confirmation = params[:repeated_password]
+      user.password_confirmation = params[:password_confirmation]
       user.recovery_password_digest = nil
       if user.save
         redirect_to '/welcome'
diff --git a/app/views/sessions/create.html.erb b/app/views/sessions/create.html.erb
index c251174..a7ac851 100644
--- a/app/views/sessions/create.html.erb
+++ b/app/views/sessions/create.html.erb
@@ -1,2 +1,2 @@
-<h1>Sessions#create</h1>
+<h3>Sessions#create</h3>
 <p>Find me in app/views/sessions/create.html.erb</p>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 67db6f9..4556936 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,8 +1,9 @@
-<h1>Login</h1>
+<h3>Login</h3>
   <%= form_tag '/login' do %>
   <%= label_tag :email%>
   <%= text_field_tag :email %>
   <%= label_tag :password%>
   <%= password_field_tag :password%>
   <%= submit_tag "Login"%>
-<%end%>
\ No newline at end of file
+<%end%>
+<%= button_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 57e6dd2..e04edd2 100644
--- a/app/views/sessions/welcome.html.erb
+++ b/app/views/sessions/welcome.html.erb
@@ -1,9 +1,8 @@
-<h1>Welcome</h1>
+<h3>Welcome</h3>
 <% if logged_in? %>
-  <h1>You are Logged In, <%= current_user.email %></h1>
+  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%>
-  <%= button_to "Password recovery", '/password_recovery_request', method: :get%>
 <%end%>
diff --git a/app/views/users/create.html.erb b/app/views/users/create.html.erb
index 48ea02e..a4a1b5f 100644
--- a/app/views/users/create.html.erb
+++ b/app/views/users/create.html.erb
@@ -1,2 +1,2 @@
-<h1>Users#create</h1>
+<h3>Users#create</h3>
 <p>Find me in app/views/users/create.html.erb</p>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 51a2e32..8413e2e 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,4 +1,4 @@
-<h1>Sign Up</h1>
+<h3>Sign Up</h3>
 <%= form_for @user do |f|%>
   <%= f.label :email%><br>
   <%= f.text_field :email%><br>
diff --git a/app/views/users/recover_password_form.html.erb b/app/views/users/recover_password_form.html.erb
index 7cc567b..a0d833f 100644
--- a/app/views/users/recover_password_form.html.erb
+++ b/app/views/users/recover_password_form.html.erb
@@ -1,9 +1,9 @@
 Recover password
 
 <%= form_with url: "/recover_password", method: :post do |form| %>
-  <%= form.text_field :password %>
-  <%= form.text_field :repeated_password %>
-  <%= form.hidden_field :recovery_code, :value => @recovery_code %>
+  <%= 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" %>
 <% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index b0a6324..43ec56d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,7 +6,7 @@ Rails.application.routes.draw do
   get 'welcome', to: 'sessions#welcome'
   get 'password_recovery_request', to: 'users#password_recovery_request_form'
   post 'password_recovery_request', to: 'users#password_recovery_request'
-  get 'recover_password/:id/:recovery_code', to: 'users#recover_password_form'
+  get 'recover_password/:id/:recovery_password', to: 'users#recover_password_form'
   post 'recover_password', to: 'users#recover_password'
   resources :books
 end
diff --git a/public/404.html b/public/404.html
index 2be3af2..c0db723 100644
--- a/public/404.html
+++ b/public/404.html
@@ -58,7 +58,7 @@
   <!-- This file lives in public/404.html -->
   <div class="dialog">
     <div>
-      <h1>The page you were looking for doesn't exist.</h1>
+      <h3>The page you were looking for doesn't exist.</h3>
       <p>You may have mistyped the address or the page may have moved.</p>
     </div>
     <p>If you are the application owner check the logs for more information.</p>
diff --git a/public/422.html b/public/422.html
index c08eac0..5c98efa 100644
--- a/public/422.html
+++ b/public/422.html
@@ -58,7 +58,7 @@
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <div>
-      <h1>The change you wanted was rejected.</h1>
+      <h3>The change you wanted was rejected.</h3>
       <p>Maybe you tried to change something you didn't have access to.</p>
     </div>
     <p>If you are the application owner check the logs for more information.</p>
diff --git a/public/500.html b/public/500.html
index 78a030a..54da439 100644
--- a/public/500.html
+++ b/public/500.html
@@ -58,7 +58,7 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <div>
-      <h1>We're sorry, but something went wrong.</h1>
+      <h3>We're sorry, but something went wrong.</h3>
     </div>
     <p>If you are the application owner check the logs for more information.</p>
   </div>