Skip to content

Mixed improvements on server and client #27

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

Merged
debugger22 merged 3 commits into from
Oct 21, 2016
Merged

Mixed improvements on server and client #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ccb7a3
Add cross-env dependency so that `npm start' works
mcornella Oct 9, 2016
5301419
Set `merged' action if `merged' key is true
mcornella Oct 9, 2016
c5a04f3
Add URL field for each event
mcornella Oct 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/public/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ function drawEvent(data, svg_area) {
.remove();

var circle_container = circle_group.append('a');
circle_container.attr('xlink:href', 'https://github.com/' + data.repo_name);
circle_container.attr('xlink:href', data.url);
circle_container.attr('target', '_blank');
circle_container.attr('fill', svg_text_color);

Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"homepage": "https://github.com/debugger22/github-audio#readme",
"dependencies": {
"chalk": "^1.1.3",
"cross-env": "^3.1.2",
"express": "^4.14.0",
"helmet": "^2.2.0",
"ip": "^1.1.3",
Expand Down
13 changes: 9 additions & 4 deletions server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ function stripData(data){
'repo_name': data.repo.name,
'payload_size': data.payload.size,
'message': data.payload.commits[0].message,
'created': data.created_at
'created': data.created_at,
'url': data.repo.url
});
pushEventCounter++;
}
Expand All @@ -130,9 +131,11 @@ function stripData(data){
'repo_name': data.repo.name,
'payload_size': 0,
'message': data.body,
'created': data.created_at
'created': data.created_at,
'url': data.payload.comment.html_url
});
}else if(data.type == 'PullRequestEvent'){
if (data.payload.pull_request.merged) data.payload.action = 'merged';
stripedData.push({
'id': data.id,
'type': data.type,
Expand All @@ -142,7 +145,8 @@ function stripData(data){
'repo_name': data.repo.name,
'action': data.payload.action, // opened, reopened, closed, merged
'message': data.payload.pull_request.title,
'created': data.created_at
'created': data.created_at,
'url': data.payload.pull_request.html_url
});
}else if(data.type == 'IssuesEvent'){
stripedData.push({
Expand All @@ -154,7 +158,8 @@ function stripData(data){
'repo_name': data.repo.name,
'action': data.payload.action, // opened, reopened, closed
'message': data.payload.issue.title,
'created': data.created_at
'created': data.created_at,
'url': data.payload.issue.html_url
});
}
});
Expand Down