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

 			create_new_authentication()

             unless controller_name == 'chat'

-                redirect_to chat_template_path

+                redirect_to chat_path

             end

 		else

 			unless controller_name == 'sessions' && (action_name == 'new' || action_name == 'create')

@@ -6,14 +6,7 @@ class RosterController < WebsocketRails::BaseController

     end

     def connect

-        #hack_sessions()

-        #Rails.logger.info "ahojte"

-        Rails.logger.info "login now"

-        login()

-        trigger_success msg: "asdds"

-

-        #login()

-        #get_roster()

+

     end

     ##

@@ -35,14 +28,4 @@ class RosterController < WebsocketRails::BaseController

         #user_id = Token.find_by(token: session[:token]).user_id

         #Rails.logger.info "user ID" + user_id.inspect

     end

-

-    def hack_sessions

-        #session[:a] = true

-        #Rails.logger.info session.inspect

-

-        #Rails.logger.info request.session.inspect

-        #Rails.logger.info request.cookies["rack.session"]

-        #session.delete :a

-        #Rails.logger.info session.inspect

-    end

 end

@@ -14,7 +14,7 @@ class SessionsController < ApplicationController

 		end

         create_new_authentication(params[:jid].downcase)

-        redirect_to chat_template_path, flash: {notice: I18n.t('login.success')}

+        redirect_to chat_path, flash: {notice: I18n.t('login.success')}

 	end

 	def destroy

@@ -1,5 +1,6 @@

 - content_for :title, t("chat.title")

 - content_for :javascript, javascript_include_tag("application")

+- content_for :javascript, javascript_include_tag("backbone-ws")

 - if flash[:notice]

   %div.alert.alert-notice

deleted file mode 100644

@@ -1,5 +0,0 @@

-- content_for :title, t("chat.title")

-- content_for :javascript, javascript_include_tag("application")

-- content_for :javascript, javascript_include_tag("backbone-ws")

-

-#content

@@ -8,6 +8,5 @@ Xmpp::Application.routes.draw do

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

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

-    match '/ws', to: 'chat#ws'

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

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

 end