From 90fe02430c828b0d99d5f60c3073c54278d85236 Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Fri, 22 Jul 2016 07:33:52 -0400
Subject: Cleaned up the routing for users. Header changeable depending on
 whether user is logged in or not. Logout option.

---
 views/partials/header.hbs  | 14 +++++++++++---
 views/signin.hbs           |  2 +-
 views/signup.hbs           |  2 +-
 views/user_profile_alt.hbs | 14 +++++++-------
 4 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'views')

diff --git a/views/partials/header.hbs b/views/partials/header.hbs
index 4e7f1c2..9140302 100644
--- a/views/partials/header.hbs
+++ b/views/partials/header.hbs
@@ -36,15 +36,23 @@
                         <li><a href="#">Fourth Year</a></li>
                     </ul>
                 </li>
-                <li><a href="/signin" >Sign In</a></li>
+                {{# if login }}
+                    <li><a href="/user/user_profile">Profile Page</a></li>
+                {{ else }}
+                    <li><a href="/user/signin" >Sign In</a></li>
+                {{/if}}
                 <li><a href="/admin">Admin Panel</a></li>
                 <!--<li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li>-->
-                <li><a href="/signup" >Sign up</a></li>
+                {{# if login}}
+                    <li><a href="/user/logout">Logout</a> </li>
+                {{ else }}
+                    <li><a href="/user/signup" >Sign up</a></li>
+                {{/if}}
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li><a tabindex="-1" href="/user_solutions">Solutions Page</a></li>
-                        <li><a href="/user_profile">Profile Page</a></li>
+                        <li><a href="/user/user_profile">Profile Page</a></li>
                         <li><a href="/questions">Questions Page</a></li>
                         <li><a href="/exams">Exams Pages</a></li>
                     </ul>
diff --git a/views/signin.hbs b/views/signin.hbs
index 76b55f8..81d0f81 100644
--- a/views/signin.hbs
+++ b/views/signin.hbs
@@ -26,7 +26,7 @@
             {{/if}}
 
             <h2><i class="fa fa-sign-in" aria-hidden="true"></i> Sign In</h2>
-            <form action="/signin" method="post">
+            <form action="/user/signin" method="post">
                 <div class="form-group">
                     <input type="text" class="form-control" placeholder="New Username" name="usrname">
                 </div>
diff --git a/views/signup.hbs b/views/signup.hbs
index b7f3600..463e347 100644
--- a/views/signup.hbs
+++ b/views/signup.hbs
@@ -28,7 +28,7 @@
 
 
         <h2><i class="fa fa-user-plus" aria-hidden="true"></i> Sign Up</h2>
-        <form action="/signup" method="post">
+        <form action="/user/signup" method="post">
             <div class="form-group">
                 <input type="text" class="form-control" placeholder="First Name" name="fname">
             </div>
diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs
index 624e2c6..8b102b8 100644
--- a/views/user_profile_alt.hbs
+++ b/views/user_profile_alt.hbs
@@ -39,7 +39,7 @@
                             <div class="row" id="profile-general">
                                 <!-- User Image -->
                                 <div class="col-md-3 col-lg-3 " align="center">
-                                    <img alt="User Pic" src="assets/images/avatar.png"
+                                    <img alt="User Pic" src="../assets/images/avatar.png"
                                          class="img-circle img-responsive">
                                 </div>
                                 <!-- User Details -->
@@ -87,7 +87,7 @@
                                         <tr>
                                             <th>
                                                 <img class="img-circle img-responsive"
-                                                     src="assets/images/misc/user1.jpeg" alt="avatar">
+                                                     src="../assets/images/misc/user1.jpeg" alt="avatar">
                                             </th>
                                             <th>
                                                 <h4>The Dude</h4>
@@ -98,7 +98,7 @@
                                         <tr>
                                             <th>
                                                 <img class="img-circle img-responsive"
-                                                     src="assets/images/misc/user2.jpeg" alt="avatar">
+                                                     src="../assets/images/misc/user2.jpeg" alt="avatar">
                                             </th>
                                             <th>
                                                 <h4>He-Man</h4>
@@ -108,7 +108,7 @@
                                         <tr>
                                             <th>
                                                 <img class="img-circle img-responsive"
-                                                     src="assets/images/misc/user3.jpeg" alt="avatar">
+                                                     src="../assets/images/misc/user3.jpeg" alt="avatar">
                                             </th>
                                             <th>
                                                 <h4>Lady Lips</h4>
@@ -128,7 +128,7 @@
                                         <tr>
                                             <th>
                                                 <img class="img-circle img-responsive"
-                                                     src="assets/images/misc/user2.jpeg" alt="avatar">
+                                                     src="../assets/images/misc/user2.jpeg" alt="avatar">
                                             </th>
                                             <th>
                                                 <h4>He-Man</h4>
@@ -138,7 +138,7 @@
                                         <tr>
                                             <th>
                                                 <img class="img-circle img-responsive"
-                                                     src="assets/images/misc/user5.jpeg" alt="avatar">
+                                                     src="../assets/images/misc/user5.jpeg" alt="avatar">
                                             </th>
                                             <th>
                                                 <h4>Jay Leno</h4>
@@ -148,7 +148,7 @@
                                         <tr>
                                             <th>
                                                 <img class="img-circle img-responsive"
-                                                     src="assets/images/misc/user6.jpeg" alt="avatar">
+                                                     src="../assets/images/misc/user6.jpeg" alt="avatar">
                                             </th>
                                             <th>
                                                 <h4>Lisa Simpson</h4>
-- 
cgit v1.2.3