Merge private_token refactory conflicts in main.js

Michel Felipe
2 parents 1b4fb62a c0b279c0
Showing 6 changed files with 85 additions and 31 deletions Show diff stats
Gemfile
Gemfile.lock
index.html
js/main.js
sass/_header.scss
sass/_proposal_detail.scss
 source 'https://rubygems.org'
-gem 'sass', '~> 3.4.9'
 \ No newline at end of file
+gem 'sass', '~> 3.4.9'
 GEM
   remote: https://rubygems.org/
   specs:
-    sass (3.4.9)
+    sass (3.4.13)
 PLATFORMS
   ruby
 DEPENDENCIES
-  sass (~> 3.4.9)
+  sass (~> 3.4.13)
+<!DOCTYPE html>
 <html lang="pt-br">
   <head>
     <meta charset="utf-8" />
@@ -5,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta property="og:title" content="Dialoga Brasil" />
     <script type="text/javascript">
       /**
@@ -74,6 +76,16 @@
   </head>
   <body>
+    <div id="fb-root"></div>
+    <script>(function(d, s, id) {
+      var js, fjs = d.getElementsByTagName(s)[0];
+      if (d.getElementById(id)) return;
+      js = d.createElement(s); js.id = id;
+      js.src = "//connect.facebook.net/pt_BR/sdk.js#xfbml=1&version=v2.3&appId=1449495475361394";
+      fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));</script>
+
+
     <div class="container">
       <div id="proposal-result"></div>
     </div>
@@ -83,6 +95,9 @@
       <header>
         <h1><a href="#">{{article.title}}</a></h1>
         <a id="display-contrast" href="#">Alto Contraste</a>
+        <div class="social">
+          <a href="#" class="fb-share" data-description="Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo">Compartilhar</a>
+        </div>
       </header>
       <div id="content">
@@ -153,6 +168,9 @@
                 {{/each}}
               </ul>
+              <div class="social">
+                <a href="#" class="fb-share" data-caption="{{title}}" data-description="{{stripTags abstract}}">Compartilhar</a>
+              </div>
               <div class="proposal-header">
                 <div class="abstract">
                   <img src="{{../host}}{{image.url}}" alt="Imagem de apresentação do programa."/>
@@ -188,7 +206,7 @@
                   <div class="info">Esta consulta termina em julho de 2015. Até lá, todas as propostas serão lidas e as cinco mais pontuadas em cada programa receberão resposta oficial do governo.</div>
                   <div class="send-proposal-button send-button"><a href="#"><span>Envie Sua Proposta</span></a></div>
                   <div class="login-container hide">Login</div>
-                  <form class="make-proposal-form save-article-form hide" id="make-proposal-form-{{id}}" action="{{proposal_action ../article . }}" method="post">
+                  <form class="make-proposal-form save-article-form require-login hide" id="make-proposal-form-{{id}}" action="{{proposal_action ../article . }}" method="post">
                     <div class="message hide"></div>
                     <div>
                       <div><label for="article_abstract">Descrição</label></div>
@@ -209,9 +227,13 @@
               <div class="support-proposal-container">
                 <div class="support-proposal">
                   <div class="container-title"> Apoie outras propostas</div>
-                  <div class="random-proposal"></div>
-                  <div class="loading">Carregando...</div>
-                  <div class="no-proposals">Ainda não existe nenhuma proposta para este programa.</div>
+                  <div class="support-proposal-content require-login">
+                    <div class="random-proposal"></div>
+                    <div class="loading">Carregando...</div>
+                    <div class="no-proposals">Ainda não existe nenhuma proposta para este programa.</div>
+                  </div>
+                  <div class="login-container hide">Login</div>
+                  <div class="send-button"><a href="#"><span>Login</span></a></div>
                 </div>
               </div>
@@ -263,6 +285,9 @@
         <a href="#" class="skip">Pular</a>
         <a href="#" class="vote-result">Resultados</a>
       </div>
+      <div class="social">
+        <a href="#/programas/{{parent.id}}/propostas/{{id}}" class="fb-share" data-caption="{{parent.title}}" data-description="{{stripTags abstract}}">Compartilhar</a>
+      </div>
     </script>
     <script id="results" type="text/x-handlebars-template">
@@ -20,14 +20,10 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
   var participa = true;
   if(participa){
     var host = 'http://www.participa.br';
-    var private_token = '375bee7e17d0021af7160ce664874618';  //participa
     var proposal_discussion = '92856'; //participa
   }else{
     var host = 'http://noosfero.com:3000';
-    //var private_token = 'bd8996155f5ea4354e42fee50b4b6891'; //casa
-    var private_token = 'aae32bf5031e895b00a20a529d763b31'; //local serpro
     var proposal_discussion = '632'; //local serpro
-    //var proposal_discussion = '401'; //casa
   }
   var BARRA_ADDED = false;
@@ -36,7 +32,8 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
   Main = (function(){
     return {
-      getProposalId: function(){
+      private_token: '375bee7e17d0021af7160ce664874618',
+      getProposalId: function() {
         var regexProposals = /\d.*\/propostas\/\d.*/;
         var proposalId = 0;
@@ -49,8 +46,8 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         return proposalId;
       },
-
-      loadRandomProposal: function (topic_id, private_token) {
+      loadRandomProposal: function (topic_id) {
+          var private_token = Main.private_token;
           var $noProposals = $('.no-proposals');
           var $loading = $('.loading');
           var $randomProposal = $('.random-proposal');
@@ -68,7 +65,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           if(childId != 0){
             url += '/'+childId;
           }
-          url += '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
+          url += '?private_token=' + Main.private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
           $.getJSON(url).done(function( data ) {
             $loading.hide();
@@ -80,10 +77,12 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
             }
             var article = data.articles[0];
+            var parentTitle = $('#proposal-item-'+topic_id).find('.proposal-header .title').text();
+            article.parent = {id: topic_id, title: parentTitle};
             $randomProposal.html(supportProposalTemplate(article));
             $body.off('click', '.vote-actions .skip');
             $body.on('click', '.vote-actions .skip', function(e) {
-              contextMain.loadRandomProposal(topic_id, private_token);
+              contextMain.loadRandomProposal(topic_id);
               e.preventDefault();
             });
             $body.off('click', '.vote-actions .like');
@@ -91,20 +90,27 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
               //Helps to prevent more than one vote per proposal
               if(ProposalApp.hasProposalbeenVoted(article.id)){
                 console.log("Proposta " + article.id + " já havia sido votada");
-                contextMain.loadRandomProposal(topic_id, private_token);
+                contextMain.loadRandomProposal(topic_id);
+                e.preventDefault();
+                return;
+              }
+
+              if(!logged_in) {
+                $(this).closest('.support-proposal').find('.send-button a').click();
                 e.preventDefault();
                 return;
               }
+
               $.ajax({
                 type: 'post',
                 url: host + '/api/v1/articles/' + article.id + '/vote',
                 data: {
                   value: $(this).data('vote-value'),
-                  private_token: private_token
+                  private_token: Main.private_token
                 }
               }).done(function( /*data*/ ) {
                 ProposalApp.addVotedProposal(article.id);
-                contextMain.loadRandomProposal(topic_id, private_token);
+                contextMain.loadRandomProposal(topic_id);
               });
               e.preventDefault();
             });
@@ -132,7 +138,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           $resultsContainer.find('.results-content').hide();
           var per_page = 10;
-          var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking' + '?private_token=' + private_token + '&per_page='+per_page+'&page='+page;
+          var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking' + '?private_token=' + Main.private_token + '&per_page='+per_page+'&page='+page;
           $.getJSON(url).done(function( data, stats, xhr ) {
             data.pagination = {
               total: parseInt(xhr.getResponseHeader('Total')),
@@ -176,14 +182,14 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           if(logged_in) {
             if(token){
-              private_token = token;
+              Main.private_token = token;
             }
-            loginButton.siblings('.save-article-form').show();
-            loginButton.siblings('.save-article-form .message').show();
+            loginButton.siblings('.require-login').show();
+            loginButton.siblings('.require-login .message').show();
             loginButton.siblings('.login-container').hide();
-            $.cookie('_dialoga_session', private_token);
+            $.cookie('_dialoga_session', Main.private_token);
           } else {
-            loginButton.siblings('.save-article-form').hide();
+            loginButton.siblings('.require-login').hide();
             loginButton.siblings('.login-container').show();
           }
         },
@@ -238,7 +244,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           $proposal.find('.calendar').slick();
           var topic_id = proposal_id.split('-').pop();
-          this.loadRandomProposal(topic_id, private_token);
+          this.loadRandomProposal(topic_id);
         },
         display_proposal_detail: function(proposal_id){
           $('#proposal-categories').hide();
@@ -256,7 +262,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           $proposal.find('.body').show();
           $proposal.show();
-          var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
+          var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + Main.private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
           $.getJSON(url).done(function( data ) {
             $('#proposal-item-' + proposal_id + ' .body-content').replaceWith(data.article.body);
           })
@@ -455,12 +461,12 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
   })();
   // Load data from localhost when it is dev env.
-  var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + private_token + '&fields=id,children,categories,abstract,title,image,url,setting,position';
+  var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + Main.private_token + '&fields=id,children,categories,abstract,title,image,url,setting,position';
   $.getJSON(noosferoAPI)
     .done(function( data ) {
       data.host = host;
-      data.private_token = private_token;
+      data.private_token = Main.private_token;
       resultsPlaceholder.innerHTML = template(data);
       $('.login-container').html(loginTemplate());
       $('.countdown').maxlength({text: '%left caracteres restantes'});
@@ -603,7 +609,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         $.ajax({
           type: 'post',
           url: host + $form.attr('action'),
-          data: $('#'+this.id).serialize() + '&private_token=' + private_token + '&fields=id&article[name]=article_' + Main.guid()
+          data: $('#'+this.id).serialize() + '&private_token=' + Main.private_token + '&fields=id&article[name]=article_' + Main.guid()
         })
         .done(function( /*data*/ ) {
           form.reset();
@@ -639,7 +645,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
       var url = host + '/api/v1/users/me?private_token=' + $.cookie('_dialoga_session');
       $.getJSON(url).done(function( /*data*/ ) {
         logged_in = true;
-        private_token = $.cookie('_dialoga_session');
+        Main.private_token = $.cookie('_dialoga_session');
       });
     }
@@ -663,6 +669,23 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
       e.preventDefault();
     });
+    $(document).on('click', '.social .fb-share', function(e) {
+      var link = $(this).attr('href');
+      if(link==='#' || link ==='') {
+        link = window.location.href;
+      } else {
+        link = 'http:'+Url.addBaseUrl(link);
+      }
+      FB.ui({
+          method: 'feed',
+          link: link,
+          name: $(this).data('name') || 'Dialoga Brasil',
+          caption: $(this).data('caption') || 'dialoga.gov.br',
+          description: $(this).data('description'),
+      }, function(response){});
+      e.preventDefault();
+    });
+
     $(document).on('click', '.new-user', function(e) {
       var loginForm = $(this).parents('#login-form');
       loginForm.hide();
@@ -4,4 +4,7 @@ header {
   margin: 0;
   padding: 0;
   position: relative;
+  .social {
+    float: right;
+  }
 }
@@ -710,6 +710,9 @@
       font-size: 20px;
     }
   }
+  .support-proposal .send-button {
+    display: none !important;
+  }
 }
 @media only screen and (max-width: 992px) {
1	source 'https://rubygems.org'	1	source 'https://rubygems.org'
2	-gem 'sass', '~> 3.4.9'
3	\ No newline at end of file	2	\ No newline at end of file
		3	+gem 'sass', '~> 3.4.9'
1	GEM	1	GEM
2	remote: https://rubygems.org/	2	remote: https://rubygems.org/
3	specs:	3	specs:
4	- sass (3.4.9)	4	+ sass (3.4.13)
5		5
6	PLATFORMS	6	PLATFORMS
7	ruby	7	ruby
8		8
9	DEPENDENCIES	9	DEPENDENCIES
10	- sass (~> 3.4.9)	10	+ sass (~> 3.4.13)
	@@ -4,4 +4,7 @@ header {		@@ -4,4 +4,7 @@ header {
4	margin: 0;	4	margin: 0;
5	padding: 0;	5	padding: 0;
6	position: relative;	6	position: relative;
		7	+ .social {
		8	+ float: right;
		9	+ }
7	}	10	}