Add keys to user setting page

Keys' form is added to same page as index. Moved aside bar on user
settings page to a partial. A few changes in style to set active class.

Gemfile.lock

@@ -390,4 +390,4 @@ DEPENDENCIES
   will_paginate
 
 BUNDLED WITH
-   1.10.2
+   1.10.5

app/assets/javascripts/main.js

@@ -9,7 +9,7 @@ $("document").ready( function(){
 	if(articleContent === "login"){
 		$(".wrapper nav").css("display", "none");
 	}
-	var toolbarDivs = $("section.toolbar div, section.action div");
+	var toolbarDivs = $("section.toolbar div, section.action div, aside nav ul li");
 	toolbarDivs.each(function(){
 			if($(this).attr("data") === articleContent){
 				$(this).addClass("active");

app/assets/stylesheets/_main.scss

@@ -65,7 +65,9 @@ $nprogress-color: red;
             }
           }
         }
-
+        table {
+          width: 100%;
+        }
         section{
           background-color: white;
           padding: 0.25em;
@@ -100,9 +102,6 @@ $nprogress-color: red;
               }
             }
           }
-          table {
-            width: 100%;
-          }
         }
       }
       aside{

app/controllers/keys_controller.rb

@@ -2,11 +2,9 @@ class KeysController < ApplicationController
   before_filter :authenticate_user!
 
   def index
-    @keys = current_user.keys
-  end
-
-  def new
     @key = current_user.keys.new
+    current_user.keys.delete @key # remove new key from collection
+    @keys = current_user.keys
   end
 
   def create

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

@@ -0,0 +1,16 @@
+%aside
+  %h1
+    User Settings
+  %nav
+    %ul
+      %li{ data: 'profile' }
+        = link_to 'Profile', edit_user_registration_path
+      %li{ data: 'identities' }
+        = link_to 'Identities', identities_path
+      %li{ data: 'keys' }
+        = link_to 'SSH Keys', keys_path
+      -#
+        %li
+          = link_to 'Passwords'
+        %li
+          = link_to 'Projects', identities_path

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

@@ -1,7 +1,7 @@
 - content_for :title do
   = current_user.username.titleize
 
-%article
+%article.user{ data: 'profile' }
   %header
     %h1
       = avatar current_user.email
@@ -37,19 +37,4 @@
           %div
             = f.submit 'Update'
 
-      %aside
-        %h1
-          User Settings
-        %nav
-          %ul
-            %li.active
-              = link_to 'Profile', edit_user_registration_path
-            %li
-              = link_to 'Identities', identities_path
-            -#
-              %li
-                = link_to 'Passwords'
-              %li
-                = link_to 'SSH Keys', identities_path
-              %li
-                = link_to 'Projects', identities_path
+      = render 'user_aside'

app/views/identities/index.html.haml

@@ -1,7 +1,7 @@
 - content_for :title do
   = current_user.username.titleize
 
-%article.user{ data: 'settings' }
+%article.user{ data: 'identities' }
   %header
     %h1
       = avatar current_user.email
@@ -29,17 +29,4 @@
         - @allowedmethods.each do |method|
           %div
             = link_to(method.to_s.capitalize, "/auth/#{method}")
-      %aside
-        %h1
-          User Settings
-        %nav
-          %ul
-            %li
-              = link_to 'Profile', edit_user_registration_path
-            %li.active
-              = link_to 'Identities', identities_path
-            -#
-              %li
-                = link_to 'SSH Keys', identities_path
-              %li
-                = link_to 'Projects', identities_path
+      = render 'devise/registrations/user_aside'

app/views/keys/_new.html.haml

@@ -0,0 +1,11 @@
+%p
+  %strong Add keys to your account
+= form_for @key do |f|
+  - @key.errors.full_messages.each do |msg|
+    %p.error_message
+      = msg
+  = f.label :title
+  = f.text_field :title, placeholder: 'Title', autofocus: true
+  = f.label :key
+  = f.text_area :key, rows: 8
+  = f.submit 'Add key'

app/views/keys/index.html.haml

@@ -1,7 +1,7 @@
 - content_for :title do
   = current_user.username.titleize
 
-%article.user{ data: 'settings' }
+%article.user{ data: 'keys' }
   %header
     %h1
       = avatar current_user.email
@@ -17,13 +17,14 @@
   %section
     %div
       .option
+        = render 'new'
         - if @keys.any?
           %table
             %thead
               %tr
                 %th Title
                 %th Fingerprint
-                %th Added at
+                %th Added
                 %th
             %tbody
               - @keys.each do |key|
@@ -34,11 +35,12 @@
                     %code= key.fingerprint
                   %td
                     %span
-                      added #{distance_of_time_in_words_to_now key.created_at}
+                      #{distance_of_time_in_words_to_now key.created_at} ago
                   %td
                     = link_to 'Remove',
                         key_path(key),
                         data: { confirm: 'Are you sure?' },
                         method: :delete
         - else
-          There are no SSH keys with access to your account.
+          There are no SSH keys with access to your account.
+      = render 'devise/registrations/user_aside'

app/views/notifications/index.html.haml

@@ -1,7 +1,7 @@
 - content_for :title do
   Notifications
 
-%article.user{ data: 'settings' }
+%article.user{ data: 'notifications' }
   %header
     %h1 My Notifications
     %h2

app/views/users/show.html.haml

@@ -1,7 +1,7 @@
 - content_for :title do
   = @user.username.titleize
 
-%article.user
+%article.user{ data: 'userpage' }
   %header
     %h1
       = avatar @user.email

config/routes.rb

@@ -18,7 +18,7 @@
 
 
   resources :projects
-  resources :keys, only: [:new, :create, :index, :destroy]
+  resources :keys, only: [:create, :index, :destroy]
   resources :identities, only: [:destroy,:index]
   resources :comments, only: [:new, :create, :destroy]
   resources :glitterposts