major changes done, category logos added

2 files changed, 15 insertions, 1 deletions

diff --git a/website/models.py b/website/models.py
index a995af7..7157ee5 100644
--- a/website/models.py
+++ b/website/models.py
@@ -56,6 +56,10 @@ class AnswerComment(models.Model):
     date_created = models.DateTimeField(auto_now_add=True)
     date_modified = models.DateTimeField(auto_now=True)
 
+    def user(self):
+        user = User.objects.get(id=self.uid)
+        return user.username
+
 class Notification(models.Model):
     uid = models.IntegerField()
     pid = models.IntegerField()
diff --git a/website/views.py b/website/views.py
index f5d0180..e368feb 100644
--- a/website/views.py
+++ b/website/views.py
@@ -7,10 +7,11 @@ from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q
 from django.core.mail import EmailMultiAlternatives
-
 from website.models import Question, Answer, Notification, TutorialDetails, TutorialResources, AnswerComment
 from website.forms import NewQuestionForm, AnswerQuesitionForm
 from website.helpers import get_video_info
+from django.contrib.auth import get_user_model
+User = get_user_model()
 
 admins = (
     9, 4376, 4915, 14595, 12329, 22467, 5518
@@ -34,6 +35,12 @@ categories = (
 ) 
 
 def home(request):
+    context = {
+        'categories': categories
+    }
+    return render(request, "website/templates/index.html", context)
+
+def recent_questions(request):
     marker = 0
     if 'marker' in request.GET:
         marker = int(request.GET['marker'])
@@ -84,6 +91,9 @@ def question_answer(request):
                 notification.qid = qid
                 notification.aid = answer.id
                 notification.save()
+    #CONTINUE continue
+    # foo = User.objects.get(pk=)
+    return HttpResponse(foo)
     return HttpResponseRedirect('/question/'+str(qid))
 
 @login_required