Merge branch 'main' into task-scheduler

Author: SahilDhillon21

README.md

@@ -4,7 +4,7 @@
 <p align="center"><a href="https://github.com/OWASP/BLT/actions" rel="noopener noreferrer" target="__blank"><img alt="Build" src="https://github.com/OWASP/BLT/actions/workflows/auto-merge.yml/badge.svg"></a> <a href="https://github.com/OWASP/BLT/blob/main/LICENSE.md" rel="noopener noreferrer"><img src="https://img.shields.io/badge/license-AGPL--3.0-blue"></a>
 <a href="https://github.com/OWASP/BLT" rel="noopener noreferrer" target="__blank"><img alt="GitHub stars" src="https://img.shields.io/github/stars/OWASP/BLT?style=social"></a></p>
 
-<img alt="Views" src="https://blt.owasp.org/projects/blt/badge"></a>
+<img alt="Views" src="https://blt.owasp.org/repos/blt/badge/">
 
 Everything is on our <a href="https://blt.owasp.org">homepage</a>
 

blt/urls.py

@@ -174,11 +174,13 @@
     view_hunt,
     weekly_report,
 )
-from website.views.project import (  # ProjectBadgeView,
+from website.views.project import (
+    ProjectBadgeView,
     ProjectDetailView,
     ProjectListView,
     ProjectsDetailView,
     ProjectView,
+    RepoBadgeView,
     RepoDetailView,
     blt_tomato,
     create_project,
@@ -604,9 +606,8 @@
     re_path(r"^api/v1/count/$", issue_count, name="api_count"),
     re_path(r"^api/v1/contributors/$", contributors, name="api_contributor"),
     path("project/<slug:slug>/", ProjectDetailView.as_view(), name="project_view"),
-    # path(
-    #     "projects/<slug:slug>/badge/", ProjectBadgeView.as_view(), name="project-badge"
-    # ),
+    path("projects/<slug:slug>/badge/", ProjectBadgeView.as_view(), name="project-badge"),
+    path("repos/<slug:slug>/badge/", RepoBadgeView.as_view(), name="repo-badge"),
     path("repository/<slug:slug>/", RepoDetailView.as_view(), name="repo_detail"),
     re_path(r"^report-ip/$", ReportIpView.as_view(), name="report_ip"),
     re_path(r"^reported-ips/$", ReportedIpListView.as_view(), name="reported_ips_list"),

website/migrations/0180_rename_project_visit_count_repo_repo_visit_count.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.3 on 2025-01-10 20:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("website", "0179_contributorstats"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="repo",
+            old_name="project_visit_count",
+            new_name="repo_visit_count",
+        ),
+    ]

website/models.py

@@ -1260,7 +1260,7 @@ class Repo(models.Model):
     last_updated = models.DateTimeField(null=True, blank=True)
     total_issues = models.IntegerField(default=0)
     # rename this to repo_visit_count and make sure the github badge works with this
-    project_visit_count = models.IntegerField(default=0)
+    repo_visit_count = models.IntegerField(default=0)
     watchers = models.IntegerField(default=0)
     open_pull_requests = models.IntegerField(default=0)
     primary_language = models.CharField(max_length=50, null=True, blank=True)

website/templates/projects/project_detail.html

@@ -158,6 +158,27 @@ <h1 class="text-3xl font-bold text-white mb-2">{{ project.name }}</h1>
                     </div>
                 </div>
             </div>
+            <!-- Badge URL Section -->
+            <div class="p-6 bg-gray-50 border-t border-gray-200">
+                <h3 class="text-lg font-semibold text-gray-900 mb-4">Project View Count Badge</h3>
+                <div class="flex flex-col gap-4">
+                    <!-- HTML Format -->
+                    <div class="space-y-2">
+                        <div class="text-gray-700 font-medium">HTML:</div>
+                        <div class="relative">
+                            <input type="text"
+                                   readonly
+                                   value='&lt;img alt="Views" src="{{ request.scheme }}://{{ request.get_host }}{% url 'project-badge' project.slug %}" &gt;'
+                                   class="w-full px-4 py-2 bg-white border border-gray-300 rounded-lg pr-24 font-mono text-sm focus:ring-2 focus:ring-red-500 focus:border-transparent"
+                                   id="badge-url-html">
+                            <button onclick="copyToClipboard('badge-url-html')"
+                                    class="absolute right-2 top-1/2 -translate-y-1/2 px-3 py-1 bg-red-500 hover:bg-red-600 text-white text-sm rounded-md transition-colors">
+                                Copy
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
         <!-- Associated Repositories -->
         <div class="grid gap-6">
@@ -287,3 +308,37 @@ <h2 class="text-xl font-bold text-gray-900 mb-4">Project Timeline</h2>
         </div>
     </div>
 {% endblock content %}
+{% block after_js %}
+    <script>
+    function copyToClipboard(elementId) {
+        const element = document.getElementById(elementId);
+        
+        // Select the text
+        element.select();
+        element.setSelectionRange(0, 99999); // For mobile devices
+
+        // Copy the text
+        try {
+            navigator.clipboard.writeText(element.value).then(() => {
+                // Get the button
+                const button = element.nextElementSibling;
+                const originalText = button.textContent;
+                
+                // Change button style to show success
+                button.textContent = 'Copied!';
+                button.classList.remove('bg-red-500', 'hover:bg-red-600');
+                button.classList.add('bg-green-500', 'hover:bg-green-600');
+                
+                // Reset button after 2 seconds
+                setTimeout(() => {
+                    button.textContent = originalText;
+                    button.classList.remove('bg-green-500', 'hover:bg-green-600');
+                    button.classList.add('bg-red-500', 'hover:bg-red-600');
+                }, 2000);
+            });
+        } catch (err) {
+            console.error('Failed to copy text: ', err);
+        }
+    }
+    </script>
+{% endblock %}

website/templates/projects/repo_detail.html

@@ -72,6 +72,27 @@ <h1 class="text-3xl font-bold text-gray-900">{{ repo.name }}</h1>
                     </a>
                 </div>
             </div>
+            <!-- Badge URL Section -->
+            <div class="mt-6 p-4 bg-gray-50 rounded-lg border border-gray-200">
+                <h3 class="text-lg font-semibold text-gray-900 mb-4">Repository View Count Badge</h3>
+                <div class="flex flex-col gap-4">
+                    <!-- HTML Format -->
+                    <div class="space-y-2">
+                        <div class="text-gray-700 font-medium">HTML:</div>
+                        <div class="relative">
+                            <input type="text"
+                                   readonly
+                                   value='&lt;img alt="Views" src="{{ request.scheme }}://{{ request.get_host }}{% url 'repo-badge' repo.slug %}" &gt;'
+                                   class="w-full px-4 py-2 bg-white border border-gray-300 rounded-lg pr-24 font-mono text-sm focus:ring-2 focus:ring-red-500 focus:border-transparent"
+                                   id="badge-url-html">
+                            <button onclick="copyToClipboard('badge-url-html')"
+                                    class="absolute right-2 top-1/2 -translate-y-1/2 px-3 py-1 bg-red-500 hover:bg-red-600 text-white text-sm rounded-md transition-colors">
+                                Copy
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <!-- Repository Type & Metadata -->
             <div class="mt-6 flex items-center justify-between border-t border-gray-200 pt-6">
                 <div class="flex items-center gap-6">
@@ -740,7 +761,38 @@ <h3 class="font-medium text-gray-900 group-hover:text-red-600 transition-colors"
 {% endblock content %}
 {% block after_js %}
     <script>
-const refreshSection = async (button, section) => {
+    function copyToClipboard(elementId) {
+        const element = document.getElementById(elementId);
+        
+        // Select the text
+        element.select();
+        element.setSelectionRange(0, 99999); // For mobile devices
+
+        // Copy the text
+        try {
+            navigator.clipboard.writeText(element.value).then(() => {
+                // Get the button
+                const button = element.nextElementSibling;
+                const originalText = button.textContent;
+                
+                // Change button style to show success
+                button.textContent = 'Copied!';
+                button.classList.remove('bg-red-500', 'hover:bg-red-600');
+                button.classList.add('bg-green-500', 'hover:bg-green-600');
+                
+                // Reset button after 2 seconds
+                setTimeout(() => {
+                    button.textContent = originalText;
+                    button.classList.remove('bg-green-500', 'hover:bg-green-600');
+                    button.classList.add('bg-red-500', 'hover:bg-red-600');
+                }, 2000);
+            });
+        } catch (err) {
+            console.error('Failed to copy text: ', err);
+        }
+    }
+
+    const refreshSection = async (button, section) => {
     if (button.classList.contains('refresh_spinner')) {
         return;
     }