Skip to content

Commit

Permalink
polished web
Browse files Browse the repository at this point in the history
  • Loading branch information
jobin212 committed Nov 18, 2016
1 parent de48881 commit 7e83987
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
3 changes: 2 additions & 1 deletion web/daasapp/err_web.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
E_FORM_INVALID='the form you filled out was not complete. please finish filling it out!'
E_USER_NOT_FOUND="we couldn't find the user requested. sorry :("
E_DRONE_NOT_FOUND="we couldn't find the drone requested. sorry :("
E_LISTING_NOT_FOUND = "we couldn't find the listing requested. sorry :/"
E_LISTING_NOT_FOUND = "we couldn't find the listing requested. sorry :/"
E_REGISTER_FAILED = "we could not register you sorry :/"
9 changes: 6 additions & 3 deletions web/daasapp/templates/web/lets-grade.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h3 class="list-group-item-heading">Navigating</h3>

<br> <br>
<b><p> Search </p></b>
<p> You can now search for listings using the upper right hand search box! </p>
<p> You can now search for listings using the upper right hand search box! (Please note that you can only search for the lisitngs you create) </p>

</p>
</li>
Expand Down Expand Up @@ -60,7 +60,7 @@ <h3> Project 4 </h3>
<h3> Project 5 </h3>
<p> 11. As a user, I want to be able to search for new listings of drones which I can lease or rent.
</p>
<p> 12. As a user, I want to be able to search for new listings of drones by any of their rent details: description, legal lease usage, maintenance status, etc.
<p> 12. As a user, I want to be able to search for new listings of drones by any of their rent details: listing description, legal lease usage, drone id, price per day, drone description, etc.
</p>
<p> 13. As a user, I want to quickly be able to search for a listing that I created. (kafka queueing)
</p>
Expand All @@ -78,7 +78,10 @@ <h3 class="list-group-item-heading">Unit Tests</h3>
<p> 4. <a href = "https://github.com/samuelhavron/daas/blob/master/models/daasapp/tests/test_users.py" > See code that inspects biography. </a> </p>
<p> 5. <a href = "https://github.com/samuelhavron/daas/blob/master/models/daasapp/tests/test_users.py" > See code that inspects when the user signed up. </a> </p>
<p> 6. <a href = "https://github.com/samuelhavron/daas/blob/master/models/daasapp/tests/test_drones.py" > See code that tests 3 most recent drones available. </a> </p>
<p> 7-12. The rest of the user stories are implemented as unit tests within our testing folder as demonstrated. </p>
<p> 7-10. These user stories are implemented as unit tests within our testing folder as demonstrated. </p>
<p> 11-13. <a href = "https://github.com/samuelhavron/daas/blob/master/exp/daasapp/test_search.py" > See code that tests searching for drones/listings. </p>


</p>
</li>

Expand Down
6 changes: 3 additions & 3 deletions web/daasapp/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,11 @@ def register(request): # /login
return render(request, 'web/t404.html', resp)

if resp['ok'] == False: # could be much more nuanced.
resp = {'resp':err_web.E_REGISTER_FAILED}
return render(request, 'web/login.html', {'login_form':login_form, 'register_form': register_form, 'resp':resp })
#resp = {'resp':err_web.E_REGISTER_FAILED}
return render(request, 'web/login.html', {'login_form':login_form, 'register_form': register_form, 'resp':err_web.E_REGISTER_FAILED})


resp = '<span style="font-size:30px; color=orange">congrats, you registered an account successfully! login to get started :)</span>'
resp = 'congrats, you registered an account successfully! login to get started :)'
return render(request, 'web/login.html', {'resp':resp})


Expand Down

0 comments on commit 7e83987

Please sign in to comment.