Various fixes, see changelog for details.

1 files changed, 125 insertions, 0 deletions

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>