M comandesUtils.txt → comandesUtils.txt

@@ -3,7 +3,14 @@ export ANDROID_HOME=~/Android/Sdk/
 PATH=$PATH:$ANDROID_HOME/tools
 PATH=$PATH:$ANDROID_HOME/platform-tools
 
+** cal estar amb sudo **
+#current path:
+export ANDROID_HOME=home/nau/sourceProgramsToInstall/android-sdk-linux/
+export PATH=$PATH:$ANDROID_HOME:/home/nau/sourceProgramsToInstall/android-sdk-linux/tools
+export PATH=$PATH:$ANDROID_HOME/home/nau/sourceProgramsToInstall/android-sdk-linux/platform-tools
 
+
+#run android sdk manager tools:
 cd /home/nau/Android/Sdk/tools
 ./android
 

M www/css/style.css → www/css/style.css

@@ -7,6 +7,10 @@ .o-imgTitle{
     width: 40px!important;
     height: 40px!important;
 }
+.o-imgSelectAvatar{
+    width: 45px!important;
+    height: 45px!important;
+}
 .o-bold{
     font-weight: bold!important;
 }

M www/js/controllers.js → www/js/controllers.js

@@ -1,6 +1,6 @@
 
-var urlapi="http://localhost:3000/api/";
-//var urlapi="https://collectivecar.paas.primustech.io/api/";
+//var urlapi="http://localhost:3000/api/";
+var urlapi="https://collectivecar.paas.primustech.io/api/";
 
 
 //localStorage.setItem("c_username", "user2");
@@ -9,7 +9,7 @@
 
 angular.module('starter.controllers', ['pascalprecht.translate'])
 
-.controller('AppCtrl', function($scope, $ionicModal, $timeout, $http, $window) {
+.controller('AppCtrl', function($scope, $ionicModal, $timeout, $http, $window, $ionicLoading) {
   // With the new view caching in Ionic, Controllers are only called
   // when they are recreated or on app start, instead of every page change.
   // To listen for when this page is active (for example, to refresh data),
@@ -88,25 +88,83 @@
   };
   $scope.doSignup = function() {
     console.log('Doing signup', $scope.signupData);
+    if($scope.emptyParams($scope.signupData))
+    {
+      $http({
+          url: urlapi + 'users',
+          method: "POST",
+          data: $scope.signupData
+      })
+      .then(function(response) {
+              // success
+              console.log("response: ");
+              console.log(response.data);
+              $timeout(function() {
+                $scope.closeSignup();
+                $scope.login();
+              }, 1000);
 
-    $http({
-        url: urlapi + 'users',
-        method: "POST",
-        data: $scope.signupData
-    })
-    .then(function(response) {
-            // success
-            console.log("response: ");
-            console.log(response.data);
-            $timeout(function() {
-              $scope.closeSignup();
-            }, 1000);
+      },
+      function(response) { // optional
+              // failed
+      });
+    }else{
+      $ionicLoading.show({ template: 'First complete all parameters', noBackdrop: true, duration: 2000 });
+    }
 
-    },
-    function(response) { // optional
-            // failed
-    });
-
+  };
+  $scope.emptyParams = function(obj){
+    if(obj.username==undefined)
+    {
+      return(false);
+    }
+    if(obj.password==undefined)
+    {
+      return(false);
+    }
+    if(obj.mail==undefined)
+    {
+      return(false);
+    }
+    if(obj.phone==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);
   };
   $scope.logout = function(){
       localStorage.removeItem("c_username");

M www/templates/signup.html → www/templates/signup.html

@@ -28,10 +28,12 @@ <label class="item item-input">
           <span class="input-label">{{'Telegram' | translate }}</span>
           <input type="text" ng-model="signupData.telegram">
         </label>
-        <label class="item item-input">
+        <!--<label class="item item-input">
           <span class="input-label">{{'Avatar' | translate }}</span>
           <input type="text" ng-model="signupData.avatar">
-        </label>
+        </label>-->
+        <p>{{'Avatar' | translate }}: <b>{{signupData.avatar}}</b></p>
+        <img ng-repeat="avatar in avatars" ng-click="avatarSelect('{{avatar}}')" ng-src="img/avatars/{{avatar}}.png" class="o-imgSelectAvatar" >
 
         <label class="item">
           <button class="button button-block button-positive" type="submit">{{'Signup' | translate }}</button>