ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2024-11-10 07:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix random user

Browse source
This commit is contained in:
Chris Blanchard 2015-08-28 21:37:55 +01:00
parent d39d031c9c
commit d699c0096b
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/socketio.js
View file

@ -12,12 +12,12 @@ var env = process.env.NODE_ENV || "development";
var parseCookies = EnslClient.parseCookies;
var assignRandomUser = (socket, next) => {
usersHelper.getRandomUser(function (error, _, body) {
usersHelper.getRandomUser(function (error, user) {
if (error) {
winston.error(error);
return next(new Error("Authentication Failed"))
}
socket._user = new User(body);
socket._user = user;
return next();
});
};

5
lib/react/gather.jsx
View file

@ -684,8 +684,9 @@ var Gatherers = React.createClass({
return (
<tr key={gatherer.user.id} data-userid={gatherer.user.id}>
<td className="col-md-9">{gatherer.user.username} <br />
{country} {lifeform} {division} {team}&nbsp;
<td className="col-md-9">
<p className="gatherer">{gatherer.user.username}</p>
<p className="gatherer">{country} {lifeform} {division} {team}</p>
</td>
<td className="col-md-3 text-right">{action}&nbsp;</td>
</tr>

5
public/css/app.css
View file

@ -6,6 +6,11 @@ html, body {
margin-top: 20px;
}
.gatherer {
margin-bottom: 3px;
padding: 0px;
}
#chatroom {
margin-top: 20px;
}