From 304f72ee2105f8483d742bc8020cd0cd25b1bceb Mon Sep 17 00:00:00 2001
From: Unknown <jpramassini@gmail.com>
Date: Sat, 27 Jan 2018 23:36:27 -0500
Subject: [PATCH 1/3] Push Before HTML Upload

---
 googletrendsgame/src/App.js                   | 26 ++++++++++------
 googletrendsgame/src/components/GameScreen.js |  1 +
 googletrendsgame/src/components/RoomList.js   | 31 ++++++++++++-------
 .../src/components/RoomListItem.js            |  5 +--
 googletrendsgame/src/components/User.js       |  0
 .../src/components/activeButton.js            |  2 +-
 .../src/components/nicknameInput.js           |  2 +-
 7 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 googletrendsgame/src/components/User.js

diff --git a/googletrendsgame/src/App.js b/googletrendsgame/src/App.js
index 631a556..d17fa7b 100644
--- a/googletrendsgame/src/App.js
+++ b/googletrendsgame/src/App.js
@@ -13,19 +13,26 @@ class App extends Component {
     super(props);
 
     this.state={
-      progression: 'createRoom',
-      roomList: []
+      progression: 'register',
+      roomsList: []
     }
+    this.modifyStateToCreateRoom = this.modifyStateToCreateRoom.bind(this);
   }
 
-  componentDidMount(){
+  modifyStateToCreateRoom() {
+    this.setState({
+      progression: 'createRoom'
+    });
   }
 
-  stateHandler(){
-    socket.on('sendRooms', payload => this.setState({
-    progression: 'roomChoose',
-    roomList: payload.rooms
-    }));
+  componentDidMount(){
+    socket.on('sendRooms', payload => {
+      const rooms = payload.rooms;
+      this.setState({
+        progression: 'roomChoose',
+        roomsList: rooms
+      })
+    });
   }
 
   render() {
@@ -34,9 +41,8 @@ class App extends Component {
         <NicknameInput socket = {socket}/>
       )
     } else if(this.state.progression === 'roomChoose') {
-
         return(
-          <RoomList roomArray = {this.state.roomList}/>
+          <RoomList stateModifier={this.modifyStateToCreateRoom} roomArray = {this.state.roomsList}/>
         )
 
     } else if (this.state.progression === 'createRoom') {
diff --git a/googletrendsgame/src/components/GameScreen.js b/googletrendsgame/src/components/GameScreen.js
index e69de29..ef867d9 100644
--- a/googletrendsgame/src/components/GameScreen.js
+++ b/googletrendsgame/src/components/GameScreen.js
@@ -0,0 +1 @@
+import React, {Component} from 'react';
diff --git a/googletrendsgame/src/components/RoomList.js b/googletrendsgame/src/components/RoomList.js
index ec9f3ca..5b8d5a5 100644
--- a/googletrendsgame/src/components/RoomList.js
+++ b/googletrendsgame/src/components/RoomList.js
@@ -1,18 +1,25 @@
-import React, { Component } from 'react';
-import RoomListItem from 'roomListItem';
+import React from 'react';
+import RoomListItem from './RoomListItem';
+import {modifyStateToCreateRoom} from '../App'
 
-class RoomList extends Component {
-
-  renderRooms(roomArray) {
-      return(
-        <RoomListItem key = {room.name} roomName = {room.name} private = {room.passwordBool} capacity = {room.capacity} occupancy = {room.occupants} />
-      )
-  }
-
-  render(){
+export default (props) => {
+  let rooms = props.roomArray;
+  console.log(rooms);
+  if (rooms.length != 0) {
+      let roomsList = rooms.map((room) =>
+      <RoomListItem roomName={room.name} private={room.passwordBool} capacity={room.capacity} occupancy={room.occupants} />
+    );
     return(
       <div>
-        {this.props.roomArray.map(this.renderRooms)}
+       <div>{roomsList}</div>
+       <button>Create Room</button>
+      </div>
+    );
+  } else {
+    return (
+      <div>
+        <div>No current rooms, you should create one!</div>
+        <button onClick={props.stateModifier}>Create Room</button>
       </div>
     )
   }
diff --git a/googletrendsgame/src/components/RoomListItem.js b/googletrendsgame/src/components/RoomListItem.js
index 411a536..91ed786 100644
--- a/googletrendsgame/src/components/RoomListItem.js
+++ b/googletrendsgame/src/components/RoomListItem.js
@@ -1,10 +1,11 @@
 import React from 'react';
 
 export default (props) => {
+  var privateString =''
   if (props.private = false){
-    const privateString = "Public"
+    privateString = "Public"
   } else {
-    const privateString = "Private"
+    privateString = "Private"
   }
   return(
     <div>
diff --git a/googletrendsgame/src/components/User.js b/googletrendsgame/src/components/User.js
new file mode 100644
index 0000000..e69de29
diff --git a/googletrendsgame/src/components/activeButton.js b/googletrendsgame/src/components/activeButton.js
index a53fb57..d90ab06 100644
--- a/googletrendsgame/src/components/activeButton.js
+++ b/googletrendsgame/src/components/activeButton.js
@@ -16,7 +16,7 @@ export default class activeButton extends Component {
           )
         }
       case 'createRoom':
-        if(this.props.passInput != '' && this.props.capacityInput != '' && this.props.capacityInput <= 25 && this.props.capacityInput>=2 && this.props.capacityInput.length <= 2){
+        if(this.props.passInput !== '' && this.props.capacityInput !== '' && this.props.capacityInput <= 25 && this.props.capacityInput>=2 && this.props.capacityInput.length <= 2){
           return(
             <button>Create Room</button>
           )
diff --git a/googletrendsgame/src/components/nicknameInput.js b/googletrendsgame/src/components/nicknameInput.js
index 5d395aa..ae3365f 100644
--- a/googletrendsgame/src/components/nicknameInput.js
+++ b/googletrendsgame/src/components/nicknameInput.js
@@ -25,7 +25,7 @@ export default class NicknameInput extends Component {
   render() {
      return(
        <form onSubmit={this.sendNickname}>
-        <input placeholder="Enter a nickname..." onChange = {this.onInputChange} value={this.state.fieldValue} />
+        <input maxLength="30" placeholder="Enter a nickname..." onChange = {this.onInputChange} value={this.state.fieldValue} />
         <span>
           <ActiveButton input = {this.state.fieldValue} type='register' />
         </span>

From 5de0c58d0b46654047cb69615956b13a7f310f79 Mon Sep 17 00:00:00 2001
From: Jesse Gliesman <jesse.gliesman@gmail.com>
Date: Sat, 27 Jan 2018 23:37:42 -0500
Subject: [PATCH 2/3] Add files via upload

---
 game.html | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 game.html

diff --git a/game.html b/game.html
new file mode 100644
index 0000000..2260521
--- /dev/null
+++ b/game.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+
+		<!--  Meta  -->
+		<meta charset="UTF-8" />
+		<title>Trend Spotter | Game</title>
+		<!--  /  -->
+
+		<!--  Styles  -->
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+		<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:100,300,400,600,700" rel="stylesheet">
+		<link href="https://fonts.googleapis.com/css?family=Poppins:100,300,400,500,700,800,900" rel="stylesheet">
+		<link rel="stylesheet" href="styles/app.css">
+		<!--  /  -->
+
+	</head>
+	<body>
+
+		<div class="container-fluid game">
+			<div class="row">
+
+				<!-- Main -->
+				<div class="col-xs-12 game__main">
+
+					<div class="logo">trend spot</div>
+					<div class="game__user-score">jesseg89: 20,005 points</div>
+					<div class="game__round">Round 4/7</div>
+					<div class="game__phrase">
+						<input class="game__phrase--entry" type="text">
+						<div class="game__phrase--clue">car</div>
+						<button class="game__submit">Submit my answer!</button>
+					</div>
+					<div class="game__room">You're in <em>dave61's room</em> | 12/20 players</div>
+					<a href="lobby.html" class="game__exit">Leave Game</a>
+
+				</div>
+				<!-- / -->
+
+				<!--
+				<div class="col-xs-12 col-sm-3 game__sidebar">
+
+					<div class="game__timer">60 seconds</div>
+					<ol class="game__players">
+						<li class="game__player">
+							<span class="game__player-name">John Daniels</span>
+							<span class="game__player-score">10,000 points</span>
+							<span class="game__player-ready">X</span>
+						</li>
+						<li class="game__player">
+							<span class="game__player-name">John Daniels</span>
+							<span class="game__player-score">10,000 points</span>
+							<span class="game__player-ready">X</span>
+						</li>
+						<li class="game__player">
+							<span class="game__player-name">John Daniels</span>
+							<span class="game__player-score">10,000 points</span>
+							<span class="game__player-ready">X</span>
+						</li>
+					</ol>
+				</div>
+			</div>
+		</div>
+	-->
+
+		<!-- Scripts -->
+		<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+		<script src="scripts/index.js"></script>
+		<!--  /  -->
+
+	</body>
+</html>

From 41588135ba1b017482917b3e61d986f7eaf6b937 Mon Sep 17 00:00:00 2001
From: Unknown <jpramassini@gmail.com>
Date: Sat, 27 Jan 2018 23:54:04 -0500
Subject: [PATCH 3/3] Fixed Naming Errors (hopefully)

---
 googletrendsgame/src/App.js                        | 4 ++--
 googletrendsgame/src/components/createRoomInput.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/googletrendsgame/src/App.js b/googletrendsgame/src/App.js
index d17fa7b..aaf0a13 100644
--- a/googletrendsgame/src/App.js
+++ b/googletrendsgame/src/App.js
@@ -2,8 +2,8 @@ import React, { Component } from 'react';
 import logo from './logo.svg';
 import './App.css';
 import openSocket from 'socket.io-client';
-import NicknameInput from './components/NicknameInput';
-import CreateRoomInput from './components/CreateRoomInput';
+import NicknameInput from './components/nicknameInput';
+import CreateRoomInput from './components/createRoomInput';
 import RoomList from './components/RoomList';
 
 const socket = openSocket('129.21.91.149:3000');
diff --git a/googletrendsgame/src/components/createRoomInput.js b/googletrendsgame/src/components/createRoomInput.js
index 65e4ed3..39cab29 100644
--- a/googletrendsgame/src/components/createRoomInput.js
+++ b/googletrendsgame/src/components/createRoomInput.js
@@ -9,7 +9,7 @@ export default class CreateRoomInput extends Component {
       passwordFieldValue: '',
       capacityFieldValue:''
     }
-
+    //test Comment
     this.onInputChangePass = this.onInputChangePass.bind(this);
     this.onInputChangeCapacity = this.onInputChangeCapacity.bind(this);
     this.sendRoomData = this.sendRoomData.bind(this);