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

Implemented hive integration fixes #7

Browse source
This commit is contained in:
Chris Blanchard 2015-08-31 15:55:42 +01:00
parent 1e347d26e5
commit 87faeab649
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/react/gather.jsx
View file

@ -634,13 +634,20 @@ var Gatherers = React.createClass({
}; };
if (gatherer.user.profile.skill) { if (gatherer.user.profile.skill) {
var skill = (<span className="label label-primary">{gatherer.user.profile.skill}</span>); var skill = (<span className="label label-default">{gatherer.user.profile.skill}</span>);
} }
var abilities = []; var abilities = [];
for (let attr in gatherer.user.profile.abilities) { for (let attr in gatherer.user.profile.abilities) {
if (gatherer.user.profile.abilities[attr]) abilities.push(_.capitalize(attr)); if (gatherer.user.profile.abilities[attr]) abilities.push(_.capitalize(attr));
} }
if (gatherer.user.hive.skill) abilities.push("ELO: " + gatherer.user.hive.skill);
if (gatherer.user.hive.playTime) {
abilities.push(Math.floor(gatherer.user.hive.playTime / 3600) + " Hours");
}
var lifeform = ( var lifeform = (
abilities.map(lifeform => { abilities.map(lifeform => {
return (<span className="label label-default add-right" return (<span className="label label-default add-right"
@ -650,7 +657,7 @@ var Gatherers = React.createClass({
var team; var team;
if (gatherer.user.team) { if (gatherer.user.team) {
team = (<span className="label label-primary">{gatherer.user.team.name}</span>); team = (<span className="label label-default">{gatherer.user.team.name}</span>);
} }
var action; var action;
@ -685,8 +692,8 @@ var Gatherers = React.createClass({
return ( return (
<tr key={gatherer.user.id} data-userid={gatherer.user.id}> <tr key={gatherer.user.id} data-userid={gatherer.user.id}>
<td className="col-md-9"> <td className="col-md-9">
<p className="gatherer">{gatherer.user.username}</p> <p className="gatherer">{country} {gatherer.user.username}</p>
<p className="gatherer">{country} {lifeform} {skill} {team}</p> <p className="gatherer-ability">{lifeform} {skill} {team}</p>
</td> </td>
<td className="col-md-3 text-right">{action}&nbsp;</td> <td className="col-md-3 text-right">{action}&nbsp;</td>
</tr> </tr>

1
lib/user/user.js
View file

@ -94,7 +94,6 @@ User.find = (id, callback) => {
} }
], function (error, result) { ], function (error, result) {
if (error) return callback(error); if (error) return callback(error);
console.log(user);
return callback(null, user); return callback(null, user);
}) })
}); });

9
public/css/app.css
View file

@ -7,10 +7,17 @@ html, body {
} }
.gatherer { .gatherer {
margin-bottom: 3px; margin-bottom: 5px;
padding: 0px; padding: 0px;
} }
.gatherer-ability {
font-size: 12px;
line-height: 25px;
padding: 0px;
margin: 0px;
}
#chatroom { #chatroom {
margin-top: 20px; margin-top: 20px;
} }