logs_collector/collector/static/collector/js/jq.delete.archive.js

@@ -0,0 +1,31 @@
+$(function () {
+    function deleteArchiveListElement(id) {
+        const archiveList = `#li-archive-${id}`
+        $(archiveList).remove()
+    }
+    $(".btn-archive-eraser").click(function (e) { 
+        e.preventDefault();
+        const csrf = $("input[name=csrfmiddlewaretoken]").val()
+        console.log(csrf)
+        const archiveListElement = $(this).attr("data-jq-archive-target");
+        $.ajax({
+            type: "delete",
+            url: $(this).attr("href"),
+            headers: {
+                'X-CSRFToken':csrf,
+                'Content-Type':'application/json'
+            },
+            // beforeSend: function(xhr) {
+            //     xhr.setRequestHeader("X-CSRFToken", csrf);
+            // },
+            success: function (response) {
+                console.log(response)
+                deleteArchiveListElement(archiveListElement);
+            },
+            error: function (response) {
+                console.log(response)
+            }
+        });
+    });
+    console.log("JQ is ready to work");
+});

logs_collector/collector/static/collector/js/jq.ticket.detail.js

@@ -1,61 +0,0 @@
-$(function () {
-    // CSRF token:
-    const csrf = $("input[name=csrfmiddlewaretoken]").val()
-    
-    function deleteArchiveListElement(id) {
-        const archiveList = `#li-archive-${id}`
-        $(archiveList).hide(1500);
-    }
-    $(".btn-archive-eraser").click(function (e) { 
-        e.preventDefault();
-        const archiveListElement = $(this).attr("data-jq-archive-target");
-        $.ajax({
-            type: "delete",
-            url: $(this).attr("href"),
-            headers: {
-                'X-CSRFToken':csrf,
-                'Content-Type':'application/json'
-            },
-            // beforeSend: function(xhr) {
-            //     xhr.setRequestHeader("X-CSRFToken", csrf);
-            // },
-            success: function (response) {
-                console.log(response.status)
-                deleteArchiveListElement(archiveListElement);
-            },
-            error: function (response) {
-                console.log(response.status)
-            }
-        });
-    });
-    $("#ticket-state").click(function () { 
-        console.log('Press');
-        let resolved = false;
-        if ($(this).attr("checked")) {
-            console.log('Find it!!!')
-            resolved = true;   
-        } else {
-            resolved = false;
-        }
-        $.ajax({
-            type: "post",
-            url: $(this).attr("ticket-state-url"),
-            headers: {
-                'X-CSRFToken':csrf,
-                'Content-Type':'application/json'
-            },
-            contentType: 'application/json',
-            dataType: 'json',
-            data: JSON.stringify({
-                "resolved": resolved
-            }),
-            success: function (response) {
-                console.log(response.status)
-            },
-            error: function (response) {
-                console.log(response.status)
-            }
-        });
-    });
-    console.log("JQ is ready to work");
-});

logs_collector/collector/templates/collector/base.html

@@ -8,32 +8,26 @@
       rel="stylesheet"
       href="{% static 'collector/css/bootstrap.min.css' %}"
       rel="stylesheet"
-    >
+    />
     <link
       rel="apple-touch-icon"
       sizes="180x180"
       href="{% static 'collector/img/apple-touch-icon.png' %}"
-    >
+    />
     <link
       rel="icon"
       type="image/png"
       sizes="32x32"
       href="{% static 'collector/img/favicon-32x32.png' %}"
-    >
+    />
     <link
       rel="icon"
       type="image/png"
       sizes="16x16"
       href="{% static 'collector/img/favicon-16x16.png' %}"
-    >
+    />
-    <link 
+    <link rel="manifest" href="{% static 'collector/img/site.webmanifest' %}">
-      rel="manifest"
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css">
-      href="{% static 'collector/img/site.webmanifest' %}"
-    >
-    <link 
-      rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css"
-    >
     <title>Document</title>
   </head>
   <body>

logs_collector/collector/templates/collector/navigation.html

@@ -81,9 +81,9 @@
                   <span class="visually-hidden">Toggle Dropdown</span>
                 </button>
                 <ul class="dropdown-menu dropdown-menu-end">
-                  <li><button class="dropdown-item" type="button"><i class="bi bi-gear"></i> Settings</button></li>
+                  <li><button class="dropdown-item" type="button">Settings</button></li>
                   <li><hr class="dropdown-divider" /></li>
-                  <li><button class="dropdown-item" type="button"><i class="bi bi-door-closed"></i> Logout</button></li>           
+                  <li><button class="dropdown-item" type="button">Logout</button></li>           
                 </ul>
               </div>              
             </li>

logs_collector/collector/templates/collector/ticket.html

@@ -11,21 +11,11 @@
           <div class="card-body" aria-current="true">
             <div class="d-flex w-100 justify-content-between mb-2">
               <h4 class="card-title mb-1">Ticket: {{ ticket.number }}</h4>
-              <small><i class="bi bi-clock-history"></i> {{ ticket.time_create }}</small>
+              <small>{{ ticket.time_create }}</small>
-            </div>
-            <div class="form-check form-switch form-check-reverse d-flex w-100 justify-content-left">
-              <label class="form-check-label" for="ticket-state">Resolved:</label>
-              <input 
-                class="form-check-input ms-2 mb-2"
-                type="checkbox"
-                role="switch"
-                id="ticket-state"
-                ticket-state-url="{% url 'ticket' ticket.platform ticket.number %}"
-                {% if ticket.resolved %} checked {% endif %}>
             </div>
             <div class="col-xl-6 mb-2">
               <h6 class="card-title mb-1">Platform: {{ ticket.platform.pretty_name }}</h6>
-              <h6 class="card-title mb-3">Owner: {{ ticket.user.username }}</h6>
+              <h6 class="card-title mb-1">Owner: {{ ticket.user.username }}</h6>
             </div>   
             <div class="col-xl-6 mt-1 mb-2">
               {% if ticket.note %}
@@ -54,11 +44,6 @@
                         <br>
                         <b>SHA1:</b>
                         <span style="word-wrap: break-word">{{ archive.sha1 }}</span>
-                      </small>
-                      <small>
-                        <br>
-                        <b>Uploaded:</b>
-                        <span style="word-wrap: break-word">{{ archive.time_update }}</span>
                       </small>
                       <br>
                       <small>
@@ -134,5 +119,5 @@
 </main>
 {% endblock content %}
 {% block jquery %}
-  <script src="{% static 'collector/js/jq.ticket.detail.js' %}"></script>
+  <script src="{% static 'collector/js/jq.delete.archive.js' %}"></script>
 {% endblock jquery %}

logs_collector/collector/utils.py

@@ -16,8 +16,3 @@ def get_file_size(file_path, unit='bytes'):
     else:
         size = file_size / 1024 ** exponents_map[unit]
         return round(size, 3)
-
-
-def is_ajax(request):
-    if request.headers.get('x-requested-with') == 'XMLHttpRequest':
-        return True

logs_collector/collector/views.py

@@ -1,6 +1,4 @@
-import json
 # from django.shortcuts import render
-from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import FileResponse, JsonResponse, Http404
 from django.views import generic
 
@@ -8,10 +6,9 @@ from rest_framework import status
 # from rest_framework.response import Response
 
 from .models import Archive, Ticket, Platform
-from .utils import is_ajax
 
 
-class ArchiveHandlerView(LoginRequiredMixin, generic.View):
+class ArchiveHandlerView(generic.View):
     def get(self, request, path):
         try:
             file = Archive.objects.get(file=path)
@@ -75,21 +72,8 @@ class DetailTicket(generic.DetailView):
     template_name = 'collector/ticket.html'
     context_object_name = 'ticket'
 
-    def post(self, request, platform, ticket):
-        if is_ajax(request):
-            model = self.get_object()
-            if request.body:
-                data = json.loads(request.body)
-                if data.get('resolved') is True:
-                    model.resolved = False
-                    model.save()
-                if data.get('resolved') is False:
-                    model.resolved = True
-                    model.save()
-        return JsonResponse({'status': 201}, status=status.HTTP_201_CREATED)
-
     def get_object(self, queryset=None):
-        return self.model.objects.get(number=self.kwargs.get('ticket'))
+        return Ticket.objects.get(number=self.kwargs.get('ticket'))
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)