javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 06:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Toderp signup and nav controller fixes

Browse Source
This commit is contained in:
Max Lynch
2013-10-04 13:31:16 -05:00
parent 065063fc70
commit b12c93f087
8 changed files with 194 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
example/toderp2/css/app.css
View File

@ -18,3 +18,11 @@
}
#splash-view .ionic-logo {
}
#signup-bottom {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
text-align: center;
}

73
example/toderp2/index.html
View File

@ -32,27 +32,82 @@
<!-- The root view controller -->
<nav-ctrl ng-controller="TodoCtrl">
<nav-bar></nav-bar>
</nav-ctrl>
<!-- Splash -->
<script id="splash.html" type="text/ng-template">
<div id="splash-view" class="view fade-in" nav-content>
<div id="splash-view" class="view fade-in" nav-content nav-bar="false">
<img src="img/ionic.png" class="ionic-logo">
</div>
</script>
<!-- Login -->
<script id="login.html" type="text/ng-template">
<div id="login-view" class="view" nav-content ng-controller="LoginCtrl">
<h1>Login</h1>
</div>
</script>
<!-- Signup -->
<script id="signup.html" type="text/ng-template">
<div id="signup-view" class="view" nav-content ng-controller="SignupCtrl"></div>
<div title="Sign up" id="signup-view" class="view" nav-content ng-controller="SignupCtrl"></div>
<main class="content">
<form class="form-horizontal" ng-submit="trySignup(signupForm)">
<div class="container" style="text-align: center">
<h1>Toderp</h1>
<h4>What do you need to derp?</h4>
</div>
<div class="input-group">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Full name</span>
<input class="col-xs-8" type="text" placeholder="" ng-model="signupForm.name">
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">Email</span>
<input class="col-xs-8" type="email" placeholder="" ng-model="signupForm.email">
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">Password</span>
<input class="col-xs-8" type="password" placeholder="" ng-model="signupForm.password">
</label>
</div>
<div class="input-group">
<button class="button button-primary button-block">Get derp'n</button>
<div id="signup-error" ng-show="signupError">Unable to signup, please try again.</div>
</div>
</form>
<div id="signup-bottom">
<h3>Already have an account?</h3>
<button class="button button-clear button-block">Sign in</button>
</div>
</main>
</div>
</script>
<!-- Login -->
<script id="login.html" type="text/ng-template">
<div title="Login" id="login-view" class="view" nav-content ng-controller="LoginCtrl">
<main class="content padded">
<form class="form-horizontal" ng-submit="tryLogin(loginForm)">
<div class="input-group inset">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Full name</span>
<input class="col-xs-8" type="text" placeholder="" ng-model="loginForm.name">
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">Email</span>
<input class="col-xs-8" type="email" placeholder="" ng-model="loginForm.email">
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">Password</span>
<input class="col-xs-8" type="password" placeholder="" ng-model="loginForm.password">
</label>
</div>
<div class="input-group inset">
<button class="button button-primary button-block">Log in</button>
<div id="login-error" ng-show="loginError">Invalid email/password. Please try again.</div>
</div>
</form>
<button ng-click="showSignup()" id="signup-button" class="button button-default button-block">Create an account</button>
</main>
</div>
</script>
<!-- Tasks -->
<script id="tasks.html" type="text/ng-template">
<side-menu-ctrl id="tasks-view" nav-content class="view" ng-controller="TasksCtrl">

17
example/toderp2/js/controllers.js
View File

@ -5,22 +5,21 @@ angular.module('ionic.todo.controllers', ['ionic.todo', 'firebase'])
$scope.candy = 'yes';
$scope.navController.pushFromTemplate('splash.html');
//$scope.navController.pushFromTemplate('login.html');
//$scope.navController.pushFromTemplate('signup.html');
//$scope.navController.pushFromTemplate('tasks.html');
console.log($scope);
$rootScope.$on('angularFireAuth:login', function(evt, user) {
$scope.display.screen = 'tasks';
$scope.navController.pushFromTemplate('tasks.html');
});
$rootScope.$on('angularFireAuth:logout', function(evt, user) {
console.log('Logged out!', evt, user);
$scope.navController.pushFromTemplate('signup.html');
});
$rootScope.$on('angularFireAuth:error', function(evt, err) {
console.log('Login Error!', evt, err);
$scope.navController.pushFromTemplate('signup.html');
});
})
.controller('SplashCtrl', function($scope) {
})
// The login form controller
.controller('LoginCtrl', function($scope, AuthService) {
console.log('Created login Ctrl');
@ -30,6 +29,10 @@ angular.module('ionic.todo.controllers', ['ionic.todo', 'firebase'])
password: 'test'
};
$scope.showSignup = function() {
$scope.navController.pushFromTemplate('signup.html');
};
$scope.tryLogin = function(data) {
$scope.loginError = false;
AuthService.login(data.email, data.password)