@@ -24,4 +24,6 @@

         %span.status.icon-record.dnd

         %a{ href: '#' }

           DND

-          %span.icon-arrow-down.drop-down

\ No newline at end of file

+          %span.icon-arrow-down.drop-down

+    %a.logout.icon-exit.icon-after{ href: '/logout' }

+      Logout

\ No newline at end of file

@@ -129,6 +129,20 @@

       top: 2px;

       font-size: 13px;

     }

+

+    .logout {

+      left: 158px;

+      font-weight: normal;

+      float: left;

+      margin: 2px;

+      position: absolute;

+      top: 61px;

+      color: $status-color;

+

+      &:after {

+        padding-left: 4px;

+      }

+    }

   }

   h1 input, h2 input {

@@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base

 		if authenticated?

 			create_new_authentication()

-            unless controller_name == 'chat'

+            if controller_name != 'chat' and (controller_name != 'sessions' and action_name != 'destroy')

                 redirect_to chat_path

             end

 		else

@@ -35,6 +35,12 @@ class ApplicationController < ActionController::Base

         save_session(user_id, user_credentials)

     end

+    def remove_session

+        reset_session()

+        cookies.delete :iv

+        cookies.delete :key

+    end

+

     private

     def save_session(user_id, user_credentials)

@@ -20,6 +20,9 @@ class SessionsController < ApplicationController

 	end

 	def destroy

-		self.remove_old_session(session[:token])

+        Token.remove_token(session[:token])

+        remove_session()

+

+        redirect_to root_path

 	end

 end

@@ -46,6 +46,10 @@ class Token

         where(token: token).first().user.jids

     end

+    def self.remove_token(token)

+        where(token: token).delete

+    end

+

     private

 	def self.generate_token

@@ -1,12 +1,12 @@

 Xmpp::Application.routes.draw do

-    get "chat/index"

+    get 'chat/index'

     resources :sessions, only: [:new, :create, :destroy]

     root :to => 'sessions#new'

     match '/signin',  to: 'sessions#new'

-    match '/signout', to: 'sessions#destroy', via: :delete

+    match '/logout',  to: 'sessions#destroy'

     match '/chat', to: 'chat#index'

 end