From 289a35682fa13e43bb5843b4166937b727c782ea Mon Sep 17 00:00:00 2001
From: Titouan Rigoudy <titouan.rigoudy@gmail.com>
Date: Sat, 12 Mar 2016 23:28:19 +0100
Subject: [PATCH] Add RoomChat, lay out everything nicely.

---
 src/actions/roomActions.js         |   8 +++
 src/components/Footer.js           |  21 ++++++
 src/components/Header.js           |   4 +-
 src/components/Room.js             |  11 +++-
 src/components/RoomList.js         |  17 +++--
 src/components/RoomListHeader.js   |  20 ++++++
 src/components/SocketStatusPane.js |   2 +-
 src/components/SolsticeApp.js      |  18 +++---
 src/constants/ActionTypes.js       |   4 ++
 src/containers/RoomChat.js         |  14 ++++
 src/containers/RoomsPane.js        |  30 ++++++---
 src/reducers/rooms.js              |   9 ++-
 src/styles/styles.scss             | 100 +++++++++++++++++++++++++++++
 13 files changed, 230 insertions(+), 28 deletions(-)
 create mode 100644 src/actions/roomActions.js
 create mode 100644 src/components/Footer.js
 create mode 100644 src/components/RoomListHeader.js
 create mode 100644 src/containers/RoomChat.js

diff --git a/src/actions/roomActions.js b/src/actions/roomActions.js
new file mode 100644
index 0000000..ee9a2d6
--- /dev/null
+++ b/src/actions/roomActions.js
@@ -0,0 +1,8 @@
+import { ROOM_SELECT } from "../constants/ActionTypes";
+
+export default {
+    select: (room_name) => ({
+        type: ROOM_SELECT,
+        payload: room_name
+    })
+};
diff --git a/src/components/Footer.js b/src/components/Footer.js
new file mode 100644
index 0000000..65a431b
--- /dev/null
+++ b/src/components/Footer.js
@@ -0,0 +1,21 @@
+import React, { PropTypes } from "react";
+
+import SocketStatusPane from "./SocketStatusPane";
+
+import LoginStatusPane from "../containers/LoginStatusPane";
+
+const Footer = ({ socket, socketActions }) => {
+    return (
+        <footer>
+            <SocketStatusPane {...socket} />
+            <LoginStatusPane socketSend={socketActions.send} />
+        </footer>
+    );
+};
+
+Footer.propTypes = {
+    socket: PropTypes.object.isRequired,
+    socketActions: PropTypes.object.isRequired
+};
+
+export default Footer;
diff --git a/src/components/Header.js b/src/components/Header.js
index 10e2f51..b09de8e 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -2,9 +2,9 @@ import React, { PropTypes } from "react";
 
 const Header = (props) => {
     return (
-        <div id="header">
+        <header>
             <h1>Solstice web UI</h1>
-        </div>
+        </header>
     );
 };
 
diff --git a/src/components/Room.js b/src/components/Room.js
index 3277c6e..a3571b2 100644
--- a/src/components/Room.js
+++ b/src/components/Room.js
@@ -1,11 +1,16 @@
 import React, { PropTypes } from "react";
 
-const Room = ({ name }) => {
-    return <div className="room">{name}</div>;
+const Room = ({ name, onClick }) => {
+    return (
+        <a className="room" onClick={onClick} href="#">
+            {name}
+        </a>
+    );
 };
 
 Room.propTypes = {
-    name: PropTypes.string.isRequired
+    name: PropTypes.string.isRequired,
+    onClick: PropTypes.func.isRequired
 };
 
 export default Room;
diff --git a/src/components/RoomList.js b/src/components/RoomList.js
index 0cf8eb9..c9551b4 100644
--- a/src/components/RoomList.js
+++ b/src/components/RoomList.js
@@ -1,26 +1,35 @@
 import React, { PropTypes } from "react";
 
 import Room from "./Room";
+import RoomListHeader from "./RoomListHeader";
 
-const RoomList = ({ rooms }) => {
+const RoomList = ({ refresh, rooms, roomActions }) => {
     const children = [];
+
     for (const [room_name, room_data] of rooms) {
+        const onClick = (event) => {
+            roomActions.select(room_name);
+        };
+
         children.push(
             <li key={room_name}>
-                <Room name={room_name} {...room_data} />
+                <Room onClick={onClick} name={room_name} {...room_data} />
             </li>
         );
     }
+
     return (
         <div id="room-list">
-            <div id="room-list-header">Room List</div>
+            <RoomListHeader refresh={refresh}/>
             <ul> {children} </ul>
         </div>
     );
 };
 
 RoomList.propTypes = {
-    rooms: PropTypes.object.isRequired
+    refresh: PropTypes.func.isRequired,
+    rooms: PropTypes.object.isRequired,
+    roomActions: PropTypes.object.isRequired
 };
 
 export default RoomList;
diff --git a/src/components/RoomListHeader.js b/src/components/RoomListHeader.js
new file mode 100644
index 0000000..fc00749
--- /dev/null
+++ b/src/components/RoomListHeader.js
@@ -0,0 +1,20 @@
+import React, { PropTypes } from "react";
+
+const RoomListHeader = ({ refresh }) => {
+    return (
+        <div id="room-list-header">
+            <div>
+                <h2>Room List</h2>
+            </div>
+            <div>
+                <button onClick={refresh}>Refresh</button>
+            </div>
+        </div>
+    );
+};
+
+RoomListHeader.propTypes = {
+    refresh: PropTypes.func.isRequired
+};
+
+export default RoomListHeader;
diff --git a/src/components/SocketStatusPane.js b/src/components/SocketStatusPane.js
index 105a52e..1af38d6 100644
--- a/src/components/SocketStatusPane.js
+++ b/src/components/SocketStatusPane.js
@@ -21,7 +21,7 @@ const SocketStatusPane = (props) => {
             string = `disconnected`;
             break;
     }
-    return <div>Connection status: {string}</div>;
+    return <div id="socket-status-pane">Connection status: {string}</div>;
 };
 
 SocketStatusPane.propTypes = {
diff --git a/src/components/SolsticeApp.js b/src/components/SolsticeApp.js
index aa7ec9d..0ac246b 100644
--- a/src/components/SolsticeApp.js
+++ b/src/components/SolsticeApp.js
@@ -1,8 +1,9 @@
 import React, {PropTypes} from "react";
 
-import ConnectForm from  "../components/ConnectForm";
-import Header from "../components/Header";
-import SocketStatusPane from "../components/SocketStatusPane";
+import ConnectForm from  "./ConnectForm";
+import Header from "./Header";
+import Footer from "./Footer";
+import SocketStatusPane from "./SocketStatusPane";
 
 import LoginStatusPane from "../containers/LoginStatusPane";
 import RoomsPane from "../containers/RoomsPane";
@@ -21,12 +22,13 @@ const SolsticeApp = (props) => {
         );
     }
     return (
-        <main>
+        <div id="solstice-app">
             <Header />
-            <SocketStatusPane {...socket} />
-            <LoginStatusPane socketSend={actions.socketActions.send}/>
-            <RoomsPane socketSend={actions.socketActions.send}/>
-        </main>
+            <main>
+                <RoomsPane socketSend={actions.socketActions.send}/>
+            </main>
+            <Footer socket={socket} socketActions={actions.socketActions} />
+        </div>
     );
 };
 
diff --git a/src/constants/ActionTypes.js b/src/constants/ActionTypes.js
index b859da8..b57911c 100644
--- a/src/constants/ActionTypes.js
+++ b/src/constants/ActionTypes.js
@@ -1,3 +1,4 @@
+// Socket actions
 export const SOCKET_SET_OPEN = Symbol("SOCKET_SET_OPEN");
 export const SOCKET_SET_OPENING = Symbol("SOCKET_SET_OPENING");
 export const SOCKET_SET_CLOSED = Symbol("SOCKET_SET_CLOSED");
@@ -5,3 +6,6 @@ export const SOCKET_SET_CLOSING = Symbol("SOCKET_SET_CLOSING");
 export const SOCKET_SET_ERROR = Symbol("SOCKET_SET_ERROR");
 export const SOCKET_RECEIVE_MESSAGE = Symbol("SOCKET_RECEIVE_MESSAGE");
 export const SOCKET_SEND_MESSAGE = Symbol("SOCKET_SEND_MESSAGE");
+
+// Room actions
+export const ROOM_SELECT = Symbol("ROOM_SELECT");
diff --git a/src/containers/RoomChat.js b/src/containers/RoomChat.js
new file mode 100644
index 0000000..2f6cccc
--- /dev/null
+++ b/src/containers/RoomChat.js
@@ -0,0 +1,14 @@
+import React, { PropTypes } from "react";
+import { connect } from "react-redux";
+
+const RoomChat = ({ name }) => {
+    return <div id="room-chat">{name}</div>;
+};
+
+RoomChat.propTypes = {
+    name: PropTypes.string.isRequired
+};
+
+export default connect(
+    (state) => ({ name: state.rooms.selected })
+)(RoomChat);
diff --git a/src/containers/RoomsPane.js b/src/containers/RoomsPane.js
index 6a2880b..bfff689 100644
--- a/src/containers/RoomsPane.js
+++ b/src/containers/RoomsPane.js
@@ -1,10 +1,14 @@
 import React, { PropTypes } from "react";
 import { connect } from "react-redux";
+import { bindActionCreators } from "redux";
 
 import RoomList from "../components/RoomList";
-import ControlRequest from "../utils/ControlRequest";
 
-const ID = "rooms-pane";
+import RoomChat from "../containers/RoomChat";
+
+import roomActions from "../actions/roomActions";
+
+import ControlRequest from "../utils/ControlRequest";
 
 class RoomsPane extends React.Component {
     constructor(props) {
@@ -16,15 +20,17 @@ class RoomsPane extends React.Component {
     }
 
     render() {
-        const onClick = (event) => {
+        const refresh = () => {
             this.props.socketSend(ControlRequest.roomList());
-            event.preventDefault();
         };
 
         return (
-            <div id={ID}>
-                <button onClick={onClick}>Refresh</button>
-                <RoomList rooms={this.props.rooms} />
+            <div id="rooms-pane">
+                <RoomChat />
+                <RoomList
+                    rooms={this.props.rooms}
+                    refresh={refresh}
+                    roomActions={this.props.roomActions}/>
             </div>
         );
     }
@@ -32,9 +38,17 @@ class RoomsPane extends React.Component {
 
 RoomsPane.propTypes = {
     rooms: PropTypes.object.isRequired,
+    roomActions: PropTypes.object.isRequired,
     socketSend: PropTypes.func.isRequired
 };
 
+const mapStateToProps = (state) => state.rooms;
+
+const mapDispatchToProps = (dispatch) => ({
+    roomActions: bindActionCreators(roomActions, dispatch)
+});
+
 export default connect(
-    state => state.rooms
+    mapStateToProps,
+    mapDispatchToProps
 )(RoomsPane);
diff --git a/src/reducers/rooms.js b/src/reducers/rooms.js
index 6491df3..afd3ed9 100644
--- a/src/reducers/rooms.js
+++ b/src/reducers/rooms.js
@@ -1,7 +1,8 @@
-import { SOCKET_RECEIVE_MESSAGE } from "../constants/ActionTypes";
+import { ROOM_SELECT, SOCKET_RECEIVE_MESSAGE } from "../constants/ActionTypes";
 
 const initialState = {
-    rooms: new Map()
+    rooms: new Map(),
+    selected: null
 };
 
 const reduceRoomList = (old_rooms, room_list) => {
@@ -47,6 +48,10 @@ export default (state = initialState, action) => {
     switch (type) {
         case SOCKET_RECEIVE_MESSAGE:
             return reduceReceiveMessage(state, payload);
+
+        case ROOM_SELECT:
+            return { ...state, selected: payload };
+
         default:
             return state;
     }
diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index 95df057..531deae 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -6,4 +6,104 @@ body {
     -moz-font-smoothing: antialiased;
     font-smoothing: antialiased;
     font-weight: 300;
+    padding: 0 !important;
+    margin: 0 !important;
+    height: 100%;
+}
+
+html {
+    padding: 0;
+    margin: 0;
+    height: 100vh;
+}
+
+#app, #solstice-app {
+    height: 100%;
+    margin: 0;
+    padding: 0;
+}
+
+#solstice-app {
+    display: flex;
+    flex-flow: column;
+}
+
+header {
+    margin: 0;
+    padding: 1.5em 2em;
+}
+
+header h1 {
+    margin: 0;
+}
+
+footer {
+    display: flex;
+}
+
+main {
+    height: 85%;
+    margin: 0;
+    padding: 0;
+}
+
+#rooms-pane {
+    display: flex;
+    border: solid grey 0.1em;
+    height: 100%;
+}
+
+#room-chat {
+    border: solid grey 0.1em;
+    padding: 2em;
+}
+
+#room-list {
+    flex: 1;
+    display: flex;
+    flex-flow: column;
+    border: solid grey 0.1em;
+    height: 100%;
+    overflow: auto;
+}
+
+#room-chat {
+    flex: 3;
+}
+
+#room-list-header {
+    display: flex;
+    flex-flow: row;
+    border: solid grey 0.1em;
+}
+
+#room-list-header div {
+    flex: 1;
+    border: solid grey 0.1em;
+}
+
+#room-list ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+
+.room {
+    display: flex;
+    color: inherit;
+    text-decoration: inherit;
+    padding: .5em 1em;
+    border: solid grey 0.1em;
+}
+
+.room:hover {
+    background: lightgrey;
+}
+
+.room:active {
+    background: grey;
+}
+
+#login-status-pane, #socket-status-pane {
+    flex: 1;
 }