From 4dfe41a71add0d25e399925539e9fb1efb0e5609 Mon Sep 17 00:00:00 2001 From: Leonardo Merlin Date: Wed, 12 Aug 2015 16:00:43 -0300 Subject: [PATCH] Small improvements --- src/app/components/auth/auth.service.js | 2 +- src/app/components/programa/programa.directive.js | 4 ++-- src/app/index.constants.js | 4 ++-- src/app/index.route.js | 22 +++++++++++++++++----- src/app/index.scss | 8 ++++++++ 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/app/components/auth/auth.service.js b/src/app/components/auth/auth.service.js index e06236a..65e0cf8 100644 --- a/src/app/components/auth/auth.service.js +++ b/src/app/components/auth/auth.service.js @@ -21,7 +21,7 @@ return service; function login (credentials) { - var url = api.host + 'login'; + var url = api.host + '/api/v1/login'; var encodedData = 'login=' + credentials.username + '&password=' + credentials.password; return $http diff --git a/src/app/components/programa/programa.directive.js b/src/app/components/programa/programa.directive.js index 1240295..c3bf44b 100644 --- a/src/app/components/programa/programa.directive.js +++ b/src/app/components/programa/programa.directive.js @@ -6,7 +6,7 @@ .directive('programaBox', programaBox); /** @ngInject */ - function programaBox() { + function programaBox(api) { /** @ngInject */ function ProgramaController($log) { @@ -37,7 +37,7 @@ ProgramaController.prototype.getImageUrl = function () { var vm = this; - return 'http://login.dialoga.gov.br/' + vm.program.image.url; + return api.host + vm.program.image.url; }; ProgramaController.prototype.getImageAlt = function () { diff --git a/src/app/index.constants.js b/src/app/index.constants.js index dd1f7f7..1ae6f1d 100644 --- a/src/app/index.constants.js +++ b/src/app/index.constants.js @@ -6,8 +6,8 @@ .module('dialoga') .constant('api', { token: null, - // host: 'http://login.dialoga.gov.br/api/v1/', - host: 'http://www.participa.br/api/v1/', + host: 'http://hom.login.dialoga.gov.br', + // host: 'http://www.participa.br', articleId: { home: 103358 } diff --git a/src/app/index.route.js b/src/app/index.route.js index 9f9a2b0..2602be8 100644 --- a/src/app/index.route.js +++ b/src/app/index.route.js @@ -20,14 +20,26 @@ 'footer': { templateUrl: 'app/partials/footer/footer.html' } } }) - .state('login', { - url: '/login', + .state('entrar', { + url: '/entrar', views: { 'header': { templateUrl: 'app/partials/header/header.html' }, 'main': { - templateUrl: 'app/partials/login/login.html', - controller: 'LoginController', - controllerAs: 'login' + templateUrl: 'app/partials/auth/signin.html', + controller: 'AuthController', + controllerAs: 'signin' + }, + 'footer': { templateUrl: 'app/partials/footer/footer.html' } + } + }) + .state('cadastrar', { + url: '/cadastrar', + views: { + 'header': { templateUrl: 'app/partials/header/header.html' }, + 'main': { + templateUrl: 'app/partials/auth/signup.html', + controller: 'AuthController', + controllerAs: 'signup' }, 'footer': { templateUrl: 'app/partials/footer/footer.html' } } diff --git a/src/app/index.scss b/src/app/index.scss index af1b088..77b716e 100644 --- a/src/app/index.scss +++ b/src/app/index.scss @@ -12,6 +12,14 @@ $icon-font-path: "../../bower_components/bootstrap-sass-official/assets/fonts/bo // bower:scss // endbower +// ------------- +// Variables +// ------------- + +$gray: #f1f1f1; + +// ------------- + .skip-links a:focus { background-color: #fff !important; opacity: 1; -- libgit2 0.21.2