Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #SB-919 feat:Create router for announcement #102

Merged
merged 3 commits into from
Nov 22, 2017
Merged

Issue #SB-919 feat:Create router for announcement #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d92c4f4
Issue #SB-919 feat:Create router for announcement
souravdey091 Nov 22, 2017
49ab740
Issue #SB-919 chore:Merge remote-tracking branch 'upstream/release-1.…
souravdey091 Nov 22, 2017
eda1076
Issue #SB-919 feat:Create router for announcement
souravdey091 Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app/private/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
<script src="scripts/managers/eventManager.js"></script>
<script src="scripts/app.js"></script>
<script src="scripts/routes/appRoute.js"></script>
<script src="scripts/routes/announcementRoute.js"></script>
<script src="scripts/factories/sessionFactory.js"></script>
<script src="scripts/services/httpService.js"></script>
<script src="scripts/services/httpServiceJava.js"></script>
Expand Down
63 changes: 63 additions & 0 deletions src/app/private/scripts/routes/announcementRoute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = ''
}
})
})
54 changes: 0 additions & 54 deletions src/app/private/scripts/routes/appRoute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
1 change: 1 addition & 0 deletions src/gulp/paths.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/**',
Expand Down