From f4ca9fa1793e007bd9f882c2c1395bb6f17ea44e Mon Sep 17 00:00:00 2001
From: Subtlemon <harryliang1@gmail.com>
Date: Sun, 17 May 2020 23:22:21 -0400
Subject: [PATCH 1/3] Enable pre-filling a room name from URL parameters

---
 client/src/components/Entry.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/components/Entry.js b/client/src/components/Entry.js
index f5f6ffb..06ca2d5 100644
--- a/client/src/components/Entry.js
+++ b/client/src/components/Entry.js
@@ -24,8 +24,9 @@ export default class Entry extends Component {
   constructor(props) {
     super(props);
 
+    let roomName = new URLSearchParams(window.location.search).get('room');
     this.state = {
-      roomName: '',
+      roomName: roomName || '',
       nickName: '',
     };
   }

From 48934106a392b5359bb86eb493e676b7a3e1d947 Mon Sep 17 00:00:00 2001
From: Subtlemon <harryliang1@gmail.com>
Date: Sun, 17 May 2020 23:35:55 -0400
Subject: [PATCH 2/3] Use only the key as room name

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

diff --git a/client/src/components/Entry.js b/client/src/components/Entry.js
index 06ca2d5..4bc3833 100644
--- a/client/src/components/Entry.js
+++ b/client/src/components/Entry.js
@@ -24,7 +24,7 @@ export default class Entry extends Component {
   constructor(props) {
     super(props);
 
-    let roomName = new URLSearchParams(window.location.search).get('room');
+    let roomName = new URLSearchParams(window.location.search).keys().next().value;
     this.state = {
       roomName: roomName || '',
       nickName: '',

From 44be3a22f72dfd08704d7bc778b7beaa48eeee7e Mon Sep 17 00:00:00 2001
From: Subtlemon <harryliang1@gmail.com>
Date: Sun, 17 May 2020 23:59:33 -0400
Subject: [PATCH 3/3] Add link to waiting room

---
 client/src/components/RoomComponent.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/components/RoomComponent.js b/client/src/components/RoomComponent.js
index ae966d1..4019d33 100644
--- a/client/src/components/RoomComponent.js
+++ b/client/src/components/RoomComponent.js
@@ -184,7 +184,10 @@ export default class RoomComponent extends Component {
             Room Name: <b>{this.state.roomName}</b>
           </Typography>
           <Typography variant='subtitle1'>
-            Ask your friends to join using the above room name!
+            Join with the above room name or below link!
+          </Typography>
+          <Typography>
+            {window.location.origin + '/?' + this.state.roomName}
           </Typography>
           <Divider variant='middle' style={styles.divider} />
           <div style={styles.settingsContainer}>