From 4b3caa22de684f04365b6efde1d500360ca433b1 2016-10-06 16:19:12 From: Marcin Lulek Date: 2016-10-06 16:19:12 Subject: [PATCH] event browser: turn into component --- diff --git a/frontend/src/app.js b/frontend/src/app.js index b851f71..631cb77 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -45,6 +45,7 @@ angular.module('appenlight.components', [ 'appenlight.components.appenlightHeader', 'appenlight.components.indexDashboardView', 'appenlight.components.logsBrowserView', + 'appenlight.components.eventBrowserView' ]); angular.module('appenlight.directives', [ 'appenlight.directives.c3chart', diff --git a/frontend/src/templates/events.html b/frontend/src/components/views/event-browser/event-browser.html similarity index 95% rename from frontend/src/templates/events.html rename to frontend/src/components/views/event-browser/event-browser.html index af72c4c..4ce38b1 100644 --- a/frontend/src/templates/events.html +++ b/frontend/src/components/views/event-browser/event-browser.html @@ -4,7 +4,7 @@

Event history

- +
@@ -30,7 +30,7 @@ diff --git a/frontend/src/controllers/events.js b/frontend/src/components/views/event-browser/event-browser.js similarity index 83% rename from frontend/src/controllers/events.js rename to frontend/src/components/views/event-browser/event-browser.js index 3be82a5..10bd80e 100644 --- a/frontend/src/controllers/events.js +++ b/frontend/src/components/views/event-browser/event-browser.js @@ -17,12 +17,16 @@ // # services, and proprietary license terms, please see // # https://rhodecode.com/licenses/ -angular.module('appenlight.controllers').controller('EventsController', EventsController); +angular.module('appenlight.components.eventBrowserView', []) + .component('eventBrowserView', { + templateUrl: 'components/views/event-browser/event-browser.html', + controller: EventBrowserController + }); -EventsController.$inject = ['eventsNoIdResource', 'eventsResource']; +EventBrowserController.$inject = ['eventsNoIdResource', 'eventsResource']; -function EventsController(eventsNoIdResource, eventsResource) { - console.info('EventsController'); +function EventBrowserController(eventsNoIdResource, eventsResource) { + console.info('EventBrowserController'); var vm = this; vm.loading = {events: true}; diff --git a/frontend/src/routes.js b/frontend/src/routes.js index f480cb9..89dad5d 100644 --- a/frontend/src/routes.js +++ b/frontend/src/routes.js @@ -61,8 +61,7 @@ angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun }); $stateProvider.state('events', { url: '/ui/events', - templateUrl: 'templates/events.html', - controller: 'EventsController as events' + component: 'eventBrowserView' }); $stateProvider.state('admin', { url: '/ui/admin',