Merge branch 'main' into activity-feed

pyproject.toml

@@ -17,7 +17,7 @@ beautifulsoup4 = "^4.12.3"
 colorthief = "^0.2.1"
 django-email-obfuscator = "^0.1.5"
 django-gravatar2 = "^1.4.5"
-django-import-export = "^4.1.0"
+django-import-export = "^4.3.1"
 django-annoying = "^0.10.7"
 dj-rest-auth = "^5.0.2"
 tweepy = "^4.8.0"
@@ -63,7 +63,7 @@ django-filter = "^24.3"
 webdriver-manager = "^4.0.2"
 pillow = "^10.4.0"
 chromedriver-autoinstaller = "^0.6.4"
-sentry-sdk = "^2.18.0"
+sentry-sdk = "^2.19.0"
 bitcash = "^1.0.2"
 pydantic = "^2.7.3"
 pydantic_core = "^2.18.4"

website/templates/base.html

@@ -152,8 +152,22 @@
             {% for message in messages %}
             $.notify("{{ message }}", {
                 style: "custom",
-                className: "{{message.level_tag }}"
-            }); 
+                className: "{{message.level_tag }}",
+                autoHide: true,
+                autoHideDelay: 2000,
+                clicktoHide: true,
+                position: "left bottom",
+                gap: 5,
+                elementSize: {
+                    width: "auto",
+                    height: "auto"
+                }
+            });
+            setTimeout(function() {
+                $('.notifyjs-wrapper').on('mouseenter', function() {
+                    $(this).fadeOut();
+                    });
+                }, 100);
             {% endfor %} 
         {% endif %}
     });

website/templates/new_home.html

@@ -12,7 +12,13 @@
             right: 15px;
         }
     </style>
-    <div class="flex flex-col sm:flex-row mt-[35px]">
+    <div class="mt-14 ml-8">
+        <a href="{% url 'report' %}"
+           class="bg-red-500 text-white px-8 py-4 rounded-lg shadow-lg font-bold text-2xl hover:bg-red-600 transform hover:-translate-y-1 transition hover:text-white">
+            Report a Bug!
+        </a>
+    </div>
+    <div class="flex flex-col sm:flex-row mt-[25px]">
         <div class="flex-1">
             <div class="hero-bugs-container grid grid-cols-1 sm:grid-cols-2 gap-4 mx-4 my-2.5">
                 {% for bug in bugs %}

website/templates/profile_edit.html

@@ -225,7 +225,7 @@ <h2 class="text-4xl font-bold text-center mb-12">Edit Profile</h2>
         <div class="mt-8 border-t pt-6">
             <h3 class="text-lg font-semibold text-red-600">Danger Zone</h3>
             <div class="mt-4">
-                <form action="{% url 'delete_user' %}"
+                <form action="{% url 'delete' %}"
                       method="post"
                       onsubmit="return confirm('Are you sure you want to delete your account? This action cannot be undone.');">
                     {% csrf_token %}

website/views/issue.py

@@ -247,10 +247,13 @@ def UpdateIssue(request):
         return HttpResponse("Missing issue ID")
     issue = get_object_or_404(Issue, pk=request.POST.get("issue_pk"))
     try:
-        for token in Token.objects.all():
-            if request.POST["token"] == token.key:
-                request.user = User.objects.get(id=token.user_id)
-                tokenauth = True
+        tokenauth = False
+        if "token" in request.POST:
+            for token in Token.objects.all():
+                if request.POST["token"] == token.key:
+                    request.user = User.objects.get(id=token.user_id)
+                    tokenauth = True
+                    break
     except:
         tokenauth = False
     if (
@@ -348,9 +351,11 @@ def newhome(request, template="new_home.html"):
 
 def delete_issue(request, id):
     try:
-        token = Token.objects.get(key=request.POST["token"])
-        request.user = User.objects.get(id=token.user_id)
-        tokenauth = True
+        # TODO: Refactor this for a direct query instead of looping through all tokens
+        for token in Token.objects.all():
+            if request.POST["token"] == token.key:
+                request.user = User.objects.get(id=token.user_id)
+                tokenauth = True
     except Token.DoesNotExist:
         tokenauth = False
 

website/views/user.py

@@ -158,7 +158,7 @@ def post(self, request, *args, **kwargs):
             logout(request)
             user.delete()
             messages.success(request, "Account successfully deleted")
-            return redirect(reverse("index"))
+            return redirect(reverse("home"))
         return render(request, "user_deletion.html", {"form": form})
 
 
@@ -202,6 +202,10 @@ def get(self, request, *args, **kwargs):
         return super(UserProfileDetailView, self).get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
+        # if userprofile does not exist, create it
+        if not UserProfile.objects.filter(user=self.object).exists():
+            UserProfile.objects.create(user=self.object)
+
         user = self.object
         context = super(UserProfileDetailView, self).get_context_data(**kwargs)
         context["my_score"] = list(