krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-05-21 18:43:59 +02:00
parent b49826129a b378e41f2c
commit c44c2a35ba
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/spec/services/groupServicesSpec.js
View File

@@ -37,6 +37,8 @@ describe('groupServices', function() {
var groupResponse = {data: {_id: groupId}}; var groupResponse = {data: {_id: groupId}};
$httpBackend.expectGET(groupApiUrlPrefix + '/party').respond(groupResponse); $httpBackend.expectGET(groupApiUrlPrefix + '/party').respond(groupResponse);
$httpBackend.expectGET('/api/v3/groups/' + groupId + '/members?includeAllPublicFields=true').respond({}); $httpBackend.expectGET('/api/v3/groups/' + groupId + '/members?includeAllPublicFields=true').respond({});
$httpBackend.expectGET('/api/v3/groups/' + groupId + '/invites').respond({});
$httpBackend.expectGET('/api/v3/challenges/groups/' + groupId).respond({});
groups.Group.syncParty(); groups.Group.syncParty();
$httpBackend.flush(); $httpBackend.flush();
}); });
@@ -81,6 +83,8 @@ describe('groupServices', function() {
var groupResponse = {data: {_id: groupId}}; var groupResponse = {data: {_id: groupId}};
$httpBackend.expectGET(groupApiUrlPrefix + '/party').respond(groupResponse); $httpBackend.expectGET(groupApiUrlPrefix + '/party').respond(groupResponse);
$httpBackend.expectGET('/api/v3/groups/' + groupId + '/members?includeAllPublicFields=true').respond({}); $httpBackend.expectGET('/api/v3/groups/' + groupId + '/members?includeAllPublicFields=true').respond({});
$httpBackend.expectGET('/api/v3/groups/' + groupId + '/invites').respond({});
$httpBackend.expectGET('/api/v3/challenges/groups/' + groupId).respond({});
groups.party(); groups.party();
$httpBackend.flush(); $httpBackend.flush();
}); });

2
test/spec/services/questServicesSpec.js
View File

@@ -349,6 +349,8 @@ describe('Quests Service', function() {
fakeBackend.when('GET', 'partials/main.html').respond({}); fakeBackend.when('GET', 'partials/main.html').respond({});
fakeBackend.when('GET', '/api/v3/groups/party').respond(partyResponse); fakeBackend.when('GET', '/api/v3/groups/party').respond(partyResponse);
fakeBackend.when('GET', '/api/v3/groups/party-id/members?includeAllPublicFields=true').respond({}); fakeBackend.when('GET', '/api/v3/groups/party-id/members?includeAllPublicFields=true').respond({});
fakeBackend.when('GET', '/api/v3/groups/party-id/invites').respond({});
fakeBackend.when('GET', '/api/v3/challenges/groups/party-id').respond({});
fakeBackend.when('POST', '/api/v3/groups/party-id/quests/invite/' + key).respond({quest: { key: 'whale' } }); fakeBackend.when('POST', '/api/v3/groups/party-id/quests/invite/' + key).respond({quest: { key: 'whale' } });
fakeBackend.flush(); fakeBackend.flush();
})); }));

8
website/client/js/controllers/tavernCtrl.js
View File

@@ -1,10 +1,14 @@
'use strict'; 'use strict';
habitrpg.controller("TavernCtrl", ['$scope', 'Groups', 'User', habitrpg.controller("TavernCtrl", ['$scope', 'Groups', 'User', 'Challenges',
function($scope, Groups, User) { function($scope, Groups, User, Challenges) {
Groups.tavern() Groups.tavern()
.then(function (tavern) { .then(function (tavern) {
$scope.group = tavern; $scope.group = tavern;
Challenges.getGroupChallenges($scope.group._id)
.then(function (response) {
$scope.group.challenges = response.data.data;
});
}) })
$scope.toggleUserTier = function($event) { $scope.toggleUserTier = function($event) {

10
website/client/js/services/groupServices.js
View File

@@ -121,8 +121,16 @@ angular.module('habitrpg')
Members.getGroupMembers(data.party._id, true) Members.getGroupMembers(data.party._id, true)
.then(function (response) { .then(function (response) {
data.party.members = response.data.data; data.party.members = response.data.data;
_cachedPartyPromise.resolve(data.party);
}); });
Members.getGroupInvites(data.party._id)
.then(function (response) {
data.party.invites = response.data.data;
});
Challenges.getGroupChallenges(data.party._id)
.then(function (response) {
data.party.challenges = response.data.data;
});
_cachedPartyPromise.resolve(data.party);
}, function (response) { }, function (response) {
data.party = { type: 'party' }; data.party = { type: 'party' };
_cachedPartyPromise.reject(data.party); _cachedPartyPromise.reject(data.party);