Merge branch 'master' of https://github.com/Dirrk/2015-hr-resolutions

bower.json

@@ -10,7 +10,9 @@
     "angular-resource": "~1.4",
     "angular-animate": "~1.4",
     "angular-mocks": "~1.4",
+    "angular-bootstrap": "~0.13",
     "angular-ui-utils": "~0.2",
-    "angular-ui-router": "~0.2.15"
+    "angular-ui-router": "~0.2.15",
+    "angularjs-geolocation": "~0.1.1"
   }
 }

lib/api/events/createEvent.js

@@ -0,0 +1 @@
+module.exports = function () {};

lib/api/events/getById.js

@@ -0,0 +1,29 @@
+'use strict';
+var HoekBoom = require('hoek-boom'),
+    config = require('../../config');
+
+module.exports = function getById(request, reply) {
+    var id,
+        response = {};
+
+    HoekBoom.assertBoom(request.params.id, 'ID is required', 'badRequest');
+
+    id = request.params.id;
+    this.els.get({index: config.elsEventsIndex, type: config.elsEventsType, id: id}, function(error, resp) {
+
+        if (error && !resp.found) {
+            return reply({status: 404, message: 'Not found'});
+        }
+        else if (error) {
+            console.error(error);
+            return reply({status: 400});
+        }
+        response.doc = resp._source.event_details;
+        response.id = id;
+
+        reply({
+            status: 200,
+            resp: response
+        });
+    });
+};

lib/api/events/getByLocation.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var HoekBoom = require('hoek-boom');
+
+module.exports = function getByLocation(request, reply) {
+
+    HoekBoom.assertBoom(request.query.lat && request.query.lng, 'lat/lng combo is required', 'badRequest');
+    return reply('hello');
+};

lib/api/events/index.js

@@ -0,0 +1,6 @@
+module.exports = {
+    getById: require('./getById'),
+    getByLocation: require('./getByLocation'),
+    createEvent: require('./createEvent'),
+    signUp: require('./signup')
+};

lib/api/events/signup.js

@@ -0,0 +1 @@
+module.exports = function () {};

lib/api/report/index.js

@@ -1,6 +1,12 @@
 'use strict';
 var HoekBoom = require('hoek-boom'),
-    Boom = HoekBoom.boom;
+    Boom = HoekBoom.boom,
+    elasticsearch = require('elasticsearch'),
+    config = require('../../config'),
+    elsClient;
+
+//setup ELS client
+elsClient = new elasticsearch.Client(config.elsClient);
 
 exports.createReport = function (request, reply) {
     reply({
@@ -9,21 +15,6 @@ exports.createReport = function (request, reply) {
     });
 };
 
-//get an event by id
-exports.getById = function (request, reply) {
-    var id;
-
-    HoekBoom.assertBoom(request.params.id, 'ID is required', 'badRequest');
-
-    id = request.params.id;
-
-    reply({
-        status: 200,
-        id: id
-    });
-    //TODO: get event by id
-};
-
 //get an event by lat/lng
 exports.getByLocation = function (request, reply) {
     var lat,

lib/config.js

@@ -3,7 +3,13 @@
 var constants = {
     server: {
         port: process.env.PORT || 3000
-    }
+    },
+    elsClient: {
+        host: 'https://hvjryrh8:[email protected]/',
+        log: 'trace'
+    },
+    elsEventsIndex: 'events',
+    elsEventsType: 'event'
 };
 
 module.exports = Object.freeze(constants);

lib/routes.js

@@ -1,17 +1,15 @@
 'use strict';
 
-var report = require('./api/report');
+var events = require('./api/events');
 
 module.exports = [
     { method: 'GET', path: '/', handler: { file: function () { return 'public/views/index.html'; }}},
     { method: 'GET', path: '/views/{file?}', handler: { directory: { path: 'public/views/'}}},
     { method: 'GET', path: '/javascript/{file?}', handler: { directory: { path: 'public/javascript/'}}},
-    { method: 'POST', path: '/api/report', handler: report.createReport },
 
     //the money maker...
-    { method: 'GET', path: '/api/events/id/{id?}', handler: report.getById },
-    { method: 'GET', path: '/api/events/location', handler: report.getByLocation },
-    { method: 'GET', path: '/api/events/search', handler: report.getByName },
-    { method: 'POST', path: '/api/events/create/{id?}', handler: report.createEvent },
-    { method: 'POST', path: '/api/events/signup/{id?}', handler: report.signup }
+    { method: 'GET', path: '/api/events/id/{id?}', handler: events.getById },
+    { method: 'GET', path: '/api/events/location', handler: events.getByLocation },
+    { method: 'POST', path: '/api/events/', handler: events.createEvent },
+    { method: 'POST', path: '/api/events/signup/{id?}', handler: events.signUp }
 ];

lib/setup.js

@@ -1,12 +1,20 @@
 'use strict';
 
 var Hapi = require('hapi'),
-    config = require('./config');
+    config = require('./config'),
+    elasticsearch = require('elasticsearch'),
+    config = require('./config'),
+    elsClient;
+
+elsClient = new elasticsearch.Client(config.elsClient);
 
 module.exports = function (next) {
     var server = new Hapi.Server();
 
     server.connection(config.server);
+    server.bind({
+        els: elsClient
+    });
     server.start(function (err) {
         if (err) {
             return next(err);

package.json

@@ -9,7 +9,8 @@
   },
   "dependencies": {
     "hapi": "8.x.x",
-    "hoek-boom": "1.x.x"
+    "hoek-boom": "1.x.x",
+    "elasticsearch": "8.x.x"
   },
   "engines": {
 	"node": "0.10.x"

public/javascript/app.js

@@ -2,10 +2,11 @@ var a = 'Hello world';
 console.log(a);
 
 var ngModule = angular.module;
-ngModule('hrApp', [
+var app = ngModule('hrApp', [
     'home',
     'about',
-    'globalNav'
+    'globalNav',
+    'ui.router'
 ]);
 
 ngModule('globalNav', [])
@@ -30,10 +31,20 @@ ngModule('home', [])
         }
     })
     .controller('homePageController', [
+        '$http',
         '$scope',
-        function ($scope) {
+        function ($http, $scope) {
             var self = this;
             self.name = 'Home Page View';
+
+            $http({
+                method: 'GET',
+                url: 'http://hack4hr2015.herokuapp.com/api/events/'
+            }).then(function (response) {
+                console.log(response);
+            }, function (error) {
+                console.log(error);
+            });
         }
     ]);
 
@@ -59,12 +70,12 @@ ngModule('about', [])
         }
     ]);
 // html 5 mode on
-// ngModule.config([
-//     '$locationProvider',
-//     function ($locationProvider) {
-//         $locationProvider.html5Mode(true);
-//     }
-// ]);
+ app.config([
+     '$locationProvider',
+     function () {
+         //$locationProvider.html5Mode(true);
+     }
+ ]);
 // bootstrapping the application this way avoids clutting up the
 // home page with 'ngapp=hrapp'
 angular.element(document).ready(function () {

public/javascript/lib/angularjs-geolocation/.bower.json

@@ -0,0 +1,38 @@
+{
+  "name": "angularjs-geolocation",
+  "version": "0.1.1",
+  "homepage": "https://github.com/arunisrael/angularjs-geolocation",
+  "authors": [
+    "Arun Israel <[email protected]>"
+  ],
+  "description": "An angular.js wrapper around window.navigator.geolocation",
+  "main": "./src/geolocation.js",
+  "keywords": [
+    "geolocation",
+    "angular.js"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "angular": "~1.x"
+  },
+  "devDependencies": {
+    "angular-mocks": "~1.x"
+  },
+  "_release": "0.1.1",
+  "_resolution": {
+    "type": "version",
+    "tag": "0.1.1",
+    "commit": "4174fca718da6dacc9de1fbc5deb9a9227783956"
+  },
+  "_source": "git://github.com/arunisrael/angularjs-geolocation.git",
+  "_target": "~0.1.1",
+  "_originalSource": "angularjs-geolocation",
+  "_direct": true
+}

public/javascript/lib/angularjs-geolocation/Gruntfile.js

@@ -0,0 +1,47 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    jshint: {
+      files: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js'],
+      options: {
+        // options here to override JSHint defaults
+        globalstrict: true,
+        globals: {
+          jQuery: true,
+          console: true,
+          module: true,
+          document: true,
+          expect: true,
+          it: true,
+          spyOn: true,
+          beforeEach: true,
+          angular: true,
+          inject: true,
+          describe: true
+        }
+      }
+    },
+    uglify: {
+      options: {
+        banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+      },
+      dist: {
+        files: {
+          'dist/<%= pkg.name %>.min.js': 'src/geolocation.js'
+        }
+      }
+    },
+    karma: {
+      unit: {
+        configFile: 'karma.conf.js'
+      }
+    }
+  });
+
+grunt.loadNpmTasks('grunt-contrib-jshint');
+grunt.loadNpmTasks('grunt-contrib-uglify');
+grunt.loadNpmTasks('grunt-karma');
+grunt.registerTask('default', ['jshint', 'karma','uglify']);
+};

public/javascript/lib/angularjs-geolocation/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Arun Israel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

public/javascript/lib/angularjs-geolocation/README.md

@@ -0,0 +1,62 @@
+AngularJS-Geolocation
+=========
+
+An angular.js wrapper around window.navigator.geolocation
+
+Bower
+--
+This module is available as bower package, install it with this command:
+
+```bash
+bower install angularjs-geolocation
+```
+or
+
+```bash
+bower install git://github.com/arunisrael/angularjs-geolocation.git
+```
+
+Usage
+--
+- Add the geolocation module as dependency
+- Inject the geolocation service (yes, it has the same name)
+- Invoke the getLocation method on the geolocation service to retrieve a promise
+- The promise will be resolved with the position returned by window.navigator.getCurrentPosition if the user allows the browser to access their location
+- The promise will be rejected if the user rejects location access or the browser does not support it
+
+Example
+--
+```
+angular.module('barterApp',['geolocation'])
+  .controller('geoCtrl', function ($scope,geolocation) {
+    geolocation.getLocation().then(function(data){
+      $scope.coords = {lat:data.coords.latitude, long:data.coords.longitude};
+    });
+});
+```
+
+Demo
+--
+See this [plunker](http://embed.plnkr.co/TM71LBh6ttYotOo6t7oX/preview) that displays your latitude/longitude
+
+Error Handling
+--
+The geolocation module defines a geolocation-msgs constant holding error msgs that are broadcast if the user rejects location access:
+```
+$rootScope.$broadcast('error',CONSTANTS['errors.location.notFound']);
+```
+
+or if the browser does not support geolocation:
+```
+$rootScope.$broadcast('error',geolocation_msgs['errors.location.unsupportedBrowser']);
+```
+
+Testing
+--
+```
+grunt test
+```
+
+License
+--
+MIT