From 784ed0a550a5018065466d15238fc0cb1095454f Mon Sep 17 00:00:00 2001
From: Caio SBA <caiosba@gmail.com>
Date: Fri, 22 May 2015 16:35:44 -0300
Subject: [PATCH] Finished login integration connected to juventude.org.br

---
 ConfJuvApp/config.xml            | 12 +++++-------
 ConfJuvApp/www/index.html        |  2 +-
 ConfJuvApp/www/js/controllers.js | 17 +++++++----------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/ConfJuvApp/config.xml b/ConfJuvApp/config.xml
index d5bd1d6..2a99bf1 100644
--- a/ConfJuvApp/config.xml
+++ b/ConfJuvApp/config.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.ionicframework.confjuvapp748431" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>ConfJuvApp</name>
-  <description>
-        An Ionic Framework and Cordova project.
-    </description>
-  <author email="hi@ionicframework" href="http://ionicframework.com/">
-      Ionic Framework Team
-    </author>
+  <description>Aplicativo móvel para 3ª Conferência Nacional de Juventude</description>
+  <author email="contato@juventude.gov.br" href="http://www.juventude.gov.br/"></author>
   <content src="index.html"/>
   <access origin="*"/>
+  <allow-navigation href="*" />
+  <allow-intent href="*" />
   <preference name="webviewbounce" value="false"/>
   <preference name="UIWebViewBounce" value="false"/>
   <preference name="DisallowOverscroll" value="true"/>
@@ -38,4 +36,4 @@
     <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
     <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
   </platform>
-</widget>
\ No newline at end of file
+</widget>
diff --git a/ConfJuvApp/www/index.html b/ConfJuvApp/www/index.html
index 55cbf87..753e3ad 100644
--- a/ConfJuvApp/www/index.html
+++ b/ConfJuvApp/www/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
 
-    <title>3ª Conferência Nacional de Juventude</title>
+    <title>ConfJuvApp</title>
 
     <!-- CSS -->
     <link href="lib/ionic/css/ionic.css" rel="stylesheet">
diff --git a/ConfJuvApp/www/js/controllers.js b/ConfJuvApp/www/js/controllers.js
index 4d5bd77..70c547f 100644
--- a/ConfJuvApp/www/js/controllers.js
+++ b/ConfJuvApp/www/js/controllers.js
@@ -46,25 +46,22 @@ angular.module('confjuvapp.controllers', [])
 
       $scope.loading = true;
 
-      var req = {
-        method: 'POST',
-        url: ConfJuvAppUtils.pathTo('login'),
+      var config = {
         headers: {
-          'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+          'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
         },
-        data: jQuery.param(data)
+        timeout: 10000
       }
       
-      $http(req)
-      .success(function(data, status, headers, config) {
+      $http.post(ConfJuvAppUtils.pathTo('login'), jQuery.param(data), config)  
+      .then(function(resp) {
         $scope.closeModal();
         $ionicPopup.alert({ title: 'Login', template: 'Login efetuado com sucesso!' });
         ConfJuvAppUtils.loggedIn = true;
         $scope.loading = false;
-      })
-      .error(function(data, status, headers, config) {
+      }, function(err) {
         $scope.closeModal();
-        var popup = $ionicPopup.alert({ title: 'Login', template: 'Erro ao efetuar login, por favor tente novamente.' });
+        var popup = $ionicPopup.alert({ title: 'Login', template: 'Erro ao efetuar login. Verifique usuário e senha e conexão com a internet.' });
         ConfJuvAppUtils.loggedIn = false;
         $scope.loading = false;
         popup.then(function() {
--
libgit2 0.21.2