Skip to content

Sort of enable joining room by link. #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Subtlemon merged 3 commits into from
May 18, 2020
Merged

Sort of enable joining room by link. #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4ca9fa
Enable pre-filling a room name from URL parameters
Subtlemon May 18, 2020
4893410
Use only the key as room name
Subtlemon May 18, 2020
44be3a2
Add link to waiting room
Subtlemon May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/src/components/Entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ export default class Entry extends Component {
constructor(props) {
super(props);

let roomName = new URLSearchParams(window.location.search).keys().next().value;
this.state = {
roomName: '',
roomName: roomName || '',
nickName: '',
};
}
Expand Down
5 changes: 4 additions & 1 deletion client/src/components/RoomComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}>
Expand Down