remove UserController, rename to profile, fix devise

app/controllers/profile_controller.rb

@@ -1,4 +1,4 @@
-class UsersController < ApplicationController
+class ProfileController < ApplicationController
   before_action :authenticate_user!
   after_action :verify_authorized
 

app/helpers/application_helper.rb

@@ -18,7 +18,7 @@ module ApplicationHelper
 
   def sign_out_link
     ssl = Rails.env.production? ? {protocol: :https } : {}
-    link_to "Sign out" , destroy_user_session_url(ssl) , method: :delete
+    link_to "Sign out" , destroy_user_session_url(ssl) 
   end
 
   # define a bunch of defaults for the best_in_place call

app/views/applies/edit.html.haml

@@ -1,4 +1,4 @@
-= render 'users/submenu'
+= render 'profiles/submenu'
 %section.padding-xxs
   .container
     .authform

app/views/applies/show.html.haml

@@ -1,4 +1,4 @@
-= render 'users/submenu'
+= render 'profiles/submenu'
 %section.padding-xxs
   .container
     .row

app/views/devise/registrations/edit.html.haml

@@ -1,4 +1,4 @@
-= render 'users/submenu'
+= render 'profiles/submenu'
 
 .authform
   %h3

app/views/layouts/_navigation.html.haml

@@ -8,7 +8,7 @@
       %li= link_to "Q & A" ,  page_path(:answers)
       -if user_signed_in?
         %li.visible-xs= sign_out_link
-        %li.visible-xs= link_to "Account" ,  user_path(current_user)
+        %li.visible-xs= link_to "Account" ,  profile_path(current_user)
       -else
         %li.visible-xs= link_to "Sign in" , new_user_session_path
         %li.visible-xs= link_to "Sign up" , new_user_registration_path

app/views/layouts/_slidetop.haml

@@ -50,7 +50,7 @@
           %li
             -if user_signed_in?
               %li= sign_out_link
-              %li= link_to "Account" ,  user_path(current_user)
+              %li= link_to "Account" ,  profile_path(current_user)
             -else
               %li
                 = simple_form_for(:user, :url => session_path(:user), :html => { :role => 'form' , class: "form-horizontal"}) do |f|

app/views/profiles/_user.html.haml

@@ -5,4 +5,4 @@
     = f.select(:role, User.roles.keys.map {|role| [role.titleize,role]})
     = f.submit 'Change Role', :class => 'button-xs'
 %td
-  = link_to("Delete user", user_path(user), :data => { :confirm => "Are you sure?" }, :method => :delete, :class => 'button-xs') unless user == current_user
+  = link_to("Delete user", profile_path(user), :data => { :confirm => "Are you sure?" }, :method => :delete, :class => 'button-xs') unless user == current_user

app/views/profiles/show.html.haml

@@ -1,4 +1,4 @@
-= render 'users/submenu'
+= render 'profiles/submenu'
 
 %h3 User
 %p

app/views/resumes/show.html.haml

@@ -1,4 +1,4 @@
-= render 'users/submenu'
+= render 'profiles/submenu'
 
 .row
   .col-md-2
@@ -6,10 +6,10 @@
     %br
 
     %p
-      Tell us about yourself and why you want to become a developer.
+      Tell us about yourself and why you want to become a developer. Click on the fields to edit.
+      While editing clicking outside the box cancels.
       %br
-      Once you have filled
-      your information you can leave an application for specific dates.
+      Once you have filled your information you can leave an application for specific dates.
     %p#notice= notice
 
 .row

config/routes.rb

@@ -11,7 +11,7 @@ Rails.application.routes.draw do
 
   devise_for :users, controllers: { registrations: "registrations" }
 
-  resources :users ,  except: [:index , :new ]
+  resources :profile ,  except: [:index , :new ]
   resource  :resume , except: [:destroy , :new , :edit]
   get :application , to: "applies#show"
   post :application , to: "applies#create"

spec/features/profiles/profile_show_spec.rb

@@ -18,7 +18,7 @@ feature 'User profile page', :devise do
   scenario 'user sees own profile' do
     user = FactoryGirl.create(:user)
     login_as(user, :scope => :user)
-    visit user_path(user)
+    visit profile_path(user)
     expect(page).to have_content 'User'
     expect(page).to have_content user.email
   end
@@ -32,7 +32,7 @@ feature 'User profile page', :devise do
     other = FactoryGirl.create(:user, email: 'other@example.com')
     login_as(me, :scope => :user)
     Capybara.current_session.driver.header 'Referer', root_path
-    visit user_path(other)
+    visit profile_path(other)
     expect(page).to have_content 'You know'
   end