From d92c4f439e4819634d848ab1820d21b0fb5e3f82 Mon Sep 17 00:00:00 2001 From: Sourav Date: Wed, 22 Nov 2017 15:26:07 +0530 Subject: [PATCH 1/2] Issue #SB-919 feat:Create router for announcement --- src/app/private/index.ejs | 1 + .../scripts/routes/announcementRoute.js | 63 +++++++++++++++++++ src/app/private/scripts/routes/appRoute.js | 54 ---------------- 3 files changed, 64 insertions(+), 54 deletions(-) create mode 100644 src/app/private/scripts/routes/announcementRoute.js diff --git a/src/app/private/index.ejs b/src/app/private/index.ejs index 7b5031954dd..cba36426224 100644 --- a/src/app/private/index.ejs +++ b/src/app/private/index.ejs @@ -90,6 +90,7 @@ + diff --git a/src/app/private/scripts/routes/announcementRoute.js b/src/app/private/scripts/routes/announcementRoute.js new file mode 100644 index 00000000000..38c9efd2c5b --- /dev/null +++ b/src/app/private/scripts/routes/announcementRoute.js @@ -0,0 +1,63 @@ +'use strict' + +angular.module('playerApp') + .config(function ($stateProvider, $urlRouterProvider, $qProvider) { + $qProvider.errorOnUnhandledRejections(false) // To handle error rejection + $urlRouterProvider.deferIntercept() + $urlRouterProvider.otherwise('/home') + $stateProvider + .state('announcementOutbox', { + url: '/announcement/outbox', + views: { + mainView: { + templateUrl: '/views/announcement/announcementOutboxList.html', + controller: 'announcementOutboxListController as announcementOutboxData' + } + }, + onEnter: function ($stateParams, $rootScope, routeHelperService) { + $rootScope.profileActive = 'active' + $rootScope.courseActive = ' ' + $rootScope.isPlayerPage = true + routeHelperService.loadRouteConfig('announcementOutbox', null) + }, + onExit: function ($rootScope) { + $rootScope.profileActive = '' + } + }) + .state('announcementDetails', { + url: '/announcement/:announcementId', + views: { + mainView: { + templateUrl: '/views/announcement/announcementDetails.html', + controller: 'announcementDetailsController as announcementDetailsData' + } + }, + onEnter: function ($stateParams, $rootScope, routeHelperService) { + $rootScope.profileActive = 'active' + $rootScope.courseActive = ' ' + $rootScope.isPlayerPage = true + routeHelperService.loadRouteConfig('announcementDetails', null) + }, + onExit: function ($rootScope) { + $rootScope.profileActive = '' + } + }) + .state('announcementInbox', { + url: '/announcement/inbox', + views: { + mainView: { + templateUrl: '/views/announcement/announcementInboxList.html', + controller: 'announcementInboxListController as announcementInboxData' + } + }, + onEnter: function ($stateParams, $rootScope, routeHelperService) { + $rootScope.homeActive = 'active' + $rootScope.isPlayerPage = true + $rootScope.courseActive = ' ' + routeHelperService.loadRouteConfig('announcementInbox', null) + }, + onExit: function ($rootScope) { + $rootScope.homeActive = '' + } + }) + }) diff --git a/src/app/private/scripts/routes/appRoute.js b/src/app/private/scripts/routes/appRoute.js index 4525343c326..66c1f4a0d2d 100644 --- a/src/app/private/scripts/routes/appRoute.js +++ b/src/app/private/scripts/routes/appRoute.js @@ -758,60 +758,6 @@ angular.module('playerApp') $rootScope.profileActive = '' } }) - .state('announcementOutbox', { - url: '/announcement/outbox', - views: { - mainView: { - templateUrl: '/views/announcement/announcementOutboxList.html', - controller: 'announcementOutboxListController as announcementOutboxData' - } - }, - onEnter: function ($stateParams, $rootScope, routeHelperService) { - $rootScope.profileActive = 'active' - $rootScope.courseActive = ' ' - $rootScope.isPlayerPage = true - routeHelperService.loadRouteConfig('announcementOutbox', null) - }, - onExit: function ($rootScope) { - $rootScope.profileActive = '' - } - }) - .state('announcementDetails', { - url: '/announcement/:announcementId', - views: { - mainView: { - templateUrl: '/views/announcement/announcementDetails.html', - controller: 'announcementDetailsController as announcementDetailsData' - } - }, - onEnter: function ($stateParams, $rootScope, routeHelperService) { - $rootScope.profileActive = 'active' - $rootScope.courseActive = ' ' - $rootScope.isPlayerPage = true - routeHelperService.loadRouteConfig('announcementDetails', null) - }, - onExit: function ($rootScope) { - $rootScope.profileActive = '' - } - }) - .state('announcementInbox', { - url: '/announcement/inbox', - views: { - mainView: { - templateUrl: '/views/announcement/announcementInboxList.html', - controller: 'announcementInboxListController as announcementInboxData' - } - }, - onEnter: function ($stateParams, $rootScope, routeHelperService) { - $rootScope.homeActive = 'active' - $rootScope.isPlayerPage = true - $rootScope.courseActive = ' ' - routeHelperService.loadRouteConfig('announcementInbox', null) - }, - onExit: function ($rootScope) { - $rootScope.homeActive = '' - } - }) .state('WorkSpace.ContentBatch', { url: '/content/batches', views: { From eda10760e80651141bbce4cdaf3e9d4ee09e93cd Mon Sep 17 00:00:00 2001 From: Sourav Date: Wed, 22 Nov 2017 15:48:12 +0530 Subject: [PATCH 2/2] Issue #SB-919 feat:Create router for announcement --- src/gulp/paths.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gulp/paths.js b/src/gulp/paths.js index b4769d92f57..20de11fb00f 100644 --- a/src/gulp/paths.js +++ b/src/gulp/paths.js @@ -297,6 +297,7 @@ var paths = { 'dist/private/scripts/managers/eventManager.js', 'dist/private/scripts/app.js', 'dist/private/scripts/routes/appRoute.js', + 'dist/private/scripts/routes/announcementRoute.js', 'dist/private/script.min.js', 'dist/common/fonts/**', 'dist/common/images/**',