Merge branch 'feature/user_information' into 'master'

Feature: my page & user information edit

See merge request !10

app/controllers/application_controller.rb

@@ -4,10 +4,11 @@ class ApplicationController < ActionController::Base
   before_action :configure_permitted_parameters, if: :devise_controller?
 
   protected
- 
+
   def configure_permitted_parameters
-    added_attrs = [:username, :email, :password, :password_confirmation, :remember_me]
+    added_attrs = [:first_name, :last_name, :username]
     devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
+    devise_parameter_sanitizer.permit :account_update, keys: added_attrs
   end
 
   def after_sign_in_path_for(resource)

app/controllers/users/my_pages_controller.rb

+class Users::MyPagesController < ApplicationController
+  def show
+  end
+end

app/views/layouts/_header.html.erb

@@ -6,7 +6,7 @@
         <ul class="list">
           <% if user_signed_in? %>
             Logged in as <strong><%= current_user.email %></strong>
-            <li class="list-inline-item"></li><%= link_to "My Page", "#" %></li>
+            <li class="list-inline-item"></li><%= link_to "My Page", users_my_page_path %></li>
             <li class="list-inline-item"></li><%= link_to "Logout", destroy_user_session_path, method: :delete %></li>
           <% else %>
             <li class="list-inline-item"><%= link_to "Login", new_user_session_path %></li>

app/views/users/my_pages/show.html.erb

+<h1>My Page</h1>
+
+<div class="container">
+  <h3>Email: <%= current_user.email %></h3>
+  <h3>Full name: <%= current_user.first_name %> <%= current_user.last_name %></h3>
+  <h3>My CV: <%= current_user.cv_path %></h3>
+  <br>
+  <%= link_to "Edit", edit_user_registration_path, class: "btn btn-lg btn-primary" %>
+  <%= link_to "My jobs", "#", class: "btn btn-lg btn-primary" %>
+</div>

app/views/users/registrations/edit.html.erb

-<h2>Edit <%= resource_name.to_s.humanize %></h2>
+<h1>My Page</h1>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= render "users/shared/error_messages", resource: resource %>
 
-  <div class="field">
+  <div class="form-group">
     <%= f.label :email %><br/>
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, autofocus: true, class: "form-control" %>
   </div>
 
   <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
     <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
   <% end %>
 
+  <div class="form-group">
+    <%= f.label :first_name %>
+    <%= f.text_field :first_name, class: "form-control" %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :last_name %>
+    <%= f.text_field :last_name, class: "form-control" %>
+  </div>
+
   <div class="field">
+    <%= f.label :cv_path %><br/>
+    <input type="file" class="form-control-file" id="cv_path">
+  </div><br>
+
+  <div class="form-group">
     <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br/>
-    <%= f.password_field :password, autocomplete: "new-password" %>
+    <%= f.password_field :password, autocomplete: "off", class: "form-control" %>
     <% if @minimum_password_length %>
       <br/>
       <em><%= @minimum_password_length %> characters minimum</em>
     <% end %>
   </div>
 
-  <div class="field">
-    <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+  <div class="form-group">
+    <%= f.label :password_confirmation %><br/>
+    <%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control" %>
   </div>
 
-  <div class="field">
+  <div class="form-group">
     <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-    <%= f.password_field :current_password, autocomplete: "current-password" %>
+    <%= f.password_field :current_password, autocomplete: "off", class: "form-control" %>
   </div>
 
   <div class="actions">
-    <%= f.submit "Update" %>
+    <%= f.submit "Update", class: "btn btn-lg btn-primary" %>
   </div>
 <% end %>
-
-<h3>Cancel my account</h3>
-
-<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
+<br>
+<%= button_to "Delete my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, class: "btn btn-danger", method: :delete %>
 
 <%= link_to "Back", :back %>

config/routes.rb

@@ -6,4 +6,7 @@ Rails.application.routes.draw do
   devise_for :users
   root "static_pages#index"
   get "static_pages/index"
+  namespace :users do
+    resource :my_page, only: :show
+  end
 end