Fix rediret to rooms after room creation

client/views/app/room.coffee

@@ -435,7 +435,6 @@ Template.room.events
 					return Errors.throw error.reason
 
 				if result?.rid?
-					# FlowRouter.go('room', { _id: result.rid })
 					$('#user-add-search').val('')
 		else if roomData.t in ['c', 'p']
 			Meteor.call 'addUserToRoom', { rid: roomData._id, username: doc.username }, (error, result) ->

client/views/app/sideNav/createChannelFlex.coffee

@@ -77,10 +77,10 @@ Template.createChannelFlex.events
 
 	'click .save-channel': (e, instance) ->
 		err = SideNav.validate()
-		instance.roomName.set instance.find('#channel-name').value
-		console.log err
+		name = instance.find('#channel-name').value
+		instance.roomName.set name
 		if not err
-			Meteor.call 'createChannel', instance.find('#channel-name').value, instance.selectedUsers.get(), (err, result) ->
+			Meteor.call 'createChannel', name, instance.selectedUsers.get(), (err, result) ->
 				if err
 					console.log err
 					if err.error is 'name-invalid'
@@ -95,8 +95,9 @@ Template.createChannelFlex.events
 				SideNav.closeFlex ->
 					instance.clearForm()
 
-				FlowRouter.go 'room', { _id: result.rid }
+				FlowRouter.go 'channel', { name: name }
 		else
+			console.log err
 			instance.error.set({ fields: err })
 
 Template.createChannelFlex.onCreated ->

client/views/app/sideNav/directMessagesFlex.coffee

@@ -48,12 +48,13 @@ Template.directMessagesFlex.events
 	'click .save-direct-message': (e, instance) ->
 		err = SideNav.validate()
 		if not err
-			Meteor.call 'createDirectMessage', instance.selectedUser.get(), (err, result) ->
+			username = instance.selectedUser.get()
+			Meteor.call 'createDirectMessage', username, (err, result) ->
 				if err
 					return toastr.error err.reason
 				SideNav.closeFlex()
 				instance.clearForm()
-				FlowRouter.go 'room', { _id: result.rid }
+				FlowRouter.go 'direct', { username: username }
 		else
 			Template.instance().error.set(err)
 

client/views/app/sideNav/privateGroupsFlex.coffee

@@ -73,9 +73,10 @@ Template.privateGroupsFlex.events
 
 	'click .save-pvt-group': (e, instance) ->
 		err = SideNav.validate()
-		instance.groupName.set instance.find('#pvt-group-name').value
+		name = instance.find('#pvt-group-name').value
+		instance.groupName.set name
 		if not err
-			Meteor.call 'createPrivateGroup', instance.find('#pvt-group-name').value, instance.selectedUsers.get(), (err, result) ->
+			Meteor.call 'createPrivateGroup', name, instance.selectedUsers.get(), (err, result) ->
 				if err
 					if err.error is 'name-invalid'
 						instance.error.set({ invalid: true })
@@ -86,7 +87,7 @@ Template.privateGroupsFlex.events
 					return toastr.error err.reason
 				SideNav.closeFlex()
 				instance.clearForm()
-				FlowRouter.go 'room', { _id: result.rid }
+				FlowRouter.go 'group', { name: name }
 		else
 			Template.instance().error.set({fields: err})
 

client/views/app/userCard.coffee

@@ -1,37 +0,0 @@
-Template.userCard.helpers
-	userData: ->
-		username = Session.get('userProfileActive')
-
-		userData = {
-			# name: Session.get('user_' + username + '_name')
-			# emails: Session.get('user_' + username + '_emails')
-			username: username
-		}
-		# phone = Session.get('user_' + username + '_phone')
-		# if phone? and phone[0]?.phoneNumber
-		# 	userData.phone = phone[0]?.phoneNumber
-
-		return userData
-
-	canManageRoom: ->
-		return false unless FlowRouter.getParam('_id')?
-
-		roomData = Session.get('roomData' + FlowRouter.getParam('_id'))
-
-		return false unless roomData?
-
-		return roomData.u?._id is Meteor.userId() and not Session.equals('userProfileActive', Meteor.user().username)
-
-Template.userCard.events
-	'click .private-chat': (event) ->
-		Meteor.call 'createDirectMessage', Session.get('userProfileActive'), (error, result) ->
-			if error
-				return Errors.throw error.reason
-
-			if result.rid?
-				FlowRouter.go('room', { _id: result.rid })
-
-	'click .remove-user': (event) ->
-		Meteor.call 'removeUserFromRoom', { rid: FlowRouter.getParam('_id'), username: Session.get('userProfileActive') }, (error, result) ->
-			if error
-				return Errors.throw error.reason

client/views/app/userCard.html

@@ -1,29 +0,0 @@
-<template name="userCard">
-	<div class="user-profile">
-		<span class="-close"><i title="{{_ "close"}}" class="icon-cancel"></i></span>
-		{{#with userData}}
-			<div class="thumb">
-				{{> avatar username=username}}
-			</div>
-			<div class="info">
-				<h3>{{name}}</h3>
-				{{!--
-				{{#each emails}}
-					<p><i class="icon-mail"></i> <a href="mailto:{{address}}">{{address}}</a></p>
-				{{/each}}
-				{{#if phone}}
-					<p><i class="icon-phone"></i> <a href="tel:{{phone}}">{{phone}}</a></p>
-				{{/if}}
-				--}}
-			</div>
-		{{/with}}
-	</div>
-	<div class="profile-buttons">
-		{{#unless $.Session.equals 'userProfileActive' $.Meteor.userId}}
-			<button class="button primary small private-chat"><span><i class='icon-chat'></i> {{_ "Conversation"}}</span></button>
-		{{/unless}}
-		{{#if canManageRoom}}
-			<button class="button delete small remove-user"><span><i class='icon-cancel'></i> {{_ "Remove"}}</span></button>
-		{{/if}}
-	</div>
-</template>