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

Trello in project #381

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Trello in project #381

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift click to select a range
06fd84c
Merge pull request #1 from Grasia/master
Apr 9, 2017
22bec23
gulpfile error handlers for pipes added
May 29, 2017
21a3017
Merge branch 'master' of https://github.com/krshubham/teem
May 29, 2017
87894a9
Added basic popover
Jun 19, 2017
aa7fcce
Merge remote-tracking branch 'upstream/master'
Jun 20, 2017
9dd4e63
Some changes in the popover
Jun 20, 2017
a5e7980
Added some stable changes to popover
Jun 22, 2017
46b44a9
separating bug fixes
Jun 22, 2017
83da6ea
Popover added gulpfile fix
Jun 22, 2017
16881d7
Removed jshint warnings
Jun 22, 2017
997258f
Added automatic pull of teemlp docker image
Jun 23, 2017
bf7aacb
ui button added asking for trello integration
Aug 15, 2017
b6d6c5a
added some more changes
Aug 15, 2017
96c4c90
Added workspace file changes
Aug 15, 2017
422cdb8
Added idea folder
Aug 15, 2017
d61125d
Added add card functionality to teem
Aug 24, 2017
f80c576
Added functionality for changing status of card
Aug 25, 2017
bcba2c7
fixed some jscs rules
Aug 28, 2017
158e6e8
removed package-lock.json
Aug 28, 2017
e2316b0
Added code for making comments as well as archiving
Aug 29, 2017
9b730ed
Corrected a bug in need-widget
Aug 29, 2017
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
10 changes: 10 additions & 0 deletions src/js/services/projectsService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 355,13 @@ angular.module('Teem')

if (newStatus) {
need.completionDate = (new Date()).toJSON();
trelloSvc.archiveCard(this.trello,need).
then(data => need.closed = true)
.catch(err => console.log(err));
} else {
trelloSvc.unarchiveCard(this.trello,need).
then(data => {need.closed = false;})
.catch(err => console.log(err));
delete need.completionDate;
}
}
Expand All @@ -376,6 382,10 @@ angular.module('Teem')
var i = this.needs.indexOf(need);

this.needs.splice(i, 1);

trelloSvc.archiveNeed(this.trello,need).
then(data => need.removed = true)
.catch(err => console.log(err));
}

addNeedComment(need, comment) {
Expand Down
12 changes: 11 additions & 1 deletion src/js/services/trelloService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 60,15 @@
return deferred.promise;
}

function archiveCard(trelloObj, need){
let deferred = $q.defer();
const archiveCardURL = `https://api.trello.com/1/cards/${need.trelloId}?closed="true"&key=09e4aced60041e389dbb27b9accadd65&token=${trelloObj.token}`;
Copy link
Contributor

Choose a reason for hiding this comment

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

key should go to the configuration file, and now be changed probably. Please let me know the new key so I can add it to the secrets file to be used by travis.

$http.put(archiveCardURL).
then(result => deferred.resolve(result.data))
.catch(err => deferred.reject(result.data));
return deferred.promise;
}

function registerWebhook(trelloObj){
const webhookURL = `https://api.trello.com/1/webhooks/?idModel=${trelloObj.boardId}&key=09e4aced60041e389dbb27b9accadd65&token=${trelloObj.token}&callbackURL=http://13.126.145.126:9500/`;
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here, key to config file.

$http.post(webhookURL)
Expand All @@ -82,7 91,8 @@
createTrelloBoard: createTrelloBoard,
createNewList: createNewList,
addNewCard: addNewCard,
registerWebhook: registerWebhook
registerWebhook: registerWebhook,
archiveCard: archiveCard
};
}
})();