Split out render methods into 'views' leaving UI logic in 'controllers'. Hopefully should make it easier to skin / customise.

src/views/atoms/LogoutButton.js

@@ -0,0 +1,13 @@
+var React = require('react');
+
+var LogoutButtonController = require("../../controllers/atoms/LogoutButton");
+
+module.exports = React.createClass({
+    mixins: [LogoutButtonController],
+
+    render: function() {
+        return (
+            <button className="mx_LogoutButton" onClick={this.onClick}>Sign out</button>
+        );
+    }
+});

src/views/atoms/MessageTimestamp.js

@@ -0,0 +1,17 @@
+var React = require('react');
+
+var MessageTimestampController = require("../../controllers/atoms/MessageTimestamp");
+
+module.exports = React.createClass({
+    mixins: [MessageTimestampController],
+
+    render: function() {
+        var date = new Date(this.props.ts);
+        return (
+            <span className="mx_MessageTimestamp">
+                {date.toLocaleTimeString()}
+            </span>
+        );
+    },
+});
+

src/views/molecules/MEmoteTile.js

@@ -0,0 +1,19 @@
+var React = require('react');
+
+var MEmoteTileController = require("../../controllers/molecules/MEmoteTile");
+
+module.exports = React.createClass({
+    mixins: [MEmoteTileController],
+
+    render: function() {
+        var mxEvent = this.props.mxEvent;
+        var content = mxEvent.getContent();
+        var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
+        return (
+            <span className="mx_MEmoteTile">
+                {name} {content.body}
+            </span>
+        );
+    },
+});
+

src/views/molecules/MTextTile.js

@@ -0,0 +1,17 @@
+var React = require('react');
+
+var MTextTileController = require("../../controllers/molecules/MTextTile");
+
+module.exports = React.createClass({
+    mixins: [MTextTileController],
+
+    render: function() {
+        var content = this.props.mxEvent.getContent();
+        return (
+            <span className="mx_MTextTile">
+                {content.body}
+            </span>
+        );
+    },
+});
+

src/views/molecules/MatrixToolbar.js

@@ -0,0 +1,20 @@
+var React = require('react');
+
+var ComponentBroker = require('../../ComponentBroker');
+
+var LogoutButton = ComponentBroker.get("atoms/LogoutButton");
+
+var MatrixToolbarController = require("../../controllers/molecules/MatrixToolbar");
+
+module.exports = React.createClass({
+    mixins: [MatrixToolbarController],
+
+    render: function() {
+        return (
+            <div className="mx_MatrixToolbar">
+                <LogoutButton />
+            </div>
+        );
+    }
+});
+

src/views/molecules/MessageComposer.js

@@ -0,0 +1,16 @@
+var React = require('react');
+
+var MessageComposerController = require("../../controllers/molecules/MessageComposer");
+
+module.exports = React.createClass({
+    mixins: [MessageComposerController],
+
+    render: function() {
+        return (
+            <div className="mx_MessageComposer">
+                <textarea ref="textarea" onKeyDown={this.onKeyDown} />
+            </div>
+        );
+    },
+});
+

src/views/molecules/MessageTile.js

@@ -0,0 +1,43 @@
+var React = require('react');
+
+var classNames = require("classnames");
+
+var ComponentBroker = require('../../ComponentBroker');
+
+var MessageTimestamp = ComponentBroker.get('atoms/MessageTimestamp');
+var SenderProfile = ComponentBroker.get('molecules/SenderProfile');
+
+var UnknownMessageTile = ComponentBroker.get('molecules/UnknownMessageTile');
+
+var tileTypes = {
+    'm.text': ComponentBroker.get('molecules/MTextTile'),
+    'm.emote': ComponentBroker.get('molecules/MEmoteTile')
+};
+
+var MessageTileController = require("../../controllers/molecules/MessageTile");
+
+module.exports = React.createClass({
+    mixins: [MessageTileController],
+
+    render: function() {
+        var content = this.props.mxEvent.getContent();
+        var msgtype = content.msgtype;
+        var TileType = UnknownMessageTile;
+        if (msgtype && tileTypes[msgtype]) {
+            TileType = tileTypes[msgtype];
+        }
+        var classes = classNames({
+            mx_MessageTile: true,
+            sending: this.props.mxEvent.status == 'sending',
+            not_sent: this.props.mxEvent.status == 'not_sent'
+        });
+        return (
+            <div className={classes}>
+                <MessageTimestamp ts={this.props.mxEvent.getTs()} />
+                <SenderProfile mxEvent={this.props.mxEvent} />
+                <TileType mxEvent={this.props.mxEvent} />
+            </div>
+        );
+    },
+});
+

src/views/molecules/ProgressBar.js

@@ -0,0 +1,18 @@
+var React = require('react');
+
+var ProgressBarController = require("./../molecules/ProgressBar");
+
+module.exports = React.createClass({
+    mixins: [ProgressBarController],
+
+    render: function() {
+        // Would use an HTML5 progress tag but if that doesn't animate if you
+        // use the HTML attributes rather than styles
+        var progressStyle = {
+            width: ((this.props.value / this.props.max) * 100)+"%"
+        };
+        return (
+            <div className="mx_ProgressBar"><div className="mx_ProgressBar_fill" style={progressStyle}></div></div>
+        );
+    }
+});

src/views/molecules/RoomHeader.js

@@ -0,0 +1,16 @@
+var React = require('react');
+
+var RoomHeaderController = require("../../controllers/molecules/RoomHeader");
+
+module.exports = React.createClass({
+    mixins: [RoomHeaderController],
+
+    render: function() {
+        return (
+            <div className="mx_RoomHeader">
+                {this.props.room.name}
+            </div>
+        );
+    },
+});
+

src/views/molecules/RoomTile.js

@@ -0,0 +1,20 @@
+var React = require('react');
+var classNames = require('classnames');
+
+var RoomTileController = require("../../controllers/molecules/RoomTile");
+
+module.exports = React.createClass({
+    mixins: [RoomTileController],
+    render: function() {
+        var classes = classNames({
+            'mx_RoomTile': true,
+            'selected': this.props.selected,
+            'unread': this.props.unread
+        });
+        return (
+            <div className={classes} onClick={this.onClick}>
+                <div className="mx_RoomTile_name">{this.props.room.name}</div>
+            </div>
+        );
+    }
+});

src/views/molecules/SenderProfile.js

@@ -0,0 +1,23 @@
+var React = require('react');
+
+var SenderProfileController = require("../../controllers/molecules/SenderProfile");
+
+module.exports = React.createClass({
+    mixins: [SenderProfileController],
+
+    render: function() {
+        var mxEvent = this.props.mxEvent;
+        var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
+
+        var msgtype = mxEvent.getContent().msgtype;
+        if (msgtype && msgtype == 'm.emote') {
+            name = ''; // emote message must include the name so don't duplicate it
+        }
+        return (
+            <span className="mx_SenderProfile">
+                {name}
+            </span>
+        );
+    },
+});
+

src/views/molecules/ServerConfig.js

@@ -0,0 +1,24 @@
+var React = require('react');
+
+var ServerConfigController = require("../../controllers/molecules/ServerConfig");
+
+module.exports = React.createClass({
+    mixins: [ServerConfigController],
+
+    render: function() {
+        return (
+            <div className="HomeServerTextBox">
+                <table className="serverConfig">
+                <tr>
+                <td>Home Server URL</td>
+                <td><input type="text" value={this.state.hs_url} onChange={this.hsChanged} /></td>
+                </tr>
+                <tr>
+                <td>Identity Server URL</td>
+                <td><input type="text" value={this.state.is_url} onChange={this.isChanged} /></td>
+                </tr>
+                </table>
+            </div>
+        );
+    }
+});

src/views/molecules/UnknownMessageTile.js

@@ -0,0 +1,15 @@
+var React = require('react');
+
+var UnknownMessageTileController = require("../../controllers/molecules/UnknownMessageTile");
+
+module.exports = React.createClass({
+    mixins: [UnknownMessageTileController],
+
+    render: function() {
+        return (
+            <span className="mx_UnknownMessageTile">
+                ?
+            </span>
+        );
+    },
+});

src/views/organisms/RoomList.js

@@ -0,0 +1,19 @@
+var React = require('react');
+
+var RoomListController = require("../../controllers/organisms/RoomList");
+
+
+module.exports = React.createClass({
+    mixins: [RoomListController],
+
+    render: function() {
+        return (
+            <div className="mx_RoomList">
+                <ul>
+                    {this.makeRoomTiles()}
+                </ul>
+            </div>
+        );
+    }
+});
+

src/views/organisms/RoomView.js

@@ -0,0 +1,35 @@
+var React = require('react');
+
+var ComponentBroker = require('../../ComponentBroker');
+
+var MessageTile = ComponentBroker.get('molecules/MessageTile');
+var RoomHeader = ComponentBroker.get('molecules/RoomHeader');
+var MessageComposer = ComponentBroker.get('molecules/MessageComposer');
+
+var RoomViewController = require("../../controllers/organisms/RoomView");
+
+
+module.exports = React.createClass({
+    mixins: [RoomViewController],
+
+    getMessageTiles: function() {
+        return this.state.room.timeline.map(function(mxEv) {
+            return (
+                <li key={mxEv.getId()}><MessageTile mxEvent={mxEv} /></li>
+            );
+        });
+    },
+
+    render: function() {
+        return (
+            <div className="mx_RoomView">
+                <RoomHeader room={this.state.room} />
+                <ul ref="messageList">
+                    {this.getMessageTiles()}
+                </ul>
+                <MessageComposer roomId={this.props.roomId} />
+            </div>
+        );
+    },
+});
+

src/views/pages/MatrixChat.js

@@ -0,0 +1,40 @@
+var React = require('react');
+var ComponentBroker = require('../../ComponentBroker');
+
+var RoomList = ComponentBroker.get('organisms/RoomList');
+var RoomView = ComponentBroker.get('organisms/RoomView');
+var MatrixToolbar = ComponentBroker.get('molecules/MatrixToolbar');
+var Login = ComponentBroker.get('templates/Login');
+
+var MatrixChatController = require("../../controllers/pages/MatrixChat");
+
+// should be atomised
+var Loader = require("react-loader");
+
+
+module.exports = React.createClass({
+    mixins: [MatrixChatController],
+
+    render: function() {
+        if (this.state.logged_in && this.state.ready) {
+            return (
+                <div className="mx_MatrixChat">
+                    <div className="mx_MatrixChat_leftPanel">
+                        <MatrixToolbar />
+                        <RoomList selectedRoom={this.state.currentRoom} />
+                    </div>
+                    <RoomView roomId={this.state.currentRoom} key={this.state.currentRoom} />
+                </div>
+            );
+        } else if (this.state.logged_in) {
+            return (
+                <Loader />
+            );
+        } else {
+            return (
+                <Login onLoggedIn={this.onLoggedIn} />
+            );
+        }
+    }
+});
+

src/views/templates/Login.js

@@ -0,0 +1,37 @@
+var React = require('react');
+
+var ComponentBroker = require("../../ComponentBroker");
+
+var ProgressBar = ComponentBroker.get("molecules/ProgressBar");
+var Loader = require("react-loader");
+
+var LoginController = require("../../controllers/templates/Login");
+
+module.exports = React.createClass({
+    mixins: [LoginController],
+
+    loginContent: function() {
+        if (this.state.busy) {
+            return (
+                <Loader />
+            );
+        } else {
+            return (
+                <div>
+                    <h1>Please log in:</h1>
+                    {this.componentForStep(this.state.step)}
+                    <div className="error">{this.state.errorText}</div>
+                </div>
+            );
+        }
+    },
+
+    render: function() {
+        return (
+            <div className="mx_Login">
+            <ProgressBar value={this.state.currentStep} max={this.state.totalSteps} />
+            {this.loginContent()}
+            </div>
+        );
+    }
+});