New Issue Page

blt/urls.py

@@ -71,7 +71,10 @@
 )
 from company.views import ShowBughuntView
 from website.alternative_views import (
-    CreateHunt2,
+    like_issue2,
+    flag_issue2,
+    subscribe_to_domains,
+    IssueView2
 )
 
 from blt import settings
@@ -285,6 +288,17 @@
     re_path(
         r"^flag_issue/(?P<issue_pk>\d+)/$", website.views.flag_issue, name="flag_issue"
     ),
+
+    re_path(
+        r"^like_issue2/(?P<issue_pk>\d+)/$", like_issue2, name="like_issue2"
+    ),
+    re_path(
+        r"^flag_issue2/(?P<issue_pk>\d+)/$", flag_issue2, name="flag_issue2"
+    ),
+    path(
+        "domain/<int:pk>/subscribe/", subscribe_to_domains, name="subscribe_to_domains"
+    ),
+
     re_path(
         r"^save_issue/(?P<issue_pk>\d+)/$", website.views.save_issue, name="save_issue"
     ),
@@ -295,7 +309,9 @@
     ), 
     re_path(r"^issue/edit/$", website.views.IssueEdit, name="edit_issue"),
     re_path(r"^issue/update/$", website.views.UpdateIssue, name="update_issue"),
+    path("issue/<str:issue_pk>/comment/", website.views.comment_on_issue, name="comment_on_issue"),
     re_path(r"^issue/(?P<slug>\w+)/$", IssueView.as_view(), name="issue_view"),
+    re_path(r"^issue2/(?P<slug>\w+)/$", IssueView2.as_view(), name="issue_view2"),
     re_path(r"^follow/(?P<user>[^/]+)/", website.views.follow_user, name="follow_user"),
     re_path(r"^all_activity/$", AllIssuesView.as_view(), name="all_activity"),
     re_path(r"^label_activity/$", SpecificIssuesView.as_view(), name="all_activity"),
@@ -329,7 +345,6 @@
     re_path(r"^accounts/", include("allauth.urls")),
     re_path(r"^start/$", TemplateView.as_view(template_name="hunt.html"),name="start_hunt"),
     re_path(r"^hunt/$", login_required(HuntCreate.as_view()), name="hunt"),
-    re_path(r"^hunt2/$", login_required(CreateHunt2.as_view()), name="hunt2"),
     re_path(r"^hunts/$", ListHunts.as_view(), name="hunts"),
     re_path(r"^invite/$", InviteCreate.as_view(template_name="invite.html")),
     re_path(

comments/migrations/0006_comment_author_fk.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.1 on 2023-08-29 04:22
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("website", "0080_alter_issue_team_members"),
+        ("comments", "0005_auto_20170727_1309"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="comment",
+            name="author_fk",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="website.userprofile",
+            ),
+        ),
+    ]

comments/models.py

@@ -4,7 +4,7 @@
 from django.db import models
 from django.utils import timezone
 
-from website.models import Issue
+from website.models import Issue, UserProfile
 
 
 # Create your models here.
@@ -13,6 +13,7 @@ class Comment(models.Model):
     parent = models.ForeignKey('self', null=True, on_delete=models.CASCADE)
     issue = models.ForeignKey(Issue, on_delete=models.CASCADE, related_name='comments')
     author = models.CharField(max_length=200)
+    author_fk = models.ForeignKey(UserProfile,null=True,on_delete=models.SET_NULL)
     author_url = models.CharField(max_length=200)
     text = models.TextField()
     created_date = models.DateTimeField(default=timezone.now)

company/static/company/js/md_editor.js

@@ -127,7 +127,7 @@ function parse(content) {
 
         matches.forEach(element => {
             const extractedText = element.slice(1);
-            content = content.replace(element, '<h1>' + extractedText + '</h1>');
+            content = content.replace(element, '<h1 class="text-4xl font-bold">' + extractedText + '</h1>');
         });
     }
 
@@ -137,7 +137,7 @@ function parse(content) {
 
         matches.forEach(element => {
             const extractedText = element.slice(2);
-            content = content.replace(element, '<h2>' + extractedText + '</h2>');
+            content = content.replace(element, '<h2 class="text-3xl font-semibold">' + extractedText + '</h2>');
         });
     }
 
@@ -147,7 +147,7 @@ function parse(content) {
 
         matches.forEach(element => {
             const extractedText = element.slice(3);
-            content = content.replace(element, '<h3>' + extractedText + '</h3>');
+            content = content.replace(element, '<h3 class="text-2xl font-medium">' + extractedText + '</h3>');
         });
     }
 
@@ -157,7 +157,7 @@ function parse(content) {
 
         matches.forEach(element => {
             const extractedText = element.slice(2, -2);
-            content = content.replace(element, '<strong>' + extractedText + '</strong>');
+            content = content.replace(element, '<strong class="font-bold">' + extractedText + '</strong>');
         });
     }
 
@@ -167,7 +167,7 @@ function parse(content) {
 
         matches.forEach(element => {
             const extractedText = element.slice(2, -1);
-            content = content.replace(element, ' <em>' + extractedText + '</em>');
+            content = content.replace(element, ' <em class="italic">' + extractedText + '</em>');
         });
     }
 
@@ -179,7 +179,7 @@ function parse(content) {
             const text = element.match(/^\[.*\]/)[0].slice(1, -1);
             const url = element.match(/\]\(.*\)/)[0].slice(2, -1);
 
-            content = content.replace(element, '<a href="' + url + '">' + text + '</a>');
+            content = content.replace(element, '<a class="text-blue-500 underline" href="' + url + '">' + text + '</a>');
         });
     }
 
@@ -194,7 +194,7 @@ function parse(content) {
                     currentValue = '<li>' + currentValue.slice(2) + '</li>';
 
                     if (!unorderedList.test(array[index - 1]) && !unorderedSubList.test(array[index - 1])) {
-                        currentValue = '<ul>' + currentValue;
+                        currentValue = '<ul class="list-disc pl-4">' + currentValue;
                     }
 
                     if (!unorderedList.test(array[index + 1]) && !unorderedSubList.test(array[index + 1])) {
@@ -227,7 +227,7 @@ function parse(content) {
                     currentValue = '<li>' + currentValue.slice(2) + '</li>';
 
                     if (!orderedList.test(array[index - 1]) && !orderedSubList.test(array[index - 1])) {
-                        currentValue = '<ol>' + currentValue;
+                        currentValue = '<ol class="list-decimal pl-4">' + currentValue;
                     }
 
                     if (!orderedList.test(array[index + 1]) && !orderedSubList.test(array[index + 1]) && !orderedList.test(array[index + 1])) {
@@ -244,15 +244,15 @@ function parse(content) {
                     currentValue = '<li>' + currentValue.slice(2) + '</li>';
 
                     if (!orderedSubList.test(array[index - 1])) {
-                        currentValue = '<ol>' + currentValue;
+                        currentValue = '<ol class="list-decimal pl-4">' + currentValue;
                     }
 
                     if (orderedList.test(array[index + 1]) && !orderedSubList.test(array[index + 1])) {
                         currentValue = currentValue + '</ol>';
                     }
 
                     if (!orderedList.test(array[index + 1]) && !orderedSubList.test(array[index + 1])) {
-                        currentValue = currentValue + '</ol></li></ol>';
+                        currentValue = currentValue + '</ol class="list-decimal pl-4"></li></ol>';
                     }
                 }
 
@@ -270,3 +270,42 @@ function parse(content) {
         }
     }).join('');
 }
+
+
+function parse2(content) {
+    // Regular Expressions
+    const h1 = /^#{1}[^#].*$/gm;
+    const h2 = /^#{2}[^#].*$/gm;
+    const h3 = /^#{3}[^#].*$/gm;
+    const bold = /\*\*[^\*\n]+\*\*/gm;
+    const italics = /[^\*]\*[^\*\n]+\*/gm;
+    const link = /\[[\w|\(|\)|\s|\*|\?|\-|\.|\,]*(\]\(){1}[^\)]*\)/gm;
+    const lists = /^((\s*((\*|\-)|\d(\.|\))) [^\n]+))+$/gm;
+    const unorderedList = /^[\*|\+|\-]\s.*$/;
+    const unorderedSubList = /^\s\s\s*[\*|\+|\-]\s.*$/;
+    const orderedList = /^\d\.\s.*$/;
+    const orderedSubList = /^\s\s+\d\.\s.*$/;
+
+    // ... (your existing parsing logic)
+
+    // Apply consistent Tailwind CSS classes to generated HTML elements
+    content = content.replace(h1, '<h1 class="text-4xl font-bold">$1</h1>');
+    content = content.replace(h2, '<h2 class="text-3xl font-semibold">$1</h2>');
+    content = content.replace(h3, '<h3 class="text-2xl font-medium">$1</h3>');
+    content = content.replace(bold, '<strong class="font-bold">$1</strong>');
+    content = content.replace(italics, '<em class="italic">$1</em>');
+    content = content.replace(link, '<a class="text-blue-500 underline" href="$1">$2</a>');
+    // ... (update the rest of the parsing logic)
+
+    // Apply Tailwind CSS classes to lists and list items
+    content = content.replace(unorderedList, '<ul class="list-disc pl-4">$&');
+    content = content.replace(unorderedSubList, '<ul class="list-disc pl-8">$&');
+    content = content.replace(orderedList, '<ol class="list-decimal pl-4">$&');
+    content = content.replace(orderedSubList, '<ol class="list-decimal pl-8">$&');
+    content = content.replace('</li>', '</li>'); // Ensure list item closing tag
+
+    // Apply Tailwind CSS class to paragraphs
+    content = content.replace(/<p>(.*?)<\/p>/g, '<p class="text-base">$1</p>');
+
+    return '<div class="container mx-auto py-8">' + content + '</div>';
+}