From c1ce89359a7b54ec97b54ce577e5534c180c5c4b Mon Sep 17 00:00:00 2001
From: HumairAK <humair88@hotmail.com>
Date: Mon, 18 Jul 2016 06:49:16 -0400
Subject: Various fixes, see changelog for details.

---
 views/about.hbs                 |  27 +++++
 views/exams.hbs                 |  40 +++++++
 views/index.hbs                 |  36 ++++++
 views/layouts/layout.hbs        |  33 ++++++
 views/partials/footer.hbs       |  21 ++++
 views/partials/header.hbs       |  59 ++++++++++
 views/partials/login.hbs        |  28 +++++
 views/partials/registration.hbs |  49 ++++++++
 views/questions.hbs             |  81 +++++++++++++
 views/user_profile_alt.hbs      | 251 ++++++++++++++++++++++++++++++++++++++++
 views/user_solutions.hbs        | 125 ++++++++++++++++++++
 11 files changed, 750 insertions(+)
 create mode 100644 views/about.hbs
 create mode 100644 views/exams.hbs
 create mode 100644 views/index.hbs
 create mode 100644 views/layouts/layout.hbs
 create mode 100644 views/partials/footer.hbs
 create mode 100644 views/partials/header.hbs
 create mode 100644 views/partials/login.hbs
 create mode 100644 views/partials/registration.hbs
 create mode 100644 views/questions.hbs
 create mode 100644 views/user_profile_alt.hbs
 create mode 100644 views/user_solutions.hbs

(limited to 'views')

diff --git a/views/about.hbs b/views/about.hbs
new file mode 100644
index 0000000..0d19d8d
--- /dev/null
+++ b/views/about.hbs
@@ -0,0 +1,27 @@
+<main id = 'solutions-main'>
+    <section class = 'search container'>
+        <!-- Contributor Details -->
+        <section class="abt-content">
+            <h3 class="">About Us</h3>
+            <p class="about-p">
+                We are 4 students from the University of Toronto.
+            </p>
+            <h4 class="abt-name">Nargiza Nosirova</h4>
+                <p>Occupation: Student</p>
+                <p>Department: CS</p>
+                <p>Email: placeholder@gmail.com</p>
+            <h4 class="abt-name">Waref Haque</h4>
+                <p>Occupation: Student</p>
+                <p>Department: ECE</p>
+                <p>Email: placeholder@gmail.com</p>
+            <h4 class="abt-name">Pradyumn (Kumar) Damani</h4>
+                <p>Occupation: Student</p>
+                <p>Department: CS</p>
+                <p>Email: placeholder@gmail.com</p>
+            <h4 class="abt-name">Humair Khan</h4>
+                <p>Occupation: Student</p>
+                <p>Department: CS</p>
+                <p>Email: placeholder@gmail.com</p>
+        </section>
+        </section>
+</main>
\ No newline at end of file
diff --git a/views/exams.hbs b/views/exams.hbs
new file mode 100644
index 0000000..fc9e7d5
--- /dev/null
+++ b/views/exams.hbs
@@ -0,0 +1,40 @@
+<main id = 'solutions-main'>
+    <div class = 'search container' id = 'solutions-div'>
+            <h4 class='search-head'>Search results for "{{query}}"</h4>
+            <a href="/questions">
+            <section class = 'solutions-card'>
+                <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
+                <p class = 'solutions-time' ><em>Term: </em>Winter 2015</p>
+                <p class = 'exam-instr'><em>Instructors: </em>Fairgrieve and Hangerman</p>
+                <p class = 'solutions-type'>Final Examination</p>
+            </section>
+            </a>
+
+            <a href="/questions">
+            <section class = 'solutions-card'>
+                <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
+                <p class = 'solutions-time' ><em>Term: </em>Fall 2014</p>
+                <p class = 'exam-instr'><em>Instructors: </em>Campbell and Fairgrieve</p>
+                <p class = 'solutions-type'>Midterm Examination</p>
+            </section>
+            </a>
+
+            <a href="/questions">
+            <section class = 'solutions-card'>
+                <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
+                <p class = 'solutions-time' ><em>Term: </em>Winter 2014</p>
+                <p class = 'exam-instr'><em>Instructors: </em>Campbell and Papadopoulou</p>
+                <p class = 'solutions-type'>Final Examination</p>
+            </section>
+            </a>
+
+            <a href="/questions">
+            <section class = 'solutions-card'>
+                <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
+                <p class = 'solutions-time' ><em>Term: </em>Fall 2013</p>
+                <p class = 'exam-instr'><em>Instructors: </em>Craig and Gries</p>
+                <p class = 'solutions-type'>Final Examination</p>
+            </section>
+            </a>
+    </div>
+</main>
diff --git a/views/index.hbs b/views/index.hbs
new file mode 100644
index 0000000..9826209
--- /dev/null
+++ b/views/index.hbs
@@ -0,0 +1,36 @@
+<header>
+	<div class="header-content">
+
+		<form action="/search" method="get">
+			<section class="header-content-inner">
+				<p><strong>The solutions to all your problems</strong></p>
+				<hr> <!-- Divider -->
+				<div class="search col-md-8 col-lg-8 col-md-offset-2">
+					<!-- Search-bar, Drop-down and Prompt -->
+					<div class="input-group">
+						<!-- Search Category Drop-Down -->
+						<div class="input-group-btn">
+							<button type="button" class="btn btn-default dropdown-toggle search-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></button>
+							<ul class="dropdown-menu">
+								<li><a href="#">Courses</a></li>
+								<li><a href="#">Users</a> </li>
+							</ul>
+						</div>
+
+						<!-- Search bar -->
+						<input type="text" id = "user-input" class="form-control" aria-label="..." 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>
+					</div>
+				</div>
+				<!-- Site Desciprtion -->
+				<h5 class="home-intro">
+					Solutions.repo is a community driven service that provides visitors
+					with solutions to past UofT Exams.
+				</h5>
+			</section>
+		</form>
+	</div>
+</header>
diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs
new file mode 100644
index 0000000..987072f
--- /dev/null
+++ b/views/layouts/layout.hbs
@@ -0,0 +1,33 @@
+!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Solutions Repo</title>
+
+    <!--ORDER IS IMPORTANT DO NOT SHIFT-->
+
+    <!--Custom CSS Files-->
+    <link href="/assets/css/style.css" rel="stylesheet" type="text/css">
+
+    <!--Bootstrap File-->
+    <link rel="stylesheet" href="/assets/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/assets/css/creative.css">
+
+    <!--Fonts-->
+    <link href='https://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+
+    <!--JS-->
+    <script src="/assets/js/jquery-2.2.4.min.js"></script>
+    <script src="/assets/js/bootstrap.min.js"></script>
+    <script src="/assets/js/script.js"></script>
+</head>
+<body>
+    {{> header }}
+    {{{ body }}}
+    {{> footer }}
+    {{> login }}
+    {{> registration }}
+</body>
+</html>
\ No newline at end of file
diff --git a/views/partials/footer.hbs b/views/partials/footer.hbs
new file mode 100644
index 0000000..eecc2f7
--- /dev/null
+++ b/views/partials/footer.hbs
@@ -0,0 +1,21 @@
+<footer>
+    <nav class="navbar navbar-default navbar-fixed-bottom">
+        <div class="container-fluid">
+            <div class="navbar-collapse collapse" id="footer-body">
+                <ul class="nav navbar-nav">
+                    <li><a href="/about">About Us</a></li>
+                    <li><a href="#">Contact Us</a></li>
+                    <li><a href="#">Terms &amp; Conditions</a></li>
+                    <li><a href="#">Privacy Policy</a></li>
+                </ul>
+            </div>
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#footer-body">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+        </div>
+    </nav>
+</footer>
\ No newline at end of file
diff --git a/views/partials/header.hbs b/views/partials/header.hbs
new file mode 100644
index 0000000..d4c51e3
--- /dev/null
+++ b/views/partials/header.hbs
@@ -0,0 +1,59 @@
+<nav id="mainNav" class="navbar navbar-default navbar-fixed-top" >
+    <div class="container-fluid">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed"
+                    data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span> <span
+                    class="icon-bar"></span> <span class="icon-bar"></span> <span
+                    class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand page-scroll" href="/">Solutions.Repo</a>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse"
+             id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav navbar-right">
+                <!--<li><a href="user_solutions.html">Solutions Page</a></li>
+                <li><a href="user_profile_alt.html">Profile Page</a></li>
+                <li><a href="questions.html">Questions Page</a></li>
+                <li><a href="exams.html">Exams Pages</a></li>-->
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li class="dropdown-submenu">
+                            <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right"></i></a>
+                            <ul class="dropdown-menu">
+                                <li><a tabindex="-1" href="/exams/csc108">CSC108</a></li>
+                                <li><a href="/exams/csc148">CSC148</a></li>
+                                <li><a href="/exams/csc165">CSC165</a></li>
+                            </ul>
+                        </li>
+                        <li><a href="#">Second Year</a></li>
+                        <li><a href="#">Third Year</a></li>
+                        <li><a href="#">Fourth Year</a></li>
+                    </ul>
+                </li>
+                <li><a href="#" data-toggle="modal" data-target=".login-window">Log In</a></li>
+                <li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li>
+                <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="/questions">Questions Page</a></li>
+                        <li><a href="/exams">Exams Pages</a></li>
+                    </ul>
+
+                </li>
+
+
+                <!--<li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> &ndash;&gt;-->
+            </ul>
+        </div>
+        <!-- /.navbar-collapse -->
+    </div>
+    <!-- /.container-fluid -->
+</nav>
\ No newline at end of file
diff --git a/views/partials/login.hbs b/views/partials/login.hbs
new file mode 100644
index 0000000..521c730
--- /dev/null
+++ b/views/partials/login.hbs
@@ -0,0 +1,28 @@
+<!-- POP UP WINDOW FOR LOGIN -->
+<article class="modal fade login-window">
+    <div class="modal-dialog">
+        <div class="modal-content">
+
+            <section class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title">Log In</h4>
+            </section>
+
+            <section class="modal-body">
+                <form role="form">
+                    <div class="form-group">
+                        <input type="text" class="form-control" placeholder="Username">
+                    </div>
+                    <div class="form-group">
+                        <input type="password" class="form-control" placeholder="Password">
+                    </div>
+                </form>
+            </section>
+
+            <div class="modal-footer">
+                <button class="btn">Submit</button>
+            </div>
+
+        </div>
+    </div>
+</article>
\ No newline at end of file
diff --git a/views/partials/registration.hbs b/views/partials/registration.hbs
new file mode 100644
index 0000000..36e02ac
--- /dev/null
+++ b/views/partials/registration.hbs
@@ -0,0 +1,49 @@
+<!-- POP UP WINDOW FOR REGISTRATION -->
+<article class="modal fade registration-window">
+    <div class="modal-dialog">
+        <div class="modal-content">
+
+            <section class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title">Sign Up</h4>
+            </section>
+
+            <section class="modal-body">
+                <form role="form">
+                    <div class="form-group">
+                        <input type="text" class="form-control" placeholder="First Name">
+                    </div>
+
+                    <div class="form-group">
+                        <input type="text" class="form-control" placeholder="Last Name">
+                    </div>
+
+                    <div class="form-group">
+                        <input type="email" class="form-control" placeholder="Email">
+                    </div>
+
+                    <div class="form-group">
+                        <input type="email" class="form-control" placeholder="New Username">
+                    </div>
+                    <div class="form-group">
+                        <input type="password" class="form-control" placeholder="New Password">
+                    </div>
+
+                    <div class="form-group">
+                        <input type="text" class="form-control" placeholder="University (optional)">
+                    </div>
+
+                    <div class="form-group">
+                        <input type="text" class="form-control" placeholder="Department (optional)">
+                    </div>
+
+                </form>
+            </section>
+
+            <div class="modal-footer">
+                <button class="btn">Submit</button>
+            </div>
+
+        </div>
+    </div>
+</article>
\ No newline at end of file
diff --git a/views/questions.hbs b/views/questions.hbs
new file mode 100644
index 0000000..8b69f8f
--- /dev/null
+++ b/views/questions.hbs
@@ -0,0 +1,81 @@
+<main id = 'solutions-main'>
+    <div class = 'search container' id = 'solutions-div'>
+
+            <!-- EXAM DETAILS -->
+
+            <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'>
+                <h3>CSC148</h3>
+                <p>Winter 2015 exam</p>
+                <p><em>Instructor(s): </em>Fairgrieve and Hangerman </p>
+                <p><em>Upload date:</em> 2016-07-08</p>
+                <p><em>Uploaded by:</em> John Smith</p>
+                <p><em>Page count:</em> 22</p>
+                <p><em>Question count:</em> 10</p>
+            </section>
+
+            <!-- QUESTION LISTINGS -->
+
+            <a href="/user_solutions">
+            <section class = 'solutions-card row'>
+                <div class='pull-left col-sm-8 col-md-8'>
+                    <h3 class = 'questions-number'>Question 1</h3>
+                    <p><span class='questions-sol-num'>2 solutions, </span> <span class = 'questions-comment'>6 comments</span></p>
+                </div>
+                <div class='pull-right right-arrow'>
+                    <img class='rounded' src="assets/images/right-arrow.png">
+                </div>
+            </section>
+            </a>
+
+            <a href="/user_solutions">
+            <section class = 'solutions-card row'>
+                <div class='pull-left col-sm-8 col-md-8'>
+                    <h3 class = 'questions-number'>Question 2</h3>
+                    <p><span class='questions-sol-num'>1 solution, </span> <span class = 'questions-comment'>2 comments</span></p>
+                </div>
+                <div class='pull-right right-arrow'>
+                    <img class='rounded' src="assets/images/right-arrow.png">
+                </div>
+            </section>
+            </a>
+
+            <a href="/user_solutions">
+            <section class = 'solutions-card row'>
+                <div class='pull-left col-sm-8 col-md-8'>
+                    <h3 class = 'questions-number'>Question 3</h3>
+                    <p><span class='questions-sol-num'>1 solution, </span> <span class = 'questions-comment'>2 comments</span></p>
+                </div>
+                <div class='pull-right right-arrow'>
+                    <img class='rounded' src="assets/images/right-arrow.png">
+                </div>
+
+            </section>
+            </a>
+
+            <a href="/user_solutions">
+            <section class = 'solutions-card row'>
+                <div class='pull-left col-sm-8 col-md-8'>
+                    <h3 class = 'questions-number'>Question 4</h3>
+                    <p><span class='questions-sol-num'>3 solutions, </span> <span class = 'questions-comment'>2 comments</span></p>
+                </div>
+                <div class='pull-right right-arrow'>
+                    <img class='rounded' src="assets/images/right-arrow.png">
+                </div>
+            </section>
+            </a>
+
+            <a href="/user_solutions">
+            <section class = 'solutions-card row'>
+                <div class='pull-left col-sm-8 col-md-8'>
+                    <h3 class = 'questions-number'>Question 5</h3>
+                    <p><span class='questions-sol-num'>0 solutions </span> <span class = 'questions-comment'></span></p>
+                </div>
+                <div class='pull-right right-arrow'>
+                    <img class='rounded' src="assets/images/right-arrow.png">
+                </div>
+            </section>
+            </a>
+    </div>
+</main>
diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs
new file mode 100644
index 0000000..624e2c6
--- /dev/null
+++ b/views/user_profile_alt.hbs
@@ -0,0 +1,251 @@
+<main id="solutions-main">
+    <div class="container user-info-content">
+        <div class="row">
+
+            <!-- User Profile details -->
+            <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 col-xs-offset-0
+            col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
+
+                <!-- User Profile 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="collapse navbar-collapse" id="profile-nav">
+                            <ul class="nav navbar-nav " >
+                                <li><a href="#" class="prf-page">General</a></li>
+                                <li><a href="#" class="prf-page">Follows</a></li>
+                                <li><a href="#" class="prf-page">Friends</a></li>
+                                <li><a href="#" class="prf-page">Inbox</a></li>
+                                <li><a href="#" class="prf-page">Comments</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </nav>
+
+                <div class="rounded">
+                    <div class="panel panel-info rounded">
+                        <div class="panel-heading">
+                            <h3 class="panel-title">Walter White</h3>
+                        </div>
+                        <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">
+                                    <img alt="User Pic" src="assets/images/avatar.png"
+                                         class="img-circle img-responsive">
+                                </div>
+                                <!-- User Details -->
+                                <div class=" col-md-9 col-lg-9 ">
+                                    <table class="table table-user-information">
+                                        <tbody>
+                                        <tr>
+                                            <td>Univeristy:</td>
+                                            <td>U of T</td>
+                                        </tr>
+                                        <tr>
+                                            <td>Department:</td>
+                                            <td>CS</td>
+                                        </tr>
+                                        <tr>
+                                            <td>Answered:</td>
+                                            <td>50</td>
+                                        </tr>
+                                        <tr>
+                                        <tr>
+                                            <td>Messages:</td>
+                                            <td>25</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>
+                                        </tr>
+                                        </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>
+
+                                        </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>
+                            </div>
+                            <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">
+                                    <table class="table-condensed">
+                                        <tbody>
+                                        <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/user5.jpeg" alt="avatar">
+                                            </th>
+                                            <th>
+                                                <h4>Jay Leno</h4>
+                                                <p>5 comments</p>
+                                            </th>
+                                        </tr>
+                                        <tr>
+                                            <th>
+                                                <img class="img-circle img-responsive"
+                                                     src="assets/images/misc/user6.jpeg" alt="avatar">
+                                            </th>
+                                            <th>
+                                                <h4>Lisa Simpson</h4>
+                                                <p>658 comments</p>
+                                            </th>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                            <div class="row" id="profile-inbox">
+                                <h3>Inbox</h3>
+                                <div class="col-sm-10 col-sm-offset-1 prf-tables">
+                                    <table class="table">
+                                        <thead>
+                                        <tr>
+                                            <th>Date</th>
+                                            <th>Subject</th>
+                                            <th>Sender</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr>
+                                                <td>2016-05-01</td>
+                                                <td>Great Solution!1</td>
+                                                <td>The Dude</td>
+                                            </tr>
+                                            <tr>
+                                                <td>2016-04-05</td>
+                                                <td>Woah look at this</td>
+                                                <td>Lady Lips</td>
+                                            </tr>
+                                            <tr>
+                                                <td>2016-02-30</td>
+                                                <td>I don't get this, help!</td>
+                                                <td>The Dude</td>
+                                            </tr>
+                                            <tr>
+                                                <td>2016-01-15</td>
+                                                <td>I solved your problem</td>
+                                                <td>Lisa</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                            <div class="row" id="profile-comments">
+                                <h3>Comment History</h3>
+                                <div class="col-sm-10 col-sm-offset-1 prf-tables">
+                                <table class="table">
+                                    <thead>
+                                    <tr>
+                                        <th>Date</th>
+                                        <th>Comment</th>
+                                        <th>Exam</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <td>2016-05-01</td>
+                                        <td>Use BFS! Not DFS!</td>
+                                        <td>CSC148 > Winter 2014</td>
+                                    </tr>
+                                    <tr>
+                                        <td>2016-04-05</td>
+                                        <td>Use a heap!</td>
+                                        <td>CSC263 > Fall 2015</td>
+                                    </tr>
+                                    <tr>
+                                        <td>2016-02-30</td>
+                                        <td>I love python!</td>
+                                        <td>CSC108 > Winter 2015</td>
+                                    </tr>
+                                    <tr>
+                                        <td>2016-01-15</td>
+                                        <td>I hate verilog!</td>
+                                        <td>CSC258 > Fall 2015</td>
+                                    </tr>
+                                    </tbody>
+
+                                </table>
+                                </div>
+                            </div>
+
+                            <!-- Date, Edit, Logout (new row) -->
+                            <div class="col-md-12 prf-sign-off">
+                                <p class=" text-info"> July 4 2016 </p>
+                                <a href="#">Edit Profile</a>
+                                <a href="#">Logout</a>
+                                <br>
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</main>
\ No newline at end of file
diff --git a/views/user_solutions.hbs b/views/user_solutions.hbs
new file mode 100644
index 0000000..8380d53
--- /dev/null
+++ b/views/user_solutions.hbs
@@ -0,0 +1,125 @@
+<main id="solutions-main">
+		<div class='search solutions-container container'>
+			<div>
+				<!-- Add Solution button and path -->
+				<div class="row top-sol">
+					<button class="col-xs-4 col-sm-2 col-md-2 col-lg-2
+					col-xs-offset-4 col-sm-offset-5 col-md-offset-2
+					col-lg-offset-2 rounded" id="add-solution">
+						<h3>Add a solution</h3>
+					</button>
+
+					<!-- Replace p below with breadcrumbs later -->
+					<p class="col-xs-12 col-sm-12 col-md-6 show-path">
+						CSC148 > Winter 2015 > Question 1
+					</p>
+				</div>
+
+				<!-- Solution 1 Example -->
+				<div class="row">
+				<section id="sol-1" 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">
+							<p class="username"><a href="/user_profile">jSmith123</a></p>
+						</div>
+
+						<div class="pull-right">
+							<div class="upvoting">
+								<button class="upvote"><img src="assets/images/up_arrow.png"></button>
+								<p class="upvote num-upvotes">3</p>
+							</div>
+							<div class="downvoting">
+								<button class="downvote"><img src="assets/images/down_arrow.png"></button>
+								<p class=" downvote num-downvotes">-1</p>
+							</div>
+						</div>
+					</div>
+
+					<div class="user-sol">
+						<h3>Solution</h3>
+						<p><img src="assets/images/dummy-sol1.png"> </p>
+					</div>
+
+					<div class="comments">
+						<h3><a data-toggle="collapse" href="#com1"><span>3</span> comments <span class="caret"></span></a></h3>
+
+						<div id="com1" class="panel-collapse collapse">
+						<ul class="list-group">
+							<li class="list-group-item">
+								<img src="assets/images/misc/user3.jpeg" class="img-responsive img-circle comment-user-img">
+								<p class="comment-username"><a href="/user_profile">janeDoe456</a></p>
+								<p class="user-comment"> This is a good answer!</p>
+							</li>
+
+							<li class="list-group-item">
+								<img src="assets/images/misc/user2.jpeg" class="img-responsive img-circle comment-user-img">
+								<p class="comment-username"><a href="/user_profile">BenAfleckIsAnOkActor</a></p>
+								<p class="user-comment">Ben Affleck is indeed just an ok actor.</p>
+							</li>
+
+							<li class="list-group-item">
+								<img src="assets/images/misc/user6.jpeg" class="img-responsive img-circle comment-user-img">
+								<p class="comment-username"><a href="/user_profile">morgana254</a></p>
+								<p class="user-comment">I mean, he's no Casey Affleck.</p>
+							</li>
+
+						</ul>
+						</div>
+
+					</div>
+					
+				</section>
+				</div>
+
+				<!-- Solution 2 Example -->
+				<div class="row">
+					<section id="sol-2" 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/user3.jpeg">
+							<p class="username"><a href="/user_profile">janeDoe456</a></p>
+						</div>
+
+						<div class="pull-right">
+							<div class="upvoting">
+								<button class="upvote"><img src="assets/images/up_arrow.png"></button>
+								<p class="upvote num-upvotes">4</p>
+							</div>
+							<div class="downvoting">
+								<button class="downvote"><img src="assets/images/down_arrow.png"></button>
+								<p class=" downvote num-downvotes">-8</p>
+							</div>
+						</div>
+					</div>
+
+					<div class="user-sol">
+						<h3>Solution</h3>
+						<p><img src="assets/images/dummy-sol2.png"> </p>
+					</div>
+
+					<div class="comments">
+
+						<h3><a data-toggle="collapse" data-target="#com2" href="#com2" aria-expanded="true"><span>2</span> comments <span class="caret"></span></a></h3>
+
+						<div id="com2" class="panel-collapse collapse">
+						<ul class="list-group">
+							<li class="list-group-item">
+								<img src="assets/images/misc/user5.jpeg" class="img-responsive img-circle comment-user-img">
+								<p class="comment-username"><a href="/user_profile">catherineTheGreat</a></p>
+								<p class="user-comment"> As a Portuguese, this was offensive and hilarious.</p>
+							</li>
+
+							<li class="list-group-item">
+								<img src="assets/images/user-default.png" class="img-responsive img-circle comment-user-img">
+								<p class="comment-username"><a href="/user_profile">alexStrav748</a></p>
+								<p class="user-comment">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+							</li>
+						</ul>
+						</div>
+					</div>
+					</section>
+				</div>
+			</div>
+		</div>
+	</main>
-- 
cgit v1.2.3