diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/add_solutions.hbs | 18 | ||||
| -rw-r--r-- | views/user_solutions.hbs | 126 |
2 files changed, 79 insertions, 65 deletions
diff --git a/views/add_solutions.hbs b/views/add_solutions.hbs new file mode 100644 index 0000000..2865a88 --- /dev/null +++ b/views/add_solutions.hbs @@ -0,0 +1,18 @@ +<main id="solutions-main"> + +<div class="row" id="solutions-main"> + +<div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3"> + <h3><i class="fa fa-wpforms" aria-hidden="true"></i> Add Solution </h3> + <form action="/user/submit_solution/{{examID}}/{{qID}}" method="post"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Enter Solution" name="solution"> + </div> + <input type="hidden" name="_csrf" value="{{ csrfToken }}"> + <button class="btn btn-primary">Submit</button> + </form> +</div> + +</div> + +</main>
\ No newline at end of file diff --git a/views/user_solutions.hbs b/views/user_solutions.hbs index 847dfff..abf1117 100644 --- a/views/user_solutions.hbs +++ b/views/user_solutions.hbs @@ -1,77 +1,73 @@ <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> +<div class='search solutions-container container'> + <div> + <!-- Add Solution button and path --> + <div class="row top-sol"> + <a href="/user/add_solution/{{examID}}/{{qID}}"> + <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> + </a> - <!-- 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> + <!-- 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-" 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> + <!-- Solution 1 Example --> - <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> + {{#each query}} + <div class="row"> + <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"> + <p class="username">{{this.author}}</p> + </div> - <div class="user-sol"> - <h3>Solution</h3> - <p><img src="assets/images/dummy-sol1.png"> </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">{{this.votes}}</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="comments"> - <h3><a data-toggle="collapse" href="#com1"><span>3</span> comments <span class="caret"></span></a></h3> + <div class="user-sol"> + <h3>Solution</h3> + <p>{{this.text}}</p> + </div> - <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> + <div class="comments"> + <h3><a data-toggle="collapse" href="#com1"><span>{{this.commentCount}}</span> comments <span class="caret"></span></a></h3> - <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> + <div id="com1" class="panel-collapse collapse"> + <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"> + <p class="comment-username"><a href="/user_profile">{{this.by}}</a>, {{this.date}}</p> + <p class="user-comment">{{this.text}}</p> + </li> + {{/each}} - <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> - </ul> - </div> + </div> + </section> + </div> + {{/each}} - </div> - - </section> - </div> - </div> - </div> - </main> + </div> +</div> +</main> + |