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

APIv2: some finalization of APIv2. Add new routes, re-rigg

Browse Source 
query/param/body requirements. This overhauls the API pretty
substantially, so we'll indeed be moving this to apiv2, using v1 for the
old API, and limiting it's use substantially
This commit is contained in:
Tyler Renelle
2013-12-15 14:49:22 -07:00
parent d0b07ba4db
commit 91e1287d06
7 changed files with 102 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/js/controllers/inventoryCtrl.js
View File

@@ -64,7 +64,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
var selected = $scope.selectedEgg ? 'selectedEgg' : $scope.selectedPotion ? 'selectedPotion' : $scope.selectedFood ? 'selectedFood' : undefined;
if (selected) {
var type = $scope.selectedEgg ? 'eggs' : $scope.selectedPotion ? 'hatchingPotions' : $scope.selectedFood ? 'food' : undefined;
user.ops.sell({query:{type:type, key: $scope[selected].name}});
user.ops.sell({params:{type:type, key: $scope[selected].name}});
if (user.items[type][$scope[selected].name] < 1) {
$scope[selected] = null;
}
@@ -77,22 +77,18 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
$scope.hatch = function(egg, potion){
if (!confirm('Hatch a ' + potion.name + ' ' + egg.name + '?')) return;
user.ops.hatch({query:{egg:egg.name, hatchingPotion:potion.name}});
user.ops.hatch({params:{egg:egg.name, hatchingPotion:potion.name}});
$scope.selectedEgg = null;
$scope.selectedPotion = null;
}
$scope.buy = function(type, item){
$scope.purchase = function(type, item){
var gems = User.user.balance * 4;
if(gems < item.value) return $rootScope.modals.buyGems = true;
var string = (type == 'hatchingPotion') ? 'hatching potion' : type; // give hatchingPotion a space
var message = "Buy this " + string + " with " + item.value + " of your " + gems + " Gems?"
if(confirm(message)){
$http.post(API_URL + '/api/v1/market/buy?type=' + type, item)
.success(function(data){
User.user.items = data.items;
});
}
if(confirm(message))
User.user.ops.purchase({params:{type:type,key:item.name}});
}
$scope.choosePet = function(egg, potion){
@@ -106,17 +102,17 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
} else if (!confirm('Feed ' + pet + ' a ' + food.name + '?')) {
return;
}
User.user.ops.feed({query:{pet: pet, food: food.name}});
User.user.ops.feed({params:{pet: pet, food: food.name}});
$scope.selectedFood = null;
// Selecting Pet
} else {
User.user.ops.equip({query:{type: 'pet', key: pet}});
User.user.ops.equip({params:{type: 'pet', key: pet}});
}
}
$scope.chooseMount = function(egg, potion) {
User.user.ops.equip({query:{type: 'mount', key: egg + '-' + potion}});
User.user.ops.equip({params:{type: 'mount', key: egg + '-' + potion}});
}
}
]);