version 1

polls/models.py

@@ -27,7 +27,7 @@ class Question(models.Model):
 
 class Choice(models.Model):
     
-    question    = models.ForeignKey(Question, on_delete=models.CASCADE)
+    question    = models.ForeignKey(Question, on_delete=models.CASCADE,related_name="choice_set")
     choice_text = models.CharField(max_length=200)
     
     def __str__(self):
@@ -44,4 +44,8 @@ class Choice(models.Model):
 
 class Vote(models.Model):
     user     = models.ForeignKey(User, on_delete=models.CASCADE)
-    choice   = models.ForeignKey(Choice, on_delete=models.CASCADE)
+    choice   = models.ForeignKey(Choice, on_delete=models.CASCADE,related_name="vote_set")
+
+    
+    # def user_voted_questions(self,user):
+    #     return self.objects

polls/static/polls/header.css

@@ -12,9 +12,15 @@ header{
     justify-content: space-between;
     padding: 0 80px;
 }
-header>#app_name{
+#app_name{
     font-size: larger;
 }
+a{
+    padding: 0;
+    margin: 0;
+    text-decoration: none;
+    color:unset;
+}
 
 #profile{
     background-color: #00000058;

polls/static/polls/index.css

@@ -113,7 +113,7 @@
     align-items: center;
 
 }
-.question_header>.right_section>img{
+.question_header>.right_section>a>img{
     fill: white;
     height: 25px;
     
@@ -188,4 +188,19 @@
 
 .vote_btn:hover{
     cursor: pointer;
+}
+
+.delete_btn{
+    margin: 10px 0;
+    border:none;
+    outline: none;
+    
+    background-color: red;
+    color: white;
+    padding: 10px 30px;
+    border-radius: 8px;
+}
+
+.delete_btn:hover{
+    cursor: pointer;
 }

polls/static/polls/index.js

@@ -55,6 +55,7 @@ function validate(elem){
 }
 
 function Vote(elem){
+    elem=elem.parentElement;
     if(!validate(elem.parentElement))   return;
 
     var data_to_send = {};
@@ -62,7 +63,7 @@ function Vote(elem){
     
     data_to_send["choice_id"]=elem.parentElement.querySelector('.choice.active').dataset.id;
 
-    fetch("vote/",{
+    fetch(vote_url,{
         method:"POST",
         headers:{
             'X-CSRFToken': csrftoken

polls/static/polls/your_polls.css

@@ -1,180 +0,0 @@
-/* .questions{
-    display: flex;
-    flex-wrap: wrap;
-}
-.question{    
-    background-color: rgb(133, 127, 255);
-    color: white;
-    padding: 4px;
-    margin:20px 4px;
-    width:140px;
-    height: 150px;
-    border-radius: 10px;
-    position:relative;
-}
-.question>.question_text{
-    font: caption;
-    margin: 0px;
-    padding: 0px;
-    margin-bottom: 14px;
-}
-.question:hover{
-    cursor: pointer;
-}
-
-.total_count{
-    font:-webkit-control;
-    color: black;
-    position:absolute;
-    bottom: 5px;
-    right: 5px;
-    padding: 0;
-    margin: 0;
-} */
-
-
-/***********************New css*****************************/
-
-
-
-
-
-
-
-
-/*********************sub header***************************/
-#sub_header{
-    font-weight:100;
-    padding:40px 40px;
-    padding-bottom: 0px;
-}
-
-
-/*******************main container*******************************/
-
-#main_container{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-}
-
-.question_container{
-    width:500px;
-    
-    color:#ffffff;
-    background-color: #5B66C6;
-    
-    border-radius: 7px;
-    box-shadow: 0px 20px 52px 0px #0000004b;
-    overflow: hidden;
-    margin-top:40px;
-}
-.question_container:last-child{
-    margin-bottom:40px;
-}
-
-.question_header{
-    padding: 10px 20px;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-
-}
-
-.question_meta{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    margin-right: 30px;
-
-    font-size: small;
-    font-weight: 100;
-}
-
-.question_header>.question_text{
-    width: 60%;
-    color:white;
-    background-color: #5B66C6;
-    border:none;
-    outline: none;
-
-    overflow: hidden;
-    resize: none;
-}
-.question_header>.right_section{
-    display: flex;
-    align-items: center;
-
-}
-.question_header>.right_section>img{
-    fill: white;
-    height: 25px;
-    
-    
-}  
-
-.question_container>.form_container{
-    box-sizing: border-box;
-    padding: 10px 20px;
-    width: 100%;
-    border-radius: 7px;
-
-    background-color: white;
-    
-    
-    display:flex;
-    flex-direction: column;
-    align-items: center;
-
-}
-.choices{
-    margin-top: 30px;
-    width: 100%;
-}
-
-.choice{
-    margin: 10px 0;
-    padding: 10px 20px;
-    
-    background-color: #5b66c670;
-    
-    border-radius: 3px;
-    display: flex;
-}
-
-.choice_text{
-    margin-left: 20px;
-    color:white;
-    background-color:transparent;
-    border:none;
-    outline: none;
-    overflow: hidden;
-    resize: none;
-}
-.choice_text:hover{
-    cursor:pointer;
-}
-
-.choice:hover{
-    background-color: #5B66C6;
-    /* color:#C3C3C3; */
-    cursor: pointer;
-}
-
-.vote_btn{
-    margin: 10px 0;
-    border:none;
-    outline: none;
-    
-    background-color: #5B66C6;
-    color: white;
-    padding: 10px 30px;
-    border-radius: 8px;
-}
-
-.vote_btn:hover{
-    cursor: pointer;
-}

polls/static/polls/your_polls.js

@@ -1,64 +1,29 @@
+function DeletePoll(elem){
+    if(!confirm("do you really wanna delete?"))
+        return ;
 
-var tx = document.getElementsByTagName('textarea');
-for (var i = 0; i < tx.length; i++) {
-  tx[i].setAttribute('style', 'height:' + (tx[i].scrollHeight) + 'px;overflow-y:hidden;');
-  tx[i].addEventListener("input", OnInput, false);
-}
 
-function OnInput(e) {
-    e.target.style.height = 'auto';
-    e.target.style.height = (e.target.scrollHeight) + 'px';
-}
+    elem=elem.parentElement.parentElement.parentElement;
+    console.log(elem.dataset.id);
+    var data_to_send = {};
 
+    data_to_send["question_id"]=elem.dataset.id;
 
-function getCookie(name) {
-    let cookieValue = null;
-
-    if (document.cookie && document.cookie !== '') {
-        const cookies = document.cookie.split(';');
-        for (let i = 0; i < cookies.length; i++) {
-            const cookie = cookies[i].trim();
-
-            // Does this cookie string begin with the name we want?
-            if (cookie.substring(0, name.length + 1) === (name + '=')) {
-                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+    fetch(delete_url,{
+        method:"POST",
+        headers:{
+            'X-CSRFToken': csrftoken
+        },
+        body:JSON.stringify(data_to_send)
+    }).then(res=>res.json()).then(res=>{
+        console.log(res);
+        
+        if (res["message"]=="success"){
+            
+            elem.remove();
 
-                break;
-            }
         }
-    }
-
-    return cookieValue;
-}
-const csrftoken = getCookie('csrftoken');
-
-
-
-function validate(){
-    if(question_text.value==''){
-        question_text.style.borderBottom="2px solid red";
-        question_text.focus();
-
-        return false;
-    }
-    else{
-        question_text.style.removeProperty("border-bottom");
-    }
-
-    choice_list=document.querySelectorAll(".choice");
-    var i=0;
-    for(i=0;i<choice_list.length;i++){
-        choice_text=choice_list[i].querySelector(".choice_text");
         
-        if(choice_text.value==""){
-            choice_text.style.borderBottom="2px solid red";
-            choice_text.focus();
-            return false
-        }
-        else{
-            choice_text.style.removeProperty("border-bottom");   
-        }
-    }
+    });
     
-    return true;
 }

polls/templates/polls/detail.html

@@ -1,50 +1,15 @@
-
-<html>
-    <head>
-        {% load static %}
-        <link type="text/css" rel="stylesheet" href="{% static 'polls/detail.css' %}">
-    </head>
-    <body>
-                
-        <div class="question">
-            <p class="question_text">{{ question.question_text }}</p>
-            <div class="options">
-                {% for choice in question.choice_set.all %}
-                <div class="option" onclick="choose_option(this);" data-id="{{ choice.id }}">{{ choice.choice_text }}</div>
-                {% endfor %}
-            </div>
-            <input id="vote_btn" onclick="vote();" type="button" value="Vote">
-        </div>
-
-        <script>
-            var vote_url="{% url 'polls:vote' question.id %}";
-        </script>
-        <script src="{% static 'polls/detail.js' %}"></script>
-    </body>
-</html>
-
-<!-- <form method="POST" action="{% url 'polls:vote' question.id %}">
-{% csrf_token %}
-    <fieldset>
-        <legend>
-            <h1>{{ question.question_text }}</h1>
-            {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
-            {% for choice in question.choice_set.all %}
-                <input type="radio" name="choice" value="{{ choice.id }}" >
-                <label>{{ choice.choice_text }}</label><br>
-            {% endfor %}
-        </legend>
-    </fieldset>
-    <input type="submit" value="Vote">
-</form>
- -->
-
-<!-- 
-<div class="question">
-    <p>Question</p>
-    <div class="options">
-        <div class="option">option A</div>
-        <div class="option">option B</div>
-        <div class="option">option C</div>
-    </div>
-</div> -->
+{% extends 'polls/base.html' %}
+
+{% block head %}
+    {% load index %}
+    {% load static %}
+    <link type="text/css" rel="stylesheet" href="{% static 'polls/index.css' %}">
+{% endblock %}
+
+{% block body %}
+    
+    <h2 id="sub_header">Details</h2>
+    {% include 'polls/question_list.html' %}
+    
+<script src="{% static 'polls/index.js' %}"></script>
+{% endblock %}

polls/templates/polls/header.html

@@ -1,5 +1,8 @@
 <header>
-    <span id="app_name">Polling App</span>
+    <a href="{% url 'polls:index' %}">
+        <span id="app_name">Polling App</span>
+    </a>
+    <!-- <span id="app_name">Polling App</span> -->
     
     <div id="profile" onclick="toggle_profile_options(event)">
         <span id="first_alpha">{{ request.user }}</span>

polls/templates/polls/index.html

@@ -9,78 +9,7 @@
 {% block body %}
     
     <h2 id="sub_header">Public Polls</h2>
-
-    {% if latest_questions_list %}
-
-
-        <div id="main_container">
-            {% for question in latest_questions_list %}
-
-                <div class="question_container">
-                    <div class="question_header">
-                        <textarea oninput="OnInput(event)" class="question_text" readonly="true">{{ question.question_text }}</textarea>
-                        <div class="right_section">
-                            <div class="question_meta">
-                                <span>
-                                    <span class="total_votes">{{ question.total_votes }}</span>
-                                    Votes
-                                </span>
-
-                                <span>Results in 
-                                    <span>1 hour</span>
-                                </span>
-                            </div>
-                            
-                            <img src="{% static 'polls/arrow-up-right-from-square-solid.svg' %}">
-        
-                        </div>
-                    </div>
-                    <div class="form_container">
-                        <div class="choices {{ question.has_voted|yesno:'result,' }}">
-                            
-                            {% for choice in question.choice_set.all  %}
-                                <div class="choice" onclick="select_option(this)" data-id="{{ choice.pk }}" 
-                                    {% if question.has_voted %}
-                                        data-percent="{{ choice.vote_percent }}"
-                                    {% endif %}        
-                                    >
-
-                                    <span>
-                                        <span>{{ forloop.counter|add:"64"|stringformat:"c" }}</span>
-                                        <span> -</span>
-                                    </span>
-                                    <textarea class="choice_text" oninput="OnInput(event)" readonly="true">{{ choice.choice_text }}</textarea>
-                                    
-                                    
-                                </div>
-                            {% endfor %}
-                        </div>
-                        <button class="vote_btn" onclick="Vote(this)">Vote</button>
-                        
-                    </div>
-                </div>
-            {% endfor %}
-        </div>
-
-        
-    {% else %}
-        <p>No questions yet</p>
-    {% endif %}
-    <!-- {% if latest_questions_list %}
-
-        <div class="questions" >
-            {% for question in latest_questions_list %}
-            
-            <div class="question" onclick="window.location.href = `{% url 'polls:detail' question.id %}`;">
-                <p class="question_text">{{ question }}</p>
-                <p class="total_count">Votes:{{ question.total_votes }}</p>  
-            </div>
-            {% endfor %}
-        </div>
-
-        
-    {% else %}
-        <p>No questions yet</p>
-    {% endif %} -->
+    {% include 'polls/question_list.html' %}
+    
 <script src="{% static 'polls/index.js' %}"></script>
 {% endblock %}

polls/templates/polls/question_list.html

@@ -0,0 +1,68 @@
+{% load static %}
+{% if latest_questions_list %}
+
+
+    <div id="main_container">
+        {% for question in latest_questions_list %}
+
+            <div class="question_container" data-id="{{ question.pk }}">
+                <div class="question_header">
+                    <textarea oninput="OnInput(event)" class="question_text" readonly="true">{{ question.question_text }}</textarea>
+                    <div class="right_section">
+                        <div class="question_meta">
+                            <span>
+                                <span class="total_votes">{{ question.total_votes }}</span>
+                                Votes
+                            </span>
+
+                            <span>Results in 
+                                <span>1 hour</span>
+                            </span>
+                        </div>
+                        
+                        <a href="{% url 'polls:detail' question.pk %}">
+                            <img src="{% static 'polls/arrow-up-right-from-square-solid.svg' %}">
+                        </a>
+    
+                    </div>
+                </div>
+                <div class="form_container">
+                    <div class="choices {{ question.has_voted|yesno:'result,' }}">
+                        
+                        {% for choice in question.choice_set.all  %}
+                            <div class="choice" onclick="select_option(this)" data-id="{{ choice.pk }}" 
+                                {% if question.has_voted %}
+                                    data-percent="{{ choice.vote_percent }}"
+                                {% endif %}        
+                                >
+
+                                <span>
+                                    <span>{{ forloop.counter|add:"64"|stringformat:"c" }}</span>
+                                    <span> -</span>
+                                </span>
+                                <textarea class="choice_text" oninput="OnInput(event)" readonly="true">{{ choice.choice_text }}</textarea>
+                                
+                                
+                            </div>
+                        {% endfor %}
+                    </div>
+                    
+                    <div>
+                        {% if canDelete %}
+                        <button class="delete_btn" onclick="DeletePoll(this)">Delete</button>
+                        {% endif %}
+                        <button class="vote_btn" onclick="Vote(this)">Vote</button>
+                    </div>
+                </div>
+            </div>
+        {% endfor %}
+    </div>
+
+    
+{% else %}
+    <p>No questions yet</p>
+{% endif %}
+
+<script>
+    var vote_url="{% url 'polls:vote' %}";
+</script>

polls/templates/polls/your_polls.html

@@ -1,78 +1,20 @@
 {% extends 'polls/base.html' %}
 
 {% block head %}
+    {% load index %}
     {% load static %}
     <link type="text/css" rel="stylesheet" href="{% static 'polls/index.css' %}">
+    <link type="text/css" rel="stylesheet" href="{% static 'polls/your_polls.css' %}">
 {% endblock %}
 
 {% block body %}
     
     <h2 id="sub_header">Your Polls</h2>
-
-    {% if latest_questions_list %}
-
-
-        <div id="main_container">
-            {% for question in latest_questions_list %}
-
-                <div class="question_container">
-                    <div class="question_header">
-                        <textarea oninput="OnInput(event)" class="question_text" readonly="true">{{ question.question_text }}</textarea>
-                        <div class="right_section">
-                            <div class="question_meta">
-                                <span>
-                                    <span>{{ question.total_votes }}</span>
-                                    Votes
-                                </span>
-
-                                <span>Results in 
-                                    <span>1 hour</span>
-                                </span>
-                            </div>
-                            
-                            <img src="{% static 'polls/arrow-up-right-from-square-solid.svg' %}">
-        
-                        </div>
-                    </div>
-                    <div class="form_container">
-                        <div class="choices">
-                            
-                            {% for choice in question.choice_set.all  %}
-                                <div class="choice">
-                                    <span>
-                                        <span>{{ forloop.counter|add:"64"|stringformat:"c" }}</span>
-                                        <span> -</span>
-                                    </span>
-                                    <textarea class="choice_text" oninput="OnInput(event)" readonly="true">{{ choice.choice_text }}</textarea>
-                                </div>
-                            {% endfor %}
-                        </div>
-                        <button class="vote_btn">Vote</button>
-                        
-                    </div>
-                </div>
-            {% endfor %}
-        </div>
-
-        
-    {% else %}
-        <p>No questions yet</p>
-    {% endif %}
-    <!-- {% if latest_questions_list %}
-
-        <div class="questions" >
-            {% for question in latest_questions_list %}
-            
-            <div class="question" onclick="window.location.href = `{% url 'polls:detail' question.id %}`;">
-                <p class="question_text">{{ question }}</p>
-                <p class="total_count">Votes:{{ question.total_votes }}</p>  
-            </div>
-            {% endfor %}
-        </div>
-
-        
-    {% else %}
-        <p>No questions yet</p>
-    {% endif %} -->
+    {% include 'polls/question_list.html' %}
+    
+<script>
+    var delete_url="{% url 'polls:delete' %}";
+</script>    
 <script src="{% static 'polls/index.js' %}"></script>
+<script src="{% static 'polls/your_polls.js' %}"></script>
 {% endblock %}

polls/templates/polls/your_votes.html

@@ -0,0 +1,17 @@
+{% extends 'polls/base.html' %}
+
+{% block head %}
+    {% load index %}
+    {% load static %}
+    <link type="text/css" rel="stylesheet" href="{% static 'polls/index.css' %}">
+{% endblock %}
+
+{% block body %}
+    
+    <h2 id="sub_header">Your Votes</h2>
+
+    {% include 'polls/question_list.html' %}
+    
+
+<script src="{% static 'polls/index.js' %}"></script>
+{% endblock %}

polls/urls.py

@@ -5,15 +5,19 @@ from . import views
 app_name="polls" # for namespace 
 urlpatterns = [
     path("",views.index,name="index"),
+
     path("signup/",views.signup,name="signup"),
     path("login/",views.login,name="login"),
-    path("details/<int:question_id>/",views.detail,name="detail"),
+
     path("vote/",views.vote,name="vote"),
-    path("result/<int:question_id>/",views.result,name="result"),
+    path("<int:question_id>/",views.detail,name="detail"),
+    
 
     path("create/",views.create,name="create"),
+    path("delete/",views.delete_view,name="delete"),
+    
     path("your_polls/",views.your_polls,name="your_polls"),
-    path("votes/",views.your_votes,name="your_votes"),
+    path("your_votes/",views.your_votes,name="your_votes"),
     path("settings/",views.settings,name="settings"),
     path("logout/",views.logout,name="logout"),
 

polls/views.py

@@ -2,6 +2,7 @@ from django.shortcuts import render,get_object_or_404
 from django.http import HttpResponse,Http404,HttpResponseRedirect,JsonResponse
 from django.contrib.auth import login as auth_login,logout as auth_logout
 from django.contrib.auth import get_user_model
+from django.contrib.auth.decorators import login_required
 from django.urls import reverse
 import json
 from .models import Question,Choice,Vote
@@ -11,6 +12,9 @@ from .forms import UserSignupForm,UserLoginForm
 User = get_user_model() # user model
 
 # Create your views here.
+login_url="/polls/login/"
+
+@login_required(login_url=login_url) 
 def index(request):
     latest_questions_list = Question.objects.order_by("-pub_date")[:5]
     
@@ -26,14 +30,7 @@ def index(request):
 
     return render(request,"polls/index.html",context)
 
-def detail(request,question_id):
-    try:
-        question=Question.objects.get(pk=question_id)
-    except Question.DoesNotExist:
-        raise Http404("Question Does Not Exists")
-        
-    return render(request,"polls/detail.html",{"question":question})
-
+@login_required(login_url=login_url) 
 def vote(request):
     if request.method=='POST':
         json_data=json.loads(request.body)
@@ -67,10 +64,6 @@ def vote(request):
         })
     
 
-def result(request,question_id):
-    question=get_object_or_404(Question,pk=question_id)
-    return render(request,"polls/result.html",{"question":question})
-
 def signup(request):
     form=UserSignupForm(request.POST or None)
     context={}
@@ -136,7 +129,7 @@ def login(request):
 
     return render(request,"polls/login.html",context)
 
-
+@login_required(login_url=login_url) 
 def create(request):
     if request.method=="GET":
         return render(request,'polls/create.html',{})
@@ -155,16 +148,64 @@ def create(request):
             
             "redirect":reverse("polls:index")
         })
-    
+
+@login_required(login_url=login_url)     
 def your_polls(request):
     latest_questions_list = Question.objects.filter(author=request.user).order_by("-pub_date")[:5]
-    context={"latest_questions_list":latest_questions_list}
+    
+    for q in latest_questions_list:
+        q.has_voted=q.has_user_voted(request.user) 
+
+    context={"latest_questions_list":latest_questions_list,
+             "canDelete":True}
     return render(request,'polls/your_polls.html',context)
 
+@login_required(login_url=login_url) 
 def your_votes(request):
-    pass
-def settings(request):
-    pass
+    user_voted_questions = Vote.objects.filter(user=request.user)
+    user_voted_questions = Choice.objects.filter(vote_set__in=user_voted_questions)
+    user_voted_questions = Question.objects.filter(choice_set__in=user_voted_questions)
+    # user_voted_questions = Question.objects.all()
+    
+    # print(user_voted_questions)
+    print(user_voted_questions[0].choice_set)
+
+    for q in user_voted_questions:
+        q.has_voted=True
+
+    
+    context={"latest_questions_list":user_voted_questions}
+    return render(request,'polls/your_votes.html',context)
+    
+@login_required(login_url=login_url) 
+def detail(request,question_id):
+    try:
+        question=Question.objects.get(pk=question_id)
+    except Question.DoesNotExist:
+        raise Http404("Question Does Not Exists")
+    
+    # question=get_object_or_404(Question,pk=question_id)
+
+    question.has_voted=True
+
+        
+    return render(request,"polls/detail.html",{"latest_questions_list":[question]})
+
+
+
+
 def logout(request):
     auth_logout(request)
-    return HttpResponseRedirect(reverse('polls:login'))
+    return HttpResponseRedirect(reverse('polls:login'))
+
+@login_required(login_url=login_url) 
+def delete_view(request):
+    if request.method=="POST":
+        json_data=json.loads(request.body)
+        question=get_object_or_404(Question,pk=json_data['question_id'])
+        question.delete()
+        return JsonResponse({"message":"success"})
+    
+
+def settings(request):
+    raise Http404()