Merge branch 'master' of https://github.com/arjunkomath/Simple-Q-A-App-using-Python-Django

Author: Arjun

README.md

@@ -1,6 +1,6 @@
 # A Simple Q&A App using Python Django
 
-Live Demo : http://djangoqa.azurewebsites.net/
+Live Demo : http://djangoqa.in/
 
 # Screenshots
 

db.sqlite3

@@ -47,14 +47,14 @@
 }
 </style>
 
-{% if question.reward %}
-  <div class="rewarding"></div>
-{% else %}
 {% if question.closed %}
   <div class="closed"></div>
 {% else %}
-  <div class="open"></div>
-{% endif %}
+    {% if question.reward %}
+    <div class="rewarding"></div>
+    {% else %}
+    <div class="open"></div>
+    {% endif %}
 {% endif %}
 
 <div class="container">
@@ -94,11 +94,9 @@ <h3><cool>Q: </cool>{{ question.question_text }}</h3>
 </div>
 
 {% if answers %}
-<div class="panel panel-success">
-  <div class="panel-heading">
-    <h3 class="panel-title">Answers</h3>
-  </div>
-  <div class="panel-body">
+  <h3>Answers</h3>
+  <hr/>
+
     {% for answer in answers %}
     <div class="row">
       {% if user.is_authenticated %}
@@ -113,16 +111,19 @@ <h3 class="panel-title">Answers</h3>
         <a href="/comment/{{ answer.id }}/" class="pull-right"><small><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> Comment &nbsp;</small></a>
 
         {% if answer.votes > 0 %}
-        <div id="ans" class="alert alert-info" role="alert">{{ answer.answer_text|markdown }}</div>
+        <div id="ans" class="alert alert-primary" role="alert">{{ answer.answer_text|markdown }}</div>
         {% elif answer.votes == 0 %}
-        <div id="ans" class="alert alert-warning" role="alert">{{ answer.answer_text|markdown }}</div>
+        <div id="ans" class="alert alert-primary" role="alert">{{ answer.answer_text|markdown }}</div>
         {% else %}
-        <div id="ans" class="alert alert-danger" role="alert">{{ answer.answer_text|markdown }}</div>
+        <div id="ans" class="alert alert-primary" role="alert">{{ answer.answer_text|markdown }}</div>
         {% endif %}
 
+        {% if answer.comment_set %}
           {% for comment in answer.comment_set.all %}
-          <p>-<b>{{ comment.comment_text }}</b><small>, <a href="/profile/{{ comment.user_data.user.id }}">{{ comment.user_data.user.username }}</a> at {{ comment.pub_date }}</small></p>
+          <p><b>{{ comment.comment_text }}</b><small>, <a href="/profile/{{ comment.user_data.user.id }}">{{ comment.user_data.user.username }}</a> <div class="pull-right">{{ comment.pub_date }}</div></small></p>
+          <hr>
           {% endfor %}
+        {% endif %}
       </div>
       <div class ="col-md-2">
 
@@ -135,10 +136,8 @@ <h3 class="panel-title">Answers</h3>
         <p class="pull-right">- <b><a href="/profile/{{ answer.user_data.user.id }}">{{ answer.user_data.user.username }}</a> ({{ answer.user_data.points }})</b></p>
       </div>
     </div>
-
+  <hr>
     {% endfor %}
-  </div>
-</div>
 
 <div class="pagination">
   <span class="step-links">
@@ -161,6 +160,5 @@ <h3 class="panel-title">Answers</h3>
 <center><h2>This question is still open, <a href="/answer/{{ question.id }}" role="button">Write answer!</a></h2></center>
 {% endif %}
 
-</div>
 
 {% include "qa/footer.html" %}

qa/templates/qa/detail.html

@@ -8,9 +8,9 @@
     padding-top: 120px;
     padding-bottom: 40px;
     background-color: #eee;
-  
+
   }
-  .btn 
+  .btn
   {
    outline:0;
    border:none;
@@ -104,5 +104,3 @@ <h1 class="form-signin-heading text-muted">Sign In</h1>
 	<center><h2 class="form-signin-heading text-muted">or</h2>
     <a class="btn btn-lg btn-success" href="/register" type="submit">New User? Sign Up</a></center>
 </div>
-  
-  

qa/templates/qa/login.html

@@ -1,27 +1,28 @@
-
+{% load bootstrap3 %}
 <div class="container">
 
   {% include "qa/header.html" %}
 
   {% if registered %}
-  <strong>thank you for registering!</strong>
-  <a href="/">Return to the homepage.</a><br />
+  <strong>Thank you for registering!</strong>
+  <a href="/login">You can Login Now!</a><br />
   {% else %}
-  <strong>Enter the following details:</strong><br /><br />
+  <h2>Welcome Aboard!</h2><br /><br />
 
-  <form id="user_form" method="post" action="/register/"
+  <form id="user_form" class="form" method="post" action="/register/"
   enctype="multipart/form-data">
 
   {% csrf_token %}
-
+  {% bootstrap_form user_form %}
   <!-- Display each form. The as_p method wraps each element in a paragraph
   (<p>) element. This ensures each element appears on a new line,
   making everything look neater. -->
-  {{ user_form.as_p }}
-  {{ profile_form.as_p }}
 
-  <!-- Provide a button to click to submit the form. -->
-  <input type="submit" name="submit" value="Register" />
+  {% buttons %}
+        <button type="submit" class="btn btn-primary">
+            {% bootstrap_icon "star" %} Submit
+        </button>
+    {% endbuttons %}
 </form>
 {% endif %}
 

qa/templates/qa/register.html

@@ -9,6 +9,8 @@
 import datetime
 from qa.forms import UserForm, UserProfileForm
 
+from django.core.mail import send_mail
+
 def search(request):
     if request.method == 'POST':
         word = request.POST['word']
@@ -136,6 +138,9 @@ def add(request):
                 t.slug = tag
                 t.save()
                 q.tags.add(t)
+
+        #send_mail('QA: Your Question has been Posted.', 'Thank you for posting the question, '+question_text+'. We will notify you once someone posts an answer.', 'admin@test.com', [request.user.email], fail_silently=False)
+
         return HttpResponseRedirect('/')
     return HttpResponse(template.render(context))
 
@@ -164,7 +169,7 @@ def comment(request, answer_id):
         c.pub_date = pub_date
         c.user_data = user
         c.save()
-    
+
         try:
             question = Question.objects.get(pk=q_id)
             question.views += 1

qa/views.py

@@ -97,3 +97,9 @@
 STATIC_URL = '/static/'
 
 MARKDOWN_EDITOR_SKIN = 'simple'
+
+#EMAIL_HOST = 'smtp.sendgrid.net'
+#EMAIL_HOST_USER = 'username'
+#EMAIL_HOST_PASSWORD = 'your-password'
+EMAIL_PORT = 587
+EMAIL_USE_TLS = True

simpleqa/settings.py

@@ -62,4 +62,6 @@ class QuestionViewSet(viewsets.ModelViewSet):
     url(r'^', include(router.urls)),
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 
+    #url('^forgot/', include('password_reset.urls')),
+
 )