Merge branch 'main' into issue-1717

.github/ISSUE_TEMPLATE/test.yml

@@ -0,0 +1,64 @@
+name: test
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug", "triage"]
+projects: ["octo-org/1", "octo-org/44"]
+assignees:
+  - octocat
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: How can we get in touch with you if we need more info?
+      placeholder: ex. email@example.com
+    validations:
+      required: false
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running?
+      options:
+        - 1.0.2 (Default)
+        - 1.0.3 (Edge)
+      default: 0
+    validations:
+      required: true
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browsers are you seeing the problem on?
+      multiple: true
+      options:
+        - Firefox
+        - Chrome
+        - Safari
+        - Microsoft Edge
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

blt/settings.py

@@ -100,6 +100,7 @@
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
+    'allauth.account.middleware.AccountMiddleware',#Newly added for allauth 0.60.1
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
@@ -176,7 +177,9 @@
 #        'LOCATION': 'cache_table',
 #    }
 # }
-
+REST_AUTH = {
+    'SESSION_LOGIN': False
+}
 CONN_MAX_AGE = None
 
 WSGI_APPLICATION = "blt.wsgi.application"

pyproject.toml

@@ -10,21 +10,20 @@ python = "3.11.2"
 toml = "^0.10.2"
 Django = "^4.2.8"
 dj-database-url = "^1.0.0"
-django-allauth = "^0.51.0"
-beautifulsoup4 = "^4.10.0"
+django-allauth = "^0.60.1"
+beautifulsoup4 = "^4.12.3"
 colorthief = "^0.2.1"
 django-email-obfuscator = "^0.1.5"
 django-gravatar2 = "^1.4.4"
 django-import-export = "^2.7.1"
 django-annoying = "^0.10.6"
-django-rest-auth = "^0.9.5"
-dj-rest-auth = "^2.2.4"
+dj-rest-auth = "^5.0.2"
 tweepy = "^4.8.0"
 Unidecode = "^1.3.8"
 user-agents = "^2.2.0"
 whitenoise = "^6.6.0"
 django-debug-toolbar = "^3.7.0"
-selenium = "^4.16.0"
+selenium = "^4.17.2"
 pylibmc = "^1.6.1"
 psycopg2-binary = "^2.9.9"
 boto = "^2.49.0"
@@ -53,7 +52,7 @@ django-tz-detect = "^0.4.0"
 django-tellme = "^0.7.3"
 django-bootstrap-datepicker-plus = "^5.0.5"
 django-star-ratings = "^0.9.2"
-stripe = "^7.11.0"
+stripe = "^7.13.0"
 django-environ = "^0.11.2"
 django-humanize = "^0.1.2"
 drf-yasg = "^1.20.0"
@@ -65,7 +64,7 @@ chromedriver-autoinstaller = "^0.6.3"
 sentry-sdk = "^1.39.2"
 
 [tool.poetry.dev-dependencies]
-black = "^22.3.0"
+black = "^23.12.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

website/static/js/issue.js

@@ -81,13 +81,13 @@ $(function () {
 
     $('body').on('click', '.edit_comment', function (e) {
         e.preventDefault();
-        comment_id = $(this).attr('name');
         old_message = $(this).parent().next().next().text();
-        $(this).parent().next().show();
-        $(this).parent().next().find('textarea').val(old_message);
+        comment_id = $(this).attr('name');
         $(this).hide();
+        $(this).next('.edit_comment').hide();
         $(this).next('.del_comment').hide();
-        $(this).parent().next().next().hide();
+        $(this).parent().next().find('textarea').val(old_message);
+        $(this).parent().parent().next().show();
     });
 
     $(document).on('click', '.edit_form button[type="submit"]', function (e) {
@@ -113,10 +113,7 @@ $(function () {
     $('body').on('click', '.reply_comment', function (e) {
         e.preventDefault();
         comment_id = $(this).attr('name');
-        $(this).hide();
-        $(this).next('.edit_comment').hide();
-        $(this).next().next('.del_comment').hide();
-        $(this).parent().parent().next().show();
+        $(this).parent().parent().parent().next().toggle();
     });
 
     $(document).on('click', '.reply_form button[type="submit"]', function (e) {