Merge pull request #31 from minhaufcg/multiMap

Multi map
minhaufcg · Dec 7, 2017 · ddcf3bf · ddcf3bf
2 parents 031bcf3 + 8814e91
commit ddcf3bf
Show file tree

Hide file tree

Showing 24 changed files with 169 additions and 39 deletions.
diff --git a/app/controllers/locations.js b/app/controllers/locations.js
@@ -0,0 +1,30 @@
+const mongoose = require('mongoose');
+const Campus = require('../models/campi');
+const Coordinations = require('../models/coords');
+const RestHelper = require('../helpers/rest-helper');
+mongoose.Promise = require('bluebird');
+
+function getAllCampi (req, res) {
+    Campus
+        .find({}).then(function (data) {
+            console.log(data);
+            RestHelper.sendJsonResponse(res, 200, data);
+        })
+}
+
+function getCampusCoords(req, res) {
+    if (!req.params || !req.params.campusId)
+        RestHelper.sendJsonResponse(res, 404, {error : "No campus ID provided"});
+
+    var campusId = req.params.campusId;
+
+    Coordinations
+        .getByCampus(campusId).then(function (coords) {
+            RestHelper.sendJsonResponse(res, 200, coords);
+        })
+}
+
+module.exports = {
+    getAllCampi : getAllCampi,
+    getCampusCoords : getCampusCoords
+};
diff --git a/app/controllers/users.js b/app/controllers/users.js
@@ -26,11 +26,12 @@ const usersReadOne = function (req, res) {
 
 const usersCreateOne = function (req, res) {
     const newUser = new User();
-    newUser.name = req.body.name,
-    newUser.email = req.body.email,
-    newUser.role = req.body.role,
-    newUser.registration = req.body.registration
+    newUser.name = req.body.name;
+    newUser.email = req.body.email;
+    newUser.role = req.body.role;
+    newUser.registration = req.body.registration;
     newUser.setPassword(req.body.password);
+    newUser.campus = req.body.campus;
 
     newUser
         .save()

diff --git a/app/models/campi.js b/app/models/campi.js
@@ -0,0 +1,11 @@
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const campusSchema = Schema({
+    name: {
+        type: String,
+        required: true
+    }
+}, {collection : 'campi'});
+
+module.exports = mongoose.model("Campus", campusSchema);
diff --git a/app/models/coords.js b/app/models/coords.js
@@ -0,0 +1,37 @@
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const coordsSchema = Schema({
+    campus: {
+        type: Schema.Types.ObjectId,
+        ref : "Campus",
+        required: true
+    },
+    center : {
+        lat : {
+            type : Number,
+            required : true
+        },
+        lng : {
+            type : Number,
+            required : true
+        }
+    },
+    coords : {
+        type : [{
+            lat : Number,
+            lng : Number
+        }],
+        required: true
+    }
+}, {collection : 'coords'});
+
+coordsSchema.statics.getByCampus = function (campusId) {
+    return this.findOne({ campus: campusId }).exec(function (coords) {
+        return coords;
+    });
+};
+
+
+module.exports = mongoose.model("Coordinations", coordsSchema);
+
diff --git a/app/models/db.js b/app/models/db.js
@@ -51,3 +51,5 @@ process.on('SIGTERM', function () {
 // Models
 require('./requests');
 require('./users');
+require('./coords');
+require('./campi');
diff --git a/app/models/users.js b/app/models/users.js
@@ -28,6 +28,11 @@ const userSchema = Schema({
         unique: false,
         required: true
     },
+    campus : {
+        type: Schema.Types.ObjectId,
+        ref : "Campus",
+        required: true
+    },
     hash: String
 });
 
@@ -51,7 +56,8 @@ userSchema.methods.generateJwt = function() {
     const payload = { 
         id: this._id,
         registration: this.registration,
-        name: this.name
+        name: this.name,
+        campus: this.campus
     };
 
     const token = jwt.sign(

diff --git a/app/routers/index.js b/app/routers/index.js
@@ -4,6 +4,7 @@ const jwt = require('express-jwt');
 const constants = require('../config/constants')
 const requestsCtrl = require('../controllers/requests');
 const usersCtrl = require('../controllers/users');
+const locationsCtrl = require('../controllers/locations');
 
 const router = express.Router();
 const auth = jwt({
@@ -24,4 +25,7 @@ router.put('/users/:userId', auth, usersCtrl.usersUpdateOne);
 router.delete('/users/:userId', auth, usersCtrl.usersDeleteOne);
 router.post('/login/', usersCtrl.login);
 
+router.get('/campi/', locationsCtrl.getAllCampi);
+router.get('/campi/:campusId/coords', locationsCtrl.getCampusCoords);
+
 module.exports = router;
diff --git a/gulpfile.js b/gulpfile.js
@@ -16,7 +16,7 @@ gulp.task('angular', () => {
       presets: ['es2015'],
       plugins: ['angularjs-annotate']
     }))
-    .pipe(uglify())
+    //.pipe(uglify())
     .pipe(gulp.dest('public/dist'));
 });
 

diff --git a/public/js/components/map-modal.js b/public/js/components/map-modal.js
@@ -1,15 +1,14 @@
 angular.module('mufcg')
-.controller('MapModalCtrl', function ($scope, LOCATIONS, NgMap, messagebox, $uibModalInstance, mapHelper) {
+.controller('MapModalCtrl', function ($scope, NgMap, messagebox, $uibModalInstance, mapHelper, AuthService) {
     var map = undefined;
     var ufcgPolygon = undefined;
 
     NgMap.getMap().then(function(mapResult) {
         map = mapResult;
 
         google.maps.event.trigger(map, "resize");
-        map.setCenter(LOCATIONS.UFCG.center);
+        mapHelper.initMap(map,AuthService.getCurrentUser());
 
-        ufcgPolygon = mapHelper.getPolygon(LOCATIONS.UFCG.polygon);
         mapHelper.deleteAllMarkers();
     });
 
@@ -18,7 +17,7 @@ angular.module('mufcg')
         var lat = event.latLng.lat();
         var lng = event.latLng.lng();
 
-        if (!google.maps.geometry.poly.containsLocation(event.latLng, ufcgPolygon)) {
+        if (!google.maps.geometry.poly.containsLocation(event.latLng, mapHelper.getPolygon())) {
             messagebox.fail('O local que você escolheu para criar a ocorrência fica fora das dependências do seu campus','Local inválido')
         }
         else {
@@ -50,7 +49,7 @@ angular.module('mufcg')
                     lng: position.coords.longitude
                 };
 
-                if (!google.maps.geometry.poly.containsLocation(posFun, ufcgPolygon)) {
+                if (!google.maps.geometry.poly.containsLocation(posFun, mapHelper.getPolygon())) {
                     messagebox.fail("Você não está no campus, não é possível marcar esta localização", "Local inválido");
                 }
                 else {
@@ -72,7 +71,7 @@ angular.module('mufcg')
     };
 
     $scope.dragLimit = function() {
-        mapHelper.dragEnd(ufcgPolygon, LOCATIONS.UFCG.center);
+        mapHelper.dragEnd(mapHelper.getPolygon());
     };
 
     function setMarker(lat, lng, geolocation) {

diff --git a/public/js/controllers/home-controller.js b/public/js/controllers/home-controller.js
@@ -1,26 +1,21 @@
 angular.module('mufcg')
-.controller('HomeCtrl', function ($scope, NgMap, mapHelper, LOCATIONS, AuthService, Request) {
+.controller('HomeCtrl', function ($scope, NgMap, mapHelper, LOCATIONS, Location, AuthService, Request) {
     var map = undefined;
     var ufcgPolygon = undefined;
 
     $scope.initMap = function () {
         NgMap.getMap().then(function (mapResult) {
             map = mapResult;
 
-            if (!mapHelper.getMap())
-                mapHelper.initMap(map);
-
-            mapHelper.deleteAllMarkers();
-
-            ufcgPolygon = mapHelper.getPolygon(LOCATIONS.UFCG.polygon);
+            mapHelper.initMap(map, AuthService.getCurrentUser());
 
             loadAuthorRequests();
         });
     };
 
-    $scope.dragLimit = function () {
-        mapHelper.dragEnd(ufcgPolygon, LOCATIONS.UFCG.center);
-    };
+    // $scope.dragLimit = function () {
+    //     mapHelper.dragEnd(ufcgPolygon, LOCATIONS.UFCG.center);
+    // };
 
     function loadAuthorRequests() {
         Request.getByAuthor(AuthService.getCurrentUser().id).then(function (res) {
@@ -29,7 +24,7 @@ angular.module('mufcg')
                 if ('location' in request) {
                     location.lat = request.location.lat;
                     location.lng = request.location.lng;
-                    let image =  undefined;
+                    var image =  undefined;
                     if (request.img) {
                         image = 'data:'.concat(request.img.filetype, ';base64,', request.img.base64);
                     }
@@ -39,6 +34,8 @@ angular.module('mufcg')
         });
     }
 
+
+
     function createMarker(title, description, image, date, location) {
         var contentString = `
                 <h1>${title}</h1>

diff --git a/public/js/controllers/register-controller.js b/public/js/controllers/register-controller.js
@@ -1,16 +1,25 @@
 angular.module('mufcg')
-.controller('RegisterCtrl', function ($scope, $state, AuthService) {
-
+.controller('RegisterCtrl', function ($scope, $state, AuthService, Location, messagebox) {
+    $scope.user = {};
+
+    function loadCampi() {
+        Location.getCampi().then(function (res) {
+            $scope.campi = res.data;
+        });
+    }
+
+    loadCampi();
+
     $scope.register = function() {
         if ($scope.user.password !== $scope.confirmPassword) {
             alert('Senhas divergem!');
         } else {
             $scope.user.role = "student";
             AuthService.register($scope.user).then(function () {
-                alert('Usuário cadastrado com sucesso');
+                messagebox.success('Usuário cadastrado com sucesso');
                 $state.go("login");
             }, function error(response) {
-                console.warn(response.message);
+                messagebox.fail(response.data.message);
             });
         }
     };

diff --git a/public/js/directives/nav-bar/nav-bar.js b/public/js/directives/nav-bar/nav-bar.js
@@ -5,9 +5,9 @@ angular.module('mufcg')
         templateUrl : '/templates/directives/nav-bar/nav-bar.html',
         scope : {},
         controller : function ($scope, $location, AuthService) {
-            $scope.enabled = false;
             $scope.isCollapsed = false;
             const FORBIDDEN = ['/login', '/register', '/'];
+            $scope.enabled = FORBIDDEN.indexOf($location.url()) === -1;
 
             $scope.getCollapseClass = function () {
                 return $scope.isCollapsed ?

diff --git a/public/js/factories/rest/location.js b/public/js/factories/rest/location.js
@@ -0,0 +1,11 @@
+angular.module("mufcg").factory('Location', function RequestFactory($http, PROPERTIES) {
+    return {
+        getCampi : function () {
+            return $http.get(PROPERTIES.restBasePath + "/campi");
+        },
+
+        getCampusCoords : function (campusId) {
+            return $http.get(PROPERTIES.restBasePath + "/campi/" + campusId + "/coords/");
+        }
+    }
+});
diff --git a/public/js/services/auth-service.js b/public/js/services/auth-service.js
@@ -47,7 +47,8 @@ angular
                 return {
                     name: payload.name,
                     registration: payload.registration,
-                    id: payload.id
+                    id: payload.id,
+                    campus: payload.campus
                 };
             }
         };

diff --git a/public/js/services/mapHelper.js b/public/js/services/mapHelper.js
@@ -1,15 +1,30 @@
 angular.module('mufcg')
-.service('mapHelper', function (NgMap ) {
+.service('mapHelper', function (NgMap, Location) {
     var markers = [];
     var map = undefined;
+    var campusCenter = undefined;
+    var coords = undefined;
+    var polygon = undefined;
+
     function clearMarkers() {
         for (var i = 0; i < markers.length; i++) {
             markers[i].setMap(null);
         }
     }
+
     return {
-        initMap : function (markersMap) {
+        initMap : function (markersMap, user) {
             map = markersMap;
+
+            Location.getCampusCoords(user.campus).then(function (res) {
+                map.setCenter(res.data.center);
+                campusCenter = res.data.center;
+                coords = res.data.coords;
+                polygon = new google.maps.Polygon({paths: coords});
+            });
+        },
+        getCampusCenter : function () {
+            return campusCenter;
         },
         getMap : function () {
             return map;
@@ -32,10 +47,10 @@ angular.module('mufcg')
             clearMarkers();
             markers = [];
         },
-        getPolygon : function (coords) {
-            return new google.maps.Polygon({paths: coords});
+        getPolygon : function () {
+            return polygon;
         },
-        dragEnd : function (polygon, center) {
+        dragEnd : function (center) {
             if(!google.maps.geometry.poly.containsLocation(map.getCenter(), polygon))
                 map.setCenter(center);
         }

diff --git a/public/js/services/messagebox-service.js b/public/js/services/messagebox-service.js
@@ -5,7 +5,7 @@ angular.module('mufcg')
     };
 
     const failModal = function (message, title, callback) {
-        defaultModal(getCustomTitle(title || "Falha de autenticação", 'white', true), message, 'small', getButton('ok', 'OK', 'btn-danger'), false, "danger-modal");
+        defaultModal(getCustomTitle(title || "Erro", 'white', true), message, 'small', getButton('ok', 'OK', 'btn-danger'), false, "danger-modal");
     };
 
     const defaultModal = function (title, message, size, buttons, closeButton, customClass, callback) {

diff --git a/public/src/app/components/home.controller.js b/public/src/app/components/home.controller.js
diff --git a/public/src/app/components/home.html b/public/src/app/components/home.html
diff --git a/public/src/app/components/home.scss b/public/src/app/components/home.scss
diff --git a/public/src/app/directives/.gitkeep b/public/src/app/directives/.gitkeep
diff --git a/public/src/app/pipes/.gitkeep b/public/src/app/pipes/.gitkeep
diff --git a/public/templates/components/map-modal.html b/public/templates/components/map-modal.html
@@ -4,7 +4,7 @@ <h3 class="modal-title" style="font-weight: bold;">Mapa do campus</h3>
 <div class="modal-body" id="modal-body">
     <div class="col-xs-offset-1 col-md-offset-3" map-lazy-load="https://maps.googleapis.com/maps/api/js"
          map-lazy-load-params="https://maps.googleapis.com/maps/api/js?key=AIzaSyCg-DgACUXO_nUZ5W9A5VHe2H0wD-9tycs">
-        <ng-map center="-7.214250, -35.909188" zoom="17" min-zoom="17" style="height: 600px; width: 700px;" on-dragend="dragLimit()" on-click="createMarker()">
+        <ng-map zoom="17" map-type-id="hybrid" style="height: 600px; width: 700px;" on-dragend="dragLimit()" on-click="createMarker()">
         </ng-map>
     </div>
     <br>

diff --git a/public/templates/pages/home.html b/public/templates/pages/home.html
@@ -2,6 +2,6 @@
 
 <div map-lazy-load="https://maps.googleapis.com/maps/api/js"
      map-lazy-load-params="https://maps.googleapis.com/maps/api/js?key=AIzaSyCg-DgACUXO_nUZ5W9A5VHe2H0wD-9tycs" ng-init="initMap()" style="margin-top: -20px; min-width: 400px;">
-    <ng-map center="-7.214850, -35.907788" zoom="17" min-zoom="17" style="width: 100%; height: auto;" on-dragend="dragLimit()">
+    <ng-map map-type-id="hybrid" center="0,0" zoom="18" style="width: 100%; height: auto;" on-dragend="dragLimit()" on-click="click()">
     </ng-map>
 </div>