Working modal stuff

This commit is contained in:
Max Lynch
2013-10-04 17:47:54 -05:00
parent e8d76af832
commit c338f75882
12 changed files with 214 additions and 95 deletions

View File

@@ -28,7 +28,7 @@
#splash-view, #signup-view {
background: url('../img/splash.png') no-repeat transparent;
background-size: contain;
background-size: cover;
}
#signup-bottom {

View File

@@ -38,7 +38,6 @@
<!-- Splash -->
<script id="splash.html" type="text/ng-template">
<div id="splash-view" class="view fade-in" nav-content nav-bar="false">
<img src="img/logo.svg" class="ionic-logo">
</div>
</script>
@@ -52,26 +51,26 @@
</div>
<div class="input-group">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Full name</span>
<span class="input-label col-xs-3">Full name</span>
<input class="col-xs-8" type="text" placeholder="" ng-model="signupForm.name" required>
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">Email</span>
<span class="input-label col-xs-3">Email</span>
<input class="col-xs-8" type="email" placeholder="" ng-model="signupForm.email" required>
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">Password</span>
<span class="input-label col-xs-3">Password</span>
<input class="col-xs-8" type="password" placeholder="" ng-model="signupForm.password" required>
</label>
</div>
<div class="input-group">
<button type="submit" class="button button-primary button-block">Get derp</button>
<button type="submit" 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>
<button ng-click="showLogin()" class="button button-clear button-block">Sign in</button>
</div>
</main>
</div>
@@ -79,8 +78,12 @@
<!-- 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">
<div id="login-view" class="modal slide-in-up" ng-controller="LoginCtrl">
<header class="bar bar-header bar-success">
<h1 class="title">Log in</h1>
<button class="button">Close</a>
</header>
<main class="content padded has-header">
<form class="form-horizontal" ng-submit="tryLogin(loginForm)">
<div class="input-group inset">
<label class="input-wrapper row">

View File

@@ -1,4 +1,4 @@
angular.module('ionic.todo.controllers', ['ionic.todo', 'firebase'])
angular.module('ionic.todo.controllers', ['ionic.todo', 'ionic.service.modal', 'firebase'])
// The main controller for the application
.controller('TodoCtrl', function($scope, $rootScope, AuthService) {
@@ -45,12 +45,19 @@ angular.module('ionic.todo.controllers', ['ionic.todo', 'firebase'])
})
// The signup form controller
.controller('SignupCtrl', function($scope, AuthService) {
.controller('SignupCtrl', function($scope, AuthService, Modal) {
$scope.signupForm = {};
Modal.fromTemplateUrl('login.html', function(modal) {
$scope.loginModal = modal;
});
$scope.trySignup = function(data) {
AuthService.signup(data.email, data.password);
};
$scope.showLogin = function() {
};
})
.controller('ProjectsCtrl', function($scope, angularFire, FIREBASE_URL) {