From 8725eceec117751e6b21a9310b72a744bf451f10 Mon Sep 17 00:00:00 2001
From: lcsoftware <lcsoftware@126.com>
Date: Tue, 28 Jul 2015 23:19:56 +0800
Subject: [PATCH] auto

---
 .../user/controllers/login.controller.ng.js   | 24 ++++++++++++---
 .../controllers/register.controller.ng.js     | 30 +++++++++++++++++++
 client/user/user.routes.ng.js                 | 11 +++++--
 client/user/views/login.view.ng.html          | 27 +++++------------
 client/user/views/register.view.ng.html       | 28 +++++------------
 5 files changed, 73 insertions(+), 47 deletions(-)
 create mode 100644 client/user/controllers/register.controller.ng.js

diff --git a/client/user/controllers/login.controller.ng.js b/client/user/controllers/login.controller.ng.js
index 4d902db..3a8c33e 100644
--- a/client/user/controllers/login.controller.ng.js
+++ b/client/user/controllers/login.controller.ng.js
@@ -1,6 +1,22 @@
 'use strict'
 
-angular.module('workbaseApp').controller('LoginCtrl', ['$scope', function(
-  $scope) {
-  $scope.opLogin = true;
-}]);
+angular.module('workbaseApp').controller('LoginCtrl', ['$scope', '$meteor',
+  function(
+    $scope, $meteor) {
+    $scope.user = {
+      username: 'user01',
+      password: '123'
+    }
+
+    $scope.login = function(user) {
+      $meteor.loginWithPassword(user.username, user.password)
+        .then(function() {
+          console.log('login success');
+          console.log($scope.currentUser);
+        }, function(err) {
+          console.log(err);
+        });
+    }
+
+  }
+]);
diff --git a/client/user/controllers/register.controller.ng.js b/client/user/controllers/register.controller.ng.js
new file mode 100644
index 0000000..e0f30bf
--- /dev/null
+++ b/client/user/controllers/register.controller.ng.js
@@ -0,0 +1,30 @@
+'use strict'
+
+angular.module('workbaseApp').controller('RegisterCtrl', ['$scope', '$meteor',
+  function($scope, $meteor) {
+
+    $scope.user = {
+      username: 'user01',
+      password: '123',
+      confirmPwd: '123',
+      nick: 'nick01',
+      mobile: '13585513045'
+    }
+
+    $scope.createUser = function(user) {
+      $meteor.createUser({
+        username: user.username,
+        password: user.password,
+        profile: {
+          nick: user.nick,
+          mobile: user.mobile
+        }
+      }).then(function() {
+        console.log('register success');
+        console.log($scope.currentUser);
+      }, function(err) {
+        console.log('register error - ', err);
+      });
+    }
+  }
+]);
diff --git a/client/user/user.routes.ng.js b/client/user/user.routes.ng.js
index b44bd77..df02d84 100644
--- a/client/user/user.routes.ng.js
+++ b/client/user/user.routes.ng.js
@@ -5,17 +5,22 @@ angular.module('workbaseApp')
     $stateProvider
       .state('login', {
         url: '/login',
-        templateUrl: 'client/user/login.view.ng.html',
+        templateUrl: 'client/user/views/login.view.ng.html',
         controller: 'LoginCtrl'
       })
+      .state('register', {
+        url: '/register',
+        templateUrl: 'client/user/views/register.view.ng.html',
+        controller: 'RegisterCtrl'
+      })
       .state('changepwd', {
         url: '/change/password',
-        templateUrl: 'client/user/password.view.ng.html',
+        templateUrl: 'client/user/views/password.view.ng.html',
         controller: 'ChangePwdCtrl'
       })
       .state('findpwd', {
         url: '/find/password',
-        templateUrl: 'client/user/find.pwd.ng.html',
+        templateUrl: 'client/user/views/find.pwd.ng.html',
         controller: 'FindPwdCtrl'
       });
   });
diff --git a/client/user/views/login.view.ng.html b/client/user/views/login.view.ng.html
index 8ef095a..639f8ed 100644
--- a/client/user/views/login.view.ng.html
+++ b/client/user/views/login.view.ng.html
@@ -1,36 +1,23 @@
 <div class="col-md-3 col-md-offset-3">
-<form>
+<form ng-submit="login(user)">
   <div class="form-group">
-    <input type="text" class="form-control" ng-model="user.loginName" placeholder="用户名">
-  </div>
-  <div class="form-group" ng-hide="opLogin">
-    <input type="text" class="form-control" ng-model="user.mobile" placeholder="手机号码">
-  </div>
-  <div class="form-group" ng-hide="opLogin">
-    <input type="text" class="form-control" ng-model="user.nick" placeholder="昵称">
+    <input type="text" class="form-control" ng-model="user.username" placeholder="用户名">
   </div>
   <div class="form-group">
     <input type="password" class="form-control" ng-model="user.password" placeholder="密码">
     <!-- <p class="help-block">Example block-level help text here.</p> -->
   </div>
-  <div class="form-group" ng-hide="opLogin">
-    <input type="password" class="form-control" ng-model="confirPwd" placeholder="验证">
-  </div>
-  <div class="checkbox" ng-show="opLogin">
+  <div class="checkbox">
     <label>
       <input type="checkbox"> 自动登录
     </label>
   </div>
-  <div ng-show="opLogin">
+  <div>
     <button type="submit" class="btn btn-primary" style="margin-right:3em;">登  录</button>
-    <a style="cursor:pointer;" ng-click="opLogin=false">忘记密码</a>
-  </div>
-  <div ng-show="opLogin" class="pull-right">
-    我还没有创建 <a style="cursor:pointer;" ng-click="opLogin=false">创建新账户</a>
+    <a style="cursor:pointer;" ui-sref="findpwd">忘记密码</a>
   </div>
-  <div ng-hide="opLogin">
-    <button type="submit" class="btn btn-primary" style="margin-right:3em;">注    册</button>
-    我已经注册过账户 <a style="cursor:pointer;" ng-click="opLogin=true">请登录</a>
+  <div class="pull-right">
+    我还没有创建 <a style="cursor:pointer;" ui-sref="register">创建新账户</a>
   </div>
 </form>
 </div>
diff --git a/client/user/views/register.view.ng.html b/client/user/views/register.view.ng.html
index 8ef095a..7bc85fd 100644
--- a/client/user/views/register.view.ng.html
+++ b/client/user/views/register.view.ng.html
@@ -1,36 +1,24 @@
 <div class="col-md-3 col-md-offset-3">
-<form>
+<form ng-submit="createUser(user)">
   <div class="form-group">
-    <input type="text" class="form-control" ng-model="user.loginName" placeholder="用户名">
+    <input type="text" class="form-control" ng-model="user.username" placeholder="用户名">
   </div>
-  <div class="form-group" ng-hide="opLogin">
+  <div class="form-group">
     <input type="text" class="form-control" ng-model="user.mobile" placeholder="手机号码">
   </div>
-  <div class="form-group" ng-hide="opLogin">
+  <div class="form-group">
     <input type="text" class="form-control" ng-model="user.nick" placeholder="昵称">
   </div>
   <div class="form-group">
     <input type="password" class="form-control" ng-model="user.password" placeholder="密码">
     <!-- <p class="help-block">Example block-level help text here.</p> -->
   </div>
-  <div class="form-group" ng-hide="opLogin">
-    <input type="password" class="form-control" ng-model="confirPwd" placeholder="验证">
-  </div>
-  <div class="checkbox" ng-show="opLogin">
-    <label>
-      <input type="checkbox"> 自动登录
-    </label>
-  </div>
-  <div ng-show="opLogin">
-    <button type="submit" class="btn btn-primary" style="margin-right:3em;">登  录</button>
-    <a style="cursor:pointer;" ng-click="opLogin=false">忘记密码</a>
-  </div>
-  <div ng-show="opLogin" class="pull-right">
-    我还没有创建 <a style="cursor:pointer;" ng-click="opLogin=false">创建新账户</a>
+  <div class="form-group">
+    <input type="password" class="form-control" ng-model="user.confirmPwd" placeholder="验证">
   </div>
-  <div ng-hide="opLogin">
+  <div>
     <button type="submit" class="btn btn-primary" style="margin-right:3em;">注    册</button>
-    我已经注册过账户 <a style="cursor:pointer;" ng-click="opLogin=true">请登录</a>
+    我已经注册过账户 <a style="cursor:pointer;" ui-sref="login">请登录</a>
   </div>
 </form>
 </div>