Merge branch 'merlin' into staging

Leonardo Merlin
2 parents e46b4a32 511ec322
Showing 10 changed files with 139 additions and 116 deletions Show diff stats
gulp/images.js
src/app/components/dialoga-service/dialoga.service.js
src/app/layout.scss
src/app/pages/auth/signin.html
src/app/pages/inicio/inicio.controller.js
src/app/pages/inicio/inicio.html
src/app/pages/programas/programa.html
src/app/pages/programas/programas.controller.js
src/app/pages/programas/programas.scss
src/app/pages/propostas/propostas.controller.js
@@ -18,7 +18,8 @@ gulp.task(&#39;sprites&#39;, function () {
   return sprity.src({
     src: src,
     style: 'sprite.css',
-    cssPath: '../assets/images/icons/'
+    cssPath: '../assets/images/icons/',
+    cachebuster: true
   })
   .pipe(gulpif('*.png', gulp.dest(destImg), gulp.dest(destCss)));
 });
@@ -25,6 +25,8 @@
     extendedService.getQuestions = getQuestions;
     extendedService.searchPrograms = searchPrograms;
     extendedService.searchProposals = searchProposals;
+    extendedService.filterProposalsByCategorySlug = filterProposalsByCategorySlug;
+    extendedService.filterProposalsByProgramId = filterProposalsByProgramId;
     var CACHE = {};
@@ -230,6 +232,52 @@
       ArticleService.searchProposals(params, cbSuccess, cbError);
     }
+    function filterProposalsByCategorySlug (input, categorySlug) {
+
+      if(!angular.isArray(input)){
+        $log.error('Input is not a Array.');
+        return [];
+      }
+
+      // Use native array filter
+      return input.filter(function(value/*, index, arr*/) {
+
+        if (!value.parent) {
+          $log.warn('Proposal without a parent.');
+          return false;
+        }
+
+        if (!value.parent.categories || value.parent.categories.length === 0) {
+          $log.warn('Proposal parent has no categories.');
+          return false;
+        }
+
+        // match?!
+        return value.parent.categories[0].slug === categorySlug;
+      });
+    }
+
+    function filterProposalsByProgramId (input, program_id) {
+      var vm = this;
+
+      if(!angular.isArray(input)){
+        $log.error('Input is not a Array.');
+        return [];
+      }
+
+      // Use native array filter
+      return input.filter(function(value) {
+        if (!value.parent || !value.parent.id) {
+          $log.warn('Proposal has no parent.');
+
+          return false;
+        }
+
+        // match?!
+        return value.parent.id === program_id;
+      });
+    }
+
     function _pipeHandleYoutube (data) {
       var abstract = data.article.abstract;
@@ -283,67 +283,44 @@ a.link-black {
   color: black;
 }
-article.program-content {
-  margin-top: 40px;
-}
-
-article.program-content div.ng-binding div.container div.row {
-  margin-bottom: 40px;
-}
-
-article.program-content h3 {
-  margin-bottom: 15px;
-}
-
 .inline-block {
   display: inline-block;
 }
+// Sobreescreve a classe do bootstrap
+.close {
+  color: white;
+  opacity: 1;
+  font-weight: normal;
+}
+
 blockquote {
-  border-left: medium none;
-  font-size: 140%;
+  border-left: none;
+  font-size: 24px;
+  line-height: 28px;
   padding: 50px 0 0 50px;
   position: relative;
+  @each $category, $color in $categories {
+    .#{$category} & {
+      color: $color;
+    }
+  }
+
   &:before {
     content: "⌜";
     font-size: 200px;
-    left: -2px;
+    line-height: 200px;
     position: absolute;
-    top: -50px;
+    top: -10px;
+    left: -10px;
     font-weight: bolder;
-    left: -17px;
-    top: -68px;
     @each $category, $color in $categories {
       .#{$category} & {
         color: $color;
       }
     }
   }
-
-}
-
-// .cultura blockquote::before {
-//   color: #cd999b;
-// }
-
-// Sobreescreve a classe do bootstrap
-.close {
-  color: white;
-  opacity: 1;
-  font-weight: normal;
-}
-
-// .img-responsive {
-//   width: 100%;
-// }
-
-strong {
-  @each $category, $color in $categories {
-    .#{$category} & {
-      color: $color;
-    }
-  }
 }
 .top-border-theme {
@@ -21,14 +21,14 @@
               <div class="row">
                 <div class="col-sm-4"></div>
                 <div class="col-sm-8 text-center-sm">
-                  <!-- <div ng-if="pageSignin.redirect > 0">
-                  </div> -->
                   <div ng-if="pageSignin.countdown > 0">
                     <p>
                       Você será redirecionado em menos de <b>{{pageSignin.countdown}} segundos</b>...
                     </p>
                   </div>
-                  <button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>
+                  <div ng-if="!pageSignin.hasRedirect">
+                    <a ui-sref="inicio" class="btn btn-primary">Ir para a Página Inicial</a>
+                  </div>
                 </div>
               </div>
             </div>
@@ -161,7 +161,18 @@
   };
   InicioPageController.prototype.submitSearch = function() {
-    vm.$log.warn('No implemented yet.');
+    var vm = this;
+
+    vm.loadingFilter = true;
+
+    // scroll to result grid
+    var $searchResult = angular.element('#search-result');
+    if($searchResult && $searchResult.length > 0){
+      angular.element('body').animate({scrollTop: $searchResult.offset().top}, 'fast');
+      vm.filtredPrograms = vm.getFiltredPrograms();
+    }else{
+      vm.$log.warn('#search-result element not found.');
+    }
   };
   InicioPageController.prototype.filter = function() {
@@ -222,6 +233,7 @@
     var selectedTheme = vm.selectedTheme;
     var filter = vm.$filter('filter');
+    vm.loadingFilter = true;
     if (selectedTheme) {
       output = vm._filterByCategory(output, selectedTheme);
@@ -235,6 +247,7 @@
       output = _balanceByCategory(output);
     }
+    vm.loadingFilter = false;
     return output;
   };
@@ -263,7 +276,7 @@
     }
     return out;
-  }
+  };
   function _balanceByCategory (input) {
     var result = [];
@@ -130,12 +130,12 @@
               </div>
             </div>
           </div>
-          <div class="row">
+          <div id="search-result" class="row">
             <div class="col-sm-12">
               <header class="header">
                 <h2>Programas</h2>
                 <button type="button" class="btn btn-link" ng-click="pageInicio.showAllPrograms($event)">
-                  <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span> Ver todos os programas
+                  <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span> Ver todos os {{::pageInicio.programs.length}} programas
                 </button>
               </header>
             </div>
@@ -18,8 +18,8 @@
     </div>
   </section>
-  <div role="main">
-    <section ng-if="pagePrograma.article.body" ng-class="pagePrograma.category.slug">
+  <div role="main" ng-class="pagePrograma.category.slug">
+    <section ng-if="pagePrograma.article.body">
       <div class="container">
         <div class="row">
           <article class="program-preview">
@@ -212,7 +212,7 @@
     }
     return out;
-  }
+  };
   ProgramasPageController.prototype._balanceByCategory = function (input) {
     var vm = this;
@@ -276,5 +276,5 @@
     }
     return result;
-  }
+  };
 })();
@@ -117,9 +117,39 @@
             line-height: 36px;
             font-weight: bold;
         }
+    }
+
+    .program-content {
+
+        margin-top: 40px;
         h3 {
+            font-size: 22px;
+            line-height: 26px;
+            font-weight: bold;
+
             margin-top: 0;
+            margin-bottom: 15px;
+        }
+
+        h4 {
+            font-size: 18px;
+            line-height: 24px;
+            font-weight: bold;
+        }
+
+        h5 {
+            font-size: 16px;
+            line-height: 22px;
+        }
+
+        p {
+            font-size: 14px;
+            line-height: 18px;
+        }
+
+        .container > .row {
+            margin-bottom: 40px;
         }
     }
@@ -22,7 +22,7 @@
     $log.debug('PropostasPageController');
   }
-  PropostasPageController.prototype.init = function () {
+  PropostasPageController.prototype.init = function() {
     var vm = this;
     vm.themes = null;
@@ -38,7 +38,7 @@
     vm.error = null;
   };
-  PropostasPageController.prototype.loadData = function () {
+  PropostasPageController.prototype.loadData = function() {
     var vm = this;
     vm.loading = true;
@@ -50,15 +50,15 @@
     // 1. Load themes
     vm.loadingThemes = true;
-    vm.DialogaService.getThemes(function(themes){
+    vm.DialogaService.getThemes(function(themes) {
       vm.themes = themes;
       vm.loadingThemes = false;
       vm.loading = false;
-      vm.loadProposals(function (){
+      vm.loadProposals(function() {
         vm.attachListeners();
       });
-    }, function (error) {
+    }, function(error) {
       vm.error = error;
       vm.$log.error(error);
       vm.loadingThemes = false;
@@ -66,21 +66,21 @@
     });
   };
-  PropostasPageController.prototype.loadProposals = function (cb) {
+  PropostasPageController.prototype.loadProposals = function(cb) {
     var vm = this;
     // load Proposals
     vm.loadingProposals = true;
-    vm.DialogaService.getProposals({}, function(data){
+    vm.DialogaService.getProposals({}, function(data) {
       vm.proposals = data.articles;
       vm.filtredProposals = vm.proposals;
       vm.loadingProposals = false;
       vm.loading = false;
-      if(cb){
+      if (cb) {
         cb();
       }
-    }, function (error) {
+    }, function(error) {
       vm.error = error;
       vm.$log.error(error);
       vm.loadingProposals = false;
@@ -91,21 +91,21 @@
   PropostasPageController.prototype.attachListeners = function() {
     var vm = this;
-    vm.$scope.$on('change-selectedCategory', function (event, selectedCategory) {
+    vm.$scope.$on('change-selectedCategory', function(event, selectedCategory) {
       vm.selectedTheme = selectedCategory;
     });
-    vm.$scope.$watch('pagePropostas.selectedTheme', function(newValue, oldValue) {
+    vm.$scope.$watch('pagePropostas.selectedTheme', function(newValue/*, oldValue*/) {
       vm.search.tema = newValue ? newValue.slug : null;
       vm.$location.search('tema', vm.search.tema);
       vm.filtredProposals = vm.getFiltredProposals();
     });
-    vm.$scope.$on('change-selectedTopic', function (event, selectedTopic) {
+    vm.$scope.$on('change-selectedTopic', function(event, selectedTopic) {
       vm.selectedProgram = selectedTopic;
     });
-    vm.$scope.$watch('pagePropostas.selectedProgram', function(newValue, oldValue) {
+    vm.$scope.$watch('pagePropostas.selectedProgram', function(newValue/*, oldValue*/) {
       vm.search.programa = newValue ? newValue.slug : null;
       vm.$location.search('programa', vm.search.programa);
       vm.filtredProposals = vm.getFiltredProposals();
@@ -128,7 +128,7 @@
   PropostasPageController.prototype.getFiltredProposals = function() {
     var vm = this;
-    if(!vm.proposals){
+    if (!vm.proposals) {
       vm.$log.info('No proposals loaded yet. Abort.');
       return null;
     }
@@ -142,64 +142,18 @@
     var filter = vm.$filter('filter');
     if (selectedTheme) {
-      output = vm._filterByCategory(output, selectedTheme);
+      output = vm.DialogaService.filterProposalsByCategorySlug(output, selectedTheme.slug);
     }
     if (selectedProgram) {
-      output = vm._filterByProgram(output, selectedProgram);
+      output = vm.DialogaService.filterProposalsByProgramId(output, selectedProgram.id);
     }
     if (query) {
       output = filter(output, query, false);
     }
-    // if(!query && !selectedTheme && vm._showAllFlag){
-    //   output = _balanceByCategory(output);
-    // }
-
     return output;
   };
-  PropostasPageController.prototype._filterByCategory = function (input, category) {
-    var vm = this;
-
-    input = input || [];
-
-    if (!category) {
-      // no filter
-      return input;
-    }
-
-    var out = [];
-    for (var i = 0; i < input.length; i++) {
-      var proposal = input[i];
-      if (proposal.parent.categories[0].slug === category.slug) {
-        out.push(proposal);
-      }
-    }
-
-    return out;
-  }
-
-  PropostasPageController.prototype._filterByProgram = function (input, program) {
-    var vm = this;
-
-    input = input || [];
-
-    if (!program) {
-      // no filter
-      return input;
-    }
-
-    var out = [];
-    for (var i = 0; i < input.length; i++) {
-      var proposal = input[i];
-      if (proposal.parent.id === program.id) {
-        out.push(proposal);
-      }
-    }
-
-    return out;
-  }
-
 })();
	@@ -25,6 +25,8 @@		@@ -25,6 +25,8 @@
25	extendedService.getQuestions = getQuestions;	25	extendedService.getQuestions = getQuestions;
26	extendedService.searchPrograms = searchPrograms;	26	extendedService.searchPrograms = searchPrograms;
27	extendedService.searchProposals = searchProposals;	27	extendedService.searchProposals = searchProposals;
		28	+ extendedService.filterProposalsByCategorySlug = filterProposalsByCategorySlug;
		29	+ extendedService.filterProposalsByProgramId = filterProposalsByProgramId;
28		30
29	var CACHE = {};	31	var CACHE = {};
30		32
	@@ -230,6 +232,52 @@		@@ -230,6 +232,52 @@
230	ArticleService.searchProposals(params, cbSuccess, cbError);	232	ArticleService.searchProposals(params, cbSuccess, cbError);
231	}	233	}
232		234
		235	+ function filterProposalsByCategorySlug (input, categorySlug) {
		236	+
		237	+ if(!angular.isArray(input)){
		238	+ $log.error('Input is not a Array.');
		239	+ return [];
		240	+ }
		241	+
		242	+ // Use native array filter
		243	+ return input.filter(function(value/, index, arr/) {
		244	+
		245	+ if (!value.parent) {
		246	+ $log.warn('Proposal without a parent.');
		247	+ return false;
		248	+ }
		249	+
		250	+ if (!value.parent.categories \|\| value.parent.categories.length === 0) {
		251	+ $log.warn('Proposal parent has no categories.');
		252	+ return false;
		253	+ }
		254	+
		255	+ // match?!
		256	+ return value.parent.categories[0].slug === categorySlug;
		257	+ });
		258	+ }
		259	+
		260	+ function filterProposalsByProgramId (input, program_id) {
		261	+ var vm = this;
		262	+
		263	+ if(!angular.isArray(input)){
		264	+ $log.error('Input is not a Array.');
		265	+ return [];
		266	+ }
		267	+
		268	+ // Use native array filter
		269	+ return input.filter(function(value) {
		270	+ if (!value.parent \|\| !value.parent.id) {
		271	+ $log.warn('Proposal has no parent.');
		272	+
		273	+ return false;
		274	+ }
		275	+
		276	+ // match?!
		277	+ return value.parent.id === program_id;
		278	+ });
		279	+ }
		280	+
233	function _pipeHandleYoutube (data) {	281	function _pipeHandleYoutube (data) {
234	var abstract = data.article.abstract;	282	var abstract = data.article.abstract;
235		283
	@@ -130,12 +130,12 @@		@@ -130,12 +130,12 @@
130	</div>	130	</div>
131	</div>	131	</div>
132	</div>	132	</div>
133	- <div class="row">	133	+ <div id="search-result" class="row">
134	<div class="col-sm-12">	134	<div class="col-sm-12">
135	<header class="header">	135	<header class="header">
136	<h2>Programas</h2>	136	<h2>Programas</h2>
137	<button type="button" class="btn btn-link" ng-click="pageInicio.showAllPrograms($event)">	137	<button type="button" class="btn btn-link" ng-click="pageInicio.showAllPrograms($event)">
138	- <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span> Ver todos os programas	138	+ <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span> Ver todos os {{::pageInicio.programs.length}} programas
139	</button>	139	</button>
140	</header>	140	</header>
141	</div>	141	</div>
	@@ -212,7 +212,7 @@		@@ -212,7 +212,7 @@
212	}	212	}
213		213
214	return out;	214	return out;
215	- }	215	+ };
216		216
217	ProgramasPageController.prototype._balanceByCategory = function (input) {	217	ProgramasPageController.prototype._balanceByCategory = function (input) {
218	var vm = this;	218	var vm = this;
	@@ -276,5 +276,5 @@		@@ -276,5 +276,5 @@
276	}	276	}
277		277
278	return result;	278	return result;
279	- }	279	+ };
280	})();	280	})();
	@@ -117,9 +117,39 @@		@@ -117,9 +117,39 @@
117	line-height: 36px;	117	line-height: 36px;
118	font-weight: bold;	118	font-weight: bold;
119	}	119	}
		120	+ }
		121	+
		122	+ .program-content {
		123	+
		124	+ margin-top: 40px;
120		125
121	h3 {	126	h3 {
		127	+ font-size: 22px;
		128	+ line-height: 26px;
		129	+ font-weight: bold;
		130	+
122	margin-top: 0;	131	margin-top: 0;
		132	+ margin-bottom: 15px;
		133	+ }
		134	+
		135	+ h4 {
		136	+ font-size: 18px;
		137	+ line-height: 24px;
		138	+ font-weight: bold;
		139	+ }
		140	+
		141	+ h5 {
		142	+ font-size: 16px;
		143	+ line-height: 22px;
		144	+ }
		145	+
		146	+ p {
		147	+ font-size: 14px;
		148	+ line-height: 18px;
		149	+ }
		150	+
		151	+ .container > .row {
		152	+ margin-bottom: 40px;
123	}	153	}
124	}	154	}
125		155