From e140c729540546b2fa6da536625fa44b1305645b Mon Sep 17 00:00:00 2001
From: Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
Date: Thu, 16 Jul 2015 12:05:46 -0300
Subject: [PATCH] changes to add 8080 port

---
 gulpfile.js |  7 ++++---
 js/main.js  | 50 ++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index c89292f..65b8aa7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -4,7 +4,7 @@ var gulp = require('gulp');
 // var sass = require('gulp-sass');
 var sass = require('gulp-ruby-sass');
 var connect = require('gulp-connect');
- 
+
 // gulp.task('sass', function () {
 //   gulp.src('./sass/**/*.scss')
 //     .pipe(sass().on('error', sass.logError))
@@ -20,16 +20,17 @@ gulp.task('sass', function() {
     .pipe(gulp.dest('.'))
     .pipe(connect.reload());
 });
- 
+
 gulp.task('watch', function () {
   gulp.watch('./sass/**/*.sass', ['sass']);
 });
 
 gulp.task('connect', function() {
   connect.server({
+    port: 8080,
     root: [__dirname],
     livereload: true
   });
 });
 
-gulp.task('default', ['sass','connect','watch']);
\ No newline at end of file
+gulp.task('default', ['sass','connect','watch']);
diff --git a/js/main.js b/js/main.js
index c681fa0..3aeb143 100644
--- a/js/main.js
+++ b/js/main.js
@@ -23,6 +23,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
   var lastHash = window.location.hash;
 
   var host = 'http://login.dialoga.gov.br';
+  var serpro_captcha_clienteId = 'fdbcdc7a0b754ee7ae9d865fda740f17';
   var dialoga_community = 19195;
   var proposal_discussion = '103358'; //participa
   var cat_saude = 180;
@@ -31,18 +32,45 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
   // var cat_reducao_da_pobreza = 183;
   var recaptchaSiteKey = '6LcLPAcTAAAAAKsd0bxY_TArhD_A7OL19SRCW7_i';
 
-
+  // There are two modes for development
+  // 1: Remote API
+  // 2: Local API
+  // For (1) use port 3000 -> rails s
+  // For (2) use port 3001 -> rails s -p 3001
+  //
+  // For (2) set at /etc/hosts:
+  //
+  //127.0.0.1  participa.br
+  //127.0.0.1  dialoga.gov.br
+  //127.0.0.1  login.dialoga.gov.br
+  //127.0.0.1  noosfero.com
   //Detects for localhost settings
-  var patt = new RegExp(':3001/');
+  var patt = new RegExp(':300[0-1]/|8080/');
+  var localDevelopment = false;
+
   if(patt.test(window.location.href)){
-    host = 'http://noosfero.com:3001';
-    dialoga_community = 104;
-//    proposal_discussion = '413'; //Eugênio
-    proposal_discussion = '392'; //Evandro
-    recaptchaSiteKey = '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'; //http://noosfero.com/
-    cat_saude = 23;
+    localDevelopment = true;
+    patt = new RegExp(':3000/');
+
+    if(patt.test(window.location.href)){
+      host = 'http://noosfero.com:3000';
+    }else if (new RegExp(':3001/').test(window.location.href)){
+      host = 'http://noosfero.com:3001';
+      dialoga_community = 104;
+      //    proposal_discussion = '413'; //Eugênio
+      proposal_discussion = '392'; //Evandro
+      recaptchaSiteKey = '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'; //http://noosfero.com/
+      cat_saude = 23;
+    } else { //ABNER
+      host = 'http://noosfero.com:3000';
+      dialoga_community = 105;
+      proposal_discussion = '392'; //Evandro
+      recaptchaSiteKey = '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'; //http://noosfero.com/
+      cat_saude = 23;
+    }
   }
 
+
   var BARRA_ADDED = false;
   var HIDE_BARRA_DO_GOVERNO = false;
 
@@ -1302,8 +1330,10 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
       var oCaptcha_serpro_gov_br;
       oCaptcha_serpro_gov_br = new captcha_serpro_gov_br();
       window.lastCaptcha = oCaptcha_serpro_gov_br;
-      oCaptcha_serpro_gov_br.clienteId = 'fdbcdc7a0b754ee7ae9d865fda740f17';
-      oCaptcha_serpro_gov_br.url = "/captchaserpro"
+      oCaptcha_serpro_gov_br.clienteId = serpro_captcha_clienteId;
+      if(!localDevelopment) {
+        oCaptcha_serpro_gov_br.url = "/captchaserpro"
+      }
       oCaptcha_serpro_gov_br.criarUI(signupForm.find('#serpro_captcha')[0], 'css', 'serpro_captcha_component_');
 
       e.preventDefault();
--
libgit2 0.21.2