pull

Merge branch 'master' of https://github.com/HumairAK/solutions_repo

3 files changed, 239 insertions, 144 deletions

diff --git a/views/admin.hbs b/views/admin.hbs
index da33f41..36a3210 100644
--- a/views/admin.hbs
+++ b/views/admin.hbs
@@ -1,102 +1,206 @@
 <main id="solutions-main">
-<div class="row signup">
-    <div class="col-md-3 col-md-offset-1 admin-form">
-        <h4>Add Exam</h4>
-        <form action="/admin/update/exam" method="post">
-            <div class="form-group">
-                Course Code: <input type="text"
-                       class="form-control"
-                       placeholder="course code"
-                       name="course_code">
-            </div>
-            <div class="form-group">
-                Year of Exam:
-                <input type="text"
-                       class="form-control"
-                       placeholder="year"
-                       name="year">
-            </div>
-            <div class="form-group">
-                Term: <input type="text"
-                       class="form-control"
-                       placeholder="term"
-                       name="term">
-            </div>
-            <div class="form-group">
-                Type of test:
-                <input type="radio" name="type" value="Midterm"> Midterm
-                <input type="radio" name="type" value="Final"> Final
-            </div>
-            <div class="form-group">
-                List all instructors separated by comma:
-                <input type="text"
-                       class="form-control"
-                       placeholder="instructor1,instructor2,.."
-                       name="instructors">
-            </div>
-            <div class="form-group">
-                Page Count:
-                <input type="text"
-                       class="form-control"
-                       placeholder="page count"
-                       name="page_count">
-            </div>
-            <div class="form-group">
-                Questions count:
-                <input type="text"
-                       class="form-control"
-                       placeholder="questions count"
-                       name="questions_count">
+<div class="container">
+<div class="row">
+<!-- Admin control Panel --->
+<div class="col-xs-12 col-sm-12 col-md-8 col-md-offset-2 col-xs-offset-0 col-sm-offset-0  toppad cpnl-details">
+
+    <!-- Admin Control Panel Menu -->
+    <nav class="navbar navbar-custom">
+        <div class="container-fluid">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle"
+                        data-toggle="collapse" data-target="#profile-nav">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
             </div>
-            <div class="form-group">
-                Questions Seperated by Comma
-                <input type="text"
-                       class="form-control"
-                       placeholder="q1,q2,q3,.."
-                       name="questions_list">
+            <div class="collapse navbar-collapse" id="profile-nav">
+                <ul class="nav navbar-nav " >
+                    <li><a href="#" class="cpnl-page">Add Exam</a></li>
+                    <li><a href="#" class="cpnl-page">Add Course</a></li>
+                    <li><a href="#" class="cpnl-page">Remove Exam</a></li>
+                    <li><a href="#" class="cpnl-page">Remove Course</a></li>
+                    <li><a href="#" class="cpnl-page">Remove User</a></li>
+                </ul>
             </div>
+        </div>
+    </nav>
 
-            <div class="form-group">
-                Upload Date:
-                <input type="text"
-                       class="form-control"
-                       placeholder="yyyy-mm-dd"
-                       name="upload_date">
-            </div>
-            <div class="form-group">
-                Your username:
-                <input type="text"
-                       class="form-control"
-                       placeholder="uploader"
-                       name="uploaded_by">
+    <!-- Admin Control Panel Pages -->
+    <div class="rounded">
+        <div class="panel panel-info rounded">
+            <div class="panel-heading">
+                <h3 class="panel-title">Admin Panel</h3>
             </div>
+            <div class="panel-body">
 
-            <input type="hidden" name="_csrf" value="{{ csrfToken }}">
-            <button type="submit" class="btn btn-primary">Submit</button>
-        </form>
-    </div>
+                <!--- Add Exam --->
+                <div class="row cpnl-container" id="cpnl-addExam">
+                    <h4>Add Exam</h4>
+                    <form action="/admin/add/exam" method="post">
+                        <div class="form-group">
+                            Course Code: <input type="text"
+                                                class="form-control"
+                                                placeholder="course code"
+                                                name="course_code">
+                        </div>
+                        <div class="form-group">
+                            Year of Exam:
+                            <input type="text"
+                                   class="form-control"
+                                   placeholder="year"
+                                   name="year">
+                        </div>
+                        <div class="form-group">
+                            Term:
+                            <input type="radio" name="term" value="Fall"> Fall
+                            <input type="radio" name="term" value="Winter"> Winter
+                            <input type="radio" name="term" value="Summer"> Summer
+                        </div>
+                        <div class="form-group">
+                            Type of test:
+                            <input type="radio" name="type" value="Midterm"> Midterm
+                            <input type="radio" name="type" value="Final"> Final
+                        </div>
+                        <div class="form-group">
+                            List all instructors separated by comma:
+                            <input type="text"
+                                   class="form-control"
+                                   placeholder="instructor1,instructor2,.."
+                                   name="instructors">
+                        </div>
+                        <div class="form-group">
+                            Page Count:
+                            <input type="text"
+                                   class="form-control"
+                                   placeholder="page count"
+                                   name="page_count">
+                        </div>
+                        <div class="form-group">
+                            Questions count:
+                            <input type="text"
+                                   class="form-control"
+                                   placeholder="questions count"
+                                   name="questions_count">
+                        </div>
+                        <div class="form-group">
+                            Questions Seperated by Comma
+                            <input type="text"
+                                   class="form-control"
+                                   placeholder="q1,q2,q3,.."
+                                   name="questions_list">
+                        </div>
 
-    <div class="col-md-3 admin-form">
-        <h4>Add Course</h4>
-        <form action="/admin/update/course" method="post">
-            <div class="form-group">
-                Course Code: <input type="text"
-                                    class="form-control"
-                                    placeholder="e.g. CSC240"
-                                    name="course_code">
-            </div>
-            <div class="form-group">
-                Title: <input type="text"
-                                    class="form-control"
-                                    placeholder="e.g. Theory of Computation"
-                                    name="title">
-            </div>
-            <input type="hidden" name="_csrf" value="{{ csrfToken }}">
-            <button type="submit" class="btn btn-primary">Submit</button>
-        </form>
+                        <div class="form-group">
+                            Upload Date:
+                            <input type="text"
+                                   class="form-control"
+                                   placeholder="yyyy-mm-dd"
+                                   name="upload_date">
+                        </div>
+                        <div class="form-group">
+                            Your username:
+                            <input type="text"
+                                   class="form-control"
+                                   placeholder="uploader"
+                                   name="uploaded_by">
+                        </div>
 
-    </div>
+                        <input type="hidden" name="_csrf" value="{{ csrfToken }}">
+                        <button type="submit" class="btn btn-primary">Submit</button>
+                    </form>
+                </div>
+
+                <!--- Add Course --->
+                <div class="row cpnl-container" id="cpnl-addCourse">
+                    <h4>Add Course</h4>
+                    <form action="/admin/add/course" method="post">
+                        <div class="form-group">
+                            Course Code: <input type="text"
+                                                class="form-control"
+                                                placeholder="e.g. CSC240"
+                                                name="course_code">
+                        </div>
+                        <div class="form-group">
+                            Title: <input type="text"
+                                          class="form-control"
+                                          placeholder="e.g. Theory of Computation"
+                                          name="title">
+                        </div>
+                        <input type="hidden" name="_csrf" value="{{ csrfToken }}">
+                        <button type="submit" class="btn btn-primary">Submit</button>
+                    </form>
+                </div>
+
+                <!--- Remove Exam --->
+                <div class="row cpnl-container" id="cpnl-removeExam">
+                    <h4>Remove Exam</h4>
+                    <form action="/admin/remove/exam" method="post">
+                        <div class="form-group">
+                            Course Code: <input type="text"
+                                                class="form-control"
+                                                placeholder="e.g. CSC240"
+                                                name="course_code">
+                        </div>
+                        <div class="form-group">
+                            Year: <input type="text"
+                                         class="form-control"
+                                         placeholder="e.g. 2015"
+                                         name="year">
+                        </div>
 
+                        <div class="form-group">
+                            Term:
+                            <input type="radio" name="term" value="Fall"> Fall
+                            <input type="radio" name="term" value="Winter"> Winter
+                            <input type="radio" name="term" value="Summer"> Summer
+                        </div>
 
+                        <div class="form-group">
+                            Type of test:
+                            <input type="radio" name="type" value="Midterm"> Midterm
+                            <input type="radio" name="type" value="Final"> Final
+                        </div>
+
+                        <div class="form-group">
+                            <p> Campus: </p>
+                            <input type="radio" name="campus" value="StGeorge"> St. George
+                            <input type="radio" name="campus" value="Scarborough"> Scarborough
+                            <input type="radio" name="campus" value="Mississauga"> Mississauga
+                        </div>
+
+
+                        <input type="hidden" name="_csrf" value="{{ csrfToken }}">
+                        <button type="submit" class="btn btn-primary">Submit</button>
+                    </form>
+                </div>
+
+                <!--- Remove Course --->
+                <div class="row cpnl-container" id="cpnl-removeCourse">
+                    <h4>Remove Course</h4>
+                    Pending. Need required database functionality.
+                </div>
+
+                <!--- Remove User --->
+                <div class="row cpnl-container" id="cpnl-removeUser">
+                    <h4>Remove User</h4>
+                    Pending. Need required database functionality.
+                </div>
+
+
+                <!-- Date, Edit, Logout (new row) -->
+                <div class="col-md-12 prf-sign-off">
+                    <p class=" text-info"> July 4 2016 </p>
+                    <a href="#">Logout</a>
+                    <br>
+
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
+</div>
 </div>
 </main>
\ No newline at end of file
diff --git a/views/signup.hbs b/views/signup.hbs
index 54464e1..e7d9c9a 100644
--- a/views/signup.hbs
+++ b/views/signup.hbs
@@ -27,7 +27,7 @@
 
 
 
-        <h2><i class="fa fa-user-plus" aria-hidden="true"></i> Sign Up</h2>
+        <h3><i class="fa fa-user-plus" aria-hidden="true"></i> Sign Up</h3>
         <form action="/user/signup" method="post">
             <div class="form-group">
                 <input type="text" class="form-control" placeholder="First Name" name="fname">
diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs
index 8b102b8..413fd0f 100644
--- a/views/user_profile_alt.hbs
+++ b/views/user_profile_alt.hbs
@@ -32,7 +32,7 @@
                 <div class="rounded">
                     <div class="panel panel-info rounded">
                         <div class="panel-heading">
-                            <h3 class="panel-title">Walter White</h3>
+                            <h3 class="panel-title">{{ user.f_name }} {{ user.l_name }}</h3>
                         </div>
                         <div class="panel-body">
                             <!--- User-Profile Pages -->
@@ -47,78 +47,69 @@
                                     <table class="table table-user-information">
                                         <tbody>
                                         <tr>
-                                            <td>Univeristy:</td>
-                                            <td>U of T</td>
+                                            <td>Email:</td>
+                                            <td><a href="{{ user.email }}">{{ user.email }}</a></td>
                                         </tr>
+                                        {{# if user.university }}
+                                            <tr>
+                                                <td>University:</td>
+                                                <td>{{ user.university }}</td>
+                                            </tr>
+                                        {{/if}}
+                                        {{# if user.department }}
                                         <tr>
                                             <td>Department:</td>
-                                            <td>CS</td>
+                                            <td>{{ user.department }}</td>
                                         </tr>
+                                        {{/if}}
                                         <tr>
                                             <td>Answered:</td>
-                                            <td>50</td>
+                                            <td>{{ user.answered }}</td>
                                         </tr>
                                         <tr>
                                         <tr>
                                             <td>Messages:</td>
-                                            <td>25</td>
+                                            <td>{{ user.messages }}</td>
                                         </tr>
                                         <tr>
                                             <td>Comments:</td>
-                                            <td>100</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Email:</td>
-                                            <td><a href="mailto:info@support.com">info@support.com</a></td>
-                                        </tr>
-                                        <tr>
-                                            <td>Phone Number:</td>
-                                            <td>111-111-1111(Mobile)</td>
+                                            <td>{{ user.comments }}</td>
                                         </tr>
+                                        {{# if user.phone_num}}
+                                            <tr>
+                                                <td>Phone Number:</td>
+                                                <td>{{ user.phone_num }}</td>
+                                            </tr>
+                                        {{/if}}
                                         </tbody>
                                     </table>
                                 </div>
                             </div>
                             <div class="row" id="profile-follows">
-                                <h3>You are following:</h3>
-                                <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6">
-                                    <table class="table-condensed">
-                                        <tbody>
-                                        <tr>
-                                            <th>
-                                                <img class="img-circle img-responsive"
-                                                     src="../assets/images/misc/user1.jpeg" alt="avatar">
-                                            </th>
-                                            <th>
-                                                <h4>The Dude</h4>
-                                                <p>3 comments</p>
-                                            </th>
+                                {{# if user.followers }}
+                                    <h3>You are being followed by:</h3>
+                                    <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6">
+                                        <table class="table-condensed">
+                                            <tbody>
+                                                {{# each user.followers}}
+                                                    <tr>
+                                                        <th>
+                                                            <img class="img-circle img-responsive"
+                                                                 src="../assets/images/misc/user1.jpeg" alt="avatar">
+                                                        </th>
+                                                        <th>
+                                                            <h4>The Dude</h4>
+                                                            <p>3 comments</p>
+                                                        </th>
 
-                                        </tr>
-                                        <tr>
-                                            <th>
-                                                <img class="img-circle img-responsive"
-                                                     src="../assets/images/misc/user2.jpeg" alt="avatar">
-                                            </th>
-                                            <th>
-                                                <h4>He-Man</h4>
-                                                <p>20 comments</p>
-                                            </th>
-                                        </tr>
-                                        <tr>
-                                            <th>
-                                                <img class="img-circle img-responsive"
-                                                     src="../assets/images/misc/user3.jpeg" alt="avatar">
-                                            </th>
-                                            <th>
-                                                <h4>Lady Lips</h4>
-                                                <p>56 comments</p>
-                                            </th>
-                                        </tr>
-                                        </tbody>
-
-                                    </table>
-                                </div>
+                                                    </tr>
+                                                {{/each}}
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                {{ else }}
+                                    <h3>You do not have any followers.</h3>
+                                {{/if}}
                             </div>
                             <div class="row" id="profile-friends">
                                 <h3>Friends</h3>