Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2 fixes: member json-file typo. Can now render PR to non-guild member… #92

Merged
merged 1 commit into from Nov 13, 2015
Merged

2 fixes: member json-file typo. Can now render PR to non-guild member… #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
125 changes: 70 additions & 55 deletions bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/components/actions.js
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ var Actions = React.createClass({
render: function(){
var rows = _.map(actions.filter(this.nameFilterFunction).filter(this.whatFilterFunction).filter(this.typeFilterFunction),function(info,id){
var user = members[info.by],
tuser = members[info.target];
tuser = members[info.target] || {github: null};
return (
<tr key={id}>
<td><Badge id={user.github} /></td>
Expand All @@ -52,7 +52,7 @@ var Actions = React.createClass({
<br/>
<a href={info.url} target="_blank">{info.description}</a>
</td>
<td>{info.target && <span><Badge id={tuser.github} /></span> || ""}</td>
<td>{info.type ==='pr' && <span><Badge id={tuser.github} /></span> || ""}</td>
</tr>
);
});
Expand Down
30 changes: 20 additions & 10 deletions src/components/badge.js
View file
Open in desktop
Expand Up @@ -5,22 +5,32 @@ var React = require("react"),

var Badge = React.createClass({
render() {
var currentMember = members[this.props.id],
names = currentMember.name.split(" "),
var currentMember = members[this.props.id];
if(currentMember){
var names = currentMember.name.split(" "),
surnameletters = {
David: 1,
Jesper: 2,
Mattias: 1,
Emil: 1
}[names[0]];
return (
<span className="badge">
<Link to={"/member/"+currentMember.github}>
<Icon icon={currentMember.icon} />
<p className="badge-name">{names[0]+(surnameletters ? " "+names[1].substr(0,surnameletters) : "")}</p>
</Link>
</span>
);
return (
<span className="badge">
<Link to={"/member/"+currentMember.github}>
<Icon icon={currentMember.icon} />
<p className="badge-name">{names[0]+(surnameletters ? " "+names[1].substr(0,surnameletters) : "")}</p>
</Link>
</span>
);
}
else {
return (
<span className="badge">
<Icon icon={'elves-wood$sylph'} />
<p className="badge-name">Non-guild member repo</p>
</span>
);
}
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/components/member.js
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ var Member = React.createClass({
return <li key={n}><a target="_blank" href={post.url}>{post.title+" ("+post.when+(post.sageadvice ? ", sage advice!":"")+")"}</a></li>;
}),
pullrequests = (data.pullrequests || []).map(function(pr,n){
var targetuser = members[pr.target];
var targetuser = members[pr.target] || {github: null};
return (
<tr key={n}>
<td><Badge id={targetuser.github} /></td>
Expand Down
2 changes: 1 addition & 1 deletion src/data/members.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ Check users/krawaller.json for an example on what your file should look like!

var members = {
krawaller: require("./users/krawaller.json"),
Dagashi: require("./users/Dagashi.json"),
Dagashi: require("./users/dagashi.json"),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change intentional? Pretty sure it should be with capital D.

OskarKlintrot: require("./users/OskarKlintrot.json"),
MoombaDS: require("./users/MoombaDS.json"),
uf222ba: require("./users/uf222ba.json"),
Expand Down