made a few adjustments, removed all avatar occurrences, a few other images for optimization and performance speed, replace pngs with svgs etc.

7 files changed, 38 insertions, 26 deletions

diff --git a/assets/css/creative.css b/assets/css/creative.css
index 45f388b..17ee257 100644
--- a/assets/css/creative.css
+++ b/assets/css/creative.css
@@ -175,7 +175,6 @@ header {
     /*-moz-background-size: cover;*/
     /*background-size: cover;*/
     /*-o-background-size: cover;*/
-
 }
 
 header .header-spec {
@@ -384,4 +383,6 @@ header .header-content .header-content-inner hr {
 }
 
 /********************************************/
-
+.follow-exam-btn{
+    margin: 15px;
+}
diff --git a/assets/css/style.css b/assets/css/style.css
index eb683b1..19601e2 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -49,7 +49,6 @@ main .search h2{
 .search input {
     text-align: center;
     box-sizing: border-box;
-    background: white url('../images/search_icon.png') no-repeat 9px 9px;
     background-size: 20px 20px;
     padding: 0;
 }
@@ -155,6 +154,9 @@ main [id^="sol-"] img.user-image {
 
 main [id^="sol-"] p.username {
 	vertical-align: middle;
+	padding-left: 10px;
+	font-weight: bolder;
+
 }
 
 main [id^="sol-"] button.upvote, [id^="sol-"] button.downvote {
@@ -337,6 +339,7 @@ p.solutions-time {
 .exam-info {
 	margin-left: 5%;
 	display: inline-block;
+	text-align: center;
 }
 
 img.exam-info {
@@ -349,6 +352,7 @@ section.exam-info em {
 	font-weight: bold;
 }
 
+
 .questions-number{
     font-size: large;
     color: #333333;
@@ -366,6 +370,10 @@ section.exam-info em {
 .questions-sol-num {
 	margin-left: 5%;
 }
+
+.questions-arrow{
+	padding-top: 6px;
+}
 /*** EXAM QUESTIONS PAGE END ***/
 
 /*** USER PROFILE PAGE  ***/
diff --git a/routes/user.js b/routes/user.js
index bd13723..a2f7cc1 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -47,7 +47,8 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) {
                     resolve(1);
                 } else if (object.length){
                     req.user.comments = object.length;
-                    comments = object;
+                    req.user.comment_list = comments = object;
+
                     resolve(1);
                 } else {
                     req.user.comments = object.length;
diff --git a/views/index.hbs b/views/index.hbs
index 214695b..8025281 100644
--- a/views/index.hbs
+++ b/views/index.hbs
@@ -67,11 +67,11 @@
                                name="search"
                                placeholder="Enter course name">
 						<!-- Prompt Search -->
-					<span class="input-group-btn">
-						<button id = 'go-button'
-                                class="btn btn-default search-button go-button"
-                                type="submit">Go!</button>
-					</span>
+					    <span class="input-group-btn">
+                            <button id = 'go-button'
+                                    class="btn btn-default search-button go-button"
+                                    type="submit">Go!</button>
+					    </span>
 					</div>
 				</div>
 				<!-- Site Desciprtion -->
diff --git a/views/questions.hbs b/views/questions.hbs
index ac94f8b..ebbbcc5 100644
--- a/views/questions.hbs
+++ b/views/questions.hbs
@@ -16,11 +16,8 @@
                 {{/if}}
             {{/if}}
         </div>
-
         <div class="row">
-            <a href="http://www.cs.toronto.edu/~fpitt/CSC148/20131/tests/test1-0101.pdf" target='_blank'><img src="/assets/images/exam.png" class='exam-img img-responsive exam-info'></a>
-
-            <section class='exam-info'>
+            <section class='exam-info col-sm-6 col-sm-offset-3'>
                 <h3>{{examInfo.courseCode}}</h3>
                 <p>{{examInfo.term}} {{examInfo.year}} {{examInfo.type}}</p>
                 <p><em>Instructor(s): </em>{{examInfo.instructors}}</p>
@@ -30,14 +27,13 @@
                 <p><em>Question count:</em> {{examInfo.questionCount}}</p>
                 <form action="/user/follow_exam/{{examInfo.id}}" method = 'post'>
                     <input type="hidden" name="_csrf" value="{{ csrfToken }}">
-                    <button class="btn btn-primary" id="add-solution" type="submit">
+                    <button class="btn btn-primary follow-exam-btn" id="add-solution" type="submit">
                         <h3>Follow Exam</h3>
                     </button>
-
                 </form>
             </section>
         </div>
-        
+
         <!-- QUESTION LISTINGS -->
         {{#each query}}
                 <a href="/solutions/{{../examInfo.id}}/{{this.q_id}}">
@@ -47,7 +43,7 @@
                             <p><span class='questions-sol-num'>{{this.count}} solutions, </span> <span class = 'questions-comment'>{{this.comments}} comments</span></p>
                         </div>
                         <div class='pull-right right-arrow'>
-                            <img class='rounded' src="/assets/images/right-arrow.png">
+                            <img class='rounded questions-arrow' src="/assets/images/right-arrow.svg">
                         </div>
                     </section>
                 </a>
diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs
index 72baa86..7a61366 100644
--- a/views/user_profile_alt.hbs
+++ b/views/user_profile_alt.hbs
@@ -20,7 +20,8 @@
                 <ul class="nav navbar-nav " >
                     <li><a href="#" class="prf-page">General</a></li>
                     <li><a href="#" class="prf-page">Following</a></li>
-                    <li><a href="#" class="prf-page">Friends</a></li>
+                    <!-- Not implemented -->
+                    <!--<li><a href="#" class="prf-page">Friends</a></li> -->
                     <li><a href="#" class="prf-page">Send Message</a></li>
                     <li><a href="#" class="prf-page">Inbox</a></li>
                     <li><a href="#" class="prf-page">Comments</a></li>
@@ -37,13 +38,13 @@
             <div class="panel-body">
                 <!--- User-Profile Pages -->
                 <div class="row" id="profile-general">
-                    <!-- User Image -->
-                    <div class="col-md-3 col-lg-3 " align="center">
+                    <!-- User Image Not implemented -->
+                    <!--<div class="col-md-3 col-lg-3 " align="center">
                         <img alt="User Pic" src="../assets/images/avatar.png"
                              class="img-circle img-responsive">
-                    </div>
+                    </div> -->
                     <!-- User Details -->
-                    <div class=" col-md-9 col-lg-9 ">
+                    <div>
                         <table class="table table-user-information">
                             <tbody>
                             <tr>
@@ -112,6 +113,9 @@
                         <h3>You are not following any exams.</h3>
                     {{/if}}
                 </div>
+
+                <!-- Friends not implemented -->
+                <!--
                 <div class="row" id="profile-friends">
                     <h3>Friends</h3>
                     <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6">
@@ -151,7 +155,7 @@
                         </table>
                     </div>
                 </div>
-
+                -->
                 <div class="row" id="profile-send-message">
                     {{# if messages.success }}
                         <section class="alert alert-success">
diff --git a/views/user_solutions.hbs b/views/user_solutions.hbs
index f50499f..7123533 100644
--- a/views/user_solutions.hbs
+++ b/views/user_solutions.hbs
@@ -37,7 +37,8 @@
             <section id="sol-" class="col-md-10 col-md-offset-1 rounded">
                 <div class="post-info">
                     <div class="">
-                        <img class="img-responsive img-circle user-image" src="/assets/images/misc/user1.jpeg">
+                        <!-- Avatar code here
+                        <img class="img-responsive img-circle user-image" src="/assets/images/misc/user1.jpeg">-->
                         <p class="username">{{this.author}}</p>
                     </div>
 
@@ -78,8 +79,9 @@
                         <ul class="list-group">
                             {{#each this.comments}}
                                 <li class="list-group-item">
-                                    <img src="/assets/images/misc/user3.jpeg"
-                                         class="img-responsive img-circle comment-user-img">
+                                    <!-- Avatar code here for comments -->
+                                   <!-- <img src="/assets/images/misc/user3.jpeg"
+                                         class="img-responsive img-circle comment-user-img"> -->
                                     <p class="comment-username">
                                         <a href="/user_profile">
                                             {{this.by}}