135 aplicar novo layout

.eslintrc.json

@@ -1,11 +1,6 @@
 {
     "extends": ["airbnb", "angular"],
     "plugins": [
-        "react",
-        "jasmine"
-    ],
-    "env":{
-      "jasmine": true,
-      "browser": true
-    }
-  }
+        "react"
+    ]
+}

.travis.yml

@@ -4,6 +4,7 @@ addons:
   apt:
     sources:
       - google-chrome
+      - chromium-chromedriver
     packages:
       - google-chrome-stable
 language: node_js
@@ -14,10 +15,11 @@ env:
   global:
     -secure: "meP3FKat278MD+Ve9zmJ90SMwdtiDHgu0/InD+EtOhJVXga2yr0IRzjyYXfA63B0XzQhZsENDp3aL7CjJ+g3FdfNbwgl/tIrJiGCBrrc4ZCjbRn/KjxmOlsQ/T9Prc4iw+HlgLh2aQpzkVf07+Y0DlQlpc2PR67o4MfvGXYVN0AjzpQNIvlhu0mZpakN4y5c0qngdSHGvdHv1CLxmupyMV2T1KpAq3Mwn+XdeuWEYS7bedN7mo9F1sst2rxBs7WG7e6fY7fm81Vve9ZSHRRnidiz8pIUh8DMqrif+8k7AJ95YJu9qMwOEuiuqWrONpr7NcKJiwQxwegjXHjx/RY/EMnznn4csO5Zc6gWHs06UldVmh56NAH0qCxJS8loYr2Tit3PsuBf7TAz9ussQVx8cgPlSqa1ec9OJiQ3eMKJC6rSpR+4vzMDmkY5j3x9nUpfonSxvpqZa/7yRjyGJg/5tnlCsp5CS9X7zmi7Y4dYBABH08tRd/LR/pThnPgki4Cazsv0Rh+IYswM5TEtodXEsZgqs8dtdORBLFbojraqZuxOyZEdFWXiTev2e593JLvXzEFLMnKYP/RvO58KrPOmZBd/guT7u7CM+A8roY8iq0yXfwiVo5mHlga5FPJbQgr4iJYENJQ357p31zlT1qg6PMcvdrofxMh7smsWl0tE5gI="
 before_script:
+  - node_modules/protractor/bin/webdriver-manager update --versions.chrome 2.31
   - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 install:
   - npm install
-  - node ./node_modules/protractor/bin/webdriver-manager update
 script:
+  - node_modules/protractor/bin/webdriver-manager start > /dev/null 2>&1 &
+  - sh -e /etc/init.d/xvfb start
   - npm run ci

README.md

@@ -1,5 +1,5 @@
 [![Stories in Ready](https://badge.waffle.io/VamosJuntas/vamosjuntas.png?label=ready&title=Ready)](https://waffle.io/VamosJuntas/vamosjuntas)
-[![Build Status](https://travis-ci.org/VamosJuntas/vamosjuntas.svg?branch=master)](https://travis-ci.org/VamosJuntas/vamosjuntas)
+[![Build Status](https://snap-ci.com/VamosJuntas/vamosjuntas/branch/master/build_image)](https://snap-ci.com/VamosJuntas/vamosjuntas/branch/master)
 
 # Vamos Juntas
 

package.json

@@ -17,7 +17,6 @@
     "eslint-config-airbnb": "^1.0.2",
     "eslint-config-angular": "^0.4.0",
     "eslint-plugin-angular": "^0.14.0",
-    "eslint-plugin-jasmine": "^2.8.0",
     "eslint-plugin-react": "^3.11.2",
     "express": "^4.13.4",
     "gulp": "^3.9.1",
@@ -32,7 +31,7 @@
     "karma-cli": "*",
     "karma-coverage": "^1.0.0",
     "karma-jasmine": "^0.3.6",
-    "karma-phantomjs-launcher": "^1.0.2",
+    "karma-phantomjs-launcher": "^0.2.1",
     "moment": "^2.17.1",
     "node-sass": "^3.4.2",
     "nodemon": "^1.9.1",
@@ -76,8 +75,5 @@
     "ionic-emulate-ios-debugger": "gulp build-dev build-prod && ionic emulate -lc ios",
     "ionic-state-restore": "ionic state restore",
     "start-stubby": "stubby -q -s 3001 -l localhost -d ./stubs/reports.yml"
-  },
-  "devDependencies": {
-    "karma": "^0.13.22"
   }
 }

scss/ionic.app.scss

@@ -36,19 +36,34 @@ $error: #FA787E;
 #splash-logo {
   max-width: 100%;
   display: block;
+  margin: 0 auto;
 }
 
 .logo {
   max-width: 100%;
 }
 
+.terms-of-use {
+  a {
+    color: #cc3399;
+  }
+}
+
 #terms-check {
   padding: 0 10px;
   display: block;
 
+  #check-terms {
+    input:checked:before, input:checked+.checkbox-icon:before {
+      background: #cc3399;
+      border-color: #cc3399;
+    }
+  }
+
   button {
-    with: 100%;
-    background: blue;
+    width: 100%;
+    background: #cc3399;
+    border-color: #cc3399;
     margin-top: 10px;
   }
 }
@@ -66,22 +81,139 @@ ion-content {
     padding: 0 10px;
 }
 
-.vamosjuntas-home-header {
-    padding-top: 30px;
+div.title.title-center.header-item {
+  background: url("img/logo-27h.png") center no-repeat;
 }
 
-.vamosjuntas-search-button {
-    margin-top: 20px;
+.bordered-places-list {
+  a {
+    margin-bottom: 10px;
+  }
 }
 
-ion-content {
-    padding: 0 10px;
+h2, p, span {
+  font-family: OpenSans;
+}
+
+h4 {
+  font-family: OpenSans;
+  font-weight: 500;
+}
+
+.table-occurrences {
+  margin: auto;
+
+  .occurrences-counter {
+    font-size: 0.9em;
+    font-family: OpenSans;
+    padding: 0.75em;
+    font-weight: 700;
+  }
+}
+
+.report-period-date {
+  font-family: OpenSans;
+  float: right;
+  color: #cc3399;
+}
+
+.report-risk {
+  font-family: OpenSans;
+  font-weight: 600;
+}
+
+.grey-dot {
+  font-size: 0.9em;
+  color: #c4c4c4;
+}
+
+.number-of-occurrences {
+  font-weight: 600;
+}
+
+.vamosjuntas-home-header-wrapper {
+  text-align: center;
+  margin-bottom: 10px;
 }
 
 .vamosjuntas-home-header {
-    padding-top: 30px;
+  padding-top: 30px;
+  color: #cc3399;
+  font-family: OpenSans;
+  font-weight: 500;
+}
+
+p.pink-denunciation-title {
+  font-family: OpenSans;
+  font-size: 0.7em;
+  color: #cc3399;
+}
+
+.pink-horizontal-rule {
+  height: 1px;
+  color: #cc3399;
+  background-color: #cc3399;
+  border: none;
+  width: 95%;
+}
+
+.grey-horizontal-rule {
+  height: 1px;
+  color: #000000;
+  background-color: #000000;
+  border: none;
+  width: 100%;
+}
+
+.item-input {
+  padding: 0px 0 0px 16px;
+}
+
+.place-details-item {
+  margin-top: 20px;
+}
+
+label.item.item-input {
+  border-style: solid;
+  border-width: 1px;
+  border-color: #cc3399;
+  margin-top: 15px;
+}
+
+.button.button-positive {
+  border-color: #cc3399;
+  background-color: #cc3399;
+  font-weight: 600;
+  font-family: OpenSans;
+  margin-bottom: 50px;
+
+  &:visited, &:hover, &:active {
+    border-color: #cc3399;
+    background-color: #cc3399;
+  }
+}
+
+.place-details-navbar {
+  img {
+    margin-top: 5px;
+  }
+}
+
+.bar.bar-positive {
+  border-color: #cc3399;
+  background-color: #cc3399;
+  background-image: linear-gradient(0deg, #cc3399, #cc3399 50%, transparent 50%);
 }
 
 .vamosjuntas-search-button {
-    margin-top: 20px;
+  background-color: #cc3399;
+  border-color: #cc3399;
+  color: #fff;
+  font-weight: 600;
+  font-family: OpenSans;
+  border-radius: 0px;
+}
+
+ion-content {
+    padding: 0 10px;
 }

www/js/controller/confirmation.controller.js

@@ -1,3 +1,4 @@
-angular.module('vamosJuntas').controller('ConfirmationController', function confirmationController() {
-  $scope.placeDetails = { };
-});
+angular.module('vamosJuntas').controller('ConfirmationController',
+    ['', function () {
+        $scope.placeDetails = { };
+}]);

www/js/controller/home.controller.js

@@ -1,17 +1,17 @@
 angular.module('vamosJuntas').controller('HomeController',
  ['$scope', 'placeFactory', 'addressFactory', 'geolocationFactory', '$ionicLoading', function($scope, placeFactory, addressFactory, geolocationFactory, $ionicLoading) {
 
-   $scope.search = {};
-   $scope.errorMessage = false;
+  $scope.search = {};
+  $scope.errorMessage = false;
 
-   $ionicLoading.show();
+  $ionicLoading.show();
 
-   var coordinates = {};
-   var posOptions = {timeout: 5000, enableHighAccuracy: false};
+  var coordinates = {};
+  var posOptions = {timeout: 5000, enableHighAccuracy: false};
 
-   geolocationFactory
+  geolocationFactory
     .getCurrentPosition(posOptions)
-    .then(function(position) {
+    .then(function (position) {
 
       placeFactory.fetchPlaces(position.coords.latitude, position.coords.longitude).then(function(response) {
         $scope.places = response.data;
@@ -27,13 +27,13 @@ angular.module('vamosJuntas').controller('HomeController',
       $ionicLoading.hide();
     });
 
-   $scope.getTotalOfOccurrences = function(place) {
-     var numberOfOccurrences = place.occurrences.reduce(function(total, occurrence) {
-       return total + occurrence.numberOfOccurrences;
-     }, 0);
+    $scope.getTotalOfOccurrences = function(place) {
+      var numberOfOccurrences = place.occurrences.reduce(function(total, occurrence) {
+        return total + occurrence.numberOfOccurrences;
+      }, 0);
 
-     return numberOfOccurrences;
-   };
+      return numberOfOccurrences;
+    };
 
    $scope.getSpecificPlace = function(place) {
      placeFactory.addPlace(place);

www/js/controller/placeDetails.controller.js

@@ -1,17 +1,56 @@
 angular.module('vamosJuntas')
-    .controller('placeDetailsController', ['$scope', 'placeFactory', '$location', function($scope, placeFactory, $location) {
-      $scope.placeDetails = placeFactory.getPlace();
+  .controller('placeDetailsController', placeDetailsController);
 
-      $scope.allOccurrences = $scope.placeDetails.occurrences.map(function(ocurrence) {
-        return { risk: ocurrence.risk, reports: ocurrence.reports };
+placeDetailsController.$inject = ['$scope', 'placeFactory', '$location'];
+
+function placeDetailsController($scope, placeFactory, $location) {
+  $scope.placeDetails = placeFactory.getPlace();
+
+  $scope.allOccurrences = $scope.placeDetails.occurrences.map(function(ocurrence) {
+    return { risk: ocurrence.risk, reports: ocurrence.reports };
+  });
+
+  $scope.allOccurrencesReports = allOccurrencesReports($scope.allOccurrences);
+
+  function allOccurrencesReports(allOccurrences) {
+    var _allOccurrences = allOccurrences.slice();
+
+    return _allOccurrences.map(function(occurence) {
+      return occurence.reports.map(function(report) {
+        return { risk: occurence.risk, date: report.date, period: report. period };
       });
+    }).reduce(function(previous, current) { return previous.concat(current); });
+  }
+
+  $scope.myGoBack = function() {
+    $ionicHistory.goBack();
+  };
+
+  $scope.submit = function() {
+    $location.path('/report');
+  };
+
+  $scope.mostFrequentOccurence = mostFrequentOccurence($scope.placeDetails.occurrences);
+  $scope.numberOfOtherOccurrences = numberOfOtherOccurrences($scope.placeDetails.occurrences);
+
+  function mostFrequentOccurence(allOccurrences) {
+    var _allOccurrences = allOccurrences.slice();
+    return _allOccurrences.sort(byNumberOfOcurrences).shift();
+  }
+
+  function numberOfOtherOccurrences(allOccurrences) {
+    var INITIAL_VALUE = 0;
+    var _allOccurrences = allOccurrences.slice();
+    var _otherOccurrences = _allOccurrences.sort(byNumberOfOcurrences).slice(1);
 
-      $scope.myGoBack = function() {
-        $ionicHistory.goBack();
-      };
+    var sumNumberOfOccurrences = function(previousOccurrence, currentOccurrence) {
+      return previousOccurrence + Number(currentOccurrence.numberOfOccurrences);
+    };
 
-      $scope.submit = function() {
-        $location.path('/report');
-      };
+    return _otherOccurrences.reduce(sumNumberOfOccurrences, INITIAL_VALUE);
+  }
 
-    }]);
+  function byNumberOfOcurrences(firstOccurrence, secondOccurrence) {
+    return Number(secondOccurrence.numberOfOccurrences) - Number(firstOccurrence.numberOfOccurrences);
+  }
+}