fixed html buttons and login

.gitignore

@@ -1,5 +1,5 @@
-*.DS_Store
+.DS_Store
 lib/node_modules/
 lib/bower_components/
-*javascripts/AppConstants.js
-npm-debug.log
+javascripts/AppConstants.js
+

css/main.css

@@ -1,4 +1,4 @@
-body {
+/*body {
 	background-image: url("img/cork.jpg");
 	font-family: 'Yanone Kaffeesatz', sans-serif;
 	font-size: 2em;
@@ -8,3 +8,4 @@ h1 {
 	font-family: 'Anton', sans-serif;
 	font-size: 1.5em;	
 }
+*/

javascripts/AppConfig.js

@@ -6,14 +6,14 @@ let isAuth = (AuthFactory) => new Promise((resolve, reject) => {
 	} else {
 		reject();
 	}
-});
+})
 
 app.run(function($rootScope, $location, FIREBASE_CONFIG, AuthFactory){
   firebase.initializeApp(FIREBASE_CONFIG);
 
 $rootScope.$on('$routeChangeStart', function(event, currRoute, prevRoute){
+
 	let logged = AuthFactory.isAuthenticated();
-
 	let appTo;
 
 	if(currRoute.originalPath){
@@ -33,7 +33,7 @@ app.config(function($routeProvider){
 	$routeProvider
 		.when('/auth', {
 			templateUrl: 'partials/auth.html',
-			controller:'AuthCtrl'
+			controller:'AuthCtrl',
 		})
 		.when('/boards/list', {
 			templateUrl: 'partials/general-view.html',
@@ -61,4 +61,6 @@ app.config(function($routeProvider){
 			resolve: {isAuth}
 		})
 		.otherwise('/auth');
-});
+});
+
+console.log("AppConfig loaded");

javascripts/AppConstants.js

@@ -6,4 +6,6 @@ app.constant("FIREBASE_CONFIG", {
     databaseURL: "https://pinthis-fe275.firebaseio.com",
     storageBucket: "pinthis-fe275.appspot.com",
     messagingSenderId: "918121387819"
-});
+});
+
+console.log("AppConstantsCompleted");

javascripts/app.js

@@ -2,3 +2,4 @@
 
 var app = angular.module("PinThisApp", ["ngRoute"]);
 
+

javascripts/controllers/AuthCtrl.js

@@ -5,7 +5,7 @@ app.controller("AuthCtrl", function($scope, $rootScope, AuthFactory, UserFactory
 	$scope.setRegisterContainer = false;
 
 
-	if($location.path() == "/logout"){
+	if($location.path() === "/logout"){
 		AuthFactory.logout();
 		$rootScope.user ={};
 		$location.url("/auth");
@@ -23,18 +23,19 @@ app.controller("AuthCtrl", function($scope, $rootScope, AuthFactory, UserFactory
 		});
 	};
 
-	$scope.setLoginContainer = function(){
-		$scope.loginContainer = true;
-		$scope.registerContainer = false;
-
-	};
 
 	$scope.setRegisterContainer = function(){
 		$scope.loginContainer = false;
 		$scope.registerContainer = true;
 
 	};
 
+	$scope.setLoginContainer = function(){
+		$scope.loginContainer = true;
+		$scope.registerContainer = false;
+
+	};
+
 	$scope.registerUser = function(registerNewUser){
 		AuthFactory.registerWithEmail(registerNewUser).then(function(didRegister){
 			registerNewUser.uid = didRegister.uid;

javascripts/factories/AuthFactory.js

@@ -59,4 +59,6 @@ app.factory("AuthFactory", function($q, $http, $rootScope, FIREBASE_CONFIG) {
   };
 
   return {isAuthenticated:isAuthenticated, getUser:getUser, logout:logout, registerWithEmail:registerWithEmail, authenticate:authenticate, authenticateGoogle: authenticateGoogle};
-});
+});
+
+console.log("AuthFactory loaded");

partials/auth.html

@@ -1,55 +1,41 @@
-<div class="container col-xs-4 col-xs-offset-3">
+<div class="col-xs-6 col-xs-offset-3">
   <div class="row">
-   <button class="btn btn-success col-xs-6" ng-click="setRegisterContainer()">Register</button>
     <button class="btn btn-info col-xs-6" ng-click="setLoginContainer()">Login</button>
-
-  </div>
+    <button class="btn btn-success col-xs-6" ng-click="setRegisterContainer()">Register</button>
+</div>
   <div class="row">
-
-<!-- start of register form -->
     <form ng-show="loginContainer">
-
       <div class="form-group">
         <label>Email Address</label>
         <input type="email" class="col-xs-offset-1 col-xs-10" placeholder="Email address" ng-model="login.email" required autofocus>
       </div>
-
       <div class="form-group">
         <label>Password</label>
         <input type="password" class="col-xs-offset-1 col-xs-10" placeholder="" ng-model="login.password" required>
       </div>
-
       <div class="form-group">
-        <a class="btn btn-lg btn-success col-xs-offset-1 col-xs-10" ng-click="loginUser(login)">Submit Login</a>
+        <a class="btn btn-lg btn-info col-xs-offset-1 col-xs-10" ng-click="loginUser(login)">Submit Login</a>
       </div>
-
     </form>
     <!--end of register form -->
-
-<!-- start of login form -->
+    <!-- start of login form -->
     <form ng-show="registerContainer">
-
       <div class="form-group">
         <label>Email Address</label>
         <input type="email" class="col-xs-offset-1 col-xs-10" placeholder="Email address" ng-model="register.email" required autofocus>
       </div>
-
       <div class="form-group">
         <label>Password</label>
-        <input type="password" class="col-xs-offset-1 col-xs-10" placeholder="" ng-model="register.password" required>
+        <input type="password" class="col-xs-offset-1 col-xs-10" placeholder="Password" ng-model="register.password" required>
       </div>
-
       <div class="form-group">
         <label>Username</label>
         <input type="text" class="col-xs-offset-1 col-xs-10" placeholder="Username" ng-model="register.username" required>
       </div>
-
       <div class="form-group">
         <a class="btn btn-lg btn-success col-xs-offset-1 col-xs-10" ng-click="registerUser(register)">Submit Registration</a>
       </div>
-
     </form>
-<!-- end of login form -->
-
-  </div> 
+    <!-- end of login form -->
+  </div>
 </div>

partials/navbar.html

@@ -8,7 +8,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="#">Todo App</a>
+                    <a class="navbar-brand" href="#">Pin This</a>
                 </div>
                 <!-- Collect the nav links, forms, and other content for toggling -->
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">