Merge branch 'master' into staging

Leonardo Merlin
2 parents ecf768da a0ee516a
Showing 8 changed files with 70 additions and 27 deletions Show diff stats
src/app/components/article-service/article.service.js
src/app/components/auth/auth.service.js
src/app/components/cadastro-proposta/cadastro-proposta.html
src/app/components/proposal-carousel/proposal-carousel.html
src/app/pages/auth/auth.controller.js
src/app/pages/auth/signin.html
src/app/pages/programas/programas.scss
src/app/pages/ranking/ranking.controller.js
@@ -13,6 +13,7 @@
       apiArticles: $rootScope.basePath + '/api/v1/articles/',
       apiCommunities: $rootScope.basePath + '/api/v1/communities/',
       apiProposals: $rootScope.basePath + '/api/v1/proposals_discussion_plugin/',
+      apiSearch: $rootScope.basePath + '/api/v1/search/',
       getArticleById: getArticleById,
       getArticleBySlug: getArticleBySlug,
       getCategories: getCategories,
@@ -234,7 +235,7 @@
     function searchTopics (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Topic&query=cisternas
-      var url = '/api/v1/search/article';
+      var url = service.apiSearch + '/article';
       var paramsExtended = angular.extend({
         // 'fields[]': ['id', 'title', 'slug', 'abstract', 'categories', 'setting', 'children_count', 'hits'],
         'type': 'ProposalsDiscussionPlugin::Topic'
@@ -249,7 +250,7 @@
     function searchProposals (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Proposal&query=cisternas
-      var url = '/api/v1/search/article';
+      var url = service.apiSearch + '/article';
       var paramsExtended = angular.extend({
         page: 1,
         per_page: 20,
@@ -37,12 +37,22 @@
         .then(function(response) {
           $log.debug('AuthService.register [SUCCESS] response', response);
-          var currentUser = Session.create(response.data);
+          var data = response.data;
-          $rootScope.currentUser = currentUser;
-          $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
-          $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
+          if ( data.user && data.user.activated === false){
+            // usuário criado E não verificado o e-mail
+            
+          }
+
+          if ( data.user && data.user.activated === true){
+            // usuário criado E não verificado o e-mail
+            var currentUser = Session.create(data);
+            $rootScope.currentUser = currentUser;
+            $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
+          }
+          
+          $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
           return response;
         }, function(response) {
           $log.debug('AuthService.register [FAIL] response', response);
@@ -21,10 +21,16 @@
 				<div class="col-sm-8">
 					<label for="proposta-textarea">Descrição da proposta*</label>
 					<a tabindex="0" class="btn btn-link btn-question" role="button" data-toggle="popover" data-trigger="focus">?</a>
-					<textarea id="proposta-textarea" name="proposta" class="texto-proposta form-control"
+					<textarea
+					id="proposta-textarea"
+					name="proposta"
+					class="texto-proposta form-control"
 					ng-class="{ 'has-error' : formPropostas.proposta.$invalid && formPropostas.proposta.$touched }"
 					ng-model="proposta"
-					required ng-maxlength="200" ></textarea>
+					ng-trim="false"
+					ng-maxlength="200"
+					maxlength="200"
+					required></textarea>
 					<validation-messages field="formPropostas.proposta" maxlength="'Ops, esse campo não pode ser maior que 200 caracteres.'"></validation-messages>
 					<div class="row">
 						<div class="col-xs-6">
@@ -32,6 +38,7 @@
 						</div>
 						<div class="col-xs-6 text-right">
 							<span>Máx. 200 caracteres</span>
+							<span ng-if="proposta.length > 0">(restam {{(200 - proposta.length)}} caracteres)</span>
 						</div>
 					</div>
 				</div>
@@ -8,7 +8,7 @@
       <div class="proposal-carousel-top-triggers" ng-if="vm.proposals">
         <ul class="list-inline">
           <li class="item-dot" ng-repeat="proposal in vm.proposals">
-            <button type="button" ng-class="{'active': vm.activeIndex === $index}" ng-click="vm.switchProposal($index)" title="Apersentar proposta na posição {{$index}}"></button>
+            <button type="button" ng-class="{'active': vm.activeIndex === $index}" ng-click="vm.switchProposal($index)" title="Apersentar proposta {{ ( $index + 1 ) }}"></button>
           </li>
         </ul>
       </div>
@@ -61,6 +61,7 @@
     // handle logout
     vm.$scope.$on(vm.AUTH_EVENTS.logoutSuccess, function() {
       vm.currentUser = vm.Session.getCurrentUser();
+      vm._attachCaptcha();
     });
   };
@@ -83,16 +84,15 @@
     var vm = this;
     vm.$scope.$on(vm.AUTH_EVENTS.registerSuccess, function(event, response) {
-      vm.$log.debug('TODO: handle register success');
       vm.$log.debug('[register success] response', response);
     });
     vm.$scope.$on(vm.AUTH_EVENTS.registerFailed, function(event, response) {
-      vm.$log.debug('TODO: handle register error');
       vm.$log.debug('[register error] response', response);
-      var reason = response.data.message;
-      vm.errorMessage = reason;
+      // REMOVED: feedback alread on "reject handler"
+      // var reason = response.data.message;
+      // vm.errorMessage = reason;
     });
     vm.$scope.$on('oauthClientPluginResult', function(event, response) {
@@ -103,6 +103,12 @@
       // var user = response.data.user;
     });
+    vm._attachCaptcha();
+  };
+
+  AuthPageController.prototype._attachCaptcha = function() {
+    var vm = this;
+
     var stop = null;
     stop = vm.$interval(function(){
       var $el = angular.element('#serpro_captcha');
@@ -137,17 +143,26 @@
       // TODO: mensagens de sucesso
       // 'Cadastro efetuado com sucesso.'
       // 'Verifique seu email para confirmar o cadastro.'
-      vm.messageTitle = 'Cadastro efetuado com sucesso!';
-      vm.successMessage = 'Verifique seu e-mail para confirmar o cadastro.';
+      vm.signupMessageTitle = 'Cadastro efetuado com sucesso!';
+      vm.signupSuccessMessage = 'Verifique seu e-mail para confirmar o cadastro.';
       vm.redirectBack();
     }, function(response) {
       vm.$log.debug('register error.response', response);
-      var message = response.data.message;
-      vm.errorMessage = message;
-
-      if(response.data.code === 500){
-        vm.internalError = true;
+      vm.internalError = true;
+
+      switch (response.data.code) {
+        case 400: // bad request
+          var errors = JSON.parse(response.data.message);
+          if(errors && errors.email){
+            vm.signupErrorMessage = "E-mail já está em uso."
+          }
+        break;
+        case 500:
+          vm.signupErrorMessage = message;
+        break;
+        default:
+        break;
       }
@@ -8,14 +8,14 @@
 <section role="main" class="section-gray auth-content">
   <div class="container">
     <div class="row">
-      <div ng-if="pageSignin.currentUser">
+      <div ng-if="pageSignin.currentUser || pageSignin.signupMessageTitle">
         <div class="row">
           <div class="col-sm-8 col-sm-offset-2">
             <div class="feedback-message">
               <show-message
               type="'success'"
-              message="pageSignin.messageTitle || 'Você está logado!'"
-              description="pageSignin.successMessage"
+              message="pageSignin.signupMessageTitle || 'Você está logado!'"
+              description="pageSignin.signupSuccessMessage"
               ></show-message>
               <div class="row">
@@ -35,7 +35,7 @@
           </div>
         </div>
       </div>
-      <div ng-if="!pageSignin.currentUser">
+      <div ng-if="!pageSignin.currentUser && !pageSignin.signupMessageTitle">
         <div class="col-sm-5">
           <div class="row">
             <div class="col-md-12">
@@ -96,10 +96,10 @@
               </p>
             </div>
           </div>
-          <div class="row" ng-if="pageSignin.errorMessage">
+          <div class="row" ng-if="pageSignin.signupErrorMessage">
             <div class="col-sm-12">
               <div class="alert alert-danger">
-                {{pageSignin.errorMessage}}
+                {{pageSignin.signupErrorMessage}}
               </div>
               <div ng-if="vm.internalError">
                 <p>Este erro parece ser um problema interno.<br/>Por favor, tente novamente mais tarde.</p>
@@ -81,9 +81,19 @@
         .program-preview--share {
             margin-bottom: 20px;
             position: relative;
+            
             .dropdown {
                 display: inline-block;
                 position: relative;
+
+                @media screen and (max-width: $screen-xs) {
+                    display: block;
+
+                    .dropdown-menu-right {
+                        left: 0;
+                        right: auto;
+                    }
+                }
             }
             .dropdown-menu {
@@ -28,7 +28,7 @@
     var vm = this;
     vm.page = 1;
-    vm.per_page = 20;
+    vm.per_page = 10;
     vm.themes = null;
     vm.selectedTheme = null;
     vm.filtredPrograms = null;
	@@ -37,12 +37,22 @@		@@ -37,12 +37,22 @@
37	.then(function(response) {	37	.then(function(response) {
38	$log.debug('AuthService.register [SUCCESS] response', response);	38	$log.debug('AuthService.register [SUCCESS] response', response);
39		39
40	- var currentUser = Session.create(response.data);	40	+ var data = response.data;
41		41
42	- $rootScope.currentUser = currentUser;
43	- $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
44	- $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);	42	+ if ( data.user && data.user.activated === false){
		43	+ // usuário criado E não verificado o e-mail
		44	+
		45	+ }
		46	+
		47	+ if ( data.user && data.user.activated === true){
		48	+ // usuário criado E não verificado o e-mail
		49	+ var currentUser = Session.create(data);
45		50
		51	+ $rootScope.currentUser = currentUser;
		52	+ $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
		53	+ }
		54	+
		55	+ $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
46	return response;	56	return response;
47	}, function(response) {	57	}, function(response) {
48	$log.debug('AuthService.register [FAIL] response', response);	58	$log.debug('AuthService.register [FAIL] response', response);
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	<div class="proposal-carousel-top-triggers" ng-if="vm.proposals">	8	<div class="proposal-carousel-top-triggers" ng-if="vm.proposals">
9	<ul class="list-inline">	9	<ul class="list-inline">
10	<li class="item-dot" ng-repeat="proposal in vm.proposals">	10	<li class="item-dot" ng-repeat="proposal in vm.proposals">
11	- <button type="button" ng-class="{'active': vm.activeIndex === $index}" ng-click="vm.switchProposal($index)" title="Apersentar proposta na posição {{$index}}"></button>	11	+ <button type="button" ng-class="{'active': vm.activeIndex === $index}" ng-click="vm.switchProposal($index)" title="Apersentar proposta {{ ( $index + 1 ) }}"></button>
12	</li>	12	</li>
13	</ul>	13	</ul>
14	</div>	14	</div>
	@@ -81,9 +81,19 @@		@@ -81,9 +81,19 @@
81	.program-preview--share {	81	.program-preview--share {
82	margin-bottom: 20px;	82	margin-bottom: 20px;
83	position: relative;	83	position: relative;
		84	+
84	.dropdown {	85	.dropdown {
85	display: inline-block;	86	display: inline-block;
86	position: relative;	87	position: relative;
		88	+
		89	+ @media screen and (max-width: $screen-xs) {
		90	+ display: block;
		91	+
		92	+ .dropdown-menu-right {
		93	+ left: 0;
		94	+ right: auto;
		95	+ }
		96	+ }
87	}	97	}
88		98
89	.dropdown-menu {	99	.dropdown-menu {
	@@ -28,7 +28,7 @@		@@ -28,7 +28,7 @@
28	var vm = this;	28	var vm = this;
29		29
30	vm.page = 1;	30	vm.page = 1;
31	- vm.per_page = 20;	31	+ vm.per_page = 10;
32	vm.themes = null;	32	vm.themes = null;
33	vm.selectedTheme = null;	33	vm.selectedTheme = null;
34	vm.filtredPrograms = null;	34	vm.filtredPrograms = null;