diff --git a/www/js/password.js b/www/js/password.js index d955ed1..97e673c 100644 --- a/www/js/password.js +++ b/www/js/password.js @@ -2,13 +2,13 @@ angular.module('app.password', ['pascalprecht.translate']) .controller('PasswordCtrl', function($scope, $stateParams, $translate, $http, $ionicLoading) { - $scope.newPass = {}; + $scope.newPassword = {}; $scope.changePassword = function() { - console.log($scope.newPass); + console.log($scope.newPassword); $http({ url: urlapi + 'changePassword', method: "PUT", - data: $scope.newPass + data: $scope.newPassword }) .then(function(data) { console.log(data); diff --git a/www/js/signup.js b/www/js/signup.js index a7e5391..cd099d4 100644 --- a/www/js/signup.js +++ b/www/js/signup.js @@ -52,40 +52,6 @@ angular.module('app.signup', ['pascalprecht.translate']) if (obj.email == undefined) { return (false); } - /*if(obj.avatar==undefined) - { - return(false); - }*/ return (true); }; - $scope.avatars = [ - "turtle", - "cat", - "toucan", - "racoon", - "tiger", - "squirrel", - "sheep", - "penguin", - "panda", - "owl", - "pelican", - "whale", - "snake", - "mouse", - "giraffe", - "macaw", - "lion", - "llama", - "kangaroo", - "hen", - "frog", - "clown-fish", - "chameleon", - "octopus" - ]; - $scope.avatarSelect = function(avat) { - $scope.signupData.avatar = avat; - //alert($scope.signupData.avatar); - }; }); diff --git a/www/templates/password.html b/www/templates/password.html index 5b2ab8e..2057c2f 100644 --- a/www/templates/password.html +++ b/www/templates/password.html @@ -14,11 +14,11 @@ - -
+ diff --git a/www/templates/signup.html b/www/templates/signup.html index 78d5897..ab7ae1f 100644 --- a/www/templates/signup.html +++ b/www/templates/signup.html @@ -22,12 +22,15 @@ +