From f2438f48994f5e7fa252d1b29fcee8b1562726ab Mon Sep 17 00:00:00 2001
From: dleung25 <dleung25@myseneca.ca>
Date: Wed, 12 Dec 2018 03:33:21 -0500
Subject: [PATCH 1/2] remove room

---
 src/components/UserList/index.js | 31 ++++++++++++++++++-------------
 src/index.js                     |  9 +++++++--
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/components/UserList/index.js b/src/components/UserList/index.js
index f4a2e8d..053f796 100644
--- a/src/components/UserList/index.js
+++ b/src/components/UserList/index.js
@@ -2,17 +2,22 @@ import React from 'react'
 import style from './index.module.css'
 
 export const UserList = ({ room, current, createConvo, removeUser }) => (
-  <ul className={style.component}>
-    {room.users.map(user => (
-      <li
-        key={user.id}
-        className={user.presence.state === 'online' ? style.online : null}
-        onClick={e => createConvo({ user })}
-        style={{ order: user.presence.state === 'online' && -1 }}
-      >
-        <img src={user.avatarURL} alt={user.name} />
-        <p>{user.name}</p>
-      </li>
-    ))}
-  </ul>
+	<div>
+	  <button onClick={e => removeUser(room)}>
+		  <span>Leave Room</span>
+	  </button>
+	  <ul className={style.component}>
+		{room.users.map(user => (
+		  <li
+			key={user.id}
+			className={user.presence.state === 'online' ? style.online : null}
+			onClick={e => createConvo({ user })}
+			style={{ order: user.presence.state === 'online' && -1 }}
+		  >
+			<img src={user.avatarURL} alt={user.name} />
+			<p>{user.name}</p>
+		  </li>
+		))}
+	  </ul>
+  </div>
 )
diff --git a/src/index.js b/src/index.js
index 4688580..a56a5ab 100644
--- a/src/index.js
+++ b/src/index.js
@@ -54,7 +54,12 @@ class View extends React.Component {
       this.actions.scrollToEnd()
     },
 
-    removeRoom: room => this.setState({ room: {} }),
+    removeRoom: room => {
+		this.state.user.leaveRoom({
+			roomId: room.id,
+		})
+		this.setState({ room: {} })
+	},
 
     joinRoom: room => {
       this.actions.setRoom(room)
@@ -255,7 +260,7 @@ class View extends React.Component {
                   room={room}
                   current={user.id}
                   createConvo={createConvo}
-                  removeUser={removeUserFromRoom}
+                  removeUser={this.actions.removeRoom}
                 />
               )}
             </row->

From ab78d6a252266fe0af85c7d4358e4245ca80e9b9 Mon Sep 17 00:00:00 2001
From: dleung25 <dleung25@myseneca.ca>
Date: Wed, 12 Dec 2018 03:41:58 -0500
Subject: [PATCH 2/2] fix warning

---
 src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.js b/src/index.js
index a56a5ab..aa06f97 100644
--- a/src/index.js
+++ b/src/index.js
@@ -226,7 +226,7 @@ class View extends React.Component {
       sidebarOpen,
       userListOpen,
     } = this.state
-    const { createRoom, createConvo, removeUserFromRoom } = this.actions
+    const { createRoom, createConvo/*, removeUserFromRoom*/ } = this.actions
 
     return (
       <main>