- 
+ 
{{ tag.title }}
+
{{ tag.title }}
+
+
+
+ {{ tag.title }}
+
+
diff --git a/client/app/main/main.controller.js b/client/app/main/main.controller.js
index c64e820..da62d1a 100644
--- a/client/app/main/main.controller.js
+++ b/client/app/main/main.controller.js
@@ -1,25 +1,46 @@
'use strict';
angular.module('fireflyApp')
- .controller('MainCtrl', function ($rootScope, $scope, $http, $location, $window, config) {
- $scope.domain = config.DOMAIN;
- $scope.nearEvent = undefined;
+ .controller('MainCtrl', function ($rootScope, $filter, $routeParams, $http, $location, $window, $timeout, config) {
+ var vm = this;
+ vm.domain = config.DOMAIN;
+
+ if ($routeParams.tag) {
+ $rootScope.prefix = $routeParams.tag;
+ vm.all = false;
+ } else {
+ vm.all = false;
+ $rootScope.prefix = config.DEFAULT_PREFIX;
+ }
+
+ $rootScope.$on('$geolocation.position.changed', function() {
+ vm.nearEvents = $filter('orderBy')(vm.nearEvents, distanceFromHere);
+ });
+
+ $http.jsonp(config.HUB_IP + 'api/v1/tags/' + $rootScope.prefix + '?callback=JSON_CALLBACK')
+ .success(function (data) {
+ $rootScope.tag = data;
+ $rootScope.tagColor = {
+ 'background-color': $rootScope.tag.color,
+ height: '4px'
+ };
+ });
$http.jsonp(config.HUB_IP + 'api/v1/events/stats?callback=JSON_CALLBACK')
.success(function(data) {
- $scope.tags = data.upcoming_top_tags; // jshint ignore:line
+ vm.tags = data.upcoming_top_tags; // jshint ignore:line
}
);
- $scope.openEvent = function (eventId) {
- $location.path('/' + eventId);
+ vm.openEvent = function (eventId) {
+ $location.path('/event/' + eventId);
};
- $scope.openTag = function (path) {
- $window.location.href = 'http://' + path;
+ vm.openTag = function (path) {
+ $location.path(path + '/events/');
};
- $scope.distanceFromHere = function (_item, _startPoint) {
+ function distanceFromHere(_item, _startPoint) {
var start = null;
if (!_item.geo) {
@@ -60,25 +81,26 @@ angular.module('fireflyApp')
var num = radiansTo(start, end) * 3958.8;
return Math.round(num * 100) / 100;
- };
+ }
var processNextEvent = function(data) {
if (data && data.items) {
- $scope.nextEvent = data.items[0];
- $scope.allEvents = data.items;
+ vm.nextEvent = data.items[0];
+ vm.nearEvents = $filter('orderBy')(data.items, distanceFromHere);
+ vm.nextEvents = $filter('orderBy')(data.items, 'start');
}
};
- if ($scope.prefix) {
- if ($scope.all) {
- $http.jsonp(config.HUB_IP + 'api/v1/events/tag/' + $scope.prefix +
+ if ($rootScope.prefix) {
+ if (vm.all) {
+ $http.jsonp(config.HUB_IP + 'api/v1/events/tag/' + $rootScope.prefix +
'?perpage=999&callback=JSON_CALLBACK').success(processNextEvent);
} else {
- $http.jsonp(config.HUB_IP + 'api/v1/events/tag/' + $scope.prefix +
+ $http.jsonp(config.HUB_IP + 'api/v1/events/tag/' + $rootScope.prefix +
'/upcoming?perpage=999&callback=JSON_CALLBACK').success(processNextEvent);
}
} else {
- if ($scope.all) {
+ if (vm.all) {
$http.jsonp(config.HUB_IP + 'api/v1/events?perpage=100&callback=JSON_CALLBACK')
.success(processNextEvent);
} else {
diff --git a/client/app/main/main.controller.spec.js b/client/app/main/main.controller.spec.js
index 7d0f0f0..2fa13d2 100644
--- a/client/app/main/main.controller.spec.js
+++ b/client/app/main/main.controller.spec.js
@@ -6,7 +6,6 @@ describe('Controller: MainCtrl', function () {
// load the controller's module
//noinspection JSValidateTypes
beforeEach(module('fireflyApp'));
-
// Initialize the controller and a mock scope
beforeEach(inject(function (_$httpBackend_, $controller, $rootScope, _config_) {
$httpBackend = _$httpBackend_;
@@ -29,6 +28,6 @@ describe('Controller: MainCtrl', function () {
.respond([]);
$httpBackend.flush();
- expect(scope.tags.length).toBe(4);
+ expect(MainCtrl.tags.length).toBe(4);
});
});
diff --git a/client/app/main/main.css b/client/app/main/main.css
index 283a210..df57b09 100644
--- a/client/app/main/main.css
+++ b/client/app/main/main.css
@@ -1,18 +1,15 @@
.thing-form {
margin: 20px 0;
}
-
#banner {
border-bottom: none;
margin-top: -20px;
}
-
#banner h1 {
font-size: 60px;
line-height: 1;
letter-spacing: -1px;
}
-
.hero-unit {
position: relative;
padding: 30px 15px;
@@ -21,11 +18,9 @@
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
background: #4393B9;
}
-
#card-box {
- margin-top: 15px;
+ margin-top: 16px;
}
-
-md-card {
- margin-top: 15px;
+.eventListContainer {
+ height: 400px;
}
diff --git a/client/app/main/main.html b/client/app/main/main.html
index 1030a88..5a4f318 100644
--- a/client/app/main/main.html
+++ b/client/app/main/main.html
@@ -1,8 +1,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Waiting for location...
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No upcoming events in this series.
+
+
+
+
+
+About {{ tag.title }}
+{{ tag.description }}
++ {{ tag.title }} Events near you +
+
+
+ {{ event.title }}
+{{ event.start | date : 'medium' : event.timezone }}
++ Upcoming {{ tag.title }} Events +
+
+
+ {{ event.title }}
+{{ event.start | date : 'medium' : event.timezone }}
+
-
-
- {{tag.title}}
+
+
+ {{ tag.title }}
-
+
@@ -31,18 +31,18 @@
-
+
+
-
+
No upcoming events in this series.
@@ -50,8 +50,8 @@
-
@@ -59,11 +59,11 @@
-
diff --git a/client/app/main/main.js b/client/app/main/main.js
deleted file mode 100644
index 862d3a9..0000000
--- a/client/app/main/main.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-angular.module('fireflyApp')
- .config(function ($routeProvider) {
- $routeProvider
- .when('/', {
- templateUrl: 'app/main/main.html',
- controller: 'MainCtrl'
- });
- });
diff --git a/client/app/moments/moments.directive.js b/client/app/moments/moments.directive.js
index e4c1934..e48e66e 100644
--- a/client/app/moments/moments.directive.js
+++ b/client/app/moments/moments.directive.js
@@ -1,91 +1,87 @@
'use strict';
-angular.module('fireflyApp')
- .directive('timeTimezone', ['$http', function() {
- return {
- restrict: 'E',
- template: '{{formatDate}}',
- scope: {
- date: '=',
- timezone: '='
- },
- link: function(scope) {
+angular.module('fireflyApp').directive('timeTimezone', ['$http', function() {
+ return {
+ restrict: 'E',
+ template: '{{formatDate}}',
+ scope: {
+ date: '=',
+ timezone: '='
+ },
+ link: function(scope) {
- var update = function upd() {
- if (scope.timezone && scope.date) {
- scope.formatDate = moment(scope.date).tz(scope.timezone).format('llll');
- }
- };
+ var update = function upd() {
+ if (scope.timezone && scope.date) {
+ scope.formatDate = moment(scope.date).tz(scope.timezone).format('llll');
+ }
+ };
- scope.$watch('date', function() {
- update();
- });
+ scope.$watch('date', function() {
+ update();
+ });
- scope.$watch('timezone', function() {
- update();
- });
- }
- };
- }])
- .directive('timeAgo', ['$timeout', function($timeout) {
- return {
- restrict: 'E',
- template: '{{formatDate}}',
- scope: {
- date: '='
- },
- link: function(scope) {
- var promise = null;
+ scope.$watch('timezone', function() {
+ update();
+ });
+ }
+ };
+}]).directive('timeAgo', ['$timeout', function($timeout) {
+ return {
+ restrict: 'E',
+ template: '{{formatDate}}',
+ scope: {
+ date: '='
+ },
+ link: function(scope) {
+ var promise = null;
- var update = function() {
- if (scope.date) {
- scope.formatDate = moment(scope.date).fromNow();
- promise = $timeout(update, 60000, false);
- }
- };
+ var update = function() {
+ if (scope.date) {
+ scope.formatDate = moment(scope.date).fromNow();
+ promise = $timeout(update, 60000, false);
+ }
+ };
- scope.$watch('date', function() {
- if (promise) {
- $timeout.cancel(promise);
- }
- update();
- });
- }
- };
- }])
- .directive('localTime', [function() {
- return {
- restrict: 'E',
- template: '{{formatDate}}',
- scope: {
- date: '='
- },
- link: function(scope) {
- var update = function upd() {
- scope.formatDate = moment(scope.date).format('llll');
- };
+ scope.$watch('date', function() {
+ if (promise) {
+ $timeout.cancel(promise);
+ }
+ update();
+ });
+ }
+ };
+}]).directive('localTime', [function() {
+ return {
+ restrict: 'E',
+ template: '{{formatDate}}',
+ scope: {
+ date: '='
+ },
+ link: function(scope) {
+ var update = function upd() {
+ scope.formatDate = moment(scope.date).format('llll');
+ };
- scope.$watch('date', function() {
- update();
- });
- }
- };
- }])
- .directive('time', [function() {
- return {
- restrict: 'E',
- template: '{{formatDate}}',
- scope: {
- date: '='
- },
- link: function(scope) {
- var update = function upd() {
- scope.formatDate = moment(scope.date).utc().format('llll');
- };
+ scope.$watch('date', function() {
+ update();
+ });
+ }
+ };
+}]).directive('time', [function() {
+ return {
+ restrict: 'E',
+ template: '{{formatDate}}',
+ scope: {
+ date: '='
+ },
+ link: function(scope) {
+ var update = function upd() {
+ scope.formatDate = moment(scope.date).utc().format('llll');
+ };
- scope.$watch('date', function() {
- update();
- });
- }
- };
- }]);
+ scope.$watch('date', function() {
+ update();
+ });
+ }
+ };
+}]);
diff --git a/client/app/shorturl/shorturl.controller.spec.js b/client/app/shorturl/shorturl.controller.spec.js
deleted file mode 100644
index f853fa8..0000000
--- a/client/app/shorturl/shorturl.controller.spec.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-describe('Controller: ShorturlEventCtrl', function () {
- var ShorturlEventCtrl, scope;
-
- // load the controller's module
- //noinspection JSValidateTypes
- beforeEach(module('fireflyApp'));
-
- // Initialize the controller and a mock scope
- beforeEach(inject(function ($controller, $rootScope) {
- scope = $rootScope.$new();
- ShorturlEventCtrl = $controller('ShorturlEventCtrl', {
- $scope: scope
- });
- }));
-
- it('should ...', function () {
- expect(1).toEqual(1);
- });
-});
diff --git a/client/app/shorturl/shorturl.js b/client/app/shorturl/shorturl.js
deleted file mode 100644
index 6246a89..0000000
--- a/client/app/shorturl/shorturl.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-angular.module('fireflyApp')
- .config(function ($routeProvider) {
- $routeProvider
- .when('/:hash/analytics', {
- templateUrl: 'app/shorturl/shorturlAnalytics.html',
- controller: 'ShorturlAnalyticsCtrl',
- controllerAs: 'vm'
- })
- .when('/:hash/', {
- templateUrl: 'app/shorturl/shorturlEvent.html',
- controller: 'ShorturlEventCtrl',
- controllerAs: 'vm'
- });
- });
diff --git a/client/app/shorturl/shorturlAnalytics.controller.js b/client/app/shorturl/shorturlAnalytics.controller.js
deleted file mode 100644
index b50a1d0..0000000
--- a/client/app/shorturl/shorturlAnalytics.controller.js
+++ /dev/null
@@ -1,118 +0,0 @@
-'use strict';
-
-angular.module('fireflyApp')
- .controller('ShorturlAnalyticsCtrl', function ($http, $routeParams, config) {
- var vm = this;
-
- vm.referrers = {
- type: 'PieChart',
- options: {
- pieHole: 0.4
- },
- data: {
- 'cols': [
- {
- id: 't',
- label: 'Referrer',
- type: 'string'
- },
- {
- id: 's',
- label: 'Hits',
- type: 'number'
- }
- ],
- 'rows': []
- }
- };
-
- vm.browsers = {
- type: 'BarChart',
- options: {
- animation: {
- duration: 300
- },
- legend: {
- numberFormat: '#'
- }
- },
- data: {
- 'cols': [
- {id: 't', label: 'Browser', type: 'string'},
- {id: 's', label: 'Hits', type: 'number'}
- ],
- 'rows': []
- }
- };
-
- vm.countries = {
- type: 'GeoChart',
- options: {
- domain: 'IN'
- },
- data: {
- 'cols': [
- {id: 't', label: 'Country', type: 'string'},
- {id: 's', label: 'Hits', type: 'number'}
- ],
- 'rows': []
- }
- };
-
- vm.platforms = {
- type: 'BarChart',
- data: {
- 'cols': [
- {id: 't', label: 'Platform', type: 'string'},
- {id: 's', label: 'Hits', type: 'number'}
- ],
- 'rows': []
- }
- };
-
- $http.get('/api/shorturl/' + $routeParams.hash).success(function (data) {
- var i, j, k, l;
- vm.shorturl = data;
- vm.shorturlBase = 'http://' + config.DOMAIN + '/';
-
- for (i = 0; i < vm.shorturl.referrers.length; i++) {
- var ref = vm.shorturl.referrers[i];
- vm.referrers.data.rows.push({
- c: [
- {v: ref.name},
- {v: ref.hits}
- ]
- });
- }
-
- for (j = 0; j < vm.shorturl.browsers.length; j++) {
- var browser = vm.shorturl.browsers[j];
- vm.browsers.data.rows.push({
- c: [
- {v: browser.name},
- {v: browser.hits}
- ]
- });
- }
-
- for (k = 0; k < vm.shorturl.countries.length; k++) {
- var country = vm.shorturl.countries[k];
- vm.countries.data.rows.push({
- c: [
- {v: country.name},
- {v: country.hits}
- ]
- });
- }
-
- for (l = 0; l < vm.shorturl.platforms.length; l++) {
- var platform = vm.shorturl.platforms[l];
- vm.platforms.data.rows.push({
- c: [
- {v: platform.name},
- {v: platform.hits}
- ]
- });
- }
- });
- });
diff --git a/client/app/shorturl/shorturlAnalytics.html b/client/app/shorturl/shorturlAnalytics.html
deleted file mode 100644
index 026a2b8..0000000
--- a/client/app/shorturl/shorturlAnalytics.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
![]()
-
-
+
+
Visit Chapter Site
- - {{tag.title}} Events near you + {{ tag.title }} Events near you
-
{{ event.title }}
-{{event.start | date : 'medium' : event.timezone}}
+{{ ::event.title }}
+{{ ::event.start | date : 'medium' : event.timezone }}
{{ event.title }}
- Upcoming {{tag.title}} Events + Upcoming {{ tag.title }} Events
-
-
{{ event.title }}
-{{event.start | date : 'medium' : event.timezone}}
+{{ ::event.title }}
+{{ ::event.start | date : 'medium' : event.timezone }}
{{ event.title }}
About {{tag.title}}
-{{tag.description}}
+About {{ tag.title }}
+{{ tag.description }}
About {{tag.title}}
Popular topics
-
{{ key }}
-{{ value }} events
+{{ ::key }}
+{{ ::value }} events
-
diff --git a/client/app/shorturl/shorturlEvent.controller.js b/client/app/shorturl/shorturlEvent.controller.js
index c2596c0..5f7f0ae 100644
--- a/client/app/shorturl/shorturlEvent.controller.js
+++ b/client/app/shorturl/shorturlEvent.controller.js
@@ -1,15 +1,15 @@
'use strict';
angular.module('fireflyApp')
- .controller('ShorturlEventCtrl', function ($http, $routeParams, config, themeService) {
+ .controller('ShorturlEventCtrl', function ($http, $routeParams, $location, $log, config, themeService) {
var vm = this;
vm.convertHex = themeService.convertHex;
- $http.get('/api/shorturl/' + $routeParams.hash).success(function (data) {
- vm.shorturl = data;
- vm.gdgeventsshorturl = 'http://' + config.DOMAIN + '/' + data.hash;
- $http.jsonp(config.HUB_IP + 'api/v1/events/' +
- data.event_id + '?callback=JSON_CALLBACK').success(processEventData); // jshint ignore:line
+ $http.jsonp(config.HUB_IP + 'api/v1/events/' + $routeParams.hash + '?callback=JSON_CALLBACK')
+ .success(processEventData)
+ .catch(function() {
+ $log.warn('Event "' + $routeParams.hash + '" not found.');
+ $location.path('/');
});
function processEventData(eventData) {
diff --git a/client/app/shorturl/shorturlEvent.html b/client/app/shorturl/shorturlEvent.html
index a11173a..5f59367 100644
--- a/client/app/shorturl/shorturlEvent.html
+++ b/client/app/shorturl/shorturlEvent.html
@@ -10,43 +10,26 @@
-
- Source Event Link
-
-
- Alternate Event Link
-
-
- Link Resolution
-
-
- Link Resolution
-
-
- ![]()
-
-
-
-
-
- Total Hits: {{ vm.shorturl.hits }}
-
-
- Referrers
- -
-
- Countries
- -
-
- Browsers
- -
-
-Platforms
- -{{ vm.event.title }}
- event
- Hosted by
-
+ event Hosted by
{{ vm.chapter.name }}
-
-
-
-
-
-
-
+
Google+ event
-
+
Visit Event Site
-
- web
- Event site
-
-
- Short URL:
- {{ vm.gdgeventsshorturl }} -
+ - {{ vm.gdgeventsshorturl }} -
web Event site
-
+
diff --git a/client/index.html b/client/index.html
index 52312fb..2a24e37 100644
--- a/client/index.html
+++ b/client/index.html
@@ -23,7 +23,6 @@
-
@@ -94,17 +93,14 @@
-
+
+
+
-
-
-
-
-