fixed login page and add username to header

app/client/scripts/events.js

@@ -244,8 +244,8 @@ Template.login.events({
     "submit form": function(e){
         e.preventDefault();
         Session.set("github", false);
-        var username = e.target.loginUsername.value;
-        var password = e.target.loginPassword.value;
+        var username = $("#username").val()
+        var password = $("#password").val();
         Meteor.loginWithPassword(username, password, function(err) {
             if (err) {
                 var errAlert = $('<div style="margin-bottom: 0" class="alert alert-danger" role="alert"><strong>Oh Snap!</strong> ' + err.reason + '</div>');

app/client/templates/header.html

@@ -31,8 +31,13 @@
                             class="material-icons right">arrow_drop_down</i></a></li>
                     <li><a class="dropdown-button" href="#!" data-activates="aboutDrop">About<i
                             class="material-icons right">arrow_drop_down</i></a></li>
-                    <li><a class="dropdown-button" href="#!" data-activates="accountDrop">Account<i
-                            class="material-icons right">arrow_drop_down</i></a></li>
+                    <li><a class="dropdown-button" href="#!" data-activates="accountDrop">
+                        {{#if currentUser}}
+                            {{currentUser.username}}
+                        {{else}}
+                            Account
+                        {{/if}}
+                        <i class="material-icons right">arrow_drop_down</i></a></li>
                 </ul>
                 <ul class="side-nav" id="mobile-navi" style="width: 240px;">
                     <ul class="collapsible" data-collapsible="accordion">
@@ -40,14 +45,18 @@
                             <a href="/feedback">Feedback</a>
                         </li>
                         <li>
-                            <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i> Contribute</div>
+                            <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i>
+                                Contribute
+                            </div>
                             <div class="collapsible-body black-text">
                                 <a href="https://www.github.com/Musare/Musare" target="_blank">Github</a>
                                 <a href="donate.html">Donate</a>
                             </div>
                         </li>
                         <li>
-                            <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i> About</div>
+                            <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i>
+                                About
+                            </div>
                             <div class="collapsible-body black-text">
                                 <a href="/project">The Project</a>
                                 <a href="/team">The Team</a>
@@ -55,7 +64,13 @@
                             </div>
                         </li>
                         <li>
-                            <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i> Account</div>
+                            <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i>
+                                {{#if currentUser}}
+                                    {{currentUser.username}}
+                                {{else}}
+                                    Account
+                                {{/if}}
+                            </div>
                             <div class="collapsible-body black-text">
                                 <a href="/login">Login</a>
                                 <a href="/register">Register</a>

app/client/templates/login.html

@@ -1,26 +1,26 @@
 <template name="login">
-  {{> header}}
-  <main>
-    <div class="container row">
-      <form class="col s12 offset-s3">
-        <h1>Login</h1>
-        <div class="row">
-          <div class="input-field col s6">
-            <input id="username" type="text" class="validate">
-            <label for="first_name">Username</label>
-          </div>
+    {{> header}}
+    <main>
+        <div class="container row">
+            <form class="col s12">
+                <h1>Login</h1>
+                <div class="row">
+                    <div class="input-field col s6">
+                        <input id="username" type="text" class="validate">
+                        <label for="first_name">Username</label>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="input-field col s6">
+                        <input id="password" type="password" class="validate">
+                        <label for="password">Password</label>
+                    </div>
+                </div>
+                <button class="btn waves-effect waves-light" type="submit" name="action">Submit
+                    <i class="material-icons right">send</i>
+                </button>
+            </form>
         </div>
-        <div class="row">
-          <div class="input-field col s6">
-            <input id="password" type="password" class="validate">
-            <label for="password">Password</label>
-          </div>
-        </div>
-        <button class="btn waves-effect waves-light" type="submit" name="action">Submit
-          <i class="material-icons right">send</i>
-        </button>
-      </form>
-    </div>
-  </main>
-  {{> footer}}
+    </main>
+    {{> footer}}
 </template>