Commit e18daa4a6142f2e450ef77bffba3b037f1ef724f

Authored by Rachel Lee
1 parent 17d9e588be

Formatting home and importing unminified angjs

Showing 1 changed file with 6 additions and 10 deletions Inline Diff

<!DOCTYPE html> 1 1 <!DOCTYPE html>
<html ng-app="flashy"> 2 2 <html ng-app="flashy">
<base href="/app/"> 3 3 <base href="/app/">
<header> 4 4 <head>
5 5 <link rel = "stylesheet" href ="styles/bootstrap-3.3.4-dist/css/bootstrap.css" />
<link rel = "stylesheet" href ="styles/bootstrap-3.3.4-dist/css/bootstrap.css" /> 6 6 <link rel ="stylesheet" href="flashy.css" />
<link rel ="stylesheet" href="flashy.css" /> 7 7 </head>
8
</header> 9
<body ng-controller="HomeController"> 10 8 <body ng-controller="HomeController">
11 9
<!-- MENU BAR --> 12 10 <!-- MENU BAR -->
<nav class="navbar navbar-default"> 13 11 <nav class="navbar navbar-default">
<div class="container-fluid"> 14 12 <div class="container-fluid">
<b>Flashy</b> 15 13 <b>Flashy</b>
</div> 16 14 </div>
</nav> 17 15 </nav>
18 16
19 17
<h2>Create and share flashcards in real time!</h2> 20 18 <h2>Create and share flashcards in real time!</h2>
21 19
<!-- REGISTRATION TABS --> 22 20 <!-- REGISTRATION TABS -->
<div class="tabbable"> 23 21 <div class="tabbable">
<ul class="nav nav-tabs"> 24 22 <ul class="nav nav-tabs">
<li role="presentation" class="active"><a href="#tab1" data-toggle="tab">SIGN UP</a></li> 25 23 <li role="presentation" class="active"><a href="#tab1" data-toggle="tab">SIGN UP</a></li>
<li role="presentation"><a href="#tab2" data-toggle="tab">LOGIN</a></li> 26 24 <li role="presentation"><a href="#tab2" data-toggle="tab">LOGIN</a></li>
</ul> 27 25 </ul>
</div> 28 26 </div>
29 27
<!-- REGISTRATION TAB PANES --> 30 28 <!-- REGISTRATION TAB PANES -->
<div class="tab-content"> 31 29 <div class="tab-content">
32 30
<!-- SIGN UP FORM --> 33 31 <!-- SIGN UP FORM -->
<div class="tab-pane active" id="tab1"> 34 32 <div class="tab-pane active" id="tab1">
<form> 35 33 <form>
<div class="form-group"> 36 34 <div class="form-group">
<input type="email" class="form-control" ng-model="signUpEmail" placeholder="Email" /> 37 35 <input type="email" class="form-control" ng-model="signUpEmail" placeholder="Email" />
</div> 38 36 </div>
39 37
<div class="form-group"> 40 38 <div class="form-group">
<input type="text" class="form-control" ng-model="signUpUsername" placeholder="Username" /> 41 39 <input type="text" class="form-control" ng-model="signUpUsername" placeholder="Username" />
</div> 42 40 </div>
43 41
<div class="form-group"> 44 42 <div class="form-group">
<input type="password" class="form-control" ng-model="signUpPassword" placeholder="Password" /> 45 43 <input type="password" class="form-control" ng-model="signUpPassword" placeholder="Password" />
</div> 46 44 </div>
<input type="submit" class="btn btn-primary" ng-click="signUp(signUpEmail, signUpUsername, signUpPassword)" value="GET STARTED!" /> 47 45 <input type="submit" class="btn btn-primary" ng-click="signUp(signUpEmail, signUpUsername, signUpPassword)" value="GET STARTED!" />
</form> 48 46 </form>
</div> 49 47 </div>
50 48
<!-- LOGIN FORM --> 51 49 <!-- LOGIN FORM -->
<div class="tab-pane" id="tab2"> 52 50 <div class="tab-pane" id="tab2">
53
<form> 54 51 <form>
<div class="form-group"> 55 52 <div class="form-group">
<input type="email" class="form-control" ng-model="loginEmailOrUsername" placeholder="Email or username" /> 56 53 <input type="email" class="form-control" ng-model="loginEmailOrUsername" placeholder="Email or username" />
</div> 57 54 </div>
<div class="form-group"> 58 55 <div class="form-group">
<input type="password" class="form-control" ng-model="loginPassword" placeholder="Password" /> 59 56 <input type="password" class="form-control" ng-model="loginPassword" placeholder="Password" />
</div> 60 57 </div>
<input type="submit" class="btn btn-primary" ng-click="login(loginEmailOrUsername, loginPassword)" value="LOGIN" /> 61 58 <input type="submit" class="btn btn-primary" ng-click="login(loginEmailOrUsername, loginPassword)" value="LOGIN" />
</form> 62 59 </form>
</div> 63 60 </div>
64
</div> 65 61 </div>