diff --git a/src/app/components/article-box/article-box.directive.js b/src/app/components/article-box/article-box.directive.js index 39ef25c..ab924c9 100644 --- a/src/app/components/article-box/article-box.directive.js +++ b/src/app/components/article-box/article-box.directive.js @@ -59,7 +59,7 @@ ArticleBoxController.prototype.showPreview = function () { var vm = this; - vm.$state.go('programa', { + vm.$state.go('programa-conteudo', { slug: vm.article.slug }, { location: true diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html index b7b2063..2886004 100644 --- a/src/app/components/navbar/navbar.html +++ b/src/app/components/navbar/navbar.html @@ -16,9 +16,10 @@ diff --git a/src/app/index.route.js b/src/app/index.route.js index d1a15cf..a884637 100644 --- a/src/app/index.route.js +++ b/src/app/index.route.js @@ -45,30 +45,55 @@ 'footer': { templateUrl: 'app/pages/footer/footer.html' } } }) - .state('programa', { - url: '/programa/:slug', + .state('programas', { + url: '/programas', views: { 'header': { templateUrl: 'app/pages/header/header.html' }, 'main': { - templateUrl: 'app/pages/programas/programa.html', - controller: 'ProgramaPageController', + templateUrl: 'app/pages/programas/programas.html', + controller: 'ProgramasPageController', controllerAs: 'pagePrograma' }, 'footer': { templateUrl: 'app/pages/footer/footer.html' } } }) - .state('conheca-o-programa', { - url: '/programa/:slug/conheca-o-programa', + .state('programa-conteudo', { + url: '/programa/:slug', views: { 'header': { templateUrl: 'app/pages/header/header.html' }, 'main': { - templateUrl: 'app/pages/programas/conheca-o-programa.html', + templateUrl: 'app/pages/programas/programa.html', controller: 'ProgramaContentPageController', controllerAs: 'pageProgramaContent' }, 'footer': { templateUrl: 'app/pages/footer/footer.html' } } }) + .state('propostas', { + url: '/propostas', + views: { + 'header': { templateUrl: 'app/pages/header/header.html' }, + 'main': { + templateUrl: 'app/pages/propostas/propostas.html', + controller: 'PropostasPageController', + controllerAs: 'pagePropostas' + }, + 'footer': { templateUrl: 'app/pages/footer/footer.html' } + } + }) + .state('propostas-details', {}) + .state('duvidas', { + url: '/duvidas', + views: { + 'header': { templateUrl: 'app/pages/header/header.html' }, + 'main': { + templateUrl: 'app/pages/duvidas/duvidas.html', + controller: 'DuvidasPageController', + controllerAs: 'pageDuvidas' + }, + 'footer': { templateUrl: 'app/pages/footer/footer.html' } + } + }) .state('sobre', { url: '/sobre', views: { @@ -94,6 +119,14 @@ 'footer': { templateUrl: 'app/pages/footer/footer.html' } } }) + .state('mapa-do-site', { + url: '/mapa-do-site', + views: { + 'header': { templateUrl: 'app/pages/header/header.html' }, + 'main': { templateUrl: 'app/pages/sitemap/sitemap.html' }, + 'footer': { templateUrl: 'app/pages/footer/footer.html' } + } + }) ; $urlRouterProvider.otherwise('/'); diff --git a/src/app/pages/duvidas/duvidas.controller.js b/src/app/pages/duvidas/duvidas.controller.js new file mode 100644 index 0000000..447654f --- /dev/null +++ b/src/app/pages/duvidas/duvidas.controller.js @@ -0,0 +1,51 @@ +(function() { + 'use strict'; + + angular + .module('dialoga') + .controller('DuvidasPageController', DuvidasPageController); + + /** @ngInject */ + function DuvidasPageController(ArticleService, $state, $location, $scope, $rootScope, $log) { + $log.debug('DuvidasPageController'); + + var vm = this; + + vm.ArticleService = ArticleService; + vm.$state = $state; + vm.$location = $location; + vm.$scope = $scope; + vm.$rootScope = $rootScope; + vm.$log = $log; + + vm.init(); + } + + DuvidasPageController.prototype.init = function () { + var vm = this; + + var params = vm.$state.params; + var slug = params.slug; + + vm.article = null; + vm.categories = null; + vm.currentCategory = null; + vm.loading = true; + vm.error = false; + + vm.loadData(); + }; + + + DuvidasPageController.prototype.loadData = function () { + var vm = this; + + vm.ArticleService.getCategories(function(categories){ + vm.categories = categories; + }, function (error) { + vm.error = error; + vm.$log.error(error); + }); + + }; +})(); diff --git a/src/app/pages/duvidas/duvidas.html b/src/app/pages/duvidas/duvidas.html new file mode 100644 index 0000000..5ef88e2 --- /dev/null +++ b/src/app/pages/duvidas/duvidas.html @@ -0,0 +1,3 @@ +
+

TODO: Home > Dúvidas

+
diff --git a/src/app/pages/programas/conheca-o-programa.html b/src/app/pages/programas/conheca-o-programa.html deleted file mode 100644 index 3211396..0000000 --- a/src/app/pages/programas/conheca-o-programa.html +++ /dev/null @@ -1,31 +0,0 @@ -
-
- -
- -
- - -
- -
-
-
-
-
-
- -
-
diff --git a/src/app/pages/programas/programa.controller.js b/src/app/pages/programas/programa.controller.js index 3942908..16e925f 100644 --- a/src/app/pages/programas/programa.controller.js +++ b/src/app/pages/programas/programa.controller.js @@ -3,11 +3,11 @@ angular .module('dialoga') - .controller('ProgramaPageController', ProgramaPageController); + .controller('ProgramasPageController', ProgramasPageController); /** @ngInject */ - function ProgramaPageController(ArticleService, $state, $location, $scope, $rootScope, $log) { - $log.debug('ProgramaPageController'); + function ProgramasPageController(ArticleService, $state, $location, $scope, $rootScope, $log) { + $log.debug('ProgramasPageController'); var vm = this; @@ -21,7 +21,7 @@ vm.init(); } - ProgramaPageController.prototype.init = function () { + ProgramasPageController.prototype.init = function () { var vm = this; var params = vm.$state.params; @@ -33,6 +33,13 @@ vm.loading = true; vm.error = false; + vm.loadData(); + }; + + + ProgramasPageController.prototype.loadData = function () { + var vm = this; + vm.ArticleService.getCategories(function(categories){ vm.categories = categories; }, function (error) { @@ -40,29 +47,30 @@ vm.$log.error(error); }); - vm.ArticleService.getArticleBySlug(slug, function(article){ - vm.article = article; - vm.currentCategory = vm.article.categories[0]; + // vm.ArticleService.getArticleBySlug(slug, function(article){ + // vm.article = article; + // vm.currentCategory = vm.article.categories[0]; - // load proposals - // vm.ArticleService.getRandomProposal(program.id, function(proposal){ - // vm.article.proposal = proposal; - // }, function (error){ - // vm.$log.error(error); - // }); + // // load proposals + // // vm.ArticleService.getRandomProposal(program.id, function(proposal){ + // // vm.article.proposal = proposal; + // // }, function (error){ + // // vm.$log.error(error); + // // }); - // load events - // vm.ArticleService.getEvents(program.id, function(proposal){ - // vm.article.proposal = proposal; - // }, function (error){ - // vm.$log.error(error); - // }); + // // load events + // // vm.ArticleService.getEvents(program.id, function(proposal){ + // // vm.article.proposal = proposal; + // // }, function (error){ + // // vm.$log.error(error); + // // }); + + // }, function (error) { + // vm.error = error; + // vm.$log.error(error); + // vm.$log.info('Rollback to home page.'); + // vm.$state.go('inicio', {}, {location: true}); + // }); - }, function (error) { - vm.error = error; - vm.$log.error(error); - vm.$log.info('Rollback to home page.'); - vm.$state.go('inicio', {}, {location: true}); - }); }; })(); diff --git a/src/app/pages/programas/programa.html b/src/app/pages/programas/programa.html index 28f0389..3211396 100644 --- a/src/app/pages/programas/programa.html +++ b/src/app/pages/programas/programa.html @@ -1,15 +1,31 @@ -
- -
- +
+
+
-
- +
+ +
-
- +
+
+
+
+
+
+
- diff --git a/src/app/pages/programas/programas.html b/src/app/pages/programas/programas.html new file mode 100644 index 0000000..b732b48 --- /dev/null +++ b/src/app/pages/programas/programas.html @@ -0,0 +1,3 @@ +
+

TODO: Home > Programas

+
diff --git a/src/app/pages/propostas/propostas.controller.js b/src/app/pages/propostas/propostas.controller.js new file mode 100644 index 0000000..dc2d586 --- /dev/null +++ b/src/app/pages/propostas/propostas.controller.js @@ -0,0 +1,51 @@ +(function() { + 'use strict'; + + angular + .module('dialoga') + .controller('PropostasPageController', PropostasPageController); + + /** @ngInject */ + function PropostasPageController(ArticleService, $state, $location, $scope, $rootScope, $log) { + $log.debug('PropostasPageController'); + + var vm = this; + + vm.ArticleService = ArticleService; + vm.$state = $state; + vm.$location = $location; + vm.$scope = $scope; + vm.$rootScope = $rootScope; + vm.$log = $log; + + vm.init(); + } + + PropostasPageController.prototype.init = function () { + var vm = this; + + var params = vm.$state.params; + var slug = params.slug; + + vm.article = null; + vm.categories = null; + vm.currentCategory = null; + vm.loading = true; + vm.error = false; + + vm.loadData(); + }; + + + PropostasPageController.prototype.loadData = function () { + var vm = this; + + vm.ArticleService.getCategories(function(categories){ + vm.categories = categories; + }, function (error) { + vm.error = error; + vm.$log.error(error); + }); + + }; +})(); diff --git a/src/app/pages/propostas/propostas.html b/src/app/pages/propostas/propostas.html new file mode 100644 index 0000000..7a88b83 --- /dev/null +++ b/src/app/pages/propostas/propostas.html @@ -0,0 +1,3 @@ +
+

TODO: Home > Propostas

+
diff --git a/src/app/pages/sitemap/sitemap.html b/src/app/pages/sitemap/sitemap.html new file mode 100644 index 0000000..9ac8391 --- /dev/null +++ b/src/app/pages/sitemap/sitemap.html @@ -0,0 +1,34 @@ +
+
+
+
+
+

Mapa do site

+

+ Uma visão geral do conteúdo disponível no site. Mantenha o ponteiro do mouse sobre o item por alguns segundos para visualizar sua descrição. +

+ +
+
+
+
+
diff --git a/src/assets/images/icons/sprite.png b/src/assets/images/icons/sprite.png index 3769689..96ff543 100644 Binary files a/src/assets/images/icons/sprite.png and b/src/assets/images/icons/sprite.png differ -- libgit2 0.21.2