@@ -130,6 +130,12 @@ this.App =

     removeContactRemote: (contact, client) ->

       App.Com.trigger(event: 'app.roster.removeContact', data: {jid: contact, client: client})

+    addContact: (jid) ->

+      App.Com.trigger(event: 'app.roster.addContact', data: {jid: jid})

+

+    answerFriendRequest: (jid, answer) ->

+      App.Com.trigger(event: 'app.roster.answerFriendRequest', data: { jid: jid, answer: answer})

+

     _setupBackboneComponents: ->

       App.Collections.contacts = new Xmpp.Collections.ContactsCollection()

       App.Collections.chats = new Xmpp.Collections.ChatsCollection()

@@ -190,6 +196,12 @@ this.App =

           chat.set('withWhom', attendants)

       )

+      App._dispatcher.bind('app.roster.friendRequest', (request) ->

+        App.debug ['receiving friend request', request]

+        popup = new Xmpp.Views.Popup.FriendRequestView(jid: request.jid, name: request.name)

+        popup.render()

+      )

+

       App._dispatcher.bind('app.chat.importChat', (chatData) ->

         chatId = chatData.chat_id

         chat = App.Collections.chats.findById(chatId)

deleted file mode 100644

@@ -1,11 +0,0 @@

-%h1 Add new account

-%form{ action: '#', id: 'asd' }

-  %label{for: 'jid'}

-    %strong Jabber ID

-  %input{type: 'text', name: 'jid', class: 'text', placeholder: 'nick@example.com'}

-

-  %label{for: 'pass'}

-    %strong Password

-  %input{type: 'password', name: 'password', class: 'text'}

-

-  %input{type: 'submit', value: "#{I18n.t('sessions.new.form-send')}", class: 'button'}

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,7 @@

+%h1 Add a new contact

+%form{ action: '#' }

+  %label{for: 'jid'}

+    %strong Jabber ID

+  %input{type: 'text', name: 'jid', class: 'text', placeholder: 'nick@example.com'}

+

+  %input{type: 'submit', value: "Send friend request", class: 'button'}

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,7 @@

+%h1 Friend request

+%form{ action: '#' }

+  %strong #{@new_contact}

+  wants to add you to his contacts. Allow?

+  %br

+  %input.left{type: 'submit', value: "Yes", name: '1', class: 'button', style: 'width: 60%'}

+  %input.close.inactive{type: 'button', value: "No", style: 'width: 30%; padding: 0'}

\ No newline at end of file

@@ -4,5 +4,16 @@ class Xmpp.Views.Popup.PopupView extends Backbone.View

   superTemplate: JST["backbone/templates/popup/popup"]

   el: $('#js-popup')

+  superEvents:

+    'click .close': 'close'

+

   render: (childHtml) ->

-    $(@el).html(@superTemplate()).append(childHtml)

\ No newline at end of file

+    $(@el).html(@superTemplate()).append(childHtml)

+

+  close: (e) ->

+    e.preventDefault()

+    @remove()

+

+  remove: ->

+    @stopListening()

+    $(@el).empty()

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,25 @@

+Xmpp.Views.Popup ||= {}

+

+class Xmpp.Views.Popup.AddContactView extends Xmpp.Views.Popup.PopupView

+  template: JST["backbone/templates/popup/add_contact"]

+

+  events:

+    'submit form': 'addContact'

+

+  initialize: ->

+    @events = _.extend(@events, @superEvents)

+

+  render: ->

+    super(@template())

+    $(@el).css(width: '20%', 'z-index': 999)

+    $(@el).find('input[type=text]').focus()

+    this

+

+  addContact: (e) ->

+    e.preventDefault()

+    jid = $(@el).find('input[name=jid]').val()

+    r = new RegExp('^.+@.+\..+$')

+    match = r.exec(jid)

+    if match and (match.length > 0)

+      jid = App.stripJid(match[0])

+      App.Com.addContact(jid)

new file mode 100644

@@ -0,0 +1,31 @@

+Xmpp.Views.Popup ||= {}

+

+class Xmpp.Views.Popup.FriendRequestView extends Xmpp.Views.Popup.PopupView

+  template: JST["backbone/templates/popup/friend_request"]

+

+  events:

+    'submit form': 'approve'

+

+  initialize: (options) ->

+    @name = options.name

+    @jid  = options.jid

+

+    @events = _.extend(@events, @superEvents)

+

+  render: ->

+    super(@template(new_contact: @name))

+    $(@el).css(width: '20%', 'z-index': 999)

+    $(@el).find('input[type=text]').focus()

+    this

+

+  approve: (e) ->

+    e.preventDefault()

+    App.debug 'approve request'

+    App.Com.answerFriendRequest(@jid, true)

+    @remove()

+

+  close: (e) ->

+    e.preventDefault()

+    App.debug 'cancel request'

+    App.Com.answerFriendRequest(@jid, false)

+    @remove()

\ No newline at end of file

deleted file mode 100644

@@ -1,26 +0,0 @@

-Xmpp.Views.Popup ||= {}

-

-class Xmpp.Views.Popup.NewAccountView extends Xmpp.Views.Popup.PopupView

-  template: JST["backbone/templates/popup/add_account"]

-

-  events:

-    'submit form': 'addAccount'

-

-  render: ->

-    super(@template())

-    $(@el).css(width: '20%')

-

-  addAccount: (e) ->

-    e.preventDefault()

-    jid = $(@el).find('input[name=jid]').val()

-    pass = $(@el).find('input[name=password]').val()

-    $.ajax(

-      url: '/sessions'

-      type: 'POST'

-      data:

-        jid: jid,

-        password: pass,

-        override: 1

-      success: (msg) ->

-        App.debug msg

-    )

\ No newline at end of file

@@ -10,8 +10,15 @@ $().ready(->

     App.UI.filterContacts(searchTerm)

   )

-  $('.chat-alert').on('click', '.close', (e) ->

+#  $('.chat-alert').on('click', '.close', (e) ->

+#    e.preventDefault()

+#    $('.chat-alert').fadeOut(250, -> $(this).html(''))

+#  )

+

+  $('#add-contact').click((e) ->

     e.preventDefault()

-    $('.chat-alert').fadeOut(250, -> $(this).html(''))

+    $('#js-popup .close').click()

+    popup = new Xmpp.Views.Popup.AddContactView()

+    popup.render()

   )

 )

\ No newline at end of file

@@ -37,15 +37,28 @@ input {

   height: 30px;

   @include box-sizing(border-box);

-  &[type=submit] {

+  &[type=submit], &[type=button] {

     text-transform:lowercase;

     font-variant: small-caps;

     font-weight: bold;

     font-size: 18px;

+    margin-top: 16px;

+  }

+

+  &[type=submit] {

     background: $app-color;

     color: #f9f9f9;

     border: none 0px #000000;

-    margin-top: 16px;

+  }

+

+  &[type=button] {

+    background: $app-color;

+    color: #f9f9f9;

+    border: none 0px #000000;

+  }

+

+  &.inactive {

+    background-color: $inactive-color;

   }

   &:focus {

@@ -378,10 +378,10 @@

     color: $app-color;

     border: 1px solid #dde0e3;

     border-radius: 12px;

-    padding: 5px 4px 4px 5px;

+    padding: 4px 4px 4px 5px;

     margin-left: 0;

     width: 13px;

-    height: 13px;

+    height: 14px;

     background: white;

     display: inline-block;

   }

@@ -87,7 +87,7 @@ class WsRosterController < WsController

             roster.items.each do |jid, contact|

                 Thread.new do

-                    vcard = get_vcard(client, jid.to_s)

+                    vcard = get_vcard_info(client, jid.to_s)

                     send_message 'app.roster.vcard', jid: jid.to_s, vcard: vcard

                 end

             end

@@ -102,6 +102,7 @@ class WsRosterController < WsController

         connection_store[:rosters].each do |roster|

             start_polling_subscription(roster)

             start_polling_presence(roster)

+            start_polling_friend_requests(roster)

         end

     end

@@ -150,7 +151,7 @@ class WsRosterController < WsController

         jid = presence = ''

         connection_store[:clients].each do |client|

-            vcard = get_vcard(client)

+            vcard = get_vcard_info(client)

             jid = client.jid.strip.to_s

             presence = uniform_presence(connection_store[:my_presences][client].show)

         end

@@ -223,10 +224,30 @@ class WsRosterController < WsController

         end

     end

-    ##

-    # Pridaj noveho priatela do zoznamu

-    def add_friend(data)

+    def add_contact(jid = nil)

+        new_jid = message[:jid] || jid

+

+        if is_valid_jid? new_jid

+            connection_store[:rosters].each do |roster|

+                Thread.new do

+                    roster.add(new_jid, nil, true)

+                end

+            end

+        end

+    end

+

+    def answer_friend_request

+        jid = message[:jid]

+        answer = message[:answer]

+        connection_store[:rosters].each do |roster|

+            if answer

+                roster.accept_subscription(jid)

+                add_contact(jid)

+            else

+                roster.decline_subscription(jid)

+            end

+        end

     end

     private

@@ -243,7 +264,7 @@ class WsRosterController < WsController

         end].max.second

     end

-    def get_vcard(me, contact_jid = nil)

+    def get_vcard_info(me, contact_jid = nil)

         vcard = Jabber::Vcard::Helper.get(me, contact_jid)

         { name: pull_name_from_vcard(vcard) || contact_jid,

@@ -333,7 +354,21 @@ class WsRosterController < WsController

         end

     end

+    def start_polling_friend_requests(roster)

+        client = connection_store[:link_roster_client][roster]

+        roster.add_subscription_request_callback do |roster_item, stanza|

+            jid = stanza.from.to_s

+            send_message 'app.roster.friendRequest',

+                         jid: jid,

+                         name: get_vcard_info(client, jid)[:name]

+        end

+    end

+

     def ask_if_using_this_app(client, contact)

         client.send(MessageBuilder::control_question(client.jid.to_s, contact))

     end

+

+    def is_valid_jid?(jid)

+        !! jid.scan(/^\w+@\w+\.\w+$/).first

+    end

 end

@@ -22,8 +22,8 @@

           #js-inactive-friends

           .toolbox

             %input#js-search-contacts{type: 'search', placeholder: "#{I18n.t('chat.roster.search')}", name: 'contact'}

-            %a{ href: '#'}

-              %span.icon-cog

+            %a{ href: '#', title: 'Add new contact', id: 'add-contact' }

+              %span.icon-plus

   .chatting-window.left.rightside

     .tabbar#tabbar

       .wrap#js-tabbar

@@ -57,6 +57,8 @@ WebsocketRails::EventMap.describe do

             subscribe :updateMyStatus,      to: WsRosterController, with_method: :me_update_status

             subscribe :updateMyVcard,       to: WsRosterController, with_method: :me_update_vcard

             subscribe :removeContact,       to: WsRosterController, with_method: :remove_contact

+            subscribe :addContact,          to: WsRosterController, with_method: :add_contact

+            subscribe :answerFriendRequest, to: WsRosterController, with_method: :answer_friend_request

         end

         namespace :chat do