diff --git a/src/app/partials/article/article.service.js b/src/app/partials/article/article.service.js index 31d113d..b6d76a1 100644 --- a/src/app/partials/article/article.service.js +++ b/src/app/partials/article/article.service.js @@ -13,7 +13,7 @@ var _savedAbstract = null; var service = { - apiArticles: api.host + 'articles/', + apiArticles: api.host + '/api/v1/articles/', getHome: getHome, setHomeAbstract: setHomeAbstract, getHomeAbstract: getHomeAbstract diff --git a/src/app/partials/auth/auth.controller.js b/src/app/partials/auth/auth.controller.js new file mode 100644 index 0000000..5f00990 --- /dev/null +++ b/src/app/partials/auth/auth.controller.js @@ -0,0 +1,44 @@ +(function() { + 'use strict'; + + angular + .module('dialoga') + .controller('AuthController', AuthController); + + /** @ngInject */ + function AuthController($rootScope, AUTH_EVENTS, AuthService, Session, $log) { + $log.debug('AuthController'); + + var vm = this; + + vm.$rootScope = $rootScope; + vm.AUTH_EVENTS = AUTH_EVENTS; + vm.AuthService = AuthService; + vm.Session = Session; + vm.$log = $log; + + vm.init(); + } + + AuthController.prototype.init = function() { + var vm = this; + + // init variables + vm.credentials = {}; + + // attach events + + // ... + }; + + AuthController.prototype.login = function(credentials) { + var vm = this; + + vm.AuthService.login(credentials).then(function(user) { + // handle view + }, function() { + // handle view + }); + }; + +})(); diff --git a/src/app/partials/auth/auth.scss b/src/app/partials/auth/auth.scss new file mode 100644 index 0000000..a94f011 --- /dev/null +++ b/src/app/partials/auth/auth.scss @@ -0,0 +1,44 @@ +.btn-social { + color: #fff; + font-weight: bold; + + &:hover, + &:focus {color: #fff;} + + &.btn-facebook { + background-color: #33477a; + &:hover, + &:focus {background-color: #304373; } + &:active {background-color: #33477a; } + } + &.btn-google-plus { + background-color: #b92d25; + &:hover, + &:focus {background-color: #b12b23; } + &:active {background-color: #b92d25; } + } +} + +.glyphicon { + &.icon-white { + fill: white; + } +} + +.separator-or { + border-top: 2px solid #d8d8d8; + text-align: center; + font-weight: bold; + + &:after { + content: "ou"; + position: absolute; + top: 4px; + left: 50%; + margin-left: -26px; + font-size: 30px; + line-height: 30px; + padding: 0 0.25em; + background: $gray; + } +} diff --git a/src/app/partials/auth/signin.html b/src/app/partials/auth/signin.html new file mode 100644 index 0000000..f11d5de --- /dev/null +++ b/src/app/partials/auth/signin.html @@ -0,0 +1,38 @@ +
+
+
+
+

Identifique-se

+
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
diff --git a/src/app/partials/auth/signup.html b/src/app/partials/auth/signup.html new file mode 100644 index 0000000..3141a37 --- /dev/null +++ b/src/app/partials/auth/signup.html @@ -0,0 +1,54 @@ +
+
+
+
+

Cadastro

+

Cadastre-se para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!

+
+
+
+
+
+
+
+
+

Conecte-se por redes sociais

+
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+

Faça o cadastro abaixo

+
+
+
+
diff --git a/src/app/partials/header/header.html b/src/app/partials/header/header.html index 10d1929..627cc68 100644 --- a/src/app/partials/header/header.html +++ b/src/app/partials/header/header.html @@ -6,7 +6,7 @@ Alto Contraste - diff --git a/src/app/partials/inicio/inicio.scss b/src/app/partials/inicio/inicio.scss index 7edb768..11ef19a 100644 --- a/src/app/partials/inicio/inicio.scss +++ b/src/app/partials/inicio/inicio.scss @@ -1,5 +1,3 @@ -$gray: #f1f1f1; - .section-gray { background-color: $gray; } diff --git a/src/app/partials/login/login.controller.js b/src/app/partials/login/login.controller.js deleted file mode 100644 index a4cbf99..0000000 --- a/src/app/partials/login/login.controller.js +++ /dev/null @@ -1,44 +0,0 @@ -(function() { - 'use strict'; - - angular - .module('dialoga') - .controller('LoginController', LoginController); - - /** @ngInject */ - function LoginController($rootScope, AUTH_EVENTS, AuthService, Session, $log) { - $log.debug('LoginController'); - - var vm = this; - - vm.$rootScope = $rootScope; - vm.AUTH_EVENTS = AUTH_EVENTS; - vm.AuthService = AuthService; - vm.Session = Session; - vm.$log = $log; - - vm.init(); - } - - LoginController.prototype.init = function() { - var vm = this; - - // init variables - vm.credentials = {}; - - // attach events - - // ... - }; - - LoginController.prototype.login = function(credentials) { - var vm = this; - - vm.AuthService.login(credentials).then(function(user) { - // handle view - }, function() { - // handle view - }); - }; - -})(); diff --git a/src/app/partials/login/login.html b/src/app/partials/login/login.html deleted file mode 100644 index 5dc6055..0000000 --- a/src/app/partials/login/login.html +++ /dev/null @@ -1,27 +0,0 @@ -
-
-
-
-
-
- -
-
- -
-
-
- -
-
- -
-
-
- -
-
-
-
-
-
diff --git a/src/app/partials/login/login.scss b/src/app/partials/login/login.scss deleted file mode 100644 index a94f011..0000000 --- a/src/app/partials/login/login.scss +++ /dev/null @@ -1,44 +0,0 @@ -.btn-social { - color: #fff; - font-weight: bold; - - &:hover, - &:focus {color: #fff;} - - &.btn-facebook { - background-color: #33477a; - &:hover, - &:focus {background-color: #304373; } - &:active {background-color: #33477a; } - } - &.btn-google-plus { - background-color: #b92d25; - &:hover, - &:focus {background-color: #b12b23; } - &:active {background-color: #b92d25; } - } -} - -.glyphicon { - &.icon-white { - fill: white; - } -} - -.separator-or { - border-top: 2px solid #d8d8d8; - text-align: center; - font-weight: bold; - - &:after { - content: "ou"; - position: absolute; - top: 4px; - left: 50%; - margin-left: -26px; - font-size: 30px; - line-height: 30px; - padding: 0 0.25em; - background: $gray; - } -} diff --git a/src/app/partials/login/signup.html b/src/app/partials/login/signup.html deleted file mode 100644 index 3141a37..0000000 --- a/src/app/partials/login/signup.html +++ /dev/null @@ -1,54 +0,0 @@ -
-
-
-
-

Cadastro

-

Cadastre-se para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!

-
-
-
-
-
-
-
-
-

Conecte-se por redes sociais

-
- -
-
- -
-
-
-
-
-
-
-
-
-
-

Faça o cadastro abaixo

-
-
-
-
-- libgit2 0.21.2