diff --git a/Procfile b/Procfile index 434aa4a6c..64f020c5e 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,3 @@ -#web: bundle exec rails server puma -p $PORT +web: bundle exec rails server puma -p $PORT worker: bundle exec sidekiq -C ./config/sidekiq.yml webpack: bin/webpacker-dev-server diff --git a/app/frontend/src/javascript/controllers/events.js.erb b/app/frontend/src/javascript/controllers/events.js.erb index 16a3012b5..008c9a748 100644 --- a/app/frontend/src/javascript/controllers/events.js.erb +++ b/app/frontend/src/javascript/controllers/events.js.erb @@ -72,6 +72,7 @@ Application.Controllers.controller('EventsController', ['$scope', '$state', 'Eve // reinitialize results datasets $scope.page = 1; $scope.eventsGroupByMonth = {}; + $scope.featuredEevent = null; $scope.events = []; $scope.monthOrder = []; $scope.noMoreResults = false; @@ -111,13 +112,14 @@ Application.Controllers.controller('EventsController', ['$scope', '$state', 'Eve */ const groupEvents = function (events) { if (events.length > 0) { - const eventsGroupedByMonth = _.groupBy(events, function (obj) { + const eventsGroupedByMonth = _.groupBy(events.slice(1), function (obj) { return _.map(['month_id', 'year'], function (key) { return obj[key]; }); }); $scope.eventsGroupByMonth = Object.assign($scope.eventsGroupByMonth, eventsGroupedByMonth); - return $scope.monthOrder = Object.keys($scope.eventsGroupByMonth); + $scope.monthOrder = Object.keys($scope.eventsGroupByMonth); + $scope.featuredEevent = events[0]; } }; diff --git a/app/frontend/templates/events/index.html b/app/frontend/templates/events/index.html index 5b2f065f5..02b436682 100644 --- a/app/frontend/templates/events/index.html +++ b/app/frontend/templates/events/index.html @@ -40,9 +40,12 @@ -