From bcbd8f3771d0aac1d33fd51bea10e3487d6e2500 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 23 Jun 2014 10:31:52 +0200 Subject: [PATCH] Adding dummy login --- app/coffee/app.coffee | 7 +++---- app/coffee/modules/auth.coffee | 23 +++++++++++++++++++---- app/partials/login.jade | 11 +++++++++++ 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 app/partials/login.jade diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index 0d61fa61..463532fb 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -22,7 +22,9 @@ @taiga = taiga = {} configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $compileProvider, $gmUrlsProvider) -> - $routeProvider.when('/project/:pslug/backlog', {templateUrl: '/partials/backlog.html'}) + $routeProvider.when("/project/:pslug/backlog", {templateUrl: "/partials/backlog.html"}) + $routeProvider.when("/login", {templateUrl: "/partials/login.html"}) + $routeProvider.otherwise({redirectTo: '/login'}) $locationProvider.html5Mode(true); @@ -80,6 +82,3 @@ angular.module("taigaLocalConfig", []).value("localconfig", {}) module = angular.module("taiga", modules) module.config(configure) module.run(init) - - - diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee index 64b3be9e..51cf0989 100644 --- a/app/coffee/modules/auth.coffee +++ b/app/coffee/modules/auth.coffee @@ -22,9 +22,9 @@ taiga = @.taiga class AuthService extends taiga.Service - @.$inject = ["$rootScope", "$tgStorage", "$tgModel", "$tgHttp"] + @.$inject = ["$rootScope", "$tgStorage", "$tgModel", "$tgHttp", "$tgUrls"] - constructor: (@rootscope, @storage, @model, @http) -> + constructor: (@rootscope, @storage, @model, @http, @urls) -> super() getUser: -> @@ -60,11 +60,12 @@ class AuthService extends taiga.Service data = { username: username password: password + type: "normal" } return @http.post(url, data).then (data, status) => - user = @model.make_model("users", data) - @.setToken(data["auth_token"]) + user = @model.make_model("users", data.data) + @.setToken(user.auth_token) @.setUser(user) return user @@ -73,5 +74,19 @@ class AuthService extends taiga.Service return true return false + +class AuthController extends taiga.Controller + @.$inject = ["$scope", "$tgAuth", "$location"] + + constructor: (@scope, @auth, @location) -> + @scope.form = {username: "", password: ""} + + submit: -> + @auth.login(@scope.form.username, @scope.form.password).then (user) => + #TODO: fix this + @location.path("/project/project-example-0/backlog") + + module = angular.module("taigaAuth", ["taigaResources"]) module.service("$tgAuth", AuthService) +module.controller("AuthController", AuthController) diff --git a/app/partials/login.jade b/app/partials/login.jade new file mode 100644 index 00000000..201e3dda --- /dev/null +++ b/app/partials/login.jade @@ -0,0 +1,11 @@ +extends dummy-layout + +block head + title Taiga Project management web application with scrum in mind! + +block content + div.wrapper(ng-controller="AuthController as ctrl") + form(ng-submit="ctrl.submit()") + input(type="text", name="username", ng-model="form.username", placeholder="User name") + input(type="password", name="password", ng-model="form.password", placeholder="Password") + input(type="submit", value="Submit")