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/4] 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/4] 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>

From abf6af4d84decc23dcc63c9b429b2995b1069327 Mon Sep 17 00:00:00 2001
From: dleung25 <dleung25@myseneca.ca>
Date: Fri, 14 Dec 2018 01:06:18 -0500
Subject: [PATCH 3/4] geolocation

---
 package.json |  1 +
 src/index.js | 29 +++++++++++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index d08bd64..2d85b13 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "object-path-immutable": "^1.0.1",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
+    "react-geolocated": "^2.4.0",
     "react-linkify": "^0.2.2",
     "react-scripts": "next",
     "vuid": "^1.0.0"
diff --git a/src/index.js b/src/index.js
index aa06f97..9742c57 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
+import { geolocated } from 'react-geolocated';
 import { set, del } from 'object-path-immutable'
 import { version } from '../package.json'
 import './index.css'
@@ -54,12 +55,7 @@ class View extends React.Component {
       this.actions.scrollToEnd()
     },
 
-    removeRoom: room => {
-		this.state.user.leaveRoom({
-			roomId: room.id,
-		})
-		this.setState({ room: {} })
-	},
+    removeRoom: room => this.setState({ room: {} }),
 
     joinRoom: room => {
       this.actions.setRoom(room)
@@ -226,7 +222,7 @@ class View extends React.Component {
       sidebarOpen,
       userListOpen,
     } = this.state
-    const { createRoom, createConvo/*, removeUserFromRoom*/ } = this.actions
+    const { createRoom, createConvo, removeUserFromRoom } = this.actions
 
     return (
       <main>
@@ -254,13 +250,30 @@ class View extends React.Component {
                 />
                 <TypingIndicator typing={typing[room.id]} />
                 <CreateMessageForm state={this.state} actions={this.actions} />
+					{
+						!this.props.isGeolocationAvailable
+						  ? <div>Your browser does not support Geolocation</div>
+						  : !this.props.isGeolocationEnabled
+							? <div>Geolocation is not enabled</div>
+							: this.props.coords
+							  ? <table>
+								<tbody>
+								  <tr><td>latitude</td><td>{this.props.coords.latitude}</td></tr>
+								  <tr><td>longitude</td><td>{this.props.coords.longitude}</td></tr>
+								  <tr><td>altitude</td><td>{this.props.coords.altitude}</td></tr>
+								  <tr><td>heading</td><td>{this.props.coords.heading}</td></tr>
+								  <tr><td>speed</td><td>{this.props.coords.speed}</td></tr>
+								</tbody>
+							  </table>
+							: <div>Getting the location data&hellip; </div>
+					}
               </col->
               {userListOpen && (
                 <UserList
                   room={room}
                   current={user.id}
                   createConvo={createConvo}
-                  removeUser={this.actions.removeRoom}
+                  removeUser={removeUserFromRoom}
                 />
               )}
             </row->

From 1f1aedd5a2e2adc165d7910612b68fc192e072ea Mon Sep 17 00:00:00 2001
From: dleung25 <dleung25@myseneca.ca>
Date: Fri, 14 Dec 2018 01:13:18 -0500
Subject: [PATCH 4/4] fix geo

---
 src/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/index.js b/src/index.js
index 9742c57..b394ab0 100644
--- a/src/index.js
+++ b/src/index.js
@@ -311,3 +311,10 @@ const githubAuthRedirect = () => {
 !existingUser && !authCode
   ? githubAuthRedirect()
   : ReactDOM.render(<View />, document.querySelector('#root'))
+  
+ export default geolocated({
+  positionOptions: {
+    enableHighAccuracy: false,
+  },
+  userDecisionTimeout: 5000,
+})(View);