diff --git a/src/app/components/article-box/article-box.directive.js b/src/app/components/article-box/article-box.directive.js index 27ccf64..21e89b4 100644 --- a/src/app/components/article-box/article-box.directive.js +++ b/src/app/components/article-box/article-box.directive.js @@ -42,7 +42,7 @@ ArticleBoxController.prototype.showContent = function () { var vm = this; - vm.$state.go('programa-conteudo', { + vm.$state.go('programa', { slug: vm.article.slug }, { location: true diff --git a/src/app/components/proposal-box/proposal-box.directive.js b/src/app/components/proposal-box/proposal-box.directive.js index 8683553..dee3f71 100644 --- a/src/app/components/proposal-box/proposal-box.directive.js +++ b/src/app/components/proposal-box/proposal-box.directive.js @@ -31,7 +31,7 @@ ProposalBoxController.prototype.showContent = function (slug) { var vm = this; - vm.$state.go('programa-conteudo', { + vm.$state.go('programa', { slug: slug, proposal_id: vm.proposal.id }, { diff --git a/src/app/components/proposal-box/proposal-box.html b/src/app/components/proposal-box/proposal-box.html index aebe4a9..e75f177 100644 --- a/src/app/components/proposal-box/proposal-box.html +++ b/src/app/components/proposal-box/proposal-box.html @@ -1,6 +1,6 @@
-
{{::vm.category.name}}
+
{{::vm.category.name}}
{{::vm.topic.title}}
diff --git a/src/app/components/proposal-carousel/proposal-carousel.html b/src/app/components/proposal-carousel/proposal-carousel.html index ff7da6e..33f55b9 100644 --- a/src/app/components/proposal-carousel/proposal-carousel.html +++ b/src/app/components/proposal-carousel/proposal-carousel.html @@ -1,6 +1,6 @@
-
+
{{::($index+1)}}º Lugar diff --git a/src/app/components/proposal-list/proposal-list.directive.js b/src/app/components/proposal-list/proposal-list.directive.js index ea4ff58..2b94baf 100644 --- a/src/app/components/proposal-list/proposal-list.directive.js +++ b/src/app/components/proposal-list/proposal-list.directive.js @@ -105,7 +105,7 @@ ProposalListController.prototype.showContent = function (proposal) { var vm = this; - vm.$state.go('programa-conteudo', { + vm.$state.go('programa', { slug: proposal.parent.slug, proposal_id: proposal.id }, { diff --git a/src/app/components/show-message/show-message.html b/src/app/components/show-message/show-message.html index 5bb7b60..ad61880 100644 --- a/src/app/components/show-message/show-message.html +++ b/src/app/components/show-message/show-message.html @@ -1,17 +1,15 @@
-
-
- -
-
-
-
-

{{ ::vm.title }}

-
-
-
{{ ::vm.message }}
+
+
+ + +
+
+

{{ ::vm.title }}

+

{{ ::vm.message }}

+
diff --git a/src/app/components/show-message/show-message.scss b/src/app/components/show-message/show-message.scss index a4de68b..96b8c14 100644 --- a/src/app/components/show-message/show-message.scss +++ b/src/app/components/show-message/show-message.scss @@ -1,26 +1,25 @@ .show-message { - .message-border { - border-radius: 40px; - padding: 30px 7px; - width: 80px; - height: 80px; - display: inline-block; - } + .message-icon { + background-color: #ccc; + border-radius: 100%; + padding: 20px 7px; + width: 80px; + height: 80px; + display: inline-block; - .success { - background-color: #8AB34D; - } + font-size: 26px; - .error { - background-color: #C93E55; - } + &.alert { + background-color: #EEB453; + } - .div-center { - text-align: center; - } + &.success { + background-color: #8AB34D; + } - .div-mensagem { - margin-left: 30px; + &.error { + background-color: #C93E55; + } } } diff --git a/src/app/index.route.js b/src/app/index.route.js index 73756e3..e3a5c71 100644 --- a/src/app/index.route.js +++ b/src/app/index.route.js @@ -75,7 +75,7 @@ } }) .state('programas', { - url: '/programas?tema&filtro', + url: '/programas?tema&filtro&task', reloadOnSearch: false, ncyBreadcrumb: {label: 'Programas'}, views: { @@ -88,8 +88,8 @@ 'footer': { templateUrl: 'app/pages/footer/footer.html' } } }) - .state('programa-conteudo', { - url: '/programa/:slug?proposal_id', + .state('programa', { + url: '/programa/:slug?proposal_id&task', reloadOnSearch: false, ncyBreadcrumb: { label: '{{$parent.$root.contentTitle}}', diff --git a/src/app/index.scss b/src/app/index.scss index 0de1223..6e8be2d 100644 --- a/src/app/index.scss +++ b/src/app/index.scss @@ -246,7 +246,8 @@ body { .#{$category} { .color-theme-fg { color: $color; } .color-theme-bg { background-color: $color;} - .color-theme-bg-darker { background-color: darken($color, 10%);} + .color-theme-bg-complementar-1 { background-color: lighten($color, 10%);} + .color-theme-bg-complementar-2 { background-color: darken($color, 10%);} .contraste & .color-theme-fg { color: #fff; } .contraste & .color-theme-bg { background-color: #000;} @@ -256,6 +257,8 @@ body { $common-color: #5E739E; .color-theme-common-fg {color: $common-color; } .color-theme-common-bg {background-color: $common-color; } +.color-fg-white {color: #fff; } +.color-bg-gray {color: #ccc; } // Contraste .contraste { diff --git a/src/app/layout.scss b/src/app/layout.scss index e98b45d..09ce12d 100644 --- a/src/app/layout.scss +++ b/src/app/layout.scss @@ -123,6 +123,12 @@ margin-left: -2px; } +.text-center-sm { + @media screen and (max-width: $screen-sm) { + text-align: center; + } +} + .btn-submit { background-color: $defaultblue; color: #fff; diff --git a/src/app/pages/auth/auth.controller.js b/src/app/pages/auth/auth.controller.js index 18a3064..a0b92e4 100644 --- a/src/app/pages/auth/auth.controller.js +++ b/src/app/pages/auth/auth.controller.js @@ -6,13 +6,14 @@ .controller('AuthPageController', AuthPageController); /** @ngInject */ - function AuthPageController($scope, $rootScope, $location, $state, AUTH_EVENTS, AuthService, DialogaService, Session, $log) { + function AuthPageController($scope, $rootScope, $location, $state, $timeout, AUTH_EVENTS, AuthService, DialogaService, Session, $log) { var vm = this; vm.$scope = $scope; vm.$rootScope = $rootScope; vm.$location = $location; vm.$state = $state; + vm.$timeout = $timeout; vm.AUTH_EVENTS = AUTH_EVENTS; vm.AuthService = AuthService; vm.DialogaService = DialogaService; @@ -33,11 +34,14 @@ vm.singup = {}; vm.terms = null; vm.loadingTerms = null; + vm.delay = 3; // segundos + vm.startRedirect = null; vm.search = vm.$location.search(); var redirect = vm.search.redirect_uri || ''; if(redirect && redirect.length > 0){ vm.params = JSON.parse('{"' + decodeURI(redirect).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}'); + vm.hasRedirect = true; } // attach events @@ -86,8 +90,11 @@ // 'Cadastro efetuado com sucesso.' // 'Verifique seu email para confirmar o cadastro.' - // TODO: show messagens and redirect timeout - vm.redirectBack(); + vm.startRedirect = true; + vm.$timeout(function(){ + vm.redirectBack(); + vm.startRedirect = false; + }, vm.delay * 1000); }, function(response){ vm.$log.debug('register error.response', response); @@ -102,7 +109,12 @@ vm.AuthService.login(credentials).then(function(user) { // handle view vm.$log.debug('user', user); - vm.redirectBack(); + + vm.startRedirect = true; + vm.$timeout(function(){ + vm.redirectBack(); + vm.startRedirect = false; + }, vm.delay * 1000); }, function() { // handle view }); @@ -111,10 +123,11 @@ AuthPageController.prototype.redirectBack = function(){ var vm = this; - if(!vm.params){ + if(!vm.hasRedirect){ vm.$log.warn('No redirect params defined.'); return; } + var state = vm.params.state; switch(state){ case 'inicio': @@ -123,6 +136,15 @@ task: vm.params.task }); break; + case 'programa': + vm.$state.go(state, { + slug: vm.params.slug, + task: vm.params.task + }); + break; + default: + vm.$log.debug('State not handled yet:', state); + break; } } diff --git a/src/app/pages/auth/signin.html b/src/app/pages/auth/signin.html index f729842..e04925d 100644 --- a/src/app/pages/auth/signin.html +++ b/src/app/pages/auth/signin.html @@ -11,8 +11,14 @@
-

Você está logado!

- + +
+

Você está logado!

+
+ Você será redirecionado em menos de 3 segundos.... +
+ +
diff --git a/src/app/pages/mapa-do-site/mapa-do-site.html b/src/app/pages/mapa-do-site/mapa-do-site.html index 322ba45..26376fd 100644 --- a/src/app/pages/mapa-do-site/mapa-do-site.html +++ b/src/app/pages/mapa-do-site/mapa-do-site.html @@ -24,7 +24,7 @@ {{theme.name}} diff --git a/src/app/pages/programas/programa.controller.js b/src/app/pages/programas/programa.controller.js index 6bd041c..93f8294 100644 --- a/src/app/pages/programas/programa.controller.js +++ b/src/app/pages/programas/programa.controller.js @@ -31,6 +31,7 @@ vm.article = null; vm.category = null; + vm.sendProposalRedirectURI = null; vm.search = vm.$location.search(); vm.error = false; @@ -53,6 +54,7 @@ vm.DialogaService.getProgramBySlug(slug, function(article) { vm.article = article; vm.category = vm.article.categories[0]; + vm.sendProposalRedirectURI = 'state=programa&task=send-proposal&slug=' + slug; // update the breadcrumb vm.$rootScope.contentTitle = vm.article.title; diff --git a/src/app/pages/programas/programa.html b/src/app/pages/programas/programa.html index 0cd0f3f..75cd19f 100644 --- a/src/app/pages/programas/programa.html +++ b/src/app/pages/programas/programa.html @@ -97,13 +97,28 @@ -- libgit2 0.21.2