added more user profile content

2 files changed, 55 insertions, 31 deletions

diff --git a/assets/js/user_profile.js b/assets/js/user_profile.js
index fa7add4..73c7897 100644
--- a/assets/js/user_profile.js
+++ b/assets/js/user_profile.js
@@ -3,10 +3,8 @@ function main(){
     var items = [
         $("#profile-general"),
         $("#profile-follows"),
-        $("#profile-friends"),
-        $("#profile-inbox"),
         $("#profile-comments"),
-        $('#profile-send-message')];
+        $("#profile-inbox")];
 
     function hidePages(){
         items.forEach(function(item){
@@ -20,32 +18,26 @@ function main(){
     // Show General page
     items[0].show();
 
-    $('.prf-page').bind('click', function(e){
+    $('.nav-o').bind('click', function(e){
 
         e.preventDefault();
         hidePages();
 
         /* Each case will need to be changed to call a handler for fetching data
          * from server*/
-        switch($(this).text()) {
-            case "General":
+        switch($(this).attr('id')) {
+            case "nav-profile":
                 console.log("clicked general");
                 $("#profile-general").show();
                 break;
-            case "Following":
+            case "nav-follows":
                 $("#profile-follows").show();
                 break;
-            case "Friends":
-                $("#profile-friends").show();
-                break;
-            case "Inbox":
-                $("#profile-inbox").show();
-                break;
-            case "Comments":
+            case "nav-comments":
                 $("#profile-comments").show();
                 break;
-            case "Send Message":
-                $('#profile-send-message').show();
+            case "nav-inbox":
+                $("#profile-inbox").show();
                 break;
             default:
                 console.log("Error: User page not found");
diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs
index 8353be9..5c797d7 100644
--- a/views/user_profile_alt.hbs
+++ b/views/user_profile_alt.hbs
@@ -28,7 +28,7 @@
 
         <!-- User name Header row -->
             <div class="u-name-header col-xs-12">
-                <h2>ChrisHopper89</h2>
+                <h2>{{user.user_name}}</h2>
             </div>
 
         <!-- Main Content row -->
@@ -37,36 +37,36 @@
                 <!-- User Image -->
                 <img alt="User Pic" src="../assets/images/avatar.png"
                      class="img-circle img-responsive">
-                <h3>Jim Hopper</h3>
-                <h4>jhop@gmail.com</h4>
+                <h3>{{ user.f_name }} {{ user.l_name }}</h3>
+                <h4>{{ user.email }}</h4>
 
                 <!-- Side Nav -->
                 <nav>
-                    <button class="nav-o">
+                    <button class="nav-o" id="nav-profile">
                         <div class="nav-o-container">
                             <h5><i class="fa fa-home" aria-hidden="true"></i> My Profile</h5>
                         </div>
                     </button>
 
-                    <button class="nav-o">
+                    <button class="nav-o" id="nav-comments">
                         <div class="nav-o-container">
                             <h5><i class="fa fa-comment-o" aria-hidden="true"></i> Comments</h5>
                         </div>
                     </button>
 
-                    <button class="nav-o">
+                    <button class="nav-o" id="nav-follows">
                         <div class="nav-o-container">
                             <h5><i class="fa fa-list" aria-hidden="true"></i> Follows</h5>
                         </div>
                     </button>
 
-                    <button class="nav-o">
+                    <button class="nav-o" id="nav-inbox">
                         <div class="nav-o-container">
                             <h5><i class="fa fa-envelope" aria-hidden="true"></i> Inbox</h5>
                         </div>
                     </button>
 
-                    <button class="nav-o">
+                    <button class="nav-o" id="nav-logout">
                         <div class="nav-o-container">
                             <h5><i class="fa fa-sign-out" aria-hidden="true"></i> Log Out</h5>
                         </div>
@@ -78,26 +78,58 @@
 
             <!-- Content Pages (On Right) -->
             <article class="col-xs-12 col-sm-9 u-pages">
-                <section class="u-profile">
+                <section class="u-profile" id="profile-general">
                     <h4>Profile </h4>
 
                     <hr>
 
                     <h5>Personal Info</h5>
-                    <p>Username: <em>ChiefHopper86</em></p>
-                    <p>Name: <em>Jim Hopper</em></p>
-                    <p>University: <em>University of Toronto</em></p>
+                    <p>Username: <em>{{user.user_name}}</em></p>
+                    <p>Name: <em>{{ user.f_name }} {{ user.l_name }}</em></p>
+
+
+                    {{# if user.university }}
+                        <p>University: <em>{{ user.university }}</em></p>
+                    {{/if}}
+                    {{# if user.department }}
+                        <p>Department: <em>{{ user.department }}</em></p>
+                    {{/if}}
 
                     <hr>
                     <h5>User Stats</h5>
-                    <p>Answered: <em>20</em></p>
-                    <p>Comments: <em>25</em></p>
-                    <p>Score: <em>205</em></p>
+                    <p>Answered: <em>{{ user.answered }}</em></p>
+                    <p>Comments: <em>{{ user.comments }}</em></p>
+                    <p>Inbox: <em>{{ user.messages }}</em></p>
+
+                    <!-- Need to add -->
+                    <p>Score: <em>N/A</em></p>
+
+                </section>
 
 
+                <!-- Add Script for paging -->
+                <section class="u-profile" id="profile-follows">
+                    <h4>Follows </h4>
 
+                    <hr>
+                    <p>[PlaceHolder]</p>
                 </section>
 
+                <section class="u-profile" id="profile-comments">
+                    <h4>Comments </h4>
+
+                    <hr>
+                    <p>[PlaceHolder]</p>
+                </section>
+
+                <section class="u-profile" id="profile-inbox">
+                    <h4>Inbox </h4>
+
+                    <hr>
+                    <p>[PlaceHolder]</p>
+                </section>
+
+
             </article>