From 7a531b14b7fe430faf0493e95315a95b9770cadd Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Mon, 3 Aug 2026 20:48:05 +0530
Subject: [PATCH 001/118] Fix resizing and closing windows

---
 twisted/twisted_site/templates/client/dashboard.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 89f2c3f..c2f8b53 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -148,7 +148,7 @@
         dragWindow(realWin);
         focusWindow(id);
  
-        realWin.addEventListener('mousedown', () => focusWindow(id));
+        realWin.querySelector('.title-bar').addEventListener('mousedown', () => focusWindow(id));
         realWin.querySelector('.close-button').onclick = () => {
             realWin.remove();
             taskBtn.remove();
@@ -159,10 +159,10 @@
         document.querySelectorAll('#taskbar-windows button').forEach(b =>
             b.classList.remove('!bg-twisted-400'));
         const win = document.querySelector('.window[data-win-id="' + id + '"]');
-
+        
         container = document.getElementById('windows-container')
         container.moveBefore(win, null)
-        
+
         const btn = document.querySelector('#taskbar-windows button[data-win-id="' + id + '"]');
         if (btn) btn.classList.add('!bg-twisted-400');
     }
@@ -190,6 +190,7 @@
             pendingY = y;
             // throttle DOM writes to one per animation frame for smoothness
             if (rafId === null) rafId = requestAnimationFrame(apply);
+
         }
  
         function onUp() {

From c6cb48c3adf433a3f898ed216b333c8c57654f1b Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 4 Aug 2026 20:58:30 +0530
Subject: [PATCH 002/118] Uploading images and closing windows fixed

---
 .../migrations/0009_uploadedimage.py          | 27 ++++++++
 .../0010_rename_uploadedimage_uploadedfile.py | 19 ++++++
 twisted/twisted_site/models.py                |  6 ++
 .../templates/client/dashboard.html           | 14 ++--
 .../templates/client/projects/journal.html    | 59 +++++++++++++++-
 twisted/twisted_site/urls.py                  |  4 ++
 twisted/twisted_site/views/misc.py            | 68 +++++++++++++++++++
 7 files changed, 189 insertions(+), 8 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0009_uploadedimage.py
 create mode 100644 twisted/twisted_site/migrations/0010_rename_uploadedimage_uploadedfile.py
 create mode 100644 twisted/twisted_site/views/misc.py

diff --git a/twisted/twisted_site/migrations/0009_uploadedimage.py b/twisted/twisted_site/migrations/0009_uploadedimage.py
new file mode 100644
index 0000000..7a1e1d1
--- /dev/null
+++ b/twisted/twisted_site/migrations/0009_uploadedimage.py
@@ -0,0 +1,27 @@
+# Generated by Django 6.0.7 on 2026-08-04 14:06
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0008_journal_reduced_minutes_alter_journal_content'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UploadedImage',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('link', models.CharField(max_length=500)),
+                ('cdn_response', models.JSONField()),
+                ('uploaded_thru', models.CharField(max_length=500)),
+                ('filesize', models.IntegerField()),
+                ('uploaded_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/twisted/twisted_site/migrations/0010_rename_uploadedimage_uploadedfile.py b/twisted/twisted_site/migrations/0010_rename_uploadedimage_uploadedfile.py
new file mode 100644
index 0000000..d5a2236
--- /dev/null
+++ b/twisted/twisted_site/migrations/0010_rename_uploadedimage_uploadedfile.py
@@ -0,0 +1,19 @@
+# Generated by Django 6.0.7 on 2026-08-04 14:08
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0009_uploadedimage'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='UploadedImage',
+            new_name='UploadedFile',
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index de49a36..d39e711 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -5,6 +5,12 @@
 
 User = get_user_model()
 
+class UploadedFile(models.Model):
+    uploaded_by = models.ForeignKey(User, on_delete=models.PROTECT)
+    link = models.CharField(max_length=500)
+    cdn_response = models.JSONField()
+    uploaded_thru = models.CharField(max_length=500)
+    filesize = models.IntegerField()
 
 # Create your models here.
 class Profile(models.Model):
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index c2f8b53..64dcb8d 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -89,7 +89,7 @@
 <template id="window-template">
     <div class="absolute window resize flex flex-col overflow-hidden" style="left: 300px; top: 300px; width: 300px; height: 300px;">
         <div class="title-bar">
-            <label class="title-bar-text">TITLE</label>
+            <label class="title-bar-text w-full">TITLE</label>
             <div class="title-bar-controls">
                 <button aria-label="Maximize"></button>
                 <button class="close-button" aria-label="Close">X</button>
@@ -145,26 +145,26 @@
         taskBtn.onclick = () => focusWindow(id);
         document.getElementById('taskbar-windows').appendChild(taskBtn);
  
+        realWin.querySelector('.title-bar').addEventListener('mousedown', () => focusWindow(id));
         dragWindow(realWin);
         focusWindow(id);
- 
-        realWin.querySelector('.title-bar').addEventListener('mousedown', () => focusWindow(id));
-        realWin.querySelector('.close-button').onclick = () => {
+        realWin.querySelector('.close-button').addEventListener('mouseup', () => {
+            console.log('close!')
             realWin.remove();
             taskBtn.remove();
-        };
+        });
     }
  
     function focusWindow(id) {
         document.querySelectorAll('#taskbar-windows button').forEach(b =>
-            b.classList.remove('!bg-twisted-400'));
+            b.classList.remove('!bg-twisted-999'));
         const win = document.querySelector('.window[data-win-id="' + id + '"]');
         
         container = document.getElementById('windows-container')
         container.moveBefore(win, null)
 
         const btn = document.querySelector('#taskbar-windows button[data-win-id="' + id + '"]');
-        if (btn) btn.classList.add('!bg-twisted-400');
+        if (btn) btn.classList.add('!bg-twisted-999');
     }
  
     function dragWindow(mywindow) {
diff --git a/twisted/twisted_site/templates/client/projects/journal.html b/twisted/twisted_site/templates/client/projects/journal.html
index c45c312..3630718 100644
--- a/twisted/twisted_site/templates/client/projects/journal.html
+++ b/twisted/twisted_site/templates/client/projects/journal.html
@@ -47,9 +47,13 @@ <h2>Your journal has been logged!</h2>
 </div>
 
 <script>
+    textbox = document.querySelector('#content')
+    console.log(textbox)
+    csrfToken = "{{ csrf_token }}"
+
     function renderpreview() {
         console.log('rendering...');
-        content = document.getElementById('content').value;
+        content = textbox.value;
         parsed = DOMPurify.sanitize(marked.parse(content));
         document.getElementById('preview').innerHTML = parsed;
     }
@@ -61,6 +65,59 @@ <h2>Your journal has been logged!</h2>
         document.getElementById('previewtab').style.display = null;
         document.getElementById('journaltab').style.display = 'none';
     }
+
+    function generateRandomString(length) {
+        const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        let result = '';
+        for (let i = 0; i < length; i++) {
+            result += chars.charAt(Math.floor(Math.random() * chars.length));
+        }
+        return result;
+    }
+
+
+    textbox.addEventListener('paste', (event) => {
+        console.log('paste detect!')
+        const items = (event.clipboardData || window.clipboardData).items;
+
+        for (let i = 0; i < items.length; i++) {
+            if (!items[i].type.startsWith('image/')) {
+                continue;
+            }
+            console.log("found image!")
+            const blob = items[i].getAsFile();
+
+            const id = `![Uploading... ${generateRandomString(5)}]()`
+
+            textbox.value = textbox.value + id + '\n'
+
+            const formData = new FormData();
+            formData.append('csrfmiddlewaretoken', csrfToken);
+            formData.append('file', blob);
+            formData.append('ref', 'journals');
+
+            // 4. Send the POST request to your backend URL
+            response = fetch("{% url 'misc.upload_file' %}", {
+                method: 'POST',
+                body: formData, // Fetch automatically sets Content-Type to multipart/form-data
+            });
+            response.then((response) => {
+                console.log(response);
+                response.json().then((result) => {
+                    console.log(result);
+                    if (result['status'] == 'ok') {
+                        console.log('Upload successful:', result);
+                        textbox.value = textbox.value.replace(id, `![${result['name']}](${result['link']})`);
+                    } else {
+                        console.log('Upload failed:', result);
+                        textbox.value = textbox.value.replace(id, `![Error: ${result['reason']}]()`);
+                    }
+                    renderpreview()
+                })
+            });
+                
+        }
+    });
 </script>
 <script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
 <script src="
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index f88a418..c8700e4 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -4,10 +4,13 @@
 from .views.client.dashboard import DashboardView
 from .views.client.projects import ListProjects, CreateProject
 from .views.client.project import ProjectDetail, ProjectSettings, NewProjectJournal
+from .views.misc import upload_file
 
 urlpatterns = [
     path('', view=HomepageView.as_view(), name="homepage"),
     path('faqs/', view=FaqsView.as_view(), name="faqs"),
+
+    path("api/upload_image/", upload_file, name="misc.upload_file"),
     
     path("auth/login/", LoginView.as_view(), name="login"),
     path("oauth/callback/", AuthCallbackView.as_view(), name="auth_callback"),
@@ -21,4 +24,5 @@
     path("dashboard/frame/projects/<int:id>/", ProjectDetail.as_view(), name="fr.projects.detail"),
     path("dashboard/frame/projects/<int:id>/settings/", ProjectSettings.as_view(), name="fr.projects.settings"),
     path("dashboard/frame/projects/<int:id>/journals/new/", NewProjectJournal.as_view(), name="fr.projects.journals.new"),
+
 ]
diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
new file mode 100644
index 0000000..d8311e8
--- /dev/null
+++ b/twisted/twisted_site/views/misc.py
@@ -0,0 +1,68 @@
+import json
+import os
+import requests
+from django.http import JsonResponse, HttpResponse
+from django.views import View
+from django.shortcuts import render, redirect
+from ..models import Project, UploadedFile
+from django.contrib.auth.decorators import login_required
+
+
+@login_required
+def upload_file(request):
+    """
+    Makdown image upload for uploading to imgur.com
+    and represent as json to markdown editor.
+    """
+
+    if request.method == "POST":
+        if "file" in request.FILES:
+            image = request.FILES["file"]
+            max_file_mb = float(request.POST.get("max_mb", 1))
+
+            image_size = image.size / (1024 * 1024)
+            if image_size > max_file_mb:
+                return JsonResponse(
+                    {"status": "error", "reason": f"File size exceeds {max_file_mb}MB!"}
+                )
+
+            response_data = file_uploader(request, image)
+            return JsonResponse(response_data)
+        return JsonResponse(
+            {"status": "error", "reason": "Invalid request: no image found"}
+        )
+    return JsonResponse(
+        {"status": "error", "reason": "Invalid request: method not POST"}
+    )
+
+
+def file_uploader(request, image):
+    """
+    Basic imgur uploader return as json data.
+    :param `image` is from `request.FILES['markdown-image-upload']`
+    :return json response
+    """
+    api_url = "https://cdn.hackclub.com/api/v4/upload"
+    headers = {"Authorization": "Bearer " + os.environ["HACKCLUB_CDN_API_KEY"]}
+    response = requests.post(api_url, headers=headers, files={"file": image})
+
+    if response.status_code in [200, 201]:
+        response_data = response.json()
+        UploadedFile.objects.create(
+            uploaded_by=request.user,
+            link=response_data["url"],
+            cdn_response=response_data,
+            uploaded_thru=request.POST.get("ref", "unknown"),
+            filesize=response_data["size"],
+        )
+        return {
+            "status": "ok",
+            "link": response_data["url"],
+            "name": response_data["filename"],
+            "response": response_data,
+        }
+
+    return {
+        "status": response.status_code,
+        "error": response.content.decode("utf-8"),
+    }

From 29a9066caa015025e834b42d5abc6138ab3a4672 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 4 Aug 2026 22:39:53 +0530
Subject: [PATCH 003/118] Fixed journalling

---
 twisted/twisted_site/views/client/project.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index 360182a..d4bec4a 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -127,8 +127,9 @@ def post(self, request, id):
                 context={"content": content},
             )
         
-        Journal(project=project, content=content, minutes_worked = project.time_unjournaled(), reduced_minutes=reduced_minutes)
-
+        journal = Journal(project=project, content=content, minutes_worked = project.time_unjournaled(), reduced_minutes=reduced_minutes)
+        journal.save()
+        
         return render(
             request, "client/projects/journal.html", context={"success": True}
         )

From 282bd1f16aa04771ead584d34b046fdba94e4e6b Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Wed, 5 Aug 2026 16:26:20 +0530
Subject: [PATCH 004/118] Replace 'login' with 'dashboard' if you are already
 logged in

---
 .../twisted_site/templates/client/homepage.html    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index cd23bf6..08f4bb3 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -25,14 +25,22 @@
         <a href="{% url 'faqs' %}">FAQs</a>
       </nav>
       <div id="rsvp">
+        {% csrf_token %}
+        {% if login_enabled %}
+        {% if user.is_authenticated %}
+        <a href="{% url 'dashboard' %}">
+          <button class="bg-twisted-400 text-absolute-white text-2xl font-bold py-3 px-10 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+            dashboard
+          </button>
+        </a>
+        {% else %}
         <form method="post" action="{% url 'login' %}">
-          {% csrf_token %}
-          {% if login_enabled %}
           <button type="submit" class="bg-twisted-400 text-absolute-white text-2xl font-bold py-3 px-10 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
             Login
           </button>
-          {% endif %}
         </form>
+          {% endif %}
+          {% endif %}
       </div>
     </div>
   </div>

From 89979721c4158c68148c84d30f94ae44a9c184ea Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 6 Aug 2026 10:22:46 +0530
Subject: [PATCH 005/118] Change journal.html

---
 .../templates/client/projects/journal.html    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/twisted/twisted_site/templates/client/projects/journal.html b/twisted/twisted_site/templates/client/projects/journal.html
index 3630718..0835f60 100644
--- a/twisted/twisted_site/templates/client/projects/journal.html
+++ b/twisted/twisted_site/templates/client/projects/journal.html
@@ -5,6 +5,13 @@
     <div class="text-4xl">
         New journal for {{ project.project_name }}
     </div>
+    <div>
+        <button disabled>Hackatime</button>
+        <button>Lookout</button>
+        {% if project.project_type == 'hardware' %}
+            <button>journal</button>
+        {% endif %}
+    </div>
     <div>
         This journal will log {{ log_minutes|minutes_to_hours_minutes }}.
     </div>
@@ -16,18 +23,16 @@
     <form method="post" class="h-full flex flex-col">
         {% csrf_token %}
         <div>
-            <button type="button" onclick="switchjournal()">Journal</button>
-            <button type="button" onclick="switchpreview()">Preview</button>
+            <button id="journalbutton" type="button" onclick="switchedit()" disabled>Edit</button>
+            <button id="previewbutton" type="button" onclick="switchpreview()">Preview</button>
         </div>
         <div class="flex-1">
             <div class="!text-lg h-full flex flex-col" id="journaltab">
-                <h3>Journal</h3>
                 <div class="flex-1">
                     <textarea name="content" id="content" class="w-full h-full text-2xl!" oninput="renderpreview()">{{ content }}</textarea>
                 </div>
             </div>
             <div id="previewtab" style="display: none;" class="h-full flex flex-col">
-                <h3>Preview</h3>
                 <div class="overflow-y-auto flex-1 bg-twisted-600 p-1">
                     <div id="preview" class="zoom-150 [&_h1,h2,h3,h4,h5,h6]:zoom-50"></div>
                 </div>
@@ -57,13 +62,19 @@ <h2>Your journal has been logged!</h2>
         parsed = DOMPurify.sanitize(marked.parse(content));
         document.getElementById('preview').innerHTML = parsed;
     }
-    function switchjournal() {
+    function switchedit() {
         document.getElementById('previewtab').style.display = 'none';
         document.getElementById('journaltab').style.display = null;
+        
+        document.getElementById('journalbutton').disabled = true;
+        document.getElementById('previewbutton').disabled = null;
     }
     function switchpreview() {
         document.getElementById('previewtab').style.display = null;
         document.getElementById('journaltab').style.display = 'none';
+
+        document.getElementById('journalbutton').disabled = null;
+        document.getElementById('previewbutton').disabled = true;
     }
 
     function generateRandomString(length) {

From 2194a733438ee1a5498c585e1a29740276aa99d0 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 6 Aug 2026 15:17:44 +0530
Subject: [PATCH 006/118] Setup work for different journal types

---
 .../static_src/package-lock.json              |  28 +++
 .../tailwindcsstheme/static_src/package.json  |   1 +
 .../static_src/src/styles.css                 |  12 ++
 .../templates/client/dashboard.html           |   8 +-
 .../twisted_site/templates/client/osbase.html |   2 +-
 .../templates/client/projects/detail.html     |   2 +-
 .../templates/client/projects/journal.html    | 137 -------------
 .../projects/journal/new_hackatime.html       |  12 ++
 .../projects/journal/new_journal.base.html    |  64 ++++++
 .../client/projects/journal/new_lookout.html  |  11 ++
 .../projects/journal/new_untracked.html       |  23 +++
 .../twisted_site/templates/cotton/mdedit.html |  99 ++++++++++
 twisted/twisted_site/urls.py                  |  23 ++-
 twisted/twisted_site/views/client/__init__.py |   5 +
 .../twisted_site/views/client/new_journal.py  | 186 ++++++++++++++++++
 twisted/twisted_site/views/client/project.py  |  59 ------
 16 files changed, 460 insertions(+), 212 deletions(-)
 delete mode 100644 twisted/twisted_site/templates/client/projects/journal.html
 create mode 100644 twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
 create mode 100644 twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
 create mode 100644 twisted/twisted_site/templates/client/projects/journal/new_lookout.html
 create mode 100644 twisted/twisted_site/templates/client/projects/journal/new_untracked.html
 create mode 100644 twisted/twisted_site/templates/cotton/mdedit.html
 create mode 100644 twisted/twisted_site/views/client/new_journal.py

diff --git a/twisted/tailwindcsstheme/static_src/package-lock.json b/twisted/tailwindcsstheme/static_src/package-lock.json
index b4da7e8..55d9798 100644
--- a/twisted/tailwindcsstheme/static_src/package-lock.json
+++ b/twisted/tailwindcsstheme/static_src/package-lock.json
@@ -10,6 +10,7 @@
       "license": "MIT",
       "devDependencies": {
         "@tailwindcss/postcss": "^4.3.0",
+        "@tailwindcss/typography": "^0.5.20",
         "98.css": "^0.1.21",
         "concurrently": "^10.0.4",
         "cross-env": "^10.1.0",
@@ -374,6 +375,33 @@
         "tailwindcss": "4.3.3"
       }
     },
+    "node_modules/@tailwindcss/typography": {
+      "version": "0.5.20",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.20.tgz",
+      "integrity": "sha512-hwbzQuNUfcPvbegQFatVPl/MY/tcM9KLl963hQ5laJKPh81TEZ1+dNG9PirGvcaDBkp+BCshExAyKVPW91dozw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "6.0.10"
+      },
+      "peerDependencies": {
+        "tailwindcss": ">=3.0.0 || >=4.0.0 || insiders"
+      }
+    },
+    "node_modules/@tailwindcss/typography/node_modules/postcss-selector-parser": {
+      "version": "6.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/98.css": {
       "version": "0.1.21",
       "resolved": "https://registry.npmjs.org/98.css/-/98.css-0.1.21.tgz",
diff --git a/twisted/tailwindcsstheme/static_src/package.json b/twisted/tailwindcsstheme/static_src/package.json
index dc89b19..2893e2e 100644
--- a/twisted/tailwindcsstheme/static_src/package.json
+++ b/twisted/tailwindcsstheme/static_src/package.json
@@ -14,6 +14,7 @@
   "license": "MIT",
   "devDependencies": {
     "@tailwindcss/postcss": "^4.3.0",
+    "@tailwindcss/typography": "^0.5.20",
     "98.css": "^0.1.21",
     "concurrently": "^10.0.4",
     "cross-env": "^10.1.0",
diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index 088fd6c..e219788 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -1,4 +1,5 @@
 @import "tailwindcss";
+/* @plugin "@tailwindcss/typography"; */
 
 /**
 * A catch-all path to Django template files, JavaScript, and Python files
@@ -53,11 +54,22 @@ button {
   --color-surface: #1E072F;
   --color-dark: #261F2D;
 }
+
 @keyframes flag-wave {
   0%, 100% { transform: rotate(-2deg); }
   50% { transform: rotate(2deg); }
 }
 
+@utility no-spinner {
+  -moz-appearance: textfield;
+  
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+}
+
 .flag-wave {
   transform-origin: top center;
   animation: flag-wave 4s ease-in-out infinite;
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 64dcb8d..5fd66de 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -129,8 +129,12 @@
  
         win.querySelector('.title-bar-text').textContent = title;
         win.querySelector('.src-frame').src = src;
-        win.style.top = (Math.random() * 150 + 80) + "px";
-        win.style.left = (Math.random() * 200 + 150) + "px";
+
+        x = Math.random() * (window.innerWidth - w)
+        y = Math.random() * (window.innerHeight - w)
+
+        win.style.left = x + "px";
+        win.style.top = y + "px";
         win.style.width = w + "px";
         win.style.height = h + "px";
         container.appendChild(clone);
diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index 4df69e8..f0302e3 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -1,5 +1,5 @@
 {% load static tailwind_tags static %}
-<html style="font-size: 12px;">
+<html style="font-size: 12px; background: #1E072F;">
     <head>
         {% tailwind_css %}
         <link rel="stylesheet" href="https://unpkg.com/98.css" />
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 052e70f..529717d 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -18,7 +18,7 @@
     </div>
     {% endif %}
     <div>
-        <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'journal: {{ project.project_name }}', 'src': '{% url 'fr.projects.journals.new' project.id %}'}, '*')">New journal...</button>
+        <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'journal: {{ project.project_name }}', 'src': '{% url 'fr.projects.journals.new.hackatime' project.id %}'}, '*')">New journal...</button>
     </div>
 </div>
 
diff --git a/twisted/twisted_site/templates/client/projects/journal.html b/twisted/twisted_site/templates/client/projects/journal.html
deleted file mode 100644
index 0835f60..0000000
--- a/twisted/twisted_site/templates/client/projects/journal.html
+++ /dev/null
@@ -1,137 +0,0 @@
-{% extends "client/osbase.html" %} {% load static time_filters %}
-{% block body %}
-<div class="bg-surface flex flex-col w-full h-full font-vintage">
-    {% if not success %}
-    <div class="text-4xl">
-        New journal for {{ project.project_name }}
-    </div>
-    <div>
-        <button disabled>Hackatime</button>
-        <button>Lookout</button>
-        {% if project.project_type == 'hardware' %}
-            <button>journal</button>
-        {% endif %}
-    </div>
-    <div>
-        This journal will log {{ log_minutes|minutes_to_hours_minutes }}.
-    </div>
-    {% if info %}
-    <div class="bg-twisted-400 rounded-md p-1 my-1">
-        {{ info|safe }}
-    </div>
-    {% endif %}
-    <form method="post" class="h-full flex flex-col">
-        {% csrf_token %}
-        <div>
-            <button id="journalbutton" type="button" onclick="switchedit()" disabled>Edit</button>
-            <button id="previewbutton" type="button" onclick="switchpreview()">Preview</button>
-        </div>
-        <div class="flex-1">
-            <div class="!text-lg h-full flex flex-col" id="journaltab">
-                <div class="flex-1">
-                    <textarea name="content" id="content" class="w-full h-full text-2xl!" oninput="renderpreview()">{{ content }}</textarea>
-                </div>
-            </div>
-            <div id="previewtab" style="display: none;" class="h-full flex flex-col">
-                <div class="overflow-y-auto flex-1 bg-twisted-600 p-1">
-                    <div id="preview" class="zoom-150 [&_h1,h2,h3,h4,h5,h6]:zoom-50"></div>
-                </div>
-            </div>
-        </div>
-        <div>
-            <button class="mt-4">Log journal</button>
-        </div>
-    </form>
-    {% else %}
-    <div class="text-center">
-        <h2>Your journal has been logged!</h2>
-        <p>You can now close this page.</p>
-        <button onclick="location.reload()">Log another journal!</button>
-    </div>
-    {% endif %}
-</div>
-
-<script>
-    textbox = document.querySelector('#content')
-    console.log(textbox)
-    csrfToken = "{{ csrf_token }}"
-
-    function renderpreview() {
-        console.log('rendering...');
-        content = textbox.value;
-        parsed = DOMPurify.sanitize(marked.parse(content));
-        document.getElementById('preview').innerHTML = parsed;
-    }
-    function switchedit() {
-        document.getElementById('previewtab').style.display = 'none';
-        document.getElementById('journaltab').style.display = null;
-        
-        document.getElementById('journalbutton').disabled = true;
-        document.getElementById('previewbutton').disabled = null;
-    }
-    function switchpreview() {
-        document.getElementById('previewtab').style.display = null;
-        document.getElementById('journaltab').style.display = 'none';
-
-        document.getElementById('journalbutton').disabled = null;
-        document.getElementById('previewbutton').disabled = true;
-    }
-
-    function generateRandomString(length) {
-        const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-        let result = '';
-        for (let i = 0; i < length; i++) {
-            result += chars.charAt(Math.floor(Math.random() * chars.length));
-        }
-        return result;
-    }
-
-
-    textbox.addEventListener('paste', (event) => {
-        console.log('paste detect!')
-        const items = (event.clipboardData || window.clipboardData).items;
-
-        for (let i = 0; i < items.length; i++) {
-            if (!items[i].type.startsWith('image/')) {
-                continue;
-            }
-            console.log("found image!")
-            const blob = items[i].getAsFile();
-
-            const id = `![Uploading... ${generateRandomString(5)}]()`
-
-            textbox.value = textbox.value + id + '\n'
-
-            const formData = new FormData();
-            formData.append('csrfmiddlewaretoken', csrfToken);
-            formData.append('file', blob);
-            formData.append('ref', 'journals');
-
-            // 4. Send the POST request to your backend URL
-            response = fetch("{% url 'misc.upload_file' %}", {
-                method: 'POST',
-                body: formData, // Fetch automatically sets Content-Type to multipart/form-data
-            });
-            response.then((response) => {
-                console.log(response);
-                response.json().then((result) => {
-                    console.log(result);
-                    if (result['status'] == 'ok') {
-                        console.log('Upload successful:', result);
-                        textbox.value = textbox.value.replace(id, `![${result['name']}](${result['link']})`);
-                    } else {
-                        console.log('Upload failed:', result);
-                        textbox.value = textbox.value.replace(id, `![Error: ${result['reason']}]()`);
-                    }
-                    renderpreview()
-                })
-            });
-                
-        }
-    });
-</script>
-<script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
-<script src="
-https://cdn.jsdelivr.net/npm/dompurify@3.4.12/dist/purify.min.js
-"></script>
-{% endblock body %}
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
new file mode 100644
index 0000000..d741905
--- /dev/null
+++ b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
@@ -0,0 +1,12 @@
+{% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %}
+{% block links %}
+<button disabled>Hackatime</button>
+    <a href="{% url 'fr.projects.journals.new.lookout' project.id %}">
+        <button>Lookout</button>
+    </a>
+    {% if project.project_type == 'hardware' %}
+    <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
+        <button>untracked</button>
+    </a>
+{% endif %}
+{% endblock links %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
new file mode 100644
index 0000000..4498f4e
--- /dev/null
+++ b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
@@ -0,0 +1,64 @@
+{% extends "client/osbase.html" %} {% load static time_filters %} {% block body %}
+
+<script type="speculationrules">
+{
+  "prerender": [
+    {
+    "source": "list",
+    "urls": ["{% url 'fr.projects.journals.new.hackatime' project.id %}", "{% url 'fr.projects.journals.new.lookout' project.id %}", "{% url 'fr.projects.journals.new.untracked' project.id %}"],
+    "eagerness": "eager"
+}]
+}
+</script>
+
+
+<div class="bg-surface flex flex-col w-full h-full font-vintage">
+    {% if not success %}
+    <div class="text-4xl">New journal for {{ project.project_name }}</div>
+    <div>
+        {% block links %}
+        <a href="{% url 'fr.projects.journals.new.hackatime' project.id %}">
+            <button>Hackatime</button>
+        </a>
+        <a href="{% url 'fr.projects.journals.new.lookout' project.id %}">
+            <button>Lookout</button>
+        </a>
+        {% if project.project_type == 'hardware' %}
+        <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
+            <button>untracked</button>
+        </a>
+        {% endif %} {% endblock links %}
+    </div>
+    {% if info %}
+    <div class="bg-twisted-400 rounded-md p-1 my-1">{{ info|safe }}</div>
+    {% endif %}
+    <div>
+        {% block journal_log_message %}
+        This journal will log {{ log_minutes|minutes_to_hours_minutes }}.
+        {% endblock journal_log_message %}
+    </div>
+    <form method="post" class="h-full flex flex-col">
+        {% csrf_token %}
+        {% block form %}
+        {% block preform %}{% endblock preform %}
+        <c-mdedit class="flex-1" />
+        <div>
+            <button class="mt-4">Log journal</button>
+        </div>
+        {% endblock form %}
+    </form>
+    {% else %}
+    <div class="text-center">
+        <h2>Your journal has been logged!</h2>
+        <p>You can now close this page.</p>
+        <button onclick="location.reload()">Log another journal!</button>
+    </div>
+    {% endif %}
+</div>
+
+<script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
+<script src="
+https://cdn.jsdelivr.net/npm/dompurify@3.4.12/dist/purify.min.js
+"></script>
+
+{% endblock body %}
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_lookout.html b/twisted/twisted_site/templates/client/projects/journal/new_lookout.html
new file mode 100644
index 0000000..48e8eff
--- /dev/null
+++ b/twisted/twisted_site/templates/client/projects/journal/new_lookout.html
@@ -0,0 +1,11 @@
+{% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %} {% block links %}
+<a href="{% url 'fr.projects.journals.new.hackatime' project.id %}">
+    <button>Hackatime</button>
+</a>
+    <button disabled>Lookout</button>
+{% if project.project_type == 'hardware' %}
+<a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
+    <button>untracked</button>
+</a>
+{% endif %}
+{% endblock links %}
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
new file mode 100644
index 0000000..e67434d
--- /dev/null
+++ b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
@@ -0,0 +1,23 @@
+{% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %} {% block links %}
+<a href="{% url 'fr.projects.journals.new.hackatime' project.id %}">
+    <button>Hackatime</button>
+</a>
+<a href="{% url 'fr.projects.journals.new.lookout' project.id %}">
+    <button>Lookout</button>
+</a>
+{% if project.project_type == 'hardware' %}
+<button disabled>untracked</button>
+{% endif %} {% endblock links %} {% block journal_log_message %} {% endblock journal_log_message %} {% block preform %}
+<div>
+    This journal will log
+    <input
+        value="1"
+        type="number"
+        min="0"
+        max="{{ max_mins }}"
+        class="no-spinner text-right"
+        oninput="if(Number(this.value) > {{ max_mins }}) this.value = {{ max_mins }};"
+    />
+    minutes.
+</div>
+{% endblock preform %}
diff --git a/twisted/twisted_site/templates/cotton/mdedit.html b/twisted/twisted_site/templates/cotton/mdedit.html
new file mode 100644
index 0000000..38317a1
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/mdedit.html
@@ -0,0 +1,99 @@
+<div class="flex flex-col {{ class }}">
+    <div>
+        <button id="editbutton" type="button" onclick="switchedit()" disabled>Edit</button>
+        <button id="previewbutton" type="button" onclick="switchpreview()">Preview</button>
+    </div>
+    <div class="flex-1">
+        <div class="!text-lg h-full flex flex-col" id="edittab">
+            <div class="flex-1">
+                <textarea name="content" id="content" class="w-full h-full text-2xl! resize-none" oninput="renderpreview()">{{ content }}</textarea>
+            </div>
+        </div>
+        <div id="previewtab" style="display: none;" class="h-full flex flex-col">
+            <div class="overflow-y-auto flex-1 bg-twisted-600 p-1">
+                <div id="preview" class="zoom-150 [&_h1,h2,h3,h4,h5,h6]:zoom-40 [&_ul,ol]:list-outside [&_ul,ol]:pl-5 [&_ul]:list-disc [&_ol]:list-decimal *:my-1">
+                </div>
+            </div>
+        </div>
+    </div>
+    
+    <script>
+        textbox = document.querySelector('#content')
+        console.log(textbox)
+        csrfToken = "{{ csrf_token }}"
+    
+        function generateRandomString(length) {
+            const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+            let result = '';
+            for (let i = 0; i < length; i++) {
+                result += chars.charAt(Math.floor(Math.random() * chars.length));
+            }
+            return result;
+        }
+    
+        function renderpreview() {
+            console.log('rendering...');
+            content = textbox.value;
+            parsed = DOMPurify.sanitize(marked.parse(content));
+            document.getElementById('preview').innerHTML = parsed;
+        }
+        function switchedit() {
+            document.getElementById('previewtab').style.display = 'none';
+            document.getElementById('edittab').style.display = null;
+            
+            document.getElementById('editbutton').disabled = true;
+            document.getElementById('previewbutton').disabled = null;
+        }
+        function switchpreview() {
+            document.getElementById('previewtab').style.display = null;
+            document.getElementById('edittab').style.display = 'none';
+    
+            document.getElementById('editbutton').disabled = null;
+            document.getElementById('previewbutton').disabled = true;
+        }
+    
+    
+        textbox.addEventListener('paste', (event) => {
+            console.log('paste detect!')
+            const items = (event.clipboardData || window.clipboardData).items;
+    
+            for (let i = 0; i < items.length; i++) {
+                if (!items[i].type.startsWith('image/')) {
+                    continue;
+                }
+                console.log("found image!")
+                const blob = items[i].getAsFile();
+    
+                const id = `![Uploading... ${generateRandomString(5)}]()`
+    
+                textbox.value = textbox.value + id + '\n'
+    
+                const formData = new FormData();
+                formData.append('csrfmiddlewaretoken', csrfToken);
+                formData.append('file', blob);
+                formData.append('ref', 'journals');
+    
+                // 4. Send the POST request to your backend URL
+                response = fetch("{% url 'misc.upload_file' %}", {
+                    method: 'POST',
+                    body: formData, // Fetch automatically sets Content-Type to multipart/form-data
+                });
+                response.then((response) => {
+                    console.log(response);
+                    response.json().then((result) => {
+                        console.log(result);
+                        if (result['status'] == 'ok') {
+                            console.log('Upload successful:', result);
+                            textbox.value = textbox.value.replace(id, `![${result['name']}](${result['link']})`);
+                        } else {
+                            console.log('Upload failed:', result);
+                            textbox.value = textbox.value.replace(id, `![Error: ${result['reason']}]()`);
+                        }
+                        renderpreview()
+                    })
+                });
+                    
+            }
+        });
+    </script>
+</div>
\ No newline at end of file
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index c8700e4..31de9ff 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -1,14 +1,11 @@
 from .views.client.auth import LoginView, AuthCallbackView, HackatimeCallbackView, LogoutView
 from django.urls import path
-from .views.client.homepage import HomepageView, FaqsView
-from .views.client.dashboard import DashboardView
-from .views.client.projects import ListProjects, CreateProject
-from .views.client.project import ProjectDetail, ProjectSettings, NewProjectJournal
+from .views import client
 from .views.misc import upload_file
 
 urlpatterns = [
-    path('', view=HomepageView.as_view(), name="homepage"),
-    path('faqs/', view=FaqsView.as_view(), name="faqs"),
+    path('', view=client.HomepageView.as_view(), name="homepage"),
+    path('faqs/', view=client.FaqsView.as_view(), name="faqs"),
 
     path("api/upload_image/", upload_file, name="misc.upload_file"),
     
@@ -17,12 +14,14 @@
     path("oauth/hackatime_callback/", HackatimeCallbackView.as_view(), name="auth_callback"),
     path("auth/logout/", LogoutView.as_view(), name="logout"),
     
-    path("dashboard/", DashboardView.as_view(), name="dashboard"),
-    path("dashboard/frame/projects/", ListProjects.as_view(), name="fr.projects"),
-    path("dashboard/frame/projects/create/", CreateProject.as_view(), name="fr.projects.create"),
+    path("dashboard/", client.DashboardView.as_view(), name="dashboard"),
+    path("dashboard/frame/projects/", client.ListProjects.as_view(), name="fr.projects"),
+    path("dashboard/frame/projects/create/", client.CreateProject.as_view(), name="fr.projects.create"),
 
-    path("dashboard/frame/projects/<int:id>/", ProjectDetail.as_view(), name="fr.projects.detail"),
-    path("dashboard/frame/projects/<int:id>/settings/", ProjectSettings.as_view(), name="fr.projects.settings"),
-    path("dashboard/frame/projects/<int:id>/journals/new/", NewProjectJournal.as_view(), name="fr.projects.journals.new"),
+    path("dashboard/frame/projects/<int:id>/", client.ProjectDetail.as_view(), name="fr.projects.detail"),
+    path("dashboard/frame/projects/<int:id>/settings/", client.ProjectSettings.as_view(), name="fr.projects.settings"),
+    path("dashboard/frame/projects/<int:id>/journals/new/hackatime/", client.NewProjectHackatimeJournal.as_view(), name="fr.projects.journals.new.hackatime"),
+    path("dashboard/frame/projects/<int:id>/journals/new/lookout/", client.NewProjectLookoutJournal.as_view(), name="fr.projects.journals.new.lookout"),
+    path("dashboard/frame/projects/<int:id>/journals/new/untracked/", client.NewProjectUntrackedJournal.as_view(), name="fr.projects.journals.new.untracked"),
 
 ]
diff --git a/twisted/twisted_site/views/client/__init__.py b/twisted/twisted_site/views/client/__init__.py
index e69de29..6203cf8 100644
--- a/twisted/twisted_site/views/client/__init__.py
+++ b/twisted/twisted_site/views/client/__init__.py
@@ -0,0 +1,5 @@
+from .homepage import HomepageView, FaqsView
+from .dashboard import DashboardView
+from .projects import ListProjects, CreateProject
+from .project import ProjectDetail, ProjectSettings
+from .new_journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal, NewProjectLookoutJournal
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/new_journal.py b/twisted/twisted_site/views/client/new_journal.py
new file mode 100644
index 0000000..6c1277b
--- /dev/null
+++ b/twisted/twisted_site/views/client/new_journal.py
@@ -0,0 +1,186 @@
+from markdown_it.rules_inline import image
+from django.http import JsonResponse
+from django.views import View
+from django.shortcuts import render, redirect
+from ...models import Profile, Project, Journal
+from ... import hackatime
+import re
+import math
+
+HACKATIME_MAX_LOGGABLE_MINUTES = 6 * 60
+
+class NewProjectHackatimeJournal(View):
+    def get(self, request, id, info=None, context={}):
+        context['info'] = info
+        if self.request.user.is_anonymous:
+            return redirect("homepage")
+
+        project = Project.objects.get(id=id)
+        if project.user != request.user:
+            return redirect("dashboard")
+
+        context["project"] = project
+
+        log_minutes = project.time_unjournaled()
+
+        log_minutes = min(log_minutes, HACKATIME_MAX_LOGGABLE_MINUTES)
+
+        context["log_minutes"] = log_minutes
+
+        return render(request, "client/projects/journal/new_hackatime.html", context=context)
+
+    def post(self, request, id):
+        project = Project.objects.get(id=id)
+        if project.user != request.user:
+            return redirect("dashboard")
+
+        reduced_minutes = min(
+            project.time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
+        )
+
+        content = request.POST["content"]
+        image_regex = r"\!\[.*?\]\(.*?\)"
+        image_count = len(re.findall(image_regex, content))
+        required_image_count = math.ceil(max(1, reduced_minutes / 180))
+
+        if image_count < required_image_count:
+            return self.get(
+                request,
+                id,
+                info=f"please add atleast {required_image_count - image_count} more image(s) to log this journal!",
+                context={"content": content},
+            )
+        if len(content) < min(100, reduced_minutes):
+            return self.get(
+                request,
+                id,
+                info=f"Content length must be more than 60 characters per hour!<br>({len(content)} of {reduced_minutes} required)",
+                context={"content": content},
+            )
+        
+        journal = Journal(project=project, content=content, minutes_worked = project.time_unjournaled(), reduced_minutes=reduced_minutes)
+        journal.save()
+        
+        return render(
+            request, "client/projects/new_hackatime.html", context={"success": True}
+        )
+
+class NewProjectLookoutJournal(View):
+    def get(self, request, id, info=None, context={}):
+        context['info'] = info
+        if self.request.user.is_anonymous:
+            return redirect("homepage")
+
+        project = Project.objects.get(id=id)
+        if project.user != request.user:
+            return redirect("dashboard")
+
+        context["project"] = project
+
+        log_minutes = project.time_unjournaled()
+
+        log_minutes = min(log_minutes, HACKATIME_MAX_LOGGABLE_MINUTES)
+
+        context["log_minutes"] = log_minutes
+        
+        context['info'] = "TODO: This has NOT been implemented yet."
+
+        return render(request, "client/projects/journal/new_lookout.html", context=context)
+
+    def post(self, request, id):
+        project = Project.objects.get(id=id)
+        if project.user != request.user:
+            return redirect("dashboard")
+
+        reduced_minutes = min(
+            project.time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
+        )
+
+        content = request.POST["content"]
+        image_regex = r"\!\[.*?\]\(.*?\)"
+        image_count = len(re.findall(image_regex, content))
+        required_image_count = math.ceil(max(1, reduced_minutes / 180))
+
+        if image_count < required_image_count:
+            return self.get(
+                request,
+                id,
+                info=f"please add atleast {required_image_count - image_count} more image(s) to log this journal!",
+                context={"content": content},
+            )
+        if len(content) < min(100, reduced_minutes):
+            return self.get(
+                request,
+                id,
+                info=f"Content length must be more than 60 characters per hour!<br>({len(content)} of {reduced_minutes} required)",
+                context={"content": content},
+            )
+        
+        journal = Journal(project=project, content=content, minutes_worked = project.time_unjournaled(), reduced_minutes=reduced_minutes)
+        journal.save()
+        
+        return render(
+            request, "client/projects/new_lookout.html", context={"success": True}
+        )
+
+UNTRACKED_MAX_LOGGABLE_MINUTES = 120
+
+class NewProjectUntrackedJournal(View):
+    def get(self, request, id, info=None, context={}):
+        context['info'] = info
+        if self.request.user.is_anonymous:
+            return redirect("homepage")
+
+        project = Project.objects.get(id=id)
+        if project.user != request.user:
+            return redirect("dashboard")
+
+        context["project"] = project
+
+        log_minutes = project.time_unjournaled()
+
+        log_minutes = min(log_minutes, HACKATIME_MAX_LOGGABLE_MINUTES)
+
+        context["log_minutes"] = log_minutes
+
+        context['max_mins'] = UNTRACKED_MAX_LOGGABLE_MINUTES
+        
+        context['info'] = "logging untracked journals is generally not advised. time deflation may occur."
+        
+        return render(request, "client/projects/journal/new_untracked.html", context=context)
+
+    def post(self, request, id):
+        project = Project.objects.get(id=id)
+        if project.user != request.user:
+            return redirect("dashboard")
+
+        reduced_minutes = min(
+            project.time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
+        )
+
+        content = request.POST["content"]
+        image_regex = r"\!\[.*?\]\(.*?\)"
+        image_count = len(re.findall(image_regex, content))
+        required_image_count = math.ceil(max(1, reduced_minutes / 180))
+
+        if image_count < required_image_count:
+            return self.get(
+                request,
+                id,
+                info=f"please add atleast {required_image_count - image_count} more image(s) to log this journal!",
+                context={"content": content},
+            )
+        if len(content) < min(100, reduced_minutes):
+            return self.get(
+                request,
+                id,
+                info=f"Content length must be more than 60 characters per hour!<br>({len(content)} of {reduced_minutes} required)",
+                context={"content": content},
+            )
+        
+        journal = Journal(project=project, content=content, minutes_worked = project.time_unjournaled(), reduced_minutes=reduced_minutes)
+        journal.save()
+        
+        return render(
+            request, "client/projects/new_untracked.html", context={"success": True}
+        )
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index d4bec4a..052c935 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -74,62 +74,3 @@ def post(self, request, id):
         project.save()
         return redirect("fr.projects.detail", project.id)
 
-
-MAX_LOGGABLE_MINUTES = 6 * 60
-
-
-class NewProjectJournal(View):
-    def get(self, request, id, info=None, context={}):
-        context['info'] = info
-        if self.request.user.is_anonymous:
-            return redirect("homepage")
-
-        project = Project.objects.get(id=id)
-        if project.user != request.user:
-            return redirect("dashboard")
-
-        context["project"] = project
-
-        log_minutes = project.time_unjournaled()
-
-        log_minutes = min(log_minutes, MAX_LOGGABLE_MINUTES)
-
-        context["log_minutes"] = log_minutes
-
-        return render(request, "client/projects/journal.html", context=context)
-
-    def post(self, request, id):
-        project = Project.objects.get(id=id)
-        if project.user != request.user:
-            return redirect("dashboard")
-
-        reduced_minutes = min(
-            project.time_unjournaled(), MAX_LOGGABLE_MINUTES
-        )
-
-        content = request.POST["content"]
-        image_regex = r"\!\[.*?\]\(.*?\)"
-        image_count = len(re.findall(image_regex, content))
-        required_image_count = math.ceil(max(1, reduced_minutes / 180))
-
-        if image_count < required_image_count:
-            return self.get(
-                request,
-                id,
-                info=f"please add atleast {required_image_count - image_count} more image(s) to log this journal!",
-                context={"content": content},
-            )
-        if len(content) < min(100, reduced_minutes):
-            return self.get(
-                request,
-                id,
-                info=f"Content length must be more than 60 characters per hour!<br>({len(content)} of {reduced_minutes} required)",
-                context={"content": content},
-            )
-        
-        journal = Journal(project=project, content=content, minutes_worked = project.time_unjournaled(), reduced_minutes=reduced_minutes)
-        journal.save()
-        
-        return render(
-            request, "client/projects/journal.html", context={"success": True}
-        )

From 58b3fa386b8f2819dcf750efdf38979cc7319935 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 6 Aug 2026 19:56:20 +0530
Subject: [PATCH 007/118] feat: windows are now fullscreenable

---
 twisted/common/templates/base.html            |  2 +
 .../templates/client/dashboard.html           | 56 ++++++++++++++++---
 .../twisted_site/templates/client/osbase.html |  2 +
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/twisted/common/templates/base.html b/twisted/common/templates/base.html
index 380ba3c..78c6844 100644
--- a/twisted/common/templates/base.html
+++ b/twisted/common/templates/base.html
@@ -3,6 +3,8 @@
 <head>
    {% tailwind_css %}
    {% block head %}{% endblock head %}
+    <link rel="icon" href="{% static 'favicon.png' %}" />
+    <title>Twisted</title>
 </head>
 <body class="font-vintage">
     {% block body %}
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 5fd66de..301652f 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -9,7 +9,7 @@
 
     <div id="windows-container"></div>
 
-    <div class="fixed bottom-0 left-0 right-0 z-50 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1">
+    <div id="taskbar" class="fixed bottom-0 left-0 right-0 z-9999 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1">
         <div class="relative">
             <button onclick="toggleStartMenu(event)"
                 class="flex items-center gap-1 !bg-twisted-600 !text-base !text-absolute-white !font-bold !px-3 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black active:!border-t-dark-black active:!border-l-dark-black active:!border-r-twisted-200 active:!border-b-twisted-200">
@@ -87,11 +87,11 @@
 <div class="-z-10 bg-surface fixed top-0 left-0 bottom-0 right-0"></div>
 
 <template id="window-template">
-    <div class="absolute window resize flex flex-col overflow-hidden" style="left: 300px; top: 300px; width: 300px; height: 300px;">
+    <div class="absolute window resize flex flex-col overflow-hidden" style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px;">
         <div class="title-bar">
             <label class="title-bar-text w-full">TITLE</label>
             <div class="title-bar-controls">
-                <button aria-label="Maximize"></button>
+                <button class="max-button" aria-label="Maximize"></button>
                 <button class="close-button" aria-label="Close">X</button>
             </div>
         </div>
@@ -106,8 +106,10 @@
 </audio>
 
 <script>
- let windowCounter = 0;
- 
+    let windowCounter = 0;
+    let currentMaximisedWindow = null;
+
+
     window.addEventListener("message", (event) => {
         const data = event.data;
         if (data.type != 'internal') return;
@@ -152,13 +154,49 @@
         realWin.querySelector('.title-bar').addEventListener('mousedown', () => focusWindow(id));
         dragWindow(realWin);
         focusWindow(id);
+        realWin.querySelector('.max-button').addEventListener('mouseup', () => {
+            console.log('maximise!');
+            fullscreenWindow(id);
+        });
         realWin.querySelector('.close-button').addEventListener('mouseup', () => {
-            console.log('close!')
+            console.log('close!');
             realWin.remove();
             taskBtn.remove();
         });
     }
- 
+    
+    function fullscreenWindow(id) {
+        const win = document.querySelector('.window[data-win-id="' + id + '"]');
+        if (currentMaximisedWindow != null && currentMaximisedWindow.win == win) {
+            win.style.left = currentMaximisedWindow.left;
+            win.style.top = currentMaximisedWindow.top;
+            win.style.width = currentMaximisedWindow.width;
+            win.style.height = currentMaximisedWindow.height;
+            win.classList.add('resize');
+
+            currentMaximisedWindow = null;
+            return
+        }
+        if (currentMaximisedWindow != null) {
+            fullscreenWindow(currentMaximisedWindow.id);
+        }
+        currentMaximisedWindow = {
+            id: id,
+            win: win,
+            left: win.style.left,
+            top: win.style.top,
+            width: win.style.width,
+            height: win.style.height
+        }
+        win.style.left = "0px";
+        win.style.top = "0px";
+        win.style.bottom = document.getElementById('taskbar').offsetHeight+"px";
+        win.style.right = "0px";
+        win.style.width = null;
+        win.style.height = null;
+        win.classList.remove('resize');
+    }
+
     function focusWindow(id) {
         document.querySelectorAll('#taskbar-windows button').forEach(b =>
             b.classList.remove('!bg-twisted-999'));
@@ -172,6 +210,7 @@
     }
  
     function dragWindow(mywindow) {
+        
         const titleBar = mywindow.getElementsByClassName('title-bar')[0];
         let dragging = false, startX = 0, startY = 0, origX = 0, origY = 0, pendingX = 0, pendingY = 0, rafId = null;
  
@@ -182,6 +221,9 @@
         }
  
         function onMove(e) {
+            if (currentMaximisedWindow != null && currentMaximisedWindow.win == mywindow) {
+                return;
+            }
             if (!dragging) return;
             e.preventDefault();
             const rect = mywindow.getBoundingClientRect();
diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index f0302e3..7f08bc2 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -5,6 +5,8 @@
         <link rel="stylesheet" href="https://unpkg.com/98.css" />
         <link rel="stylesheet" href="{% static 'css/dist/win98.css' %}" />
         <link rel="stylesheet" href="{% static 'css/98.override.css' %}" />
+        <link rel="icon" href="{% static 'favicon.png' %}" />
+        <title>Twisted</title>
         {% block css %} {% endblock css %}
     </head>
     <body class="font-vintage">

From b1c7e18cec919d9b60dc2daeacad2c4485cb41ab Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 6 Aug 2026 22:25:39 +0530
Subject: [PATCH 008/118] Added journalling and viewing journals in project
 detail view and made project detail view look a lot better

---
 .../migrations/0011_journal_type.py           |  19 +++
 twisted/twisted_site/models.py                |  34 ++++--
 .../templates/client/dashboard.html           |   8 +-
 .../twisted_site/templates/client/osbase.html |   6 +
 .../templates/client/projects/detail.html     |  66 +++++++---
 .../projects/journal/new_journal.base.html    |   6 -
 .../projects/journal/new_untracked.html       |   1 +
 .../templates/cotton/mdpreview.html           |  18 +++
 .../twisted_site/views/client/new_journal.py  | 114 +++++++++++-------
 9 files changed, 194 insertions(+), 78 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0011_journal_type.py
 create mode 100644 twisted/twisted_site/templates/cotton/mdpreview.html

diff --git a/twisted/twisted_site/migrations/0011_journal_type.py b/twisted/twisted_site/migrations/0011_journal_type.py
new file mode 100644
index 0000000..b99b43d
--- /dev/null
+++ b/twisted/twisted_site/migrations/0011_journal_type.py
@@ -0,0 +1,19 @@
+# Generated by Django 6.0.7 on 2026-08-06 15:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0010_rename_uploadedimage_uploadedfile'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='journal',
+            name='type',
+            field=models.CharField(choices=[('hackatime', 'Hackatime'), ('lookout', 'Lookout'), ('untracked', 'Untracked')], default='hackatime', max_length=100),
+            preserve_default=False,
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index d39e711..2407d39 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -5,12 +5,21 @@
 
 User = get_user_model()
 
+JOURNAL_TYPES = {
+   'hackatime': 'Hackatime',
+   'lookout': 'Lookout',
+   'untracked': 'Untracked'
+}
+
 class UploadedFile(models.Model):
     uploaded_by = models.ForeignKey(User, on_delete=models.PROTECT)
     link = models.CharField(max_length=500)
     cdn_response = models.JSONField()
     uploaded_thru = models.CharField(max_length=500)
     filesize = models.IntegerField()
+    
+    def __str__(self):
+        return f"{self.cdn_response['filename']} uploaded by {self.uploaded_by.profile.slack_username}"
 
 # Create your models here.
 class Profile(models.Model):
@@ -26,6 +35,7 @@ class Profile(models.Model):
     def __str__(self):
         return self.user.username  # ty:ignore[unresolved-attribute]
 
+PROJECT_TYPE_CHOICES = {'software': 'Software', 'hardware': 'Hardware'}
 
 class Project(models.Model):
     user = models.ForeignKey(User, on_delete=models.PROTECT, related_name="projects")
@@ -33,7 +43,7 @@ class Project(models.Model):
     project_name = models.CharField(max_length=50)
     project_description = models.TextField(max_length=2000)
     
-    project_type = models.CharField(choices={'software': 'Software', 'hardware': 'Hardware'}, max_length=100)
+    project_type = models.CharField(choices=PROJECT_TYPE_CHOICES, max_length=100)
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -55,15 +65,24 @@ def get_hackatime_project(self) -> hackatime.HackatimeProject | None:
     def time_logged(self, include_all_minutes=False):
         minutes = 0
         for journal in self.journals.all():  # ty:ignore[unresolved-attribute]
-            # django-orm-lens-disable-next-line DOL007
             if include_all_minutes:
+                # django-orm-lens-disable-next-line DOL007
                 minutes += journal.minutes_worked
             else:
                 minutes += journal.reduced_minutes
         return minutes
     
-    def all_time_logged(self):
-        return self.time_logged(True)
+    def hackatime_logged(self, include_all_minutes=False):
+        minutes = 0
+        for journal in self.journals.all():  # ty:ignore[unresolved-attribute]
+            if journal.type != 'hackatime':
+                continue
+            if include_all_minutes:
+                # django-orm-lens-disable-next-line DOL007
+                minutes += journal.minutes_worked
+            else:
+                minutes += journal.reduced_minutes
+        return minutes
     
     def time_spent(self):
         project = self.get_hackatime_project()
@@ -71,11 +90,12 @@ def time_spent(self):
             return 0
         return project.total_seconds // 60
 
-    def time_unjournaled(self):
-        return self.time_spent() - self.time_logged(include_all_minutes=True)
+    def hackatime_time_unjournaled(self):
+        return self.time_spent() - self.hackatime_logged(include_all_minutes=True)
 
 class Journal(models.Model):
     project = models.ForeignKey(Project, on_delete=models.PROTECT, related_name="journals")
+    type = models.CharField(max_length=100, choices=JOURNAL_TYPES)
     
     content = TextField()
     
@@ -86,4 +106,4 @@ class Journal(models.Model):
     reduced_minutes = models.IntegerField()
     
     def __str__(self):
-        return f"{self.minutes_worked} mins on {self.project}"
\ No newline at end of file
+        return f"{self.reduced_minutes} mins on {self.project}"
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 301652f..6f99746 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -156,7 +156,7 @@
         focusWindow(id);
         realWin.querySelector('.max-button').addEventListener('mouseup', () => {
             console.log('maximise!');
-            fullscreenWindow(id);
+            fullscreenWindow(realWin);
         });
         realWin.querySelector('.close-button').addEventListener('mouseup', () => {
             console.log('close!');
@@ -165,8 +165,7 @@
         });
     }
     
-    function fullscreenWindow(id) {
-        const win = document.querySelector('.window[data-win-id="' + id + '"]');
+    function fullscreenWindow(win) {
         if (currentMaximisedWindow != null && currentMaximisedWindow.win == win) {
             win.style.left = currentMaximisedWindow.left;
             win.style.top = currentMaximisedWindow.top;
@@ -178,10 +177,9 @@
             return
         }
         if (currentMaximisedWindow != null) {
-            fullscreenWindow(currentMaximisedWindow.id);
+            fullscreenWindow(currentMaximisedWindow.win);
         }
         currentMaximisedWindow = {
-            id: id,
             win: win,
             left: win.style.left,
             top: win.style.top,
diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index 7f08bc2..a5e8444 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -8,6 +8,12 @@
         <link rel="icon" href="{% static 'favicon.png' %}" />
         <title>Twisted</title>
         {% block css %} {% endblock css %}
+
+        <script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
+        <script src="
+        https://cdn.jsdelivr.net/npm/dompurify@3.4.12/dist/purify.min.js
+        "></script>
+
     </head>
     <body class="font-vintage">
         {% block body %} meow :3 {% endblock body %}
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 529717d..a19acb9 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -1,24 +1,58 @@
 {% extends "client/osbase.html" %} {% load static time_filters %} {% block body %}
 <div class="bg-surface flex flex-col w-full h-full font-vintage">
-    <div class="text-xl">
-        {{ project.project_name }} ({{ project.get_project_type_display }})
+    <div class="flex mb-2">
+        <div class="flex-1">
+            <div class="text-xl">
+                {{ project.project_name }} ({{ project.get_project_type_display }})
+            </div>
+            <div>{{ project.project_description }}</div>
+        </div>
+        <div>
+            <a href="{% url 'fr.projects.settings' project.id %}">
+                <button>Settings</button>
+            </a>
+        </div>
     </div>
-    <div>{{ project.project_description }}</div>
-    <div>
-        <a href="{% url 'fr.projects.settings' project.id %}">
-            <button>Settings</button>
-        </a>
-    </div>
-    <div>Time spent: {{ project.time_spent|minutes_to_hours_minutes }}</div>
-    <div>Time logged: {{ project.time_logged|minutes_to_hours_minutes }}</div>
-    {% if not project.hackatime_project_name %}
-    <div class="border border-twisted-400 p-1 m-1 w-fit">
-        Hi! I noticed you dont have a hackatime project linked yet. You can link a hackatime project over at the
-        <a href="{% url 'fr.projects.settings' project.id %}">project settings</a>.
+    <div class="mb-2">
+        <div class="flex gap-4">
+            <div>
+                <div>
+                    Time spent
+                </div>
+                <div class="text-right">
+                    {{ project.time_spent|minutes_to_hours_minutes }}
+                </div>
+            </div>
+            <div>
+                <div>Time logged</div>
+                <div class="text-right">
+                    {{ project.time_logged|minutes_to_hours_minutes }}
+                </div>
+            </div>
+        </div>
+        {% if not project.hackatime_project_name %}
+        <div class="border border-twisted-400 p-1 m-1 w-fit">
+            Hi! I noticed you dont have a hackatime project linked yet. You can link a hackatime project over at the
+            <a href="{% url 'fr.projects.settings' project.id %}">project settings</a>.
+        </div>
+        {% endif %}
+        <div>
+            <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'journal: {{ project.project_name }}', 'src': '{% url 'fr.projects.journals.new.hackatime' project.id %}'}, '*')">New journal...</button>
+        </div>
     </div>
-    {% endif %}
     <div>
-        <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'journal: {{ project.project_name }}', 'src': '{% url 'fr.projects.journals.new.hackatime' project.id %}'}, '*')">New journal...</button>
+        {% for journal in project.journals.all %}
+        <div class="p-4 m-2 rounded-lg bg-twisted-600">
+            <div class="flex gap-1">
+                <div>{{ journal.reduced_minutes|minutes_to_hours_minutes }} logged</div>
+                •
+                <div>{{ journal.get_type_display }} journal</div>
+            </div>
+            <div>
+                <c-mdpreview class="w-full zoom-100 **:[&_img]:zoom-50">{{ journal.content }}</c-mdpreview>
+            </div>
+        </div>
+        {% endfor %}
     </div>
 </div>
 
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
index 4498f4e..bdee945 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
@@ -55,10 +55,4 @@ <h2>Your journal has been logged!</h2>
     </div>
     {% endif %}
 </div>
-
-<script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
-<script src="
-https://cdn.jsdelivr.net/npm/dompurify@3.4.12/dist/purify.min.js
-"></script>
-
 {% endblock body %}
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
index e67434d..fdd3019 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
@@ -12,6 +12,7 @@
     This journal will log
     <input
         value="1"
+        name="time_logged"
         type="number"
         min="0"
         max="{{ max_mins }}"
diff --git a/twisted/twisted_site/templates/cotton/mdpreview.html b/twisted/twisted_site/templates/cotton/mdpreview.html
new file mode 100644
index 0000000..320b9ee
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/mdpreview.html
@@ -0,0 +1,18 @@
+<div class="{{ class }}">
+    <div class="w-full previewdiv zoom-100 [&_h1,h2,h3,h4,h5,h6]:zoom-40 [&_ul,ol]:list-outside [&_ul,ol]:pl-5 [&_ul]:list-disc [&_ol]:list-decimal *:my-1">
+    </div>
+    <textarea class="textbox">{{ slot }}</textarea>
+    <script>
+        function rendermarkdown() {
+            console.log('rendering markdown...');
+            elem = document.currentScript.parentElement.querySelector('.textbox')
+            content = elem.value;
+            elem.classList.add('hidden')
+            parsed = DOMPurify.sanitize(marked.parse(content));
+            elem.parentElement.querySelector('.previewdiv');
+            console.log(elem)
+            elem.parentElement.querySelector('.previewdiv').innerHTML = parsed;
+        }
+        rendermarkdown()
+    </script>
+</div>
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/new_journal.py b/twisted/twisted_site/views/client/new_journal.py
index 6c1277b..19b93f5 100644
--- a/twisted/twisted_site/views/client/new_journal.py
+++ b/twisted/twisted_site/views/client/new_journal.py
@@ -9,9 +9,10 @@
 
 HACKATIME_MAX_LOGGABLE_MINUTES = 6 * 60
 
+
 class NewProjectHackatimeJournal(View):
     def get(self, request, id, info=None, context={}):
-        context['info'] = info
+        context["info"] = info
         if self.request.user.is_anonymous:
             return redirect("homepage")
 
@@ -21,13 +22,15 @@ def get(self, request, id, info=None, context={}):
 
         context["project"] = project
 
-        log_minutes = project.time_unjournaled()
+        log_minutes = project.hackatime_time_unjournaled()
 
         log_minutes = min(log_minutes, HACKATIME_MAX_LOGGABLE_MINUTES)
 
         context["log_minutes"] = log_minutes
 
-        return render(request, "client/projects/journal/new_hackatime.html", context=context)
+        return render(
+            request, "client/projects/journal/new_hackatime.html", context=context
+        )
 
     def post(self, request, id):
         project = Project.objects.get(id=id)
@@ -35,7 +38,7 @@ def post(self, request, id):
             return redirect("dashboard")
 
         reduced_minutes = min(
-            project.time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
+            project.hackatime_time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
         )
 
         content = request.POST["content"]
@@ -57,17 +60,22 @@ def post(self, request, id):
                 info=f"Content length must be more than 60 characters per hour!<br>({len(content)} of {reduced_minutes} required)",
                 context={"content": content},
             )
-        
-        journal = Journal(project=project, content=content, minutes_worked = project.time_unjournaled(), reduced_minutes=reduced_minutes)
-        journal.save()
-        
-        return render(
-            request, "client/projects/new_hackatime.html", context={"success": True}
+
+        journal = Journal(
+            project=project,
+            type="hackatime",
+            content=content,
+            minutes_worked=project.hackatime_time_unjournaled(),
+            reduced_minutes=reduced_minutes,
         )
+        journal.save()
+
+        return self.get(request, id, context={"success": True})
+
 
 class NewProjectLookoutJournal(View):
     def get(self, request, id, info=None, context={}):
-        context['info'] = info
+        context["info"] = info
         if self.request.user.is_anonymous:
             return redirect("homepage")
 
@@ -77,15 +85,17 @@ def get(self, request, id, info=None, context={}):
 
         context["project"] = project
 
-        log_minutes = project.time_unjournaled()
+        log_minutes = project.hackatime_time_unjournaled()
 
         log_minutes = min(log_minutes, HACKATIME_MAX_LOGGABLE_MINUTES)
 
         context["log_minutes"] = log_minutes
-        
-        context['info'] = "TODO: This has NOT been implemented yet."
 
-        return render(request, "client/projects/journal/new_lookout.html", context=context)
+        context["info"] = "TODO: This has NOT been implemented yet."
+
+        return render(
+            request, "client/projects/journal/new_lookout.html", context=context
+        )
 
     def post(self, request, id):
         project = Project.objects.get(id=id)
@@ -93,7 +103,7 @@ def post(self, request, id):
             return redirect("dashboard")
 
         reduced_minutes = min(
-            project.time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
+            project.hackatime_time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
         )
 
         content = request.POST["content"]
@@ -115,21 +125,31 @@ def post(self, request, id):
                 info=f"Content length must be more than 60 characters per hour!<br>({len(content)} of {reduced_minutes} required)",
                 context={"content": content},
             )
-        
-        journal = Journal(project=project, content=content, minutes_worked = project.time_unjournaled(), reduced_minutes=reduced_minutes)
+
+        journal = Journal(
+            project=project,
+            content=content,
+            minutes_worked=project.hackatime_time_unjournaled(),
+            reduced_minutes=reduced_minutes,
+        )
         journal.save()
-        
+
         return render(
             request, "client/projects/new_lookout.html", context={"success": True}
         )
 
-UNTRACKED_MAX_LOGGABLE_MINUTES = 120
+
+UNTRACKED_MAX_LOGGABLE_MINUTES = 180
+
 
 class NewProjectUntrackedJournal(View):
     def get(self, request, id, info=None, context={}):
-        context['info'] = info
+        context["info"] = info
         if self.request.user.is_anonymous:
             return redirect("homepage")
+        
+        if project.project_type == 'software':
+            return redirect('fr.projects.journals.new.hackatime')
 
         project = Project.objects.get(id=id)
         if project.user != request.user:
@@ -137,50 +157,56 @@ def get(self, request, id, info=None, context={}):
 
         context["project"] = project
 
-        log_minutes = project.time_unjournaled()
+        log_minutes = project.hackatime_time_unjournaled()
 
         log_minutes = min(log_minutes, HACKATIME_MAX_LOGGABLE_MINUTES)
 
         context["log_minutes"] = log_minutes
 
-        context['max_mins'] = UNTRACKED_MAX_LOGGABLE_MINUTES
-        
-        context['info'] = "logging untracked journals is generally not advised. time deflation may occur."
-        
-        return render(request, "client/projects/journal/new_untracked.html", context=context)
+        context["max_mins"] = UNTRACKED_MAX_LOGGABLE_MINUTES
+
+        context["info"] = (
+            "logging untracked journals is generally not advised. time deflation may occur."
+        )
+
+        return render(
+            request, "client/projects/journal/new_untracked.html", context=context
+        )
 
     def post(self, request, id):
         project = Project.objects.get(id=id)
         if project.user != request.user:
             return redirect("dashboard")
-
-        reduced_minutes = min(
-            project.time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
-        )
+        
+        if project.project_type == 'software':
+            return redirect('fr.projects.journals.new.hackatime')
 
         content = request.POST["content"]
-        image_regex = r"\!\[.*?\]\(.*?\)"
-        image_count = len(re.findall(image_regex, content))
-        required_image_count = math.ceil(max(1, reduced_minutes / 180))
+        time_logged = int(request.POST["time_logged"])
 
-        if image_count < required_image_count:
+        if time_logged > 180:
             return self.get(
                 request,
                 id,
-                info=f"please add atleast {required_image_count - image_count} more image(s) to log this journal!",
+                info="Time logged cannot be more than 180 minutes!",
                 context={"content": content},
             )
-        if len(content) < min(100, reduced_minutes):
+
+        if len(content) < min(100, time_logged * 2):
             return self.get(
                 request,
                 id,
-                info=f"Content length must be more than 60 characters per hour!<br>({len(content)} of {reduced_minutes} required)",
+                info=f"Content length must be more than 120 characters per hour!<br>({len(content)} of {time_logged} required)",
                 context={"content": content},
             )
-        
-        journal = Journal(project=project, content=content, minutes_worked = project.time_unjournaled(), reduced_minutes=reduced_minutes)
-        journal.save()
-        
-        return render(
-            request, "client/projects/new_untracked.html", context={"success": True}
+
+        journal = Journal(
+            project=project,
+            type="untracked",
+            content=content,
+            minutes_worked=time_logged,
+            reduced_minutes=time_logged,
         )
+        journal.save()
+
+        return self.get(request, id, context={"success": True})

From 2fd207f05ff8923ed038b0b9b691e320bb26b2ec Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 7 Aug 2026 17:44:58 +0530
Subject: [PATCH 009/118] Remove TODO.md

---
 TODO.md | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 TODO.md

diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index 6c8b8c8..0000000
--- a/TODO.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Kavyansh
-- [x] implement hackatime auth
-- [x] add project creation
-- [x] add hackatime helper functions
-- [x] implement hackatime for projects
-- [ ] add journal creation (backend)
-- [ ] add journal editing
-- [ ] implement shipping
-- [ ] implement pathways
-- [ ] implement images in journals
-- [ ] implement admin dash
-- [ ] implement reviewer dash
-- [ ] 
\ No newline at end of file

From 979c948dbd871375f3d05392183c8b8592c3cc87 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 7 Aug 2026 17:55:54 +0530
Subject: [PATCH 010/118] Fix a few bugs

---
 twisted/twisted_site/templates/client/homepage.html      | 2 +-
 twisted/twisted_site/templates/client/projects/list.html | 4 +++-
 twisted/twisted_site/views/client/new_journal.py         | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index 08f4bb3..4dc19f5 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -25,7 +25,6 @@
         <a href="{% url 'faqs' %}">FAQs</a>
       </nav>
       <div id="rsvp">
-        {% csrf_token %}
         {% if login_enabled %}
         {% if user.is_authenticated %}
         <a href="{% url 'dashboard' %}">
@@ -35,6 +34,7 @@
         </a>
         {% else %}
         <form method="post" action="{% url 'login' %}">
+          {% csrf_token %}
           <button type="submit" class="bg-twisted-400 text-absolute-white text-2xl font-bold py-3 px-10 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
             Login
           </button>
diff --git a/twisted/twisted_site/templates/client/projects/list.html b/twisted/twisted_site/templates/client/projects/list.html
index 25323ad..70ec802 100644
--- a/twisted/twisted_site/templates/client/projects/list.html
+++ b/twisted/twisted_site/templates/client/projects/list.html
@@ -21,7 +21,9 @@
     </div>
     </div>
     <div class="sticky status-field-border font-vintage">
-        {{ projects|length }} project{{ projects|length|pluralize }}
+        <div class="mx-1">
+            {{ projects|length }} project{{ projects|length|pluralize }}
+        </div>
     </div>
 </div>
 
diff --git a/twisted/twisted_site/views/client/new_journal.py b/twisted/twisted_site/views/client/new_journal.py
index 19b93f5..6122fb2 100644
--- a/twisted/twisted_site/views/client/new_journal.py
+++ b/twisted/twisted_site/views/client/new_journal.py
@@ -148,10 +148,11 @@ def get(self, request, id, info=None, context={}):
         if self.request.user.is_anonymous:
             return redirect("homepage")
         
+        project = Project.objects.get(id=id)
+
         if project.project_type == 'software':
             return redirect('fr.projects.journals.new.hackatime')
-
-        project = Project.objects.get(id=id)
+        
         if project.user != request.user:
             return redirect("dashboard")
 

From e21cd5b12ae0ab75384062f3949a0a4c6a2d8681 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 7 Aug 2026 22:30:22 +0530
Subject: [PATCH 011/118] Add delete button and some other stuff

---
 .../static_src/src/styles.css                 |  5 ++
 .../templates/client/projects/detail.html     | 13 ++--
 .../projects/journal/new_hackatime.html       |  3 -
 .../projects/journal/new_journal.base.html    |  5 +-
 .../client/projects/journal/new_lookout.html  | 11 ----
 .../projects/journal/new_untracked.html       |  3 -
 twisted/twisted_site/urls.py                  |  2 -
 twisted/twisted_site/views/client/__init__.py |  2 +-
 .../twisted_site/views/client/new_journal.py  | 66 -------------------
 9 files changed, 15 insertions(+), 95 deletions(-)
 delete mode 100644 twisted/twisted_site/templates/client/projects/journal/new_lookout.html

diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index e219788..4c656d9 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -70,6 +70,11 @@ button {
   }
 }
 
+@utility image-render-pixelated {
+  image-rendering: crisp-edges;
+  image-rendering: pixelated;
+}
+
 .flag-wave {
   transform-origin: top center;
   animation: flag-wave 4s ease-in-out infinite;
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index a19acb9..9f708ca 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -15,14 +15,14 @@
     </div>
     <div class="mb-2">
         <div class="flex gap-4">
-            <div>
+            <!-- <div>
                 <div>
                     Time spent
                 </div>
                 <div class="text-right">
                     {{ project.time_spent|minutes_to_hours_minutes }}
                 </div>
-            </div>
+            </div> -->
             <div>
                 <div>Time logged</div>
                 <div class="text-right">
@@ -44,9 +44,12 @@
         {% for journal in project.journals.all %}
         <div class="p-4 m-2 rounded-lg bg-twisted-600">
             <div class="flex gap-1">
-                <div>{{ journal.reduced_minutes|minutes_to_hours_minutes }} logged</div>
-                •
-                <div>{{ journal.get_type_display }} journal</div>
+                <div class="flex-1">
+                    <div>{{ journal.reduced_minutes|minutes_to_hours_minutes }} logged via {{ journal.get_type_display }}</div>
+                </div>
+                <div>
+                    <img class="w-16 image-render-pixelated" src="{% static 'icons/delete.png' %}" alt="">
+                </div>
             </div>
             <div>
                 <c-mdpreview class="w-full zoom-100 **:[&_img]:zoom-50">{{ journal.content }}</c-mdpreview>
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
index d741905..e62cdfc 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
@@ -1,9 +1,6 @@
 {% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %}
 {% block links %}
 <button disabled>Hackatime</button>
-    <a href="{% url 'fr.projects.journals.new.lookout' project.id %}">
-        <button>Lookout</button>
-    </a>
     {% if project.project_type == 'hardware' %}
     <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
         <button>untracked</button>
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
index bdee945..28d2590 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
@@ -5,7 +5,7 @@
   "prerender": [
     {
     "source": "list",
-    "urls": ["{% url 'fr.projects.journals.new.hackatime' project.id %}", "{% url 'fr.projects.journals.new.lookout' project.id %}", "{% url 'fr.projects.journals.new.untracked' project.id %}"],
+    "urls": ["{% url 'fr.projects.journals.new.hackatime' project.id %}", "{% url 'fr.projects.journals.new.untracked' project.id %}"],
     "eagerness": "eager"
 }]
 }
@@ -20,9 +20,6 @@
         <a href="{% url 'fr.projects.journals.new.hackatime' project.id %}">
             <button>Hackatime</button>
         </a>
-        <a href="{% url 'fr.projects.journals.new.lookout' project.id %}">
-            <button>Lookout</button>
-        </a>
         {% if project.project_type == 'hardware' %}
         <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
             <button>untracked</button>
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_lookout.html b/twisted/twisted_site/templates/client/projects/journal/new_lookout.html
deleted file mode 100644
index 48e8eff..0000000
--- a/twisted/twisted_site/templates/client/projects/journal/new_lookout.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %} {% block links %}
-<a href="{% url 'fr.projects.journals.new.hackatime' project.id %}">
-    <button>Hackatime</button>
-</a>
-    <button disabled>Lookout</button>
-{% if project.project_type == 'hardware' %}
-<a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
-    <button>untracked</button>
-</a>
-{% endif %}
-{% endblock links %}
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
index fdd3019..15b77df 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
@@ -2,9 +2,6 @@
 <a href="{% url 'fr.projects.journals.new.hackatime' project.id %}">
     <button>Hackatime</button>
 </a>
-<a href="{% url 'fr.projects.journals.new.lookout' project.id %}">
-    <button>Lookout</button>
-</a>
 {% if project.project_type == 'hardware' %}
 <button disabled>untracked</button>
 {% endif %} {% endblock links %} {% block journal_log_message %} {% endblock journal_log_message %} {% block preform %}
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index 31de9ff..31365d3 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -21,7 +21,5 @@
     path("dashboard/frame/projects/<int:id>/", client.ProjectDetail.as_view(), name="fr.projects.detail"),
     path("dashboard/frame/projects/<int:id>/settings/", client.ProjectSettings.as_view(), name="fr.projects.settings"),
     path("dashboard/frame/projects/<int:id>/journals/new/hackatime/", client.NewProjectHackatimeJournal.as_view(), name="fr.projects.journals.new.hackatime"),
-    path("dashboard/frame/projects/<int:id>/journals/new/lookout/", client.NewProjectLookoutJournal.as_view(), name="fr.projects.journals.new.lookout"),
     path("dashboard/frame/projects/<int:id>/journals/new/untracked/", client.NewProjectUntrackedJournal.as_view(), name="fr.projects.journals.new.untracked"),
-
 ]
diff --git a/twisted/twisted_site/views/client/__init__.py b/twisted/twisted_site/views/client/__init__.py
index 6203cf8..7365ea0 100644
--- a/twisted/twisted_site/views/client/__init__.py
+++ b/twisted/twisted_site/views/client/__init__.py
@@ -2,4 +2,4 @@
 from .dashboard import DashboardView
 from .projects import ListProjects, CreateProject
 from .project import ProjectDetail, ProjectSettings
-from .new_journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal, NewProjectLookoutJournal
\ No newline at end of file
+from .new_journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/new_journal.py b/twisted/twisted_site/views/client/new_journal.py
index 6122fb2..aa957fa 100644
--- a/twisted/twisted_site/views/client/new_journal.py
+++ b/twisted/twisted_site/views/client/new_journal.py
@@ -73,72 +73,6 @@ def post(self, request, id):
         return self.get(request, id, context={"success": True})
 
 
-class NewProjectLookoutJournal(View):
-    def get(self, request, id, info=None, context={}):
-        context["info"] = info
-        if self.request.user.is_anonymous:
-            return redirect("homepage")
-
-        project = Project.objects.get(id=id)
-        if project.user != request.user:
-            return redirect("dashboard")
-
-        context["project"] = project
-
-        log_minutes = project.hackatime_time_unjournaled()
-
-        log_minutes = min(log_minutes, HACKATIME_MAX_LOGGABLE_MINUTES)
-
-        context["log_minutes"] = log_minutes
-
-        context["info"] = "TODO: This has NOT been implemented yet."
-
-        return render(
-            request, "client/projects/journal/new_lookout.html", context=context
-        )
-
-    def post(self, request, id):
-        project = Project.objects.get(id=id)
-        if project.user != request.user:
-            return redirect("dashboard")
-
-        reduced_minutes = min(
-            project.hackatime_time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
-        )
-
-        content = request.POST["content"]
-        image_regex = r"\!\[.*?\]\(.*?\)"
-        image_count = len(re.findall(image_regex, content))
-        required_image_count = math.ceil(max(1, reduced_minutes / 180))
-
-        if image_count < required_image_count:
-            return self.get(
-                request,
-                id,
-                info=f"please add atleast {required_image_count - image_count} more image(s) to log this journal!",
-                context={"content": content},
-            )
-        if len(content) < min(100, reduced_minutes):
-            return self.get(
-                request,
-                id,
-                info=f"Content length must be more than 60 characters per hour!<br>({len(content)} of {reduced_minutes} required)",
-                context={"content": content},
-            )
-
-        journal = Journal(
-            project=project,
-            content=content,
-            minutes_worked=project.hackatime_time_unjournaled(),
-            reduced_minutes=reduced_minutes,
-        )
-        journal.save()
-
-        return render(
-            request, "client/projects/new_lookout.html", context={"success": True}
-        )
-
-
 UNTRACKED_MAX_LOGGABLE_MINUTES = 180
 
 

From 16a40ed5b74fec632c8afb91ad9750df47e887a1 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Fri, 7 Aug 2026 17:03:33 +0000
Subject: [PATCH 012/118] Migrate from CDN to R2 Bucket

---
 pyproject.toml                     |  1 +
 twisted/.env.example               |  8 ++++-
 twisted/twisted_site/views/misc.py | 58 +++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index abed9d8..7a7b091 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,4 +19,5 @@ dependencies = [
     "tzdata>=2026.3",
     "urllib3>=2.7.0",
     "whitenoise>=6.12.0",
+    "boto3>=1.43.66",
 ]
diff --git a/twisted/.env.example b/twisted/.env.example
index 5acfbb2..6945ef5 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -19,4 +19,10 @@ CSRF_TRUSTED_ORIGINS = http://127.0.0.1:8000, http://localhost:8000
 
 HACKCLUB_CDN_API_KEY = sk_cdn_***
 
-LOGIN_ENABLED=true
\ No newline at end of file
+LOGIN_ENABLED=true
+
+R2_ENDPOINT = https://<your-account-id>.r2.cloudflarestorage.com
+R2_ACCESS_KEY = <your-access-key>
+R2_SECRET_KEY = <your-secret-key>
+R2_BUCKET = <your-bucket>
+R2_PUBLIC_URL = <your-public-url>
diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index d8311e8..23cee80 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -6,7 +6,18 @@
 from django.shortcuts import render, redirect
 from ..models import Project, UploadedFile
 from django.contrib.auth.decorators import login_required
+import boto3
+from pathlib import Path
+from uuid import uuid4
+from botocore.exceptions import ClientError, BotoCoreError
 
+s3 = boto3.client(
+    "s3",
+    endpoint_url=os.environ["R2_ENDPOINT"],
+    aws_access_key_id=os.environ["R2_ACCESS_KEY"],
+    aws_secret_access_key=os.environ["R2_SECRET_KEY"],
+    region_name="auto",
+)
 
 @login_required
 def upload_file(request):
@@ -42,27 +53,32 @@ def file_uploader(request, image):
     :param `image` is from `request.FILES['markdown-image-upload']`
     :return json response
     """
-    api_url = "https://cdn.hackclub.com/api/v4/upload"
-    headers = {"Authorization": "Bearer " + os.environ["HACKCLUB_CDN_API_KEY"]}
-    response = requests.post(api_url, headers=headers, files={"file": image})
-
-    if response.status_code in [200, 201]:
-        response_data = response.json()
-        UploadedFile.objects.create(
-            uploaded_by=request.user,
-            link=response_data["url"],
-            cdn_response=response_data,
-            uploaded_thru=request.POST.get("ref", "unknown"),
-            filesize=response_data["size"],
+    try:
+        ext = Path(image.name).suffix.lower()
+        filename = f"{uuid4().hex}{ext}"
+        s3.upload_fileobj(
+            image,
+            os.environ["R2_BUCKET"],
+            filename,
+            ExtraArgs={
+                "ContentType": image.content_type,
+            },
         )
-        return {
-            "status": "ok",
-            "link": response_data["url"],
-            "name": response_data["filename"],
-            "response": response_data,
+
+        response_data = {
+            "url": f"{os.environ['R2_PUBLIC_URL']}/{filename}",
+            "filename": filename,
+            "size": image.size,
         }
 
-    return {
-        "status": response.status_code,
-        "error": response.content.decode("utf-8"),
-    }
+    except (ClientError, BotoCoreError) as e:
+        return {
+            "status": "Error Occured", 
+            "error": str(e)
+            }
+
+    except Exception as e:
+        return {
+            "status": "Error Occurred", 
+            "error": f"Unknown Error Occurred: {str(e)}",
+            }

From b3fd168aa6e4ec9a9c9dfb0c48dc9d8a6c23299e Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Fri, 7 Aug 2026 17:11:00 +0000
Subject: [PATCH 013/118] Add new dependancy to uv.lock

---
 uv.lock | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/uv.lock b/uv.lock
index c3c9fc4..da25c51 100644
--- a/uv.lock
+++ b/uv.lock
@@ -157,6 +157,34 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/cd/0c/31cfaa6b56fe23488ecb993bc9fc526c0d84d89607decdf2a10776426c2e/binaryornot-0.6.0-py3-none-any.whl", hash = "sha256:900adfd5e1b821255ba7e63139b0396b14c88b9286e74e03b6f51e0200331337", size = 14185, upload-time = "2026-03-08T16:26:27.466Z" },
 ]
 
+[[package]]
+name = "boto3"
+version = "1.43.66"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "botocore" },
+    { name = "jmespath" },
+    { name = "s3transfer" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/90/8f/92486dc60e9caf63a766bce02c561381455169a1b7090548d1fdc14d6b8d/boto3-1.43.66.tar.gz", hash = "sha256:ffc77129a4e5519bdbd9b278e4fe9e6276c9d951e0d2b60d626977bdb957cb38", size = 112668, upload-time = "2026-08-06T19:38:42.066Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/07/bc/131d596cf673f7b7c6b52ff88fa05f73bbdf9dff70d93e31d4b62645def3/boto3-1.43.66-py3-none-any.whl", hash = "sha256:8d097a41e2f545c25252105570f782bb035b1ac13d6213c772d1c895dc7cedeb", size = 140027, upload-time = "2026-08-06T19:38:40.651Z" },
+]
+
+[[package]]
+name = "botocore"
+version = "1.43.66"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "jmespath" },
+    { name = "python-dateutil" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/5d/81/9ce1f5fe88b4b1429edf83189b8994ffb9883fc20bdd46b7ee9d1cc1da24/botocore-1.43.66.tar.gz", hash = "sha256:dde324cbe8be14b536b78f4fafe192f94fffcc70716bde804044e62495af8c3c", size = 15880416, upload-time = "2026-08-06T19:38:37.603Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/84/e6/53f0e28dea0f17a1b041bb3356d0c21fda7ba4198a515cfaf4d5f3088fe3/botocore-1.43.66-py3-none-any.whl", hash = "sha256:0fa62529579469a9224c186eba87e7e561db87dfad20c63ce5d52e427c7fa325", size = 15566310, upload-time = "2026-08-06T19:38:34.446Z" },
+]
+
 [[package]]
 name = "certifi"
 version = "2026.7.22"
@@ -570,6 +598,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" },
 ]
 
+[[package]]
+name = "jmespath"
+version = "1.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d3/59/322338183ecda247fb5d1763a6cbe46eff7222eaeebafd9fa65d4bf5cb11/jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d", size = 27377, upload-time = "2026-01-22T16:35:26.279Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64", size = 20419, upload-time = "2026-01-22T16:35:24.919Z" },
+]
+
 [[package]]
 name = "joserfc"
 version = "1.7.4"
@@ -992,6 +1029,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/82/3b/64d4899d73f91ba49a8c18a8ff3f0ea8f1c1d75481760df8c68ef5235bf5/rich-15.0.0-py3-none-any.whl", hash = "sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb", size = 310654, upload-time = "2026-04-12T08:24:02.83Z" },
 ]
 
+[[package]]
+name = "s3transfer"
+version = "0.19.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "botocore" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/76/43/35e4d8aa320bffe8287fe8f65f578fa2d2db0a64212f0e710dce58267854/s3transfer-0.19.2.tar.gz", hash = "sha256:ba0309fd86be3c27dbf78cdd813c13c5e1df16e5874b99d2535ebbdfb9892993", size = 165592, upload-time = "2026-07-22T19:30:44.432Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/bc/e7/5c595c75e9f41a44f30e526eda465ea0b4eec93470e074e4a111b253f13a/s3transfer-0.19.2-py3-none-any.whl", hash = "sha256:d8168eccca828cbb2cd573675333f3bddd254313a9c42494b84c76b539e8ba25", size = 90216, upload-time = "2026-07-22T19:30:43.251Z" },
+]
+
 [[package]]
 name = "six"
 version = "1.17.0"
@@ -1035,6 +1084,7 @@ source = { virtual = "." }
 dependencies = [
     { name = "aiohttp" },
     { name = "authlib" },
+    { name = "boto3" },
     { name = "django" },
     { name = "django-cotton" },
     { name = "django-jazzmin" },
@@ -1053,6 +1103,7 @@ dependencies = [
 requires-dist = [
     { name = "aiohttp", specifier = ">=3.14.3" },
     { name = "authlib", specifier = ">=1.7.2" },
+    { name = "boto3", specifier = ">=1.43.66" },
     { name = "django", specifier = ">=6.0.7" },
     { name = "django-cotton", specifier = ">=2.7.2" },
     { name = "django-jazzmin", specifier = ">=3.0.5" },

From 72a01f9e38f665c9f96dd218eb2b97406618ab4c Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 7 Aug 2026 22:47:37 +0530
Subject: [PATCH 014/118] fix a few stuff related to image uploading

---
 twisted/.env.example               |  1 +
 twisted/twisted_site/views/misc.py | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/twisted/.env.example b/twisted/.env.example
index 6945ef5..a868233 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -26,3 +26,4 @@ R2_ACCESS_KEY = <your-access-key>
 R2_SECRET_KEY = <your-secret-key>
 R2_BUCKET = <your-bucket>
 R2_PUBLIC_URL = <your-public-url>
+R2_TOKEN = 
\ No newline at end of file
diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index 23cee80..3f4e6d3 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -65,7 +65,7 @@ def file_uploader(request, image):
             },
         )
 
-        response_data = {
+        return {
             "url": f"{os.environ['R2_PUBLIC_URL']}/{filename}",
             "filename": filename,
             "size": image.size,
@@ -73,12 +73,12 @@ def file_uploader(request, image):
 
     except (ClientError, BotoCoreError) as e:
         return {
-            "status": "Error Occured", 
-            "error": str(e)
+                "status": "Error Occured", 
+                "error": str(e)
             }
 
     except Exception as e:
         return {
-            "status": "Error Occurred", 
-            "error": f"Unknown Error Occurred: {str(e)}",
+                "status": "Error Occurred", 
+                "error": f"Unknown Error Occurred: {str(e)}",
             }

From a644a2b1c46d88ac7fcc15c27139369a15ef8513 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Fri, 7 Aug 2026 17:26:42 +0000
Subject: [PATCH 015/118] Add some debugging code

---
 twisted/twisted_site/views/misc.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index 3f4e6d3..918c8ec 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -10,7 +10,9 @@
 from pathlib import Path
 from uuid import uuid4
 from botocore.exceptions import ClientError, BotoCoreError
+import logging
 
+logging.basicConfig(level=logging.INFO)
 s3 = boto3.client(
     "s3",
     endpoint_url=os.environ["R2_ENDPOINT"],
@@ -72,12 +74,14 @@ def file_uploader(request, image):
         }
 
     except (ClientError, BotoCoreError) as e:
+        logging.exception(f"Error occurred during file upload. e: {e}")
         return {
                 "status": "Error Occured", 
                 "error": str(e)
             }
 
     except Exception as e:
+        logging.exception(f"Unknown error occurred during file upload. e: {e}")
         return {
                 "status": "Error Occurred", 
                 "error": f"Unknown Error Occurred: {str(e)}",

From d19c3177a847a35bf7866bbaad5ffb4fa18f2fde Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Fri, 7 Aug 2026 17:30:28 +0000
Subject: [PATCH 016/118] Add more debugging code

---
 twisted/twisted_site/views/misc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index 918c8ec..7281aa1 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -74,14 +74,14 @@ def file_uploader(request, image):
         }
 
     except (ClientError, BotoCoreError) as e:
-        logging.exception(f"Error occurred during file upload. e: {e}")
+        print(f"Error occurred during file upload. e: {e}")
         return {
                 "status": "Error Occured", 
                 "error": str(e)
             }
 
     except Exception as e:
-        logging.exception(f"Unknown error occurred during file upload. e: {e}")
+        print(f"Unknown error occurred during file upload. e: {e}")
         return {
                 "status": "Error Occurred", 
                 "error": f"Unknown Error Occurred: {str(e)}",

From 2b5beca7d1a42d9d40ee772e16aaaecd554d440f Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Fri, 7 Aug 2026 17:36:51 +0000
Subject: [PATCH 017/118] More debugging

---
 twisted/twisted_site/views/misc.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index 7281aa1..b10b8e7 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -11,8 +11,8 @@
 from uuid import uuid4
 from botocore.exceptions import ClientError, BotoCoreError
 import logging
+logger = logging.getLogger('django')
 
-logging.basicConfig(level=logging.INFO)
 s3 = boto3.client(
     "s3",
     endpoint_url=os.environ["R2_ENDPOINT"],
@@ -74,14 +74,14 @@ def file_uploader(request, image):
         }
 
     except (ClientError, BotoCoreError) as e:
-        print(f"Error occurred during file upload. e: {e}")
+        logger.error(f"Error occurred during file upload. e: {e}")
         return {
                 "status": "Error Occured", 
                 "error": str(e)
             }
 
     except Exception as e:
-        print(f"Unknown error occurred during file upload. e: {e}")
+        logger.error(f"Unknown error occurred during file upload. e: {e}")
         return {
                 "status": "Error Occurred", 
                 "error": f"Unknown Error Occurred: {str(e)}",

From 62f31a6f74ba96d66a0039b6d687aeb5c74194d9 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Fri, 7 Aug 2026 17:48:18 +0000
Subject: [PATCH 018/118] Fix Image Upload

---
 twisted/twisted_site/views/misc.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index b10b8e7..3f5d8d2 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -10,8 +10,6 @@
 from pathlib import Path
 from uuid import uuid4
 from botocore.exceptions import ClientError, BotoCoreError
-import logging
-logger = logging.getLogger('django')
 
 s3 = boto3.client(
     "s3",
@@ -40,7 +38,15 @@ def upload_file(request):
                 )
 
             response_data = file_uploader(request, image)
-            return JsonResponse(response_data)
+            # Handle upload errors
+            if response_data.get("status") == "error":
+                return JsonResponse(response_data)
+            return JsonResponse({
+                "status": "ok",
+                "link": response_data["url"],
+                "name": response_data["filename"],
+                "response": response_data,
+            })
         return JsonResponse(
             {"status": "error", "reason": "Invalid request: no image found"}
         )
@@ -74,15 +80,13 @@ def file_uploader(request, image):
         }
 
     except (ClientError, BotoCoreError) as e:
-        logger.error(f"Error occurred during file upload. e: {e}")
         return {
                 "status": "Error Occured", 
                 "error": str(e)
             }
 
     except Exception as e:
-        logger.error(f"Unknown error occurred during file upload. e: {e}")
         return {
-                "status": "Error Occurred", 
-                "error": f"Unknown Error Occurred: {str(e)}",
-            }
+            "status": "Error Occurred", 
+            "error": f"Unknown Error Occurred: {str(e)}",
+        }

From 57834a35240658e3c9334fb9d5985877836ae220 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 8 Aug 2026 08:20:29 +0530
Subject: [PATCH 019/118] Make changes to image uploading: telemetry data

---
 twisted/twisted_site/views/misc.py | 43 +++++++++++++++++-------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index 3f5d8d2..0797753 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -21,34 +21,40 @@
 
 @login_required
 def upload_file(request):
-    """
-    Makdown image upload for uploading to imgur.com
-    and represent as json to markdown editor.
-    """
-
     if request.method == "POST":
         if "file" in request.FILES:
-            image = request.FILES["file"]
+            file = request.FILES["file"]
             max_file_mb = float(request.POST.get("max_mb", 1))
 
-            image_size = image.size / (1024 * 1024)
-            if image_size > max_file_mb:
+            file_size_mb = file.size / (1024 * 1024)
+            if file_size_mb > max_file_mb:
                 return JsonResponse(
                     {"status": "error", "reason": f"File size exceeds {max_file_mb}MB!"}
                 )
 
-            response_data = file_uploader(request, image)
+            response_data = file_uploader(request, file)
             # Handle upload errors
             if response_data.get("status") == "error":
                 return JsonResponse(response_data)
+            
+            url = response_data["link"]
+            filename = response_data["name"]
+            UploadedFile.objects.create(
+                uploaded_by=request.user,
+                link=url,
+                cdn_response=response_data,
+                uploaded_thru=request.POST.get('ref', 'unknown'),
+                filesize=file.size
+            )
+            
             return JsonResponse({
                 "status": "ok",
-                "link": response_data["url"],
-                "name": response_data["filename"],
+                "link": url,
+                "name": filename,
                 "response": response_data,
             })
         return JsonResponse(
-            {"status": "error", "reason": "Invalid request: no image found"}
+            {"status": "error", "reason": "Invalid request: No file found"}
         )
     return JsonResponse(
         {"status": "error", "reason": "Invalid request: method not POST"}
@@ -58,12 +64,10 @@ def upload_file(request):
 def file_uploader(request, image):
     """
     Basic imgur uploader return as json data.
-    :param `image` is from `request.FILES['markdown-image-upload']`
-    :return json response
     """
     try:
         ext = Path(image.name).suffix.lower()
-        filename = f"{uuid4().hex}{ext}"
+        filename = f"{str(uuid4())}{ext}"
         s3.upload_fileobj(
             image,
             os.environ["R2_BUCKET"],
@@ -74,19 +78,20 @@ def file_uploader(request, image):
         )
 
         return {
-            "url": f"{os.environ['R2_PUBLIC_URL']}/{filename}",
-            "filename": filename,
+            "status": "ok",
+            "link": f"{os.environ['R2_PUBLIC_URL']}/{filename}",
+            "name": filename,
             "size": image.size,
         }
 
     except (ClientError, BotoCoreError) as e:
         return {
-                "status": "Error Occured", 
+                "status": "error", 
                 "error": str(e)
             }
 
     except Exception as e:
         return {
-            "status": "Error Occurred", 
+            "status": "error", 
             "error": f"Unknown Error Occurred: {str(e)}",
         }

From 57261339889e9fadf7bce3f6b6a9556460bd5415 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 8 Aug 2026 12:40:03 +0530
Subject: [PATCH 020/118] Add deleting journals

---
 twisted/common/templates/base.html            |  5 +++
 twisted/mysite/middleware.py                  | 19 +++++++++
 twisted/mysite/settings.py                    |  2 +
 .../twisted_site/templates/client/osbase.html |  5 +++
 .../templates/client/projects/detail.html     | 25 ++++++++----
 .../client/projects/journal/delete.html       | 40 +++++++++++++++++++
 .../projects/journal/new_hackatime.html       |  2 +-
 .../templates/cotton/mdpreview.html           |  2 -
 twisted/twisted_site/urls.py                  |  1 +
 twisted/twisted_site/views/client/__init__.py |  2 +-
 .../client/{new_journal.py => journal.py}     | 40 ++++++++++++++++++-
 11 files changed, 131 insertions(+), 12 deletions(-)
 create mode 100644 twisted/mysite/middleware.py
 create mode 100644 twisted/twisted_site/templates/client/projects/journal/delete.html
 rename twisted/twisted_site/views/client/{new_journal.py => journal.py} (80%)

diff --git a/twisted/common/templates/base.html b/twisted/common/templates/base.html
index 78c6844..00be3c0 100644
--- a/twisted/common/templates/base.html
+++ b/twisted/common/templates/base.html
@@ -11,4 +11,9 @@
     meow :3
     {% endblock body %}
 </body>
+<script>
+    // Timezone settings
+    const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; // e.g. "America/New_York"
+    document.cookie = "django_timezone=" + timezone;
+</script>
 </html>
\ No newline at end of file
diff --git a/twisted/mysite/middleware.py b/twisted/mysite/middleware.py
new file mode 100644
index 0000000..19e33d5
--- /dev/null
+++ b/twisted/mysite/middleware.py
@@ -0,0 +1,19 @@
+import zoneinfo
+from django.utils import timezone
+
+class TimezoneMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        try:
+            # get django_timezone from cookie
+            tzname = request.COOKIES.get("django_timezone")
+            if tzname:
+                timezone.activate(zoneinfo.ZoneInfo(tzname))
+            else:
+                timezone.deactivate()
+        except Exception as e:
+            timezone.deactivate()
+
+        return self.get_response(request)
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 662000b..1e4f6cd 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -52,6 +52,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.humanize',
 
     # Your apps
     'common',
@@ -76,6 +77,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'mysite.middleware.TimezoneMiddleware',
 ]
 
 if DEBUG:
diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index a5e8444..a9fff8c 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -18,4 +18,9 @@
     <body class="font-vintage">
         {% block body %} meow :3 {% endblock body %}
     </body>
+    <script>
+        // Timezone settings
+        const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; // e.g. "America/New_York"
+        document.cookie = "django_timezone=" + timezone;
+    </script>
 </html>
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 9f708ca..74cb634 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -1,4 +1,4 @@
-{% extends "client/osbase.html" %} {% load static time_filters %} {% block body %}
+{% extends "client/osbase.html" %} {% load static time_filters humanize %} {% block body %}
 <div class="bg-surface flex flex-col w-full h-full font-vintage">
     <div class="flex mb-2">
         <div class="flex-1">
@@ -33,23 +33,34 @@
         {% if not project.hackatime_project_name %}
         <div class="border border-twisted-400 p-1 m-1 w-fit">
             Hi! I noticed you dont have a hackatime project linked yet. You can link a hackatime project over at the
-            <a href="{% url 'fr.projects.settings' project.id %}">project settings</a>.
+            <a href="{% url 'fr.projects.settings' project.pk %}">project settings</a>.
         </div>
         {% endif %}
         <div>
-            <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'journal: {{ project.project_name }}', 'src': '{% url 'fr.projects.journals.new.hackatime' project.id %}'}, '*')">New journal...</button>
+            <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'journal: {{ project.project_name }}', 'src': '{% url 'fr.projects.journals.new.hackatime' project.pk %}'}, '*')">New journal...</button>
         </div>
     </div>
     <div>
-        {% for journal in project.journals.all %}
+        {% for journal in project.journals.all|dictsortreversed:"created_at" %}
         <div class="p-4 m-2 rounded-lg bg-twisted-600">
             <div class="flex gap-1">
-                <div class="flex-1">
+                <div class="flex-1 flex gap-1">
                     <div>{{ journal.reduced_minutes|minutes_to_hours_minutes }} logged via {{ journal.get_type_display }}</div>
+                    •
+                    <div title="{{ journal.created_at }}">{{ journal.created_at|naturaltime }}</div>
                 </div>
-                <div>
-                    <img class="w-16 image-render-pixelated" src="{% static 'icons/delete.png' %}" alt="">
+                {% if project.user == request.user %}
+                <div class="flex gap-2">
+                    {% if journal.type == "untracked" %}
+                    <div title="Delete" onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'delete journal', 'src': '{% url 'fr.projects.journals.delete' journal.pk %}'}, '*')" class="w-7 h-7 bg-twisted-800 p-1 rounded-md cursor-pointer">
+                        <img draggable="false" class="w-full h-full image-render-pixelated" src="{% static 'icons/delete.png' %}" alt="">
+                    </div>
+                    {% endif %}
+                    <div title="Edit" class="w-7 h-7 bg-twisted-800 p-1 rounded-md cursor-pointer">
+                        <img draggable="false" class="w-full h-full image-render-pixelated" src="{% static 'icons/edit.png' %}" alt="">
+                    </div>
                 </div>
+                {% endif %}
             </div>
             <div>
                 <c-mdpreview class="w-full zoom-100 **:[&_img]:zoom-50">{{ journal.content }}</c-mdpreview>
diff --git a/twisted/twisted_site/templates/client/projects/journal/delete.html b/twisted/twisted_site/templates/client/projects/journal/delete.html
new file mode 100644
index 0000000..a07b988
--- /dev/null
+++ b/twisted/twisted_site/templates/client/projects/journal/delete.html
@@ -0,0 +1,40 @@
+{% extends "client/osbase.html" %} {% load static time_filters %}
+{% block body %}
+<div class="font-vintage">
+    {% if not success %}
+    <div class="p-2">
+        <div>
+            <div class="grid grid-cols-2 w-fit gap-x-4">
+                <div>Time logged:</div>
+                <div>{{ journal.reduced_minutes|minutes_to_hours_minutes }}</div>
+                <div>Journal type:</div>
+                <div>{{ journal.get_type_display }}</div>
+                <div>Created:</div>
+                <div>{{ journal.created_at }}</div>
+            </div>
+        </div>
+        <div class="mt-4">
+            <div>
+                Are you sure you want to delete this journal?
+            </div>
+            <div>
+                It will be lost forever (a long time!)
+            </div>
+            <form method="post" action="{% url 'fr.projects.journals.delete' journal.pk %}">
+                {% csrf_token %}
+                <button>Yes, delete it</button>
+            </form>
+        </div>
+    </div>
+    {% else %}
+    <div class="text-center mt-4">
+        <div class="text-2xl">
+            Your journal has been deleted
+        </div>
+        <div>
+            You can now close this window
+        </div>
+    </div>
+    {% endif %}
+</div>
+{% endblock body %}
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
index e62cdfc..bbfd7fd 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
@@ -1,7 +1,7 @@
 {% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %}
 {% block links %}
+{% if project.project_type == 'hardware' %}
 <button disabled>Hackatime</button>
-    {% if project.project_type == 'hardware' %}
     <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
         <button>untracked</button>
     </a>
diff --git a/twisted/twisted_site/templates/cotton/mdpreview.html b/twisted/twisted_site/templates/cotton/mdpreview.html
index 320b9ee..40ecf4a 100644
--- a/twisted/twisted_site/templates/cotton/mdpreview.html
+++ b/twisted/twisted_site/templates/cotton/mdpreview.html
@@ -4,13 +4,11 @@
     <textarea class="textbox">{{ slot }}</textarea>
     <script>
         function rendermarkdown() {
-            console.log('rendering markdown...');
             elem = document.currentScript.parentElement.querySelector('.textbox')
             content = elem.value;
             elem.classList.add('hidden')
             parsed = DOMPurify.sanitize(marked.parse(content));
             elem.parentElement.querySelector('.previewdiv');
-            console.log(elem)
             elem.parentElement.querySelector('.previewdiv').innerHTML = parsed;
         }
         rendermarkdown()
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index 31365d3..d88d627 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -22,4 +22,5 @@
     path("dashboard/frame/projects/<int:id>/settings/", client.ProjectSettings.as_view(), name="fr.projects.settings"),
     path("dashboard/frame/projects/<int:id>/journals/new/hackatime/", client.NewProjectHackatimeJournal.as_view(), name="fr.projects.journals.new.hackatime"),
     path("dashboard/frame/projects/<int:id>/journals/new/untracked/", client.NewProjectUntrackedJournal.as_view(), name="fr.projects.journals.new.untracked"),
+    path("dashboard/frame/journals/delete/<int:id>/", client.DeleteJournal.as_view(), name="fr.projects.journals.delete"),
 ]
diff --git a/twisted/twisted_site/views/client/__init__.py b/twisted/twisted_site/views/client/__init__.py
index 7365ea0..ec62a38 100644
--- a/twisted/twisted_site/views/client/__init__.py
+++ b/twisted/twisted_site/views/client/__init__.py
@@ -2,4 +2,4 @@
 from .dashboard import DashboardView
 from .projects import ListProjects, CreateProject
 from .project import ProjectDetail, ProjectSettings
-from .new_journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal
\ No newline at end of file
+from .journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal, DeleteJournal
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/new_journal.py b/twisted/twisted_site/views/client/journal.py
similarity index 80%
rename from twisted/twisted_site/views/client/new_journal.py
rename to twisted/twisted_site/views/client/journal.py
index aa957fa..41eaab2 100644
--- a/twisted/twisted_site/views/client/new_journal.py
+++ b/twisted/twisted_site/views/client/journal.py
@@ -75,7 +75,6 @@ def post(self, request, id):
 
 UNTRACKED_MAX_LOGGABLE_MINUTES = 180
 
-
 class NewProjectUntrackedJournal(View):
     def get(self, request, id, info=None, context={}):
         context["info"] = info
@@ -145,3 +144,42 @@ def post(self, request, id):
         journal.save()
 
         return self.get(request, id, context={"success": True})
+
+class DeleteJournal(View):
+    def get(self, request, id, context={'success': False}):
+        if request.user.is_anonymous:
+            return redirect('homepage')
+        
+        if id is not None:
+            journal = Journal.objects.get(id=id)
+            if journal.project.user != request.user:
+                return redirect('dashboard')
+            
+            if journal.type != 'untracked':
+                return redirect('dashboard')
+            
+            
+            context['journal'] = journal
+        
+        return render(
+            request, "client/projects/journal/delete.html", context=context
+        )
+
+    def post(self, request, id):
+        if request.user.is_anonymous:
+            return redirect('homepage')
+        print('hi', flush=True)
+        
+        journal = Journal.objects.get(id=id)
+        print(journal)
+        
+        if journal.project.user != request.user:
+            return redirect('dashboard')
+        
+        if journal.type != 'untracked':
+            return redirect('dashboard')
+        
+        journal.delete()
+        
+        
+        return self.get(request, id=None, context={"success": True})

From c150acffd1cd9e5916eeeab3871fe340b02d2432 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Sat, 8 Aug 2026 07:16:29 +0000
Subject: [PATCH 021/118] Improve file upload names

---
 twisted/twisted_site/views/misc.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index 0797753..2c7eaca 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -6,6 +6,7 @@
 from django.shortcuts import render, redirect
 from ..models import Project, UploadedFile
 from django.contrib.auth.decorators import login_required
+from django.utils.text import slugify
 import boto3
 from pathlib import Path
 from uuid import uuid4
@@ -67,7 +68,8 @@ def file_uploader(request, image):
     """
     try:
         ext = Path(image.name).suffix.lower()
-        filename = f"{str(uuid4())}{ext}"
+        filename = f"{str(uuid4())}-{str(image.size)}-{slugify(Path(image.name).stem)}{ext}"
+        original_filename = Path(image.name).stem
         s3.upload_fileobj(
             image,
             os.environ["R2_BUCKET"],
@@ -80,7 +82,7 @@ def file_uploader(request, image):
         return {
             "status": "ok",
             "link": f"{os.environ['R2_PUBLIC_URL']}/{filename}",
-            "name": filename,
+            "name": original_filename,
             "size": image.size,
         }
 

From 5c25cb0d48074d3bfeba2aa179dafaa38e9b4a38 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 8 Aug 2026 13:44:03 +0530
Subject: [PATCH 022/118] Start working on shipping projects

---
 .../migrations/0012_project_repo_url.py        | 18 ++++++++++++++++++
 twisted/twisted_site/models.py                 |  4 +++-
 .../templates/client/projects/detail.html      | 17 +++++++++++++++--
 .../projects/journal/new_journal.base.html     |  2 +-
 .../templates/client/projects/settings.html    |  8 ++++++--
 twisted/twisted_site/views/client/journal.py   |  2 +-
 twisted/twisted_site/views/client/project.py   |  1 +
 7 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0012_project_repo_url.py

diff --git a/twisted/twisted_site/migrations/0012_project_repo_url.py b/twisted/twisted_site/migrations/0012_project_repo_url.py
new file mode 100644
index 0000000..511ccec
--- /dev/null
+++ b/twisted/twisted_site/migrations/0012_project_repo_url.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0.7 on 2026-08-08 07:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0011_journal_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='project',
+            name='repo_url',
+            field=models.CharField(blank=True, default='', max_length=200),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 2407d39..5220aad 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -40,6 +40,7 @@ def __str__(self):
 class Project(models.Model):
     user = models.ForeignKey(User, on_delete=models.PROTECT, related_name="projects")
 
+    
     project_name = models.CharField(max_length=50)
     project_description = models.TextField(max_length=2000)
     
@@ -49,7 +50,8 @@ class Project(models.Model):
     updated_at = models.DateTimeField(auto_now=True)
     
     hackatime_project_name = models.CharField(max_length=200, blank=True, default="")
-
+    repo_url = models.CharField(max_length=200, blank=True, default="")
+    
     def __str__(self):
         return self.project_name
 
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 74cb634..12702ab 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -7,10 +7,16 @@
             </div>
             <div>{{ project.project_description }}</div>
         </div>
-        <div>
+        <div class="flex flex-col text-right">
             <a href="{% url 'fr.projects.settings' project.id %}">
                 <button>Settings</button>
             </a>
+            {% if project.hackatime_project_name and project.repo_url and project.time_logged > 60 %}
+            <form method="post" action="">
+                {% csrf_token %}
+                <button>Ship project!</button>
+            </form>
+            {% endif %}
         </div>
     </div>
     <div class="mb-2">
@@ -32,9 +38,16 @@
         </div>
         {% if not project.hackatime_project_name %}
         <div class="border border-twisted-400 p-1 m-1 w-fit">
-            Hi! I noticed you dont have a hackatime project linked yet. You can link a hackatime project over at the
+            Hi! I noticed you don't have a hackatime project linked yet. You can link a hackatime project over at the
             <a href="{% url 'fr.projects.settings' project.pk %}">project settings</a>.
         </div>
+        {% else %}
+        {% if not project.repo_url %}
+        <div class="border border-twisted-400 p-1 m-1 w-fit">
+            Hi! You don't have a repo linked yet. You can link a repo over at the
+            <a href="{% url 'fr.projects.settings' project.pk %}">project settings</a>.
+        </div>
+        {% endif %}
         {% endif %}
         <div>
             <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'journal: {{ project.project_name }}', 'src': '{% url 'fr.projects.journals.new.hackatime' project.pk %}'}, '*')">New journal...</button>
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
index 28d2590..09dd47d 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
@@ -48,7 +48,7 @@
     <div class="text-center">
         <h2>Your journal has been logged!</h2>
         <p>You can now close this page.</p>
-        <button onclick="location.reload()">Log another journal!</button>
+        <button onclick="location = location">Log another journal!</button>
     </div>
     {% endif %}
 </div>
diff --git a/twisted/twisted_site/templates/client/projects/settings.html b/twisted/twisted_site/templates/client/projects/settings.html
index ec3b07f..f80febf 100644
--- a/twisted/twisted_site/templates/client/projects/settings.html
+++ b/twisted/twisted_site/templates/client/projects/settings.html
@@ -8,11 +8,11 @@
     <div class="text-xl">Project settings</div>
     <form method="post">
         {% csrf_token %}
-        <div class="field-row-stacked">
+        <div class="mt-2 field-row-stacked">
             <label for="name">Project name</label>
             <input id="name" name="name" type="text" value="{{ project.project_name }}" />
         </div>
-        <div class="field-row-stacked">
+        <div class="mt-2 field-row-stacked">
             <label for="description">Project description</label>
             <textarea id="description" name="description">{{ project.project_description }}</textarea>
         </div>
@@ -34,6 +34,10 @@
                 {% endfor %}
             </select>
         </div>
+        <div class="mt-2 field-row-stacked">
+            <label for="repo">Repo URL</label>
+            <input id="repo" name="repo" type="text" placeholder="https://github.com/<yournamehere>/<yourprojecthere>" value="{{ project.repo_url }}" />
+        </div>
         <button type="submit" class="mt-4">Save</button>
     </form>
 </div>
diff --git a/twisted/twisted_site/views/client/journal.py b/twisted/twisted_site/views/client/journal.py
index 41eaab2..520028a 100644
--- a/twisted/twisted_site/views/client/journal.py
+++ b/twisted/twisted_site/views/client/journal.py
@@ -100,7 +100,7 @@ def get(self, request, id, info=None, context={}):
         context["max_mins"] = UNTRACKED_MAX_LOGGABLE_MINUTES
 
         context["info"] = (
-            "logging untracked journals is generally not advised. time deflation may occur."
+            "logging untracked journals may lead to heavy time deflation. for hardware projects, consider using lapse and sync to hackatime."
         )
 
         return render(
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index 052c935..a27a47f 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -71,6 +71,7 @@ def post(self, request, id):
         project.project_description = request.POST["description"]
         project.project_type = request.POST["type"]
         project.hackatime_project_name = request.POST["hackatime"]
+        project.repo_url = request.POST["repo"]
         project.save()
         return redirect("fr.projects.detail", project.id)
 

From b81dd49d1798b1d90c1401d4632731d729bed087 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 8 Aug 2026 13:49:37 +0530
Subject: [PATCH 023/118] MAJOR refactor: Moved slack_bot to its own app.

---
 twisted/mysite/settings.py                   | 2 ++
 twisted/mysite/urls.py                       | 1 +
 twisted/slack_bot/__init__.py                | 0
 twisted/slack_bot/admin.py                   | 3 +++
 twisted/slack_bot/apps.py                    | 5 +++++
 twisted/slack_bot/migrations/__init__.py     | 0
 twisted/slack_bot/models.py                  | 9 +++++++++
 twisted/{twisted_site => slack_bot}/slack.py | 0
 twisted/slack_bot/tests.py                   | 3 +++
 twisted/slack_bot/views.py                   | 3 +++
 twisted/twisted_site/views/client/auth.py    | 2 +-
 11 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 twisted/slack_bot/__init__.py
 create mode 100644 twisted/slack_bot/admin.py
 create mode 100644 twisted/slack_bot/apps.py
 create mode 100644 twisted/slack_bot/migrations/__init__.py
 create mode 100644 twisted/slack_bot/models.py
 rename twisted/{twisted_site => slack_bot}/slack.py (100%)
 create mode 100644 twisted/slack_bot/tests.py
 create mode 100644 twisted/slack_bot/views.py

diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 1e4f6cd..3f56007 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -57,11 +57,13 @@
     # Your apps
     'common',
     'twisted_site',
+    'slack_bot',
     
     # 3rd party apps
     'django_cotton',
     'tailwind',
     TAILWIND_APP_NAME,
+    
 ]
 
 if DEBUG:
diff --git a/twisted/mysite/urls.py b/twisted/mysite/urls.py
index c408299..b1091c2 100644
--- a/twisted/mysite/urls.py
+++ b/twisted/mysite/urls.py
@@ -23,6 +23,7 @@
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("", include("twisted_site.urls")),
+    path("_slackbot/", include("slack_bot.urls")),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
 if settings.DEBUG:
diff --git a/twisted/slack_bot/__init__.py b/twisted/slack_bot/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/twisted/slack_bot/admin.py b/twisted/slack_bot/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/twisted/slack_bot/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/twisted/slack_bot/apps.py b/twisted/slack_bot/apps.py
new file mode 100644
index 0000000..8686b56
--- /dev/null
+++ b/twisted/slack_bot/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class SlackBotConfig(AppConfig):
+    name = 'slack_bot'
diff --git a/twisted/slack_bot/migrations/__init__.py b/twisted/slack_bot/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/twisted/slack_bot/models.py b/twisted/slack_bot/models.py
new file mode 100644
index 0000000..de74d33
--- /dev/null
+++ b/twisted/slack_bot/models.py
@@ -0,0 +1,9 @@
+from django.db import models
+
+# Create your models here.
+class SupportMember(models.Model):
+    user_id=models.CharField(max_length=200)
+    is_admin=models.BooleanField()
+    
+    def __str__(self):
+        return f"{self.user_id} {'(admin)' if self.is_admin else ''}"
\ No newline at end of file
diff --git a/twisted/twisted_site/slack.py b/twisted/slack_bot/slack.py
similarity index 100%
rename from twisted/twisted_site/slack.py
rename to twisted/slack_bot/slack.py
diff --git a/twisted/slack_bot/tests.py b/twisted/slack_bot/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/twisted/slack_bot/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/twisted/slack_bot/views.py b/twisted/slack_bot/views.py
new file mode 100644
index 0000000..91ea44a
--- /dev/null
+++ b/twisted/slack_bot/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/twisted/twisted_site/views/client/auth.py b/twisted/twisted_site/views/client/auth.py
index e75f4d8..4b5c4e8 100644
--- a/twisted/twisted_site/views/client/auth.py
+++ b/twisted/twisted_site/views/client/auth.py
@@ -9,7 +9,7 @@
 
 from ...models import Profile
 from ... import hackatime
-from ...slack import slack_bot
+from ....slack_bot.slack import slack_bot
 
 oauth = OAuth()
 

From 062ba000fd8fd3b280e15c029508ad2cd8c97e63 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Sat, 8 Aug 2026 08:49:10 +0000
Subject: [PATCH 024/118] Migrate from Slack SDK to Slack Bolt

---
 pyproject.toml              |  2 +-
 twisted/slack_bot/models.py |  4 +--
 twisted/slack_bot/slack.py  |  8 ++---
 twisted/slack_bot/urls.py   |  8 +++++
 twisted/slack_bot/views.py  | 68 ++++++++++++++++++++++++++++++++++++-
 uv.lock                     | 16 +++++++--
 6 files changed, 96 insertions(+), 10 deletions(-)
 create mode 100644 twisted/slack_bot/urls.py

diff --git a/pyproject.toml b/pyproject.toml
index 7a7b091..05f0f92 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ dependencies = [
     "psycopg[binary]>=3.3.4",
     "python-dotenv>=1.2.2",
     "requests>=2.34.2",
-    "slack-sdk>=3.43.0",
+    "slack-bolt>=1.30.0",
     "tzdata>=2026.3",
     "urllib3>=2.7.0",
     "whitenoise>=6.12.0",
diff --git a/twisted/slack_bot/models.py b/twisted/slack_bot/models.py
index de74d33..ae1d27a 100644
--- a/twisted/slack_bot/models.py
+++ b/twisted/slack_bot/models.py
@@ -2,8 +2,8 @@
 
 # Create your models here.
 class SupportMember(models.Model):
-    user_id=models.CharField(max_length=200)
+    user_id=models.CharField(max_length=200, unique=True)
     is_admin=models.BooleanField()
     
     def __str__(self):
-        return f"{self.user_id} {'(admin)' if self.is_admin else ''}"
\ No newline at end of file
+        return f"{self.user_id} {'(admin)' if self.is_admin else ''}"
diff --git a/twisted/slack_bot/slack.py b/twisted/slack_bot/slack.py
index 389c38a..da6162f 100644
--- a/twisted/slack_bot/slack.py
+++ b/twisted/slack_bot/slack.py
@@ -1,13 +1,13 @@
 import os
 from typing import Any
-
-from slack_sdk import WebClient
+from slack_bolt import App
 
 
 class SlackBot:
 	def __init__(self, token: str | None = None, cc_group_id: str | None = None):
 		slack_token = token
-		self.client = WebClient(token=slack_token)
+		self.app = App(token=slack_token)
+		self.client = self.app.client
 		self._cc_group_id = cc_group_id
 
 	def post_message(
@@ -96,4 +96,4 @@ def users_info(self, *, user: str):
 cc_group_id = os.getenv("SLACK_CC_GROUP_ID")
 
 slack_bot = SlackBot(token=slack_token, cc_group_id=cc_group_id)
-slack_client = slack_bot.client
+slack_client = slack_bot.client
\ No newline at end of file
diff --git a/twisted/slack_bot/urls.py b/twisted/slack_bot/urls.py
new file mode 100644
index 0000000..27d7e9a
--- /dev/null
+++ b/twisted/slack_bot/urls.py
@@ -0,0 +1,8 @@
+from django.urls import path
+from . import views
+
+app_name = "slack_bot"
+
+urlpatterns = [
+    path("events", views.slack_events, name="events"),
+]
diff --git a/twisted/slack_bot/views.py b/twisted/slack_bot/views.py
index 91ea44a..c928b27 100644
--- a/twisted/slack_bot/views.py
+++ b/twisted/slack_bot/views.py
@@ -1,3 +1,69 @@
 from django.shortcuts import render
+from django.http import HttpResponse
+from django.views.decorators.http import csrf_exempt
+from slack_bolt.adapter.django import SlackEventsHandler
+from .slack import slack_bot
+
+# Initialize the handler
+handler = SlackEventsHandler(slack_bot.app)
+
+
+@csrf_exempt
+def slack_events(request):
+    """
+    Slack events endpoint handler for:
+    - App mentions and messages
+    - Slash commands
+    - Shortcuts
+    - Interactive components
+    """
+    return handler.handle(request)
+
+
+# ==================== Event Handlers ====================
+
+
+@slack_bot.app.event("app_mention")
+def handle_app_mention(body, say, logger):
+    """Handle when the bot is mentioned in a message"""
+    logger.debug(f"App mention event: {body}")
+    say(f"Thanks for the mention! <@{body['event']['user']}>")
+
+
+@slack_bot.app.event("message")
+def handle_message(body, logger):
+    """Handle regular messages (optional, remove if not needed)"""
+    logger.debug(f"Message event: {body}")
+
+
+# ==================== Slash Commands ====================
+
+
+@slack_bot.app.command("/hellotwisted")
+def handle_hello_command(ack, respond, command):
+    """
+    Slash command: /hellotwisted
+    Responds with a greeting and user information
+    """
+    ack()
+    respond(
+        text=f"Hello <@{command['user_id']}>! 👋",
+        blocks=[
+            {
+                "type": "section",
+                "text": {
+                    "type": "mrkdwn",
+                    "text": f"Hello <@{command['user_id']}> from the Twisted Slack Bot! 👋",
+                },
+            },
+            {
+                "type": "section",
+                "fields": [
+                    {"type": "mrkdwn", "text": f"*User:*\n<@{command['user_id']}>"},
+                    {"type": "mrkdwn", "text": f"*Channel:*\n<#{command['channel_id']}>"},
+                ],
+            },
+        ],
+    )
+
 
-# Create your views here.
diff --git a/uv.lock b/uv.lock
index da25c51..163c7de 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1050,6 +1050,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" },
 ]
 
+[[package]]
+name = "slack-bolt"
+version = "1.30.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "slack-sdk" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/e3/4f/5ba15533d66da2e7174334cc0e2805142e5390c9f4c5f31633df78b17006/slack_bolt-1.30.0.tar.gz", hash = "sha256:af38258d41f801ad9c74503090e0f39accd66c49f667f7e55c97fcdb0e51b886", size = 131180, upload-time = "2026-07-15T20:47:33.679Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2f/ee/1a7a286cf98fa3f4eeffaabc090e82f58f058ab4812aa1d7421d92c2637a/slack_bolt-1.30.0-py2.py3-none-any.whl", hash = "sha256:81f5bc46e79516d23d5e2a31dded6304dd1b8b6b72c0083f2f31d5d801e262c4", size = 235341, upload-time = "2026-07-15T20:47:32.113Z" },
+]
+
 [[package]]
 name = "slack-sdk"
 version = "3.43.0"
@@ -1093,7 +1105,7 @@ dependencies = [
     { name = "psycopg", extra = ["binary"] },
     { name = "python-dotenv" },
     { name = "requests" },
-    { name = "slack-sdk" },
+    { name = "slack-bolt" },
     { name = "tzdata" },
     { name = "urllib3" },
     { name = "whitenoise" },
@@ -1112,7 +1124,7 @@ requires-dist = [
     { name = "psycopg", extras = ["binary"], specifier = ">=3.3.4" },
     { name = "python-dotenv", specifier = ">=1.2.2" },
     { name = "requests", specifier = ">=2.34.2" },
-    { name = "slack-sdk", specifier = ">=3.43.0" },
+    { name = "slack-bolt", specifier = ">=1.30.0" },
     { name = "tzdata", specifier = ">=2026.3" },
     { name = "urllib3", specifier = ">=2.7.0" },
     { name = "whitenoise", specifier = ">=6.12.0" },

From df5e3a2935b9e5af726be25d2939d0ea72c3a558 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 8 Aug 2026 14:28:05 +0530
Subject: [PATCH 025/118] Fix a few bugs

---
 twisted/slack_bot/migrations/0001_initial.py | 22 +++++
 twisted/slack_bot/views.py                   |  6 +-
 twisted/twisted_site/slack.py                | 99 ++++++++++++++++++++
 twisted/twisted_site/views/client/auth.py    |  2 +-
 4 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 twisted/slack_bot/migrations/0001_initial.py
 create mode 100644 twisted/twisted_site/slack.py

diff --git a/twisted/slack_bot/migrations/0001_initial.py b/twisted/slack_bot/migrations/0001_initial.py
new file mode 100644
index 0000000..6ac4ef7
--- /dev/null
+++ b/twisted/slack_bot/migrations/0001_initial.py
@@ -0,0 +1,22 @@
+# Generated by Django 6.0.7 on 2026-08-08 08:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SupportMember',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user_id', models.CharField(max_length=200, unique=True)),
+                ('is_admin', models.BooleanField()),
+            ],
+        ),
+    ]
diff --git a/twisted/slack_bot/views.py b/twisted/slack_bot/views.py
index c928b27..fc1f917 100644
--- a/twisted/slack_bot/views.py
+++ b/twisted/slack_bot/views.py
@@ -1,11 +1,11 @@
+from slack_bolt.adapter.django import SlackRequestHandler
 from django.shortcuts import render
 from django.http import HttpResponse
-from django.views.decorators.http import csrf_exempt
-from slack_bolt.adapter.django import SlackEventsHandler
+from django.views.decorators.csrf import csrf_exempt
 from .slack import slack_bot
 
 # Initialize the handler
-handler = SlackEventsHandler(slack_bot.app)
+handler = SlackRequestHandler(slack_bot.app)
 
 
 @csrf_exempt
diff --git a/twisted/twisted_site/slack.py b/twisted/twisted_site/slack.py
new file mode 100644
index 0000000..da6162f
--- /dev/null
+++ b/twisted/twisted_site/slack.py
@@ -0,0 +1,99 @@
+import os
+from typing import Any
+from slack_bolt import App
+
+
+class SlackBot:
+	def __init__(self, token: str | None = None, cc_group_id: str | None = None):
+		slack_token = token
+		self.app = App(token=slack_token)
+		self.client = self.app.client
+		self._cc_group_id = cc_group_id
+
+	def post_message(
+		self,
+		*,
+		channel: str,
+		text: str,
+		blocks: list[dict[str, Any]] | None = None,
+		**kwargs: Any,
+	):
+		payload: dict[str, Any] = {
+			"channel": channel,
+			"text": text,
+			**kwargs,
+		}
+		if blocks is not None:
+			payload["blocks"] = blocks
+		return self.client.chat_postMessage(**payload)
+
+	def send_message(self, *, channel: str, text: str, **kwargs: Any):
+		return self.post_message(channel=channel, text=text, **kwargs)
+
+	def send_blocks(
+		self,
+		*,
+		channel: str,
+		blocks: list[dict[str, Any]],
+		text: str = " ",
+		**kwargs: Any,
+	):
+		return self.post_message(channel=channel, text=text, blocks=blocks, **kwargs)
+	def error_log(
+		self,
+		*,
+		channel: str,
+		error: str,
+		title: str | None = None,
+		**kwargs: Any,
+	):
+		if title is None:
+			title = "Error Log"
+
+		group_id = self._cc_group_id
+		mention = f"<@{group_id}>" if group_id else ""
+
+		# Parent message
+		parent = self.client.chat_postMessage(
+			channel=channel,
+			text=f"{title}".strip(),
+			blocks=[
+				{
+					"type": "section",
+					"text": {
+						"type": "mrkdwn",
+						"text": f"*{title}*".strip(),
+					},
+				},
+			],
+		)
+
+		# Thread message
+		thread_text = f"```{error}```"
+		if mention:
+			thread_text += f"\n\nCC: {mention}"
+
+		return self.client.chat_postMessage(
+			channel=channel,
+			thread_ts=parent["ts"],
+			text=thread_text,
+			blocks=[
+				{
+					"type": "section",
+					"text": {
+						"type": "mrkdwn",
+						"text": thread_text,
+					},
+				},
+			],
+		)
+
+	def users_info(self, *, user: str):
+		return self.client.users_info(user=user)
+
+
+slack_token = os.getenv("SLACK_TOKEN")
+cc_group_id = os.getenv("SLACK_CC_GROUP_ID")
+
+slack_bot = SlackBot(token=slack_token, cc_group_id=cc_group_id)
+slack_client = slack_bot.client
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/auth.py b/twisted/twisted_site/views/client/auth.py
index 4b5c4e8..e75f4d8 100644
--- a/twisted/twisted_site/views/client/auth.py
+++ b/twisted/twisted_site/views/client/auth.py
@@ -9,7 +9,7 @@
 
 from ...models import Profile
 from ... import hackatime
-from ....slack_bot.slack import slack_bot
+from ...slack import slack_bot
 
 oauth = OAuth()
 

From 289d5023676f8fb1e649805b36e8fa1c53ee8d45 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 8 Aug 2026 19:42:43 +0530
Subject: [PATCH 026/118] Work on ship (part 2) and add DEBUG to .env

---
 twisted/.env.example                          |  4 ++-
 twisted/mysite/settings.py                    |  2 +-
 .../migrations/0013_projectship.py            | 28 +++++++++++++++
 twisted/twisted_site/models.py                | 34 +++++++++++++++++-
 .../twisted_site/templates/client/osbase.html |  1 +
 .../templates/client/projects/detail.html     | 11 +++---
 .../templates/client/projects/ship.html       | 35 +++++++++++++++++++
 twisted/twisted_site/urls.py                  |  1 +
 twisted/twisted_site/views/client/__init__.py |  2 +-
 twisted/twisted_site/views/client/project.py  | 27 +++++++++++++-
 10 files changed, 134 insertions(+), 11 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0013_projectship.py
 create mode 100644 twisted/twisted_site/templates/client/projects/ship.html

diff --git a/twisted/.env.example b/twisted/.env.example
index a868233..5e30f84 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -1,3 +1,6 @@
+LOGIN_ENABLED=true
+DEBUG=true
+
 POSTGRES_DB = django
 POSTGRES_USER = django
 POSTGRES_PASSWORD = django
@@ -19,7 +22,6 @@ CSRF_TRUSTED_ORIGINS = http://127.0.0.1:8000, http://localhost:8000
 
 HACKCLUB_CDN_API_KEY = sk_cdn_***
 
-LOGIN_ENABLED=true
 
 R2_ENDPOINT = https://<your-account-id>.r2.cloudflarestorage.com
 R2_ACCESS_KEY = <your-access-key>
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 3f56007..dc3e237 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -27,7 +27,7 @@
 SECRET_KEY = 'django-insecure-&3p#whs%8@!e1=fl$!wk^y6^e@z+714@714xd$=0ghmfyk43bn'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = os.environ.get('DEBUG', 'true').lower() in ['true', 'on', '1']
 
 USE_X_FORWARDED_HOST = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
diff --git a/twisted/twisted_site/migrations/0013_projectship.py b/twisted/twisted_site/migrations/0013_projectship.py
new file mode 100644
index 0000000..b799efc
--- /dev/null
+++ b/twisted/twisted_site/migrations/0013_projectship.py
@@ -0,0 +1,28 @@
+# Generated by Django 6.0.7 on 2026-08-08 10:57
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0012_project_repo_url'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProjectShip',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('t1_updated_at', models.DateTimeField(default=None, null=True)),
+                ('t2_updated_at', models.DateTimeField(default=None, null=True)),
+                ('t1_message', models.TextField(blank=True, default='')),
+                ('t2_message', models.TextField(blank=True, default='')),
+                ('status', models.CharField(choices=[('created', 'Newly created'), ('rejected', 'Rejected ship'), ('reqchecked', 'Checked by T1'), ('approved', 'Approved by T2')], default='created', max_length=200)),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ships', to='twisted_site.project')),
+            ],
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 5220aad..d90cf5b 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -94,6 +94,14 @@ def time_spent(self):
 
     def hackatime_time_unjournaled(self):
         return self.time_spent() - self.hackatime_logged(include_all_minutes=True)
+    
+    def is_shipped(self):
+        ships = ProjectShip.objects.filter(status)
+        for ship in ships:
+            if ship.status != 'approved':
+                return ship
+        return None
+                
 
 class Journal(models.Model):
     project = models.ForeignKey(Project, on_delete=models.PROTECT, related_name="journals")
@@ -108,4 +116,28 @@ class Journal(models.Model):
     reduced_minutes = models.IntegerField()
     
     def __str__(self):
-        return f"{self.reduced_minutes} mins on {self.project}"
\ No newline at end of file
+        return f"{self.reduced_minutes} mins on {self.project}"
+
+
+PROJECT_SHIP_STATUSES = {
+    'created': 'Newly created',
+    'rejected': 'Rejected ship',
+    'reqchecked': 'Checked by T1',
+    'approved': 'Approved by T2'
+}
+
+class ProjectShip(models.Model):
+    project = models.ForeignKey(Project, on_delete=models.PROTECT, related_name="ships")
+    
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    t1_updated_at = models.DateTimeField(default=None, null=True)
+    t2_updated_at = models.DateTimeField(default=None, null=True)
+    
+    t1_message = models.TextField(blank=True, default="")
+    t2_message =models.TextField(blank=True, default="")
+    
+    status = models.CharField(max_length=200, choices=PROJECT_SHIP_STATUSES, default='created')
+    
+    def __str__(self):
+        return f"Ship created at {self.created_at} ({PROJECT_SHIP_STATUSES.get(str(self.status), self.status)})"
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index a9fff8c..d57d5fb 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -8,6 +8,7 @@
         <link rel="icon" href="{% static 'favicon.png' %}" />
         <title>Twisted</title>
         {% block css %} {% endblock css %}
+        {% block js %}{% endblock js %}
 
         <script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
         <script src="
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 12702ab..6212593 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -8,15 +8,14 @@
             <div>{{ project.project_description }}</div>
         </div>
         <div class="flex flex-col text-right">
+            {% if project.hackatime_project_name and project.repo_url and project.time_logged > 60 %}
+                <a href="{% url 'fr.projects.ship' project.id %}">
+                    <button>Submit project</button>
+                </a>
+            {% endif %}
             <a href="{% url 'fr.projects.settings' project.id %}">
                 <button>Settings</button>
             </a>
-            {% if project.hackatime_project_name and project.repo_url and project.time_logged > 60 %}
-            <form method="post" action="">
-                {% csrf_token %}
-                <button>Ship project!</button>
-            </form>
-            {% endif %}
         </div>
     </div>
     <div class="mb-2">
diff --git a/twisted/twisted_site/templates/client/projects/ship.html b/twisted/twisted_site/templates/client/projects/ship.html
new file mode 100644
index 0000000..ec154c3
--- /dev/null
+++ b/twisted/twisted_site/templates/client/projects/ship.html
@@ -0,0 +1,35 @@
+{% extends "client/osbase.html" %} {% load static time_filters humanize %}
+{% block body %}
+
+<div class="bg-surface flex flex-col w-full h-full font-vintage">
+    <div class="text-center">
+        <div class="p-4 my-2 bg-twisted-600 text-3xl">READ THE GUIDELINES!</div>
+        <div class="my-2">
+            Please read through our <a href="#">submission guidelines</a> before continuing.
+        </div>
+        <div class="text-3xl my-2">
+            90% of rejections could have taken 5 minutes to fix
+        </div>
+        <form method="post" class="my-2">
+            {% csrf_token %}
+            <button class="text-2xl! py-2! px-4!">
+                I have read and I am ready to submit!
+            </button>
+        </form>
+        <a class="my-2" href="{% url 'fr.projects.detail' project.id %}">Nevermind! Take me back.</a>
+        <div class="my-2">
+            <div>
+                Our reviewers will manually check.
+            </div>
+            <div>
+                {% if project.type == 'software' %}
+                Make sure your project works before shipping it.
+                {% else %}
+                Make sure your design is shipped and looks like it will work.
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock body %}
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index d88d627..12bbd94 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -19,6 +19,7 @@
     path("dashboard/frame/projects/create/", client.CreateProject.as_view(), name="fr.projects.create"),
 
     path("dashboard/frame/projects/<int:id>/", client.ProjectDetail.as_view(), name="fr.projects.detail"),
+    path("dashboard/frame/projects/ship/<int:id>/", client.SubmitProject.as_view(), name="fr.projects.ship"),
     path("dashboard/frame/projects/<int:id>/settings/", client.ProjectSettings.as_view(), name="fr.projects.settings"),
     path("dashboard/frame/projects/<int:id>/journals/new/hackatime/", client.NewProjectHackatimeJournal.as_view(), name="fr.projects.journals.new.hackatime"),
     path("dashboard/frame/projects/<int:id>/journals/new/untracked/", client.NewProjectUntrackedJournal.as_view(), name="fr.projects.journals.new.untracked"),
diff --git a/twisted/twisted_site/views/client/__init__.py b/twisted/twisted_site/views/client/__init__.py
index ec62a38..cfd1570 100644
--- a/twisted/twisted_site/views/client/__init__.py
+++ b/twisted/twisted_site/views/client/__init__.py
@@ -1,5 +1,5 @@
 from .homepage import HomepageView, FaqsView
 from .dashboard import DashboardView
 from .projects import ListProjects, CreateProject
-from .project import ProjectDetail, ProjectSettings
+from .project import ProjectDetail, ProjectSettings, SubmitProject
 from .journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal, DeleteJournal
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index a27a47f..68920dc 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -2,7 +2,7 @@
 from django.http import JsonResponse
 from django.views import View
 from django.shortcuts import render, redirect
-from ...models import Profile, Project, Journal
+from ...models import Profile, Project, Journal, ProjectShip
 from ... import hackatime
 import re
 import math
@@ -75,3 +75,28 @@ def post(self, request, id):
         project.save()
         return redirect("fr.projects.detail", project.id)
 
+class SubmitProject(View):
+    def get(self, request, id, context={}):
+        if self.request.user.is_anonymous:
+            return redirect('homepage')
+        
+        project = Project.objects.get(id=id)
+        if project.user != request.user:
+            return redirect('dashboard')
+        
+        context['project'] = project
+        return render(request, 'client/projects/ship.html', context)
+
+    def post(self, request, id, context={}):
+        if self.request.user.is_anonymous:
+            return redirect('homepage')
+        
+        project = Project.objects.get(id=id)
+        if project.user != request.user:
+            return redirect('dashboard')
+        
+        # ships = project.ships:
+        
+        ship = ProjectShip(project)
+        ship.save()
+        return self.get(request, id, context={'success': True})
\ No newline at end of file

From 6b06a06659c8136c0a3a1d5e3eb1f3c0c542187d Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 8 Aug 2026 19:56:08 +0530
Subject: [PATCH 027/118] Remove HC CDN key from .env.example

---
 twisted/.env.example | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/twisted/.env.example b/twisted/.env.example
index 5e30f84..13b2ab6 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -20,9 +20,6 @@ SLACK_TOKEN = xoxb-***
 ALLOWED_HOSTS = 127.0.0.1, localhost
 CSRF_TRUSTED_ORIGINS = http://127.0.0.1:8000, http://localhost:8000
 
-HACKCLUB_CDN_API_KEY = sk_cdn_***
-
-
 R2_ENDPOINT = https://<your-account-id>.r2.cloudflarestorage.com
 R2_ACCESS_KEY = <your-access-key>
 R2_SECRET_KEY = <your-secret-key>

From feaca204f5b7b5e1fade470c98f7dcdd4d13d5f7 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 8 Aug 2026 20:27:21 +0530
Subject: [PATCH 028/118] Add proper play/pause button for music in the
 homepage and faq page and add a back button in the faq page

---
 .../templates/client/dashboard.html           |  4 +--
 .../twisted_site/templates/client/faqs.html   | 31 ++++++++++++++-----
 .../templates/client/homepage.html            | 15 ++++++++-
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 6f99746..3998694 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -63,7 +63,7 @@
         <div id="taskbar-windows" class="flex-1 flex items-center gap-1 px-2 overflow-x-auto"></div>
 
         <div class="flex items-center gap-2">
-            <button id="speaker-btn" onclick="toggleMusic()" class="bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+            <div id="speaker-btn" onclick="toggleMusic()" class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
                 <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg">
                     <rect x="2" y="6" width="2" height="4" fill="#CAB3E1"/>
                     <rect x="4" y="5" width="2" height="6" fill="#CAB3E1"/>
@@ -74,7 +74,7 @@
                         <rect x="15" y="3" width="2" height="10" fill="#8364A2"/>
                     </g>
                 </svg>
-            </button>
+            </div>
             <canvas id="spectrum" width="100" height="24" class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
             <div id="taskbar-clock"
                 class="!font-vintage !text-base !bg-twisted-600 !text-absolute-white !px-3 !py-1 !border-2 !border-t-dark-black !border-l-dark-black !border-r-twisted-200 !border-b-twisted-200 min-w-20 text-center">
diff --git a/twisted/twisted_site/templates/client/faqs.html b/twisted/twisted_site/templates/client/faqs.html
index bc7baaa..8e2a346 100644
--- a/twisted/twisted_site/templates/client/faqs.html
+++ b/twisted/twisted_site/templates/client/faqs.html
@@ -4,15 +4,18 @@
 <a href="https://hackclub.com" target="_blank" rel="noopener" class="fixed top-0 left-4 z-50">
   <img src="https://assets.hackclub.com/flag-orpheus-top.svg" alt="Hack Club" class="w-48 flag-wave origin-top">
 </a>
-<div class="bg-cover w-screen min-h-screen bg-surface text-absolute-white p-4 sm:p-8 pb-20">
+<div class="bg-cover min-h-screen bg-surface text-absolute-white p-4 sm:p-8 pb-20">
 
   <div id="faqs" class="max-w-3xl mx-auto bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
     <div class="flex items-center justify-between bg-twisted-600 text-absolute-white px-2 py-1">
-      <span class="font-bold text-sm">FAQs.exe</span>
+      <span class="font-bold text-sm">
+        <button onclick="location='{% url 'homepage' %}'" class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">←</button>
+        FAQs.exe
+      </span>
       <div class="flex gap-1">
         <span class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">_</span>
         <span class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">□</span>
-        <span class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">×</span>
+        <span onclick="location='{% url 'homepage' %}'" class="cursor-pointer bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">×</span>
       </div>
     </div>
     <div class="p-6 space-y-5">
@@ -46,16 +49,28 @@
 </div>
 
 <div class="fixed bottom-0 left-0 right-0 z-50 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1">
-  <button id="twist-btn" onclick="toggleMusic()" class="flex items-center gap-1 bg-twisted-600 text-absolute-white font-bold px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-    <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5"> Twist
+  <button id="twist-btn" class="flex items-center gap-1 bg-twisted-600 text-absolute-white font-bold px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+    <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5"> Twist 
   </button>
-<div  class="flex items-center gap-2">
+ <div  class="flex items-center gap-2">
+              <div id="speaker-btn" onclick="toggleMusic()" class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg">
+                    <rect x="2" y="6" width="2" height="4" fill="#CAB3E1"/>
+                    <rect x="4" y="5" width="2" height="6" fill="#CAB3E1"/>
+                    <rect x="6" y="4" width="2" height="8" fill="#CAB3E1"/>
+                    <rect x="8" y="2" width="2" height="12" fill="#CAB3E1"/>
+                    <g id="sound-waves">
+                        <rect x="12" y="5" width="2" height="6" fill="#8364A2"/>
+                        <rect x="15" y="3" width="2" height="10" fill="#8364A2"/>
+                    </g>
+                </svg>
+            </div>
+
    <canvas id="spectrum" width="100" height="24" class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
   <div id="taskbar-clock" class="bg-twisted-600 text-absolute-white px-3 py-1 border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200 min-w-20 text-center">
     00:00 00
   </div>
-</div>
-</div>
+ </div>
 
 <audio id="bg-music" loop>
   <source src="{% static 'audio/bg.mp3' %}" type="audio/mpeg">
diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index 4dc19f5..e9221cb 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -48,10 +48,23 @@
   </div>
 </div>
 <div class="fixed bottom-0 left-0 right-0 z-50 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1">
-  <button id="twist-btn" onclick="toggleMusic()" class="flex items-center gap-1 bg-twisted-600 text-absolute-white font-bold px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+  <button id="twist-btn" class="flex items-center gap-1 bg-twisted-600 text-absolute-white font-bold px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
     <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5"> Twist 
   </button>
  <div  class="flex items-center gap-2">
+              <div id="speaker-btn" onclick="toggleMusic()" class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg">
+                    <rect x="2" y="6" width="2" height="4" fill="#CAB3E1"/>
+                    <rect x="4" y="5" width="2" height="6" fill="#CAB3E1"/>
+                    <rect x="6" y="4" width="2" height="8" fill="#CAB3E1"/>
+                    <rect x="8" y="2" width="2" height="12" fill="#CAB3E1"/>
+                    <g id="sound-waves">
+                        <rect x="12" y="5" width="2" height="6" fill="#8364A2"/>
+                        <rect x="15" y="3" width="2" height="10" fill="#8364A2"/>
+                    </g>
+                </svg>
+            </div>
+
    <canvas id="spectrum" width="100" height="24" class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
   <div id="taskbar-clock" class="bg-twisted-600 text-absolute-white px-3 py-1 border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200 min-w-20 text-center">
     00:00 00

From c9d7b48a452805d62fcb60a434e64a6360f923cf Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sun, 9 Aug 2026 08:38:47 +0530
Subject: [PATCH 029/118] Make errors visible on prod

---
 twisted/entrypoint.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/twisted/entrypoint.sh b/twisted/entrypoint.sh
index 99abb81..a9ef756 100644
--- a/twisted/entrypoint.sh
+++ b/twisted/entrypoint.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
 
 uv run manage.py migrate --noinput
-uv run gunicorn -w 3 mysite.wsgi:application --bind 0.0.0.0:8000
\ No newline at end of file
+uv run gunicorn -w 3 mysite.wsgi:application \
+    --bind 0.0.0.0:8000 \
+    --log-level info \
+    --access-logfile - \
+    --error-logfile - \
+    --capture-output

From 01f203930a4f661db6ae431067eceaa8ae19278f Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sun, 9 Aug 2026 09:02:59 +0530
Subject: [PATCH 030/118] Add shipping a project

---
 twisted/twisted_site/models.py                |  6 ++--
 .../templates/client/projects/detail.html     | 21 ++++++++++---
 .../templates/client/projects/ship.html       | 15 ++++++++-
 twisted/twisted_site/views/client/journal.py  | 31 ++++++++++++++++---
 twisted/twisted_site/views/client/project.py  | 12 +++++--
 5 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index d90cf5b..6eae4ea 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -96,11 +96,11 @@ def hackatime_time_unjournaled(self):
         return self.time_spent() - self.hackatime_logged(include_all_minutes=True)
     
     def is_shipped(self):
-        ships = ProjectShip.objects.filter(status)
+        ships = ProjectShip.objects.filter(project=self)
         for ship in ships:
-            if ship.status != 'approved':
+            if ship.status != 'rejected':
                 return ship
-        return None
+        return False
                 
 
 class Journal(models.Model):
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 6212593..fea860d 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -8,14 +8,18 @@
             <div>{{ project.project_description }}</div>
         </div>
         <div class="flex flex-col text-right">
-            {% if project.hackatime_project_name and project.repo_url and project.time_logged > 60 %}
+            {% if project.repo_url and project.time_logged > 60 %}
+            {% if not project.is_shipped %}
                 <a href="{% url 'fr.projects.ship' project.id %}">
                     <button>Submit project</button>
                 </a>
             {% endif %}
-            <a href="{% url 'fr.projects.settings' project.id %}">
-                <button>Settings</button>
-            </a>
+            {% endif %}
+            {% if not project.is_shipped %}
+                <a href="{% url 'fr.projects.settings' project.id %}">
+                    <button>Settings</button>
+                </a>
+            {% endif %}
         </div>
     </div>
     <div class="mb-2">
@@ -35,6 +39,11 @@
                 </div>
             </div>
         </div>
+        {% if project.is_shipped %}
+            <div>
+                Your project is shipped and now read-only.
+            </div>
+        {% endif %}
         {% if not project.hackatime_project_name %}
         <div class="border border-twisted-400 p-1 m-1 w-fit">
             Hi! I noticed you don't have a hackatime project linked yet. You can link a hackatime project over at the
@@ -48,9 +57,11 @@
         </div>
         {% endif %}
         {% endif %}
+        {% if not project.is_shipped %}
         <div>
             <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'journal: {{ project.project_name }}', 'src': '{% url 'fr.projects.journals.new.hackatime' project.pk %}'}, '*')">New journal...</button>
         </div>
+        {% endif %}
     </div>
     <div>
         {% for journal in project.journals.all|dictsortreversed:"created_at" %}
@@ -63,6 +74,7 @@
                 </div>
                 {% if project.user == request.user %}
                 <div class="flex gap-2">
+                    {% if not project.is_shipped %}
                     {% if journal.type == "untracked" %}
                     <div title="Delete" onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'delete journal', 'src': '{% url 'fr.projects.journals.delete' journal.pk %}'}, '*')" class="w-7 h-7 bg-twisted-800 p-1 rounded-md cursor-pointer">
                         <img draggable="false" class="w-full h-full image-render-pixelated" src="{% static 'icons/delete.png' %}" alt="">
@@ -71,6 +83,7 @@
                     <div title="Edit" class="w-7 h-7 bg-twisted-800 p-1 rounded-md cursor-pointer">
                         <img draggable="false" class="w-full h-full image-render-pixelated" src="{% static 'icons/edit.png' %}" alt="">
                     </div>
+                    {% endif %}
                 </div>
                 {% endif %}
             </div>
diff --git a/twisted/twisted_site/templates/client/projects/ship.html b/twisted/twisted_site/templates/client/projects/ship.html
index ec154c3..30a60c0 100644
--- a/twisted/twisted_site/templates/client/projects/ship.html
+++ b/twisted/twisted_site/templates/client/projects/ship.html
@@ -2,7 +2,12 @@
 {% block body %}
 
 <div class="bg-surface flex flex-col w-full h-full font-vintage">
+    {% if info %}
+    <div class="bg-twisted-400 rounded-md p-1 my-1">{{ info|safe }}</div>
+    {% endif %}
+    
     <div class="text-center">
+        {% if not success %}
         <div class="p-4 my-2 bg-twisted-600 text-3xl">READ THE GUIDELINES!</div>
         <div class="my-2">
             Please read through our <a href="#">submission guidelines</a> before continuing.
@@ -13,7 +18,7 @@
         <form method="post" class="my-2">
             {% csrf_token %}
             <button class="text-2xl! py-2! px-4!">
-                I have read and I am ready to submit!
+                I have read and am ready to submit!
             </button>
         </form>
         <a class="my-2" href="{% url 'fr.projects.detail' project.id %}">Nevermind! Take me back.</a>
@@ -29,6 +34,14 @@
                 {% endif %}
             </div>
         </div>
+        {% else %}
+        <div class="mt-2 text-2xl">
+            Success!
+        </div>
+        <div>
+            Your project has been submitted for review.
+        </div>
+        {% endif %}
     </div>
 </div>
 
diff --git a/twisted/twisted_site/views/client/journal.py b/twisted/twisted_site/views/client/journal.py
index 520028a..78bff6d 100644
--- a/twisted/twisted_site/views/client/journal.py
+++ b/twisted/twisted_site/views/client/journal.py
@@ -8,6 +8,7 @@
 import math
 
 HACKATIME_MAX_LOGGABLE_MINUTES = 6 * 60
+IMAGE_REGEX = r'!\[([^\]]*)\]\([^)]+\)'
 
 
 class NewProjectHackatimeJournal(View):
@@ -22,6 +23,10 @@ def get(self, request, id, info=None, context={}):
 
         context["project"] = project
 
+        if project.is_shipped():
+            return redirect('fr.projects.detail', id)
+
+
         log_minutes = project.hackatime_time_unjournaled()
 
         log_minutes = min(log_minutes, HACKATIME_MAX_LOGGABLE_MINUTES)
@@ -41,10 +46,16 @@ def post(self, request, id):
             project.hackatime_time_unjournaled(), HACKATIME_MAX_LOGGABLE_MINUTES
         )
 
+        if project.is_shipped():
+            return redirect('fr.projects.detail', id)
+
         content = request.POST["content"]
-        image_regex = r"\!\[.*?\]\(.*?\)"
-        image_count = len(re.findall(image_regex, content))
+        
+        image_count = len(re.findall(IMAGE_REGEX, content))
         required_image_count = math.ceil(max(1, reduced_minutes / 180))
+        
+        content_no_images = re.sub(IMAGE_REGEX, '', content)
+        content_length = len(' '.join(content_no_images.split()))
 
         if image_count < required_image_count:
             return self.get(
@@ -53,7 +64,8 @@ def post(self, request, id):
                 info=f"please add atleast {required_image_count - image_count} more image(s) to log this journal!",
                 context={"content": content},
             )
-        if len(content) < min(100, reduced_minutes):
+        
+        if content_length < min(100, reduced_minutes):
             return self.get(
                 request,
                 id,
@@ -118,6 +130,10 @@ def post(self, request, id):
         content = request.POST["content"]
         time_logged = int(request.POST["time_logged"])
 
+        
+        content_no_images = re.sub(IMAGE_REGEX, '', content)
+        content_length = len(' '.join(content_no_images.split()))
+
         if time_logged > 180:
             return self.get(
                 request,
@@ -126,7 +142,7 @@ def post(self, request, id):
                 context={"content": content},
             )
 
-        if len(content) < min(100, time_logged * 2):
+        if content_length < min(100, time_logged * 2):
             return self.get(
                 request,
                 id,
@@ -152,6 +168,9 @@ def get(self, request, id, context={'success': False}):
         
         if id is not None:
             journal = Journal.objects.get(id=id)
+            if journal.project.is_shipped():
+                return redirect('fr.projects.detail', journal.project.id)
+
             if journal.project.user != request.user:
                 return redirect('dashboard')
             
@@ -161,6 +180,7 @@ def get(self, request, id, context={'success': False}):
             
             context['journal'] = journal
         
+        
         return render(
             request, "client/projects/journal/delete.html", context=context
         )
@@ -173,6 +193,9 @@ def post(self, request, id):
         journal = Journal.objects.get(id=id)
         print(journal)
         
+        if journal.project.is_shipped():
+            return redirect('fr.projects.detail', journal.project.id)
+
         if journal.project.user != request.user:
             return redirect('dashboard')
         
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index 68920dc..8ad3db7 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -43,6 +43,9 @@ def get(self, request, id):
         project = Project.objects.get(id=id)
         context["project"] = project
 
+        if project.is_shipped():
+            return redirect('fr.projects.detail', id)
+        
         if project.user != request.user:
             return redirect("dashboard")
 
@@ -67,6 +70,9 @@ def post(self, request, id):
         if project.user != request.user:
             return redirect("dashboard")
 
+        if project.is_shipped():
+            return redirect('fr.projects.detail', id)
+        
         project.project_name = request.POST["name"]
         project.project_description = request.POST["description"]
         project.project_type = request.POST["type"]
@@ -83,7 +89,6 @@ def get(self, request, id, context={}):
         project = Project.objects.get(id=id)
         if project.user != request.user:
             return redirect('dashboard')
-        
         context['project'] = project
         return render(request, 'client/projects/ship.html', context)
 
@@ -95,8 +100,9 @@ def post(self, request, id, context={}):
         if project.user != request.user:
             return redirect('dashboard')
         
-        # ships = project.ships:
+        if project.is_shipped():
+            return self.get(request, id, context={"info": "silly! you have already shipped."})
         
-        ship = ProjectShip(project)
+        ship = ProjectShip(project=project)
         ship.save()
         return self.get(request, id, context={'success': True})
\ No newline at end of file

From adc7c5f35743e2c08c20967d197a66093d260488 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Mon, 10 Aug 2026 22:03:54 +0530
Subject: [PATCH 031/118] Added /admin/ page and added a left navbar to it

---
 .vscode/settings.json                         |   4 +-
 pyproject.toml                                |   1 +
 twisted/common/templates/base.html            |   2 +-
 twisted/mysite/settings.py                    | 142 ++++++++++++-
 twisted/mysite/urls.py                        |   3 -
 .../static_src/src/cotton-ui.sources.css      | 188 ++++++++++++++++++
 .../static_src/src/styles.css                 |  46 +++++
 .../migrations/0014_profile_is_staff.py       |  18 ++
 .../migrations/0015_profile_dark_theme.py     |  18 ++
 twisted/twisted_site/models.py                |   4 +
 .../templates/admin/dashboard.html            |   5 +
 .../twisted_site/templates/cotton/base.html   |  34 ++++
 .../templates/cotton/navlist/index.html       |  29 +++
 .../templates/cotton/navlist/item.html        |   0
 twisted/twisted_site/urls.py                  |   3 +
 twisted/twisted_site/views/admin/__init__.py  |   1 +
 twisted/twisted_site/views/admin/dashboard.py |  12 ++
 uv.lock                                       |  15 ++
 18 files changed, 517 insertions(+), 8 deletions(-)
 create mode 100644 twisted/tailwindcsstheme/static_src/src/cotton-ui.sources.css
 create mode 100644 twisted/twisted_site/migrations/0014_profile_is_staff.py
 create mode 100644 twisted/twisted_site/migrations/0015_profile_dark_theme.py
 create mode 100644 twisted/twisted_site/templates/admin/dashboard.html
 create mode 100644 twisted/twisted_site/templates/cotton/base.html
 create mode 100644 twisted/twisted_site/templates/cotton/navlist/index.html
 create mode 100644 twisted/twisted_site/templates/cotton/navlist/item.html
 create mode 100644 twisted/twisted_site/views/admin/__init__.py
 create mode 100644 twisted/twisted_site/views/admin/dashboard.py

diff --git a/.vscode/settings.json b/.vscode/settings.json
index a382656..7c3845a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,5 +10,7 @@
         ".venv": true,
         "**/__pycache__": true
     },
-    "djangoCotton.templatePaths": ["templates/cotton", "twisted/*/templates/cotton"]
+    "djangoCotton.templatePaths": [
+        "twisted/templates/cotton", "twisted/*/templates/cotton", ".venv/lib/*/site-packages/django_cotton_ui/templates/cotton"
+    ]
 }
diff --git a/pyproject.toml b/pyproject.toml
index 05f0f92..8cd1a34 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,4 +20,5 @@ dependencies = [
     "urllib3>=2.7.0",
     "whitenoise>=6.12.0",
     "boto3>=1.43.66",
+    "django-cotton-ui>=0.3.2",
 ]
diff --git a/twisted/common/templates/base.html b/twisted/common/templates/base.html
index 00be3c0..5f4423b 100644
--- a/twisted/common/templates/base.html
+++ b/twisted/common/templates/base.html
@@ -1,4 +1,4 @@
-{% load static tailwind_tags static %}
+{% load tailwind_tags static %}
 <html>
 <head>
    {% tailwind_css %}
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index dc3e237..e06e8ff 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -45,8 +45,7 @@
 TAILWIND_APP_NAME = 'tailwindcsstheme'
 
 INSTALLED_APPS = [
-    'jazzmin',
-    'django.contrib.admin',
+    # 'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -61,6 +60,7 @@
     
     # 3rd party apps
     'django_cotton',
+    'django_cotton_ui',
     'tailwind',
     TAILWIND_APP_NAME,
     
@@ -160,4 +160,140 @@
 STATIC_URL = 'static/'
 STATIC_ROOT = BASE_DIR / 'static'
 CSRF_COOKIE_HTTPONLY = False
-NPM_BIN_PATH = os.environ.get("NPM_BIN_PATH", "npm")
\ No newline at end of file
+NPM_BIN_PATH = os.environ.get("NPM_BIN_PATH", "npm")
+
+# Jazzmin Settings
+JAZZMIN_SETTINGS = {
+    # title of the window (Will default to current_admin_site.site_title if absent or None)
+    "site_title": "Twisted Supadmin",
+
+    # Title on the login screen (19 chars max) (defaults to current_admin_site.site_header if absent or None)
+    "site_header": "Twisted - YSWS",
+
+    # Title on the brand (19 chars max) (defaults to current_admin_site.site_header if absent or None)
+    "site_brand": "Twisted - YSWS",
+
+    # Logo to use for your site, must be present in static files, used for brand on top left
+    "site_logo": "favicon.png",
+
+    # Logo to use for your site, must be present in static files, used for login form logo (defaults to site_logo)
+    "login_logo": True,
+
+    # Logo to use for login form in dark themes (defaults to login_logo)
+    "login_logo_dark": False,
+
+    # CSS classes that are applied to the logo above
+    "site_logo_classes": "img-circle",
+
+    # Relative path to a favicon for your site, will default to site_logo if absent (ideally 32x32 px)
+    "site_icon": '/static/favicon.png',
+
+    # Welcome text on the login screen
+    "welcome_sign": "Please sign in via the root!",
+
+    # Copyright on the footer
+    "copyright": "Twisted and Hack Club",
+
+    # List of model admins to search from the search bar, search bar omitted if excluded
+    # If you want to use a single search field you dont need to use a list, you can use a simple string 
+    # "search_model": ["auth.User", "auth.Group"],
+
+    # Field name on user model that contains avatar ImageField/URLField/Charfield or a callable that receives the user
+    "user_avatar": None,
+
+    ############
+    # Top Menu #
+    ############
+
+    # Links to put along the top menu
+    "topmenu_links": [
+
+        # Url that gets reversed (Permissions can be added)
+        {"name": "Home",  "url": "admin:index", "permissions": ["auth.view_user"]},
+
+        # external url that opens in a new window (Permissions can be added)
+        {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True},
+
+        # model admin to link to (Permissions checked against model)
+        {"model": "auth.User"},
+
+        # App with dropdown menu to all its models pages (Permissions checked against models)
+        {"app": "books"},
+    ],
+
+    #############
+    # User Menu #
+    #############
+
+    # Additional links to include in the user menu on the top right ("app" url type is not allowed)
+    "usermenu_links": [
+        {"name": "Dashboard", "url": "/dashboard/", "new_window": True},
+        {"model": "auth.user"}
+    ],
+
+    #############
+    # Side Menu #
+    #############
+
+    # Whether to display the side menu
+    "show_sidebar": True,
+
+    # Whether to aut expand the menu
+    "navigation_expanded": True,
+
+    # List of apps (and/or models) to base side menu ordering off of (does not need to contain all apps/models)
+    # "order_with_respect_to": ["auth", "books", "books.author", "books.book"],
+
+    # Custom links to append to app groups, keyed on app name
+    # "custom_links": {
+    #     "books": [{
+    #         "name": "Make Messages", 
+    #         "url": "make_messages", 
+    #         "icon": "fas fa-comments",
+    #         "permissions": ["books.view_book"]
+    #     }]
+    # },
+
+    # Custom icons for side menu apps/models See https://fontawesome.com/icons?d=gallery&m=free&v=5.0.0,5.0.1,5.0.10,5.0.11,5.0.12,5.0.13,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.13.0,5.12.0,5.11.2,5.11.1,5.10.0,5.9.0,5.8.2,5.8.1,5.7.2,5.7.1,5.7.0,5.6.3,5.5.0,5.4.2
+    # for the full list of 5.13.0 free icon classes
+    "icons": {
+        "auth": "fas fa-users-cog",
+        "auth.user": "fas fa-user",
+        "auth.Group": "fas fa-users",
+    },
+    # Icons that are used when one is not manually specified
+    "default_icon_parents": "fas fa-chevron-circle-right",
+    "default_icon_children": "fas fa-circle",
+
+    #################
+    # Related Modal #
+    #################
+    # Use modals instead of popups
+    "related_modal_active": False,
+
+    #############
+    # UI Tweaks #
+    #############
+    # Relative paths to custom CSS/JS scripts (must be present in static files)
+    "custom_css": None,
+    "custom_js": None,
+    # Whether to link font from fonts.googleapis.com (use custom_css to supply font otherwise)
+    "use_google_fonts_cdn": True,
+    # Whether to show the UI customizer on the sidebar
+    "show_ui_builder": False,
+
+    ###############
+    # Change view #
+    ###############
+    # Render out the change view as a single form, or in tabs, current options are
+    # - single
+    # - horizontal_tabs (default)
+    # - vertical_tabs
+    # - collapsible
+    # - carousel
+    "changeform_format": "horizontal_tabs",
+    # override change forms on a per modeladmin basis
+    "changeform_format_overrides": {"auth.user": "collapsible", "auth.group": "vertical_tabs"},
+    # Add a language dropdown into the admin
+    "language_chooser": False,
+}
diff --git a/twisted/mysite/urls.py b/twisted/mysite/urls.py
index b1091c2..d77c7b9 100644
--- a/twisted/mysite/urls.py
+++ b/twisted/mysite/urls.py
@@ -15,19 +15,16 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 
-from django.contrib import admin
 from django.urls import include, path
 from django.conf import settings
 from django.conf.urls.static import static
 
 urlpatterns = [
-    path("admin/", admin.site.urls),
     path("", include("twisted_site.urls")),
     path("_slackbot/", include("slack_bot.urls")),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
 if settings.DEBUG:
-    # Include django_browser_reload URLs only in DEBUG mode
     urlpatterns += [
         path("__reload__/", include("django_browser_reload.urls")),
     ]
diff --git a/twisted/tailwindcsstheme/static_src/src/cotton-ui.sources.css b/twisted/tailwindcsstheme/static_src/src/cotton-ui.sources.css
new file mode 100644
index 0000000..955e8f3
--- /dev/null
+++ b/twisted/tailwindcsstheme/static_src/src/cotton-ui.sources.css
@@ -0,0 +1,188 @@
+/* Generated by `manage.py cotton_ui_sources`. Do not edit.
+   @import after `@import "tailwindcss"`; brand via :root / .dark after it. */
+
+@custom-variant dark (&:where(.dark, .dark *));
+
+/* Cotton UI tokens: accent palette, component tokens (radius, surfaces, shadows,
+   focus ring) and x-cloak. Brand by overriding --color-accent via :root / .dark. */
+
+@theme {
+    --color-accent: var(--color-ink-900);
+    --color-accent-content: var(--color-ink-700);
+    --color-accent-foreground: var(--color-white);
+
+    /* Component tokens declared in @theme (not just :root) so their named utilities
+       generate: text-muted, bg-surface, border-box-border, bg-input-bg, bg-accent-muted.
+       These are the light defaults; .dark overrides them in the @layer theme block below. */
+    --color-muted: var(--color-ink-500);           /* secondary text (text-muted): meta lines, descriptions, timestamps */
+    --color-box-border: var(--color-ink-200);      /* border for box-role surfaces: cards, dialogs, menus */
+    --color-accent-muted: var(--color-ink-900);    /* off-accent fill: :accent=false controls re-tone with the Ink control */
+    --color-surface: color-mix(in oklab, var(--color-bg), white var(--surface-level));  /* raised surfaces, derived from --color-bg + --surface-level */
+    --color-input-bg: transparent;                 /* form fields: border-defined in light; .dark lifts it */
+
+    /* Radius is split by role, not by size, and kept in its own namespace so it never
+       collides with Tailwind's --radius-md/-lg scale or your own rounded-* usage.
+       Declared in @theme so the `rounded-control` / `rounded-box` utilities are generated. */
+    --radius-control: 0.375rem;   /* form controls: inputs, segments → rounded-control */
+    --radius-box: 0.5rem;         /* structural: cards, dialogs, menus → rounded-box */
+    --radius-button: var(--radius-control);  /* buttons → rounded-button; defaults to the control radius, set to a large value for pill buttons */
+
+    /* Extra neutral/gray scales beyond Tailwind's five, so the theme builder's Gray base
+       can remap zinc to a warmer/cooler neutral. Only emitted when referenced (the theme
+       builder primes them); they add nothing to the bundle unless that component is used. */
+    --color-taupe-50: oklch(98.6% 0.002 67.8);
+    --color-taupe-100: oklch(96% 0.002 17.2);
+    --color-taupe-200: oklch(92.2% 0.005 34.3);
+    --color-taupe-300: oklch(86.8% 0.007 39.5);
+    --color-taupe-400: oklch(71.4% 0.014 41.2);
+    --color-taupe-500: oklch(54.7% 0.021 43.1);
+    --color-taupe-600: oklch(43.8% 0.017 39.3);
+    --color-taupe-700: oklch(36.7% 0.016 35.7);
+    --color-taupe-800: oklch(26.8% 0.011 36.5);
+    --color-taupe-900: oklch(21.4% 0.009 43.1);
+    --color-taupe-950: oklch(14.7% 0.004 49.3);
+
+    --color-mauve-50: oklch(98.5% 0 0);
+    --color-mauve-100: oklch(96% 0.003 325.6);
+    --color-mauve-200: oklch(92.2% 0.005 325.62);
+    --color-mauve-300: oklch(86.5% 0.012 325.68);
+    --color-mauve-400: oklch(71.1% 0.019 323.02);
+    --color-mauve-500: oklch(54.2% 0.034 322.5);
+    --color-mauve-600: oklch(43.5% 0.029 321.78);
+    --color-mauve-700: oklch(36.4% 0.029 323.89);
+    --color-mauve-800: oklch(26.3% 0.024 320.12);
+    --color-mauve-900: oklch(21.2% 0.019 322.12);
+    --color-mauve-950: oklch(14.5% 0.008 326);
+
+    --color-mist-50: oklch(98.7% 0.002 197.1);
+    --color-mist-100: oklch(96.3% 0.002 197.1);
+    --color-mist-200: oklch(92.5% 0.005 214.3);
+    --color-mist-300: oklch(87.2% 0.007 219.6);
+    --color-mist-400: oklch(72.3% 0.014 214.4);
+    --color-mist-500: oklch(56% 0.021 213.5);
+    --color-mist-600: oklch(45% 0.017 213.2);
+    --color-mist-700: oklch(37.8% 0.015 216);
+    --color-mist-800: oklch(27.5% 0.011 216.9);
+    --color-mist-900: oklch(21.8% 0.008 223.9);
+    --color-mist-950: oklch(14.8% 0.004 228.8);
+
+    --color-olive-50: oklch(98.8% 0.003 106.5);
+    --color-olive-100: oklch(96.6% 0.005 106.5);
+    --color-olive-200: oklch(93% 0.007 106.5);
+    --color-olive-300: oklch(88% 0.011 106.6);
+    --color-olive-400: oklch(73.7% 0.021 106.9);
+    --color-olive-500: oklch(58% 0.031 107.3);
+    --color-olive-600: oklch(46.6% 0.025 107.3);
+    --color-olive-700: oklch(39.4% 0.023 107.4);
+    --color-olive-800: oklch(28.6% 0.016 107.4);
+    --color-olive-900: oklch(22.8% 0.013 107.4);
+    --color-olive-950: oklch(15.3% 0.006 107.1);
+
+    /* Neutral scale the components are authored against. Defaults to the zinc look, so the
+       precompiled (no-build / CDN) stylesheet needs zero config. Re-tone the whole UI by
+       overriding --color-ink-* (directly or via the theme builder) WITHOUT touching a
+       consumer's own zinc-* usage. Kept as var() refs so an app that re-themes zinc still
+       cascades through; the priming list forces both scales into the shipped CSS. */
+    --color-ink-50: var(--color-zinc-50);
+    --color-ink-100: var(--color-zinc-100);
+    --color-ink-200: var(--color-zinc-200);
+    --color-ink-300: var(--color-zinc-300);
+    --color-ink-400: var(--color-zinc-400);
+    --color-ink-500: var(--color-zinc-500);
+    --color-ink-600: var(--color-zinc-600);
+    --color-ink-700: var(--color-zinc-700);
+    --color-ink-800: var(--color-zinc-800);
+    --color-ink-900: var(--color-zinc-900);
+    --color-ink-950: var(--color-zinc-950);
+}
+
+/* The remaining component tokens live in the `theme` layer so a consumer's @theme /
+   @layer theme overrides always win (light and dark stay in the same layer, no cascade upset). */
+@layer theme {
+    :root {
+        --color-bg: var(--color-ink-50);       /* page base */
+        /* --surface-level drives the raised-surface derivation in @theme (--color-surface):
+           higher = more contrast off the page. Light is flat white; .dark lifts subtly. */
+        --surface-level: 100%;
+
+        --shadow-input: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+        --shadow-box: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+
+        --focus-ring-width: 3px;
+        --focus-ring-offset: 0px;
+        --focus-ring-color: color-mix(in oklab, var(--color-accent) 30%, transparent);
+        --focus-ring-offset-color: #ffffff;
+    }
+
+    .dark {
+        --color-accent: var(--color-ink-100);
+        --color-accent-content: var(--color-ink-300);
+        --color-accent-foreground: var(--color-ink-900);
+        --color-bg: var(--color-ink-950);  /* override to ink-900 for a softer dark, ink-800 for soft */
+        --surface-level: 6%;  /* subtle lift off the dark page */
+        --color-box-border: var(--color-ink-700);
+        --color-accent-muted: var(--color-ink-100);
+        --color-muted: var(--color-ink-400);
+        /* Inputs lift off any surface (page or card) via a translucent lighten. */
+        --color-input-bg: color-mix(in oklab, white 4%, transparent);
+        --focus-ring-offset-color: #18181b; /* zinc-900 */
+    }
+}
+
+/* Unified focus indicator. Add `focus-ring` to any interactive element for a crisp accent
+   border plus a faded, translucent accent ring on focus. Uses `outline` for the ring so it
+   follows border-radius, never clashes with the element's box-shadow, and is not clipped by
+   overflow. The accent border-color is a no-op on borderless elements (button/checkbox labels),
+   so it only shows on bordered controls (inputs, selects, textareas). Themeable via
+   --focus-ring-width / --focus-ring-color / --focus-ring-offset (see the theme builder). */
+@utility focus-ring {
+    /* The always-present transparent outline avoids a colour flash and suppresses the
+       UA default; only the colour changes on focus. */
+    outline: var(--focus-ring-width) solid transparent;
+    outline-offset: var(--focus-ring-offset);
+    &:focus-visible {
+        outline-color: var(--focus-ring-color);
+        border-color: var(--color-accent);
+    }
+}
+
+/* Range slider, themed to match inputs: a visible filled track and a neutral surface
+   thumb (no bright accent). Webkit and Moz pseudo-elements are separate rules, a browser
+   drops the whole rule if it doesn't recognise the selector. */
+.ui-range {
+    --range-fill-color: var(--color-accent);   /* completed portion + thumb; neutral via .ui-range-neutral */
+    --range-track-bg: var(--color-input-bg);    /* unfilled track: same surface as an input/unchecked checkbox */
+    --range-border: var(--color-ink-300);      /* track + thumb border, matched to inputs/radio; .dark override below */
+    @apply w-full cursor-pointer appearance-none bg-transparent;
+    &:disabled { @apply cursor-not-allowed opacity-50; }
+
+    /* Track: completed portion (up to --range-fill, set per value) is the accent; the rest
+       is the unchecked-control bg. Separate webkit/moz rules, a browser drops a rule whose
+       selector it doesn't know. Colours come from custom props (set on .ui-range, inherited
+       into the pseudo-element) because Tailwind's `dark:` variant cannot target a nested
+       pseudo-element — it compiles to ::thumb:where(.dark) which never matches. */
+    &::-webkit-slider-runnable-track {
+        @apply h-2 rounded-full border;
+        border-color: var(--range-border);
+        background: linear-gradient(to right, var(--range-fill-color) var(--range-fill, 0%), var(--range-track-bg) var(--range-fill, 0%));
+    }
+    &::-moz-range-track { @apply h-2 rounded-full border; border-color: var(--range-border); background: var(--range-track-bg); }
+    &::-moz-range-progress { @apply h-2; border-radius: 9999px 0 0 9999px; background: var(--range-fill-color); }
+
+    &::-webkit-slider-thumb { @apply appearance-none size-[1.05rem] -mt-[0.3rem] rounded-full border-2 shadow-sm; border-color: var(--range-border); background: var(--range-fill-color); }
+    &::-moz-range-thumb { @apply size-[1.05rem] rounded-full border-2 shadow-sm; border-color: var(--range-border); background: var(--range-fill-color); }
+
+    &:focus-visible { @apply outline-none; }
+    &:focus-visible::-webkit-slider-thumb { outline: var(--focus-ring-width) solid var(--focus-ring-color); outline-offset: 2px; }
+    &:focus-visible::-moz-range-thumb { outline: var(--focus-ring-width) solid var(--focus-ring-color); outline-offset: 2px; }
+}
+.dark .ui-range { --range-border: var(--color-ink-700); }
+.ui-range-neutral { --range-fill-color: var(--color-ink-400); }
+.dark .ui-range-neutral { --range-fill-color: var(--color-ink-500); }
+
+/* Alpine.js x-cloak */
+[x-cloak] {
+    display: none !important;
+}
+
+@source inline("!bg-transparent !p-0 !px-0 !ring-zinc-900 -mb-1 -mb-px -ml-1 -mr-1 -mt-1 -rotate-180 -rotate-90 -space-x-2 -translate-x-1/2 -translate-x-full -translate-y-1/2 -translate-y-full [&>*]:-rotate-180 [&>.is-current]:bg-accent [&>.is-current]:bg-accent/15 [&>.is-current]:border-accent [&>.is-current]:text-accent [&>.is-current]:text-accent-content [&>.is-current]:text-accent-foreground [&>.is-current]:text-ink-900 [&>a:hover]:bg-ink-100 [&>a:hover]:text-ink-900 [&>a]:border-b-2 [&>a]:border-transparent [&>a]:font-medium [&>a]:px-1 [&>a]:px-2 [&>a]:px-3 [&>a]:py-2 [&>a]:rounded-control [&>a]:text-ink-600 [&>a]:text-sm [&>a]:transition-colors [&>option]:bg-white [&>option]:dark:bg-ink-900 [&>option]:dark:text-ink-100 [&>option]:text-ink-900 [&>span]:ring-2 [&>span]:ring-white [&>svg]:h-4 [&>svg]:size-4 [&>svg]:w-4 [&_.is-current]:bg-ink-100 [&_.is-current]:border-accent [&_.is-current]:font-semibold [&_.is-current]:text-ink-900 [&_a:hover]:bg-ink-50 [&_a:hover]:text-ink-900 [&_a]:-mb-px [&_a]:border-b-2 [&_a]:border-ink-200 [&_a]:border-l-2 [&_a]:border-transparent [&_a]:flex [&_a]:font-medium [&_a]:font-normal [&_a]:gap-2 [&_a]:gap-3 [&_a]:inline-flex [&_a]:items-center [&_a]:justify-between [&_a]:pl-4 [&_a]:pr-2 [&_a]:px-3 [&_a]:px-4 [&_a]:py-1 [&_a]:py-2 [&_a]:py-3 [&_a]:relative [&_a]:rounded-control [&_a]:rounded-t-md [&_a]:text-ink-600 [&_a]:text-sm [&_a]:transition-colors [&_tbody_tr:hover]:bg-ink-50 [&_tbody_tr:last-child]:border-0 [&_tbody_tr]:border-b [&_tbody_tr]:border-ink-100 [&_td]:px-3 [&_td]:py-2.5 [&_td]:text-ink-700 [&_th]:font-medium [&_th]:px-3 [&_th]:py-2.5 [&_th]:text-ink-500 [&_th]:whitespace-nowrap [&_thead]:border-b [&_thead]:border-ink-200 absolute accent-[var(--color-accent)] active:opacity-100 animate-spin appearance-none backdrop-blur backdrop-blur-sm before:content-[var(--bc-separator)] before:mr-0.5 before:text-ink-300 bg-[color-mix(in_oklab,var(--color-accent-muted,currentColor)_5%,transparent)] bg-[right_0.5rem_center] bg-[var(--color-accent-muted,currentColor)] bg-[var(--color-input-bg)] bg-[var(--color-surface)] bg-accent bg-accent/10 bg-accent/5 bg-amber-100 bg-amber-300 bg-amber-400 bg-amber-50 bg-amber-500 bg-amber-600 bg-amber-950 bg-black/20 bg-black/50 bg-blue-100 bg-blue-300 bg-blue-400 bg-blue-50 bg-blue-500 bg-blue-600 bg-blue-950 bg-cyan-100 bg-cyan-300 bg-cyan-400 bg-cyan-500 bg-cyan-600 bg-cyan-950 bg-emerald-100 bg-emerald-300 bg-emerald-400 bg-emerald-500 bg-emerald-600 bg-emerald-950 bg-fuchsia-100 bg-fuchsia-300 bg-fuchsia-400 bg-fuchsia-500 bg-fuchsia-600 bg-fuchsia-950 bg-gray-100 bg-gray-200 bg-gray-300 bg-gray-400 bg-gray-50 bg-gray-500 bg-gray-600 bg-gray-700 bg-gray-800 bg-gray-900 bg-gray-950 bg-green-100 bg-green-300 bg-green-400 bg-green-50 bg-green-500 bg-green-600 bg-green-950 bg-indigo-100 bg-indigo-300 bg-indigo-400 bg-indigo-500 bg-indigo-600 bg-indigo-950 bg-ink-100 bg-ink-200 bg-ink-300 bg-ink-400 bg-ink-50 bg-ink-500 bg-ink-600 bg-ink-700 bg-ink-800 bg-ink-900 bg-ink-950 bg-lime-100 bg-lime-300 bg-lime-400 bg-lime-500 bg-lime-600 bg-lime-950 bg-mauve-100 bg-mauve-200 bg-mauve-300 bg-mauve-400 bg-mauve-50 bg-mauve-500 bg-mauve-600 bg-mauve-700 bg-mauve-800 bg-mauve-900 bg-mauve-950 bg-mist-100 bg-mist-200 bg-mist-300 bg-mist-400 bg-mist-50 bg-mist-500 bg-mist-600 bg-mist-700 bg-mist-800 bg-mist-900 bg-mist-950 bg-neutral-100 bg-neutral-200 bg-neutral-300 bg-neutral-400 bg-neutral-50 bg-neutral-500 bg-neutral-600 bg-neutral-700 bg-neutral-800 bg-neutral-900 bg-neutral-950 bg-no-repeat bg-olive-100 bg-olive-200 bg-olive-300 bg-olive-400 bg-olive-50 bg-olive-500 bg-olive-600 bg-olive-700 bg-olive-800 bg-olive-900 bg-olive-950 bg-orange-100 bg-orange-300 bg-orange-400 bg-orange-500 bg-orange-600 bg-orange-950 bg-pink-100 bg-pink-300 bg-pink-400 bg-pink-500 bg-pink-600 bg-pink-950 bg-purple-100 bg-purple-300 bg-purple-400 bg-purple-500 bg-purple-600 bg-purple-950 bg-red-100 bg-red-300 bg-red-400 bg-red-50 bg-red-500 bg-red-600 bg-red-950 bg-rose-100 bg-rose-300 bg-rose-400 bg-rose-500 bg-rose-600 bg-rose-950 bg-sky-100 bg-sky-300 bg-sky-400 bg-sky-500 bg-sky-600 bg-sky-950 bg-slate-100 bg-slate-200 bg-slate-300 bg-slate-400 bg-slate-50 bg-slate-500 bg-slate-600 bg-slate-700 bg-slate-800 bg-slate-900 bg-slate-950 bg-stone-100 bg-stone-200 bg-stone-300 bg-stone-400 bg-stone-50 bg-stone-500 bg-stone-600 bg-stone-700 bg-stone-800 bg-stone-900 bg-stone-950 bg-taupe-100 bg-taupe-200 bg-taupe-300 bg-taupe-400 bg-taupe-50 bg-taupe-500 bg-taupe-600 bg-taupe-700 bg-taupe-800 bg-taupe-900 bg-taupe-950 bg-teal-100 bg-teal-300 bg-teal-400 bg-teal-500 bg-teal-600 bg-teal-950 bg-transparent bg-violet-100 bg-violet-300 bg-violet-400 bg-violet-500 bg-violet-600 bg-violet-950 bg-white bg-white/80 bg-white/90 bg-yellow-100 bg-yellow-300 bg-yellow-400 bg-yellow-500 bg-yellow-600 bg-yellow-950 bg-zinc-100 bg-zinc-500 bg-zinc-700 bg-zinc-900 block border border-0 border-2 border-[color:var(--color-box-border)] border-[color:var(--color-card-border,var(--color-box-border))] border-[var(--color-accent-muted,currentColor)] border-accent border-amber-200 border-amber-300 border-b border-b-2 border-blue-200 border-blue-300 border-collapse border-green-200 border-green-300 border-ink-100 border-ink-200 border-ink-300 border-ink-400 border-ink-900 border-l border-r border-red-200 border-red-300 border-red-500 border-t border-transparent border-zinc-200 bottom-0 bottom-4 collapse container contents cursor-not-allowed cursor-pointer cursor-text dark dark:!ring-white dark:[&>.is-current]:bg-accent/20 dark:[&>.is-current]:text-accent dark:[&>.is-current]:text-white dark:[&>a:hover]:bg-ink-800 dark:[&>a:hover]:text-white dark:[&>a]:text-ink-300 dark:[&>a]:text-ink-400 dark:[&>span]:ring-ink-900 dark:[&_.is-current]:bg-ink-800 dark:[&_.is-current]:text-ink-100 dark:[&_.is-current]:text-white dark:[&_a:hover]:bg-ink-800/50 dark:[&_a:hover]:text-ink-100 dark:[&_a]:border-ink-800 dark:[&_a]:text-ink-400 dark:[&_tbody_tr:hover]:bg-ink-800/50 dark:[&_tbody_tr]:border-ink-800 dark:[&_td]:text-ink-300 dark:[&_th]:text-ink-400 dark:[&_thead]:border-ink-700 dark:before:text-ink-600 dark:bg-amber-500 dark:bg-amber-900/30 dark:bg-amber-950/40 dark:bg-amber-950/90 dark:bg-blue-500 dark:bg-blue-900/30 dark:bg-blue-950/40 dark:bg-blue-950/90 dark:bg-cyan-500 dark:bg-cyan-900/30 dark:bg-emerald-500 dark:bg-emerald-900/30 dark:bg-fuchsia-500 dark:bg-fuchsia-900/30 dark:bg-green-500 dark:bg-green-900/30 dark:bg-green-950/40 dark:bg-green-950/90 dark:bg-indigo-500 dark:bg-indigo-900/30 dark:bg-ink-300 dark:bg-ink-300/10 dark:bg-ink-400 dark:bg-ink-400/30 dark:bg-ink-700 dark:bg-ink-800 dark:bg-ink-900 dark:bg-ink-900/80 dark:bg-ink-950 dark:bg-lime-500 dark:bg-lime-900/30 dark:bg-orange-500 dark:bg-orange-900/30 dark:bg-pink-500 dark:bg-pink-900/30 dark:bg-purple-500 dark:bg-purple-900/30 dark:bg-red-500 dark:bg-red-900/30 dark:bg-red-950/40 dark:bg-red-950/90 dark:bg-rose-500 dark:bg-rose-900/30 dark:bg-sky-500 dark:bg-sky-900/30 dark:bg-teal-500 dark:bg-teal-900/30 dark:bg-violet-500 dark:bg-violet-900/30 dark:bg-white dark:bg-yellow-500 dark:bg-yellow-900/30 dark:bg-zinc-300 dark:bg-zinc-400 dark:bg-zinc-700 dark:bg-zinc-800 dark:bg-zinc-800/90 dark:bg-zinc-900 dark:border-amber-800 dark:border-amber-900 dark:border-blue-800 dark:border-blue-900 dark:border-green-800 dark:border-green-900 dark:border-ink-100 dark:border-ink-300/20 dark:border-ink-600 dark:border-ink-700 dark:border-ink-800 dark:border-red-800 dark:border-red-900 dark:border-zinc-700 dark:border-zinc-800 dark:divide-ink-700 dark:focus-visible:bg-ink-800 dark:focus-visible:bg-red-950/30 dark:hover:bg-ink-600 dark:hover:bg-ink-700 dark:hover:bg-ink-700/50 dark:hover:bg-ink-800 dark:hover:bg-red-950/30 dark:hover:bg-zinc-700/50 dark:hover:bg-zinc-800 dark:hover:border-ink-600 dark:hover:text-ink-100 dark:hover:text-ink-200 dark:hover:text-ink-300 dark:hover:text-white dark:hover:text-zinc-200 dark:placeholder:text-ink-500 dark:ring-offset-zinc-900 dark:ring-white/15 dark:text-amber-200 dark:text-amber-300 dark:text-amber-400 dark:text-blue-200 dark:text-blue-300 dark:text-blue-400 dark:text-cyan-400 dark:text-emerald-400 dark:text-fuchsia-400 dark:text-green-200 dark:text-green-300 dark:text-green-400 dark:text-indigo-400 dark:text-ink-100 dark:text-ink-200 dark:text-ink-300 dark:text-ink-400 dark:text-ink-50 dark:text-ink-500 dark:text-ink-600 dark:text-ink-900 dark:text-lime-400 dark:text-orange-400 dark:text-pink-400 dark:text-purple-400 dark:text-red-200 dark:text-red-300 dark:text-red-400 dark:text-rose-400 dark:text-sky-400 dark:text-teal-400 dark:text-violet-400 dark:text-white dark:text-yellow-400 dark:text-zinc-100 dark:text-zinc-200 dark:text-zinc-300 dark:text-zinc-400 dark:text-zinc-900 disabled:cursor-not-allowed disabled:opacity-50 disabled:opacity-75 disabled:pointer-events-none divide-ink-200 divide-y duration-100 duration-150 duration-200 duration-300 duration-500 duration-75 ease-in ease-in-out ease-linear ease-out first:before:content-[''] first:pt-0 first:rounded-l-[var(--radius-control)] fixed flex flex-1 flex-col flex-col-reverse flex-shrink-0 flex-wrap focus-ring focus-visible:bg-ink-100 focus-visible:bg-red-50 focus-visible:outline-none focus-within:border-accent focus-within:ring-[length:var(--focus-ring-width)] focus-within:ring-[var(--focus-ring-color)] focus:outline-none focus:ring-0 font-medium font-mono font-normal font-semibold gap-1 gap-1.5 gap-2 gap-2.5 gap-3 gap-4 gap-x-6 gap-y-2 grid grid-cols-3 grid-cols-7 h-1 h-1.5 h-14 h-16 h-2 h-24 h-3 h-32 h-4 h-48 h-5 h-6 h-64 h-7 h-8 h-80 h-9 h-[1.125rem] h-full h-px hidden hover:bg-accent-content hover:bg-accent/10 hover:bg-ink-100 hover:bg-ink-200 hover:bg-ink-50 hover:bg-red-50 hover:bg-red-500/10 hover:bg-red-600 hover:bg-zinc-100 hover:bg-zinc-50 hover:border-ink-300 hover:opacity-100 hover:opacity-80 hover:scale-110 hover:text-accent-content hover:text-ink-600 hover:text-ink-700 hover:text-ink-900 hover:text-zinc-800 hover:text-zinc-900 hover:underline inline inline-block inline-flex inset-0 inset-x-0 inset-y-0 invisible is-current items-center items-end items-start justify-between justify-center justify-start last:border-r-0 last:rounded-r-[var(--radius-control)] leading-[1.45] leading-none left-0 left-1/2 left-3 left-4 light max-h-44 max-h-60 max-h-[40vh] max-h-[55vh] max-h-[70vh] max-h-[82vh] max-h-[85vh] max-h-[92vh] max-h-[calc(100vh-4rem)] max-w-2xl max-w-4xl max-w-[7.5rem] max-w-[calc(100vw-2rem)] max-w-full max-w-lg max-w-md max-w-sm max-w-xl max-w-xs mb-1.5 mb-2 mb-4 md:absolute md:flex md:hidden md:min-w-[var(--dd-min)] md:mt-0 md:w-auto min-h-10 min-h-11 min-h-12 min-h-14 min-h-16 min-h-5 min-h-8 min-h-9 min-h-[3.5rem] min-h-[42px] min-w-0 min-w-9 min-w-[var(--dd-min)] ml-1.5 ml-2 ml-auto mr-0.5 mr-1 mr-2 mt-0.5 mt-1 mt-1.5 mt-2 mt-4 my-1 no-underline object-cover opacity-0 opacity-100 opacity-25 opacity-50 opacity-60 opacity-70 opacity-75 opacity-80 opacity-90 outline overflow-auto overflow-hidden overflow-visible overflow-x-auto overflow-x-hidden overflow-y-auto p-0.5 p-1 p-1.5 p-10 p-12 p-2 p-2.5 p-3 p-4 p-6 p-8 pb-0 pb-2 pb-2.5 pb-3 pb-4 pl-10 pl-2 pl-2.5 pl-3 pl-9 placeholder:text-ink-400 pointer-events-auto pointer-events-none pr-10 pr-12 pr-14 pr-2 pr-3 pr-7 pr-8 pt-0 pt-1 pt-2 pt-3 pt-4 pt-5 px-1 px-1.5 px-2 px-2.5 px-3 px-3.5 px-4 px-5 px-6 py-0.5 py-1 py-1.5 py-2 py-2.5 py-3 py-3.5 py-4 py-6 relative resize resize-none right-0 right-2 right-4 ring ring-1 ring-2 ring-[length:var(--focus-ring-width)] ring-[var(--focus-ring-color)] ring-black/10 ring-offset-2 ring-offset-white rotate-0 rotate-180 rotate-90 rounded rounded-[calc(var(--radius-control)*0.5)] rounded-[calc(var(--radius-control)*0.66)] rounded-box rounded-button rounded-control rounded-full rounded-t-md scale-0 scale-100 scale-95 select-none shadow shadow-[var(--shadow-box)] shadow-[var(--shadow-input)] shadow-lg shadow-sm shadow-xl shrink shrink-0 size-10 size-11 size-12 size-16 size-2.5 size-2/3 size-3 size-3.5 size-4 size-5 size-6 size-8 size-full sm:flex-row sm:justify-end sm:max-h-[80vh] sm:space-x-2 sm:text-left space-y-1 space-y-1.5 space-y-2.5 space-y-3 space-y-4 space-y-5 sr-only static sticky table tabular-nums text-2xl text-[10px] text-[11px] text-accent text-accent-foreground text-amber-700 text-amber-800 text-base text-blue-700 text-blue-800 text-center text-current text-cyan-700 text-emerald-700 text-fuchsia-700 text-green-700 text-green-800 text-indigo-700 text-ink-300 text-ink-400 text-ink-500 text-ink-600 text-ink-700 text-ink-800 text-ink-900 text-ink-950 text-left text-lg text-lime-700 text-orange-700 text-pink-700 text-purple-700 text-red-500 text-red-600 text-red-700 text-red-800 text-right text-rose-700 text-sky-700 text-sm text-teal-700 text-violet-700 text-white text-xl text-xs text-yellow-700 text-zinc-400 text-zinc-500 text-zinc-600 text-zinc-700 text-zinc-800 text-zinc-900 top-0 top-1/2 top-4 tracking-tight tracking-wider transform transition transition-[background-color,color] transition-[background-color] transition-[width] transition-all transition-colors transition-opacity transition-transform translate-x-0 translate-x-0.5 translate-x-[0.875rem] translate-x-[1.125rem] translate-x-[1.375rem] translate-x-[1.875rem] translate-x-[2.125rem] translate-x-[2.375rem] translate-x-full translate-y-0 translate-y-1 translate-y-2 translate-y-full truncate ui-range ui-range-neutral underline uppercase visible w-10 w-11 w-14 w-16 w-2 w-28 w-3 w-36 w-4 w-5 w-6 w-7 w-8 w-80 w-9 w-[1.125rem] w-[280px] w-[340px] w-[4.5rem] w-full w-max w-screen whitespace-nowrap z-10 z-40 z-50 z-[100] z-[90] z-[99]");
diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index 4c656d9..03ca9bc 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -1,4 +1,5 @@
 @import "tailwindcss";
+@import "./cotton-ui.sources.css";
 /* @plugin "@tailwindcss/typography"; */
 
 /**
@@ -10,6 +11,50 @@
 */
 @source "../../../**/*.{html,py,js}";
 
+:root {
+    /* Accent: primary buttons, links, focus ring, active states */
+    --color-accent: #8442c9;
+    --color-accent-content: #7239ad;
+    --color-accent-foreground: #ffffff;
+
+    /* Corner radius, by role */
+    --radius-control: 0.375rem;
+    --radius-box: 0.5rem;
+
+    /* Form controls */
+    --focus-ring-width: 3px;
+    --shadow-input: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+
+    /* Structural surfaces */
+    --shadow-box: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+}
+
+.dark {
+    /* Dark mode: lighter accent so it stays vivid on dark surfaces */
+    --color-accent: #9359cf;
+    --color-accent-content: #a677d8;
+    --color-accent-foreground: #ffffff;
+}
+
+/* latin-ext */
+@font-face {
+  font-family: 'Figtree';
+  font-style: normal;
+  font-weight: 300 900;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/figtree/v9/_Xms-HUzqDCFdgfMm4q9DbZs.woff2) format('woff2');
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Figtree';
+  font-style: normal;
+  font-weight: 300 900;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/figtree/v9/_Xms-HUzqDCFdgfMm4S9DQ.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
 button {
     cursor: pointer;
 }
@@ -40,6 +85,7 @@ button {
 
 @theme {
   --font-vintage: "Pirkalla", monospace, sans-serif;
+  --font-latin: "Figtree", sans-serif;
 
   --color-absolute-white: #FAFAFA;
   --color-fair-gray: #A1A1A1;
diff --git a/twisted/twisted_site/migrations/0014_profile_is_staff.py b/twisted/twisted_site/migrations/0014_profile_is_staff.py
new file mode 100644
index 0000000..cdf75cb
--- /dev/null
+++ b/twisted/twisted_site/migrations/0014_profile_is_staff.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0.7 on 2026-08-09 14:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0013_projectship'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='is_staff',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/twisted/twisted_site/migrations/0015_profile_dark_theme.py b/twisted/twisted_site/migrations/0015_profile_dark_theme.py
new file mode 100644
index 0000000..dce9602
--- /dev/null
+++ b/twisted/twisted_site/migrations/0015_profile_dark_theme.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0.7 on 2026-08-10 14:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0014_profile_is_staff'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='dark_theme',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 6eae4ea..05c8ca1 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -32,9 +32,13 @@ class Profile(models.Model):
     hackatime_access_token = models.CharField(max_length=2000, blank=True, default="")
     hackatime_state = models.CharField(max_length=100, blank=True, default="")
     
+    is_staff = models.BooleanField(default=False)
+    dark_theme = models.BooleanField(default=True)
+    
     def __str__(self):
         return self.user.username  # ty:ignore[unresolved-attribute]
 
+
 PROJECT_TYPE_CHOICES = {'software': 'Software', 'hardware': 'Hardware'}
 
 class Project(models.Model):
diff --git a/twisted/twisted_site/templates/admin/dashboard.html b/twisted/twisted_site/templates/admin/dashboard.html
new file mode 100644
index 0000000..b8ebd1b
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/dashboard.html
@@ -0,0 +1,5 @@
+<c-base>
+    <c-ui.button variant="primary">Primary Button</c-ui.button>
+<c-ui.button variant="default">Default Button</c-ui.button>
+
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html
new file mode 100644
index 0000000..6475aa8
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/base.html
@@ -0,0 +1,34 @@
+{% load static tailwind_tags %}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {% tailwind_css %}
+    <title>Admin - Twisted</title>
+    <link rel="icon" href="{% static 'favicon.png' %}" />
+</head>
+<body class="dark bg-[#09090B] text-white font-latin">
+    <div class="flex py-2 h-screen">
+        <div class="h-full">
+            <c-navlist>
+                <c-navlist.item href="/">item 1</c-navlist.item>
+                <c-navlist.item href="/">item 2</c-navlist.item>
+                <c-navlist.item href="/">item 3</c-navlist.item>
+            </c-navlist>
+        </div>
+        <div class="p-2 flex-1">
+            {{ slot }}
+        </div>
+    </div>
+
+    <!-- Cotton UI bundle first: it registers components on Alpine's alpine:init event -->
+    <script defer src="{% static 'django_cotton_ui/cotton-ui.min.js' %}"></script>
+
+    <!-- Alpine.js plugins, then Alpine core (deferred scripts run in order) -->
+    <script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/collapse@3.x.x/dist/cdn.min.js"></script>
+    <script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/focus@3.x.x/dist/cdn.min.js"></script>
+    <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
+</body>
+</html>
diff --git a/twisted/twisted_site/templates/cotton/navlist/index.html b/twisted/twisted_site/templates/cotton/navlist/index.html
new file mode 100644
index 0000000..7184584
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/navlist/index.html
@@ -0,0 +1,29 @@
+{% load static %}
+<div class="py-2 px-4 h-full">
+    <div class="border border-gray-600 bg-zinc-900 p-1 rounded-xl w-60 h-full flex flex-col">
+        <div class="flex gap-2 p-1 rounded-xl">
+            <div>
+                <img src="{% static 'favicon.png' %}" class="size-10 rounded-xl my-auto">
+            </div>
+            <div class="flex flex-col my-auto">
+                <label class="text-lg">
+                    Twisted
+                </label>
+                <label class="text-xs text-gray-500">
+                    ADMIN
+                </label>
+            </div>
+        </div>
+        <div class="flex-1">
+            a
+            {{ slot }}
+        </div>
+        <div class="">
+            <div class="mx-auto w-full border-gray-600 border-t"></div>
+            <div class="flex p-2">
+                <img class="size-8 rounded-full" src="{{ request.user.profile.slack_pfp_url }}" alt="">
+                <label class="my-auto ml-2">@{{ request.user.profile.slack_username }}</label>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/navlist/item.html b/twisted/twisted_site/templates/cotton/navlist/item.html
new file mode 100644
index 0000000..e69de29
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index 12bbd94..e95850d 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -2,6 +2,7 @@
 from django.urls import path
 from .views import client
 from .views.misc import upload_file
+from .views import admin
 
 urlpatterns = [
     path('', view=client.HomepageView.as_view(), name="homepage"),
@@ -24,4 +25,6 @@
     path("dashboard/frame/projects/<int:id>/journals/new/hackatime/", client.NewProjectHackatimeJournal.as_view(), name="fr.projects.journals.new.hackatime"),
     path("dashboard/frame/projects/<int:id>/journals/new/untracked/", client.NewProjectUntrackedJournal.as_view(), name="fr.projects.journals.new.untracked"),
     path("dashboard/frame/journals/delete/<int:id>/", client.DeleteJournal.as_view(), name="fr.projects.journals.delete"),
+
+    path("admin/", admin.DashboardView.as_view(), name="admin.dash")
 ]
diff --git a/twisted/twisted_site/views/admin/__init__.py b/twisted/twisted_site/views/admin/__init__.py
new file mode 100644
index 0000000..43d6bbd
--- /dev/null
+++ b/twisted/twisted_site/views/admin/__init__.py
@@ -0,0 +1 @@
+from .dashboard import DashboardView
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
new file mode 100644
index 0000000..e9bad78
--- /dev/null
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -0,0 +1,12 @@
+from django.views import View
+from django.shortcuts import render, redirect
+
+# Create your views here.
+class DashboardView(View):
+    def get(self, request):
+        if self.request.user.is_anonymous:
+            return redirect('homepage')
+        profile = self.request.user.profile
+        return render(request, "admin/dashboard.html", {
+            "profile": profile
+        })
diff --git a/uv.lock b/uv.lock
index 163c7de..c42c248 100644
--- a/uv.lock
+++ b/uv.lock
@@ -444,6 +444,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/8b/9b/d75158f6280906befada54f9cb17c10d5e0eac078d8d2e189e2f90da0fc1/django_cotton-2.7.2-py3-none-any.whl", hash = "sha256:1b293037ead54ab228362654da00ededc5ca52b2ff407b6087a81cfd9390850e", size = 32084, upload-time = "2026-06-01T22:52:01.238Z" },
 ]
 
+[[package]]
+name = "django-cotton-ui"
+version = "0.3.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "django" },
+    { name = "django-cotton" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/94/d8/0ca995941a12df896c83a58aefc6614a040e4a8fe87d533227236a5c6558/django_cotton_ui-0.3.2.tar.gz", hash = "sha256:71a82c7940b9581299fbe741420c24f2a7ac91f84f2c28ad42de361cd89c6516", size = 173126, upload-time = "2026-07-07T12:57:22.715Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d2/61/1de040c48796f16afdaae9ab4fd5c6683b819c02a06f77563dcfb0e9fdb6/django_cotton_ui-0.3.2-py3-none-any.whl", hash = "sha256:0a05d6f733553929389071786a9524335782c7f9d3e1ca8fe4234cdf80488bf2", size = 214320, upload-time = "2026-07-07T12:57:23.837Z" },
+]
+
 [[package]]
 name = "django-jazzmin"
 version = "3.0.5"
@@ -1099,6 +1112,7 @@ dependencies = [
     { name = "boto3" },
     { name = "django" },
     { name = "django-cotton" },
+    { name = "django-cotton-ui" },
     { name = "django-jazzmin" },
     { name = "django-tailwind", extra = ["cookiecutter", "honcho", "reload"] },
     { name = "gunicorn" },
@@ -1118,6 +1132,7 @@ requires-dist = [
     { name = "boto3", specifier = ">=1.43.66" },
     { name = "django", specifier = ">=6.0.7" },
     { name = "django-cotton", specifier = ">=2.7.2" },
+    { name = "django-cotton-ui", specifier = ">=0.3.2" },
     { name = "django-jazzmin", specifier = ">=3.0.5" },
     { name = "django-tailwind", extras = ["cookiecutter", "honcho", "reload"], specifier = ">=4.5.0" },
     { name = "gunicorn", specifier = ">=26.0.0" },

From 57471709918453bd7dcc719441ba028b09475447 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 11 Aug 2026 16:45:57 +0530
Subject: [PATCH 032/118] Work on sidebar

---
 .../static_src/src/styles.css                 |  2 +-
 .../twisted_site/templates/cotton/base.html   | 14 +++---
 .../templates/cotton/navlist/index.html       | 29 ------------
 .../templates/cotton/navlist/item.html        |  0
 .../templates/cotton/sidebar/index.html       | 47 +++++++++++++++++++
 .../templates/cotton/sidebar/item.html        | 10 ++++
 6 files changed, 65 insertions(+), 37 deletions(-)
 delete mode 100644 twisted/twisted_site/templates/cotton/navlist/index.html
 delete mode 100644 twisted/twisted_site/templates/cotton/navlist/item.html
 create mode 100644 twisted/twisted_site/templates/cotton/sidebar/index.html
 create mode 100644 twisted/twisted_site/templates/cotton/sidebar/item.html

diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index 03ca9bc..54312f2 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -10,7 +10,7 @@
 * the scope of this path.
 */
 @source "../../../**/*.{html,py,js}";
-
+@source "../../../../.venv/lib/python3.13/site-packages/django_cotton_ui/templates/**/*.html";
 :root {
     /* Accent: primary buttons, links, focus ring, active states */
     --color-accent: #8442c9;
diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html
index 6475aa8..49dcdc2 100644
--- a/twisted/twisted_site/templates/cotton/base.html
+++ b/twisted/twisted_site/templates/cotton/base.html
@@ -10,13 +10,13 @@
     <link rel="icon" href="{% static 'favicon.png' %}" />
 </head>
 <body class="dark bg-[#09090B] text-white font-latin">
-    <div class="flex py-2 h-screen">
-        <div class="h-full">
-            <c-navlist>
-                <c-navlist.item href="/">item 1</c-navlist.item>
-                <c-navlist.item href="/">item 2</c-navlist.item>
-                <c-navlist.item href="/">item 3</c-navlist.item>
-            </c-navlist>
+    <div class="md:flex md:py-2 h-screen">
+        <div class="md:h-full">
+            <c-sidebar>
+                <c-sidebar.item icon="analytics" href="/stats" active>Statistics</c-sidebar.item>
+                <c-sidebar.item icon="profile" href="/">Users</c-sidebar.item>
+                <c-sidebar.item href="/">item 3</c-sidebar.item>
+            </c-sidebar>
         </div>
         <div class="p-2 flex-1">
             {{ slot }}
diff --git a/twisted/twisted_site/templates/cotton/navlist/index.html b/twisted/twisted_site/templates/cotton/navlist/index.html
deleted file mode 100644
index 7184584..0000000
--- a/twisted/twisted_site/templates/cotton/navlist/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% load static %}
-<div class="py-2 px-4 h-full">
-    <div class="border border-gray-600 bg-zinc-900 p-1 rounded-xl w-60 h-full flex flex-col">
-        <div class="flex gap-2 p-1 rounded-xl">
-            <div>
-                <img src="{% static 'favicon.png' %}" class="size-10 rounded-xl my-auto">
-            </div>
-            <div class="flex flex-col my-auto">
-                <label class="text-lg">
-                    Twisted
-                </label>
-                <label class="text-xs text-gray-500">
-                    ADMIN
-                </label>
-            </div>
-        </div>
-        <div class="flex-1">
-            a
-            {{ slot }}
-        </div>
-        <div class="">
-            <div class="mx-auto w-full border-gray-600 border-t"></div>
-            <div class="flex p-2">
-                <img class="size-8 rounded-full" src="{{ request.user.profile.slack_pfp_url }}" alt="">
-                <label class="my-auto ml-2">@{{ request.user.profile.slack_username }}</label>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/navlist/item.html b/twisted/twisted_site/templates/cotton/navlist/item.html
deleted file mode 100644
index e69de29..0000000
diff --git a/twisted/twisted_site/templates/cotton/sidebar/index.html b/twisted/twisted_site/templates/cotton/sidebar/index.html
new file mode 100644
index 0000000..ed34e86
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/sidebar/index.html
@@ -0,0 +1,47 @@
+{% load static %}
+<div class="md:py-2 md:px-4 md:h-full">
+    <c-ui.drawer class="md:hidden" side="left">
+        <c-slot name="header">
+            <div class="flex gap-2 p-1 mb-2 rounded-xl">
+                <div>
+                    <img src="{% static 'favicon.png' %}" class="size-10 rounded-xl my-auto" />
+                </div>
+                <label class="text-lg my-auto">
+                    Twisted
+                    <label class="my-auto text-xs text-gray-500"> ADMIN </label>
+                </label>
+            </div>
+        </c-slot>
+        <c-ui.button size="xs" variant="ghost" @click="drawerOpen = true">
+            <img src="https://icons.hackclub.com/api/icons/white/align-left" class="size-10" />
+        </c-ui.button>
+        <c-slot name="content">{{ slot }}</c-slot>
+        <c-slot name="footer">
+            <div class="flex p-2">
+                <img class="size-8 rounded-full" src="{{ request.user.profile.slack_pfp_url }}" alt="" />
+                <label class="my-auto ml-2">@{{ request.user.profile.slack_username }}</label>
+            </div>
+        </c-slot>
+    </c-ui.drawer>
+    <div class="border border-gray-700 bg-zinc-900 p-1 rounded-xl w-60 h-full hidden md:flex flex-col">
+        <div class="flex gap-2 p-1 mb-2 rounded-xl">
+            <div>
+                <img src="{% static 'favicon.png' %}" class="size-10 rounded-xl my-auto" />
+            </div>
+            <div class="flex flex-col my-auto">
+                <label class="text-lg">Twisted</label>
+                <label class="text-xs text-gray-500">ADMIN</label>
+            </div>
+        </div>
+        <div class="mx-auto w-full border-gray-700 border-t"></div>
+        <div class="flex-1 my-2">{{ slot }}</div>
+        <div>
+            <div class="mx-auto w-full border-gray-700 border-t"></div>
+            <div class="flex p-2">
+                <img class="size-8 rounded-full" src="{{ request.user.profile.slack_pfp_url }}" alt="" />
+                <label class="my-auto ml-2">@{{ request.user.profile.slack_username }}</label>
+            </div>
+        </div>
+    </div>
+    <div></div>
+</div>
diff --git a/twisted/twisted_site/templates/cotton/sidebar/item.html b/twisted/twisted_site/templates/cotton/sidebar/item.html
new file mode 100644
index 0000000..0f3f16b
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/sidebar/item.html
@@ -0,0 +1,10 @@
+<a href="{{ href }}">
+    <div class="flex gap-2 rounded-xl w-full p-2 hover:text-white hover:bg-zinc-800 {% if active %} bg-red-950 text-[#e3818f] {% else %} text-gray-400 {% endif %}">
+        <div class="size-6">
+            <img src="https://icons.hackclub.com/api/icons/{% if active %}0xe3818f{% else %}0x99A1AF{% endif %}/{{ icon }}" alt="">
+        </div>
+        <div class="flex-1">
+            {{ slot }}
+        </div>
+    </div>
+</a>
\ No newline at end of file

From 36802db0784af77f03f629b7fde03f695bbcc4f3 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 11 Aug 2026 17:13:39 +0530
Subject: [PATCH 033/118] Add all sidebar items (for now)

---
 .../twisted_site/templates/cotton/base.html   |  6 ++--
 .../templates/cotton/sidebar/item.html        |  5 +--
 twisted/twisted_site/urls.py                  |  8 ++++-
 twisted/twisted_site/views/admin/admin.py     | 34 +++++++++++++++++++
 twisted/twisted_site/views/admin/dashboard.py | 11 +++---
 5 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 twisted/twisted_site/views/admin/admin.py

diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html
index 49dcdc2..40fb472 100644
--- a/twisted/twisted_site/templates/cotton/base.html
+++ b/twisted/twisted_site/templates/cotton/base.html
@@ -13,9 +13,9 @@
     <div class="md:flex md:py-2 h-screen">
         <div class="md:h-full">
             <c-sidebar>
-                <c-sidebar.item icon="analytics" href="/stats" active>Statistics</c-sidebar.item>
-                <c-sidebar.item icon="profile" href="/">Users</c-sidebar.item>
-                <c-sidebar.item href="/">item 3</c-sidebar.item>
+                {% for link in sidebar_links %}
+                <c-sidebar.item icon="{{ link.icon }}" href="{{ link.href }}" active="{% if page == link.name %}True{% endif %}">{{ link.text }}</c-sidebar.item>
+                {% endfor %}
             </c-sidebar>
         </div>
         <div class="p-2 flex-1">
diff --git a/twisted/twisted_site/templates/cotton/sidebar/item.html b/twisted/twisted_site/templates/cotton/sidebar/item.html
index 0f3f16b..5f75106 100644
--- a/twisted/twisted_site/templates/cotton/sidebar/item.html
+++ b/twisted/twisted_site/templates/cotton/sidebar/item.html
@@ -1,7 +1,8 @@
 <a href="{{ href }}">
-    <div class="flex gap-2 rounded-xl w-full p-2 hover:text-white hover:bg-zinc-800 {% if active %} bg-red-950 text-[#e3818f] {% else %} text-gray-400 {% endif %}">
+    <div class="flex gap-2 rounded-xl w-full p-2 hover:text-white **:[.white-img]:hidden hover:**:[.white-img]:block hover:**:[.default-img]:hidden hover:bg-zinc-800 {% if active %} bg-red-950 text-[#e3818f] {% else %} text-gray-400 {% endif %}">
         <div class="size-6">
-            <img src="https://icons.hackclub.com/api/icons/{% if active %}0xe3818f{% else %}0x99A1AF{% endif %}/{{ icon }}" alt="">
+            <img class="default-img" src="https://icons.hackclub.com/api/icons/{% if active %}0xe3818f{% else %}0x99A1AF{% endif %}/{{ icon }}" alt="{{ icon }}">
+            <img class="white-img" src="https://icons.hackclub.com/api/icons/white/{{ icon }}" alt="{{ icon }}">
         </div>
         <div class="flex-1">
             {{ slot }}
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index e95850d..54bb771 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -26,5 +26,11 @@
     path("dashboard/frame/projects/<int:id>/journals/new/untracked/", client.NewProjectUntrackedJournal.as_view(), name="fr.projects.journals.new.untracked"),
     path("dashboard/frame/journals/delete/<int:id>/", client.DeleteJournal.as_view(), name="fr.projects.journals.delete"),
 
-    path("admin/", admin.DashboardView.as_view(), name="admin.dash")
+    path("admin/", admin.DashboardView.as_view(), name="admin.dash"),
+    path("admin/users/", admin.DashboardView.as_view(), name="admin.users"),
+    path("admin/pathways/", admin.DashboardView.as_view(), name="admin.pathways"),
+    path("admin/fulfillment/", admin.DashboardView.as_view(), name="admin.fulfillment"),
+    path("admin/shop/", admin.DashboardView.as_view(), name="admin.shop"),
+    path("admin/review/", admin.DashboardView.as_view(), name="admin.review"),
+    path("admin/announcements/", admin.DashboardView.as_view(), name="admin.announcements"),
 ]
diff --git a/twisted/twisted_site/views/admin/admin.py b/twisted/twisted_site/views/admin/admin.py
new file mode 100644
index 0000000..8c4bfb1
--- /dev/null
+++ b/twisted/twisted_site/views/admin/admin.py
@@ -0,0 +1,34 @@
+from django.views import View
+from django.shortcuts import render, redirect, resolve_url
+from dataclasses import dataclass
+
+@dataclass
+class SidebarLink:
+    name: str
+    icon: str
+    text: str
+    href: str
+
+# Create your views here.
+class AdminView(View):
+    def get_context_data(self, **kwargs) -> dict:
+        context = {}
+        context["sidebar_links"] = [
+            SidebarLink(name="statistics", icon="analytics", text="Statistics", href=resolve_url('admin.dash')),
+            SidebarLink(name="users", icon="profile", text="Users", href=resolve_url('admin.users')),
+            SidebarLink(name="pathways", icon="controls", text="Pathways", href=resolve_url('admin.pathways')),
+            SidebarLink(name="fulfillment", icon="list", text="Fulfillment", href=resolve_url('admin.fulfillment')),
+            SidebarLink(name="shop", icon="bag-add", text="Shop", href=resolve_url('admin.shop')),
+            SidebarLink(name="review", icon="reply", text="Review", href=resolve_url('admin.review')),
+            SidebarLink(name="announcements", icon="important", text="Announcements", href=resolve_url('admin.announcements')),
+        ]
+        context['profile'] = self.request.user.profile
+        return context
+    
+
+    def dispatch(self, request, *args, **kwargs):
+        if request.user.is_anonymous:
+            return redirect('homepage')
+        if not request.user.profile.is_staff:
+            return redirect('dashboard')
+        return super().dispatch(request, *args, **kwargs)
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
index e9bad78..d7952f0 100644
--- a/twisted/twisted_site/views/admin/dashboard.py
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -1,12 +1,11 @@
-from django.views import View
+from .admin import AdminView
 from django.shortcuts import render, redirect
 
 # Create your views here.
-class DashboardView(View):
+class DashboardView(AdminView):
     def get(self, request):
+        context = self.get_context_data()
+        context['page'] = 'statistics'
         if self.request.user.is_anonymous:
             return redirect('homepage')
-        profile = self.request.user.profile
-        return render(request, "admin/dashboard.html", {
-            "profile": profile
-        })
+        return render(request, "admin/dashboard.html", context=context)

From 226191270470d48bd20d5257cd0d1e9bdfdc943d Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 11 Aug 2026 17:24:23 +0530
Subject: [PATCH 034/118] Figured out why static wasnt being served properly.
 Had static in .gitignore.

---
 .gitignore                                   |   1 -
 twisted/twisted_site/static/favicon.png      | Bin 0 -> 800 bytes
 twisted/twisted_site/static/icons/delete.png | Bin 0 -> 144 bytes
 twisted/twisted_site/static/icons/edit.png   | Bin 0 -> 131 bytes
 4 files changed, 1 deletion(-)
 create mode 100644 twisted/twisted_site/static/favicon.png
 create mode 100644 twisted/twisted_site/static/icons/delete.png
 create mode 100644 twisted/twisted_site/static/icons/edit.png

diff --git a/.gitignore b/.gitignore
index c3c1864..98a633c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,3 @@ twisted/*.sqlite3
 
 .env
 twisted/.env
-static/
diff --git a/twisted/twisted_site/static/favicon.png b/twisted/twisted_site/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb96aa8c7962d6fea6cc5dee3021c611873e762b
GIT binary patch
literal 800
zcmV+*1K<3KP)<h;3K|Lk000e1NJLTq003A3003AB1^@s6ag{JM0008#Nkl<Zc%1E>
zO;W=!424@J_kb0w;Qr@e$Bvu8WD%w${*h!oTTb4$>P(w7m0zAE#Yvaf=l7r6q<npU
z{=I&C`B1-a{jL<b{Xg9Z6b2Z~U274Zr(I7pc4C1RF^Hw~<~FL2qhnERG}X7NRRa|a
zh5-h1ADIXD%u~_ij(@ocm^E{V04)N{!6H(bg9WSV(fKM0=D~wtfWh1&chhFDgPNs^
zvIwGQ3;eRaxLWz@NiBA21$$)~XQI@z;UouU8L7mXY(X=zJ)*V<TEmf2OlT2cvZeA$
z>y_HsGlSgmYtCXS7>r9LcZM8R+hmfen3bFXT0|h4EMoRNw)Va@B~9536%2+RY(%<d
z#N6ze4NHDsvl0ok2r!~a?reFkX1o3NRB$jj$tkdO5)T1B!z!NCB&BIgd0e&G_CbpP
z!vKRhScG-vor#(SSS%*D4=NZ80}RF`P0O7=qbw$60ku-t+D)t32o(&bm<MlI*Z20M
z$K-6e>xv2n!vKRR=E3AYme^3iVAxGlV5#g}0vxrZ*5tXUn<A;;43?BE#ng9tT9-a~
zG;{X*%?$)6IWV+{3|?odD8SL0IjQgWSo&na{Vt=cV)bi!Fqr8SoXZ?6{oWiNDH^XT
zcY+>#^Q+uail1(ErRKD^mcr6PMFK4XOw*$kN2AHlQH`A%R4^C@7>v4`HX6yPp2~w$
z`{?nzE}f?J=vB}nz=Tn7E%&TpX}DX_bnB>KFro)Eds3^utPL7XKUn&tt=#8W$pzw)
zS%g%9))wXCwxZRQngg*;Hmz%VQ^(Wu(ov36D;ODAX;Ypa3<etDb(E3iXrvN8$CMV~
zG5JV7U;3=;;=k6LNj&L2VYN<_p%rZTQI;#h`+~xA5P8uP#NPv&_itE6&*Ofyk-2J#
z*5ewg;1&zWZQm*oZ@LCJs!9=TzZLo~1k$cmY5NuHjgS!r6sq9JitRNJr^_Ou4Ql8=
eD)C}uSM3+TTE2oDAN?Ny0000<MNUMnLSTZjrg&Tc

literal 0
HcmV?d00001

diff --git a/twisted/twisted_site/static/icons/delete.png b/twisted/twisted_site/static/icons/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1c1a404d4d27162c665b5f77ca8646ab09e0942
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a)4a8DP<kcv55CpvN+P~c(lJ+b!x
z|IG7wnJX8i^;Q%(@Z=aZUA)3@V4rpR9(BPb(lbm~UbE|VQk!_<Ov<HMZq}!-v>rJ7
ss;N>|FY5me@vu4a9N!Pr<yK$jpR-k8pvH=`5NHL1r>mdKI;Vst02WC!zW@LL

literal 0
HcmV?d00001

diff --git a/twisted/twisted_site/static/icons/edit.png b/twisted/twisted_site/static/icons/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..875fd0eea5ba1176c308aec37528c2995f816354
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kFHaZ8kcv4|FF0~BC~&YG5c&T<
zg_oZ#>d7wk=9^rVjE14zGu>v)TyeN>fjHCk%|08>8yyT^cz9*QgJ6e^?XTw5Thy-H
e{WJ2#hIHmieIMEE^a^gEsSKX3elF{r5}E+cUoATT

literal 0
HcmV?d00001


From 8e65785281a605829953fcdcffbe784e21bc0483 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 11 Aug 2026 22:31:22 +0530
Subject: [PATCH 035/118] Work a LOT on the admin + add Docs link

---
 pyproject.toml                                |  2 +
 twisted/mysite/settings.py                    |  2 +-
 .../static_src/src/styles.css                 | 13 +++--
 twisted/twisted_site/models.py                |  2 +-
 .../templates/admin/announcements.html        |  5 ++
 .../templates/admin/dashboard.html            | 55 ++++++++++++++++++-
 .../templates/admin/fulfillment.html          |  5 ++
 .../templates/admin/pathways.html             |  5 ++
 .../twisted_site/templates/admin/review.html  |  5 ++
 .../twisted_site/templates/admin/shop.html    |  5 ++
 .../twisted_site/templates/admin/users.html   |  5 ++
 .../templates/client/dashboard.html           | 22 ++++++--
 .../templates/client/homepage.html            |  4 +-
 .../twisted_site/templates/cotton/base.html   |  1 +
 twisted/twisted_site/urls.py                  | 14 ++---
 twisted/twisted_site/views/admin/__init__.py  |  8 ++-
 twisted/twisted_site/views/admin/admin.py     |  2 +-
 .../twisted_site/views/admin/announcements.py | 11 ++++
 twisted/twisted_site/views/admin/dashboard.py | 17 +++++-
 .../twisted_site/views/admin/fulfillment.py   |  9 +++
 twisted/twisted_site/views/admin/pathways.py  |  9 +++
 twisted/twisted_site/views/admin/review.py    |  9 +++
 twisted/twisted_site/views/admin/shop.py      |  9 +++
 twisted/twisted_site/views/admin/users.py     |  9 +++
 uv.lock                                       | 16 ++++++
 25 files changed, 216 insertions(+), 28 deletions(-)
 create mode 100644 twisted/twisted_site/templates/admin/announcements.html
 create mode 100644 twisted/twisted_site/templates/admin/fulfillment.html
 create mode 100644 twisted/twisted_site/templates/admin/pathways.html
 create mode 100644 twisted/twisted_site/templates/admin/review.html
 create mode 100644 twisted/twisted_site/templates/admin/shop.html
 create mode 100644 twisted/twisted_site/templates/admin/users.html
 create mode 100644 twisted/twisted_site/views/admin/announcements.py
 create mode 100644 twisted/twisted_site/views/admin/fulfillment.py
 create mode 100644 twisted/twisted_site/views/admin/pathways.py
 create mode 100644 twisted/twisted_site/views/admin/review.py
 create mode 100644 twisted/twisted_site/views/admin/shop.py
 create mode 100644 twisted/twisted_site/views/admin/users.py

diff --git a/pyproject.toml b/pyproject.toml
index 8cd1a34..b3a002d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,4 +21,6 @@ dependencies = [
     "whitenoise>=6.12.0",
     "boto3>=1.43.66",
     "django-cotton-ui>=0.3.2",
+    "django-google-charts>=0.1.1",
+    "django-qsstats-magic>=1.1.0",
 ]
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index e06e8ff..aa631aa 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -63,7 +63,7 @@
     'django_cotton_ui',
     'tailwind',
     TAILWIND_APP_NAME,
-    
+    'googlecharts',
 ]
 
 if DEBUG:
diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index 54312f2..43e24f2 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -11,10 +11,12 @@
 */
 @source "../../../**/*.{html,py,js}";
 @source "../../../../.venv/lib/python3.13/site-packages/django_cotton_ui/templates/**/*.html";
+
+/* COTTON-STYLES start */
 :root {
     /* Accent: primary buttons, links, focus ring, active states */
-    --color-accent: #8442c9;
-    --color-accent-content: #7239ad;
+    --color-accent: var(--color-rose-500);
+    --color-accent-content: var(--color-rose-600);
     --color-accent-foreground: #ffffff;
 
     /* Corner radius, by role */
@@ -31,10 +33,11 @@
 
 .dark {
     /* Dark mode: lighter accent so it stays vivid on dark surfaces */
-    --color-accent: #9359cf;
-    --color-accent-content: #a677d8;
-    --color-accent-foreground: #ffffff;
+    --color-accent: var(--color-rose-400);
+    --color-accent-content: var(--color-rose-300);
+    --color-accent-foreground: var(--color-rose-950);
 }
+/* COTTON-STYLES end */
 
 /* latin-ext */
 @font-face {
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 05c8ca1..235f359 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -139,7 +139,7 @@ class ProjectShip(models.Model):
     t2_updated_at = models.DateTimeField(default=None, null=True)
     
     t1_message = models.TextField(blank=True, default="")
-    t2_message =models.TextField(blank=True, default="")
+    t2_message = models.TextField(blank=True, default="")
     
     status = models.CharField(max_length=200, choices=PROJECT_SHIP_STATUSES, default='created')
     
diff --git a/twisted/twisted_site/templates/admin/announcements.html b/twisted/twisted_site/templates/admin/announcements.html
new file mode 100644
index 0000000..b8ebd1b
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/announcements.html
@@ -0,0 +1,5 @@
+<c-base>
+    <c-ui.button variant="primary">Primary Button</c-ui.button>
+<c-ui.button variant="default">Default Button</c-ui.button>
+
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/dashboard.html b/twisted/twisted_site/templates/admin/dashboard.html
index b8ebd1b..3ae37ba 100644
--- a/twisted/twisted_site/templates/admin/dashboard.html
+++ b/twisted/twisted_site/templates/admin/dashboard.html
@@ -1,5 +1,56 @@
+{% load googlecharts %}
 <c-base>
-    <c-ui.button variant="primary">Primary Button</c-ui.button>
-<c-ui.button variant="default">Default Button</c-ui.button>
+    <c-slot name="head">
+        <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+    </c-slot>
+    <c-ui.card class="bg-zinc-900 mb-4">
+        <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_username }}!</h3>
+        <p class="text-ink-400">
+            <c-ui.button onclick="alert('weh, you are looking at them right now >:(')">See statistics</c-ui.button>
+            <c-ui.button>Manage Users</c-ui.button>
+            <c-ui.button>Edit Pathways</c-ui.button>
+            <c-ui.button>Fulfill orders</c-ui.button>
+            <c-ui.button>Edit shop</c-ui.button>
+            <c-ui.button>Review projects</c-ui.button>
+            <c-ui.button>Announce stuff</c-ui.button>
+        </p>
+    </c-ui.card>
+    <c-ui.tabs variant="segmented">
+        <c-ui.tabs.tab name="Logged">
+            <c-ui.card class="bg-zinc-900">
+                <div class="flex flex-col md:flex-row text-center md:text-left gap-4">
+                    <div class="md:w-fit">
+                        <div class="text-center">
+                            Hours logged
+                        </div>
+                        <div class="text-center text-lg font-bold">
+                            {{ hours_logged }}h
+                        </div>
+                        <div id="hours_logged_chart" class="h-40 mx-auto md:mx-0 w-60">
+                            Loading...
+                        </div>
+                    </div>
+                    <script type="text/javascript">
+                        google.charts.load('current', {'packages':['corechart']});
+                        google.charts.setOnLoadCallback(drawChart);
 
+                        function drawChart() {
+                            var data = google.visualization.arrayToDataTable({{ hours_logged_chart|safe }});
+
+                            var options = {
+                                vAxis: {minValue: 0}
+                            };
+
+                            var chart = new google.visualization.AreaChart(document.getElementById('hours_logged_chart'));
+                            chart.draw(data, options);
+                        }
+                    </script>
+
+                </div>
+            </c-ui.card>
+        </c-ui.tabs.tab>
+        <c-ui.tabs.tab name="Shipped">
+            <!-- Content -->
+        </c-ui.tabs.tab>
+    </c-ui.tabs>
 </c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/fulfillment.html b/twisted/twisted_site/templates/admin/fulfillment.html
new file mode 100644
index 0000000..b8ebd1b
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/fulfillment.html
@@ -0,0 +1,5 @@
+<c-base>
+    <c-ui.button variant="primary">Primary Button</c-ui.button>
+<c-ui.button variant="default">Default Button</c-ui.button>
+
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/pathways.html b/twisted/twisted_site/templates/admin/pathways.html
new file mode 100644
index 0000000..b8ebd1b
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/pathways.html
@@ -0,0 +1,5 @@
+<c-base>
+    <c-ui.button variant="primary">Primary Button</c-ui.button>
+<c-ui.button variant="default">Default Button</c-ui.button>
+
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/review.html b/twisted/twisted_site/templates/admin/review.html
new file mode 100644
index 0000000..b8ebd1b
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/review.html
@@ -0,0 +1,5 @@
+<c-base>
+    <c-ui.button variant="primary">Primary Button</c-ui.button>
+<c-ui.button variant="default">Default Button</c-ui.button>
+
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/shop.html b/twisted/twisted_site/templates/admin/shop.html
new file mode 100644
index 0000000..b8ebd1b
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/shop.html
@@ -0,0 +1,5 @@
+<c-base>
+    <c-ui.button variant="primary">Primary Button</c-ui.button>
+<c-ui.button variant="default">Default Button</c-ui.button>
+
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/users.html b/twisted/twisted_site/templates/admin/users.html
new file mode 100644
index 0000000..b8ebd1b
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/users.html
@@ -0,0 +1,5 @@
+<c-base>
+    <c-ui.button variant="primary">Primary Button</c-ui.button>
+<c-ui.button variant="default">Default Button</c-ui.button>
+
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 3998694..c6f5af7 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -1,10 +1,22 @@
 {% extends "client/osbase.html" %} {% load static %} {% block body %}
 <div class="h-full text-absolute-white">
-    <div class="p-4 flex items-center gap-3">
-        <button onclick="newWindow('Projects', '{% url 'fr.projects' %}')"
-            class="bg-twisted-400 text-absolute-white font-bold px-4 py-2 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-            Projects
-        </button>
+    <div class="p-4 flex flex-col gap-3">
+        <div>
+            <button onclick="newWindow('Projects', '{% url 'fr.projects' %}')"
+                class="bg-twisted-400 text-absolute-white font-bold px-4 py-2 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                Projects
+            </button>
+        </div>
+        {% if user.profile.is_staff %}
+        <div>
+            <a href="{% url 'admin.dash' %}" target="_blank">
+                <button
+                    class="bg-twisted-400 text-absolute-white font-bold px-4 py-2 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                    Admin
+                </button>
+            </a>
+        </div>
+    {% endif %}
     </div>
 
     <div id="windows-container"></div>
diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index e9221cb..58f8513 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -21,8 +21,8 @@
         A unique YSWS where you make cool projects and complete a twisted roadmap full of challenges to get a PC!
       </p>
       <nav class="flex flex-wrap justify-center gap-4 mb-6 text-twisted-200 underline">
-        <a href="https://hackclub.enterprise.slack.com/archives/C0A8G9BSCSG">slack</a>
-        <a href="{% url 'faqs' %}">FAQs</a>
+        <a href="https://hackclub.enterprise.slack.com/archives/C0A8G9BSCSG">Slack</a>
+        <a href="https://docs.twisted.hackclub.com">Docs</a>
       </nav>
       <div id="rsvp">
         {% if login_enabled %}
diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html
index 40fb472..5a15837 100644
--- a/twisted/twisted_site/templates/cotton/base.html
+++ b/twisted/twisted_site/templates/cotton/base.html
@@ -8,6 +8,7 @@
     {% tailwind_css %}
     <title>Admin - Twisted</title>
     <link rel="icon" href="{% static 'favicon.png' %}" />
+    {{ head }}
 </head>
 <body class="dark bg-[#09090B] text-white font-latin">
     <div class="md:flex md:py-2 h-screen">
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index 54bb771..3e7c6b0 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -1,8 +1,8 @@
 from .views.client.auth import LoginView, AuthCallbackView, HackatimeCallbackView, LogoutView
 from django.urls import path
 from .views import client
-from .views.misc import upload_file
 from .views import admin
+from .views.misc import upload_file
 
 urlpatterns = [
     path('', view=client.HomepageView.as_view(), name="homepage"),
@@ -27,10 +27,10 @@
     path("dashboard/frame/journals/delete/<int:id>/", client.DeleteJournal.as_view(), name="fr.projects.journals.delete"),
 
     path("admin/", admin.DashboardView.as_view(), name="admin.dash"),
-    path("admin/users/", admin.DashboardView.as_view(), name="admin.users"),
-    path("admin/pathways/", admin.DashboardView.as_view(), name="admin.pathways"),
-    path("admin/fulfillment/", admin.DashboardView.as_view(), name="admin.fulfillment"),
-    path("admin/shop/", admin.DashboardView.as_view(), name="admin.shop"),
-    path("admin/review/", admin.DashboardView.as_view(), name="admin.review"),
-    path("admin/announcements/", admin.DashboardView.as_view(), name="admin.announcements"),
+    path("admin/users/", admin.UsersView.as_view(), name="admin.users"),
+    path("admin/pathways/", admin.PathwaysView.as_view(), name="admin.pathways"),
+    path("admin/fulfillment/", admin.FulfillmentView.as_view(), name="admin.fulfillment"),
+    path("admin/shop/", admin.ShopView.as_view(), name="admin.shop"),
+    path("admin/review/", admin.ReviewView.as_view(), name="admin.review"),
+    path("admin/announcements/", admin.AnnouncementsView.as_view(), name="admin.announcements"),
 ]
diff --git a/twisted/twisted_site/views/admin/__init__.py b/twisted/twisted_site/views/admin/__init__.py
index 43d6bbd..4b03aff 100644
--- a/twisted/twisted_site/views/admin/__init__.py
+++ b/twisted/twisted_site/views/admin/__init__.py
@@ -1 +1,7 @@
-from .dashboard import DashboardView
\ No newline at end of file
+from .dashboard import DashboardView
+from .users import UsersView
+from .pathways import PathwaysView
+from .fulfillment import FulfillmentView
+from .shop import ShopView
+from .review import ReviewView
+from .announcements import AnnouncementsView
diff --git a/twisted/twisted_site/views/admin/admin.py b/twisted/twisted_site/views/admin/admin.py
index 8c4bfb1..ac16e93 100644
--- a/twisted/twisted_site/views/admin/admin.py
+++ b/twisted/twisted_site/views/admin/admin.py
@@ -14,7 +14,7 @@ class AdminView(View):
     def get_context_data(self, **kwargs) -> dict:
         context = {}
         context["sidebar_links"] = [
-            SidebarLink(name="statistics", icon="analytics", text="Statistics", href=resolve_url('admin.dash')),
+            SidebarLink(name="dashboard", icon="analytics", text="Dashboard", href=resolve_url('admin.dash')),
             SidebarLink(name="users", icon="profile", text="Users", href=resolve_url('admin.users')),
             SidebarLink(name="pathways", icon="controls", text="Pathways", href=resolve_url('admin.pathways')),
             SidebarLink(name="fulfillment", icon="list", text="Fulfillment", href=resolve_url('admin.fulfillment')),
diff --git a/twisted/twisted_site/views/admin/announcements.py b/twisted/twisted_site/views/admin/announcements.py
new file mode 100644
index 0000000..8f03b4c
--- /dev/null
+++ b/twisted/twisted_site/views/admin/announcements.py
@@ -0,0 +1,11 @@
+from .admin import AdminView
+from django.shortcuts import render, redirect
+
+# Create your views here.
+class AnnouncementsView(AdminView):
+    def get(self, request):
+        context = self.get_context_data()
+        context['page'] = 'announcements'
+        if self.request.user.is_anonymous:
+            return redirect('homepage')
+        return render(request, "admin/announcements.html", context=context)
diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
index d7952f0..9b18a66 100644
--- a/twisted/twisted_site/views/admin/dashboard.py
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -1,11 +1,22 @@
 from .admin import AdminView
 from django.shortcuts import render, redirect
-
+from ...models import Journal, Project, ProjectShip
+import json
 # Create your views here.
 class DashboardView(AdminView):
     def get(self, request):
         context = self.get_context_data()
-        context['page'] = 'statistics'
+        context['page'] = 'dashboard'
         if self.request.user.is_anonymous:
             return redirect('homepage')
-        return render(request, "admin/dashboard.html", context=context)
+        hours_logged = 0
+        hours_logged_chart = {}
+        for journal in Journal.objects.all():
+            hours = journal.reduced_minutes / 60
+            hours_logged += hours
+            date = journal.created_at.date().strftime("%a, %-d %b")
+            hours_logged_chart[date] = hours_logged_chart.get(date, 0) + hours
+        context['hours_logged_chart'] = json.dumps([['Date', 'Hours']] + list(hours_logged_chart.items()))
+        
+        context['hours_logged'] = round(hours_logged, 2)
+        return render(request, "admin/dashboard.html", context=context)
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/fulfillment.py b/twisted/twisted_site/views/admin/fulfillment.py
new file mode 100644
index 0000000..00397da
--- /dev/null
+++ b/twisted/twisted_site/views/admin/fulfillment.py
@@ -0,0 +1,9 @@
+from .admin import AdminView
+from django.shortcuts import render, redirect
+
+# Create your views here.
+class FulfillmentView(AdminView):
+    def get(self, request):
+        context = self.get_context_data()
+        context['page'] = 'fulfillment'
+        return render(request, "admin/fulfillment.html", context=context)
diff --git a/twisted/twisted_site/views/admin/pathways.py b/twisted/twisted_site/views/admin/pathways.py
new file mode 100644
index 0000000..19c58a3
--- /dev/null
+++ b/twisted/twisted_site/views/admin/pathways.py
@@ -0,0 +1,9 @@
+from .admin import AdminView
+from django.shortcuts import render, redirect
+
+# Create your views here.
+class PathwaysView(AdminView):
+    def get(self, request):
+        context = self.get_context_data()
+        context['page'] = 'pathways'
+        return render(request, "admin/pathways.html", context=context)
diff --git a/twisted/twisted_site/views/admin/review.py b/twisted/twisted_site/views/admin/review.py
new file mode 100644
index 0000000..f2978a9
--- /dev/null
+++ b/twisted/twisted_site/views/admin/review.py
@@ -0,0 +1,9 @@
+from .admin import AdminView
+from django.shortcuts import render, redirect
+
+# Create your views here.
+class ReviewView(AdminView):
+    def get(self, request):
+        context = self.get_context_data()
+        context['page'] = 'review'
+        return render(request, "admin/review.html", context=context)
diff --git a/twisted/twisted_site/views/admin/shop.py b/twisted/twisted_site/views/admin/shop.py
new file mode 100644
index 0000000..549e26d
--- /dev/null
+++ b/twisted/twisted_site/views/admin/shop.py
@@ -0,0 +1,9 @@
+from .admin import AdminView
+from django.shortcuts import render, redirect
+
+# Create your views here.
+class ShopView(AdminView):
+    def get(self, request):
+        context = self.get_context_data()
+        context['page'] = 'shop'
+        return render(request, "admin/shop.html", context=context)
diff --git a/twisted/twisted_site/views/admin/users.py b/twisted/twisted_site/views/admin/users.py
new file mode 100644
index 0000000..d2f0d5b
--- /dev/null
+++ b/twisted/twisted_site/views/admin/users.py
@@ -0,0 +1,9 @@
+from .admin import AdminView
+from django.shortcuts import render, redirect
+
+# Create your views here.
+class UsersView(AdminView):
+    def get(self, request):
+        context = self.get_context_data()
+        context['page'] = 'users'
+        return render(request, "admin/users.html", context=context)
diff --git a/uv.lock b/uv.lock
index c42c248..810a486 100644
--- a/uv.lock
+++ b/uv.lock
@@ -457,6 +457,12 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d2/61/1de040c48796f16afdaae9ab4fd5c6683b819c02a06f77563dcfb0e9fdb6/django_cotton_ui-0.3.2-py3-none-any.whl", hash = "sha256:0a05d6f733553929389071786a9524335782c7f9d3e1ca8fe4234cdf80488bf2", size = 214320, upload-time = "2026-07-07T12:57:23.837Z" },
 ]
 
+[[package]]
+name = "django-google-charts"
+version = "0.1.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/39/90/636b444eedc136912d93386c8c90a92e9a02ad4f9f75743a6d3f06bd23d0/django-google-charts-0.1.1.tar.gz", hash = "sha256:4c956bced0e10fc4fce980edc03fc1d0c071020cc0755b4a2ebd3854a776f1f8", size = 3297, upload-time = "2011-11-16T11:27:16.063Z" }
+
 [[package]]
 name = "django-jazzmin"
 version = "3.0.5"
@@ -469,6 +475,12 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/23/40/892f4c922c92d0d2b8ca5f96f556c5dc04d19ea2ea717910d8bbf2dc23fc/django_jazzmin-3.0.5-py3-none-any.whl", hash = "sha256:578fb1fc0a1b7e3b8472d2692ace60b1584ccd937c3828e2c9a89bdf94067f94", size = 2581722, upload-time = "2026-06-25T21:05:50.948Z" },
 ]
 
+[[package]]
+name = "django-qsstats-magic"
+version = "1.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/b1/ba/4578950dd3033f23a334634ea52329a1b1287c87b9f02943181a546bb2ea/django-qsstats-magic-1.1.0.tar.gz", hash = "sha256:73268ab20805c9f2e92b8cf54c36adfe03661d90eb5d58da69a5cb4d932c2757", size = 8596, upload-time = "2019-07-23T12:39:14.561Z" }
+
 [[package]]
 name = "django-tailwind"
 version = "4.5.0"
@@ -1113,7 +1125,9 @@ dependencies = [
     { name = "django" },
     { name = "django-cotton" },
     { name = "django-cotton-ui" },
+    { name = "django-google-charts" },
     { name = "django-jazzmin" },
+    { name = "django-qsstats-magic" },
     { name = "django-tailwind", extra = ["cookiecutter", "honcho", "reload"] },
     { name = "gunicorn" },
     { name = "psycopg", extra = ["binary"] },
@@ -1133,7 +1147,9 @@ requires-dist = [
     { name = "django", specifier = ">=6.0.7" },
     { name = "django-cotton", specifier = ">=2.7.2" },
     { name = "django-cotton-ui", specifier = ">=0.3.2" },
+    { name = "django-google-charts", specifier = ">=0.1.1" },
     { name = "django-jazzmin", specifier = ">=3.0.5" },
+    { name = "django-qsstats-magic", specifier = ">=1.1.0" },
     { name = "django-tailwind", extras = ["cookiecutter", "honcho", "reload"], specifier = ">=4.5.0" },
     { name = "gunicorn", specifier = ">=26.0.0" },
     { name = "psycopg", extras = ["binary"], specifier = ">=3.3.4" },

From 9c8ae08d580742cee9d8ee6aa0b6a220f762fd0b Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 11 Aug 2026 22:31:49 +0530
Subject: [PATCH 036/118] ehh should keep faq link too

---
 twisted/twisted_site/templates/client/homepage.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index 58f8513..0d19b42 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -22,6 +22,7 @@
       </p>
       <nav class="flex flex-wrap justify-center gap-4 mb-6 text-twisted-200 underline">
         <a href="https://hackclub.enterprise.slack.com/archives/C0A8G9BSCSG">Slack</a>
+        <a href="{% url 'faqs' %}">FAQs</a>
         <a href="https://docs.twisted.hackclub.com">Docs</a>
       </nav>
       <div id="rsvp">

From 70321af1822c5a0b0217a8994ac5b6a708518d0b Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Wed, 12 Aug 2026 21:51:09 +0530
Subject: [PATCH 037/118] Add funny lines and circles thing

---
 .../templates/admin/dashboard.html            | 55 +++++++++++++++++--
 twisted/twisted_site/views/admin/dashboard.py | 13 ++++-
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/twisted/twisted_site/templates/admin/dashboard.html b/twisted/twisted_site/templates/admin/dashboard.html
index 3ae37ba..86bbfeb 100644
--- a/twisted/twisted_site/templates/admin/dashboard.html
+++ b/twisted/twisted_site/templates/admin/dashboard.html
@@ -26,8 +26,10 @@ <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_usern
                         <div class="text-center text-lg font-bold">
                             {{ hours_logged }}h
                         </div>
-                        <div id="hours_logged_chart" class="h-40 mx-auto md:mx-0 w-60">
-                            Loading...
+                        <div id="hours_logged_chart" class="mx-auto md:mx-0">
+                            <div class="text-center py-4">
+                                Loading chart...
+                            </div>
                         </div>
                     </div>
                     <script type="text/javascript">
@@ -38,19 +40,62 @@ <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_usern
                             var data = google.visualization.arrayToDataTable({{ hours_logged_chart|safe }});
 
                             var options = {
-                                vAxis: {minValue: 0}
+                                vAxis: {minValue: 0},
+                                animation: {duration: 250, startup: true},
+                                backgroundColor: {fill: 'transparent'},
+                                theme: "maximized",
+                                width: 240,
+                                height: 160
                             };
 
                             var chart = new google.visualization.AreaChart(document.getElementById('hours_logged_chart'));
                             chart.draw(data, options);
                         }
                     </script>
-
                 </div>
             </c-ui.card>
         </c-ui.tabs.tab>
         <c-ui.tabs.tab name="Shipped">
-            <!-- Content -->
+            <c-ui.card class="bg-zinc-900">
+                <div class="flex flex-col md:flex-row text-center md:text-left gap-4">
+                    <div class="md:w-fit">
+                        <div class="text-center">
+                            Hours shipped
+                        </div>
+                        <div class="text-center text-lg font-bold">
+                            {{ hours_shipped }}h
+                        </div>
+                        <div id="hours_shipped_chart" class="mx-auto md:mx-0">
+                            <div class="text-center py-4">
+                                Loading chart...
+                            </div>
+                        </div>
+                    </div>
+                    <script type="text/javascript">
+                        google.charts.load('current', {'packages':['corechart']});
+                        google.charts.setOnLoadCallback(drawChart);
+
+                        function drawChart() {
+                            var data = google.visualization.arrayToDataTable({{ hours_shipped_chart|safe }});
+
+                            var options = {
+                                vAxis: {minValue: 0},
+                                animation: {duration: 250, startup: true},
+                                backgroundColor: {fill: 'transparent'},
+                                theme: "maximized",
+                                width: 240,
+                                height: 160
+                            };
+
+                            var chart = new google.visualization.AreaChart(document.getElementById('hours_shipped_chart'));
+                            chart.draw(data, options);
+                        }
+                    </script>
+                </div>
+            </c-ui.card>
+        </c-ui.tabs.tab>
+        <c-ui.tabs.tab name="Reviewed">
+            This is still WIP! (annoy @kavyansh. to fix if you see this after the YSWS has started!)
         </c-ui.tabs.tab>
     </c-ui.tabs>
 </c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
index 9b18a66..a0b978e 100644
--- a/twisted/twisted_site/views/admin/dashboard.py
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -11,12 +11,21 @@ def get(self, request):
             return redirect('homepage')
         hours_logged = 0
         hours_logged_chart = {}
-        for journal in Journal.objects.all():
+        hours_shipped = 0
+        hours_shipped_chart = {}
+        for journal in Journal.objects.all().prefetch_related('project'):
             hours = journal.reduced_minutes / 60
             hours_logged += hours
             date = journal.created_at.date().strftime("%a, %-d %b")
             hours_logged_chart[date] = hours_logged_chart.get(date, 0) + hours
-        context['hours_logged_chart'] = json.dumps([['Date', 'Hours']] + list(hours_logged_chart.items()))
+            if journal.project.is_shipped():
+                hours_shipped += hours
+                hours_shipped_chart[date] = hours_shipped_chart.get(date, 0) + hours
         
         context['hours_logged'] = round(hours_logged, 2)
+        context['hours_logged_chart'] = json.dumps([['Date', 'Hours']] + list(hours_logged_chart.items()))
+        
+        context['hours_shipped'] = round(hours_shipped, 2)
+        context['hours_shipped_chart'] = json.dumps([['Date', 'Hours']] + list(hours_shipped_chart.items()))
+        
         return render(request, "admin/dashboard.html", context=context)
\ No newline at end of file

From 7b62c754c1abacd3d3c4aedc1caad222112a4587 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 13 Aug 2026 17:45:22 +0530
Subject: [PATCH 038/118] Some more admin dash changes

---
 .../templates/admin/dashboard.html            | 92 +++++++++++++++++--
 twisted/twisted_site/views/admin/dashboard.py |  9 +-
 twisted/twisted_site/views/client/journal.py  |  6 +-
 3 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/twisted/twisted_site/templates/admin/dashboard.html b/twisted/twisted_site/templates/admin/dashboard.html
index 86bbfeb..d944dc7 100644
--- a/twisted/twisted_site/templates/admin/dashboard.html
+++ b/twisted/twisted_site/templates/admin/dashboard.html
@@ -17,16 +17,92 @@ <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_usern
     </c-ui.card>
     <c-ui.tabs variant="segmented">
         <c-ui.tabs.tab name="Logged">
+            <c-ui.card class="bg-zinc-900">
+                <div class="flex flex-col md:flex-row text-center md:text-left gap-4">
+                    <div class="md:w-fit">
+                        <div>
+                            <div class="text-center">
+                                Hours logged
+                            </div>
+                            <div class="text-center text-lg font-bold">
+                                {{ hours_logged }}h
+                            </div>
+                            <div id="hours_logged_chart" class="mx-auto md:mx-0">
+                                <div class="text-center py-4">
+                                    Loading chart...
+                                </div>
+                            </div>
+                        </div>
+                        <script type="text/javascript">
+                            google.charts.load('current', {'packages':['corechart']});
+                            google.charts.setOnLoadCallback(drawChart);
+
+                            function drawChart() {
+                                var data = google.visualization.arrayToDataTable({{ hours_logged_chart|safe }});
+
+                                var options = {
+                                    vAxis: {minValue: 0},
+                                    animation: {duration: 250, startup: true},
+                                    backgroundColor: {fill: 'transparent'},
+                                    theme: "maximized",
+                                    width: 240,
+                                    height: 160
+                                };
+
+                                var chart = new google.visualization.AreaChart(document.getElementById('hours_logged_chart'));
+                                chart.draw(data, options);
+                            }
+                        </script>
+                    </div>
+                    <div class="md:w-fit">
+                        <div>
+                            <div class="text-center">
+                                Project type
+                            </div>
+                            <div class="text-center text-lg font-bold">
+                                {{ hours_logged }}h
+                            </div>
+                            <div id="logged_project_type" class="mx-auto md:mx-0">
+                                <div class="text-center py-4">
+                                    Loading chart...
+                                </div>
+                            </div>
+                        </div>
+                        <script type="text/javascript">
+                            google.charts.load('current', {'packages':['corechart']});
+                            google.charts.setOnLoadCallback(drawChart);
+
+                            function drawChart() {
+                                var data = google.visualization.arrayToDataTable({{ logged_project_type|safe }});
+
+                                var options = {
+                                    vAxis: {minValue: 0},
+                                    animation: {duration: 250, startup: true},
+                                    backgroundColor: {fill: 'transparent'},
+                                    theme: "maximized",
+                                    width: 240,
+                                    height: 160
+                                };
+
+                                var chart = new google.visualization.PieChart(document.getElementById('logged_project_type'));
+                                chart.draw(data, options);
+                            }
+                        </script>
+                    </div>
+                </div>
+            </c-ui.card>
+        </c-ui.tabs.tab>
+        <c-ui.tabs.tab name="Shipped">
             <c-ui.card class="bg-zinc-900">
                 <div class="flex flex-col md:flex-row text-center md:text-left gap-4">
                     <div class="md:w-fit">
                         <div class="text-center">
-                            Hours logged
+                            Hours shipped
                         </div>
                         <div class="text-center text-lg font-bold">
-                            {{ hours_logged }}h
+                            {{ hours_shipped }}h
                         </div>
-                        <div id="hours_logged_chart" class="mx-auto md:mx-0">
+                        <div id="hours_shipped_chart" class="mx-auto md:mx-0">
                             <div class="text-center py-4">
                                 Loading chart...
                             </div>
@@ -37,7 +113,7 @@ <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_usern
                         google.charts.setOnLoadCallback(drawChart);
 
                         function drawChart() {
-                            var data = google.visualization.arrayToDataTable({{ hours_logged_chart|safe }});
+                            var data = google.visualization.arrayToDataTable({{ hours_shipped_chart|safe }});
 
                             var options = {
                                 vAxis: {minValue: 0},
@@ -48,15 +124,11 @@ <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_usern
                                 height: 160
                             };
 
-                            var chart = new google.visualization.AreaChart(document.getElementById('hours_logged_chart'));
+                            var chart = new google.visualization.AreaChart(document.getElementById('hours_shipped_chart'));
                             chart.draw(data, options);
                         }
                     </script>
                 </div>
-            </c-ui.card>
-        </c-ui.tabs.tab>
-        <c-ui.tabs.tab name="Shipped">
-            <c-ui.card class="bg-zinc-900">
                 <div class="flex flex-col md:flex-row text-center md:text-left gap-4">
                     <div class="md:w-fit">
                         <div class="text-center">
@@ -65,7 +137,7 @@ <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_usern
                         <div class="text-center text-lg font-bold">
                             {{ hours_shipped }}h
                         </div>
-                        <div id="hours_shipped_chart" class="mx-auto md:mx-0">
+                        <div id="hours_shipped_chart2" class="mx-auto md:mx-0">
                             <div class="text-center py-4">
                                 Loading chart...
                             </div>
diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
index a0b978e..f3fdd70 100644
--- a/twisted/twisted_site/views/admin/dashboard.py
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -11,21 +11,28 @@ def get(self, request):
             return redirect('homepage')
         hours_logged = 0
         hours_logged_chart = {}
+        logged_project_type = {"Software": 0, "Hardware": 0}
         hours_shipped = 0
         hours_shipped_chart = {}
         for journal in Journal.objects.all().prefetch_related('project'):
             hours = journal.reduced_minutes / 60
             hours_logged += hours
+            
             date = journal.created_at.date().strftime("%a, %-d %b")
             hours_logged_chart[date] = hours_logged_chart.get(date, 0) + hours
+            
+            logged_project_type[journal.project.get_project_type_display()] += hours
+            
             if journal.project.is_shipped():
                 hours_shipped += hours
                 hours_shipped_chart[date] = hours_shipped_chart.get(date, 0) + hours
-        
+
         context['hours_logged'] = round(hours_logged, 2)
         context['hours_logged_chart'] = json.dumps([['Date', 'Hours']] + list(hours_logged_chart.items()))
+        context['logged_project_type'] = json.dumps([['Type', 'Hours']] + list(logged_project_type.items()))
         
         context['hours_shipped'] = round(hours_shipped, 2)
         context['hours_shipped_chart'] = json.dumps([['Date', 'Hours']] + list(hours_shipped_chart.items()))
         
+        
         return render(request, "admin/dashboard.html", context=context)
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/journal.py b/twisted/twisted_site/views/client/journal.py
index 78bff6d..336f449 100644
--- a/twisted/twisted_site/views/client/journal.py
+++ b/twisted/twisted_site/views/client/journal.py
@@ -64,12 +64,12 @@ def post(self, request, id):
                 info=f"please add atleast {required_image_count - image_count} more image(s) to log this journal!",
                 context={"content": content},
             )
-        
-        if content_length < min(100, reduced_minutes):
+        required_content_length = reduced_minutes // 3
+        if content_length < min(100, required_content_length):
             return self.get(
                 request,
                 id,
-                info=f"Content length must be more than 60 characters per hour!<br>({len(content)} of {reduced_minutes} required)",
+                info=f"Content length must be more than 20 characters per hour!<br>({content_length} of {required_content_length} required)",
                 context={"content": content},
             )
 

From 4b61414f32c78eb327fc6c67483ef4770043c68c Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 13 Aug 2026 17:51:05 +0530
Subject: [PATCH 039/118] Fix a few bugs

---
 twisted/twisted_site/templates/client/osbase.html | 1 +
 twisted/twisted_site/views/client/projects.py     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index d57d5fb..aafb80b 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -1,4 +1,5 @@
 {% load static tailwind_tags static %}
+<!DOCTYPE html>
 <html style="font-size: 12px; background: #1E072F;">
     <head>
         {% tailwind_css %}
diff --git a/twisted/twisted_site/views/client/projects.py b/twisted/twisted_site/views/client/projects.py
index ee385e5..9959cdd 100644
--- a/twisted/twisted_site/views/client/projects.py
+++ b/twisted/twisted_site/views/client/projects.py
@@ -1,7 +1,7 @@
-from django.http import JsonResponse
+from django.http import JsonResponse, HttpResponse
 from django.views import View
 from django.shortcuts import render, redirect
-from ...models import Project
+from ...models import Project, PROJECT_TYPE_CHOICES
 
 
 # Create your views here.
@@ -40,6 +40,9 @@ def post(self, request):
         project_description = request.POST["description"]
         project_type = request.POST["type"]
 
+        if project_type not in PROJECT_TYPE_CHOICES:
+            return HttpResponse("naughty! you arent supposed to do this!")
+
         Project.objects.create(
             user=request.user,
             project_name=project_name,

From b713af0d0060a86a9696bf5ea5c18a2943ecfc5d Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 13 Aug 2026 18:53:17 +0530
Subject: [PATCH 040/118] fix an xss

---
 twisted/twisted_site/templates/client/osbase.html     | 11 ++++++++++-
 .../twisted_site/templates/client/projects/list.html  |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index aafb80b..2b01acb 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -10,7 +10,16 @@
         <title>Twisted</title>
         {% block css %} {% endblock css %}
         {% block js %}{% endblock js %}
-
+        <script>
+            function createWindow(title, src) {
+                window.parent.postMessage({
+                    'type': 'internal',
+                    'action': 'open',
+                    'title': title,
+                    'src': src
+                }, '*')
+            }
+        </script>
         <script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
         <script src="
         https://cdn.jsdelivr.net/npm/dompurify@3.4.12/dist/purify.min.js
diff --git a/twisted/twisted_site/templates/client/projects/list.html b/twisted/twisted_site/templates/client/projects/list.html
index 70ec802..f6debf0 100644
--- a/twisted/twisted_site/templates/client/projects/list.html
+++ b/twisted/twisted_site/templates/client/projects/list.html
@@ -10,7 +10,8 @@
     >
     <div class="flex gap-4 w-full flex-wrap">
         {% for project in projects %}
-        <div class="w-16 cursor-pointer" onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': '{{ project.project_name }}', 'src': '{% url 'fr.projects.detail' project.id %}'}, '*')">
+        <input type="hidden" value="{{ project.project_name }}" id="project-{{ project.id }}">
+        <div class="w-16 cursor-pointer" onclick="createWindow(document.getElementById('project-{{ project.id }}').value, '{% url 'fr.projects.detail' project.id %}')">
             <img src="{% static 'images/directory.png' %}" class="w-full">
             <div class="w-full text-center text-wrap wrap-anywhere" style="text-align: center;">
                 {{ project.project_name }}

From c41544e03f0417968095820e43a82ad062be76df Mon Sep 17 00:00:00 2001
From: coolton-agent <coolton-agent@users.noreply.github.com>
Date: Thu, 13 Aug 2026 13:40:40 +0000
Subject: [PATCH 041/118] fix: prevent project names reaching unsafe javascript

---
 twisted/twisted_site/templates/client/dashboard.html      | 8 +++++++-
 .../twisted_site/templates/client/projects/detail.html    | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index c6f5af7..8d437e5 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -159,7 +159,13 @@
         const taskBtn = document.createElement('button');
         taskBtn.dataset.winId = id;
         taskBtn.className = "flex items-center gap-1 !bg-twisted-600 !text-absolute-white text-sm !px-2 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black max-w-40";
-        taskBtn.innerHTML = '<img src="{% static "images/round-square.jpg" %}" class="w-4 h-4 object-cover shrink-0"><span class="truncate">' + title + '</span>';
+        const taskIcon = document.createElement('img');
+        taskIcon.src = '{% static "images/round-square.jpg" %}';
+        taskIcon.className = 'w-4 h-4 object-cover shrink-0';
+        const taskTitle = document.createElement('span');
+        taskTitle.className = 'truncate';
+        taskTitle.textContent = title;
+        taskBtn.append(taskIcon, taskTitle);
         taskBtn.onclick = () => focusWindow(id);
         document.getElementById('taskbar-windows').appendChild(taskBtn);
  
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index fea860d..062c7c1 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -2,6 +2,7 @@
 <div class="bg-surface flex flex-col w-full h-full font-vintage">
     <div class="flex mb-2">
         <div class="flex-1">
+            <input type="hidden" value="{{ project.project_name }}" id="project-title">
             <div class="text-xl">
                 {{ project.project_name }} ({{ project.get_project_type_display }})
             </div>
@@ -59,7 +60,7 @@
         {% endif %}
         {% if not project.is_shipped %}
         <div>
-            <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'journal: {{ project.project_name }}', 'src': '{% url 'fr.projects.journals.new.hackatime' project.pk %}'}, '*')">New journal...</button>
+            <button onclick="createWindow('journal: ' + document.getElementById('project-title').value, '{% url 'fr.projects.journals.new.hackatime' project.pk %}')">New journal...</button>
         </div>
         {% endif %}
     </div>

From 15253b4ad86deae7e88d81468955dc0f15aad8b7 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 13 Aug 2026 19:12:58 +0530
Subject: [PATCH 042/118] fix css styling after i added doctype

---
 twisted/twisted_site/templates/client/osbase.html | 4 ++--
 twisted/twisted_site/views/client/project.py      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index 2b01acb..f0f88b0 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -1,6 +1,6 @@
 {% load static tailwind_tags static %}
 <!DOCTYPE html>
-<html style="font-size: 12px; background: #1E072F;">
+<html style="font-size: 12px; background: #1E072F;" class="w-full h-full">
     <head>
         {% tailwind_css %}
         <link rel="stylesheet" href="https://unpkg.com/98.css" />
@@ -26,7 +26,7 @@
         "></script>
 
     </head>
-    <body class="font-vintage">
+    <body class="font-vintage h-full">
         {% block body %} meow :3 {% endblock body %}
     </body>
     <script>
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index 8ad3db7..d1492c0 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -76,7 +76,7 @@ def post(self, request, id):
         project.project_name = request.POST["name"]
         project.project_description = request.POST["description"]
         project.project_type = request.POST["type"]
-        project.hackatime_project_name = request.POST["hackatime"]
+        project.hackatime_project_name = request.POST.get("hackatime", "")
         project.repo_url = request.POST["repo"]
         project.save()
         return redirect("fr.projects.detail", project.id)

From a15da00b3120f80e6541a72b4b9767be132fd8be Mon Sep 17 00:00:00 2001
From: coolton-agent <coolton-agent@users.noreply.github.com>
Date: Thu, 13 Aug 2026 13:46:44 +0000
Subject: [PATCH 043/118] fix: harden deployment and access controls

---
 twisted/.env.example                         | 3 ++-
 twisted/mysite/settings.py                   | 4 ++--
 twisted/twisted_site/views/client/project.py | 9 ++++-----
 twisted/twisted_site/views/misc.py           | 3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/twisted/.env.example b/twisted/.env.example
index 13b2ab6..a3552d6 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -1,5 +1,6 @@
+SECRET_KEY = <generate-a-long-random-secret>
 LOGIN_ENABLED=true
-DEBUG=true
+DEBUG=false
 
 POSTGRES_DB = django
 POSTGRES_USER = django
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index aa631aa..0b75b3f 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -24,10 +24,10 @@
 # See https://docs.djangoproject.com/en/6.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure-&3p#whs%8@!e1=fl$!wk^y6^e@z+714@714xd$=0ghmfyk43bn'
+SECRET_KEY = os.environ['SECRET_KEY']
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = os.environ.get('DEBUG', 'true').lower() in ['true', 'on', '1']
+DEBUG = os.environ.get('DEBUG', 'false').lower() in ['true', 'on', '1']
 
 USE_X_FORWARDED_HOST = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index 8ad3db7..f08c9a8 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -19,12 +19,11 @@ def get(self, request, id):
         context["profile"] = profile
 
         project = Project.objects.get(id=id)
-        context["project"] = project
+        if project.user != request.user:
+            return redirect("dashboard")
 
-        if project.user == request.user:
-            context["owner"] = True
-        else:
-            context["owner"] = False
+        context["project"] = project
+        context["owner"] = True
 
         return render(
             request,
diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index 2c7eaca..9ef2190 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -25,7 +25,8 @@ def upload_file(request):
     if request.method == "POST":
         if "file" in request.FILES:
             file = request.FILES["file"]
-            max_file_mb = float(request.POST.get("max_mb", 1))
+            # The size limit is a server-side policy; never let the client raise it.
+            max_file_mb = 1
 
             file_size_mb = file.size / (1024 * 1024)
             if file_size_mb > max_file_mb:

From 9beabf575443ff113d5bb3b159e8e430d190b493 Mon Sep 17 00:00:00 2001
From: coolton-agent <coolton-agent@users.noreply.github.com>
Date: Thu, 13 Aug 2026 13:51:08 +0000
Subject: [PATCH 044/118] fix: remove remaining unsafe project title
 interpolation

---
 .../twisted_site/templates/client/projects/list.html  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/twisted/twisted_site/templates/client/projects/list.html b/twisted/twisted_site/templates/client/projects/list.html
index f6debf0..28c050b 100644
--- a/twisted/twisted_site/templates/client/projects/list.html
+++ b/twisted/twisted_site/templates/client/projects/list.html
@@ -11,7 +11,7 @@
     <div class="flex gap-4 w-full flex-wrap">
         {% for project in projects %}
         <input type="hidden" value="{{ project.project_name }}" id="project-{{ project.id }}">
-        <div class="w-16 cursor-pointer" onclick="createWindow(document.getElementById('project-{{ project.id }}').value, '{% url 'fr.projects.detail' project.id %}')">
+        <div class="w-16 cursor-pointer" data-project-id="{{ project.id }}" data-project-url="{% url 'fr.projects.detail' project.id %}">
             <img src="{% static 'images/directory.png' %}" class="w-full">
             <div class="w-full text-center text-wrap wrap-anywhere" style="text-align: center;">
                 {{ project.project_name }}
@@ -19,6 +19,15 @@
         </div>
         {% endfor %}
 
+    <script>
+        document.querySelectorAll('[data-project-id]').forEach((project) => {
+            project.addEventListener('click', () => {
+                const title = document.getElementById(`project-${project.dataset.projectId}`).value;
+                createWindow(title, project.dataset.projectUrl);
+            });
+        });
+    </script>
+
     </div>
     </div>
     <div class="sticky status-field-border font-vintage">

From c284bae2e9ea715d51ad77f4a8abd897e0350f0b Mon Sep 17 00:00:00 2001
From: coolton-agent <coolton-agent@users.noreply.github.com>
Date: Thu, 13 Aug 2026 14:17:24 +0000
Subject: [PATCH 045/118] revert: keep project details publicly viewable

---
 twisted/twisted_site/views/client/project.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index f08c9a8..8ad3db7 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -19,11 +19,12 @@ def get(self, request, id):
         context["profile"] = profile
 
         project = Project.objects.get(id=id)
-        if project.user != request.user:
-            return redirect("dashboard")
-
         context["project"] = project
-        context["owner"] = True
+
+        if project.user == request.user:
+            context["owner"] = True
+        else:
+            context["owner"] = False
 
         return render(
             request,

From a6d78648fd637d218cc897af42839d810e5232e6 Mon Sep 17 00:00:00 2001
From: coolton-agent <coolton-agent@users.noreply.github.com>
Date: Thu, 13 Aug 2026 14:22:13 +0000
Subject: [PATCH 046/118] fix: align upload limit and development env example

---
 twisted/.env.example               | 3 +--
 twisted/twisted_site/views/misc.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/twisted/.env.example b/twisted/.env.example
index a3552d6..13b2ab6 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -1,6 +1,5 @@
-SECRET_KEY = <generate-a-long-random-secret>
 LOGIN_ENABLED=true
-DEBUG=false
+DEBUG=true
 
 POSTGRES_DB = django
 POSTGRES_USER = django
diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/misc.py
index 9ef2190..d8cc0f8 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/misc.py
@@ -26,7 +26,7 @@ def upload_file(request):
         if "file" in request.FILES:
             file = request.FILES["file"]
             # The size limit is a server-side policy; never let the client raise it.
-            max_file_mb = 1
+            max_file_mb = 10
 
             file_size_mb = file.size / (1024 * 1024)
             if file_size_mb > max_file_mb:

From 4fff150019be83ee8a452eefec2e366180ce5b92 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 13 Aug 2026 19:58:52 +0530
Subject: [PATCH 047/118] Add secret key to .env.example

---
 twisted/.env.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/twisted/.env.example b/twisted/.env.example
index 13b2ab6..6b7e745 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -1,3 +1,4 @@
+SECRET_KEY=<insert-super-secure-secret-here>
 LOGIN_ENABLED=true
 DEBUG=true
 

From ea2006a3e4303d60fd318ffd4ddcc287bf35ecb5 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 13 Aug 2026 21:20:38 +0530
Subject: [PATCH 048/118] fix spinner for firefox

---
 twisted/tailwindcsstheme/static_src/src/styles.css              | 1 +
 .../templates/client/projects/journal/new_untracked.html        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index 43e24f2..a0add82 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -110,6 +110,7 @@ button {
 }
 
 @utility no-spinner {
+  appearance: textfield;
   -moz-appearance: textfield;
   
   &::-webkit-outer-spin-button,
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
index 15b77df..656dace 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
@@ -13,7 +13,7 @@
         type="number"
         min="0"
         max="{{ max_mins }}"
-        class="no-spinner text-right"
+        class="no-spinner! text-right"
         oninput="if(Number(this.value) > {{ max_mins }}) this.value = {{ max_mins }};"
     />
     minutes.

From d8cf73138d2c9745a9b453bc1996e1939acb2ee2 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 13 Aug 2026 22:07:39 +0530
Subject: [PATCH 049/118] Add icon to maximise and add reload button

---
 .../templates/client/dashboard.html           | 346 ++++++++++++------
 twisted/twisted_site/views/client/journal.py  |  12 +-
 2 files changed, 240 insertions(+), 118 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 8d437e5..bff4b21 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -2,8 +2,10 @@
 <div class="h-full text-absolute-white">
     <div class="p-4 flex flex-col gap-3">
         <div>
-            <button onclick="newWindow('Projects', '{% url 'fr.projects' %}')"
-                class="bg-twisted-400 text-absolute-white font-bold px-4 py-2 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+            <button
+                onclick="newWindow('Projects', '{% url 'fr.projects' %}')"
+                class="bg-twisted-400 text-absolute-white font-bold px-4 py-2 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200"
+            >
                 Projects
             </button>
         </div>
@@ -11,32 +13,46 @@
         <div>
             <a href="{% url 'admin.dash' %}" target="_blank">
                 <button
-                    class="bg-twisted-400 text-absolute-white font-bold px-4 py-2 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                    class="bg-twisted-400 text-absolute-white font-bold px-4 py-2 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200"
+                >
                     Admin
                 </button>
             </a>
         </div>
-    {% endif %}
+        {% endif %}
     </div>
 
     <div id="windows-container"></div>
 
-    <div id="taskbar" class="fixed bottom-0 left-0 right-0 z-9999 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1">
+    <div
+        id="taskbar"
+        class="fixed bottom-0 left-0 right-0 z-9999 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1"
+    >
         <div class="relative">
-            <button onclick="toggleStartMenu(event)"
-                class="flex items-center gap-1 !bg-twisted-600 !text-base !text-absolute-white !font-bold !px-3 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black active:!border-t-dark-black active:!border-l-dark-black active:!border-r-twisted-200 active:!border-b-twisted-200">
-                <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5"> Twist
+            <button
+                onclick="toggleStartMenu(event)"
+                class="flex items-center gap-1 !bg-twisted-600 !text-base !text-absolute-white !font-bold !px-3 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black active:!border-t-dark-black active:!border-l-dark-black active:!border-r-twisted-200 active:!border-b-twisted-200"
+            >
+                <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5" /> Twist
             </button>
 
-            <div id="start-menu" style="display: none; position: fixed; bottom: 48px; left: 4px; width: 520px;"
-                class="z-[10000] bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
+            <div
+                id="start-menu"
+                style="display: none; position: fixed; bottom: 48px; left: 4px; width: 520px"
+                class="z-[10000] bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg"
+            >
                 <div class="flex">
                     <div class="flex-1 bg-twisted-999 p-2 space-y-0.5">
                         {% for i in "0123456789" %}
-                        <button onclick="newWindow('Projects', '{% url 'fr.projects' %}'); toggleStartMenu(event)"
-                            class="w-full flex items-center gap-3 px-2 py-1.5 text-absolute-white text-left hover:bg-twisted-600">
-                            <img src="{% static 'images/round-square.jpg' %}" alt=""
-                                class="w-7 h-7 object-cover border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shrink-0">
+                        <button
+                            onclick="newWindow('Projects', '{% url 'fr.projects' %}'); toggleStartMenu(event)"
+                            class="w-full flex items-center gap-3 px-2 py-1.5 text-absolute-white text-left hover:bg-twisted-600"
+                        >
+                            <img
+                                src="{% static 'images/round-square.jpg' %}"
+                                alt=""
+                                class="w-7 h-7 object-cover border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shrink-0"
+                            />
                             <span class="text-sm">Projects</span>
                         </button>
                         {% endfor %}
@@ -44,15 +60,23 @@
 
                     <div class="w-44 bg-twisted-600 p-3 pt-10 flex flex-col">
                         <div class="text-center mb-3">
-                            <img src="{{ user.profile.slack_pfp_url }}" alt="" class="w-16 h-16 object-cover mx-auto mb-1 -mt-12 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
+                            <img
+                                src="{{ user.profile.slack_pfp_url }}"
+                                alt=""
+                                class="w-16 h-16 object-cover mx-auto mb-1 -mt-12 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg"
+                            />
                             <div class="text-absolute-white font-bold text-sm font-vintage">
                                 {{ profile.slack_username|default:user.username }}
                             </div>
                         </div>
 
-                        <div class="font-vintage space-y-1 text-absolute-white text-sm border-t border-twisted-800 pt-2">
+                        <div
+                            class="font-vintage space-y-1 text-absolute-white text-sm border-t border-twisted-800 pt-2"
+                        >
                             {% if user.is_staff %}
-                            <a href="/admin/" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Supadmin Panel</a>
+                            <a href="/admin/" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800"
+                                >Supadmin Panel</a
+                            >
                             {% endif %}
                             <a href="#" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Settings</a>
                             <a href="#" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Help</a>
@@ -63,8 +87,10 @@
                 <div class="flex items-center justify-between bg-twisted-400 p-2 border-t-2 border-t-twisted-200">
                     <form method="post" action="{% url 'logout' %}">
                         {% csrf_token %}
-                        <button type="submit"
-                            class="text-absolute-white text-sm px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                        <button
+                            type="submit"
+                            class="text-absolute-white text-sm px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200"
+                        >
                             Logout
                         </button>
                     </form>
@@ -75,21 +101,39 @@
         <div id="taskbar-windows" class="flex-1 flex items-center gap-1 px-2 overflow-x-auto"></div>
 
         <div class="flex items-center gap-2">
-            <div id="speaker-btn" onclick="toggleMusic()" class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-                <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg">
-                    <rect x="2" y="6" width="2" height="4" fill="#CAB3E1"/>
-                    <rect x="4" y="5" width="2" height="6" fill="#CAB3E1"/>
-                    <rect x="6" y="4" width="2" height="8" fill="#CAB3E1"/>
-                    <rect x="8" y="2" width="2" height="12" fill="#CAB3E1"/>
+            <div
+                id="speaker-btn"
+                onclick="toggleMusic()"
+                class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200"
+            >
+                <svg
+                    id="speaker-icon"
+                    width="20"
+                    height="16"
+                    viewBox="0 0 20 16"
+                    shape-rendering="crispEdges"
+                    xmlns="http://www.w3.org/2000/svg"
+                >
+                    <rect x="2" y="6" width="2" height="4" fill="#CAB3E1" />
+                    <rect x="4" y="5" width="2" height="6" fill="#CAB3E1" />
+                    <rect x="6" y="4" width="2" height="8" fill="#CAB3E1" />
+                    <rect x="8" y="2" width="2" height="12" fill="#CAB3E1" />
                     <g id="sound-waves">
-                        <rect x="12" y="5" width="2" height="6" fill="#8364A2"/>
-                        <rect x="15" y="3" width="2" height="10" fill="#8364A2"/>
+                        <rect x="12" y="5" width="2" height="6" fill="#8364A2" />
+                        <rect x="15" y="3" width="2" height="10" fill="#8364A2" />
                     </g>
                 </svg>
             </div>
-            <canvas id="spectrum" width="100" height="24" class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
-            <div id="taskbar-clock"
-                class="!font-vintage !text-base !bg-twisted-600 !text-absolute-white !px-3 !py-1 !border-2 !border-t-dark-black !border-l-dark-black !border-r-twisted-200 !border-b-twisted-200 min-w-20 text-center">
+            <canvas
+                id="spectrum"
+                width="100"
+                height="24"
+                class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"
+            ></canvas>
+            <div
+                id="taskbar-clock"
+                class="!font-vintage !text-base !bg-twisted-600 !text-absolute-white !px-3 !py-1 !border-2 !border-t-dark-black !border-l-dark-black !border-r-twisted-200 !border-b-twisted-200 min-w-20 text-center"
+            >
                 00:00 00
             </div>
         </div>
@@ -99,11 +143,57 @@
 <div class="-z-10 bg-surface fixed top-0 left-0 bottom-0 right-0"></div>
 
 <template id="window-template">
-    <div class="absolute window resize flex flex-col overflow-hidden" style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px;">
+    <div
+        class="absolute window resize flex flex-col overflow-hidden"
+        style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px"
+    >
         <div class="title-bar">
             <label class="title-bar-text w-full">TITLE</label>
             <div class="title-bar-controls">
-                <button class="max-button" aria-label="Maximize"></button>
+                <button class="reload-button">
+                    <svg
+                        fill-rule="evenodd"
+                        clip-rule="evenodd"
+                        stroke-linejoin="round"
+                        stroke-miterlimit="1.414"
+                        xmlns="http://www.w3.org/2000/svg"
+                        aria-label="view-reload"
+                        viewBox="0 0 32 32"
+                        preserveAspectRatio="xMidYMid meet"
+                        fill="currentColor"
+                        width="16"
+                        height="16"
+                    >
+                        <path
+                            d="M20.726,14.162c-0.776,-2.415 -3.04,-4.162 -5.713,-4.162c-3.314,0 -6,2.686 -6,6c0,3.314 2.686,6 6,6c2.063,0 3.883,-1.041 4.962,-2.626c0.333,-0.489 0.988,-0.707 1.497,-0.406c0.437,0.26 0.611,0.814 0.342,1.246c-1.411,2.273 -3.929,3.786 -6.801,3.786c-4.418,0 -8,-3.582 -8,-8c0,-4.418 3.582,-8 8,-8c3.53,0 6.525,2.286 7.588,5.458c0.278,-0.429 0.537,-0.848 0.736,-1.175c0.108,-0.178 0.196,-0.324 0.258,-0.428l0.042,-0.07l0.029,-0.05l0.018,-0.03l0.005,-0.008l0.001,-0.002c0.279,-0.476 0.892,-0.636 1.368,-0.357c0.477,0.279 0.636,0.892 0.357,1.369l-0.001,0.001l-0.001,0.002l-0.005,0.009l-0.02,0.034c-0.017,0.028 -0.043,0.072 -0.075,0.125l-0.062,0.105l-0.015,0.025l-0.084,0.139c-0.033,0.055 -0.069,0.114 -0.107,0.176c-0.222,0.365 -0.528,0.86 -0.849,1.35c-0.32,0.49 -0.676,1.006 -0.978,1.389c-0.157,0.198 -0.336,0.402 -0.482,0.54c-0.084,0.077 -0.217,0.181 -0.316,0.243c-0.103,0.062 -0.357,0.201 -0.695,0.178c-0.202,-0.013 -0.369,-0.08 -0.447,-0.113c-0.083,-0.035 -0.195,-0.091 -0.283,-0.141c-0.164,-0.092 -0.372,-0.224 -0.575,-0.363c-0.399,-0.272 -0.884,-0.633 -1.337,-0.98c-0.453,-0.348 -0.892,-0.697 -1.214,-0.954c-0.162,-0.13 -0.296,-0.239 -0.389,-0.314l-0.108,-0.088l-0.029,-0.024l-0.007,-0.006l-0.002,-0.001l-0.001,-0.001c-0.427,-0.35 -0.489,-0.98 -0.139,-1.407c0.35,-0.428 0.98,-0.489 1.407,-0.139l0.036,0.029l0.104,0.085c0.091,0.074 0.221,0.178 0.379,0.305c0.317,0.255 0.74,0.59 1.181,0.928c0.143,0.11 0.285,0.218 0.425,0.323Z"
+                        />
+                    </svg>
+                </button>
+                <button class="max-button" aria-label="Maximize">
+                    <svg class="m-auto" viewBox="-4 -4 20 20" style="width: 11px; height: 11px">
+                        <rect
+                            width="9"
+                            height="9"
+                            x="1.00000"
+                            y="1.00000"
+                            style="
+                                opacity: 1;
+                                fill: none;
+                                fill-opacity: 1;
+                                fill-rule: evenodd;
+                                stroke: #000000;
+                                stroke-width: 2;
+                                stroke-linecap: round;
+                                stroke-linejoin: round;
+                                stroke-miterlimit: 4;
+                                stroke-dasharray: none;
+                                stroke-dashoffset: 0;
+                                stroke-opacity: 1;
+                            "
+                            id="rect5719"
+                        />
+                    </svg>
+                </button>
                 <button class="close-button" aria-label="Close">X</button>
             </div>
         </div>
@@ -114,85 +204,94 @@
 </template>
 
 <audio id="bg-music" loop>
-    <source src="{% static 'audio/bg.mp3' %}" type="audio/mpeg">
+    <source src="{% static 'audio/bg.mp3' %}" type="audio/mpeg" />
 </audio>
 
 <script>
     let windowCounter = 0;
     let currentMaximisedWindow = null;
 
+    window.addEventListener(
+        "message",
+        (event) => {
+            const data = event.data;
+            if (data.type != "internal") return;
+            if (data.action == "open") {
+                let w = 400,
+                    h = 400;
+                if (data.width) w = data.width;
+                if (data.height) h = data.height;
+                newWindow(data.title, data.src, w, h);
+            }
+        },
+        false,
+    );
 
-    window.addEventListener("message", (event) => {
-        const data = event.data;
-        if (data.type != 'internal') return;
-        if (data.action == 'open') {
-            let w = 400, h = 400;
-            if (data.width) w = data.width;
-            if (data.height) h = data.height;
-            newWindow(data.title, data.src, w, h);
-        }
-    }, false);
- 
     function newWindow(title, src, w = 400, h = 400) {
-        const template = document.getElementById('window-template');
-        const container = document.getElementById('windows-container');
+        const template = document.getElementById("window-template");
+        const container = document.getElementById("windows-container");
         const clone = template.content.cloneNode(true);
-        const win = clone.querySelector('.window');
-        const id = 'win-' + (++windowCounter);
+        const win = clone.querySelector(".window");
+        const id = "win-" + ++windowCounter;
         win.dataset.winId = id;
- 
-        win.querySelector('.title-bar-text').textContent = title;
-        win.querySelector('.src-frame').src = src;
 
-        x = Math.random() * (window.innerWidth - w)
-        y = Math.random() * (window.innerHeight - w)
+        win.querySelector(".title-bar-text").textContent = title;
+        win.querySelector(".src-frame").src = src;
+
+        x = Math.random() * (window.innerWidth - w);
+        y = Math.random() * (window.innerHeight - w);
 
         win.style.left = x + "px";
         win.style.top = y + "px";
         win.style.width = w + "px";
         win.style.height = h + "px";
         container.appendChild(clone);
- 
+
         const realWin = container.querySelector('[data-win-id="' + id + '"]');
- 
+
         // Taskbar button with round png icon
-        const taskBtn = document.createElement('button');
+        const taskBtn = document.createElement("button");
         taskBtn.dataset.winId = id;
-        taskBtn.className = "flex items-center gap-1 !bg-twisted-600 !text-absolute-white text-sm !px-2 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black max-w-40";
-        const taskIcon = document.createElement('img');
+        taskBtn.className =
+            "flex items-center gap-1 !bg-twisted-600 !text-absolute-white text-sm !px-2 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black max-w-40";
+        const taskIcon = document.createElement("img");
         taskIcon.src = '{% static "images/round-square.jpg" %}';
-        taskIcon.className = 'w-4 h-4 object-cover shrink-0';
-        const taskTitle = document.createElement('span');
-        taskTitle.className = 'truncate';
+        taskIcon.className = "w-4 h-4 object-cover shrink-0";
+        const taskTitle = document.createElement("span");
+        taskTitle.className = "truncate";
         taskTitle.textContent = title;
         taskBtn.append(taskIcon, taskTitle);
         taskBtn.onclick = () => focusWindow(id);
-        document.getElementById('taskbar-windows').appendChild(taskBtn);
- 
-        realWin.querySelector('.title-bar').addEventListener('mousedown', () => focusWindow(id));
+        document.getElementById("taskbar-windows").appendChild(taskBtn);
+
+        realWin.querySelector(".title-bar").addEventListener("mousedown", () => focusWindow(id));
         dragWindow(realWin);
         focusWindow(id);
-        realWin.querySelector('.max-button').addEventListener('mouseup', () => {
-            console.log('maximise!');
+        realWin.querySelector(".max-button").addEventListener("mouseup", () => {
+            console.log("maximise!");
             fullscreenWindow(realWin);
         });
-        realWin.querySelector('.close-button').addEventListener('mouseup', () => {
-            console.log('close!');
+        realWin.querySelector(".reload-button").addEventListener("mouseup", () => {
+            frame = realWin.querySelector('.src-frame');
+            frame.src = frame.src;
+        });
+        realWin.querySelector(".close-button").addEventListener("mouseup", () => {
+            console.log("close!");
             realWin.remove();
             taskBtn.remove();
         });
     }
-    
+
     function fullscreenWindow(win) {
         if (currentMaximisedWindow != null && currentMaximisedWindow.win == win) {
             win.style.left = currentMaximisedWindow.left;
             win.style.top = currentMaximisedWindow.top;
             win.style.width = currentMaximisedWindow.width;
             win.style.height = currentMaximisedWindow.height;
-            win.classList.add('resize');
+            win.classList.add("resize");
 
             currentMaximisedWindow = null;
-            return
+            return;
         }
         if (currentMaximisedWindow != null) {
             fullscreenWindow(currentMaximisedWindow.win);
@@ -202,40 +301,45 @@
             left: win.style.left,
             top: win.style.top,
             width: win.style.width,
-            height: win.style.height
-        }
+            height: win.style.height,
+        };
         win.style.left = "0px";
         win.style.top = "0px";
-        win.style.bottom = document.getElementById('taskbar').offsetHeight+"px";
+        win.style.bottom = document.getElementById("taskbar").offsetHeight + "px";
         win.style.right = "0px";
         win.style.width = null;
         win.style.height = null;
-        win.classList.remove('resize');
+        win.classList.remove("resize");
     }
 
     function focusWindow(id) {
-        document.querySelectorAll('#taskbar-windows button').forEach(b =>
-            b.classList.remove('!bg-twisted-999'));
+        document.querySelectorAll("#taskbar-windows button").forEach((b) => b.classList.remove("!bg-twisted-999"));
         const win = document.querySelector('.window[data-win-id="' + id + '"]');
-        
-        container = document.getElementById('windows-container')
-        container.moveBefore(win, null)
+
+        container = document.getElementById("windows-container");
+        container.moveBefore(win, null);
 
         const btn = document.querySelector('#taskbar-windows button[data-win-id="' + id + '"]');
-        if (btn) btn.classList.add('!bg-twisted-999');
+        if (btn) btn.classList.add("!bg-twisted-999");
     }
- 
+
     function dragWindow(mywindow) {
-        
-        const titleBar = mywindow.getElementsByClassName('title-bar')[0];
-        let dragging = false, startX = 0, startY = 0, origX = 0, origY = 0, pendingX = 0, pendingY = 0, rafId = null;
- 
+        const titleBar = mywindow.getElementsByClassName("title-bar")[0];
+        let dragging = false,
+            startX = 0,
+            startY = 0,
+            origX = 0,
+            origY = 0,
+            pendingX = 0,
+            pendingY = 0,
+            rafId = null;
+
         function apply() {
             rafId = null;
             mywindow.style.left = pendingX + "px";
             mywindow.style.top = pendingY + "px";
         }
- 
+
         function onMove(e) {
             if (currentMaximisedWindow != null && currentMaximisedWindow.win == mywindow) {
                 return;
@@ -252,30 +356,32 @@
             pendingY = y;
             // throttle DOM writes to one per animation frame for smoothness
             if (rafId === null) rafId = requestAnimationFrame(apply);
-
         }
- 
+
         function onUp() {
             dragging = false;
-            document.body.style.userSelect = '';
-            document.removeEventListener('mousemove', onMove);
-            document.removeEventListener('mouseup', onUp);
-            if (rafId !== null) { cancelAnimationFrame(rafId); rafId = null; }
+            document.body.style.userSelect = "";
+            document.removeEventListener("mousemove", onMove);
+            document.removeEventListener("mouseup", onUp);
+            if (rafId !== null) {
+                cancelAnimationFrame(rafId);
+                rafId = null;
+            }
         }
- 
-        titleBar.addEventListener('mousedown', (e) => {
+
+        titleBar.addEventListener("mousedown", (e) => {
             e.preventDefault();
             dragging = true;
             startX = e.clientX;
             startY = e.clientY;
             origX = mywindow.offsetLeft;
             origY = mywindow.offsetTop;
-            document.body.style.userSelect = 'none';
-            document.addEventListener('mousemove', onMove);
-            document.addEventListener('mouseup', onUp);
+            document.body.style.userSelect = "none";
+            document.addEventListener("mousemove", onMove);
+            document.addEventListener("mouseup", onUp);
         });
     }
- 
+
     function updateClock() {
         const now = new Date();
         let h = now.getHours();
@@ -284,32 +390,35 @@
         h = h % 12 || 12;
         document.getElementById("taskbar-clock").textContent = h + ":" + m + " " + ampm;
     }
- 
+
     function toggleStartMenu(event) {
         event.stopPropagation();
         const menu = document.getElementById("start-menu");
-        menu.style.display = (menu.style.display === "none") ? "block" : "none";
+        menu.style.display = menu.style.display === "none" ? "block" : "none";
     }
- 
+
     document.addEventListener("click", (e) => {
         const menu = document.getElementById("start-menu");
         if (menu.style.display !== "none" && !menu.contains(e.target)) {
             menu.style.display = "none";
         }
     });
- 
+
     updateClock();
     setInterval(updateClock, 1000);
- 
+
     const music = document.getElementById("bg-music");
     const savedTime = parseFloat(sessionStorage.getItem("musicTime") || "0");
     const wasPlaying = sessionStorage.getItem("musicPlaying") === "true";
     if (savedTime) music.currentTime = savedTime;
- 
-    let audioCtx, analyser, dataArray, sourceConnected = false;
+
+    let audioCtx,
+        analyser,
+        dataArray,
+        sourceConnected = false;
     const canvas = document.getElementById("spectrum");
     const ctx = canvas ? canvas.getContext("2d") : null;
- 
+
     function initAudioGraph() {
         if (sourceConnected) return;
         const AC = window.AudioContext || window.webkitAudioContext;
@@ -324,18 +433,21 @@
         sourceConnected = true;
         drawSpectrum();
     }
- 
+
     function playMusic() {
         initAudioGraph();
         if (audioCtx && audioCtx.state === "suspended") audioCtx.resume();
         music.play().catch(() => {});
     }
- 
+
     function toggleMusic() {
-        if (music.paused) { playMusic(); }
-        else { music.pause(); }
+        if (music.paused) {
+            playMusic();
+        } else {
+            music.pause();
+        }
     }
- 
+
     if (wasPlaying) {
         playMusic();
         const resumeOnce = () => {
@@ -346,7 +458,7 @@
         document.addEventListener("pointerdown", resumeOnce, { once: true });
         document.addEventListener("keydown", resumeOnce, { once: true });
     }
- 
+
     setInterval(() => {
         sessionStorage.setItem("musicTime", music.currentTime);
         sessionStorage.setItem("musicPlaying", (!music.paused).toString());
@@ -355,7 +467,7 @@
         sessionStorage.setItem("musicTime", music.currentTime);
         sessionStorage.setItem("musicPlaying", (!music.paused).toString());
     });
- 
+
     function drawSpectrum() {
         if (!ctx) return;
         requestAnimationFrame(drawSpectrum);
@@ -363,7 +475,9 @@
         ctx.fillRect(0, 0, canvas.width, canvas.height);
         if (!analyser || music.paused) return;
         analyser.getByteFrequencyData(dataArray);
-        const bars = 8, barWidth = canvas.width / bars, pixel = 3;
+        const bars = 8,
+            barWidth = canvas.width / bars,
+            pixel = 3;
         for (let i = 0; i < bars; i++) {
             const value = dataArray[i] / 255;
             const barHeight = Math.floor((value * canvas.height) / pixel) * pixel;
@@ -377,4 +491,4 @@
     drawSpectrum();
 </script>
 
-{% endblock body %}
\ No newline at end of file
+{% endblock body %}
diff --git a/twisted/twisted_site/views/client/journal.py b/twisted/twisted_site/views/client/journal.py
index 336f449..a76ba24 100644
--- a/twisted/twisted_site/views/client/journal.py
+++ b/twisted/twisted_site/views/client/journal.py
@@ -134,14 +134,22 @@ def post(self, request, id):
         content_no_images = re.sub(IMAGE_REGEX, '', content)
         content_length = len(' '.join(content_no_images.split()))
 
-        if time_logged > 180:
+        if time_logged > UNTRACKED_MAX_LOGGABLE_MINUTES:
             return self.get(
                 request,
                 id,
-                info="Time logged cannot be more than 180 minutes!",
+                info=f"Time logged cannot be more than {UNTRACKED_MAX_LOGGABLE_MINUTES} minutes!",
                 context={"content": content},
             )
 
+        if time_logged < 0:
+            return self.get(
+                request,
+                id,
+                info="I dont understand, why do you wanna lose time :hs:",
+                context={"content": content},
+            )
+        
         if content_length < min(100, time_logged * 2):
             return self.get(
                 request,

From bf4576841512aa4fed2e4374f0d7cc04793b84e6 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 14 Aug 2026 16:05:48 +0530
Subject: [PATCH 050/118] Add shipped_project_type chart

---
 .../templates/admin/dashboard.html            | 104 +++++++++---------
 twisted/twisted_site/views/admin/dashboard.py |   3 +
 2 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/twisted/twisted_site/templates/admin/dashboard.html b/twisted/twisted_site/templates/admin/dashboard.html
index d944dc7..0e17589 100644
--- a/twisted/twisted_site/templates/admin/dashboard.html
+++ b/twisted/twisted_site/templates/admin/dashboard.html
@@ -54,15 +54,12 @@ <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_usern
                             }
                         </script>
                     </div>
-                    <div class="md:w-fit">
+                    <div class="md:w-fit flex flex-row">
                         <div>
                             <div class="text-center">
                                 Project type
                             </div>
-                            <div class="text-center text-lg font-bold">
-                                {{ hours_logged }}h
-                            </div>
-                            <div id="logged_project_type" class="mx-auto md:mx-0">
+                            <div id="logged_project_type" class="mx-auto md:mx-0 mt-6">
                                 <div class="text-center py-4">
                                     Loading chart...
                                 </div>
@@ -107,62 +104,59 @@ <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_usern
                                 Loading chart...
                             </div>
                         </div>
+                        <script type="text/javascript">
+                            google.charts.load('current', {'packages':['corechart']});
+                            google.charts.setOnLoadCallback(drawChart);
+    
+                            function drawChart() {
+                                var data = google.visualization.arrayToDataTable({{ hours_shipped_chart|safe }});
+    
+                                var options = {
+                                    vAxis: {minValue: 0},
+                                    animation: {duration: 250, startup: true},
+                                    backgroundColor: {fill: 'transparent'},
+                                    theme: "maximized",
+                                    width: 240,
+                                    height: 160
+                                };
+    
+                                var chart = new google.visualization.AreaChart(document.getElementById('hours_shipped_chart'));
+                                chart.draw(data, options);
+                            }
+                        </script>
                     </div>
-                    <script type="text/javascript">
-                        google.charts.load('current', {'packages':['corechart']});
-                        google.charts.setOnLoadCallback(drawChart);
-
-                        function drawChart() {
-                            var data = google.visualization.arrayToDataTable({{ hours_shipped_chart|safe }});
-
-                            var options = {
-                                vAxis: {minValue: 0},
-                                animation: {duration: 250, startup: true},
-                                backgroundColor: {fill: 'transparent'},
-                                theme: "maximized",
-                                width: 240,
-                                height: 160
-                            };
-
-                            var chart = new google.visualization.AreaChart(document.getElementById('hours_shipped_chart'));
-                            chart.draw(data, options);
-                        }
-                    </script>
-                </div>
-                <div class="flex flex-col md:flex-row text-center md:text-left gap-4">
-                    <div class="md:w-fit">
-                        <div class="text-center">
-                            Hours shipped
-                        </div>
-                        <div class="text-center text-lg font-bold">
-                            {{ hours_shipped }}h
-                        </div>
-                        <div id="hours_shipped_chart2" class="mx-auto md:mx-0">
-                            <div class="text-center py-4">
-                                Loading chart...
+                    <div class="md:w-fit flex flex-row">
+                        <div>
+                            <div class="text-center">
+                                Project type
+                            </div>
+                            <div id="shipped_project_type" class="mx-auto md:mx-0 mt-6">
+                                <div class="text-center py-4">
+                                    Loading chart...
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <script type="text/javascript">
-                        google.charts.load('current', {'packages':['corechart']});
-                        google.charts.setOnLoadCallback(drawChart);
+                        <script type="text/javascript">
+                            google.charts.load('current', {'packages':['corechart']});
+                            google.charts.setOnLoadCallback(drawChart);
 
-                        function drawChart() {
-                            var data = google.visualization.arrayToDataTable({{ hours_shipped_chart|safe }});
+                            function drawChart() {
+                                var data = google.visualization.arrayToDataTable({{ shipped_project_type|safe }});
 
-                            var options = {
-                                vAxis: {minValue: 0},
-                                animation: {duration: 250, startup: true},
-                                backgroundColor: {fill: 'transparent'},
-                                theme: "maximized",
-                                width: 240,
-                                height: 160
-                            };
+                                var options = {
+                                    vAxis: {minValue: 0},
+                                    animation: {duration: 250, startup: true},
+                                    backgroundColor: {fill: 'transparent'},
+                                    theme: "maximized",
+                                    width: 240,
+                                    height: 160
+                                };
 
-                            var chart = new google.visualization.AreaChart(document.getElementById('hours_shipped_chart'));
-                            chart.draw(data, options);
-                        }
-                    </script>
+                                var chart = new google.visualization.PieChart(document.getElementById('shipped_project_type'));
+                                chart.draw(data, options);
+                            }
+                        </script>
+                    </div>
                 </div>
             </c-ui.card>
         </c-ui.tabs.tab>
diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
index f3fdd70..4ce475e 100644
--- a/twisted/twisted_site/views/admin/dashboard.py
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -12,6 +12,7 @@ def get(self, request):
         hours_logged = 0
         hours_logged_chart = {}
         logged_project_type = {"Software": 0, "Hardware": 0}
+        shipped_project_type = {"Software": 0, "Hardware": 0}
         hours_shipped = 0
         hours_shipped_chart = {}
         for journal in Journal.objects.all().prefetch_related('project'):
@@ -26,6 +27,7 @@ def get(self, request):
             if journal.project.is_shipped():
                 hours_shipped += hours
                 hours_shipped_chart[date] = hours_shipped_chart.get(date, 0) + hours
+                shipped_project_type[journal.project.get_project_type_display()] += hours
 
         context['hours_logged'] = round(hours_logged, 2)
         context['hours_logged_chart'] = json.dumps([['Date', 'Hours']] + list(hours_logged_chart.items()))
@@ -33,6 +35,7 @@ def get(self, request):
         
         context['hours_shipped'] = round(hours_shipped, 2)
         context['hours_shipped_chart'] = json.dumps([['Date', 'Hours']] + list(hours_shipped_chart.items()))
+        context['shipped_project_type'] = json.dumps([['Type', 'Hours']] + list(shipped_project_type.items()))
         
         
         return render(request, "admin/dashboard.html", context=context)
\ No newline at end of file

From 2cc57c013202f6cef46cf2b0f91d3fb8483c6638 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 14 Aug 2026 22:41:40 +0530
Subject: [PATCH 051/118] Fix a bug where you can ship without IDV and also
 added /admin/users

---
 pyproject.toml                                |  1 +
 twisted/mysite/settings.py                    |  3 +-
 .../migrations/0016_profile_ysws_eligible.py  | 18 +++++
 twisted/twisted_site/models.py                | 20 +++++
 .../twisted_site/templates/admin/user.html    |  5 ++
 .../twisted_site/templates/admin/users.html   | 78 ++++++++++++++++++-
 .../twisted_site/templates/cotton/base.html   | 10 ++-
 twisted/twisted_site/views/admin/users.py     | 16 +++-
 twisted/twisted_site/views/client/auth.py     | 18 ++---
 twisted/twisted_site/views/client/project.py  |  8 ++
 uv.lock                                       | 15 ++++
 11 files changed, 174 insertions(+), 18 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0016_profile_ysws_eligible.py
 create mode 100644 twisted/twisted_site/templates/admin/user.html

diff --git a/pyproject.toml b/pyproject.toml
index b3a002d..d39594b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,4 +23,5 @@ dependencies = [
     "django-cotton-ui>=0.3.2",
     "django-google-charts>=0.1.1",
     "django-qsstats-magic>=1.1.0",
+    "django-htmx>=1.29.0",
 ]
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 0b75b3f..50a5cc0 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -63,7 +63,7 @@
     'django_cotton_ui',
     'tailwind',
     TAILWIND_APP_NAME,
-    'googlecharts',
+    'django_htmx',
 ]
 
 if DEBUG:
@@ -80,6 +80,7 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'mysite.middleware.TimezoneMiddleware',
+    "django_htmx.middleware.HtmxMiddleware",
 ]
 
 if DEBUG:
diff --git a/twisted/twisted_site/migrations/0016_profile_ysws_eligible.py b/twisted/twisted_site/migrations/0016_profile_ysws_eligible.py
new file mode 100644
index 0000000..9342104
--- /dev/null
+++ b/twisted/twisted_site/migrations/0016_profile_ysws_eligible.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0.7 on 2026-08-14 13:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0015_profile_dark_theme'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='ysws_eligible',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 235f359..ffedc21 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -25,6 +25,7 @@ def __str__(self):
 class Profile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="profile")
     verification_status = models.CharField(max_length=64, blank=True, default="")
+    ysws_eligible = models.BooleanField(default=False)
     slack_id = models.CharField(max_length=64, blank=True, default="")
     slack_username = models.CharField(max_length=64, blank=True, default="")
     slack_pfp_url = models.CharField(max_length=200, blank=True, default="")
@@ -35,6 +36,25 @@ class Profile(models.Model):
     is_staff = models.BooleanField(default=False)
     dark_theme = models.BooleanField(default=True)
     
+    def shipped_projects(self):
+        shipped_projects = []
+        for project in self.user.projects.all():
+            if project.is_shipped():
+                shipped_projects.append(project)
+        return shipped_projects
+
+    def time_logged(self):
+        time_logged = 0
+        for project in self.user.projects.all():
+            time_logged += project.time_logged()
+        return time_logged
+
+    def time_shipped(self):
+        time_shipped = 0
+        for project in self.shipped_projects():
+            time_shipped += project.time_logged()
+        return time_shipped
+    
     def __str__(self):
         return self.user.username  # ty:ignore[unresolved-attribute]
 
diff --git a/twisted/twisted_site/templates/admin/user.html b/twisted/twisted_site/templates/admin/user.html
new file mode 100644
index 0000000..b8ebd1b
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/user.html
@@ -0,0 +1,5 @@
+<c-base>
+    <c-ui.button variant="primary">Primary Button</c-ui.button>
+<c-ui.button variant="default">Default Button</c-ui.button>
+
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/users.html b/twisted/twisted_site/templates/admin/users.html
index b8ebd1b..04e6dd6 100644
--- a/twisted/twisted_site/templates/admin/users.html
+++ b/twisted/twisted_site/templates/admin/users.html
@@ -1,5 +1,75 @@
+{% load maths %}
 <c-base>
-    <c-ui.button variant="primary">Primary Button</c-ui.button>
-<c-ui.button variant="default">Default Button</c-ui.button>
-
-</c-base>
\ No newline at end of file
+    <div class="mb-4 flex gap-2">
+        <div class="flex-1">
+            <c-ui.input
+                type="search"
+                name="search"
+                hx-get="{% url 'admin.users' %}"
+                hx-trigger="input changed delay:100ms, keyup[key=='Enter'], load"
+                hx-target="#container"
+                hx-select="#search-results"
+                hx-indicator=".loading-indicator"
+                placeholder="Search Users..."
+                autocomplete="off"
+            >
+                <c-slot name="left_addon">
+                    <svg
+                        fill-rule="evenodd"
+                        clip-rule="evenodd"
+                        stroke-linejoin="round"
+                        stroke-miterlimit="1.414"
+                        xmlns="http://www.w3.org/2000/svg"
+                        aria-label="search"
+                        viewBox="0 0 32 32"
+                        preserveAspectRatio="xMidYMid meet"
+                        fill="currentColor"
+                        class="size-6"
+                    >
+                        <path
+                            d="M14,9c-2.761,0 -5,2.239 -5,5c0,2.761 2.239,5 5,5c1.387,0 2.641,-0.564 3.548,-1.477c0.899,-0.905 1.452,-2.148 1.452,-3.523c0,-2.761 -2.239,-5 -5,-5Zm-7,5c0,-3.866 3.134,-7 7,-7c3.866,0 7,3.134 7,7c0,1.257 -0.332,2.436 -0.912,3.456c-0.244,0.431 -0.212,0.981 0.137,1.332l3.984,4.007c0.389,0.391 0.388,1.025 -0.004,1.414c-0.392,0.389 -1.025,0.388 -1.414,-0.004l-3.97,-3.992c-0.352,-0.354 -0.908,-0.387 -1.341,-0.138c-1.025,0.588 -2.214,0.925 -3.48,0.925c-3.866,0 -7,-3.134 -7,-7Z"
+                        />
+                    </svg>
+                </c-slot>
+            </c-ui.input>
+        </div>
+        <div class="my-auto loading-indicator">
+            <c-ui.spinner />
+        </div>
+    </div>
+    <div id="container">
+        <div id="search-results" class="grid gap-2 grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
+            {% for user in users %}
+                <c-ui.card class="bg-ink-900">
+                    <div class="flex gap-2">
+                        <c-ui.avatar size="md" src="{{ user.profile.slack_pfp_url }}" />
+                        <div>
+                            <h3 class="text-lg font-semibold mb-1">
+                                @{{ user.profile.slack_username }}
+                                <c-ui.badge size="sm">{{ user.profile.slack_id|default:"user not found" }}</c-ui.badge>
+                            </h3>
+                            {% if user.profile %}
+                            <div>
+                                {% if user.profile.is_staff %}
+                                <c-ui.badge size="sm" color="purple">Staff</c-ui.badge>
+                                {% endif %}
+                                <c-ui.badge size="sm" color="{{ user.profile.ysws_eligible|yesno:'green,red' }}"
+                                    >{{ user.profile.ysws_eligible|yesno:"YSWS eligible,Not YSWS eligible" }}</c-ui.badge
+                                >
+                            </div>
+                            <div>
+                                <p>{{ user.projects.count }} projects created</p>
+                                <p>{{ user.profile.shipped_projects|length }} projects shipped</p>
+                            </div>
+                            <div class="mt-2">
+                                <p>{{ user.profile.time_logged|divide:60|floatformat:2 }}h logged</p>
+                                <p>{{ user.profile.time_shipped|divide:60|floatformat:2 }}h shipped</p>
+                            </div>
+                            {% endif %}
+                        </div>
+                    </div>
+                </c-ui.card>
+            {% endfor %}
+        </div>
+    </div>
+</c-base>
diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html
index 5a15837..ef075c8 100644
--- a/twisted/twisted_site/templates/cotton/base.html
+++ b/twisted/twisted_site/templates/cotton/base.html
@@ -1,16 +1,20 @@
-{% load static tailwind_tags %}
+{% load static tailwind_tags django_htmx %}
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-
+    
+    {% htmx_script %}
+    <script src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.10/dist/htmx.min.js" 
+        integrity="sha384-H5SrcfygHmAuTDZphMHqBJLc3FhssKjG7w/CeCpFReSfwBWDTKpkzPP8c+cLsK+V"
+        crossorigin="anonymous"></script>
     {% tailwind_css %}
     <title>Admin - Twisted</title>
     <link rel="icon" href="{% static 'favicon.png' %}" />
     {{ head }}
 </head>
-<body class="dark bg-[#09090B] text-white font-latin">
+<body class="dark bg-[#09090B] text-white font-latin" hx-headers='{"x-csrftoken": "{{ csrf_token }}"}'>
     <div class="md:flex md:py-2 h-screen">
         <div class="md:h-full">
             <c-sidebar>
diff --git a/twisted/twisted_site/views/admin/users.py b/twisted/twisted_site/views/admin/users.py
index d2f0d5b..c259821 100644
--- a/twisted/twisted_site/views/admin/users.py
+++ b/twisted/twisted_site/views/admin/users.py
@@ -1,9 +1,23 @@
+from django.http import HttpResponse
 from .admin import AdminView
 from django.shortcuts import render, redirect
+from ...models import User, Profile
+from django.db.models import Q
 
 # Create your views here.
 class UsersView(AdminView):
     def get(self, request):
         context = self.get_context_data()
         context['page'] = 'users'
-        return render(request, "admin/users.html", context=context)
+        if request.htmx:
+            query = request.GET['search']
+            context['users'] = User.objects.all()
+            context['users'] = User.objects.filter(
+                Q(profile__slack_username__icontains=query) |
+                Q(profile__slack_id__icontains=query) |
+                Q(first_name__icontains=query) |
+                Q(last_name__icontains=query)
+            ).order_by('profile__slack_username')
+            return render(request, "admin/users.html", context=context)
+        context['users'] = User.objects.all().order_by('profile__slack_username')
+        return render(request, "admin/users.html", context=context)
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/auth.py b/twisted/twisted_site/views/client/auth.py
index e75f4d8..21cb5f2 100644
--- a/twisted/twisted_site/views/client/auth.py
+++ b/twisted/twisted_site/views/client/auth.py
@@ -49,20 +49,20 @@ def get(self, request):
         clean_sub = sub.replace("!", "_")
         slack_id = userinfo.get("slack_id", "")
         verification_status = userinfo.get("verification_status", "")
-
+        ysws_eligible = userinfo.get("ysws_eligible", False)
         user_model = get_user_model()
         user, created = user_model.objects.get_or_create(
             username=clean_sub,
             defaults={
                 "email": email,
                 "first_name": userinfo.get("given_name", ""),
-                "last_name": userinfo.get("family_name", "")
+                "last_name": userinfo.get("family_name", ""),
             },
         )  
 
         if slack_id:
             try:
-                slack_user = slack_bot.users_info(user=slack_id)["user"]  # ty:ignore[not-subscriptable]
+                slack_user = slack_bot.users_info(user=slack_id)["user"]
                 slack_profile = slack_user["profile"]
 
                 display_name = (
@@ -77,12 +77,12 @@ def get(self, request):
                 avatar_url = os.environ["DEFAULT_PFP"]
 
         profile, created = Profile.objects.get_or_create(user=user)  # ty:ignore[unresolved-attribute]
-        if created:
-            profile.verification_status = verification_status
-            profile.slack_id = slack_id
-            profile.slack_username = display_name
-            profile.slack_pfp_url = avatar_url
-            profile.save()
+        profile.verification_status = verification_status
+        profile.slack_id = slack_id
+        profile.slack_username = display_name
+        profile.slack_pfp_url = avatar_url
+        profile.ysws_eligible = ysws_eligible
+        profile.save()
 
         login(request, user)
         
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index d1492c0..5de057a 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -89,6 +89,11 @@ def get(self, request, id, context={}):
         project = Project.objects.get(id=id)
         if project.user != request.user:
             return redirect('dashboard')
+        
+        if not project.user.profile.ysws_eligible:
+            context["info"] = "You are not YSWS eligible yet! Please get IDVd! Get help with it at #identity-help! (if you think this is a mistake, please ask in #twisted-help)"
+        
+        
         context['project'] = project
         return render(request, 'client/projects/ship.html', context)
 
@@ -103,6 +108,9 @@ def post(self, request, id, context={}):
         if project.is_shipped():
             return self.get(request, id, context={"info": "silly! you have already shipped."})
         
+        if not project.user.profile.ysws_eligible:
+            return self.get(request, id)
+        
         ship = ProjectShip(project=project)
         ship.save()
         return self.get(request, id, context={'success': True})
\ No newline at end of file
diff --git a/uv.lock b/uv.lock
index 810a486..997ee90 100644
--- a/uv.lock
+++ b/uv.lock
@@ -463,6 +463,19 @@ version = "0.1.1"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/39/90/636b444eedc136912d93386c8c90a92e9a02ad4f9f75743a6d3f06bd23d0/django-google-charts-0.1.1.tar.gz", hash = "sha256:4c956bced0e10fc4fce980edc03fc1d0c071020cc0755b4a2ebd3854a776f1f8", size = 3297, upload-time = "2011-11-16T11:27:16.063Z" }
 
+[[package]]
+name = "django-htmx"
+version = "1.29.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "asgiref" },
+    { name = "django" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/66/cc/b0619004ed73a4a2bfa50d14b00a8228407b01994df73613584523ab3056/django_htmx-1.29.0.tar.gz", hash = "sha256:337dfa35b8da13fd68bf968f2b9cc9a4144a4e71f06c204d7ff10f7343988102", size = 204340, upload-time = "2026-08-05T23:42:09.457Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ec/72/1f5f35d719b355e5c051378ae4859586f59c9db08708f02fea358376c130/django_htmx-1.29.0-py3-none-any.whl", hash = "sha256:0ec5be1645ed71e6787bd75e0250624f00274ac3bb1730f07b6629a95688929b", size = 224954, upload-time = "2026-08-05T23:42:08.142Z" },
+]
+
 [[package]]
 name = "django-jazzmin"
 version = "3.0.5"
@@ -1126,6 +1139,7 @@ dependencies = [
     { name = "django-cotton" },
     { name = "django-cotton-ui" },
     { name = "django-google-charts" },
+    { name = "django-htmx" },
     { name = "django-jazzmin" },
     { name = "django-qsstats-magic" },
     { name = "django-tailwind", extra = ["cookiecutter", "honcho", "reload"] },
@@ -1148,6 +1162,7 @@ requires-dist = [
     { name = "django-cotton", specifier = ">=2.7.2" },
     { name = "django-cotton-ui", specifier = ">=0.3.2" },
     { name = "django-google-charts", specifier = ">=0.1.1" },
+    { name = "django-htmx", specifier = ">=1.29.0" },
     { name = "django-jazzmin", specifier = ">=3.0.5" },
     { name = "django-qsstats-magic", specifier = ">=1.1.0" },
     { name = "django-tailwind", extras = ["cookiecutter", "honcho", "reload"], specifier = ">=4.5.0" },

From 773b3052037c122aec850cdeb6bac53bfd60a64b Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 14 Aug 2026 22:46:27 +0530
Subject: [PATCH 052/118] oopsies forgot to remove googlecharts

---
 twisted/twisted_site/templates/admin/dashboard.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/twisted/twisted_site/templates/admin/dashboard.html b/twisted/twisted_site/templates/admin/dashboard.html
index 0e17589..4c2cf2a 100644
--- a/twisted/twisted_site/templates/admin/dashboard.html
+++ b/twisted/twisted_site/templates/admin/dashboard.html
@@ -1,4 +1,3 @@
-{% load googlecharts %}
 <c-base>
     <c-slot name="head">
         <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>

From b2c750ad4996d2853ea68b3f8cf48b1df17e7536 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Fri, 14 Aug 2026 17:33:29 +0000
Subject: [PATCH 053/118] Add support for both Slack Socket Mode and Https

---
 twisted/.env.example          |  3 +++
 twisted/slack_bot/slack.py    | 34 +++++++++++++++++++++++++++++++---
 twisted/slack_bot/urls.py     |  2 +-
 twisted/twisted_site/slack.py | 34 +++++++++++++++++++++++++++++++---
 4 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/twisted/.env.example b/twisted/.env.example
index 6b7e745..f028aeb 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -17,6 +17,9 @@ HACKATIME_CLIENT_SECRET =
 HACKATIME_REDIRECT_URI = https://localhost:8000/auth/hackatime_callback
 
 SLACK_TOKEN = xoxb-***
+SLACK_SIGNING_SECRET =
+SLACK_APP_TOKEN = xapp-***
+SLACK_MODE = https
 
 ALLOWED_HOSTS = 127.0.0.1, localhost
 CSRF_TRUSTED_ORIGINS = http://127.0.0.1:8000, http://localhost:8000
diff --git a/twisted/slack_bot/slack.py b/twisted/slack_bot/slack.py
index da6162f..d50618e 100644
--- a/twisted/slack_bot/slack.py
+++ b/twisted/slack_bot/slack.py
@@ -1,15 +1,34 @@
 import os
 from typing import Any
 from slack_bolt import App
+from slack_bolt.adapter.socket_mode import SocketModeHandler
 
 
 class SlackBot:
-	def __init__(self, token: str | None = None, cc_group_id: str | None = None):
+	def __init__(
+		self,
+		token: str | None = None,
+		signing_secret: str | None = None,
+		cc_group_id: str | None = None,
+		app_token: str | None = None,
+		slack_mode: str | None = None,
+	):
+		self.slack_mode = (slack_mode or os.getenv("SLACK_MODE", "https")).lower()
+		self.app_token = app_token or os.getenv("SLACK_APP_TOKEN")
 		slack_token = token
-		self.app = App(token=slack_token)
+		self.app = App(token=slack_token, signing_secret=signing_secret)
+		self.socket_mode_handler: SocketModeHandler | None = None
+		if self.slack_mode == "socket":
+			if not self.app_token:
+				raise ValueError("SLACK_APP_TOKEN must be set when SLACK_MODE=socket")
+			self.socket_mode_handler = SocketModeHandler(self.app, self.app_token)
 		self.client = self.app.client
 		self._cc_group_id = cc_group_id
 
+	def start(self):
+		if self.socket_mode_handler is not None:
+			self.socket_mode_handler.start()
+
 	def post_message(
 		self,
 		*,
@@ -93,7 +112,16 @@ def users_info(self, *, user: str):
 
 
 slack_token = os.getenv("SLACK_TOKEN")
+slack_signing_secret = os.getenv("SLACK_SIGNING_SECRET")
 cc_group_id = os.getenv("SLACK_CC_GROUP_ID")
+slack_mode = os.getenv("SLACK_MODE", "https").strip().lower()
+slack_app_token = os.getenv("SLACK_APP_TOKEN")
 
-slack_bot = SlackBot(token=slack_token, cc_group_id=cc_group_id)
+slack_bot = SlackBot(
+	token=slack_token,
+	signing_secret=slack_signing_secret,
+	cc_group_id=cc_group_id,
+	app_token=slack_app_token,
+	slack_mode=slack_mode,
+)
 slack_client = slack_bot.client
\ No newline at end of file
diff --git a/twisted/slack_bot/urls.py b/twisted/slack_bot/urls.py
index 27d7e9a..2ec9e08 100644
--- a/twisted/slack_bot/urls.py
+++ b/twisted/slack_bot/urls.py
@@ -4,5 +4,5 @@
 app_name = "slack_bot"
 
 urlpatterns = [
-    path("events", views.slack_events, name="events"),
+    path("/slack/events", views.slack_events, name="events"),
 ]
diff --git a/twisted/twisted_site/slack.py b/twisted/twisted_site/slack.py
index da6162f..d50618e 100644
--- a/twisted/twisted_site/slack.py
+++ b/twisted/twisted_site/slack.py
@@ -1,15 +1,34 @@
 import os
 from typing import Any
 from slack_bolt import App
+from slack_bolt.adapter.socket_mode import SocketModeHandler
 
 
 class SlackBot:
-	def __init__(self, token: str | None = None, cc_group_id: str | None = None):
+	def __init__(
+		self,
+		token: str | None = None,
+		signing_secret: str | None = None,
+		cc_group_id: str | None = None,
+		app_token: str | None = None,
+		slack_mode: str | None = None,
+	):
+		self.slack_mode = (slack_mode or os.getenv("SLACK_MODE", "https")).lower()
+		self.app_token = app_token or os.getenv("SLACK_APP_TOKEN")
 		slack_token = token
-		self.app = App(token=slack_token)
+		self.app = App(token=slack_token, signing_secret=signing_secret)
+		self.socket_mode_handler: SocketModeHandler | None = None
+		if self.slack_mode == "socket":
+			if not self.app_token:
+				raise ValueError("SLACK_APP_TOKEN must be set when SLACK_MODE=socket")
+			self.socket_mode_handler = SocketModeHandler(self.app, self.app_token)
 		self.client = self.app.client
 		self._cc_group_id = cc_group_id
 
+	def start(self):
+		if self.socket_mode_handler is not None:
+			self.socket_mode_handler.start()
+
 	def post_message(
 		self,
 		*,
@@ -93,7 +112,16 @@ def users_info(self, *, user: str):
 
 
 slack_token = os.getenv("SLACK_TOKEN")
+slack_signing_secret = os.getenv("SLACK_SIGNING_SECRET")
 cc_group_id = os.getenv("SLACK_CC_GROUP_ID")
+slack_mode = os.getenv("SLACK_MODE", "https").strip().lower()
+slack_app_token = os.getenv("SLACK_APP_TOKEN")
 
-slack_bot = SlackBot(token=slack_token, cc_group_id=cc_group_id)
+slack_bot = SlackBot(
+	token=slack_token,
+	signing_secret=slack_signing_secret,
+	cc_group_id=cc_group_id,
+	app_token=slack_app_token,
+	slack_mode=slack_mode,
+)
 slack_client = slack_bot.client
\ No newline at end of file

From 51a017277fd4a76732174dba5b393070d1e62d37 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Fri, 14 Aug 2026 17:48:00 +0000
Subject: [PATCH 054/118] Update socket mode handler

---
 twisted/slack_bot/apps.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/twisted/slack_bot/apps.py b/twisted/slack_bot/apps.py
index 8686b56..ea88efb 100644
--- a/twisted/slack_bot/apps.py
+++ b/twisted/slack_bot/apps.py
@@ -1,5 +1,17 @@
+import os
+
 from django.apps import AppConfig
 
 
 class SlackBotConfig(AppConfig):
     name = 'slack_bot'
+
+    def ready(self):
+        super().ready()
+
+        if os.getenv("SLACK_MODE", "https").strip().lower() != "socket":
+            return
+
+        from .slack import slack_bot
+
+        slack_bot.start()

From c2913fc8faaaf628f5d2f0ac86f39d11b9121a26 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Fri, 14 Aug 2026 18:01:37 +0000
Subject: [PATCH 055/118] Fix Socket Mode

---
 twisted/slack_bot/slack.py    |  9 ++++++-
 twisted/slack_bot/tests.py    | 48 +++++++++++++++++++++++++++++++++--
 twisted/twisted_site/slack.py |  9 ++++++-
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/twisted/slack_bot/slack.py b/twisted/slack_bot/slack.py
index d50618e..7df8336 100644
--- a/twisted/slack_bot/slack.py
+++ b/twisted/slack_bot/slack.py
@@ -1,4 +1,5 @@
 import os
+import threading
 from typing import Any
 from slack_bolt import App
 from slack_bolt.adapter.socket_mode import SocketModeHandler
@@ -18,6 +19,7 @@ def __init__(
 		slack_token = token
 		self.app = App(token=slack_token, signing_secret=signing_secret)
 		self.socket_mode_handler: SocketModeHandler | None = None
+		self.socket_thread: threading.Thread | None = None
 		if self.slack_mode == "socket":
 			if not self.app_token:
 				raise ValueError("SLACK_APP_TOKEN must be set when SLACK_MODE=socket")
@@ -27,7 +29,12 @@ def __init__(
 
 	def start(self):
 		if self.socket_mode_handler is not None:
-			self.socket_mode_handler.start()
+			self.socket_thread = threading.Thread(
+				target=self.socket_mode_handler.start,
+				name="slack-socket-mode",
+				daemon=True,
+			)
+			self.socket_thread.start()
 
 	def post_message(
 		self,
diff --git a/twisted/slack_bot/tests.py b/twisted/slack_bot/tests.py
index 7ce503c..9f98f7c 100644
--- a/twisted/slack_bot/tests.py
+++ b/twisted/slack_bot/tests.py
@@ -1,3 +1,47 @@
-from django.test import TestCase
+from unittest.mock import Mock, patch
 
-# Create your tests here.
+from django.test import SimpleTestCase
+
+from .slack import SlackBot
+
+
+class SlackBotModeTests(SimpleTestCase):
+    @patch("slack_bot.slack.threading.Thread")
+    @patch("slack_bot.slack.SocketModeHandler")
+    def test_socket_mode_starts_in_background_thread(self, socket_handler_cls, thread_cls):
+        socket_handler = Mock()
+        socket_handler_cls.return_value = socket_handler
+        thread_instance = Mock()
+        thread_cls.return_value = thread_instance
+
+        bot = SlackBot(
+            token="xoxb-test",
+            signing_secret="secret",
+            app_token="xapp-test",
+            slack_mode="socket",
+        )
+
+        bot.start()
+
+        socket_handler_cls.assert_called_once_with(bot.app, "xapp-test")
+        thread_cls.assert_called_once_with(
+            target=socket_handler.start,
+            name="slack-socket-mode",
+            daemon=True,
+        )
+        thread_instance.start.assert_called_once_with()
+
+    @patch("slack_bot.slack.threading.Thread")
+    @patch("slack_bot.slack.SocketModeHandler")
+    def test_https_mode_does_not_start_socket_thread(self, socket_handler_cls, thread_cls):
+        bot = SlackBot(
+            token="xoxb-test",
+            signing_secret="secret",
+            app_token="xapp-test",
+            slack_mode="https",
+        )
+
+        bot.start()
+
+        socket_handler_cls.assert_not_called()
+        thread_cls.assert_not_called()
diff --git a/twisted/twisted_site/slack.py b/twisted/twisted_site/slack.py
index d50618e..7df8336 100644
--- a/twisted/twisted_site/slack.py
+++ b/twisted/twisted_site/slack.py
@@ -1,4 +1,5 @@
 import os
+import threading
 from typing import Any
 from slack_bolt import App
 from slack_bolt.adapter.socket_mode import SocketModeHandler
@@ -18,6 +19,7 @@ def __init__(
 		slack_token = token
 		self.app = App(token=slack_token, signing_secret=signing_secret)
 		self.socket_mode_handler: SocketModeHandler | None = None
+		self.socket_thread: threading.Thread | None = None
 		if self.slack_mode == "socket":
 			if not self.app_token:
 				raise ValueError("SLACK_APP_TOKEN must be set when SLACK_MODE=socket")
@@ -27,7 +29,12 @@ def __init__(
 
 	def start(self):
 		if self.socket_mode_handler is not None:
-			self.socket_mode_handler.start()
+			self.socket_thread = threading.Thread(
+				target=self.socket_mode_handler.start,
+				name="slack-socket-mode",
+				daemon=True,
+			)
+			self.socket_thread.start()
 
 	def post_message(
 		self,

From 531fac0c9fb228ab487a65ba8b0b834219833e89 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 14 Aug 2026 23:44:19 +0530
Subject: [PATCH 056/118] Add ?search= param

---
 twisted/twisted_site/templates/admin/users.html | 3 ++-
 twisted/twisted_site/views/admin/users.py       | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/twisted/twisted_site/templates/admin/users.html b/twisted/twisted_site/templates/admin/users.html
index 04e6dd6..d5141a1 100644
--- a/twisted/twisted_site/templates/admin/users.html
+++ b/twisted/twisted_site/templates/admin/users.html
@@ -6,12 +6,13 @@
                 type="search"
                 name="search"
                 hx-get="{% url 'admin.users' %}"
-                hx-trigger="input changed delay:100ms, keyup[key=='Enter'], load"
+                hx-trigger="input changed delay:100ms, keyup[key=='Enter']"
                 hx-target="#container"
                 hx-select="#search-results"
                 hx-indicator=".loading-indicator"
                 placeholder="Search Users..."
                 autocomplete="off"
+                value="{{ request.GET.search }}"
             >
                 <c-slot name="left_addon">
                     <svg
diff --git a/twisted/twisted_site/views/admin/users.py b/twisted/twisted_site/views/admin/users.py
index c259821..19eb9a5 100644
--- a/twisted/twisted_site/views/admin/users.py
+++ b/twisted/twisted_site/views/admin/users.py
@@ -9,7 +9,7 @@ class UsersView(AdminView):
     def get(self, request):
         context = self.get_context_data()
         context['page'] = 'users'
-        if request.htmx:
+        if request.GET.get('search'):
             query = request.GET['search']
             context['users'] = User.objects.all()
             context['users'] = User.objects.filter(
@@ -18,6 +18,7 @@ def get(self, request):
                 Q(first_name__icontains=query) |
                 Q(last_name__icontains=query)
             ).order_by('profile__slack_username')
-            return render(request, "admin/users.html", context=context)
-        context['users'] = User.objects.all().order_by('profile__slack_username')
+            context['search'] = True
+        else:
+            context['users'] = User.objects.all().order_by('profile__slack_username')
         return render(request, "admin/users.html", context=context)
\ No newline at end of file

From 43338b768f0b8120fd66abbab27a99a29aaf11a1 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 15 Aug 2026 10:52:56 +0530
Subject: [PATCH 057/118] improve admin and add user detail page

---
 twisted/twisted_site/models.py                |  7 +-
 .../templates/admin/dashboard.html            |  4 +-
 .../twisted_site/templates/admin/user.html    | 64 +++++++++++++++++--
 .../twisted_site/templates/admin/users.html   | 54 ++++++++--------
 .../twisted_site/templates/cotton/base.html   |  4 +-
 twisted/twisted_site/urls.py                  |  1 +
 twisted/twisted_site/views/admin/__init__.py  |  2 +-
 twisted/twisted_site/views/admin/admin.py     |  7 +-
 .../twisted_site/views/admin/announcements.py |  6 +-
 twisted/twisted_site/views/admin/dashboard.py |  6 +-
 .../twisted_site/views/admin/fulfillment.py   |  3 +-
 twisted/twisted_site/views/admin/pathways.py  |  3 +-
 twisted/twisted_site/views/admin/review.py    |  3 +-
 twisted/twisted_site/views/admin/shop.py      |  3 +-
 twisted/twisted_site/views/admin/users.py     | 14 +++-
 15 files changed, 126 insertions(+), 55 deletions(-)

diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index ffedc21..faa29e3 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -122,10 +122,10 @@ def hackatime_time_unjournaled(self):
     def is_shipped(self):
         ships = ProjectShip.objects.filter(project=self)
         for ship in ships:
-            if ship.status != 'rejected':
+            if ship.status not in ['rejected', 'requested_changes']:
                 return ship
         return False
-                
+
 
 class Journal(models.Model):
     project = models.ForeignKey(Project, on_delete=models.PROTECT, related_name="journals")
@@ -144,8 +144,9 @@ def __str__(self):
 
 
 PROJECT_SHIP_STATUSES = {
-    'created': 'Newly created',
+    'created': 'Awaiting review',
     'rejected': 'Rejected ship',
+    'requested_changes': 'Requested Changes',
     'reqchecked': 'Checked by T1',
     'approved': 'Approved by T2'
 }
diff --git a/twisted/twisted_site/templates/admin/dashboard.html b/twisted/twisted_site/templates/admin/dashboard.html
index 4c2cf2a..b2d7928 100644
--- a/twisted/twisted_site/templates/admin/dashboard.html
+++ b/twisted/twisted_site/templates/admin/dashboard.html
@@ -6,7 +6,9 @@
         <h3 class="text-lg font-semibold mb-2">Welcome back, {{ user.profile.slack_username }}!</h3>
         <p class="text-ink-400">
             <c-ui.button onclick="alert('weh, you are looking at them right now >:(')">See statistics</c-ui.button>
-            <c-ui.button>Manage Users</c-ui.button>
+            <a href="{% url 'admin.users' %}">
+                <c-ui.button>Manage Users</c-ui.button>
+            </a>
             <c-ui.button>Edit Pathways</c-ui.button>
             <c-ui.button>Fulfill orders</c-ui.button>
             <c-ui.button>Edit shop</c-ui.button>
diff --git a/twisted/twisted_site/templates/admin/user.html b/twisted/twisted_site/templates/admin/user.html
index b8ebd1b..dc581ec 100644
--- a/twisted/twisted_site/templates/admin/user.html
+++ b/twisted/twisted_site/templates/admin/user.html
@@ -1,5 +1,61 @@
+{% load maths time_filters %}
 <c-base>
-    <c-ui.button variant="primary">Primary Button</c-ui.button>
-<c-ui.button variant="default">Default Button</c-ui.button>
-
-</c-base>
\ No newline at end of file
+    <a href="{% url 'admin.users' %}">
+        <c-ui.button>Back</c-ui.button>
+    </a>
+    <c-ui.card class="mt-4 bg-ink-900">
+        <div class="flex gap-2">
+            <c-ui.avatar size="md" src="{{ user.profile.slack_pfp_url }}" />
+            <div>
+                <h3 class="text-lg font-semibold mb-1">
+                    @{{ user.profile.slack_username }}
+                    <c-ui.badge size="sm">{{ user.profile.slack_id|default:"user not found" }}</c-ui.badge>
+                </h3>
+                {% if user.profile %}
+                <div>
+                    {% if user.profile.is_staff %}
+                    <c-ui.badge size="sm" color="purple">Staff</c-ui.badge>
+                    {% endif %}
+                    <c-ui.badge size="sm" color="{{ user.profile.ysws_eligible|yesno:'green,red' }}"
+                        >{{ user.profile.ysws_eligible|yesno:"YSWS eligible,Not YSWS eligible" }}</c-ui.badge
+                    >
+                </div>
+                {% endif %}
+            </div>
+        </div>
+    </c-ui.card>
+    <div class="mt-4">
+        <h1 class="text-2xl font-black">Projects</h1>
+        {% if user.projects.all %}
+        <div class="grid gap-4 grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
+            {% for project in user.projects.all %}
+            <c-ui.card class="bg-ink-900">
+                <div>
+                    <h1 class="text-lg font-bold">{{ project }}</h1>
+                </div>
+                <div>
+                    <c-ui.badge>{{ project.get_project_type_display }}</c-ui.badge>
+                    {% if project.is_shipped %}
+                    <c-ui.badge>{{ project.is_shipped.get_status_display }}</c-ui.badge>
+                    {% endif %}
+                </div>
+                <div>
+                    <p>
+                        {{ project.time_logged|minutes_to_hours_minutes }} logged
+                    </p>
+                </div>
+            </c-ui.card>
+            {% endfor %}
+        </div>
+        {% else %}
+        <c-ui.card class="bg-ink-900">
+            <h1 class="text-lg font-bold">
+                No projects found :(
+            </h1>
+            <p>
+                This user has not created any projects!
+            </p>
+        </c-ui.card>
+        {% endif %}
+    </div>
+</c-base>
diff --git a/twisted/twisted_site/templates/admin/users.html b/twisted/twisted_site/templates/admin/users.html
index d5141a1..c6a4661 100644
--- a/twisted/twisted_site/templates/admin/users.html
+++ b/twisted/twisted_site/templates/admin/users.html
@@ -9,7 +9,7 @@
                 hx-trigger="input changed delay:100ms, keyup[key=='Enter']"
                 hx-target="#container"
                 hx-select="#search-results"
-                hx-indicator=".loading-indicator"
+                hx-indicator=".htmx-indicator"
                 placeholder="Search Users..."
                 autocomplete="off"
                 value="{{ request.GET.search }}"
@@ -34,7 +34,7 @@
                 </c-slot>
             </c-ui.input>
         </div>
-        <div class="my-auto loading-indicator">
+        <div class="my-auto htmx-indicator">
             <c-ui.spinner />
         </div>
     </div>
@@ -42,33 +42,37 @@
         <div id="search-results" class="grid gap-2 grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
             {% for user in users %}
                 <c-ui.card class="bg-ink-900">
-                    <div class="flex gap-2">
-                        <c-ui.avatar size="md" src="{{ user.profile.slack_pfp_url }}" />
-                        <div>
-                            <h3 class="text-lg font-semibold mb-1">
-                                @{{ user.profile.slack_username }}
-                                <c-ui.badge size="sm">{{ user.profile.slack_id|default:"user not found" }}</c-ui.badge>
-                            </h3>
-                            {% if user.profile %}
+                    <a href="{% url 'admin.users.detail' user.id %}">
+                        <div class="flex gap-2">
+                            <c-ui.avatar size="md" src="{{ user.profile.slack_pfp_url }}" />
                             <div>
-                                {% if user.profile.is_staff %}
-                                <c-ui.badge size="sm" color="purple">Staff</c-ui.badge>
+                                <h3 class="text-lg font-semibold mb-1">
+                                    @{{ user.profile.slack_username }}
+                                    <c-ui.badge size="sm">{{ user.profile.slack_id|default:"user not found" }}</c-ui.badge>
+                                </h3>
+                                {% if user.profile %}
+                                <div>
+                                    {% if user.profile.is_staff %}
+                                    <c-ui.badge size="sm" color="purple">Staff</c-ui.badge>
+                                    {% endif %}
+                                    <c-ui.badge size="sm" color="{{ user.profile.ysws_eligible|yesno:'green,red' }}"
+                                        >{{ user.profile.ysws_eligible|yesno:"YSWS eligible,Not YSWS eligible" }}</c-ui.badge
+                                    >
+                                </div>
+                                <div class="text-sm">
+                                    <div>
+                                        <p>{{ user.projects.count }} projects created</p>
+                                        <p>{{ user.profile.shipped_projects|length }} projects shipped</p>
+                                    </div>
+                                    <div class="mt-2">
+                                        <p>{{ user.profile.time_logged|divide:60|floatformat:2 }}h logged</p>
+                                        <p>{{ user.profile.time_shipped|divide:60|floatformat:2 }}h shipped</p>
+                                    </div>
+                                </div>
                                 {% endif %}
-                                <c-ui.badge size="sm" color="{{ user.profile.ysws_eligible|yesno:'green,red' }}"
-                                    >{{ user.profile.ysws_eligible|yesno:"YSWS eligible,Not YSWS eligible" }}</c-ui.badge
-                                >
                             </div>
-                            <div>
-                                <p>{{ user.projects.count }} projects created</p>
-                                <p>{{ user.profile.shipped_projects|length }} projects shipped</p>
-                            </div>
-                            <div class="mt-2">
-                                <p>{{ user.profile.time_logged|divide:60|floatformat:2 }}h logged</p>
-                                <p>{{ user.profile.time_shipped|divide:60|floatformat:2 }}h shipped</p>
-                            </div>
-                            {% endif %}
                         </div>
-                    </div>
+                    </a>
                 </c-ui.card>
             {% endfor %}
         </div>
diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html
index ef075c8..f50245d 100644
--- a/twisted/twisted_site/templates/cotton/base.html
+++ b/twisted/twisted_site/templates/cotton/base.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    
+
     {% htmx_script %}
     <script src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.10/dist/htmx.min.js" 
         integrity="sha384-H5SrcfygHmAuTDZphMHqBJLc3FhssKjG7w/CeCpFReSfwBWDTKpkzPP8c+cLsK+V"
@@ -23,7 +23,7 @@
                 {% endfor %}
             </c-sidebar>
         </div>
-        <div class="p-2 flex-1">
+        <div class="p-2 flex-1 overflow-y-auto">
             {{ slot }}
         </div>
     </div>
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index 3e7c6b0..32e5c70 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -28,6 +28,7 @@
 
     path("admin/", admin.DashboardView.as_view(), name="admin.dash"),
     path("admin/users/", admin.UsersView.as_view(), name="admin.users"),
+    path("admin/users/<int:id>/", admin.UserDetailView.as_view(), name="admin.users.detail"),
     path("admin/pathways/", admin.PathwaysView.as_view(), name="admin.pathways"),
     path("admin/fulfillment/", admin.FulfillmentView.as_view(), name="admin.fulfillment"),
     path("admin/shop/", admin.ShopView.as_view(), name="admin.shop"),
diff --git a/twisted/twisted_site/views/admin/__init__.py b/twisted/twisted_site/views/admin/__init__.py
index 4b03aff..fc43652 100644
--- a/twisted/twisted_site/views/admin/__init__.py
+++ b/twisted/twisted_site/views/admin/__init__.py
@@ -1,5 +1,5 @@
 from .dashboard import DashboardView
-from .users import UsersView
+from .users import UsersView, UserDetailView
 from .pathways import PathwaysView
 from .fulfillment import FulfillmentView
 from .shop import ShopView
diff --git a/twisted/twisted_site/views/admin/admin.py b/twisted/twisted_site/views/admin/admin.py
index ac16e93..f0be2c1 100644
--- a/twisted/twisted_site/views/admin/admin.py
+++ b/twisted/twisted_site/views/admin/admin.py
@@ -11,8 +11,10 @@ class SidebarLink:
 
 # Create your views here.
 class AdminView(View):
-    def get_context_data(self, **kwargs) -> dict:
+    def get_context_data(self, page, subpage=None) -> dict:
         context = {}
+        context['page'] = page
+        context['subpage'] = subpage
         context["sidebar_links"] = [
             SidebarLink(name="dashboard", icon="analytics", text="Dashboard", href=resolve_url('admin.dash')),
             SidebarLink(name="users", icon="profile", text="Users", href=resolve_url('admin.users')),
@@ -31,4 +33,5 @@ def dispatch(self, request, *args, **kwargs):
             return redirect('homepage')
         if not request.user.profile.is_staff:
             return redirect('dashboard')
-        return super().dispatch(request, *args, **kwargs)
\ No newline at end of file
+        response = super().dispatch(request, *args, **kwargs)
+        return response
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/announcements.py b/twisted/twisted_site/views/admin/announcements.py
index 8f03b4c..73c496a 100644
--- a/twisted/twisted_site/views/admin/announcements.py
+++ b/twisted/twisted_site/views/admin/announcements.py
@@ -1,11 +1,11 @@
+from django.template.response import TemplateResponse
 from .admin import AdminView
 from django.shortcuts import render, redirect
 
 # Create your views here.
 class AnnouncementsView(AdminView):
     def get(self, request):
-        context = self.get_context_data()
-        context['page'] = 'announcements'
+        context = self.get_context_data(page='announcements')
         if self.request.user.is_anonymous:
             return redirect('homepage')
-        return render(request, "admin/announcements.html", context=context)
+        return TemplateResponse(request, "admin/announcements.html", context=context)
diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
index 4ce475e..a0010e9 100644
--- a/twisted/twisted_site/views/admin/dashboard.py
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -1,3 +1,4 @@
+from django.template.response import TemplateResponse
 from .admin import AdminView
 from django.shortcuts import render, redirect
 from ...models import Journal, Project, ProjectShip
@@ -5,8 +6,7 @@
 # Create your views here.
 class DashboardView(AdminView):
     def get(self, request):
-        context = self.get_context_data()
-        context['page'] = 'dashboard'
+        context = self.get_context_data(page='dashboard')
         if self.request.user.is_anonymous:
             return redirect('homepage')
         hours_logged = 0
@@ -38,4 +38,4 @@ def get(self, request):
         context['shipped_project_type'] = json.dumps([['Type', 'Hours']] + list(shipped_project_type.items()))
         
         
-        return render(request, "admin/dashboard.html", context=context)
\ No newline at end of file
+        return TemplateResponse(request, "admin/dashboard.html", context=context)
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/fulfillment.py b/twisted/twisted_site/views/admin/fulfillment.py
index 00397da..ba0be71 100644
--- a/twisted/twisted_site/views/admin/fulfillment.py
+++ b/twisted/twisted_site/views/admin/fulfillment.py
@@ -4,6 +4,5 @@
 # Create your views here.
 class FulfillmentView(AdminView):
     def get(self, request):
-        context = self.get_context_data()
-        context['page'] = 'fulfillment'
+        context = self.get_context_data(page='fulfillment')
         return render(request, "admin/fulfillment.html", context=context)
diff --git a/twisted/twisted_site/views/admin/pathways.py b/twisted/twisted_site/views/admin/pathways.py
index 19c58a3..ea2bcc0 100644
--- a/twisted/twisted_site/views/admin/pathways.py
+++ b/twisted/twisted_site/views/admin/pathways.py
@@ -4,6 +4,5 @@
 # Create your views here.
 class PathwaysView(AdminView):
     def get(self, request):
-        context = self.get_context_data()
-        context['page'] = 'pathways'
+        context = self.get_context_data(page='pathways')
         return render(request, "admin/pathways.html", context=context)
diff --git a/twisted/twisted_site/views/admin/review.py b/twisted/twisted_site/views/admin/review.py
index f2978a9..3680dc4 100644
--- a/twisted/twisted_site/views/admin/review.py
+++ b/twisted/twisted_site/views/admin/review.py
@@ -4,6 +4,5 @@
 # Create your views here.
 class ReviewView(AdminView):
     def get(self, request):
-        context = self.get_context_data()
-        context['page'] = 'review'
+        context = self.get_context_data(page='review')
         return render(request, "admin/review.html", context=context)
diff --git a/twisted/twisted_site/views/admin/shop.py b/twisted/twisted_site/views/admin/shop.py
index 549e26d..3e563b7 100644
--- a/twisted/twisted_site/views/admin/shop.py
+++ b/twisted/twisted_site/views/admin/shop.py
@@ -4,6 +4,5 @@
 # Create your views here.
 class ShopView(AdminView):
     def get(self, request):
-        context = self.get_context_data()
-        context['page'] = 'shop'
+        context = self.get_context_data(page='shop')
         return render(request, "admin/shop.html", context=context)
diff --git a/twisted/twisted_site/views/admin/users.py b/twisted/twisted_site/views/admin/users.py
index 19eb9a5..984b940 100644
--- a/twisted/twisted_site/views/admin/users.py
+++ b/twisted/twisted_site/views/admin/users.py
@@ -1,3 +1,4 @@
+from django.template.response import TemplateResponse
 from django.http import HttpResponse
 from .admin import AdminView
 from django.shortcuts import render, redirect
@@ -7,8 +8,7 @@
 # Create your views here.
 class UsersView(AdminView):
     def get(self, request):
-        context = self.get_context_data()
-        context['page'] = 'users'
+        context = self.get_context_data(page='users')
         if request.GET.get('search'):
             query = request.GET['search']
             context['users'] = User.objects.all()
@@ -21,4 +21,12 @@ def get(self, request):
             context['search'] = True
         else:
             context['users'] = User.objects.all().order_by('profile__slack_username')
-        return render(request, "admin/users.html", context=context)
\ No newline at end of file
+        return TemplateResponse(request, "admin/users.html", context)
+
+class UserDetailView(AdminView):
+    def get(self, request, id):
+        context = self.get_context_data(page='users', subpage='detail')
+        user = User.objects.get(id=id)
+        context['user'] = user
+        
+        return TemplateResponse(request, "admin/user.html", context)
\ No newline at end of file

From 8e05faac01ca5e892e5bed7e64089d03d24daa8a Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 15 Aug 2026 16:25:15 +0530
Subject: [PATCH 058/118] Add LOGIN_ALLOWED='maybe' for selective allowance

---
 twisted/.env.example                          |  2 +-
 twisted/mysite/urls.py                        |  2 +-
 twisted/slack_bot/urls.py                     |  2 +-
 ..._dark_theme_profile_is_allowed_and_more.py | 27 +++++++++++++++++++
 twisted/twisted_site/models.py                |  3 +--
 .../twisted_site/templates/admin/user.html    | 12 +++++++++
 .../twisted_site/templates/admin/users.html   | 11 ++++++++
 .../templates/client/homepage.html            |  2 +-
 twisted/twisted_site/views/admin/users.py     | 25 +++++++++++++++--
 twisted/twisted_site/views/client/auth.py     |  6 ++++-
 10 files changed, 83 insertions(+), 9 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0017_remove_profile_dark_theme_profile_is_allowed_and_more.py

diff --git a/twisted/.env.example b/twisted/.env.example
index f028aeb..f138bca 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -1,5 +1,5 @@
 SECRET_KEY=<insert-super-secure-secret-here>
-LOGIN_ENABLED=true
+LOGIN_ENABLED=true # possible options: 'true,false,maybe'
 DEBUG=true
 
 POSTGRES_DB = django
diff --git a/twisted/mysite/urls.py b/twisted/mysite/urls.py
index d77c7b9..a81504d 100644
--- a/twisted/mysite/urls.py
+++ b/twisted/mysite/urls.py
@@ -21,7 +21,7 @@
 
 urlpatterns = [
     path("", include("twisted_site.urls")),
-    path("_slackbot/", include("slack_bot.urls")),
+    path("", include("slack_bot.urls")),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
 if settings.DEBUG:
diff --git a/twisted/slack_bot/urls.py b/twisted/slack_bot/urls.py
index 2ec9e08..c296fcd 100644
--- a/twisted/slack_bot/urls.py
+++ b/twisted/slack_bot/urls.py
@@ -4,5 +4,5 @@
 app_name = "slack_bot"
 
 urlpatterns = [
-    path("/slack/events", views.slack_events, name="events"),
+    path("slack/events/", views.slack_events, name="events"),
 ]
diff --git a/twisted/twisted_site/migrations/0017_remove_profile_dark_theme_profile_is_allowed_and_more.py b/twisted/twisted_site/migrations/0017_remove_profile_dark_theme_profile_is_allowed_and_more.py
new file mode 100644
index 0000000..950fa21
--- /dev/null
+++ b/twisted/twisted_site/migrations/0017_remove_profile_dark_theme_profile_is_allowed_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 6.0.7 on 2026-08-15 09:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0016_profile_ysws_eligible'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='profile',
+            name='dark_theme',
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='is_allowed',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='projectship',
+            name='status',
+            field=models.CharField(choices=[('created', 'Awaiting review'), ('rejected', 'Rejected ship'), ('requested_changes', 'Requested Changes'), ('reqchecked', 'Checked by T1'), ('approved', 'Approved by T2')], default='created', max_length=200),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index faa29e3..bb1d9a0 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -34,7 +34,7 @@ class Profile(models.Model):
     hackatime_state = models.CharField(max_length=100, blank=True, default="")
     
     is_staff = models.BooleanField(default=False)
-    dark_theme = models.BooleanField(default=True)
+    is_allowed = models.BooleanField(default=False)
     
     def shipped_projects(self):
         shipped_projects = []
@@ -64,7 +64,6 @@ def __str__(self):
 class Project(models.Model):
     user = models.ForeignKey(User, on_delete=models.PROTECT, related_name="projects")
 
-    
     project_name = models.CharField(max_length=50)
     project_description = models.TextField(max_length=2000)
     
diff --git a/twisted/twisted_site/templates/admin/user.html b/twisted/twisted_site/templates/admin/user.html
index dc581ec..888f6c3 100644
--- a/twisted/twisted_site/templates/admin/user.html
+++ b/twisted/twisted_site/templates/admin/user.html
@@ -16,6 +16,9 @@ <h3 class="text-lg font-semibold mb-1">
                     {% if user.profile.is_staff %}
                     <c-ui.badge size="sm" color="purple">Staff</c-ui.badge>
                     {% endif %}
+                    {% if login_maybe %}
+                    <c-ui.badge size="sm" color="{{ user.profile.is_allowed|yesno:'green,red' }}">{{ user.profile.is_allowed|yesno:"Login allowed,Login disallowed" }}</c-ui.badge>
+                    {% endif %}
                     <c-ui.badge size="sm" color="{{ user.profile.ysws_eligible|yesno:'green,red' }}"
                         >{{ user.profile.ysws_eligible|yesno:"YSWS eligible,Not YSWS eligible" }}</c-ui.badge
                     >
@@ -58,4 +61,13 @@ <h1 class="text-lg font-bold">
         </c-ui.card>
         {% endif %}
     </div>
+    {% if login_maybe %}
+    <div class="mt-4">
+        <form method="post">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="toggle_is_allowed">
+            <c-ui.button type="submit">Toggle allowed state</c-ui.button>
+        </form>
+    </div>
+    {% endif %}
 </c-base>
diff --git a/twisted/twisted_site/templates/admin/users.html b/twisted/twisted_site/templates/admin/users.html
index c6a4661..ea61d79 100644
--- a/twisted/twisted_site/templates/admin/users.html
+++ b/twisted/twisted_site/templates/admin/users.html
@@ -55,6 +55,9 @@ <h3 class="text-lg font-semibold mb-1">
                                     {% if user.profile.is_staff %}
                                     <c-ui.badge size="sm" color="purple">Staff</c-ui.badge>
                                     {% endif %}
+                                    {% if user.profile.is_allowed %}
+                                    <c-ui.badge size="sm" color="purple">Allowed</c-ui.badge>
+                                    {% endif %}
                                     <c-ui.badge size="sm" color="{{ user.profile.ysws_eligible|yesno:'green,red' }}"
                                         >{{ user.profile.ysws_eligible|yesno:"YSWS eligible,Not YSWS eligible" }}</c-ui.badge
                                     >
@@ -77,4 +80,12 @@ <h3 class="text-lg font-semibold mb-1">
             {% endfor %}
         </div>
     </div>
+    <div class="mt-100">
+        <form method="post">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="logoutall">
+            hehe click this funny button to log everyone out:
+            <c-ui.button type="submit" variant="danger">Log everyone out</c-ui.button>
+        </form>
+    </div>
 </c-base>
diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index 0d19b42..1476756 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -26,7 +26,7 @@
         <a href="https://docs.twisted.hackclub.com">Docs</a>
       </nav>
       <div id="rsvp">
-        {% if login_enabled %}
+        {% if login_enabled != 'false' %}
         {% if user.is_authenticated %}
         <a href="{% url 'dashboard' %}">
           <button class="bg-twisted-400 text-absolute-white text-2xl font-bold py-3 px-10 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
diff --git a/twisted/twisted_site/views/admin/users.py b/twisted/twisted_site/views/admin/users.py
index 984b940..a38e9cb 100644
--- a/twisted/twisted_site/views/admin/users.py
+++ b/twisted/twisted_site/views/admin/users.py
@@ -1,9 +1,12 @@
+from django.contrib.sessions.models import Session
 from django.template.response import TemplateResponse
 from django.http import HttpResponse
 from .admin import AdminView
 from django.shortcuts import render, redirect
 from ...models import User, Profile
 from django.db.models import Q
+import os
+import json
 
 # Create your views here.
 class UsersView(AdminView):
@@ -23,10 +26,28 @@ def get(self, request):
             context['users'] = User.objects.all().order_by('profile__slack_username')
         return TemplateResponse(request, "admin/users.html", context)
 
+    def post(self, request):
+        if request.POST.get('action') == 'logoutall':
+            Session.objects.all().delete()
+        
+        return redirect(self.request.path)
+    
 class UserDetailView(AdminView):
     def get(self, request, id):
         context = self.get_context_data(page='users', subpage='detail')
         user = User.objects.get(id=id)
         context['user'] = user
-        
-        return TemplateResponse(request, "admin/user.html", context)
\ No newline at end of file
+        context['login_maybe'] = os.environ.get("LOGIN_ENABLED") == 'maybe'
+        return TemplateResponse(request, "admin/user.html", context)
+    
+    def post(self, request, id):
+        user = User.objects.get(id=id)
+        if request.POST.get('action') == 'toggle_is_allowed':
+            prof = user.profile
+            prof.is_allowed = not prof.is_allowed
+            prof.save()
+            resp = redirect(self.request.path)
+            resp["HX-Trigger"] = json.dumps({
+                "toast": {"message": f"Set is_allowed to {prof.is_allowed}", "variant": "success"}
+            })
+            return resp
diff --git a/twisted/twisted_site/views/client/auth.py b/twisted/twisted_site/views/client/auth.py
index 21cb5f2..0772367 100644
--- a/twisted/twisted_site/views/client/auth.py
+++ b/twisted/twisted_site/views/client/auth.py
@@ -35,7 +35,7 @@ def post(self, request):
 class AuthCallbackView(View):
     def get(self, request):
         if os.environ.get("LOGIN_ENABLED") == 'false':
-            return JsonResponse("not allowed!")
+            return JsonResponse({"error": "Not allowed! DM @kavyansh. if this is a mistake!"})
         
         token = oauth.hca.authorize_access_token(request)
         
@@ -84,6 +84,10 @@ def get(self, request):
         profile.ysws_eligible = ysws_eligible
         profile.save()
 
+        if os.environ.get("LOGIN_ENABLED") == 'maybe':
+            if not profile.is_allowed:
+                return JsonResponse({"error": "Not allowed! DM @kavyansh. if this is a mistake!"})
+        
         login(request, user)
         
         if not profile.hackatime_access_token:

From 62887229a8e8dcadb1fe73a573bb7c729d588ef4 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sun, 16 Aug 2026 12:32:23 +0530
Subject: [PATCH 059/118] Add better looking icons

---
 .../templates/client/dashboard.html           | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index bff4b21..f1e484b 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -1,25 +1,26 @@
 {% extends "client/osbase.html" %} {% load static %} {% block body %}
 <div class="h-full text-absolute-white">
     <div class="p-4 flex flex-col gap-3">
-        <div>
-            <button
-                onclick="newWindow('Projects', '{% url 'fr.projects' %}')"
-                class="bg-twisted-400 text-absolute-white font-bold px-4 py-2 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200"
-            >
-                Projects
-            </button>
-        </div>
         {% if user.profile.is_staff %}
-        <div>
+        <div class="font-vintage w-fit cursor-pointer" onclick="newWindow('Projects', '{% url 'fr.projects' %}')">
             <a href="{% url 'admin.dash' %}" target="_blank">
-                <button
-                    class="bg-twisted-400 text-absolute-white font-bold px-4 py-2 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200"
-                >
-                    Admin
-                </button>
+                <img
+                    src="{% static 'images/round-square.jpg' %}"
+                    alt=""
+                    class="size-20"
+                />
+                <span class="text-white block text-center">Admin</span>
             </a>
         </div>
         {% endif %}
+        <div class="font-vintage w-fit cursor-pointer" onclick="newWindow('Projects', '{% url 'fr.projects' %}')">
+            <img
+                src="{% static 'images/round-square.jpg' %}"
+                alt=""
+                class="size-20"
+            />
+            <span class="block text-center">Projects</span>
+        </div>
     </div>
 
     <div id="windows-container"></div>
@@ -272,7 +273,7 @@
             fullscreenWindow(realWin);
         });
         realWin.querySelector(".reload-button").addEventListener("mouseup", () => {
-            frame = realWin.querySelector('.src-frame');
+            frame = realWin.querySelector(".src-frame");
             frame.src = frame.src;
         });
         realWin.querySelector(".close-button").addEventListener("mouseup", () => {

From 11c4faed2868186955657f899fe41a7e5d696899 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Mon, 17 Aug 2026 14:42:17 +0530
Subject: [PATCH 060/118] Fix Bugs

---
 twisted/slack_bot/views.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/twisted/slack_bot/views.py b/twisted/slack_bot/views.py
index fc1f917..c8692a4 100644
--- a/twisted/slack_bot/views.py
+++ b/twisted/slack_bot/views.py
@@ -24,10 +24,10 @@ def slack_events(request):
 
 
 @slack_bot.app.event("app_mention")
-def handle_app_mention(body, say, logger):
+async def handle_app_mention(body, say, logger):
     """Handle when the bot is mentioned in a message"""
     logger.debug(f"App mention event: {body}")
-    say(f"Thanks for the mention! <@{body['event']['user']}>")
+    await say(f"Thanks for the mention! <@{body['event']['user']}>")
 
 
 @slack_bot.app.event("message")
@@ -40,13 +40,13 @@ def handle_message(body, logger):
 
 
 @slack_bot.app.command("/hellotwisted")
-def handle_hello_command(ack, respond, command):
+async def handle_hello_command(ack, respond, command):
     """
     Slash command: /hellotwisted
     Responds with a greeting and user information
     """
-    ack()
-    respond(
+    await ack()
+    await respond(
         text=f"Hello <@{command['user_id']}>! 👋",
         blocks=[
             {

From b9ee91456a8f84c847ca6ac03141c45b68861cbb Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Mon, 17 Aug 2026 22:19:16 +0530
Subject: [PATCH 061/118] Start working on pathways

---
 pyproject.toml                                |  1 +
 twisted/mysite/settings.py                    |  1 +
 .../twisted_site/migrations/0018_pathway.py   | 25 ++++++++++++++++
 twisted/twisted_site/models.py                | 12 +++++++-
 .../templates/client/dashboard.html           | 16 +++++++---
 .../templates/client/pathways.html            | 29 +++++++++++++++++++
 twisted/twisted_site/urls.py                  |  1 +
 twisted/twisted_site/views/client/__init__.py |  3 +-
 twisted/twisted_site/views/client/pathways.py | 27 +++++++++++++++++
 uv.lock                                       | 14 +++++++++
 10 files changed, 123 insertions(+), 6 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0018_pathway.py
 create mode 100644 twisted/twisted_site/templates/client/pathways.html
 create mode 100644 twisted/twisted_site/views/client/pathways.py

diff --git a/pyproject.toml b/pyproject.toml
index d39594b..065c5cc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,4 +24,5 @@ dependencies = [
     "django-google-charts>=0.1.1",
     "django-qsstats-magic>=1.1.0",
     "django-htmx>=1.29.0",
+    "django-extensions>=4.1",
 ]
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 50a5cc0..5189746 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -64,6 +64,7 @@
     'tailwind',
     TAILWIND_APP_NAME,
     'django_htmx',
+    'django_extensions',
 ]
 
 if DEBUG:
diff --git a/twisted/twisted_site/migrations/0018_pathway.py b/twisted/twisted_site/migrations/0018_pathway.py
new file mode 100644
index 0000000..84d114a
--- /dev/null
+++ b/twisted/twisted_site/migrations/0018_pathway.py
@@ -0,0 +1,25 @@
+# Generated by Django 6.0.7 on 2026-08-17 15:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0017_remove_profile_dark_theme_profile_is_allowed_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Pathway',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('start', models.DateTimeField()),
+                ('end', models.DateTimeField()),
+                ('name', models.CharField(max_length=200)),
+                ('min_mins', models.IntegerField(default=300)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+            ],
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index bb1d9a0..d0669b9 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -164,4 +164,14 @@ class ProjectShip(models.Model):
     status = models.CharField(max_length=200, choices=PROJECT_SHIP_STATUSES, default='created')
     
     def __str__(self):
-        return f"Ship created at {self.created_at} ({PROJECT_SHIP_STATUSES.get(str(self.status), self.status)})"
\ No newline at end of file
+        return f"Ship created at {self.created_at} ({PROJECT_SHIP_STATUSES.get(str(self.status), self.status)})"
+
+class Pathway(models.Model):
+    start = models.DateTimeField()
+    end = models.DateTimeField()
+    
+    name = models.CharField(max_length=200)
+    min_mins = models.IntegerField(default=300)
+
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index f1e484b..ea3284a 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -1,8 +1,8 @@
 {% extends "client/osbase.html" %} {% load static %} {% block body %}
 <div class="h-full text-absolute-white">
-    <div class="p-4 flex flex-col gap-3">
+    <div class="p-4 flex flex-col flex-wrap content-start gap-3 w-full h-full overflow-y-hidden">
         {% if user.profile.is_staff %}
-        <div class="font-vintage w-fit cursor-pointer" onclick="newWindow('Projects', '{% url 'fr.projects' %}')">
+        <div class="font-vintage w-fit cursor-pointer">
             <a href="{% url 'admin.dash' %}" target="_blank">
                 <img
                     src="{% static 'images/round-square.jpg' %}"
@@ -21,6 +21,14 @@
             />
             <span class="block text-center">Projects</span>
         </div>
+        <div class="font-vintage w-fit cursor-pointer" onclick="newWindow('Pathways', '{% url 'fr.pathways' %}')">
+            <img
+            src="{% static 'images/round-square.jpg' %}"
+            alt=""
+            class="size-20"
+            />
+            <span class="block text-center">Pathways</span>
+        </div>
     </div>
 
     <div id="windows-container"></div>
@@ -39,7 +47,7 @@
 
             <div
                 id="start-menu"
-                style="display: none; position: fixed; bottom: 48px; left: 4px; width: 520px"
+                style="display: none; position: fixed; bottom: 36px; left: 4px; width: 520px"
                 class="z-[10000] bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg"
             >
                 <div class="flex">
@@ -199,7 +207,7 @@
             </div>
         </div>
         <div class="window-body h-full flex-1">
-            <iframe class="w-full h-full src-frame" src="about:blank" frameborder="0"></iframe>
+            <iframe class="w-full h-full src-frame select-none" src="about:blank" frameborder="0"></iframe>
         </div>
     </div>
 </template>
diff --git a/twisted/twisted_site/templates/client/pathways.html b/twisted/twisted_site/templates/client/pathways.html
new file mode 100644
index 0000000..48a4147
--- /dev/null
+++ b/twisted/twisted_site/templates/client/pathways.html
@@ -0,0 +1,29 @@
+{% extends "client/osbase.html" %} {% load static time_filters humanize %} {% block body %}
+<div class="bg-surface flex flex-col w-full h-full">
+    <div class="flex-1 sunken-panel font-vintage overflow-y-scroll p-4">
+        <div class="text-center">
+            <div class="text-xl">
+                CURRENT PATHWAY
+            </div>
+            <div class="text-3xl font-bold">
+                {{ current_pathway.name|default:"none! please dm @kavyansh." }}
+            </div>
+            <div>
+                {{ current_mins|minutes_to_hours_minutes }}/{{ current_pathway.min_mins|minutes_to_hours_minutes }} required
+            </div>
+            <div class="text-xl">
+                <div>
+                    Started {{ current_pathway.start|naturaltime }}
+                </div>
+                <div>
+                    Ends {{ current_pathway.end|naturaltime }}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="sticky status-field-border font-vintage">
+        <div class="mx-1">{{ pathways|length }} pathway{{ pathways|length|pluralize }}</div>
+    </div>
+</div>
+
+{% endblock body %}
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index 32e5c70..37f3e8e 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -25,6 +25,7 @@
     path("dashboard/frame/projects/<int:id>/journals/new/hackatime/", client.NewProjectHackatimeJournal.as_view(), name="fr.projects.journals.new.hackatime"),
     path("dashboard/frame/projects/<int:id>/journals/new/untracked/", client.NewProjectUntrackedJournal.as_view(), name="fr.projects.journals.new.untracked"),
     path("dashboard/frame/journals/delete/<int:id>/", client.DeleteJournal.as_view(), name="fr.projects.journals.delete"),
+    path("dashboard/frame/pathways/", client.PathwaysView.as_view(), name="fr.pathways"),
 
     path("admin/", admin.DashboardView.as_view(), name="admin.dash"),
     path("admin/users/", admin.UsersView.as_view(), name="admin.users"),
diff --git a/twisted/twisted_site/views/client/__init__.py b/twisted/twisted_site/views/client/__init__.py
index cfd1570..b68b5fc 100644
--- a/twisted/twisted_site/views/client/__init__.py
+++ b/twisted/twisted_site/views/client/__init__.py
@@ -2,4 +2,5 @@
 from .dashboard import DashboardView
 from .projects import ListProjects, CreateProject
 from .project import ProjectDetail, ProjectSettings, SubmitProject
-from .journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal, DeleteJournal
\ No newline at end of file
+from .journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal, DeleteJournal
+from .pathways import PathwaysView
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/pathways.py b/twisted/twisted_site/views/client/pathways.py
new file mode 100644
index 0000000..18052b8
--- /dev/null
+++ b/twisted/twisted_site/views/client/pathways.py
@@ -0,0 +1,27 @@
+from django.utils import timezone
+from django.http import JsonResponse, HttpResponse
+from django.views import View
+from django.shortcuts import render, redirect
+from ...models import Pathway
+
+
+# Create your views here.
+class PathwaysView(View):
+    def get(self, request):
+        if self.request.user.is_anonymous:
+            return redirect('homepage')
+        
+        profile = request.user.profile
+        pathways = Pathway.objects.order_by('-start').all()
+
+        current_pathway = None
+        for pathway in pathways:
+            if pathway.start < timezone.now() and pathway.end > timezone.now():
+                current_pathway = pathway
+                break
+        
+        return render(
+            request,
+            "client/pathways.html",
+            {"profile": profile, 'pathways': pathways, "current_pathway": current_pathway},
+        )
diff --git a/uv.lock b/uv.lock
index 997ee90..ad903e9 100644
--- a/uv.lock
+++ b/uv.lock
@@ -457,6 +457,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d2/61/1de040c48796f16afdaae9ab4fd5c6683b819c02a06f77563dcfb0e9fdb6/django_cotton_ui-0.3.2-py3-none-any.whl", hash = "sha256:0a05d6f733553929389071786a9524335782c7f9d3e1ca8fe4234cdf80488bf2", size = 214320, upload-time = "2026-07-07T12:57:23.837Z" },
 ]
 
+[[package]]
+name = "django-extensions"
+version = "4.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "django" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/6d/b3/ed0f54ed706ec0b54fd251cc0364a249c6cd6c6ec97f04dc34be5e929eac/django_extensions-4.1.tar.gz", hash = "sha256:7b70a4d28e9b840f44694e3f7feb54f55d495f8b3fa6c5c0e5e12bcb2aa3cdeb", size = 283078, upload-time = "2025-04-11T01:15:39.617Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/64/96/d967ca440d6a8e3861120f51985d8e5aec79b9a8bdda16041206adfe7adc/django_extensions-4.1-py3-none-any.whl", hash = "sha256:0699a7af28f2523bf8db309a80278519362cd4b6e1fd0a8cd4bf063e1e023336", size = 232980, upload-time = "2025-04-11T01:15:37.701Z" },
+]
+
 [[package]]
 name = "django-google-charts"
 version = "0.1.1"
@@ -1138,6 +1150,7 @@ dependencies = [
     { name = "django" },
     { name = "django-cotton" },
     { name = "django-cotton-ui" },
+    { name = "django-extensions" },
     { name = "django-google-charts" },
     { name = "django-htmx" },
     { name = "django-jazzmin" },
@@ -1161,6 +1174,7 @@ requires-dist = [
     { name = "django", specifier = ">=6.0.7" },
     { name = "django-cotton", specifier = ">=2.7.2" },
     { name = "django-cotton-ui", specifier = ">=0.3.2" },
+    { name = "django-extensions", specifier = ">=4.1" },
     { name = "django-google-charts", specifier = ">=0.1.1" },
     { name = "django-htmx", specifier = ">=1.29.0" },
     { name = "django-jazzmin", specifier = ">=3.0.5" },

From 4d4f2969e5ab928c0aae89a58b570b9f4c264dce Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 20 Aug 2026 13:30:23 +0530
Subject: [PATCH 062/118] Add pathways

---
 pyproject.toml                                |   2 +
 twisted/mysite/settings.py                    |   3 +
 twisted/twisted_site/models.py                | 124 +++++++++++++-----
 .../templates/client/pathways.html            | 113 ++++++++++++++--
 .../twisted_site/templatetags/time_filters.py |   8 ++
 twisted/twisted_site/views/client/pathways.py |  58 ++++++--
 uv.lock                                       |  32 +++++
 7 files changed, 286 insertions(+), 54 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 065c5cc..49fdf52 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,4 +25,6 @@ dependencies = [
     "django-qsstats-magic>=1.1.0",
     "django-htmx>=1.29.0",
     "django-extensions>=4.1",
+    "django-mathfilters>=1.0.0",
+    "django-humanize>=0.1.2",
 ]
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 5189746..a8eadd3 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -65,6 +65,8 @@
     TAILWIND_APP_NAME,
     'django_htmx',
     'django_extensions',
+    'mathfilters',
+    'django_humanize'
 ]
 
 if DEBUG:
@@ -152,6 +154,7 @@
 TIME_ZONE = 'UTC'
 
 USE_I18N = True
+USE_L10N = True
 
 USE_TZ = True
 
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index d0669b9..be2026a 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -1,26 +1,29 @@
 from django.db.models import TextField
 from django.contrib.auth import get_user_model
 from django.db import models
+from django.utils import timezone
 from . import hackatime
 
 User = get_user_model()
 
 JOURNAL_TYPES = {
-   'hackatime': 'Hackatime',
-   'lookout': 'Lookout',
-   'untracked': 'Untracked'
+    "hackatime": "Hackatime",
+    "lookout": "Lookout",
+    "untracked": "Untracked",
 }
 
+
 class UploadedFile(models.Model):
     uploaded_by = models.ForeignKey(User, on_delete=models.PROTECT)
     link = models.CharField(max_length=500)
     cdn_response = models.JSONField()
     uploaded_thru = models.CharField(max_length=500)
     filesize = models.IntegerField()
-    
+
     def __str__(self):
         return f"{self.cdn_response['filename']} uploaded by {self.uploaded_by.profile.slack_username}"
 
+
 # Create your models here.
 class Profile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="profile")
@@ -32,10 +35,10 @@ class Profile(models.Model):
 
     hackatime_access_token = models.CharField(max_length=2000, blank=True, default="")
     hackatime_state = models.CharField(max_length=100, blank=True, default="")
-    
+
     is_staff = models.BooleanField(default=False)
     is_allowed = models.BooleanField(default=False)
-    
+
     def shipped_projects(self):
         shipped_projects = []
         for project in self.user.projects.all():
@@ -54,27 +57,28 @@ def time_shipped(self):
         for project in self.shipped_projects():
             time_shipped += project.time_logged()
         return time_shipped
-    
+
     def __str__(self):
         return self.user.username  # ty:ignore[unresolved-attribute]
 
 
-PROJECT_TYPE_CHOICES = {'software': 'Software', 'hardware': 'Hardware'}
+PROJECT_TYPE_CHOICES = {"software": "Software", "hardware": "Hardware"}
+
 
 class Project(models.Model):
     user = models.ForeignKey(User, on_delete=models.PROTECT, related_name="projects")
 
     project_name = models.CharField(max_length=50)
     project_description = models.TextField(max_length=2000)
-    
+
     project_type = models.CharField(choices=PROJECT_TYPE_CHOICES, max_length=100)
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
-    
+
     hackatime_project_name = models.CharField(max_length=200, blank=True, default="")
     repo_url = models.CharField(max_length=200, blank=True, default="")
-    
+
     def __str__(self):
         return self.project_name
 
@@ -86,7 +90,7 @@ def get_hackatime_project(self) -> hackatime.HackatimeProject | None:
             if project.name == self.hackatime_project_name:
                 return project
         return
-    
+
     def time_logged(self, include_all_minutes=False):
         minutes = 0
         for journal in self.journals.all():  # ty:ignore[unresolved-attribute]
@@ -96,11 +100,11 @@ def time_logged(self, include_all_minutes=False):
             else:
                 minutes += journal.reduced_minutes
         return minutes
-    
+
     def hackatime_logged(self, include_all_minutes=False):
         minutes = 0
         for journal in self.journals.all():  # ty:ignore[unresolved-attribute]
-            if journal.type != 'hackatime':
+            if journal.type != "hackatime":
                 continue
             if include_all_minutes:
                 # django-orm-lens-disable-next-line DOL007
@@ -108,7 +112,7 @@ def hackatime_logged(self, include_all_minutes=False):
             else:
                 minutes += journal.reduced_minutes
         return minutes
-    
+
     def time_spent(self):
         project = self.get_hackatime_project()
         if project is None:
@@ -117,61 +121,115 @@ def time_spent(self):
 
     def hackatime_time_unjournaled(self):
         return self.time_spent() - self.hackatime_logged(include_all_minutes=True)
-    
+
     def is_shipped(self):
         ships = ProjectShip.objects.filter(project=self)
         for ship in ships:
-            if ship.status not in ['rejected', 'requested_changes']:
+            if ship.status not in ["rejected", "requested_changes"]:
                 return ship
         return False
 
 
 class Journal(models.Model):
-    project = models.ForeignKey(Project, on_delete=models.PROTECT, related_name="journals")
+    project = models.ForeignKey(
+        Project, on_delete=models.PROTECT, related_name="journals"
+    )
     type = models.CharField(max_length=100, choices=JOURNAL_TYPES)
-    
+
     content = TextField()
-    
+
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
     minutes_worked = models.IntegerField()
     reduced_minutes = models.IntegerField()
-    
+
     def __str__(self):
         return f"{self.reduced_minutes} mins on {self.project}"
 
 
 PROJECT_SHIP_STATUSES = {
-    'created': 'Awaiting review',
-    'rejected': 'Rejected ship',
-    'requested_changes': 'Requested Changes',
-    'reqchecked': 'Checked by T1',
-    'approved': 'Approved by T2'
+    "created": "Awaiting review",
+    "rejected": "Rejected ship",
+    "requested_changes": "Requested Changes",
+    "reqchecked": "Checked by T1",
+    "approved": "Approved by T2",
 }
 
+
 class ProjectShip(models.Model):
     project = models.ForeignKey(Project, on_delete=models.PROTECT, related_name="ships")
-    
+
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     t1_updated_at = models.DateTimeField(default=None, null=True)
     t2_updated_at = models.DateTimeField(default=None, null=True)
-    
+
     t1_message = models.TextField(blank=True, default="")
     t2_message = models.TextField(blank=True, default="")
-    
-    status = models.CharField(max_length=200, choices=PROJECT_SHIP_STATUSES, default='created')
-    
+
+    status = models.CharField(
+        max_length=200, choices=PROJECT_SHIP_STATUSES, default="created"
+    )
+
     def __str__(self):
         return f"Ship created at {self.created_at} ({PROJECT_SHIP_STATUSES.get(str(self.status), self.status)})"
 
+
 class Pathway(models.Model):
     start = models.DateTimeField()
     end = models.DateTimeField()
-    
+
     name = models.CharField(max_length=200)
     min_mins = models.IntegerField(default=300)
 
     created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
\ No newline at end of file
+    updated_at = models.DateTimeField(auto_now=True)
+
+    def ended(self):
+        return timezone.now() > self.end
+
+    def didnt_start(self):
+        return self.start > timezone.now()
+
+    def in_progress(self):
+        return not self.ended() and not self.didnt_start()
+
+    def mins_spent(self, user: User):
+        pathways = Pathway.objects.order_by('start').values('id', 'start', 'end', 'min_mins')
+        if not pathways:
+            return 0
+        
+        pathway_totals = {p['id']: 0 for p in pathways}
+
+        journals = Journal.objects.filter(
+            project__user=user
+        ).order_by('created_at').values_list('created_at', 'reduced_minutes')
+
+        for j_created, j_mins in journals:
+            mins_remaining = j_mins
+            for pathway in pathways:
+                if mins_remaining <= 0:
+                    break
+                
+                # Check if journal falls within the pathway window
+                if pathway['start'] > j_created or pathway['end'] < j_created:
+                    continue
+                
+                p_id = pathway['id']
+                mins_completed = pathway_totals.get(p_id, 0)
+                mins_required = pathway['min_mins']
+
+                if mins_completed >= mins_required:
+                    continue
+
+                mins_needed = mins_required - mins_completed
+                mins_donated = min(j_mins, mins_needed)
+
+                mins_remaining -= mins_donated
+                pathway_totals[p_id] = mins_completed + mins_donated
+
+        return pathway_totals.get(self.id, 0)
+
+    def __str__(self):
+        return self.name
diff --git a/twisted/twisted_site/templates/client/pathways.html b/twisted/twisted_site/templates/client/pathways.html
index 48a4147..0772011 100644
--- a/twisted/twisted_site/templates/client/pathways.html
+++ b/twisted/twisted_site/templates/client/pathways.html
@@ -1,29 +1,118 @@
-{% extends "client/osbase.html" %} {% load static time_filters humanize %} {% block body %}
+{% extends "client/osbase.html" %} {% load static time_filters humanizelib maths mathfilters %} {% block body %}
 <div class="bg-surface flex flex-col w-full h-full">
     <div class="flex-1 sunken-panel font-vintage overflow-y-scroll p-4">
+        {% if not pathways %}
+        <div>
+            <div>
+                No pathways yet! :(
+            </div>
+            <div>
+                Come check later
+            </div>
+        </div>
+        {% endif %}
+        {% if current_pathways %}
         <div class="text-center">
             <div class="text-xl">
-                CURRENT PATHWAY
-            </div>
-            <div class="text-3xl font-bold">
-                {{ current_pathway.name|default:"none! please dm @kavyansh." }}
+                Current pathway{{ current_pathways|pluralize }}
             </div>
             <div>
-                {{ current_mins|minutes_to_hours_minutes }}/{{ current_pathway.min_mins|minutes_to_hours_minutes }} required
+                {% for pathway_info in current_pathways %}
+                <div class="mt-2">
+                    <div class="text-3xl font-bold">
+                        {{ pathway_info.pathway.name|default:"none! please dm @kavyansh." }}
+                    </div>
+                    <div class="text-xl">
+                        {{ pathway_info.minutes_spent|minutes_to_hours_minutes }}/{{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }} completed
+                    </div>
+                    <div class="text-md flex w-fit mx-auto gap-2">
+                        <div>
+                            Started
+                            <span class="underline decoration-dotted" title="{{ pathway_info.pathway.start }}">
+                                {{ pathway_info.pathway.start|naturaltime }}
+                            </span>
+                        </div>
+                        &bullet;
+                        <div>
+                            Ends
+                            <span class="underline decoration-dotted" title="{{ pathway_info.pathway.end }}">
+                                {{ pathway_info.pathway.end|naturaltime }}
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                {% endfor %}
             </div>
-            <div class="text-xl">
-                <div>
-                    Started {{ current_pathway.start|naturaltime }}
+        </div>
+        {% endif %}
+        <div class="{% if past_pathways and future_pathways %}grid grid-cols-2{% endif %} mt-4 gap-2">
+            {% if past_pathways %}
+            <div>
+                <h1 class="text-center font-black text-xl!">
+                    Past pathways
+                </h1>
+                <div class="grid gap-2">
+                    {% for pathway_info in past_pathways %}
+                    <div class="border {% if pathway_info.unlocked %}bg-lime-800 border-lime-600{% else %}bg-twisted-800 border-twisted-600{% endif %} p-1">
+                        <div class="flex gap-2">
+                            <h2 class="flex-1 font-bold text-lg!">{{ pathway_info.pathway.name }}</h2>
+                            <p>{{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} long</p>
+                        </div>
+                        <div>
+                            started
+                            <span
+                                class="underline decoration-dotted"
+                                title="{{ pathway_info.pathway.start }}">
+                                {{ pathway_info.pathway.start|naturalday }}</span>
+                            and ended
+                            <span
+                                class="underline decoration-dotted"
+                                title="{{ pathway_info.pathway.end }}"
+                            >{{ pathway_info.pathway.end|naturalday }}</span>
+                            </title>
+                        </div>
+                        <div>
+                            {{ pathway_info.minutes_spent|minutes_to_hours_minutes }}/{{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }} spent
+                        </div>
+                    </div>
+                    {% endfor %}
                 </div>
-                <div>
-                    Ends {{ current_pathway.end|naturaltime }}
+            </div>
+            {% endif %}
+            {% if future_pathways %}
+            <div>
+                <h1 class="text-center font-bold text-xl!">
+                    Future pathways
+                </h1>
+                <div class="grid gap-2">
+                    {% for pathway_info in future_pathways %}
+                    <div class="bg-twisted-800 border border-twisted-600 p-1">
+                        <div class="flex gap-2">
+                            <h2 class="flex-1 font-bold text-lg!">{{ pathway_info.pathway.name }}</h2>
+                            <p>{{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} long</p>
+                        </div>
+                        <div>
+                            starts
+                            <span
+                                class="underline decoration-dotted"
+                                title="{{ pathway_info.pathway.start }}">
+                                {{ pathway_info.pathway.start|naturalday }}</span>
+                            and ends
+                            <span
+                                class="underline decoration-dotted"
+                                title="{{ pathway_info.pathway.end }}"
+                            >{{ pathway_info.pathway.end|naturalday }}</span>
+                            </title>
+                        </div>
+                    </div>
+                    {% endfor %}
                 </div>
             </div>
+            {% endif %}
         </div>
     </div>
     <div class="sticky status-field-border font-vintage">
         <div class="mx-1">{{ pathways|length }} pathway{{ pathways|length|pluralize }}</div>
     </div>
 </div>
-
 {% endblock body %}
diff --git a/twisted/twisted_site/templatetags/time_filters.py b/twisted/twisted_site/templatetags/time_filters.py
index ebc27e7..c164d85 100644
--- a/twisted/twisted_site/templatetags/time_filters.py
+++ b/twisted/twisted_site/templatetags/time_filters.py
@@ -1,4 +1,5 @@
 from django import template
+from datetime import timedelta
 register = template.Library()
 
 @register.filter
@@ -12,5 +13,12 @@ def minutes_to_hours_minutes(minutes):
     remaining_minutes = total_minutes % 60
     
     if hours > 0:
+        if remaining_minutes == 0:
+            return f"{hours}h"
         return f"{hours}h {remaining_minutes}m"
     return f"{int(minutes)}m"
+
+@register.filter
+def rounddelta(delta:timedelta, to=1):
+    delta = timedelta(seconds=round(delta.total_seconds(), to))
+    return delta
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/pathways.py b/twisted/twisted_site/views/client/pathways.py
index 18052b8..336966b 100644
--- a/twisted/twisted_site/views/client/pathways.py
+++ b/twisted/twisted_site/views/client/pathways.py
@@ -9,19 +9,59 @@
 class PathwaysView(View):
     def get(self, request):
         if self.request.user.is_anonymous:
-            return redirect('homepage')
-        
+            return redirect("homepage")
+
         profile = request.user.profile
-        pathways = Pathway.objects.order_by('-start').all()
+        pathways = Pathway.objects.order_by("start").all()
+        pathways_reversed = Pathway.objects.order_by("-start").all()
 
-        current_pathway = None
+        current_pathways = []
         for pathway in pathways:
-            if pathway.start < timezone.now() and pathway.end > timezone.now():
-                current_pathway = pathway
-                break
-        
+            if not pathway.in_progress():
+                continue
+            minutes_spent = pathway.mins_spent(request.user)
+            current_pathways.append(
+                {
+                    "pathway": pathway,
+                    "minutes_spent": minutes_spent,
+                    "unlocked": minutes_spent > pathway.min_mins,
+                }
+            )
+
+        past_pathways = []
+        for pathway in pathways_reversed:
+            if not pathway.ended():
+                continue
+            minutes_spent = pathway.mins_spent(request.user)
+            past_pathways.append(
+                {
+                    "pathway": pathway,
+                    "minutes_spent": minutes_spent,
+                    "unlocked": minutes_spent > pathway.min_mins,
+                }
+            )
+
+        future_pathways = []
+        for pathway in pathways:
+            if not pathway.didnt_start():
+                continue
+            minutes_spent = 0
+            future_pathways.append(
+                {
+                    "pathway": pathway,
+                    "minutes_spent": minutes_spent,
+                    "unlocked": minutes_spent > pathway.min_mins,
+                }
+            )
+
         return render(
             request,
             "client/pathways.html",
-            {"profile": profile, 'pathways': pathways, "current_pathway": current_pathway},
+            {
+                "profile": profile,
+                "pathways": pathways,
+                "current_pathways": current_pathways,
+                "past_pathways": past_pathways,
+                "future_pathways": future_pathways,
+            },
         )
diff --git a/uv.lock b/uv.lock
index ad903e9..06ed01f 100644
--- a/uv.lock
+++ b/uv.lock
@@ -488,6 +488,16 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ec/72/1f5f35d719b355e5c051378ae4859586f59c9db08708f02fea358376c130/django_htmx-1.29.0-py3-none-any.whl", hash = "sha256:0ec5be1645ed71e6787bd75e0250624f00274ac3bb1730f07b6629a95688929b", size = 224954, upload-time = "2026-08-05T23:42:08.142Z" },
 ]
 
+[[package]]
+name = "django-humanize"
+version = "0.1.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "django" },
+    { name = "humanize" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b3/a8/955344ecd167d6c8677fba60833fb4374e7e969d42af0e14029341e6ffc0/django-humanize-0.1.2.tar.gz", hash = "sha256:32491bf0209b89a277f7bfdab7fd6d4cc7944bb037f742d62e8e447a575c0028", size = 2307, upload-time = "2015-09-29T13:17:15.125Z" }
+
 [[package]]
 name = "django-jazzmin"
 version = "3.0.5"
@@ -500,6 +510,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/23/40/892f4c922c92d0d2b8ca5f96f556c5dc04d19ea2ea717910d8bbf2dc23fc/django_jazzmin-3.0.5-py3-none-any.whl", hash = "sha256:578fb1fc0a1b7e3b8472d2692ace60b1584ccd937c3828e2c9a89bdf94067f94", size = 2581722, upload-time = "2026-06-25T21:05:50.948Z" },
 ]
 
+[[package]]
+name = "django-mathfilters"
+version = "1.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ca/a6/1e8262e52aa3cbfae277bc97c23dd4f1f6c7d7c3adaf45fb41132c312a40/django-mathfilters-1.0.0.tar.gz", hash = "sha256:c9b892ef6dfc893683e75cfd0279c187a601ca68f4684c38f9da44657fb64b07", size = 5699, upload-time = "2020-02-10T12:02:06.569Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/8a/c6/107083a63a564664830e352af330563763654972d27d56e42d9b6e3c744f/django_mathfilters-1.0.0-py3-none-any.whl", hash = "sha256:64200a21bb249fbf27be601d4bbb788779e09c6e063170c097cd82c4d18ebb83", size = 5909, upload-time = "2020-02-10T12:02:09.819Z" },
+]
+
 [[package]]
 name = "django-qsstats-magic"
 version = "1.1.0"
@@ -627,6 +646,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/48/1c/25631fc359955569e63f5446dbb7022c320edf9846cbe892ee5113433a7e/honcho-2.0.0-py3-none-any.whl", hash = "sha256:56dcd04fc72d362a4befb9303b1a1a812cba5da283526fbc6509be122918ddf3", size = 22093, upload-time = "2024-10-06T14:26:52.181Z" },
 ]
 
+[[package]]
+name = "humanize"
+version = "4.16.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/0a/ea/13a1ef3c12d12662905801495283530251918b70d62d368f1d2e0272c70d/humanize-4.16.0.tar.gz", hash = "sha256:7dc2244a2f84a4bfb1d36c37bac80cd78e35cdc5c119206d87b018e1445f3a3f", size = 89515, upload-time = "2026-06-30T16:17:29.859Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b0/aa/0b7365d30fed43e7a3449aba1fe20a0a7174d9cf13e282af4e69ac825441/humanize-4.16.0-py3-none-any.whl", hash = "sha256:353eb2f34c09d098b2880eee8bef21832eae6d174f48c5762fff7e5fcb74d01d", size = 137209, upload-time = "2026-06-30T16:17:28.36Z" },
+]
+
 [[package]]
 name = "idna"
 version = "3.18"
@@ -1153,7 +1181,9 @@ dependencies = [
     { name = "django-extensions" },
     { name = "django-google-charts" },
     { name = "django-htmx" },
+    { name = "django-humanize" },
     { name = "django-jazzmin" },
+    { name = "django-mathfilters" },
     { name = "django-qsstats-magic" },
     { name = "django-tailwind", extra = ["cookiecutter", "honcho", "reload"] },
     { name = "gunicorn" },
@@ -1177,7 +1207,9 @@ requires-dist = [
     { name = "django-extensions", specifier = ">=4.1" },
     { name = "django-google-charts", specifier = ">=0.1.1" },
     { name = "django-htmx", specifier = ">=1.29.0" },
+    { name = "django-humanize", specifier = ">=0.1.2" },
     { name = "django-jazzmin", specifier = ">=3.0.5" },
+    { name = "django-mathfilters", specifier = ">=1.0.0" },
     { name = "django-qsstats-magic", specifier = ">=1.1.0" },
     { name = "django-tailwind", extras = ["cookiecutter", "honcho", "reload"], specifier = ">=4.5.0" },
     { name = "gunicorn", specifier = ">=26.0.0" },

From c7141c6c2d2ffc98774e779b07d3b052185775e2 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 20 Aug 2026 22:05:26 +0530
Subject: [PATCH 063/118] Add sum stuff to pathways in admin

---
 .../static_src/src/styles.css                 | 10 +--
 twisted/twisted_site/models.py                | 76 ++++++++++++++++++-
 .../templates/admin/pathways.html             | 48 +++++++++++-
 .../twisted_site/templates/cotton/base.html   |  2 +-
 .../templates/cotton/pathway_card.html        | 42 ++++++++++
 twisted/twisted_site/views/admin/pathways.py  | 24 +++++-
 twisted/twisted_site/views/client/pathways.py | 50 ++++--------
 7 files changed, 204 insertions(+), 48 deletions(-)
 create mode 100644 twisted/twisted_site/templates/cotton/pathway_card.html

diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index a0add82..bbdedf5 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -15,8 +15,8 @@
 /* COTTON-STYLES start */
 :root {
     /* Accent: primary buttons, links, focus ring, active states */
-    --color-accent: var(--color-rose-500);
-    --color-accent-content: var(--color-rose-600);
+    --color-accent: var(--color-violet-500);
+    --color-accent-content: var(--color-violet-600);
     --color-accent-foreground: #ffffff;
 
     /* Corner radius, by role */
@@ -33,9 +33,9 @@
 
 .dark {
     /* Dark mode: lighter accent so it stays vivid on dark surfaces */
-    --color-accent: var(--color-rose-400);
-    --color-accent-content: var(--color-rose-300);
-    --color-accent-foreground: var(--color-rose-950);
+    --color-accent: var(--color-violet-400);
+    --color-accent-content: var(--color-violet-300);
+    --color-accent-foreground: var(--color-violet-950);
 }
 /* COTTON-STYLES end */
 
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index be2026a..5c26dfc 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -195,6 +195,14 @@ def didnt_start(self):
     def in_progress(self):
         return not self.ended() and not self.didnt_start()
 
+    def status(self):
+        if self.ended():
+            return 'ended'
+        if self.didnt_start():
+            return 'awaiting'
+        if self.in_progress():
+            return 'in progress'
+    
     def mins_spent(self, user: User):
         pathways = Pathway.objects.order_by('start').values('id', 'start', 'end', 'min_mins')
         if not pathways:
@@ -224,12 +232,76 @@ def mins_spent(self, user: User):
                     continue
 
                 mins_needed = mins_required - mins_completed
-                mins_donated = min(j_mins, mins_needed)
+                mins_donated = min(mins_remaining, mins_needed)
 
                 mins_remaining -= mins_donated
                 pathway_totals[p_id] = mins_completed + mins_donated
 
-        return pathway_totals.get(self.id, 0)
+        return pathway_totals[self.id]
+    
+    def mins_spent_per_participant(self) -> dict[int, int]:
+        """
+        Calculates the minutes spent on this specific pathway for all participants.
+
+        Returns:
+            dict: {user_id: mins_spent}
+        """
+        # Fetch all pathways to accurately model the sequential time donation
+        pathways = list(Pathway.objects.order_by('start').values('id', 'start', 'end', 'min_mins'))
+        if not pathways:
+            return {}
+
+        # Fetch journals from all users that fit within this pathway's active time frame
+        journals = Journal.objects.filter(
+            created_at__gte=self.start,
+            created_at__lte=self.end,
+            reduced_minutes__gt=0
+        ).order_by('project__user_id', 'created_at').values_list(
+            'project__user_id', 'created_at', 'reduced_minutes'
+        )
+
+        user_pathway_totals = {}
+
+        for user_id, j_created, j_mins in journals:
+            if user_id not in user_pathway_totals:
+                user_pathway_totals[user_id] = {p['id']: 0 for p in pathways}
+
+            pathway_totals = user_pathway_totals[user_id]
+            mins_remaining = j_mins
+
+            for pathway in pathways:
+                if mins_remaining <= 0:
+                    break
 
+                if pathway['start'] > j_created or pathway['end'] < j_created:
+                    continue
+
+                p_id = pathway['id']
+                mins_completed = pathway_totals[p_id]
+                mins_required = pathway['min_mins']
+
+                if mins_completed >= mins_required:
+                    continue
+
+                mins_needed = mins_required - mins_completed
+                mins_donated = min(mins_remaining, mins_needed)
+
+                mins_remaining -= mins_donated
+                pathway_totals[p_id] += mins_donated
+
+        # Extract only this pathway's result for each participant
+        return {
+            user_id: totals.get(self.id, 0)
+            for user_id, totals in user_pathway_totals.items()
+        }
+    
+    def qualified_participants(self):
+        per_part = self.mins_spent_per_participant()
+        qualified = []
+        for userid, mins in per_part.items():
+            if mins >= self.min_mins:
+                qualified.append(User.objects.get(id=userid))
+        return qualified
+    
     def __str__(self):
         return self.name
diff --git a/twisted/twisted_site/templates/admin/pathways.html b/twisted/twisted_site/templates/admin/pathways.html
index b8ebd1b..3d300fd 100644
--- a/twisted/twisted_site/templates/admin/pathways.html
+++ b/twisted/twisted_site/templates/admin/pathways.html
@@ -1,5 +1,45 @@
 <c-base>
-    <c-ui.button variant="primary">Primary Button</c-ui.button>
-<c-ui.button variant="default">Default Button</c-ui.button>
-
-</c-base>
\ No newline at end of file
+    <div class="flex flex-col h-full">
+        <div class="mb-2 flex flex-col md:flex-row">
+            <h1 class="text-center md:text-left me-4 font-semibold text-3xl mt-auto">
+                Pathways
+            </h1>
+            <c-ui.button variant="primary">
+                <svg class="inline-block size-6" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" xmlns="http://www.w3.org/2000/svg" aria-label="plus" viewBox="0 0 32 32" preserveAspectRatio="xMidYMid meet" fill="currentColor" width="256" height="256"><path d="M16,6c5.1,0 7.247,0.575 8.336,1.664c1.089,1.089 1.664,3.236 1.664,8.336c0,5.1 -0.575,7.247 -1.664,8.336c-1.089,1.089 -3.236,1.664 -8.336,1.664c-5.1,0 -7.247,-0.575 -8.336,-1.664c-1.089,-1.089 -1.664,-3.236 -1.664,-8.336c0,-5.1 0.575,-7.247 1.664,-8.336c1.089,-1.089 3.236,-1.664 8.336,-1.664Zm0,-2c10,0 12,2 12,12c0,10 -2,12 -12,12c-10,0 -12,-2 -12,-12c0,-10 2,-12 12,-12Zm-1,8c0,-0.552 0.448,-1 1,-1c0.552,0 1,0.448 1,1l0,3l3,0c0.552,0 1,0.448 1,1c0,0.552 -0.448,1 -1,1l-3,0l0,3c0,0.552 -0.448,1 -1,1c-0.552,0 -1,-0.448 -1,-1l0,-3l-3,0c-0.552,0 -1,-0.448 -1,-1c0,-0.552 0.448,-1 1,-1l3,0l0,-3Z"/></svg>
+                Create new
+            </c-ui.button>
+        </div>
+        <div class="flex gap-2 *:min-w-80 *:w-200 flex-1 h-full bg-slate-950">
+            <div class="bg-purple-950/40 border border-purple-900 rounded-md p-2">
+                <h1 class="font-semibold mb-2 mx-2">
+                    Not started ({{ future_pathways|length }} item{{ future_pathways|pluralize }})
+                </h1>
+                <div class="flex flex-col gap-2">
+                    {% for pathway in future_pathways %}
+                    <c-pathway_card />
+                    {% endfor %}
+                </div>
+            </div>
+            <div class="bg-orange-950/40 border border-orange-900 rounded-md p-2">
+                <h1 class="font-semibold mb-2 mx-2">
+                    In progress ({{ current_pathways|length }} item{{ current_pathways|pluralize }})
+                </h1>
+                <div class="flex flex-col gap-2">
+                    {% for pathway in current_pathways %}
+                    <c-pathway_card />
+                    {% endfor %}
+                </div>
+            </div>
+            <div class="bg-emerald-950/40 border border-emerald-900 rounded-md p-2">
+                <h1 class="font-semibold mb-2 mx-2">
+                    Ended ({{ past_pathways|length }} item{{ past_pathways|pluralize }})
+                </h1>
+                <div class="flex flex-col gap-2">
+                    {% for pathway in past_pathways %}
+                    <c-pathway_card />
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+    </div>
+</c-base>
diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html
index f50245d..67c4a54 100644
--- a/twisted/twisted_site/templates/cotton/base.html
+++ b/twisted/twisted_site/templates/cotton/base.html
@@ -15,7 +15,7 @@
     {{ head }}
 </head>
 <body class="dark bg-[#09090B] text-white font-latin" hx-headers='{"x-csrftoken": "{{ csrf_token }}"}'>
-    <div class="md:flex md:py-2 h-screen">
+    <div class="flex flex-col md:flex-row md:py-2 h-screen">
         <div class="md:h-full">
             <c-sidebar>
                 {% for link in sidebar_links %}
diff --git a/twisted/twisted_site/templates/cotton/pathway_card.html b/twisted/twisted_site/templates/cotton/pathway_card.html
new file mode 100644
index 0000000..8299bc2
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/pathway_card.html
@@ -0,0 +1,42 @@
+{% load humanize maths mathfilters %}
+<c-ui.card class="bg-ink-900 hover:bg-ink-800">
+    <h3 class="text-lg font-bold">{{ pathway.name }}</h3>
+    <div class="flex flex-col gap-2">
+        <div>
+            <p class="text-ink-400">Start</p>
+            <p title="local time">{{ pathway.start }}</p>
+            {% if pathway.didnt_start %}
+            <p>({{ pathway.start|naturaltime }})</p>
+            {% endif %}
+        </div>
+        <div>
+            <p class="text-ink-400">End</p>
+            <p title="local time">{{ pathway.end }}</p>
+            {% if pathway.in_progress %}
+            <p>({{ pathway.end|naturaltime }})</p>
+            {% endif %}
+        </div>
+        {% if not pathway.didnt_start %}
+        <div>
+            <p class="text-ink-400">Qualified count</p>
+            <p title="local time">{{ pathway.qualified_participants|length }}</p>
+            {% if pathway.qualified_participants %}
+            <p class="mt-2">
+                <c-ui.avatar.group>
+                {% for user in pathway.qualified_participants %}
+                    {% if forloop.counter < 8 %}
+                        <c-ui.tooltip content="{{ user.profile.slack_username }}">
+                            <c-ui.avatar class="ring-2 ring-ink-900" title="{{ user.profile.slack_username }}" src="{{ user.profile.slack_pfp_url }}" alt="Jane Doe" />
+                        </c-ui.tooltip>
+                    {% endif %}
+                    {% if forloop.counter == 8 %}
+                        <c-ui.avatar initials="+{{ pathway.qualified_participants|length|sub:7 }}" />
+                    {% endif %}
+                {% endfor %}
+                </c-ui.avatar.group>
+            </p>
+            {% endif %}
+        </div>
+        {% endif %}
+    </div>
+</c-ui.card>
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/pathways.py b/twisted/twisted_site/views/admin/pathways.py
index ea2bcc0..6976cbe 100644
--- a/twisted/twisted_site/views/admin/pathways.py
+++ b/twisted/twisted_site/views/admin/pathways.py
@@ -1,8 +1,30 @@
 from .admin import AdminView
 from django.shortcuts import render, redirect
+from ...models import Pathway
 
 # Create your views here.
 class PathwaysView(AdminView):
     def get(self, request):
         context = self.get_context_data(page='pathways')
-        return render(request, "admin/pathways.html", context=context)
+        context['pathways'] = Pathway.objects.all().order_by('start')
+
+        pathways = Pathway.objects.order_by("start").all()
+
+        current_pathways = []
+        past_pathways = []
+        future_pathways = []
+        
+        for pathway in pathways:
+            if pathway.in_progress():
+                current_pathways.append(pathway)
+            if pathway.ended():
+                past_pathways.append(pathway)
+            if pathway.didnt_start():
+                future_pathways.append(pathway)
+
+        past_pathways.reverse()        
+        context['current_pathways'] = current_pathways
+        context['past_pathways'] = past_pathways
+        context['future_pathways'] = future_pathways
+        
+        return render(request, "admin/pathways.html", context=context)
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/pathways.py b/twisted/twisted_site/views/client/pathways.py
index 336966b..0223962 100644
--- a/twisted/twisted_site/views/client/pathways.py
+++ b/twisted/twisted_site/views/client/pathways.py
@@ -13,46 +13,26 @@ def get(self, request):
 
         profile = request.user.profile
         pathways = Pathway.objects.order_by("start").all()
-        pathways_reversed = Pathway.objects.order_by("-start").all()
 
         current_pathways = []
-        for pathway in pathways:
-            if not pathway.in_progress():
-                continue
-            minutes_spent = pathway.mins_spent(request.user)
-            current_pathways.append(
-                {
-                    "pathway": pathway,
-                    "minutes_spent": minutes_spent,
-                    "unlocked": minutes_spent > pathway.min_mins,
-                }
-            )
-
         past_pathways = []
-        for pathway in pathways_reversed:
-            if not pathway.ended():
-                continue
-            minutes_spent = pathway.mins_spent(request.user)
-            past_pathways.append(
-                {
-                    "pathway": pathway,
-                    "minutes_spent": minutes_spent,
-                    "unlocked": minutes_spent > pathway.min_mins,
-                }
-            )
-
         future_pathways = []
+
         for pathway in pathways:
-            if not pathway.didnt_start():
-                continue
-            minutes_spent = 0
-            future_pathways.append(
-                {
-                    "pathway": pathway,
-                    "minutes_spent": minutes_spent,
-                    "unlocked": minutes_spent > pathway.min_mins,
-                }
-            )
+            minutes_spent = pathway.mins_spent(request.user)
+            pathway_info = {
+                "pathway": pathway,
+                "minutes_spent": minutes_spent,
+                "unlocked": minutes_spent > pathway.min_mins,
+            }
+            if pathway.in_progress():
+                current_pathways.append(pathway_info)
+            if pathway.ended():
+                past_pathways.append(pathway_info)
+            if pathway.didnt_start():
+                future_pathways.append(pathway_info)
+
+        past_pathways.reverse()
 
         return render(
             request,

From e36aca8f27732cbe21444cb077b1cea1a50a377b Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Thu, 20 Aug 2026 17:28:27 +0000
Subject: [PATCH 064/118] Try a fix

---
 twisted/entrypoint.sh      |  2 ++
 twisted/slack_bot/views.py | 67 ++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/twisted/entrypoint.sh b/twisted/entrypoint.sh
index a9ef756..ea881b5 100644
--- a/twisted/entrypoint.sh
+++ b/twisted/entrypoint.sh
@@ -3,6 +3,8 @@
 uv run manage.py migrate --noinput
 uv run gunicorn -w 3 mysite.wsgi:application \
     --bind 0.0.0.0:8000 \
+    --threads=4 \
+    --worker-class=gthread \
     --log-level info \
     --access-logfile - \
     --error-logfile - \
diff --git a/twisted/slack_bot/views.py b/twisted/slack_bot/views.py
index c8692a4..b9a361f 100644
--- a/twisted/slack_bot/views.py
+++ b/twisted/slack_bot/views.py
@@ -24,10 +24,10 @@ def slack_events(request):
 
 
 @slack_bot.app.event("app_mention")
-async def handle_app_mention(body, say, logger):
+def handle_app_mention(body, say, logger):
     """Handle when the bot is mentioned in a message"""
     logger.debug(f"App mention event: {body}")
-    await say(f"Thanks for the mention! <@{body['event']['user']}>")
+    say(f"Thanks for the mention! <@{body['event']['user']}>")
 
 
 @slack_bot.app.event("message")
@@ -39,31 +39,42 @@ def handle_message(body, logger):
 # ==================== Slash Commands ====================
 
 
-@slack_bot.app.command("/hellotwisted")
-async def handle_hello_command(ack, respond, command):
-    """
-    Slash command: /hellotwisted
-    Responds with a greeting and user information
-    """
-    await ack()
-    await respond(
-        text=f"Hello <@{command['user_id']}>! 👋",
-        blocks=[
-            {
-                "type": "section",
-                "text": {
-                    "type": "mrkdwn",
-                    "text": f"Hello <@{command['user_id']}> from the Twisted Slack Bot! 👋",
-                },
-            },
-            {
-                "type": "section",
-                "fields": [
-                    {"type": "mrkdwn", "text": f"*User:*\n<@{command['user_id']}>"},
-                    {"type": "mrkdwn", "text": f"*Channel:*\n<#{command['channel_id']}>"},
-                ],
-            },
-        ],
-    )
+# @slack_bot.app.command("/hellotwisted")
+# def handle_hello_command(ack, respond, command):
+#     """
+#     Slash command: /hellotwisted
+#     Responds with a greeting and user information
+#     """
+#     ack()
+#     respond(
+#         text=f"Hello <@{command['user_id']}>! 👋",
+#         blocks=[
+#             {
+#                 "type": "section",
+#                 "text": {
+#                     "type": "mrkdwn",
+#                     "text": f"Hello <@{command['user_id']}> from the Twisted Slack Bot! 👋",
+#                 },
+#             },
+#             {
+#                 "type": "section",
+#                 "fields": [
+#                     {"type": "mrkdwn", "text": f"*User:*\n<@{command['user_id']}>"},
+#                     {"type": "mrkdwn", "text": f"*Channel:*\n<#{command['channel_id']}>"},
+#                 ],
+#             },
+#         ],
+#     )
+
+
+def ack_short_handler(ack):
+    ack()
 
+def hellotwistedcommand(respond, body):
+    user = body["user"]["id"]
+    respond(text=f"Hello <@{user}> from the Twisted Slack Bot! 👋")
 
+slack_bot.command("/hellotwisted")(
+    ack=ack_short_handler,
+    lazy=[hellotwistedcommand]
+)
\ No newline at end of file

From 5640d8faee5a930b5eaf125ae72abf54bb58d567 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Thu, 20 Aug 2026 23:00:43 +0530
Subject: [PATCH 065/118] typo fix

---
 twisted/slack_bot/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/twisted/slack_bot/views.py b/twisted/slack_bot/views.py
index b9a361f..a33f514 100644
--- a/twisted/slack_bot/views.py
+++ b/twisted/slack_bot/views.py
@@ -74,7 +74,7 @@ def hellotwistedcommand(respond, body):
     user = body["user"]["id"]
     respond(text=f"Hello <@{user}> from the Twisted Slack Bot! 👋")
 
-slack_bot.command("/hellotwisted")(
+slack_bot.app.command("/hellotwisted")(
     ack=ack_short_handler,
     lazy=[hellotwistedcommand]
-)
\ No newline at end of file
+)

From a669bc883797a63ec2dc0d0b9381c7e8da15c2c0 Mon Sep 17 00:00:00 2001
From: CoolCream <mahasankarshant@gmail.com>
Date: Sat, 22 Aug 2026 17:55:45 +0530
Subject: [PATCH 066/118] updated the homepage further

---
 .../static/fonts/Piedra-Regular.ttf           | Bin 0 -> 74612 bytes
 .../static/fonts/VT323-Regular.ttf            | Bin 0 -> 149688 bytes
 .../templates/client/homepage.html            | 163 +++++++++++-------
 3 files changed, 102 insertions(+), 61 deletions(-)
 create mode 100644 twisted/twisted_site/static/fonts/Piedra-Regular.ttf
 create mode 100644 twisted/twisted_site/static/fonts/VT323-Regular.ttf

diff --git a/twisted/twisted_site/static/fonts/Piedra-Regular.ttf b/twisted/twisted_site/static/fonts/Piedra-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..c3c75e40df071f7d00d0b6176f31053c2ea17d79
GIT binary patch
literal 74612
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

literal 0
HcmV?d00001

diff --git a/twisted/twisted_site/static/fonts/VT323-Regular.ttf b/twisted/twisted_site/static/fonts/VT323-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6aec59930ed26b7802dec57ed6e13970b0088cba
GIT binary patch
literal 149688
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

literal 0
HcmV?d00001

diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index 1476756..180154e 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -1,78 +1,119 @@
 {% extends "base.html" %}
 {% load static %}
 {% block body %}
-<a href="https://hackclub.com" target="_blank" rel="noopener" class="fixed top-0 left-4 z-50">
-  <img src="https://assets.hackclub.com/flag-orpheus-top.svg" alt="Hack Club" class="w-48 flag-wave origin-top">
+<a href="https://hackclub.com" target="_blank" rel="noopener" class="fixed top-4 left-0 z-50">
+  <img src="https://assets.hackclub.com/flag-orpheus-left.svg" alt="Hack Club" class="w-38 flag-wave origin-top">
 </a>
-<div class="bg-cover w-screen h-screen bg-surface text-absolute-white p-4 sm:p-8">
-  <div class="max-w-3xl mx-auto bg-dark border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
-    <div class="flex items-center justify-between bg-twisted-600 text-absolute-white px-2 py-1">
+<div class="min-h-screen bg-background text-foreground p-4 sm:p-8">
+  <div
+    class="max-w-[80%] max-h-[90vh] mx-auto bg-dark shadow-neo-primary border-2 border-t-twisted-200 border-l-twisted-200 border-r border-b">
+    <div class="flex items-center justify-between bg-primary text-primary-foreground px-3 py-2">
       <span class="font-bold text-sm">twisted.exe</span>
       <div class="flex gap-1">
-        <span class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">_</span>
-        <span class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">□</span>
-        <span class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">×</span>
+        <button class="h-5 w-5 bg-card border text-card-foreground hover:bg-secondary">
+          -
+        </button>
+
+        <button class="h-5 w-5 bg-card border text-card-foreground hover:bg-secondary">
+          □
+        </button>
+
+        <button class="h-5 w-5 bg-card border text-card-foreground hover:bg-destructive">
+          ×
+        </button>
       </div>
     </div>
-    <div class="p-6 text-center">
-      <img src="{% static 'images/twisted_logo.png' %}" alt="twisted logo" class="mx-auto mb-4 max-h-64">
-
-      <p class="text-lg mb-6 max-w-xl mx-auto text-twisted-200">
-        A unique YSWS where you make cool projects and complete a twisted roadmap full of challenges to get a PC!
-      </p>
-      <nav class="flex flex-wrap justify-center gap-4 mb-6 text-twisted-200 underline">
-        <a href="https://hackclub.enterprise.slack.com/archives/C0A8G9BSCSG">Slack</a>
-        <a href="{% url 'faqs' %}">FAQs</a>
-        <a href="https://docs.twisted.hackclub.com">Docs</a>
+    <div class="p-2 text-center">
+      <div class="py-6 sm:py-8">
+        <img src="{% static 'images/twisted_logo.png' %}" alt="Twisted"
+          class="mx-auto w-70 sm:w-80 drop-shadow-sm drop-shadow-primary">
+      </div>
+
+      <div class="max-w-[90%] mx-auto mb-8">
+        <div class="text-left bg-background border p-4 font-mono text-sm">
+          <div class="text-muted-foreground mb-2">
+            message
+          </div>
+
+          <p class="text-foreground font-vintage text-xs">
+            Join this awesome YSWS where you make cool projects
+            and complete a twisted roadmap full of
+            challenges to get a PC by the end!
+          </p>
+        </div>
+      </div>
+      <nav class="flex flex-wrap justify-center gap-2 mb-8">
+        <a href="https://hackclub.enterprise.slack.com/archives/C0A8G9BSCSG"
+          class="px-3 py-2 border bg-card hover:bg-secondary transition-colors">
+          Slack
+        </a>
+
+        <a href="{% url 'faqs' %}" class="px-3 py-2 border bg-card hover:bg-secondary transition-colors">
+          FAQs
+        </a>
+
+        <a href="https://docs.twisted.hackclub.com"
+          class="px-3 py-2 border bg-card hover:bg-secondary transition-colors">
+          Docs
+        </a>
       </nav>
       <div id="rsvp">
         {% if login_enabled != 'false' %}
         {% if user.is_authenticated %}
         <a href="{% url 'dashboard' %}">
-          <button class="bg-twisted-400 text-absolute-white text-2xl font-bold py-3 px-10 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-            dashboard
+          <button
+            class="bg-primary font-vintage hover:bg-primary/70 text-primary-foreground text-2xl font-bold py-3 px-10 border-2 ">
+            enter twisted
           </button>
         </a>
         {% else %}
         <form method="post" action="{% url 'login' %}">
           {% csrf_token %}
-          <button type="submit" class="bg-twisted-400 text-absolute-white text-2xl font-bold py-3 px-10 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+          <button type="submit"
+            class="bg-twisted-400 text-absolute-white text-2xl font-bold py-3 px-10 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
             Login
           </button>
         </form>
-          {% endif %}
-          {% endif %}
+        {% endif %}
+        {% endif %}
       </div>
     </div>
   </div>
 
-  </div>
 </div>
-<div class="fixed bottom-0 left-0 right-0 z-50 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1">
-  <button id="twist-btn" class="flex items-center gap-1 bg-twisted-600 text-absolute-white font-bold px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-    <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5"> Twist 
+</div>
+<div class="fixed bottom-0 left-0 right-0 z-50 flex items-center justify-between bg-secondary border-t px-2 py-1">
+  <button
+    class="flex items-center gap-2 bg-secondary text-secondary-foreground px-3 py-1 border hover:bg-primary hover:text-primary-foreground transition"
+    id="twist-btn">
+    <img src="{% static 'images/twisted_logo.png' %}" class="w-6 h-4" alt="">
+    Twisted
   </button>
- <div  class="flex items-center gap-2">
-              <div id="speaker-btn" onclick="toggleMusic()" class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-                <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg">
-                    <rect x="2" y="6" width="2" height="4" fill="#CAB3E1"/>
-                    <rect x="4" y="5" width="2" height="6" fill="#CAB3E1"/>
-                    <rect x="6" y="4" width="2" height="8" fill="#CAB3E1"/>
-                    <rect x="8" y="2" width="2" height="12" fill="#CAB3E1"/>
-                    <g id="sound-waves">
-                        <rect x="12" y="5" width="2" height="6" fill="#8364A2"/>
-                        <rect x="15" y="3" width="2" height="10" fill="#8364A2"/>
-                    </g>
-                </svg>
-            </div>
-
-   <canvas id="spectrum" width="100" height="24" class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
-  <div id="taskbar-clock" class="bg-twisted-600 text-absolute-white px-3 py-1 border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200 min-w-20 text-center">
-    00:00 00
+  <div class="flex items-center gap-2">
+    <div id="speaker-btn" onclick="toggleMusic()"
+      class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+      <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
+        xmlns="http://www.w3.org/2000/svg">
+        <rect x="2" y="6" width="2" height="4" fill="#CAB3E1" />
+        <rect x="4" y="5" width="2" height="6" fill="#CAB3E1" />
+        <rect x="6" y="4" width="2" height="8" fill="#CAB3E1" />
+        <rect x="8" y="2" width="2" height="12" fill="#CAB3E1" />
+        <g id="sound-waves">
+          <rect x="12" y="5" width="2" height="6" fill="#8364A2" />
+          <rect x="15" y="3" width="2" height="10" fill="#8364A2" />
+        </g>
+      </svg>
+    </div>
+
+    <canvas id="spectrum" width="100" height="24"
+      class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
+    <div id="taskbar-clock"
+      class="bg-twisted-600 text-absolute-white px-3 py-1 border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200 min-w-20 text-center">
+      00:00 00
+    </div>
   </div>
- </div>
-  
-</div> 
+
+</div>
 <audio id="bg-music" loop>
   <source src="{% static 'audio/bg.mp3' %}" type="audio/mpeg">
 </audio>
@@ -104,7 +145,7 @@
   function playMusic() {
     initAudioGraph();
     if (audioCtx && audioCtx.state === "suspended") audioCtx.resume();
-    music.play().catch(() => {});
+    music.play().catch(() => { });
   }
 
   function toggleMusic() {
@@ -115,10 +156,10 @@
   if (wasPlaying) {
     const resume = () => {
       playMusic();
-      ["click","keydown","scroll","mousemove","touchstart"].forEach(e =>
+      ["click", "keydown", "scroll", "mousemove", "touchstart"].forEach(e =>
         document.removeEventListener(e, resume));
     };
-    ["click","keydown","scroll","mousemove","touchstart"].forEach(e =>
+    ["click", "keydown", "scroll", "mousemove", "touchstart"].forEach(e =>
       document.addEventListener(e, resume, { once: true }));
   }
 
@@ -150,16 +191,16 @@
     }
   }
   function updateClock() {
-        const now = new Date();
-        let h = now.getHours();
-        const m = now.getMinutes().toString().padStart(2, "0");
-        const ampm = h >= 12 ? "PM" : "AM";
-        h = h % 12 || 12;
-        document.getElementById("taskbar-clock").textContent = `${h}:${m} ${ampm}`;
-    }
-    
-    setInterval(updateClock, 1000);
-    updateClock(); 
-    drawSpectrum();
+    const now = new Date();
+    let h = now.getHours();
+    const m = now.getMinutes().toString().padStart(2, "0");
+    const ampm = h >= 12 ? "PM" : "AM";
+    h = h % 12 || 12;
+    document.getElementById("taskbar-clock").textContent = `${h}:${m} ${ampm}`;
+  }
+
+  setInterval(updateClock, 1000);
+  updateClock();
+  drawSpectrum();
 </script>
 {% endblock body %}
\ No newline at end of file

From 34cf1055936418eacedb854e7868fab6a869fda7 Mon Sep 17 00:00:00 2001
From: CoolCream <mahasankarshant@gmail.com>
Date: Sat, 22 Aug 2026 17:56:18 +0530
Subject: [PATCH 067/118] forgot the button

---
 .../templates/components/button.html          | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 twisted/twisted_site/templates/components/button.html

diff --git a/twisted/twisted_site/templates/components/button.html b/twisted/twisted_site/templates/components/button.html
new file mode 100644
index 0000000..efbeb9b
--- /dev/null
+++ b/twisted/twisted_site/templates/components/button.html
@@ -0,0 +1,32 @@
+<button type="{{ type|default:'button' }}" class="
+        inline-flex items-center justify-center
+        font-latin font-medium
+        p-2
+        text-sm
+        transition-all duration-150
+
+        focus:outline-none
+        focus:ring-2
+        focus:ring-ring
+        focus:ring-offset-2
+        focus:ring-offset-background
+
+        disabled:pointer-events-none
+        disabled:opacity-50
+
+        {% if variant == 'secondary' %}
+            bg-secondary text-secondary-foreground hover:brightness-110
+        {% elif variant == 'destructive' %}
+            bg-destructive text-destructive-foreground hover:brightness-110
+        {% elif variant == 'outline' %}
+            border border-border bg-transparent text-foreground hover:bg-muted
+        {% elif variant == 'ghost' %}
+            bg-transparent text-foreground hover:bg-muted
+        {% else %}
+            bg-primary text-primary-foreground hover:brightness-110
+        {% endif %}
+
+        {{ class }}
+    ">
+    {{ text }}
+</button>
\ No newline at end of file

From e2fafb6a105f475ca002a5b8f3eefc0c72f06336 Mon Sep 17 00:00:00 2001
From: CoolCream <mahasankarshant@gmail.com>
Date: Sun, 23 Aug 2026 16:48:28 +0530
Subject: [PATCH 068/118] updated a page

---
 .../static_src/src/styles.css                 | 189 ++++----
 .../tailwindcsstheme/static_src/src/win98.css |  55 ---
 .../twisted_site/static/css/98.override.css   |  33 --
 .../templates/client/dashboard.html           | 154 ++-----
 .../templates/client/homepage.html            | 431 +++++++++++++-----
 5 files changed, 444 insertions(+), 418 deletions(-)
 delete mode 100644 twisted/tailwindcsstheme/static_src/src/win98.css
 delete mode 100644 twisted/twisted_site/static/css/98.override.css

diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index bbdedf5..cdbc368 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -1,118 +1,121 @@
 @import "tailwindcss";
 @import "./cotton-ui.sources.css";
-/* @plugin "@tailwindcss/typography"; */
-
-/**
-* A catch-all path to Django template files, JavaScript, and Python files
-* that contain Tailwind CSS classes and will be scanned by Tailwind to generate the final CSS file.
-*
-* If your final CSS file is not being updated after code changes, you may want to broaden or narrow
-* the scope of this path.
-*/
+
 @source "../../../**/*.{html,py,js}";
 @source "../../../../.venv/lib/python3.13/site-packages/django_cotton_ui/templates/**/*.html";
 
-/* COTTON-STYLES start */
-:root {
-    /* Accent: primary buttons, links, focus ring, active states */
-    --color-accent: var(--color-violet-500);
-    --color-accent-content: var(--color-violet-600);
-    --color-accent-foreground: #ffffff;
-
-    /* Corner radius, by role */
-    --radius-control: 0.375rem;
-    --radius-box: 0.5rem;
-
-    /* Form controls */
-    --focus-ring-width: 3px;
-    --shadow-input: 0 1px 2px 0 rgb(0 0 0 / 0.05);
-
-    /* Structural surfaces */
-    --shadow-box: 0 1px 2px 0 rgb(0 0 0 / 0.05);
-}
-
-.dark {
-    /* Dark mode: lighter accent so it stays vivid on dark surfaces */
-    --color-accent: var(--color-violet-400);
-    --color-accent-content: var(--color-violet-300);
-    --color-accent-foreground: var(--color-violet-950);
-}
-/* COTTON-STYLES end */
-
-/* latin-ext */
 @font-face {
-  font-family: 'Figtree';
+  font-family: "Figtree";
   font-style: normal;
   font-weight: 300 900;
   font-display: swap;
-  src: url(https://fonts.gstatic.com/s/figtree/v9/_Xms-HUzqDCFdgfMm4q9DbZs.woff2) format('woff2');
-  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: 'Figtree';
-  font-style: normal;
-  font-weight: 300 900;
-  font-display: swap;
-  src: url(https://fonts.gstatic.com/s/figtree/v9/_Xms-HUzqDCFdgfMm4S9DQ.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-button {
-    cursor: pointer;
+  src: url(https://fonts.gstatic.com/s/figtree/v9/_Xms-HUzqDCFdgfMm4S9DbZs.woff2) format("woff2");
 }
 
 @font-face {
-  font-family: "Pixelated MS Sans Serif";
-  src: url("/static/fonts/ms_sans_serif.woff") format("woff");
-  src: url("/static/fonts/ms_sans_serif.woff2") format("woff2");
-  font-weight: normal;
+  font-family: "Pirkkala";
+  src: url("/static/fonts/pirkkala.ttf") format("truetype");
+  font-weight: 200;
   font-style: normal;
+  font-display: swap;
 }
 
 @font-face {
-  font-family: "Pixelated MS Sans Serif";
-  src: url("/static/fonts/ms_sans_serif_bold.woff") format("woff");
-  src: url("/static/fonts/ms_sans_serif_bold.woff2") format("woff2");
-  font-weight: bold;
+  font-family: "Piedra";
+  src: url("/static/fonts/Piedra-Regular.ttf") format("truetype");
+  font-weight: 400;
   font-style: normal;
+  font-display: swap;
 }
 
 @font-face {
-  font-family: 'Pirkalla';
-  src: url('/static/fonts/pirkkala.ttf') format('truetype');
+  font-family: "VT323";
+  src: url("/static/fonts/VT323.ttf") format("truetype");
   font-weight: 400;
   font-style: normal;
   font-display: swap;
 }
 
 @theme {
-  --font-vintage: "Pirkalla", monospace, sans-serif;
+  --font-vintage: "Pirkkala", sans-serif;
   --font-latin: "Figtree", sans-serif;
 
-  --color-absolute-white: #FAFAFA;
-  --color-fair-gray: #A1A1A1;
-  --color-dark-black: #050505;
+  --color-background: #24102F;
+  --color-foreground: #FAF7FF;
+
+  --color-card: #1B0D25;
+  --color-card-foreground: #FAF7FF;
+
+  --color-popover: #48245C;
+  --color-popover-foreground: #FFFFFF;
+
+  --color-primary: #B96CFF;
+  --color-primary-foreground: #190B24;
+
+  --color-secondary: #5B2E73;
+  --color-secondary-foreground: #F1DFFF;
+
+  --color-accent: #E0A7FF;
+  --color-accent-foreground: #24102F;
+
+  --color-muted: #432252;
+  --color-muted-foreground: #C9B8D3;
+
+  --color-subtle: #806A8D;
+  --color-subtle-foreground: #E2D8E8;
+
+  --color-border: #654078;
+  --color-input: #75488A;
+  --color-ring: #C27AFF;
+
+  --color-success: #4ADE80;
+  --color-success-foreground: #092414;
+
+  --color-warning: #FACC15;
+  --color-warning-foreground: #2A2105;
 
-  --color-twisted-200: #CAB3E1;
-  --color-twisted-400: #8364A2;
-  --color-twisted-600: #5A4471;
-  --color-twisted-800: #36214B;
-  --color-twisted-999: #29153D;
+  --color-destructive: #FF6B7A;
+  --color-destructive-foreground: #2A080D;
 
-  --color-surface: #1E072F;
-  --color-dark: #261F2D;
+  --color-twisted-200: #E0A7FF;
+  --color-twisted-400: #B96CFF;
+  --color-twisted-600: #8C3ED1;
+  --color-twisted-800: #61268F;
+  --color-twisted-999: #3A1750;
+
+  --color-absolute-white: #FFFFFF;
+  --color-fair-gray: #B8ADBF;
+  --color-dark-black: #120817;
+
+  --color-surface: #2E153C;
+  --color-dark: #1B0D25;
+}
+
+button {
+  cursor: pointer;
 }
 
 @keyframes flag-wave {
-  0%, 100% { transform: rotate(-2deg); }
-  50% { transform: rotate(2deg); }
+
+  0%,
+  100% {
+    transform: rotate(-2deg);
+  }
+
+  50% {
+    transform: rotate(2deg);
+  }
+}
+
+.flag-wave {
+  transform-origin: top center;
+  animation: flag-wave 4s ease-in-out infinite;
 }
 
 @utility no-spinner {
   appearance: textfield;
   -moz-appearance: textfield;
-  
+
   &::-webkit-outer-spin-button,
   &::-webkit-inner-spin-button {
     -webkit-appearance: none;
@@ -123,34 +126,4 @@ button {
 @utility image-render-pixelated {
   image-rendering: crisp-edges;
   image-rendering: pixelated;
-}
-
-.flag-wave {
-  transform-origin: top center;
-  animation: flag-wave 4s ease-in-out infinite;
-}
-
-.scrollbar-win9x::-webkit-scrollbar {
-  width: 16px;
-}
-
-.scrollbar-win9x::-webkit-scrollbar-track {
-  background-color: #c0c0c0;
-  border-left: 2px solid #dfdfdf;
-}
-
-.scrollbar-win9x::-webkit-scrollbar-thumb {
-  background-color: #c0c0c0;
-  border-top: 2px solid #ffffff;
-  border-left: 2px solid #ffffff;
-  border-right: 2px solid #0a0a0a;
-  border-bottom: 2px solid #0a0a0a;
-}
-
-.scrollbar-win9x::-webkit-scrollbar-thumb:focus {
-  background-color: #FFFFFF;
-  border-top: 2px solid #ffffff;
-  border-left: 2px solid #ffffff;
-  border-right: 2px solid #0a0a0a;
-  border-bottom: 2px solid #0a0a0a;
-}
+}
\ No newline at end of file
diff --git a/twisted/tailwindcsstheme/static_src/src/win98.css b/twisted/tailwindcsstheme/static_src/src/win98.css
deleted file mode 100644
index 8dcd7e2..0000000
--- a/twisted/tailwindcsstheme/static_src/src/win98.css
+++ /dev/null
@@ -1,55 +0,0 @@
-@import "../node_modules/98.css/style.css";
-
-
-
-
-/**
-* A catch-all path to Django template files, JavaScript, and Python files
-* that contain Tailwind CSS classes and will be scanned by Tailwind to generate the final CSS file.
-*
-* If your final CSS file is not being updated after code changes, you may want to broaden or narrow
-* the scope of this path.
-*/
-@source "../../../**/*.{html,py,js}";
-
-button,
-label,
-input,
-legend,
-textarea,
-select,
-option,
-table,
-ul.tree-view,
-.window,
-.title-bar,
-li[role="tab"] {
-    font-family: "Pirkalla", Arial;
-    -webkit-font-smoothing: none;
-    font-size: 11px;
-}
-
-:root {
-    --dialog-blue: #261f2d;
-    --dialog-blue-light: var(--dialog-blue);
-
-    --button-highlight: #36214B;
-
-    --surface: #1E072F;
-    --text-color: #ffffff;
-    --link-blue: #8f8ff4 !important;
-}
-
-.sunken-panel {
-    background-color: #261f2d;
-}
-
-select:focus {
-  color: var(--text-color);
-  background-color: #29153D;
-}
-
-select:focus option {
-  color: var(--text-color);
-  background-color: var(--surface);
-}
\ No newline at end of file
diff --git a/twisted/twisted_site/static/css/98.override.css b/twisted/twisted_site/static/css/98.override.css
deleted file mode 100644
index d2634eb..0000000
--- a/twisted/twisted_site/static/css/98.override.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.window {
-  background: #8364A2 !important; 
-  border: 2px solid !important;
-  border-color: #CAB3E1 #29153D #29153D #CAB3E1 !important; 
-  box-shadow: none !important;
-}
-
-.title-bar {
-  background: linear-gradient(90deg, #5A4471, #8364A2) !important; 
-  color: #FAFAFA !important;
-  padding: 3px 4px !important;
-}
-
-.title-bar-text {
-  color: #FAFAFA !important;
-  font-weight: bold;
-}
-
-.title-bar-controls button {
-  background: #CAB3E1 !important;  
-  border: 1px solid !important;
-  border-color: #FAFAFA #29153D #29153D #FAFAFA !important;
-  color: #29153D !important;
-  min-width: 18px;
-  min-height: 16px;
-}
-
-.window-body {
-  background: #36214B !important;  
-  color: #FAFAFA !important;
-  margin: 0 !important;
-  padding: 4px !important;
-}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index ea3284a..ea4d390 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -1,67 +1,47 @@
 {% extends "client/osbase.html" %} {% load static %} {% block body %}
-<div class="h-full text-absolute-white">
+<main class="h-full w-full bg-background text-foreground p-5">
     <div class="p-4 flex flex-col flex-wrap content-start gap-3 w-full h-full overflow-y-hidden">
         {% if user.profile.is_staff %}
         <div class="font-vintage w-fit cursor-pointer">
             <a href="{% url 'admin.dash' %}" target="_blank">
-                <img
-                    src="{% static 'images/round-square.jpg' %}"
-                    alt=""
-                    class="size-20"
-                />
+                <img src="{% static 'images/round-square.jpg' %}" alt="" class="size-20" />
                 <span class="text-white block text-center">Admin</span>
             </a>
         </div>
         {% endif %}
-        <div class="font-vintage w-fit cursor-pointer" onclick="newWindow('Projects', '{% url 'fr.projects' %}')">
-            <img
-                src="{% static 'images/round-square.jpg' %}"
-                alt=""
-                class="size-20"
-            />
+        <div class="font-vintage w-fit cursor-pointer" data-url="{% url 'fr.projects' %}"
+            onclick="newWindow('Projects', this.dataset.url)">
+            <img src="{% static 'images/round-square.jpg' %}" alt="" class="size-20" />
             <span class="block text-center">Projects</span>
         </div>
-        <div class="font-vintage w-fit cursor-pointer" onclick="newWindow('Pathways', '{% url 'fr.pathways' %}')">
-            <img
-            src="{% static 'images/round-square.jpg' %}"
-            alt=""
-            class="size-20"
-            />
+        <div class="font-vintage w-fit cursor-pointer" data-url="{% url 'fr.pathways' %}"
+            onclick="newWindow('Pathways', this.dataset.url)">
+            <img src="{% static 'images/round-square.jpg' %}" alt="" class="size-20" />
             <span class="block text-center">Pathways</span>
         </div>
     </div>
 
     <div id="windows-container"></div>
 
-    <div
-        id="taskbar"
-        class="fixed bottom-0 left-0 right-0 z-9999 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1"
-    >
+    <div id="taskbar"
+        class="fixed bottom-0 left-0 right-0 z-9999 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1">
         <div class="relative">
-            <button
-                onclick="toggleStartMenu(event)"
-                class="flex items-center gap-1 !bg-twisted-600 !text-base !text-absolute-white !font-bold !px-3 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black active:!border-t-dark-black active:!border-l-dark-black active:!border-r-twisted-200 active:!border-b-twisted-200"
-            >
+            <button onclick="toggleStartMenu(event)"
+                class="flex items-center gap-1 !bg-twisted-600 !text-base !text-absolute-white !font-bold !px-3 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black active:!border-t-dark-black active:!border-l-dark-black active:!border-r-twisted-200 active:!border-b-twisted-200">
                 <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5" /> Twist
             </button>
 
-            <div
-                id="start-menu"
-                style="display: none; position: fixed; bottom: 36px; left: 4px; width: 520px"
-                class="z-[10000] bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg"
-            >
+            <div id="start-menu" style="display: none; position: fixed; bottom: 36px; left: 4px; width: 520px"
+                class="z-[10000] bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
                 <div class="flex">
                     <div class="flex-1 bg-twisted-999 p-2 space-y-0.5">
                         {% for i in "0123456789" %}
-                        <button
-                            onclick="newWindow('Projects', '{% url 'fr.projects' %}'); toggleStartMenu(event)"
-                            class="w-full flex items-center gap-3 px-2 py-1.5 text-absolute-white text-left hover:bg-twisted-600"
-                        >
-                            <img
-                                src="{% static 'images/round-square.jpg' %}"
-                                alt=""
-                                class="w-7 h-7 object-cover border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shrink-0"
-                            />
+                        <button data-url="{% url 'fr.projects' %}"
+                            onclick="newWindow('Projects', this.dataset.url); toggleStartMenu(event)">
+                            class="w-full flex items-center gap-3 px-2 py-1.5 text-absolute-white text-left
+                            hover:bg-twisted-600">
+                            <img src="{% static 'images/round-square.jpg' %}" alt=""
+                                class="w-7 h-7 object-cover border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shrink-0" />
                             <span class="text-sm">Projects</span>
                         </button>
                         {% endfor %}
@@ -69,23 +49,18 @@
 
                     <div class="w-44 bg-twisted-600 p-3 pt-10 flex flex-col">
                         <div class="text-center mb-3">
-                            <img
-                                src="{{ user.profile.slack_pfp_url }}"
-                                alt=""
-                                class="w-16 h-16 object-cover mx-auto mb-1 -mt-12 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg"
-                            />
+                            <img src="{{ user.profile.slack_pfp_url }}" alt=""
+                                class="w-16 h-16 object-cover mx-auto mb-1 -mt-12 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg" />
                             <div class="text-absolute-white font-bold text-sm font-vintage">
                                 {{ profile.slack_username|default:user.username }}
                             </div>
                         </div>
 
                         <div
-                            class="font-vintage space-y-1 text-absolute-white text-sm border-t border-twisted-800 pt-2"
-                        >
+                            class="font-vintage space-y-1 text-absolute-white text-sm border-t border-twisted-800 pt-2">
                             {% if user.is_staff %}
-                            <a href="/admin/" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800"
-                                >Supadmin Panel</a
-                            >
+                            <a href="/admin/" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Supadmin
+                                Panel</a>
                             {% endif %}
                             <a href="#" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Settings</a>
                             <a href="#" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Help</a>
@@ -96,10 +71,8 @@
                 <div class="flex items-center justify-between bg-twisted-400 p-2 border-t-2 border-t-twisted-200">
                     <form method="post" action="{% url 'logout' %}">
                         {% csrf_token %}
-                        <button
-                            type="submit"
-                            class="text-absolute-white text-sm px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200"
-                        >
+                        <button type="submit"
+                            class="text-absolute-white text-sm px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
                             Logout
                         </button>
                     </form>
@@ -110,19 +83,10 @@
         <div id="taskbar-windows" class="flex-1 flex items-center gap-1 px-2 overflow-x-auto"></div>
 
         <div class="flex items-center gap-2">
-            <div
-                id="speaker-btn"
-                onclick="toggleMusic()"
-                class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200"
-            >
-                <svg
-                    id="speaker-icon"
-                    width="20"
-                    height="16"
-                    viewBox="0 0 20 16"
-                    shape-rendering="crispEdges"
-                    xmlns="http://www.w3.org/2000/svg"
-                >
+            <div id="speaker-btn" onclick="toggleMusic()"
+                class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
+                    xmlns="http://www.w3.org/2000/svg">
                     <rect x="2" y="6" width="2" height="4" fill="#CAB3E1" />
                     <rect x="4" y="5" width="2" height="6" fill="#CAB3E1" />
                     <rect x="6" y="4" width="2" height="8" fill="#CAB3E1" />
@@ -133,59 +97,35 @@
                     </g>
                 </svg>
             </div>
-            <canvas
-                id="spectrum"
-                width="100"
-                height="24"
-                class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"
-            ></canvas>
-            <div
-                id="taskbar-clock"
-                class="!font-vintage !text-base !bg-twisted-600 !text-absolute-white !px-3 !py-1 !border-2 !border-t-dark-black !border-l-dark-black !border-r-twisted-200 !border-b-twisted-200 min-w-20 text-center"
-            >
+            <canvas id="spectrum" width="100" height="24"
+                class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
+            <div id="taskbar-clock"
+                class="!font-vintage !text-base !bg-twisted-600 !text-absolute-white !px-3 !py-1 !border-2 !border-t-dark-black !border-l-dark-black !border-r-twisted-200 !border-b-twisted-200 min-w-20 text-center">
                 00:00 00
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <div class="-z-10 bg-surface fixed top-0 left-0 bottom-0 right-0"></div>
 
 <template id="window-template">
-    <div
-        class="absolute window resize flex flex-col overflow-hidden"
-        style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px"
-    >
+    <div class="absolute window resize flex flex-col overflow-hidden"
+        style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px">
         <div class="title-bar">
             <label class="title-bar-text w-full">TITLE</label>
             <div class="title-bar-controls">
                 <button class="reload-button">
-                    <svg
-                        fill-rule="evenodd"
-                        clip-rule="evenodd"
-                        stroke-linejoin="round"
-                        stroke-miterlimit="1.414"
-                        xmlns="http://www.w3.org/2000/svg"
-                        aria-label="view-reload"
-                        viewBox="0 0 32 32"
-                        preserveAspectRatio="xMidYMid meet"
-                        fill="currentColor"
-                        width="16"
-                        height="16"
-                    >
+                    <svg fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"
+                        xmlns="http://www.w3.org/2000/svg" aria-label="view-reload" viewBox="0 0 32 32"
+                        preserveAspectRatio="xMidYMid meet" fill="currentColor" width="16" height="16">
                         <path
-                            d="M20.726,14.162c-0.776,-2.415 -3.04,-4.162 -5.713,-4.162c-3.314,0 -6,2.686 -6,6c0,3.314 2.686,6 6,6c2.063,0 3.883,-1.041 4.962,-2.626c0.333,-0.489 0.988,-0.707 1.497,-0.406c0.437,0.26 0.611,0.814 0.342,1.246c-1.411,2.273 -3.929,3.786 -6.801,3.786c-4.418,0 -8,-3.582 -8,-8c0,-4.418 3.582,-8 8,-8c3.53,0 6.525,2.286 7.588,5.458c0.278,-0.429 0.537,-0.848 0.736,-1.175c0.108,-0.178 0.196,-0.324 0.258,-0.428l0.042,-0.07l0.029,-0.05l0.018,-0.03l0.005,-0.008l0.001,-0.002c0.279,-0.476 0.892,-0.636 1.368,-0.357c0.477,0.279 0.636,0.892 0.357,1.369l-0.001,0.001l-0.001,0.002l-0.005,0.009l-0.02,0.034c-0.017,0.028 -0.043,0.072 -0.075,0.125l-0.062,0.105l-0.015,0.025l-0.084,0.139c-0.033,0.055 -0.069,0.114 -0.107,0.176c-0.222,0.365 -0.528,0.86 -0.849,1.35c-0.32,0.49 -0.676,1.006 -0.978,1.389c-0.157,0.198 -0.336,0.402 -0.482,0.54c-0.084,0.077 -0.217,0.181 -0.316,0.243c-0.103,0.062 -0.357,0.201 -0.695,0.178c-0.202,-0.013 -0.369,-0.08 -0.447,-0.113c-0.083,-0.035 -0.195,-0.091 -0.283,-0.141c-0.164,-0.092 -0.372,-0.224 -0.575,-0.363c-0.399,-0.272 -0.884,-0.633 -1.337,-0.98c-0.453,-0.348 -0.892,-0.697 -1.214,-0.954c-0.162,-0.13 -0.296,-0.239 -0.389,-0.314l-0.108,-0.088l-0.029,-0.024l-0.007,-0.006l-0.002,-0.001l-0.001,-0.001c-0.427,-0.35 -0.489,-0.98 -0.139,-1.407c0.35,-0.428 0.98,-0.489 1.407,-0.139l0.036,0.029l0.104,0.085c0.091,0.074 0.221,0.178 0.379,0.305c0.317,0.255 0.74,0.59 1.181,0.928c0.143,0.11 0.285,0.218 0.425,0.323Z"
-                        />
+                            d="M20.726,14.162c-0.776,-2.415 -3.04,-4.162 -5.713,-4.162c-3.314,0 -6,2.686 -6,6c0,3.314 2.686,6 6,6c2.063,0 3.883,-1.041 4.962,-2.626c0.333,-0.489 0.988,-0.707 1.497,-0.406c0.437,0.26 0.611,0.814 0.342,1.246c-1.411,2.273 -3.929,3.786 -6.801,3.786c-4.418,0 -8,-3.582 -8,-8c0,-4.418 3.582,-8 8,-8c3.53,0 6.525,2.286 7.588,5.458c0.278,-0.429 0.537,-0.848 0.736,-1.175c0.108,-0.178 0.196,-0.324 0.258,-0.428l0.042,-0.07l0.029,-0.05l0.018,-0.03l0.005,-0.008l0.001,-0.002c0.279,-0.476 0.892,-0.636 1.368,-0.357c0.477,0.279 0.636,0.892 0.357,1.369l-0.001,0.001l-0.001,0.002l-0.005,0.009l-0.02,0.034c-0.017,0.028 -0.043,0.072 -0.075,0.125l-0.062,0.105l-0.015,0.025l-0.084,0.139c-0.033,0.055 -0.069,0.114 -0.107,0.176c-0.222,0.365 -0.528,0.86 -0.849,1.35c-0.32,0.49 -0.676,1.006 -0.978,1.389c-0.157,0.198 -0.336,0.402 -0.482,0.54c-0.084,0.077 -0.217,0.181 -0.316,0.243c-0.103,0.062 -0.357,0.201 -0.695,0.178c-0.202,-0.013 -0.369,-0.08 -0.447,-0.113c-0.083,-0.035 -0.195,-0.091 -0.283,-0.141c-0.164,-0.092 -0.372,-0.224 -0.575,-0.363c-0.399,-0.272 -0.884,-0.633 -1.337,-0.98c-0.453,-0.348 -0.892,-0.697 -1.214,-0.954c-0.162,-0.13 -0.296,-0.239 -0.389,-0.314l-0.108,-0.088l-0.029,-0.024l-0.007,-0.006l-0.002,-0.001l-0.001,-0.001c-0.427,-0.35 -0.489,-0.98 -0.139,-1.407c0.35,-0.428 0.98,-0.489 1.407,-0.139l0.036,0.029l0.104,0.085c0.091,0.074 0.221,0.178 0.379,0.305c0.317,0.255 0.74,0.59 1.181,0.928c0.143,0.11 0.285,0.218 0.425,0.323Z" />
                     </svg>
                 </button>
                 <button class="max-button" aria-label="Maximize">
                     <svg class="m-auto" viewBox="-4 -4 20 20" style="width: 11px; height: 11px">
-                        <rect
-                            width="9"
-                            height="9"
-                            x="1.00000"
-                            y="1.00000"
-                            style="
+                        <rect width="9" height="9" x="1.00000" y="1.00000" style="
                                 opacity: 1;
                                 fill: none;
                                 fill-opacity: 1;
@@ -198,9 +138,7 @@
                                 stroke-dasharray: none;
                                 stroke-dashoffset: 0;
                                 stroke-opacity: 1;
-                            "
-                            id="rect5719"
-                        />
+                            " id="rect5719" />
                     </svg>
                 </button>
                 <button class="close-button" aria-label="Close">X</button>
@@ -446,7 +384,7 @@
     function playMusic() {
         initAudioGraph();
         if (audioCtx && audioCtx.state === "suspended") audioCtx.resume();
-        music.play().catch(() => {});
+        music.play().catch(() => { });
     }
 
     function toggleMusic() {
@@ -500,4 +438,4 @@
     drawSpectrum();
 </script>
 
-{% endblock body %}
+{% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index 180154e..f22c176 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -1,206 +1,409 @@
 {% extends "base.html" %}
 {% load static %}
+
 {% block body %}
-<a href="https://hackclub.com" target="_blank" rel="noopener" class="fixed top-4 left-0 z-50">
-  <img src="https://assets.hackclub.com/flag-orpheus-left.svg" alt="Hack Club" class="w-38 flag-wave origin-top">
+
+<a href="https://hackclub.com" target="_blank" rel="noopener" class="fixed top-0 left-4 z-50">
+  <img src="https://assets.hackclub.com/flag-orpheus-top.svg" alt="Hack Club" class="w-30 flag-wave">
 </a>
-<div class="min-h-screen bg-background text-foreground p-4 sm:p-8">
-  <div
-    class="max-w-[80%] max-h-[90vh] mx-auto bg-dark shadow-neo-primary border-2 border-t-twisted-200 border-l-twisted-200 border-r border-b">
-    <div class="flex items-center justify-between bg-primary text-primary-foreground px-3 py-2">
-      <span class="font-bold text-sm">twisted.exe</span>
+
+<div class="min-h-screen bg-background text-foreground px-3 py-4 sm:px-6 sm:py-8 md:px-8 md:py-10 pb-20">
+  <main
+    class="shadow-sm shadow-primary mx-auto w-full max-w-4xl overflow-hidden border border-border bg-card max-h-[85%]">
+    <header class="flex items-center justify-between border-b border-border bg-secondary px-2 py-1.5 sm:px-3 sm:py-2">
+      <div class="flex items-center gap-2">
+        <div class="flex h-5 w-5 items-center justify-center bg-primary text-[10px] font-bold text-primary-foreground">
+          T
+        </div>
+
+        <span class="font-mono text-sm font-semibold tracking-wide">
+          twisted.exe
+        </span>
+      </div>
+
       <div class="flex gap-1">
-        <button class="h-5 w-5 bg-card border text-card-foreground hover:bg-secondary">
-          -
+        <button type="button" aria-label="Minimize"
+          class="flex h-7 w-8 items-center justify-center border border-border bg-card text-card-foreground transition hover:bg-muted">
+          −
         </button>
 
-        <button class="h-5 w-5 bg-card border text-card-foreground hover:bg-secondary">
+        <button type="button" aria-label="Maximize"
+          class="flex h-7 w-8 items-center justify-center border border-border bg-card text-card-foreground transition hover:bg-muted">
           □
         </button>
 
-        <button class="h-5 w-5 bg-card border text-card-foreground hover:bg-destructive">
+        <button type="button" aria-label="Close"
+          class="flex h-7 w-8 items-center justify-center border border-border bg-card text-card-foreground transition hover:border-destructive hover:bg-destructive hover:text-destructive-foreground">
           ×
         </button>
       </div>
-    </div>
-    <div class="p-2 text-center">
-      <div class="py-6 sm:py-8">
-        <img src="{% static 'images/twisted_logo.png' %}" alt="Twisted"
-          class="mx-auto w-70 sm:w-80 drop-shadow-sm drop-shadow-primary">
-      </div>
+    </header>
+
+    <section class="px-4 py-6 sm:px-8 sm:py-10 md:px-12">
+      <div class="mx-auto max-w-2xl text-center space-y-5">
+        <div>
+          <img src="{% static 'images/twisted_logo.png' %}" alt="Twisted"
+            class="mx-auto w-[min(65vw,20rem)] h-auto drop-shadow-sm drop-shadow-primary">
+        </div>
+
+        <div class="border border-border bg-background p-4 sm:p-5 text-left shadow-xs shadow-primary">
+          <div class="text-foreground font-vintage text-sm sm:text-base leading-relaxed">
+            <span class="font-mono text-[10px] uppercase tracking-[0.2em] text-muted-foreground">
+              message from the orgs
+            </span>
 
-      <div class="max-w-[90%] mx-auto mb-8">
-        <div class="text-left bg-background border p-4 font-mono text-sm">
-          <div class="text-muted-foreground mb-2">
-            message
+            <span class="h-2 w-2  full bg-success shadow-[0_0_8px_currentColor]"></span>
           </div>
 
-          <p class="text-foreground font-vintage text-xs">
-            Join this awesome YSWS where you make cool projects
-            and complete a twisted roadmap full of
-            challenges to get a PC by the end!
+          <p class="font-vintage text-sm sm:text-md md:text-lg leading-relaxed text-foreground">
+            Hii!!! Join a twisted YSWS where you build cool projects,
+            complete challenges, and work your way through a
+            roadmap to earn a PC.
           </p>
         </div>
+
+        <div id="rsvp">
+          {% if login_enabled != 'false' %}
+          {% if user.is_authenticated %}
+          <a href="{% url 'dashboard' %}">
+            <button type="button"
+              class="w-full sm:w-auto border border-primary bg-primary px-6 sm:px-10 py-3 font-vintage text-xl sm:text-2xl font-bold text-primary-foreground shadow-xs shadow-white transition hover:translate-x-[2px] hover:translate-y-[2px] hover:shadow-sm active:translate-x-[4px] active:translate-y-[4px] active:shadow-none">
+              enter twisted →
+            </button>
+          </a>
+          {% else %}
+          <form method="post" action="{% url 'login' %}">
+            {% csrf_token %}
+
+            <button type="submit"
+              class="border border-primary bg-primary px-10 py-3 font-vintage text-2xl font-bold text-primary-foreground shadow-[4px_4px_0_var(--color-dark-black)] transition hover:translate-x-[2px] hover:translate-y-[2px] hover:shadow-[2px_2px_0_var(--color-dark-black)] active:translate-x-[4px] active:translate-y-[4px] active:shadow-none">
+              login →
+            </button>
+          </form>
+          {% endif %}
+          {% endif %}
+        </div>
       </div>
-      <nav class="flex flex-wrap justify-center gap-2 mb-8">
-        <a href="https://hackclub.enterprise.slack.com/archives/C0A8G9BSCSG"
-          class="px-3 py-2 border bg-card hover:bg-secondary transition-colors">
-          Slack
-        </a>
-
-        <a href="{% url 'faqs' %}" class="px-3 py-2 border bg-card hover:bg-secondary transition-colors">
-          FAQs
-        </a>
-
-        <a href="https://docs.twisted.hackclub.com"
-          class="px-3 py-2 border bg-card hover:bg-secondary transition-colors">
-          Docs
-        </a>
-      </nav>
-      <div id="rsvp">
-        {% if login_enabled != 'false' %}
-        {% if user.is_authenticated %}
-        <a href="{% url 'dashboard' %}">
-          <button
-            class="bg-primary font-vintage hover:bg-primary/70 text-primary-foreground text-2xl font-bold py-3 px-10 border-2 ">
-            enter twisted
-          </button>
-        </a>
-        {% else %}
-        <form method="post" action="{% url 'login' %}">
-          {% csrf_token %}
-          <button type="submit"
-            class="bg-twisted-400 text-absolute-white text-2xl font-bold py-3 px-10 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-            Login
-          </button>
-        </form>
-        {% endif %}
-        {% endif %}
-      </div>
-    </div>
-  </div>
+    </section>
+  </main>
+  <nav class="grid grid-cols-1 sm:grid-cols-3 gap-2 mt-6 max-w-4xl justify-self-center">
+    <a href="https://hackclub.enterprise.slack.com/archives/C0A8G9BSCSG"
+      class="flex items-center justify-center border border-border bg-secondary px-3 py-2.5 font-mono text-sm font-semibold text-secondary-foreground transition hover:border-primary hover:bg-primary hover:text-primary-foreground">
+      Slack
+    </a>
 
+    <a href="{% url 'faqs' %}"
+      class="flex items-center justify-center border border-border bg-secondary px-3 py-2.5 font-mono text-sm font-semibold text-secondary-foreground transition hover:border-primary hover:bg-primary hover:text-primary-foreground">
+      FAQs
+    </a>
+
+    <a href="https://docs.twisted.hackclub.com"
+      class="flex items-center justify-center border border-border bg-secondary px-3 py-2.5 font-mono text-sm font-semibold text-secondary-foreground transition hover:border-primary hover:bg-primary hover:text-primary-foreground">
+      Docs
+    </a>
+  </nav>
 </div>
-</div>
-<div class="fixed bottom-0 left-0 right-0 z-50 flex items-center justify-between bg-secondary border-t px-2 py-1">
-  <button
-    class="flex items-center gap-2 bg-secondary text-secondary-foreground px-3 py-1 border hover:bg-primary hover:text-primary-foreground transition"
-    id="twist-btn">
-    <img src="{% static 'images/twisted_logo.png' %}" class="w-6 h-4" alt="">
+
+<div
+  class="fixed bottom-0 left-0 right-0 z-50 flex h-12 items-center justify-between gap-2 border-t border-border bg-card px-2 sm:px-3">
+  <button id="twist-btn"
+    class="flex shrink-0 items-center gap-1.5 sm:gap-2 border border-border bg-secondary px-2 sm:px-3 py-1.5 font-mono text-xs sm:text-sm font-bold text-secondary-foreground transition hover:bg-primary hover:text-primary-foreground">
+    <img src="{% static 'images/twisted_logo.png' %}" class="h-4 w-6 object-contain" alt="">
     Twisted
   </button>
+
   <div class="flex items-center gap-2">
-    <div id="speaker-btn" onclick="toggleMusic()"
-      class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+    <button id="speaker-btn" type="button" onclick="toggleMusic()" aria-label="Toggle music"
+      class="flex h-8 items-center border border-border bg-secondary px-2 text-secondary-foreground transition hover:bg-muted">
       <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
         xmlns="http://www.w3.org/2000/svg">
-        <rect x="2" y="6" width="2" height="4" fill="#CAB3E1" />
-        <rect x="4" y="5" width="2" height="6" fill="#CAB3E1" />
-        <rect x="6" y="4" width="2" height="8" fill="#CAB3E1" />
-        <rect x="8" y="2" width="2" height="12" fill="#CAB3E1" />
+        <rect x="2" y="6" width="2" height="4" fill="#E0A7FF" />
+        <rect x="4" y="5" width="2" height="6" fill="#E0A7FF" />
+        <rect x="6" y="4" width="2" height="8" fill="#E0A7FF" />
+        <rect x="8" y="2" width="2" height="12" fill="#E0A7FF" />
+
         <g id="sound-waves">
-          <rect x="12" y="5" width="2" height="6" fill="#8364A2" />
-          <rect x="15" y="3" width="2" height="10" fill="#8364A2" />
+          <rect x="12" y="5" width="2" height="6" fill="#B96CFF" />
+          <rect x="15" y="3" width="2" height="10" fill="#B96CFF" />
         </g>
       </svg>
-    </div>
+    </button>
+
+    <canvas id="spectrum" width="100" height="24" class="hidden border border-border sm:block"></canvas>
 
-    <canvas id="spectrum" width="100" height="24"
-      class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
     <div id="taskbar-clock"
-      class="bg-twisted-600 text-absolute-white px-3 py-1 border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200 min-w-20 text-center">
-      00:00 00
+      class="min-w-20 border border-border bg-background px-3 py-1.5 text-center font-mono text-xs text-foreground">
+      00:00 AM
     </div>
   </div>
-
 </div>
+
+
 <audio id="bg-music" loop>
   <source src="{% static 'audio/bg.mp3' %}" type="audio/mpeg">
 </audio>
+
+
 <script>
   const music = document.getElementById("bg-music");
-  const savedTime = parseFloat(sessionStorage.getItem("musicTime") || "0");
-  const wasPlaying = sessionStorage.getItem("musicPlaying") === "true";
-  if (savedTime) music.currentTime = savedTime;
 
-  let audioCtx, analyser, dataArray, sourceConnected = false;
+  const savedTime =
+    parseFloat(sessionStorage.getItem("musicTime") || "0");
+
+  const wasPlaying =
+    sessionStorage.getItem("musicPlaying") === "true";
+
+  if (savedTime) {
+    music.currentTime = savedTime;
+  }
+
+
+  let audioCtx;
+  let analyser;
+  let dataArray;
+  let sourceConnected = false;
+
   const canvas = document.getElementById("spectrum");
   const ctx = canvas ? canvas.getContext("2d") : null;
 
+
+  function getThemeColor(variable) {
+    return getComputedStyle(document.documentElement)
+      .getPropertyValue(variable)
+      .trim();
+  }
+
+
   function initAudioGraph() {
     if (sourceConnected) return;
-    const AC = window.AudioContext || window.webkitAudioContext;
+
+    const AC =
+      window.AudioContext ||
+      window.webkitAudioContext;
+
     if (!AC) return;
+
     audioCtx = new AC();
-    const source = audioCtx.createMediaElementSource(music);
+
+    const source =
+      audioCtx.createMediaElementSource(music);
+
     analyser = audioCtx.createAnalyser();
+
     analyser.fftSize = 64;
+
     source.connect(analyser);
     analyser.connect(audioCtx.destination);
-    dataArray = new Uint8Array(analyser.frequencyBinCount);
+
+    dataArray =
+      new Uint8Array(analyser.frequencyBinCount);
+
     sourceConnected = true;
+
     drawSpectrum();
   }
 
+
   function playMusic() {
     initAudioGraph();
-    if (audioCtx && audioCtx.state === "suspended") audioCtx.resume();
+
+    if (
+      audioCtx &&
+      audioCtx.state === "suspended"
+    ) {
+      audioCtx.resume();
+    }
+
     music.play().catch(() => { });
   }
 
+
   function toggleMusic() {
-    if (music.paused) { playMusic(); }
-    else { music.pause(); }
+    if (music.paused) {
+      playMusic();
+    } else {
+      music.pause();
+    }
   }
 
+
   if (wasPlaying) {
+
     const resume = () => {
+
       playMusic();
-      ["click", "keydown", "scroll", "mousemove", "touchstart"].forEach(e =>
-        document.removeEventListener(e, resume));
+
+      [
+        "click",
+        "keydown",
+        "scroll",
+        "mousemove",
+        "touchstart"
+      ].forEach(event => {
+        document.removeEventListener(event, resume);
+      });
+
     };
-    ["click", "keydown", "scroll", "mousemove", "touchstart"].forEach(e =>
-      document.addEventListener(e, resume, { once: true }));
+
+    [
+      "click",
+      "keydown",
+      "scroll",
+      "mousemove",
+      "touchstart"
+    ].forEach(event => {
+      document.addEventListener(
+        event,
+        resume,
+        { once: true }
+      );
+    });
+
   }
 
+
   setInterval(() => {
-    sessionStorage.setItem("musicTime", music.currentTime);
-    sessionStorage.setItem("musicPlaying", (!music.paused).toString());
+
+    sessionStorage.setItem(
+      "musicTime",
+      music.currentTime
+    );
+
+    sessionStorage.setItem(
+      "musicPlaying",
+      (!music.paused).toString()
+    );
+
   }, 400);
+
+
   window.addEventListener("beforeunload", () => {
-    sessionStorage.setItem("musicTime", music.currentTime);
-    sessionStorage.setItem("musicPlaying", (!music.paused).toString());
+
+    sessionStorage.setItem(
+      "musicTime",
+      music.currentTime
+    );
+
+    sessionStorage.setItem(
+      "musicPlaying",
+      (!music.paused).toString()
+    );
+
   });
 
+
   function drawSpectrum() {
+
     if (!ctx) return;
+
     requestAnimationFrame(drawSpectrum);
-    ctx.fillStyle = "#1E072F";
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+    const background =
+      getThemeColor("--color-background");
+
+    const low =
+      getThemeColor("--color-twisted-600");
+
+    const medium =
+      getThemeColor("--color-twisted-400");
+
+    const high =
+      getThemeColor("--color-twisted-200");
+
+
+    ctx.fillStyle = background;
+    ctx.fillRect(
+      0,
+      0,
+      canvas.width,
+      canvas.height
+    );
+
+
     if (!analyser || music.paused) return;
+
+
     analyser.getByteFrequencyData(dataArray);
-    const bars = 8, barWidth = canvas.width / bars, pixel = 3;
+
+    const bars = 8;
+    const barWidth = canvas.width / bars;
+    const pixel = 3;
+
+
     for (let i = 0; i < bars; i++) {
-      const value = dataArray[i] / 255;
-      const barHeight = Math.floor((value * canvas.height) / pixel) * pixel;
-      for (let y = 0; y < barHeight; y += pixel) {
-        const ratio = y / canvas.height;
-        ctx.fillStyle = ratio > 0.6 ? "#CAB3E1" : ratio > 0.3 ? "#8364A2" : "#5A4471";
-        ctx.fillRect(i * barWidth + 1, canvas.height - y - pixel, barWidth - 2, pixel - 1);
+
+      const value =
+        dataArray[i] / 255;
+
+      const barHeight =
+        Math.floor(
+          (value * canvas.height) / pixel
+        ) * pixel;
+
+
+      for (
+        let y = 0;
+        y < barHeight;
+        y += pixel
+      ) {
+
+        const ratio =
+          y / canvas.height;
+
+
+        ctx.fillStyle =
+          ratio > 0.6
+            ? high
+            : ratio > 0.3
+              ? medium
+              : low;
+
+
+        ctx.fillRect(
+          i * barWidth + 1,
+          canvas.height - y - pixel,
+          barWidth - 2,
+          pixel - 1
+        );
+
       }
+
     }
+
   }
+
+
   function updateClock() {
+
     const now = new Date();
-    let h = now.getHours();
-    const m = now.getMinutes().toString().padStart(2, "0");
-    const ampm = h >= 12 ? "PM" : "AM";
-    h = h % 12 || 12;
-    document.getElementById("taskbar-clock").textContent = `${h}:${m} ${ampm}`;
+
+    let hours = now.getHours();
+
+    const minutes =
+      now.getMinutes()
+        .toString()
+        .padStart(2, "0");
+
+    const ampm =
+      hours >= 12 ? "PM" : "AM";
+
+    hours =
+      hours % 12 || 12;
+
+
+    document.getElementById(
+      "taskbar-clock"
+    ).textContent =
+      `${hours}:${minutes} ${ampm}`;
+
   }
 
+
   setInterval(updateClock, 1000);
+
   updateClock();
   drawSpectrum();
+
 </script>
+
 {% endblock body %}
\ No newline at end of file

From 0163ba4fcb9e27bd4a5c51be634853b0dc5e3781 Mon Sep 17 00:00:00 2001
From: Aoishik Khan <73829596+aoishik@users.noreply.github.com>
Date: Mon, 24 Aug 2026 11:58:06 +0000
Subject: [PATCH 069/118] sudo rm slack bolt

---
 twisted/slack_bot/admin.py                   |   3 -
 twisted/slack_bot/apps.py                    |  17 --
 twisted/slack_bot/migrations/0001_initial.py |  22 --
 twisted/slack_bot/migrations/__init__.py     |   0
 twisted/slack_bot/models.py                  |   9 -
 twisted/slack_bot/slack.py                   | 295 +++++++++++--------
 twisted/slack_bot/tests.py                   |  47 ---
 twisted/slack_bot/urls.py                    |   8 -
 twisted/slack_bot/views.py                   |  80 -----
 twisted/twisted_site/slack.py                | 295 +++++++++++--------
 10 files changed, 348 insertions(+), 428 deletions(-)
 delete mode 100644 twisted/slack_bot/migrations/0001_initial.py
 delete mode 100644 twisted/slack_bot/migrations/__init__.py

diff --git a/twisted/slack_bot/admin.py b/twisted/slack_bot/admin.py
index 8c38f3f..e69de29 100644
--- a/twisted/slack_bot/admin.py
+++ b/twisted/slack_bot/admin.py
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/twisted/slack_bot/apps.py b/twisted/slack_bot/apps.py
index ea88efb..e69de29 100644
--- a/twisted/slack_bot/apps.py
+++ b/twisted/slack_bot/apps.py
@@ -1,17 +0,0 @@
-import os
-
-from django.apps import AppConfig
-
-
-class SlackBotConfig(AppConfig):
-    name = 'slack_bot'
-
-    def ready(self):
-        super().ready()
-
-        if os.getenv("SLACK_MODE", "https").strip().lower() != "socket":
-            return
-
-        from .slack import slack_bot
-
-        slack_bot.start()
diff --git a/twisted/slack_bot/migrations/0001_initial.py b/twisted/slack_bot/migrations/0001_initial.py
deleted file mode 100644
index 6ac4ef7..0000000
--- a/twisted/slack_bot/migrations/0001_initial.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 6.0.7 on 2026-08-08 08:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='SupportMember',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('user_id', models.CharField(max_length=200, unique=True)),
-                ('is_admin', models.BooleanField()),
-            ],
-        ),
-    ]
diff --git a/twisted/slack_bot/migrations/__init__.py b/twisted/slack_bot/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/twisted/slack_bot/models.py b/twisted/slack_bot/models.py
index ae1d27a..e69de29 100644
--- a/twisted/slack_bot/models.py
+++ b/twisted/slack_bot/models.py
@@ -1,9 +0,0 @@
-from django.db import models
-
-# Create your models here.
-class SupportMember(models.Model):
-    user_id=models.CharField(max_length=200, unique=True)
-    is_admin=models.BooleanField()
-    
-    def __str__(self):
-        return f"{self.user_id} {'(admin)' if self.is_admin else ''}"
diff --git a/twisted/slack_bot/slack.py b/twisted/slack_bot/slack.py
index 7df8336..c9e2d37 100644
--- a/twisted/slack_bot/slack.py
+++ b/twisted/slack_bot/slack.py
@@ -1,134 +1,187 @@
 import os
-import threading
 from typing import Any
-from slack_bolt import App
-from slack_bolt.adapter.socket_mode import SocketModeHandler
+
+from slack_sdk import WebClient
 
 
 class SlackBot:
-	def __init__(
-		self,
-		token: str | None = None,
-		signing_secret: str | None = None,
-		cc_group_id: str | None = None,
-		app_token: str | None = None,
-		slack_mode: str | None = None,
-	):
-		self.slack_mode = (slack_mode or os.getenv("SLACK_MODE", "https")).lower()
-		self.app_token = app_token or os.getenv("SLACK_APP_TOKEN")
-		slack_token = token
-		self.app = App(token=slack_token, signing_secret=signing_secret)
-		self.socket_mode_handler: SocketModeHandler | None = None
-		self.socket_thread: threading.Thread | None = None
-		if self.slack_mode == "socket":
-			if not self.app_token:
-				raise ValueError("SLACK_APP_TOKEN must be set when SLACK_MODE=socket")
-			self.socket_mode_handler = SocketModeHandler(self.app, self.app_token)
-		self.client = self.app.client
-		self._cc_group_id = cc_group_id
-
-	def start(self):
-		if self.socket_mode_handler is not None:
-			self.socket_thread = threading.Thread(
-				target=self.socket_mode_handler.start,
-				name="slack-socket-mode",
-				daemon=True,
-			)
-			self.socket_thread.start()
-
-	def post_message(
-		self,
-		*,
-		channel: str,
-		text: str,
-		blocks: list[dict[str, Any]] | None = None,
-		**kwargs: Any,
-	):
-		payload: dict[str, Any] = {
-			"channel": channel,
-			"text": text,
-			**kwargs,
-		}
-		if blocks is not None:
-			payload["blocks"] = blocks
-		return self.client.chat_postMessage(**payload)
-
-	def send_message(self, *, channel: str, text: str, **kwargs: Any):
-		return self.post_message(channel=channel, text=text, **kwargs)
-
-	def send_blocks(
-		self,
-		*,
-		channel: str,
-		blocks: list[dict[str, Any]],
-		text: str = " ",
-		**kwargs: Any,
-	):
-		return self.post_message(channel=channel, text=text, blocks=blocks, **kwargs)
-	def error_log(
-		self,
-		*,
-		channel: str,
-		error: str,
-		title: str | None = None,
-		**kwargs: Any,
-	):
-		if title is None:
-			title = "Error Log"
-
-		group_id = self._cc_group_id
-		mention = f"<@{group_id}>" if group_id else ""
-
-		# Parent message
-		parent = self.client.chat_postMessage(
-			channel=channel,
-			text=f"{title}".strip(),
-			blocks=[
-				{
-					"type": "section",
-					"text": {
-						"type": "mrkdwn",
-						"text": f"*{title}*".strip(),
-					},
-				},
-			],
-		)
-
-		# Thread message
-		thread_text = f"```{error}```"
-		if mention:
-			thread_text += f"\n\nCC: {mention}"
-
-		return self.client.chat_postMessage(
-			channel=channel,
-			thread_ts=parent["ts"],
-			text=thread_text,
-			blocks=[
-				{
-					"type": "section",
-					"text": {
-						"type": "mrkdwn",
-						"text": thread_text,
-					},
-				},
-			],
-		)
-
-	def users_info(self, *, user: str):
-		return self.client.users_info(user=user)
+    def __init__(
+        self,
+        token: str | None = None,
+        cc_group_id: str | None = None,
+    ):
+        self.token = token or os.getenv("SLACK_TOKEN")
+
+        if not self.token:
+            raise ValueError("SLACK_TOKEN must be set")
+
+        self.client = WebClient(token=self.token)
+        self._cc_group_id = cc_group_id or os.getenv("SLACK_CC_GROUP_ID")
+
+    def post_message(
+        self,
+        *,
+        channel: str,
+        text: str,
+        blocks: list[dict[str, Any]] | None = None,
+        **kwargs: Any,
+    ):
+        payload = {
+            "channel": channel,
+            "text": text,
+            **kwargs,
+        }
+
+        if blocks is not None:
+            payload["blocks"] = blocks
+
+        return self.client.chat_postMessage(**payload)
+
+    def send_message(
+        self,
+        *,
+        channel: str,
+        text: str,
+        **kwargs: Any,
+    ):
+        return self.post_message(
+            channel=channel,
+            text=text,
+            **kwargs,
+        )
+
+    def send_blocks(
+        self,
+        *,
+        channel: str,
+        blocks: list[dict[str, Any]],
+        text: str = " ",
+        **kwargs: Any,
+    ):
+        return self.post_message(
+            channel=channel,
+            text=text,
+            blocks=blocks,
+            **kwargs,
+        )
+
+    def dm_user(
+        self,
+        *,
+        user: str,
+        text: str,
+        blocks: list[dict[str, Any]] | None = None,
+        **kwargs: Any,
+    ):
+        """
+        Send a DM to a Slack user using their U... user ID.
+
+        No D... DM channel ID is required.
+        """
+        return self.post_message(
+            channel=user,
+            text=text,
+            blocks=blocks,
+            **kwargs,
+        )
+
+    def dm_user_blocks(
+        self,
+        *,
+        user: str,
+        blocks: list[dict[str, Any]],
+        text: str = " ",
+        **kwargs: Any,
+    ):
+        """Send Block Kit directly to a user using their U... ID."""
+        return self.dm_user(
+            user=user,
+            text=text,
+            blocks=blocks,
+            **kwargs,
+        )
+
+    def users_info(self, *, user: str):
+        return self.client.users_info(user=user)
+
+    def get_user_profile(self, user: str) -> dict[str, Any]:
+        response = self.client.users_info(user=user)
+
+        user_data = response["user"]
+        profile = user_data.get("profile", {})
+
+        return {
+            "id": user_data["id"],
+            "name": user_data.get("name"),
+            "real_name": (
+                user_data.get("real_name")
+                or profile.get("real_name")
+            ),
+            "display_name": (
+                profile.get("display_name")
+                or user_data.get("name")
+            ),
+            "image_24": profile.get("image_24"),
+            "image_32": profile.get("image_32"),
+            "image_48": profile.get("image_48"),
+            "image_72": profile.get("image_72"),
+            "image_192": profile.get("image_192"),
+            "image_512": profile.get("image_512"),
+        }
+
+    def error_log(
+        self,
+        *,
+        channel: str,
+        error: str,
+        title: str = "Error Log",
+        **kwargs: Any,
+    ):
+        group_id = self._cc_group_id
+        mention = f"<!subteam^{group_id}>" if group_id else ""
+
+        parent = self.client.chat_postMessage(
+            channel=channel,
+            text=title,
+            blocks=[
+                {
+                    "type": "section",
+                    "text": {
+                        "type": "mrkdwn",
+                        "text": f"*{title}*",
+                    },
+                }
+            ],
+            **kwargs,
+        )
+
+        thread_text = f"```{error}```"
+
+        if mention:
+            thread_text += f"\n\nCC: {mention}"
+
+        return self.client.chat_postMessage(
+            channel=channel,
+            thread_ts=parent["ts"],
+            text=thread_text,
+            blocks=[
+                {
+                    "type": "section",
+                    "text": {
+                        "type": "mrkdwn",
+                        "text": thread_text,
+                    },
+                }
+            ],
+        )
 
 
 slack_token = os.getenv("SLACK_TOKEN")
-slack_signing_secret = os.getenv("SLACK_SIGNING_SECRET")
 cc_group_id = os.getenv("SLACK_CC_GROUP_ID")
-slack_mode = os.getenv("SLACK_MODE", "https").strip().lower()
-slack_app_token = os.getenv("SLACK_APP_TOKEN")
 
 slack_bot = SlackBot(
-	token=slack_token,
-	signing_secret=slack_signing_secret,
-	cc_group_id=cc_group_id,
-	app_token=slack_app_token,
-	slack_mode=slack_mode,
+    token=slack_token,
+    cc_group_id=cc_group_id,
 )
+
 slack_client = slack_bot.client
\ No newline at end of file
diff --git a/twisted/slack_bot/tests.py b/twisted/slack_bot/tests.py
index 9f98f7c..e69de29 100644
--- a/twisted/slack_bot/tests.py
+++ b/twisted/slack_bot/tests.py
@@ -1,47 +0,0 @@
-from unittest.mock import Mock, patch
-
-from django.test import SimpleTestCase
-
-from .slack import SlackBot
-
-
-class SlackBotModeTests(SimpleTestCase):
-    @patch("slack_bot.slack.threading.Thread")
-    @patch("slack_bot.slack.SocketModeHandler")
-    def test_socket_mode_starts_in_background_thread(self, socket_handler_cls, thread_cls):
-        socket_handler = Mock()
-        socket_handler_cls.return_value = socket_handler
-        thread_instance = Mock()
-        thread_cls.return_value = thread_instance
-
-        bot = SlackBot(
-            token="xoxb-test",
-            signing_secret="secret",
-            app_token="xapp-test",
-            slack_mode="socket",
-        )
-
-        bot.start()
-
-        socket_handler_cls.assert_called_once_with(bot.app, "xapp-test")
-        thread_cls.assert_called_once_with(
-            target=socket_handler.start,
-            name="slack-socket-mode",
-            daemon=True,
-        )
-        thread_instance.start.assert_called_once_with()
-
-    @patch("slack_bot.slack.threading.Thread")
-    @patch("slack_bot.slack.SocketModeHandler")
-    def test_https_mode_does_not_start_socket_thread(self, socket_handler_cls, thread_cls):
-        bot = SlackBot(
-            token="xoxb-test",
-            signing_secret="secret",
-            app_token="xapp-test",
-            slack_mode="https",
-        )
-
-        bot.start()
-
-        socket_handler_cls.assert_not_called()
-        thread_cls.assert_not_called()
diff --git a/twisted/slack_bot/urls.py b/twisted/slack_bot/urls.py
index c296fcd..e69de29 100644
--- a/twisted/slack_bot/urls.py
+++ b/twisted/slack_bot/urls.py
@@ -1,8 +0,0 @@
-from django.urls import path
-from . import views
-
-app_name = "slack_bot"
-
-urlpatterns = [
-    path("slack/events/", views.slack_events, name="events"),
-]
diff --git a/twisted/slack_bot/views.py b/twisted/slack_bot/views.py
index a33f514..e69de29 100644
--- a/twisted/slack_bot/views.py
+++ b/twisted/slack_bot/views.py
@@ -1,80 +0,0 @@
-from slack_bolt.adapter.django import SlackRequestHandler
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.views.decorators.csrf import csrf_exempt
-from .slack import slack_bot
-
-# Initialize the handler
-handler = SlackRequestHandler(slack_bot.app)
-
-
-@csrf_exempt
-def slack_events(request):
-    """
-    Slack events endpoint handler for:
-    - App mentions and messages
-    - Slash commands
-    - Shortcuts
-    - Interactive components
-    """
-    return handler.handle(request)
-
-
-# ==================== Event Handlers ====================
-
-
-@slack_bot.app.event("app_mention")
-def handle_app_mention(body, say, logger):
-    """Handle when the bot is mentioned in a message"""
-    logger.debug(f"App mention event: {body}")
-    say(f"Thanks for the mention! <@{body['event']['user']}>")
-
-
-@slack_bot.app.event("message")
-def handle_message(body, logger):
-    """Handle regular messages (optional, remove if not needed)"""
-    logger.debug(f"Message event: {body}")
-
-
-# ==================== Slash Commands ====================
-
-
-# @slack_bot.app.command("/hellotwisted")
-# def handle_hello_command(ack, respond, command):
-#     """
-#     Slash command: /hellotwisted
-#     Responds with a greeting and user information
-#     """
-#     ack()
-#     respond(
-#         text=f"Hello <@{command['user_id']}>! 👋",
-#         blocks=[
-#             {
-#                 "type": "section",
-#                 "text": {
-#                     "type": "mrkdwn",
-#                     "text": f"Hello <@{command['user_id']}> from the Twisted Slack Bot! 👋",
-#                 },
-#             },
-#             {
-#                 "type": "section",
-#                 "fields": [
-#                     {"type": "mrkdwn", "text": f"*User:*\n<@{command['user_id']}>"},
-#                     {"type": "mrkdwn", "text": f"*Channel:*\n<#{command['channel_id']}>"},
-#                 ],
-#             },
-#         ],
-#     )
-
-
-def ack_short_handler(ack):
-    ack()
-
-def hellotwistedcommand(respond, body):
-    user = body["user"]["id"]
-    respond(text=f"Hello <@{user}> from the Twisted Slack Bot! 👋")
-
-slack_bot.app.command("/hellotwisted")(
-    ack=ack_short_handler,
-    lazy=[hellotwistedcommand]
-)
diff --git a/twisted/twisted_site/slack.py b/twisted/twisted_site/slack.py
index 7df8336..cbf727b 100644
--- a/twisted/twisted_site/slack.py
+++ b/twisted/twisted_site/slack.py
@@ -1,134 +1,187 @@
 import os
-import threading
 from typing import Any
-from slack_bolt import App
-from slack_bolt.adapter.socket_mode import SocketModeHandler
+
+from slack_sdk import WebClient
 
 
 class SlackBot:
-	def __init__(
-		self,
-		token: str | None = None,
-		signing_secret: str | None = None,
-		cc_group_id: str | None = None,
-		app_token: str | None = None,
-		slack_mode: str | None = None,
-	):
-		self.slack_mode = (slack_mode or os.getenv("SLACK_MODE", "https")).lower()
-		self.app_token = app_token or os.getenv("SLACK_APP_TOKEN")
-		slack_token = token
-		self.app = App(token=slack_token, signing_secret=signing_secret)
-		self.socket_mode_handler: SocketModeHandler | None = None
-		self.socket_thread: threading.Thread | None = None
-		if self.slack_mode == "socket":
-			if not self.app_token:
-				raise ValueError("SLACK_APP_TOKEN must be set when SLACK_MODE=socket")
-			self.socket_mode_handler = SocketModeHandler(self.app, self.app_token)
-		self.client = self.app.client
-		self._cc_group_id = cc_group_id
-
-	def start(self):
-		if self.socket_mode_handler is not None:
-			self.socket_thread = threading.Thread(
-				target=self.socket_mode_handler.start,
-				name="slack-socket-mode",
-				daemon=True,
-			)
-			self.socket_thread.start()
-
-	def post_message(
-		self,
-		*,
-		channel: str,
-		text: str,
-		blocks: list[dict[str, Any]] | None = None,
-		**kwargs: Any,
-	):
-		payload: dict[str, Any] = {
-			"channel": channel,
-			"text": text,
-			**kwargs,
-		}
-		if blocks is not None:
-			payload["blocks"] = blocks
-		return self.client.chat_postMessage(**payload)
-
-	def send_message(self, *, channel: str, text: str, **kwargs: Any):
-		return self.post_message(channel=channel, text=text, **kwargs)
-
-	def send_blocks(
-		self,
-		*,
-		channel: str,
-		blocks: list[dict[str, Any]],
-		text: str = " ",
-		**kwargs: Any,
-	):
-		return self.post_message(channel=channel, text=text, blocks=blocks, **kwargs)
-	def error_log(
-		self,
-		*,
-		channel: str,
-		error: str,
-		title: str | None = None,
-		**kwargs: Any,
-	):
-		if title is None:
-			title = "Error Log"
-
-		group_id = self._cc_group_id
-		mention = f"<@{group_id}>" if group_id else ""
-
-		# Parent message
-		parent = self.client.chat_postMessage(
-			channel=channel,
-			text=f"{title}".strip(),
-			blocks=[
-				{
-					"type": "section",
-					"text": {
-						"type": "mrkdwn",
-						"text": f"*{title}*".strip(),
-					},
-				},
-			],
-		)
-
-		# Thread message
-		thread_text = f"```{error}```"
-		if mention:
-			thread_text += f"\n\nCC: {mention}"
-
-		return self.client.chat_postMessage(
-			channel=channel,
-			thread_ts=parent["ts"],
-			text=thread_text,
-			blocks=[
-				{
-					"type": "section",
-					"text": {
-						"type": "mrkdwn",
-						"text": thread_text,
-					},
-				},
-			],
-		)
-
-	def users_info(self, *, user: str):
-		return self.client.users_info(user=user)
+    def __init__(
+        self,
+        token: str | None = None,
+        cc_group_id: str | None = None,
+    ):
+        self.token = token or os.getenv("SLACK_TOKEN")
+
+        if not self.token:
+            raise ValueError("SLACK_TOKEN must be set")
+
+        self.client = WebClient(token=self.token)
+        self._cc_group_id = cc_group_id or os.getenv("SLACK_CC_GROUP_ID")
+
+    def post_message(
+        self,
+        *,
+        channel: str,
+        text: str,
+        blocks: list[dict[str, Any]] | None = None,
+        **kwargs: Any,
+    ):
+        payload = {
+            "channel": channel,
+            "text": text,
+            **kwargs,
+        }
+
+        if blocks is not None:
+            payload["blocks"] = blocks
+
+        return self.client.chat_postMessage(**payload)
+
+    def send_message(
+        self,
+        *,
+        channel: str,
+        text: str,
+        **kwargs: Any,
+    ):
+        return self.post_message(
+            channel=channel,
+            text=text,
+            **kwargs,
+        )
+
+    def send_blocks(
+        self,
+        *,
+        channel: str,
+        blocks: list[dict[str, Any]],
+        text: str = " ",
+        **kwargs: Any,
+    ):
+        return self.post_message(
+            channel=channel,
+            text=text,
+            blocks=blocks,
+            **kwargs,
+        )
+
+    def dm_user(
+        self,
+        *,
+        user: str,
+        text: str,
+        blocks: list[dict[str, Any]] | None = None,
+        **kwargs: Any,
+    ):
+        """
+        Send a DM to a Slack user using their U... user ID.
+
+        No D... DM channel ID is required.
+        """
+        return self.post_message(
+            channel=user,
+            text=text,
+            blocks=blocks,
+            **kwargs,
+        )
+
+    def dm_user_blocks(
+        self,
+        *,
+        user: str,
+        blocks: list[dict[str, Any]],
+        text: str = " ",
+        **kwargs: Any,
+    ):
+        """Send Block Kit directly to a user using their U... ID."""
+        return self.dm_user(
+            user=user,
+            text=text,
+            blocks=blocks,
+            **kwargs,
+        )
+
+    def users_info(self, *, user: str):
+        return self.client.users_info(user=user)
+
+    def get_user_profile(self, user: str) -> dict[str, Any]:
+        response = self.client.users_info(user=user)
+
+        user_data = response["user"]
+        profile = user_data.get("profile", {})
+
+        return {
+            "id": user_data["id"],
+            "name": user_data.get("name"),
+            "real_name": (
+                user_data.get("real_name")
+                or profile.get("real_name")
+            ),
+            "display_name": (
+                profile.get("display_name")
+                or user_data.get("name")
+            ),
+            "image_24": profile.get("image_24"),
+            "image_32": profile.get("image_32"),
+            "image_48": profile.get("image_48"),
+            "image_72": profile.get("image_72"),
+            "image_192": profile.get("image_192"),
+            "image_512": profile.get("image_512"),
+        }
+
+    def error_log(
+        self,
+        *,
+        channel: str,
+        error: str,
+        title: str = "Error Log",
+        **kwargs: Any,
+    ):
+        group_id = self._cc_group_id
+        mention = f"<@{group_id}>" if group_id else ""
+
+        parent = self.client.chat_postMessage(
+            channel=channel,
+            text=title,
+            blocks=[
+                {
+                    "type": "section",
+                    "text": {
+                        "type": "mrkdwn",
+                        "text": f"*{title}*",
+                    },
+                }
+            ],
+            **kwargs,
+        )
+
+        thread_text = f"```{error}```"
+
+        if mention:
+            thread_text += f"\n\nCC: {mention}"
+
+        return self.client.chat_postMessage(
+            channel=channel,
+            thread_ts=parent["ts"],
+            text=thread_text,
+            blocks=[
+                {
+                    "type": "section",
+                    "text": {
+                        "type": "mrkdwn",
+                        "text": thread_text,
+                    },
+                }
+            ],
+        )
 
 
 slack_token = os.getenv("SLACK_TOKEN")
-slack_signing_secret = os.getenv("SLACK_SIGNING_SECRET")
 cc_group_id = os.getenv("SLACK_CC_GROUP_ID")
-slack_mode = os.getenv("SLACK_MODE", "https").strip().lower()
-slack_app_token = os.getenv("SLACK_APP_TOKEN")
 
 slack_bot = SlackBot(
-	token=slack_token,
-	signing_secret=slack_signing_secret,
-	cc_group_id=cc_group_id,
-	app_token=slack_app_token,
-	slack_mode=slack_mode,
+    token=slack_token,
+    cc_group_id=cc_group_id,
 )
+
 slack_client = slack_bot.client
\ No newline at end of file

From 45ec82394ae877626834031ef15879c0eccd0914 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Mon, 24 Aug 2026 18:01:20 +0530
Subject: [PATCH 070/118] Add slack.py

---
 slack_bot/slack.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 slack_bot/slack.py

diff --git a/slack_bot/slack.py b/slack_bot/slack.py
new file mode 100644
index 0000000..e69de29

From e4f30d4590e4c7d25e701e9a3f76ca777c113338 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Mon, 24 Aug 2026 18:08:07 +0530
Subject: [PATCH 071/118] Complete removal of slack_bot module

---
 twisted/mysite/settings.py    |   1 -
 twisted/mysite/urls.py        |   1 -
 twisted/slack_bot/__init__.py |   0
 twisted/slack_bot/admin.py    |   0
 twisted/slack_bot/apps.py     |   0
 twisted/slack_bot/models.py   |   0
 twisted/slack_bot/slack.py    | 187 ----------------------------------
 twisted/slack_bot/tests.py    |   0
 twisted/slack_bot/urls.py     |   0
 twisted/slack_bot/views.py    |   0
 10 files changed, 189 deletions(-)
 delete mode 100644 twisted/slack_bot/__init__.py
 delete mode 100644 twisted/slack_bot/admin.py
 delete mode 100644 twisted/slack_bot/apps.py
 delete mode 100644 twisted/slack_bot/models.py
 delete mode 100644 twisted/slack_bot/slack.py
 delete mode 100644 twisted/slack_bot/tests.py
 delete mode 100644 twisted/slack_bot/urls.py
 delete mode 100644 twisted/slack_bot/views.py

diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index a8eadd3..8e75d04 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -56,7 +56,6 @@
     # Your apps
     'common',
     'twisted_site',
-    'slack_bot',
     
     # 3rd party apps
     'django_cotton',
diff --git a/twisted/mysite/urls.py b/twisted/mysite/urls.py
index a81504d..c5b2bf4 100644
--- a/twisted/mysite/urls.py
+++ b/twisted/mysite/urls.py
@@ -21,7 +21,6 @@
 
 urlpatterns = [
     path("", include("twisted_site.urls")),
-    path("", include("slack_bot.urls")),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
 if settings.DEBUG:
diff --git a/twisted/slack_bot/__init__.py b/twisted/slack_bot/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/twisted/slack_bot/admin.py b/twisted/slack_bot/admin.py
deleted file mode 100644
index e69de29..0000000
diff --git a/twisted/slack_bot/apps.py b/twisted/slack_bot/apps.py
deleted file mode 100644
index e69de29..0000000
diff --git a/twisted/slack_bot/models.py b/twisted/slack_bot/models.py
deleted file mode 100644
index e69de29..0000000
diff --git a/twisted/slack_bot/slack.py b/twisted/slack_bot/slack.py
deleted file mode 100644
index c9e2d37..0000000
--- a/twisted/slack_bot/slack.py
+++ /dev/null
@@ -1,187 +0,0 @@
-import os
-from typing import Any
-
-from slack_sdk import WebClient
-
-
-class SlackBot:
-    def __init__(
-        self,
-        token: str | None = None,
-        cc_group_id: str | None = None,
-    ):
-        self.token = token or os.getenv("SLACK_TOKEN")
-
-        if not self.token:
-            raise ValueError("SLACK_TOKEN must be set")
-
-        self.client = WebClient(token=self.token)
-        self._cc_group_id = cc_group_id or os.getenv("SLACK_CC_GROUP_ID")
-
-    def post_message(
-        self,
-        *,
-        channel: str,
-        text: str,
-        blocks: list[dict[str, Any]] | None = None,
-        **kwargs: Any,
-    ):
-        payload = {
-            "channel": channel,
-            "text": text,
-            **kwargs,
-        }
-
-        if blocks is not None:
-            payload["blocks"] = blocks
-
-        return self.client.chat_postMessage(**payload)
-
-    def send_message(
-        self,
-        *,
-        channel: str,
-        text: str,
-        **kwargs: Any,
-    ):
-        return self.post_message(
-            channel=channel,
-            text=text,
-            **kwargs,
-        )
-
-    def send_blocks(
-        self,
-        *,
-        channel: str,
-        blocks: list[dict[str, Any]],
-        text: str = " ",
-        **kwargs: Any,
-    ):
-        return self.post_message(
-            channel=channel,
-            text=text,
-            blocks=blocks,
-            **kwargs,
-        )
-
-    def dm_user(
-        self,
-        *,
-        user: str,
-        text: str,
-        blocks: list[dict[str, Any]] | None = None,
-        **kwargs: Any,
-    ):
-        """
-        Send a DM to a Slack user using their U... user ID.
-
-        No D... DM channel ID is required.
-        """
-        return self.post_message(
-            channel=user,
-            text=text,
-            blocks=blocks,
-            **kwargs,
-        )
-
-    def dm_user_blocks(
-        self,
-        *,
-        user: str,
-        blocks: list[dict[str, Any]],
-        text: str = " ",
-        **kwargs: Any,
-    ):
-        """Send Block Kit directly to a user using their U... ID."""
-        return self.dm_user(
-            user=user,
-            text=text,
-            blocks=blocks,
-            **kwargs,
-        )
-
-    def users_info(self, *, user: str):
-        return self.client.users_info(user=user)
-
-    def get_user_profile(self, user: str) -> dict[str, Any]:
-        response = self.client.users_info(user=user)
-
-        user_data = response["user"]
-        profile = user_data.get("profile", {})
-
-        return {
-            "id": user_data["id"],
-            "name": user_data.get("name"),
-            "real_name": (
-                user_data.get("real_name")
-                or profile.get("real_name")
-            ),
-            "display_name": (
-                profile.get("display_name")
-                or user_data.get("name")
-            ),
-            "image_24": profile.get("image_24"),
-            "image_32": profile.get("image_32"),
-            "image_48": profile.get("image_48"),
-            "image_72": profile.get("image_72"),
-            "image_192": profile.get("image_192"),
-            "image_512": profile.get("image_512"),
-        }
-
-    def error_log(
-        self,
-        *,
-        channel: str,
-        error: str,
-        title: str = "Error Log",
-        **kwargs: Any,
-    ):
-        group_id = self._cc_group_id
-        mention = f"<!subteam^{group_id}>" if group_id else ""
-
-        parent = self.client.chat_postMessage(
-            channel=channel,
-            text=title,
-            blocks=[
-                {
-                    "type": "section",
-                    "text": {
-                        "type": "mrkdwn",
-                        "text": f"*{title}*",
-                    },
-                }
-            ],
-            **kwargs,
-        )
-
-        thread_text = f"```{error}```"
-
-        if mention:
-            thread_text += f"\n\nCC: {mention}"
-
-        return self.client.chat_postMessage(
-            channel=channel,
-            thread_ts=parent["ts"],
-            text=thread_text,
-            blocks=[
-                {
-                    "type": "section",
-                    "text": {
-                        "type": "mrkdwn",
-                        "text": thread_text,
-                    },
-                }
-            ],
-        )
-
-
-slack_token = os.getenv("SLACK_TOKEN")
-cc_group_id = os.getenv("SLACK_CC_GROUP_ID")
-
-slack_bot = SlackBot(
-    token=slack_token,
-    cc_group_id=cc_group_id,
-)
-
-slack_client = slack_bot.client
\ No newline at end of file
diff --git a/twisted/slack_bot/tests.py b/twisted/slack_bot/tests.py
deleted file mode 100644
index e69de29..0000000
diff --git a/twisted/slack_bot/urls.py b/twisted/slack_bot/urls.py
deleted file mode 100644
index e69de29..0000000
diff --git a/twisted/slack_bot/views.py b/twisted/slack_bot/views.py
deleted file mode 100644
index e69de29..0000000

From 272a010092f05fdfd9d79a6a5cc7861cfd8a867d Mon Sep 17 00:00:00 2001
From: Rohan317685 <dsairohan@gmail.com>
Date: Mon, 24 Aug 2026 16:46:52 +0100
Subject: [PATCH 072/118] feat: ability to resize windows by hovering on the
 edge.

---
 .../twisted_site/static/css/98.override.css   | 42 +++++++++++-
 .../templates/client/dashboard.html           | 67 +++++++++++++++++++
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/twisted/twisted_site/static/css/98.override.css b/twisted/twisted_site/static/css/98.override.css
index d2634eb..44c88b6 100644
--- a/twisted/twisted_site/static/css/98.override.css
+++ b/twisted/twisted_site/static/css/98.override.css
@@ -30,4 +30,44 @@
   color: #FAFAFA !important;
   margin: 0 !important;
   padding: 4px !important;
-}
\ No newline at end of file
+}
+
+.resize-handle {
+  position: absolute;
+  z-index: 10;
+}
+
+.resize-n,
+.resize-s {
+  left: 8px;
+  right: 8px;
+  height: 6px;
+  cursor: ns-resize;
+}
+
+.resize-n { top: 0; }
+.resize-s { bottom: 0; }
+
+.resize-e,
+.resize-w {
+  top: 8px;
+  bottom: 8px;
+  width: 6px;
+  cursor: ew-resize;
+}
+
+.resize-e { right: 0; }
+.resize-w { left: 0; }
+
+.resize-ne,
+.resize-nw,
+.resize-se,
+.resize-sw {
+  width: 8px;
+  height: 8px;
+}
+
+.resize-ne { top: 0; right: 0; cursor: ne-resize; }
+.resize-nw { top: 0; left: 0; cursor: nw-resize; }
+.resize-se { bottom: 0; right: 0; cursor: se-resize; }
+.resize-sw { bottom: 0; left: 0; cursor: sw-resize; }
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index ea3284a..76691e2 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -209,6 +209,14 @@
         <div class="window-body h-full flex-1">
             <iframe class="w-full h-full src-frame select-none" src="about:blank" frameborder="0"></iframe>
         </div>
+        <div class="resize-handle resize-n"></div>
+        <div class="resize-handle resize-s"></div>
+        <div class="resize-handle resize-e"></div>
+        <div class="resize-handle resize-w"></div>
+        <div class="resize-handle resize-ne"></div>
+        <div class="resize-handle resize-nw"></div>
+        <div class="resize-handle resize-se"></div>
+        <div class="resize-handle resize-sw"></div>
     </div>
 </template>
 
@@ -275,6 +283,7 @@
 
         realWin.querySelector(".title-bar").addEventListener("mousedown", () => focusWindow(id));
         dragWindow(realWin);
+        initResizeHandles(realWin);
         focusWindow(id);
         realWin.querySelector(".max-button").addEventListener("mouseup", () => {
             console.log("maximise!");
@@ -391,6 +400,64 @@
         });
     }
 
+    function initResizeHandles(mywindow) {
+        const handles = mywindow.querySelectorAll(".resize-handle");
+        const frame = mywindow.querySelector(".src-frame");
+        handles.forEach((handle) => {
+            handle.addEventListener("mousedown", (e) => {
+                e.preventDefault();
+                if (!mywindow.classList.contains("resize")) return;
+                const dir = handle.classList[1].replace("resize-", "");
+                const startX = e.clientX;
+                const startY = e.clientY;
+                const startLeft = mywindow.offsetLeft;
+                const startTop = mywindow.offsetTop;
+                const startWidth = mywindow.offsetWidth;
+                const startHeight = mywindow.offsetHeight;
+                const minW = 200;
+                const minH = 200;
+                const oldPointerEvents = frame.style.pointerEvents;
+                frame.style.pointerEvents = "none";
+
+                function onMove(ev) {
+                    const dx = ev.clientX - startX;
+                    const dy = ev.clientY - startY;
+                    let newLeft = startLeft;
+                    let newTop = startTop;
+                    let newWidth = startWidth;
+                    let newHeight = startHeight;
+
+                    if (dir.includes("e")) newWidth = Math.max(minW, startWidth + dx);
+                    if (dir.includes("s")) newHeight = Math.max(minH, startHeight + dy);
+                    if (dir.includes("w")) {
+                        newWidth = Math.max(minW, startWidth - dx);
+                        newLeft = startLeft + (startWidth - newWidth);
+                    }
+                    if (dir.includes("n")) {
+                        newHeight = Math.max(minH, startHeight - dy);
+                        newTop = startTop + (startHeight - newHeight);
+                    }
+
+                    mywindow.style.left = newLeft + "px";
+                    mywindow.style.top = newTop + "px";
+                    mywindow.style.width = newWidth + "px";
+                    mywindow.style.height = newHeight + "px";
+                }
+
+                function onUp() {
+                    frame.style.pointerEvents = oldPointerEvents;
+                    document.removeEventListener("mousemove", onMove);
+                    document.removeEventListener("mouseup", onUp);
+                    document.body.style.userSelect = "";
+                }
+
+                document.body.style.userSelect = "none";
+                document.addEventListener("mousemove", onMove);
+                document.addEventListener("mouseup", onUp);
+            });
+        });
+    }
+
     function updateClock() {
         const now = new Date();
         let h = now.getHours();

From 4dcf57de5e7195ecb83e3dd2ba1ddfcf9d40f065 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Mon, 24 Aug 2026 21:21:48 +0530
Subject: [PATCH 073/118] Work a bit on the pathways

---
 .../templates/admin/pathways/create.html      | 58 ++++++++++++
 .../templates/admin/pathways/detail.html      |  3 +
 .../{pathways.html => pathways/list.html}     | 10 ++-
 .../twisted_site/templates/cotton/base.html   |  1 +
 .../templates/cotton/pathway_card.html        |  4 +-
 twisted/twisted_site/urls.py                  |  4 +-
 twisted/twisted_site/views/admin/__init__.py  |  2 +-
 twisted/twisted_site/views/admin/admin.py     |  3 +
 twisted/twisted_site/views/admin/pathways.py  | 88 +++++++++++++++++--
 9 files changed, 156 insertions(+), 17 deletions(-)
 create mode 100644 twisted/twisted_site/templates/admin/pathways/create.html
 create mode 100644 twisted/twisted_site/templates/admin/pathways/detail.html
 rename twisted/twisted_site/templates/admin/{pathways.html => pathways/list.html} (62%)

diff --git a/twisted/twisted_site/templates/admin/pathways/create.html b/twisted/twisted_site/templates/admin/pathways/create.html
new file mode 100644
index 0000000..ac3cbb8
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/pathways/create.html
@@ -0,0 +1,58 @@
+{% load tz %}
+{% get_current_timezone as TIMEZONE %}
+<c-base>
+
+    <div>
+        <c-ui.breadcrumbs>
+            <c-ui.breadcrumbs.item href="{% url 'admin.dash' %}">Admin</c-ui.breadcrumbs.item>
+            <c-ui.breadcrumbs.item href="{% url 'admin.pathways' %}">Pathways</c-ui.breadcrumbs.item>
+            <c-ui.breadcrumbs.item :current="True">New</c-ui.breadcrumbs.item>
+        </c-ui.breadcrumbs>
+        <h1 class="text-2xl font-bold mt-2">Create Pathway</h1>
+        <form method="post">
+            {% csrf_token %}
+            <div class="mt-2 flex flex-col gap-2">
+                <c-ui.input label="Pathway name" name="name" placeholder="CPU" required="True" value="{{ pathway_name }}" />
+                <div class="flex flex-col lg:flex-row gap-2 w-full *:w-full">
+                    <div>
+                        <c-ui.label>Start</c-ui.label>
+                        <div class="flex gap-2 *:w-full">
+                            <c-ui.datepicker mode="single" name="startDate" value="{{ start_date }}" required />
+                            <c-ui.input type="time" name="startTime" value="{{ start_time }}" required />
+                        </div>
+                    </div>
+                    <div class="hidden lg:block border border-zinc-800 flex-0">
+                    </div>
+                    <div>
+                        <c-ui.label>End</c-ui.label>
+                        <div class="flex gap-2 *:w-full">
+                            <c-ui.datepicker mode="single" name="endDate" value="{{ end_date }}" required />
+                            <c-ui.input type="time" name="endTime" value="{{ end_time }}" required />
+                        </div>
+                    </div>
+                </div>
+                <div>
+                    <c-ui.alert>Start/End is in {{ TIMEZONE }} (your local time).</c-ui.alert>
+                </div>
+                <div>
+                    <c-ui.input label="Minimum time required to unlock (in minutes)" type="number" value="{{ min_mins }}" name="mins" placeholder="300" required />
+                </div>
+                <c-ui.button class="lg:w-min" type="submit" variant="primary">Create Pathway</c-ui.mode-toggle>
+            </div>
+        </form>
+    </div>
+    <script>
+            htmx.logAll();
+    </script>
+
+    {% if error %}
+        <div id="errorMessage" data-message="{{ error|default:'no error found!' }}">
+            <script>
+                message = document.querySelector('#errorMessage').dataset.message
+                setTimeout(() => {
+                    window.dispatchEvent(new CustomEvent('toast', { detail: { message: message, variant: 'error' }}))
+                }, 100)
+            </script>
+        </div>
+    {% endif %}
+</c-base>
diff --git a/twisted/twisted_site/templates/admin/pathways/detail.html b/twisted/twisted_site/templates/admin/pathways/detail.html
new file mode 100644
index 0000000..4d79ca2
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/pathways/detail.html
@@ -0,0 +1,3 @@
+<c-base>
+    <div>Work in progress!</div>
+</c-base>
diff --git a/twisted/twisted_site/templates/admin/pathways.html b/twisted/twisted_site/templates/admin/pathways/list.html
similarity index 62%
rename from twisted/twisted_site/templates/admin/pathways.html
rename to twisted/twisted_site/templates/admin/pathways/list.html
index 3d300fd..d181113 100644
--- a/twisted/twisted_site/templates/admin/pathways.html
+++ b/twisted/twisted_site/templates/admin/pathways/list.html
@@ -4,10 +4,12 @@
             <h1 class="text-center md:text-left me-4 font-semibold text-3xl mt-auto">
                 Pathways
             </h1>
-            <c-ui.button variant="primary">
-                <svg class="inline-block size-6" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" xmlns="http://www.w3.org/2000/svg" aria-label="plus" viewBox="0 0 32 32" preserveAspectRatio="xMidYMid meet" fill="currentColor" width="256" height="256"><path d="M16,6c5.1,0 7.247,0.575 8.336,1.664c1.089,1.089 1.664,3.236 1.664,8.336c0,5.1 -0.575,7.247 -1.664,8.336c-1.089,1.089 -3.236,1.664 -8.336,1.664c-5.1,0 -7.247,-0.575 -8.336,-1.664c-1.089,-1.089 -1.664,-3.236 -1.664,-8.336c0,-5.1 0.575,-7.247 1.664,-8.336c1.089,-1.089 3.236,-1.664 8.336,-1.664Zm0,-2c10,0 12,2 12,12c0,10 -2,12 -12,12c-10,0 -12,-2 -12,-12c0,-10 2,-12 12,-12Zm-1,8c0,-0.552 0.448,-1 1,-1c0.552,0 1,0.448 1,1l0,3l3,0c0.552,0 1,0.448 1,1c0,0.552 -0.448,1 -1,1l-3,0l0,3c0,0.552 -0.448,1 -1,1c-0.552,0 -1,-0.448 -1,-1l0,-3l-3,0c-0.552,0 -1,-0.448 -1,-1c0,-0.552 0.448,-1 1,-1l3,0l0,-3Z"/></svg>
-                Create new
-            </c-ui.button>
+            <a href="{% url 'admin.pathways.create' %}">
+                <c-ui.button variant="primary">
+                    <svg class="inline-block size-6" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" xmlns="http://www.w3.org/2000/svg" aria-label="plus" viewBox="0 0 32 32" preserveAspectRatio="xMidYMid meet" fill="currentColor" width="256" height="256"><path d="M16,6c5.1,0 7.247,0.575 8.336,1.664c1.089,1.089 1.664,3.236 1.664,8.336c0,5.1 -0.575,7.247 -1.664,8.336c-1.089,1.089 -3.236,1.664 -8.336,1.664c-5.1,0 -7.247,-0.575 -8.336,-1.664c-1.089,-1.089 -1.664,-3.236 -1.664,-8.336c0,-5.1 0.575,-7.247 1.664,-8.336c1.089,-1.089 3.236,-1.664 8.336,-1.664Zm0,-2c10,0 12,2 12,12c0,10 -2,12 -12,12c-10,0 -12,-2 -12,-12c0,-10 2,-12 12,-12Zm-1,8c0,-0.552 0.448,-1 1,-1c0.552,0 1,0.448 1,1l0,3l3,0c0.552,0 1,0.448 1,1c0,0.552 -0.448,1 -1,1l-3,0l0,3c0,0.552 -0.448,1 -1,1c-0.552,0 -1,-0.448 -1,-1l0,-3l-3,0c-0.552,0 -1,-0.448 -1,-1c0,-0.552 0.448,-1 1,-1l3,0l0,-3Z"/></svg>
+                    Create new
+                </c-ui.button>
+            </a>
         </div>
         <div class="flex gap-2 *:min-w-80 *:w-200 flex-1 h-full bg-slate-950">
             <div class="bg-purple-950/40 border border-purple-900 rounded-md p-2">
diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html
index 67c4a54..afbcb8a 100644
--- a/twisted/twisted_site/templates/cotton/base.html
+++ b/twisted/twisted_site/templates/cotton/base.html
@@ -15,6 +15,7 @@
     {{ head }}
 </head>
 <body class="dark bg-[#09090B] text-white font-latin" hx-headers='{"x-csrftoken": "{{ csrf_token }}"}'>
+    <c-ui.toast.container />
     <div class="flex flex-col md:flex-row md:py-2 h-screen">
         <div class="md:h-full">
             <c-sidebar>
diff --git a/twisted/twisted_site/templates/cotton/pathway_card.html b/twisted/twisted_site/templates/cotton/pathway_card.html
index 8299bc2..9eaa97e 100644
--- a/twisted/twisted_site/templates/cotton/pathway_card.html
+++ b/twisted/twisted_site/templates/cotton/pathway_card.html
@@ -18,8 +18,8 @@ <h3 class="text-lg font-bold">{{ pathway.name }}</h3>
         </div>
         {% if not pathway.didnt_start %}
         <div>
-            <p class="text-ink-400">Qualified count</p>
-            <p title="local time">{{ pathway.qualified_participants|length }}</p>
+            <p class="text-ink-400">Qualified</p>
+            <p title="local time">{{ pathway.qualified_participants|length }} participant{{ pathway.qualified_participants|pluralize }}</p>
             {% if pathway.qualified_participants %}
             <p class="mt-2">
                 <c-ui.avatar.group>
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index 37f3e8e..32dfc5d 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -30,7 +30,9 @@
     path("admin/", admin.DashboardView.as_view(), name="admin.dash"),
     path("admin/users/", admin.UsersView.as_view(), name="admin.users"),
     path("admin/users/<int:id>/", admin.UserDetailView.as_view(), name="admin.users.detail"),
-    path("admin/pathways/", admin.PathwaysView.as_view(), name="admin.pathways"),
+    path("admin/pathways/", admin.PathwayListView.as_view(), name="admin.pathways"),
+    path("admin/pathways/<int:id>", admin.PathwayDetailView.as_view(), name="admin.pathways.detail"),
+    path("admin/pathways/new/", admin.PathwayCreateView.as_view(), name="admin.pathways.create"),
     path("admin/fulfillment/", admin.FulfillmentView.as_view(), name="admin.fulfillment"),
     path("admin/shop/", admin.ShopView.as_view(), name="admin.shop"),
     path("admin/review/", admin.ReviewView.as_view(), name="admin.review"),
diff --git a/twisted/twisted_site/views/admin/__init__.py b/twisted/twisted_site/views/admin/__init__.py
index fc43652..e88f93d 100644
--- a/twisted/twisted_site/views/admin/__init__.py
+++ b/twisted/twisted_site/views/admin/__init__.py
@@ -1,6 +1,6 @@
 from .dashboard import DashboardView
 from .users import UsersView, UserDetailView
-from .pathways import PathwaysView
+from .pathways import PathwayListView, PathwayDetailView, PathwayCreateView
 from .fulfillment import FulfillmentView
 from .shop import ShopView
 from .review import ReviewView
diff --git a/twisted/twisted_site/views/admin/admin.py b/twisted/twisted_site/views/admin/admin.py
index f0be2c1..5cef33f 100644
--- a/twisted/twisted_site/views/admin/admin.py
+++ b/twisted/twisted_site/views/admin/admin.py
@@ -1,6 +1,9 @@
 from django.views import View
 from django.shortcuts import render, redirect, resolve_url
 from dataclasses import dataclass
+import json
+from typing import Literal
+from django_htmx.http import trigger_client_event
 
 @dataclass
 class SidebarLink:
diff --git a/twisted/twisted_site/views/admin/pathways.py b/twisted/twisted_site/views/admin/pathways.py
index 6976cbe..dff8b06 100644
--- a/twisted/twisted_site/views/admin/pathways.py
+++ b/twisted/twisted_site/views/admin/pathways.py
@@ -1,19 +1,22 @@
+from django.http import HttpResponse
 from .admin import AdminView
 from django.shortcuts import render, redirect
 from ...models import Pathway
+from django.utils import timezone
+
 
 # Create your views here.
-class PathwaysView(AdminView):
+class PathwayListView(AdminView):
     def get(self, request):
-        context = self.get_context_data(page='pathways')
-        context['pathways'] = Pathway.objects.all().order_by('start')
+        context = self.get_context_data(page="pathways")
+        context["pathways"] = Pathway.objects.all().order_by("start")
 
         pathways = Pathway.objects.order_by("start").all()
 
         current_pathways = []
         past_pathways = []
         future_pathways = []
-        
+
         for pathway in pathways:
             if pathway.in_progress():
                 current_pathways.append(pathway)
@@ -22,9 +25,76 @@ def get(self, request):
             if pathway.didnt_start():
                 future_pathways.append(pathway)
 
-        past_pathways.reverse()        
-        context['current_pathways'] = current_pathways
-        context['past_pathways'] = past_pathways
-        context['future_pathways'] = future_pathways
+        past_pathways.reverse()
+        context["current_pathways"] = current_pathways
+        context["past_pathways"] = past_pathways
+        context["future_pathways"] = future_pathways
+
+        return render(request, "admin/pathways/list.html", context=context)
+
+
+class PathwayCreateView(AdminView):
+    def get(self, request, error=None, extracontext={}):
+        context = self.get_context_data(page="pathways", subpage="create")
+        context.update(extracontext)
+        
+        if error:
+            context['error'] = error
+        
+        return render(request, "admin/pathways/create.html", context=context)
+
+    def post(self, request):
+        pathway_name = request.POST.get("name")
+
+        start_date = request.POST.get("startDate")
+        start_time = request.POST.get("startTime")
+
+        end_date = request.POST.get("endDate")
+        end_time = request.POST.get("endTime")
         
-        return render(request, "admin/pathways.html", context=context)
\ No newline at end of file
+        min_mins = int(request.POST.get("mins", "0"))
+
+        errcontext = {
+            'pathway_name': pathway_name,
+            'start_date': start_date,
+            'start_time': start_time,
+            'end_date': end_date,
+            'end_time': end_time,
+            'min_mins': min_mins,
+        }
+        
+        if not pathway_name:
+            return self.get(request, "No pathway name typed!", errcontext)
+        
+        if not start_date:
+            return self.get(request, "No start date selected!", errcontext)
+        
+        if not start_time:
+            return self.get(request, "No start time selected!", errcontext)
+        
+        if not end_date:
+            return self.get(request, "No end date selected!", errcontext)
+        
+        if not end_time:
+            return self.get(request, "No end time selected!", errcontext)
+        
+        if not min_mins:
+            return self.get(request, "No minimum minutes selected!", errcontext)
+        
+        current_tz_offset = timezone.datetime.now(timezone.get_current_timezone()).strftime('%z')
+        start = timezone.datetime.strptime(
+            f"{start_date} {start_time} {current_tz_offset}", "%Y-%m-%d %H:%M %z"
+        )
+        end = timezone.datetime.strptime(
+            f"{end_date} {end_time} {current_tz_offset}", "%Y-%m-%d %H:%M %z"
+        )
+
+        return HttpResponse(
+            f"{pathway_name=}<br>{start.isoformat()=}<br>{end.isoformat()=}<br>{min_mins=}"
+        )
+
+
+class PathwayDetailView(AdminView):
+    def get(self, request, id):
+        context = self.get_context_data(page="pathways", subpage="detail")
+        return render(request, "admin/pathways/detail.html", context=context)

From e55b7d2442036b2e93c914fb1c931503e3439d11 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Mon, 24 Aug 2026 22:10:56 +0530
Subject: [PATCH 074/118] Pathway creation now works, and implemented messages
 framework for admin.

---
 twisted/mysite/settings.py                    | 137 +-----------------
 .../templates/admin/pathways/create.html      |  14 --
 .../twisted_site/templates/cotton/base.html   |  27 ++++
 twisted/twisted_site/views/admin/pathways.py  |  55 ++++---
 4 files changed, 62 insertions(+), 171 deletions(-)

diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 8e75d04..75ae03c 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -166,138 +166,5 @@
 CSRF_COOKIE_HTTPONLY = False
 NPM_BIN_PATH = os.environ.get("NPM_BIN_PATH", "npm")
 
-# Jazzmin Settings
-JAZZMIN_SETTINGS = {
-    # title of the window (Will default to current_admin_site.site_title if absent or None)
-    "site_title": "Twisted Supadmin",
-
-    # Title on the login screen (19 chars max) (defaults to current_admin_site.site_header if absent or None)
-    "site_header": "Twisted - YSWS",
-
-    # Title on the brand (19 chars max) (defaults to current_admin_site.site_header if absent or None)
-    "site_brand": "Twisted - YSWS",
-
-    # Logo to use for your site, must be present in static files, used for brand on top left
-    "site_logo": "favicon.png",
-
-    # Logo to use for your site, must be present in static files, used for login form logo (defaults to site_logo)
-    "login_logo": True,
-
-    # Logo to use for login form in dark themes (defaults to login_logo)
-    "login_logo_dark": False,
-
-    # CSS classes that are applied to the logo above
-    "site_logo_classes": "img-circle",
-
-    # Relative path to a favicon for your site, will default to site_logo if absent (ideally 32x32 px)
-    "site_icon": '/static/favicon.png',
-
-    # Welcome text on the login screen
-    "welcome_sign": "Please sign in via the root!",
-
-    # Copyright on the footer
-    "copyright": "Twisted and Hack Club",
-
-    # List of model admins to search from the search bar, search bar omitted if excluded
-    # If you want to use a single search field you dont need to use a list, you can use a simple string 
-    # "search_model": ["auth.User", "auth.Group"],
-
-    # Field name on user model that contains avatar ImageField/URLField/Charfield or a callable that receives the user
-    "user_avatar": None,
-
-    ############
-    # Top Menu #
-    ############
-
-    # Links to put along the top menu
-    "topmenu_links": [
-
-        # Url that gets reversed (Permissions can be added)
-        {"name": "Home",  "url": "admin:index", "permissions": ["auth.view_user"]},
-
-        # external url that opens in a new window (Permissions can be added)
-        {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True},
-
-        # model admin to link to (Permissions checked against model)
-        {"model": "auth.User"},
-
-        # App with dropdown menu to all its models pages (Permissions checked against models)
-        {"app": "books"},
-    ],
-
-    #############
-    # User Menu #
-    #############
-
-    # Additional links to include in the user menu on the top right ("app" url type is not allowed)
-    "usermenu_links": [
-        {"name": "Dashboard", "url": "/dashboard/", "new_window": True},
-        {"model": "auth.user"}
-    ],
-
-    #############
-    # Side Menu #
-    #############
-
-    # Whether to display the side menu
-    "show_sidebar": True,
-
-    # Whether to aut expand the menu
-    "navigation_expanded": True,
-
-    # List of apps (and/or models) to base side menu ordering off of (does not need to contain all apps/models)
-    # "order_with_respect_to": ["auth", "books", "books.author", "books.book"],
-
-    # Custom links to append to app groups, keyed on app name
-    # "custom_links": {
-    #     "books": [{
-    #         "name": "Make Messages", 
-    #         "url": "make_messages", 
-    #         "icon": "fas fa-comments",
-    #         "permissions": ["books.view_book"]
-    #     }]
-    # },
-
-    # Custom icons for side menu apps/models See https://fontawesome.com/icons?d=gallery&m=free&v=5.0.0,5.0.1,5.0.10,5.0.11,5.0.12,5.0.13,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.13.0,5.12.0,5.11.2,5.11.1,5.10.0,5.9.0,5.8.2,5.8.1,5.7.2,5.7.1,5.7.0,5.6.3,5.5.0,5.4.2
-    # for the full list of 5.13.0 free icon classes
-    "icons": {
-        "auth": "fas fa-users-cog",
-        "auth.user": "fas fa-user",
-        "auth.Group": "fas fa-users",
-    },
-    # Icons that are used when one is not manually specified
-    "default_icon_parents": "fas fa-chevron-circle-right",
-    "default_icon_children": "fas fa-circle",
-
-    #################
-    # Related Modal #
-    #################
-    # Use modals instead of popups
-    "related_modal_active": False,
-
-    #############
-    # UI Tweaks #
-    #############
-    # Relative paths to custom CSS/JS scripts (must be present in static files)
-    "custom_css": None,
-    "custom_js": None,
-    # Whether to link font from fonts.googleapis.com (use custom_css to supply font otherwise)
-    "use_google_fonts_cdn": True,
-    # Whether to show the UI customizer on the sidebar
-    "show_ui_builder": False,
-
-    ###############
-    # Change view #
-    ###############
-    # Render out the change view as a single form, or in tabs, current options are
-    # - single
-    # - horizontal_tabs (default)
-    # - vertical_tabs
-    # - collapsible
-    # - carousel
-    "changeform_format": "horizontal_tabs",
-    # override change forms on a per modeladmin basis
-    "changeform_format_overrides": {"auth.user": "collapsible", "auth.group": "vertical_tabs"},
-    # Add a language dropdown into the admin
-    "language_chooser": False,
-}
+# Django Messages Framework
+MESSAGE_STORAGE = "django.contrib.messages.storage.cookie.CookieStorage"
diff --git a/twisted/twisted_site/templates/admin/pathways/create.html b/twisted/twisted_site/templates/admin/pathways/create.html
index ac3cbb8..3988f17 100644
--- a/twisted/twisted_site/templates/admin/pathways/create.html
+++ b/twisted/twisted_site/templates/admin/pathways/create.html
@@ -41,18 +41,4 @@ <h1 class="text-2xl font-bold mt-2">Create Pathway</h1>
             </div>
         </form>
     </div>
-    <script>
-            htmx.logAll();
-    </script>
-
-    {% if error %}
-        <div id="errorMessage" data-message="{{ error|default:'no error found!' }}">
-            <script>
-                message = document.querySelector('#errorMessage').dataset.message
-                setTimeout(() => {
-                    window.dispatchEvent(new CustomEvent('toast', { detail: { message: message, variant: 'error' }}))
-                }, 100)
-            </script>
-        </div>
-    {% endif %}
 </c-base>
diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html
index afbcb8a..299e814 100644
--- a/twisted/twisted_site/templates/cotton/base.html
+++ b/twisted/twisted_site/templates/cotton/base.html
@@ -16,6 +16,17 @@
 </head>
 <body class="dark bg-[#09090B] text-white font-latin" hx-headers='{"x-csrftoken": "{{ csrf_token }}"}'>
     <c-ui.toast.container />
+    {% if error %}
+        <div id="errorMessage" data-message="{{ error|default:'no error found!' }}">
+            <script>
+                message = document.querySelector('#errorMessage').dataset.message
+                setTimeout(() => {
+                    window.dispatchEvent(new CustomEvent('toast', { detail: { message: message, variant: 'error' }}))
+                }, 100)
+            </script>
+        </div>
+    {% endif %}
+
     <div class="flex flex-col md:flex-row md:py-2 h-screen">
         <div class="md:h-full">
             <c-sidebar>
@@ -36,5 +47,21 @@
     <script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/collapse@3.x.x/dist/cdn.min.js"></script>
     <script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/focus@3.x.x/dist/cdn.min.js"></script>
     <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
+
+    {% if messages %}
+    {% for message in messages %}
+        <div id="djangomessage{{ forloop.counter }}" data-message="{{ message }}">
+            <script>
+                window.addEventListener('load', (event) => {
+                    message = document.querySelector('#djangomessage{{ forloop.counter }}').dataset.message
+                    setTimeout(() => {
+                        console.log("sending message "+message+"...")
+                        window.dispatchEvent(new CustomEvent('toast', { detail: { message: message, variant: '{{ message.tags }}' }}))
+                    }, 100)
+                })
+            </script>
+        </div>
+    {% endfor %}
+    {% endif %}
 </body>
 </html>
diff --git a/twisted/twisted_site/views/admin/pathways.py b/twisted/twisted_site/views/admin/pathways.py
index dff8b06..9b56d4c 100644
--- a/twisted/twisted_site/views/admin/pathways.py
+++ b/twisted/twisted_site/views/admin/pathways.py
@@ -3,7 +3,7 @@
 from django.shortcuts import render, redirect
 from ...models import Pathway
 from django.utils import timezone
-
+from django.contrib import messages
 
 # Create your views here.
 class PathwayListView(AdminView):
@@ -30,6 +30,7 @@ def get(self, request):
         context["past_pathways"] = past_pathways
         context["future_pathways"] = future_pathways
 
+        
         return render(request, "admin/pathways/list.html", context=context)
 
 
@@ -39,7 +40,7 @@ def get(self, request, error=None, extracontext={}):
         context.update(extracontext)
         
         if error:
-            context['error'] = error
+            messages.error(request, error)
         
         return render(request, "admin/pathways/create.html", context=context)
 
@@ -63,35 +64,45 @@ def post(self, request):
             'min_mins': min_mins,
         }
         
-        if not pathway_name:
-            return self.get(request, "No pathway name typed!", errcontext)
-        
-        if not start_date:
-            return self.get(request, "No start date selected!", errcontext)
-        
-        if not start_time:
-            return self.get(request, "No start time selected!", errcontext)
-        
-        if not end_date:
-            return self.get(request, "No end date selected!", errcontext)
-        
-        if not end_time:
-            return self.get(request, "No end time selected!", errcontext)
-        
-        if not min_mins:
-            return self.get(request, "No minimum minutes selected!", errcontext)
+        if "form validation":
+            if not pathway_name:
+                return self.get(request, "No pathway name typed!", errcontext)
+            
+            if not start_date:
+                return self.get(request, "No start date selected!", errcontext)
+            
+            if not start_time:
+                return self.get(request, "No start time selected!", errcontext)
+            
+            if not end_date:
+                return self.get(request, "No end date selected!", errcontext)
+            
+            if not end_time:
+                return self.get(request, "No end time selected!", errcontext)
+            
+            if not min_mins:
+                return self.get(request, "Minimum minutes must be greater than zero!", errcontext)
         
         current_tz_offset = timezone.datetime.now(timezone.get_current_timezone()).strftime('%z')
+        
         start = timezone.datetime.strptime(
             f"{start_date} {start_time} {current_tz_offset}", "%Y-%m-%d %H:%M %z"
         )
+        
         end = timezone.datetime.strptime(
             f"{end_date} {end_time} {current_tz_offset}", "%Y-%m-%d %H:%M %z"
         )
-
-        return HttpResponse(
-            f"{pathway_name=}<br>{start.isoformat()=}<br>{end.isoformat()=}<br>{min_mins=}"
+        
+        Pathway.objects.create(
+            start=start,
+            end=end,
+            name=pathway_name,
+            min_mins=min_mins
         )
+        
+        messages.success(request, f"Successfully created Pathway for \"{pathway_name}\"!")
+
+        return redirect('admin.pathways')
 
 
 class PathwayDetailView(AdminView):

From b31b4a9aa7744f9fc20e802d2566a3f6c472df87 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 25 Aug 2026 07:05:56 +0530
Subject: [PATCH 075/118] fix: obscure scrolling bug in /admin/pathways/

---
 twisted/tailwindcsstheme/static_src/src/styles.css   |  4 ++++
 .../twisted_site/templates/admin/pathways/list.html  | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index bbdedf5..c35c465 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -154,3 +154,7 @@ button {
   border-right: 2px solid #0a0a0a;
   border-bottom: 2px solid #0a0a0a;
 }
+
+@utility no-scrollbar {
+  @apply [scrollbar-none] [&::-webkit-scrollbar]:hidden;
+}
diff --git a/twisted/twisted_site/templates/admin/pathways/list.html b/twisted/twisted_site/templates/admin/pathways/list.html
index d181113..50570ad 100644
--- a/twisted/twisted_site/templates/admin/pathways/list.html
+++ b/twisted/twisted_site/templates/admin/pathways/list.html
@@ -1,6 +1,6 @@
 <c-base>
-    <div class="flex flex-col h-full">
-        <div class="mb-2 flex flex-col md:flex-row">
+    <div class="flex flex-col min-h-0 h-full">
+        <div class="mb-2 flex mx-auto md:mx-0 flex-row">
             <h1 class="text-center md:text-left me-4 font-semibold text-3xl mt-auto">
                 Pathways
             </h1>
@@ -11,8 +11,8 @@ <h1 class="text-center md:text-left me-4 font-semibold text-3xl mt-auto">
                 </c-ui.button>
             </a>
         </div>
-        <div class="flex gap-2 *:min-w-80 *:w-200 flex-1 h-full bg-slate-950">
-            <div class="bg-purple-950/40 border border-purple-900 rounded-md p-2">
+        <div class="min-h-0 overflow-y-hidden flex gap-2 *:min-w-80 *:w-200 grow max-h-full bg-slate-950">
+            <div class="bg-purple-950/40 border border-purple-900 rounded-md p-2 h-full overflow-y-auto no-scrollbar">
                 <h1 class="font-semibold mb-2 mx-2">
                     Not started ({{ future_pathways|length }} item{{ future_pathways|pluralize }})
                 </h1>
@@ -22,7 +22,7 @@ <h1 class="font-semibold mb-2 mx-2">
                     {% endfor %}
                 </div>
             </div>
-            <div class="bg-orange-950/40 border border-orange-900 rounded-md p-2">
+            <div class="bg-orange-950/40 border border-orange-900 rounded-md p-2 h-full overflow-y-auto no-scrollbar">
                 <h1 class="font-semibold mb-2 mx-2">
                     In progress ({{ current_pathways|length }} item{{ current_pathways|pluralize }})
                 </h1>
@@ -32,7 +32,7 @@ <h1 class="font-semibold mb-2 mx-2">
                     {% endfor %}
                 </div>
             </div>
-            <div class="bg-emerald-950/40 border border-emerald-900 rounded-md p-2">
+            <div class="bg-emerald-950/40 border border-emerald-900 rounded-md p-2 h-full overflow-y-auto no-scrollbar">
                 <h1 class="font-semibold mb-2 mx-2">
                     Ended ({{ past_pathways|length }} item{{ past_pathways|pluralize }})
                 </h1>

From ef8a0c686978f56ef0a4446abd457be06d67e349 Mon Sep 17 00:00:00 2001
From: CoolCream <mahasankarshant@gmail.com>
Date: Tue, 25 Aug 2026 08:57:42 +0530
Subject: [PATCH 076/118] updated pathways page

---
 .../static_src/src/styles.css                 |  39 ++-
 .../templates/client/dashboard.html           | 311 ++++++++++--------
 .../templates/client/homepage.html            |   2 +-
 .../twisted_site/templates/client/osbase.html |  63 ++--
 .../templates/client/pathways.html            | 231 ++++++++-----
 5 files changed, 379 insertions(+), 267 deletions(-)

diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index cdbc368..5ea20be 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -23,15 +23,7 @@
 @font-face {
   font-family: "Piedra";
   src: url("/static/fonts/Piedra-Regular.ttf") format("truetype");
-  font-weight: 400;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "VT323";
-  src: url("/static/fonts/VT323.ttf") format("truetype");
-  font-weight: 400;
+  font-weight: 100;
   font-style: normal;
   font-display: swap;
 }
@@ -40,6 +32,8 @@
   --font-vintage: "Pirkkala", sans-serif;
   --font-latin: "Figtree", sans-serif;
 
+  --background-image-gradbg: radial-gradient(circle, var(--color-background) 33%, rgba(9, 11, 15, 1) 100%);
+
   --color-background: #24102F;
   --color-foreground: #FAF7FF;
 
@@ -126,4 +120,31 @@ button {
 @utility image-render-pixelated {
   image-rendering: crisp-edges;
   image-rendering: pixelated;
+}
+
+.window .maximized {
+  position: fixed !important;
+  inset: 0 0 32px 0 !important;
+  width: auto !important;
+  height: auto !important;
+  min-width: 0 !important;
+  min-height: 0 !important;
+  margin: 0 !important;
+  transform: none !important;
+}
+
+progress {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  display: block;
+  height: 100%;
+  border: none;
+  box-sizing: border-box;
+  background-color: var(--color-primary);
+}
+
+progress::-webkit-progress-bar {
+  background-color: var(--color-primary);
+  height: 100%;
 }
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index ea4d390..c6b0d18 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -1,151 +1,150 @@
 {% extends "client/osbase.html" %} {% load static %} {% block body %}
-<main class="h-full w-full bg-background text-foreground p-5">
-    <div class="p-4 flex flex-col flex-wrap content-start gap-3 w-full h-full overflow-y-hidden">
-        {% if user.profile.is_staff %}
-        <div class="font-vintage w-fit cursor-pointer">
-            <a href="{% url 'admin.dash' %}" target="_blank">
-                <img src="{% static 'images/round-square.jpg' %}" alt="" class="size-20" />
-                <span class="text-white block text-center">Admin</span>
-            </a>
-        </div>
-        {% endif %}
-        <div class="font-vintage w-fit cursor-pointer" data-url="{% url 'fr.projects' %}"
-            onclick="newWindow('Projects', this.dataset.url)">
-            <img src="{% static 'images/round-square.jpg' %}" alt="" class="size-20" />
-            <span class="block text-center">Projects</span>
-        </div>
-        <div class="font-vintage w-fit cursor-pointer" data-url="{% url 'fr.pathways' %}"
-            onclick="newWindow('Pathways', this.dataset.url)">
-            <img src="{% static 'images/round-square.jpg' %}" alt="" class="size-20" />
-            <span class="block text-center">Pathways</span>
+<main class="h-full w-full bg-gradbg text-foreground p-5 overflow-clip">
+    <img src="{% static 'images/twisted_logo.png' %}" alt=""
+        class="fixed inset-0 z-0 bg-[url('static/images/twisted_logo.png')] pointer-events-none select-none my-auto justify-self-center opacity-60 bg-contain bg-scale scale-95 drop-shadow-lg shadow-primary" />
+    <div class="relative z-10">
+        <div class="p-4 flex flex-col flex-wrap content-start gap-3 w-full h-full overflow-y-hidden">
+            {% if user.profile.is_staff %}
+            <div class="font-vintage w-fit cursor-pointer select-none">
+                <a href="{% url 'admin.dash' %}" target="_blank">
+                    <div class="size-20 bg-secondary border rounded-md flex items-center justify-center text-4xl">🛡️
+                    </div>
+                    <span class="text-white block text-center">Admin</span>
+                </a>
+            </div>
+            {% endif %}
+            <div class="font-vintage w-fit cursor-pointer select-none" data-url="{% url 'fr.projects' %}"
+                onclick="newWindow('Projects', this.dataset.url)">
+                <div class="size-20 bg-secondary border rounded-md flex items-center justify-center text-4xl">📂</div>
+                <span class="block text-center">Projects</span>
+            </div>
+            <div class="font-vintage w-fit cursor-pointer select-none" data-url="{% url 'fr.pathways' %}"
+                onclick="newWindow('Pathways', this.dataset.url)">
+                <div class="size-20 bg-secondary border rounded-md flex items-center justify-center text-4xl">🛣️</div>
+                <span class="block text-center">Pathways</span>
+            </div>
         </div>
-    </div>
 
-    <div id="windows-container"></div>
-
-    <div id="taskbar"
-        class="fixed bottom-0 left-0 right-0 z-9999 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1">
-        <div class="relative">
-            <button onclick="toggleStartMenu(event)"
-                class="flex items-center gap-1 !bg-twisted-600 !text-base !text-absolute-white !font-bold !px-3 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black active:!border-t-dark-black active:!border-l-dark-black active:!border-r-twisted-200 active:!border-b-twisted-200">
-                <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5" /> Twist
-            </button>
-
-            <div id="start-menu" style="display: none; position: fixed; bottom: 36px; left: 4px; width: 520px"
-                class="z-[10000] bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
-                <div class="flex">
-                    <div class="flex-1 bg-twisted-999 p-2 space-y-0.5">
-                        {% for i in "0123456789" %}
-                        <button data-url="{% url 'fr.projects' %}"
-                            onclick="newWindow('Projects', this.dataset.url); toggleStartMenu(event)">
-                            class="w-full flex items-center gap-3 px-2 py-1.5 text-absolute-white text-left
-                            hover:bg-twisted-600">
-                            <img src="{% static 'images/round-square.jpg' %}" alt=""
-                                class="w-7 h-7 object-cover border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shrink-0" />
-                            <span class="text-sm">Projects</span>
-                        </button>
-                        {% endfor %}
-                    </div>
+        <div id="windows-container"></div>
 
-                    <div class="w-44 bg-twisted-600 p-3 pt-10 flex flex-col">
-                        <div class="text-center mb-3">
-                            <img src="{{ user.profile.slack_pfp_url }}" alt=""
-                                class="w-16 h-16 object-cover mx-auto mb-1 -mt-12 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg" />
-                            <div class="text-absolute-white font-bold text-sm font-vintage">
-                                {{ profile.slack_username|default:user.username }}
-                            </div>
+        <nav id="taskbar"
+            class="fixed bottom-0 left-0 right-0 z-50 flex h-12 items-center justify-between gap-2 border-t border-border bg-card px-2 sm:px-3">
+            <div class="relative">
+                <button onclick="toggleStartMenu(event)"
+                    class="flex shrink-0 items-center gap-1.5 sm:gap-2 border border-border bg-secondary px-2 sm:px-3 py-1.5 font-mono text-xs sm:text-sm font-bold text-secondary-foreground transition hover:bg-primary hover:text-primary-foreground">
+                    <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5" /> Twist
+                </button>
+
+                <div id="start-menu" style="display: none; position: fixed; bottom: 36px; left: 4px; width: 520px"
+                    class="z-[10000] bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
+                    <div class="flex">
+                        <div class="flex-1 bg-twisted-999 p-2 space-y-0.5">
+                            {% for i in "0123456789" %}
+                            <button data-url="{% url 'fr.projects' %}"
+                                onclick="newWindow('Projects', this.dataset.url); toggleStartMenu(event)">
+                                class="w-full flex items-center gap-3 px-2 py-1.5 text-absolute-white text-left
+                                hover:bg-twisted-600">
+                                <img src="{% static 'images/round-square.jpg' %}" alt=""
+                                    class="w-7 h-7 object-cover border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shrink-0" />
+                                <span class="text-sm">Projects</span>
+                            </button>
+                            {% endfor %}
                         </div>
 
-                        <div
-                            class="font-vintage space-y-1 text-absolute-white text-sm border-t border-twisted-800 pt-2">
-                            {% if user.is_staff %}
-                            <a href="/admin/" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Supadmin
-                                Panel</a>
-                            {% endif %}
-                            <a href="#" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Settings</a>
-                            <a href="#" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Help</a>
+                        <div class="w-44 bg-twisted-600 p-3 pt-10 flex flex-col">
+                            <div class="text-center mb-3">
+                                <img src="{{ user.profile.slack_pfp_url }}" alt=""
+                                    class="w-16 h-16 object-cover mx-auto mb-1 -mt-12 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg" />
+                                <div class="text-absolute-white font-bold text-sm font-vintage">
+                                    {{ profile.slack_username|default:user.username }}
+                                </div>
+                            </div>
+
+                            <div
+                                class="font-vintage space-y-1 text-absolute-white text-sm border-t border-twisted-800 pt-2">
+                                {% if user.is_staff %}
+                                <a href="/admin/"
+                                    class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Supadmin
+                                    Panel</a>
+                                {% endif %}
+                                <a href="#"
+                                    class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Settings</a>
+                                <a href="#" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Help</a>
+                            </div>
                         </div>
                     </div>
-                </div>
 
-                <div class="flex items-center justify-between bg-twisted-400 p-2 border-t-2 border-t-twisted-200">
-                    <form method="post" action="{% url 'logout' %}">
-                        {% csrf_token %}
-                        <button type="submit"
-                            class="text-absolute-white text-sm px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-                            Logout
-                        </button>
-                    </form>
+                    <div class="flex items-center justify-between bg-twisted-400 p-2 border-t-2 border-t-twisted-200">
+                        <form method="post" action="{% url 'logout' %}">
+                            {% csrf_token %}
+                            <button type="submit"
+                                class="text-absolute-white text-sm px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                                Logout
+                            </button>
+                        </form>
+                    </div>
                 </div>
             </div>
-        </div>
 
-        <div id="taskbar-windows" class="flex-1 flex items-center gap-1 px-2 overflow-x-auto"></div>
-
-        <div class="flex items-center gap-2">
-            <div id="speaker-btn" onclick="toggleMusic()"
-                class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-                <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <rect x="2" y="6" width="2" height="4" fill="#CAB3E1" />
-                    <rect x="4" y="5" width="2" height="6" fill="#CAB3E1" />
-                    <rect x="6" y="4" width="2" height="8" fill="#CAB3E1" />
-                    <rect x="8" y="2" width="2" height="12" fill="#CAB3E1" />
-                    <g id="sound-waves">
-                        <rect x="12" y="5" width="2" height="6" fill="#8364A2" />
-                        <rect x="15" y="3" width="2" height="10" fill="#8364A2" />
-                    </g>
-                </svg>
-            </div>
-            <canvas id="spectrum" width="100" height="24"
-                class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
-            <div id="taskbar-clock"
-                class="!font-vintage !text-base !bg-twisted-600 !text-absolute-white !px-3 !py-1 !border-2 !border-t-dark-black !border-l-dark-black !border-r-twisted-200 !border-b-twisted-200 min-w-20 text-center">
-                00:00 00
+            <div id="taskbar-windows" class="flex-1 flex items-center gap-1 px-2 overflow-x-auto"></div>
+
+            <div class="flex items-center gap-2">
+                <div id="speaker-btn" onclick="toggleMusic()"
+                    class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                    <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
+                        xmlns="http://www.w3.org/2000/svg">
+                        <rect x="2" y="6" width="2" height="4" fill="#CAB3E1" />
+                        <rect x="4" y="5" width="2" height="6" fill="#CAB3E1" />
+                        <rect x="6" y="4" width="2" height="8" fill="#CAB3E1" />
+                        <rect x="8" y="2" width="2" height="12" fill="#CAB3E1" />
+                        <g id="sound-waves">
+                            <rect x="12" y="5" width="2" height="6" fill="#8364A2" />
+                            <rect x="15" y="3" width="2" height="10" fill="#8364A2" />
+                        </g>
+                    </svg>
+                </div>
+                <canvas id="spectrum" width="100" height="24"
+                    class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
+                <div id="taskbar-clock"
+                    class="!font-vintage !text-base !bg-twisted-600 !text-absolute-white !px-3 !py-1 !border-2 !border-t-dark-black !border-l-dark-black !border-r-twisted-200 !border-b-twisted-200 min-w-20 text-center">
+                    00:00 00
+                </div>
             </div>
-        </div>
+        </nav>
     </div>
 </main>
 
-<div class="-z-10 bg-surface fixed top-0 left-0 bottom-0 right-0"></div>
-
 <template id="window-template">
-    <div class="absolute window resize flex flex-col overflow-hidden"
-        style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px">
-        <div class="title-bar">
-            <label class="title-bar-text w-full">TITLE</label>
-            <div class="title-bar-controls">
-                <button class="reload-button">
-                    <svg fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"
-                        xmlns="http://www.w3.org/2000/svg" aria-label="view-reload" viewBox="0 0 32 32"
-                        preserveAspectRatio="xMidYMid meet" fill="currentColor" width="16" height="16">
-                        <path
-                            d="M20.726,14.162c-0.776,-2.415 -3.04,-4.162 -5.713,-4.162c-3.314,0 -6,2.686 -6,6c0,3.314 2.686,6 6,6c2.063,0 3.883,-1.041 4.962,-2.626c0.333,-0.489 0.988,-0.707 1.497,-0.406c0.437,0.26 0.611,0.814 0.342,1.246c-1.411,2.273 -3.929,3.786 -6.801,3.786c-4.418,0 -8,-3.582 -8,-8c0,-4.418 3.582,-8 8,-8c3.53,0 6.525,2.286 7.588,5.458c0.278,-0.429 0.537,-0.848 0.736,-1.175c0.108,-0.178 0.196,-0.324 0.258,-0.428l0.042,-0.07l0.029,-0.05l0.018,-0.03l0.005,-0.008l0.001,-0.002c0.279,-0.476 0.892,-0.636 1.368,-0.357c0.477,0.279 0.636,0.892 0.357,1.369l-0.001,0.001l-0.001,0.002l-0.005,0.009l-0.02,0.034c-0.017,0.028 -0.043,0.072 -0.075,0.125l-0.062,0.105l-0.015,0.025l-0.084,0.139c-0.033,0.055 -0.069,0.114 -0.107,0.176c-0.222,0.365 -0.528,0.86 -0.849,1.35c-0.32,0.49 -0.676,1.006 -0.978,1.389c-0.157,0.198 -0.336,0.402 -0.482,0.54c-0.084,0.077 -0.217,0.181 -0.316,0.243c-0.103,0.062 -0.357,0.201 -0.695,0.178c-0.202,-0.013 -0.369,-0.08 -0.447,-0.113c-0.083,-0.035 -0.195,-0.091 -0.283,-0.141c-0.164,-0.092 -0.372,-0.224 -0.575,-0.363c-0.399,-0.272 -0.884,-0.633 -1.337,-0.98c-0.453,-0.348 -0.892,-0.697 -1.214,-0.954c-0.162,-0.13 -0.296,-0.239 -0.389,-0.314l-0.108,-0.088l-0.029,-0.024l-0.007,-0.006l-0.002,-0.001l-0.001,-0.001c-0.427,-0.35 -0.489,-0.98 -0.139,-1.407c0.35,-0.428 0.98,-0.489 1.407,-0.139l0.036,0.029l0.104,0.085c0.091,0.074 0.221,0.178 0.379,0.305c0.317,0.255 0.74,0.59 1.181,0.928c0.143,0.11 0.285,0.218 0.425,0.323Z" />
-                    </svg>
+    <div class="absolute window resize flex flex-col overflow-hidden bg-card border-2 border-dark-black shadow-lg"
+        style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px;">
+        <div
+            class="title-bar w-full h-8 shrink-0 flex items-center justify-between bg-primary text-primary-foreground px-2 select-none">
+            <label class="title-bar-text font-bold truncate">TITLE</label>
+
+            <div class="title-bar-controls flex items-center gap-1">
+                <button
+                    class="reload-button h-5 w-5 flex items-center justify-center bg-card text-card-foreground border border-border hover:bg-secondary"
+                    type="button" aria-label="Reload">
+                    ↻
                 </button>
-                <button class="max-button" aria-label="Maximize">
-                    <svg class="m-auto" viewBox="-4 -4 20 20" style="width: 11px; height: 11px">
-                        <rect width="9" height="9" x="1.00000" y="1.00000" style="
-                                opacity: 1;
-                                fill: none;
-                                fill-opacity: 1;
-                                fill-rule: evenodd;
-                                stroke: #000000;
-                                stroke-width: 2;
-                                stroke-linecap: round;
-                                stroke-linejoin: round;
-                                stroke-miterlimit: 4;
-                                stroke-dasharray: none;
-                                stroke-dashoffset: 0;
-                                stroke-opacity: 1;
-                            " id="rect5719" />
-                    </svg>
+
+                <button id="max-button"
+                    class=" max-button h-5 w-5 flex items-center justify-center bg-card text-card-foreground border border-border hover:bg-secondary"
+                    type="button" aria-label="Maximize">
+                    □
+                </button>
+
+                <button
+                    class="close-button h-5 w-5 flex items-center justify-center bg-card text-card-foreground border border-border hover:bg-destructive hover:text-destructive-foreground"
+                    type="button" aria-label="Close">
+                    ×
                 </button>
-                <button class="close-button" aria-label="Close">X</button>
             </div>
         </div>
-        <div class="window-body h-full flex-1">
-            <iframe class="w-full h-full src-frame select-none" src="about:blank" frameborder="0"></iframe>
+
+        <div class="window-body min-h-0 flex-1 overflow-hidden">
+            <iframe class="w-full h-full block src-frame select-none border-0" src="about:blank"
+                frameborder="0"></iframe>
         </div>
     </div>
 </template>
@@ -214,10 +213,12 @@
         realWin.querySelector(".title-bar").addEventListener("mousedown", () => focusWindow(id));
         dragWindow(realWin);
         focusWindow(id);
-        realWin.querySelector(".max-button").addEventListener("mouseup", () => {
-            console.log("maximise!");
+        realWin.querySelector(".max-button").addEventListener("click", () => {
             fullscreenWindow(realWin);
         });
+        realWin.querySelector(".title-bar-controls").addEventListener("mousedown", (event) => {
+            event.stopPropagation();
+        });
         realWin.querySelector(".reload-button").addEventListener("mouseup", () => {
             frame = realWin.querySelector(".src-frame");
             frame.src = frame.src;
@@ -230,33 +231,50 @@
     }
 
     function fullscreenWindow(win) {
-        if (currentMaximisedWindow != null && currentMaximisedWindow.win == win) {
-            win.style.left = currentMaximisedWindow.left;
-            win.style.top = currentMaximisedWindow.top;
-            win.style.width = currentMaximisedWindow.width;
-            win.style.height = currentMaximisedWindow.height;
+        if (currentMaximisedWindow?.win === win) {
+            const previous = currentMaximisedWindow;
+
+            win.style.position = previous.position;
+            win.style.left = previous.left;
+            win.style.top = previous.top;
+            win.style.right = previous.right;
+            win.style.bottom = previous.bottom;
+            win.style.width = previous.width;
+            win.style.height = previous.height;
+
             win.classList.add("resize");
 
             currentMaximisedWindow = null;
             return;
         }
-        if (currentMaximisedWindow != null) {
+
+        if (currentMaximisedWindow) {
             fullscreenWindow(currentMaximisedWindow.win);
         }
+
         currentMaximisedWindow = {
-            win: win,
+            win,
+            position: win.style.position,
             left: win.style.left,
             top: win.style.top,
+            right: win.style.right,
+            bottom: win.style.bottom,
             width: win.style.width,
             height: win.style.height,
         };
-        win.style.left = "0px";
-        win.style.top = "0px";
-        win.style.bottom = document.getElementById("taskbar").offsetHeight + "px";
-        win.style.right = "0px";
-        win.style.width = null;
-        win.style.height = null;
+
+        const taskbar = document.getElementById("taskbar");
+        const taskbarHeight = taskbar?.offsetHeight || 48;
+
         win.classList.remove("resize");
+
+        win.style.position = "fixed";
+        win.style.left = "0";
+        win.style.top = "0";
+        win.style.right = "0";
+        win.style.bottom = `${taskbarHeight}px`;
+        win.style.width = "auto";
+        win.style.height = "auto";
     }
 
     function focusWindow(id) {
@@ -296,9 +314,12 @@
             const rect = mywindow.getBoundingClientRect();
             let x = origX + (e.clientX - startX);
             let y = origY + (e.clientY - startY);
-            // clamp to viewport
-            x = Math.max(0, Math.min(x, window.innerWidth - rect.width));
-            y = Math.max(0, Math.min(y, window.innerHeight - rect.height));
+            const viewportWidth = document.documentElement.clientWidth;
+            const viewportHeight = document.documentElement.clientHeight;
+            const maxX = Math.max(0, viewportWidth - rect.width);
+            const maxY = Math.max(0, viewportHeight - rect.height);
+            x = Math.max(0, Math.min(x, maxX));
+            y = Math.max(0, Math.min(y, maxY));
             pendingX = x;
             pendingY = y;
             // throttle DOM writes to one per animation frame for smoothness
diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index f22c176..f77d055 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -7,7 +7,7 @@
   <img src="https://assets.hackclub.com/flag-orpheus-top.svg" alt="Hack Club" class="w-30 flag-wave">
 </a>
 
-<div class="min-h-screen bg-background text-foreground px-3 py-4 sm:px-6 sm:py-8 md:px-8 md:py-10 pb-20">
+<div class="min-h-screen bg-gradbg text-foreground px-3 py-4 sm:px-6 sm:py-8 md:px-8 md:py-10 pb-20">
   <main
     class="shadow-sm shadow-primary mx-auto w-full max-w-4xl overflow-hidden border border-border bg-card max-h-[85%]">
     <header class="flex items-center justify-between border-b border-border bg-secondary px-2 py-1.5 sm:px-3 sm:py-2">
diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index f0f88b0..2a66a19 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -1,37 +1,38 @@
 {% load static tailwind_tags static %}
 <!DOCTYPE html>
 <html style="font-size: 12px; background: #1E072F;" class="w-full h-full">
-    <head>
-        {% tailwind_css %}
-        <link rel="stylesheet" href="https://unpkg.com/98.css" />
-        <link rel="stylesheet" href="{% static 'css/dist/win98.css' %}" />
-        <link rel="stylesheet" href="{% static 'css/98.override.css' %}" />
-        <link rel="icon" href="{% static 'favicon.png' %}" />
-        <title>Twisted</title>
-        {% block css %} {% endblock css %}
-        {% block js %}{% endblock js %}
-        <script>
-            function createWindow(title, src) {
-                window.parent.postMessage({
-                    'type': 'internal',
-                    'action': 'open',
-                    'title': title,
-                    'src': src
-                }, '*')
-            }
-        </script>
-        <script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
-        <script src="
-        https://cdn.jsdelivr.net/npm/dompurify@3.4.12/dist/purify.min.js
-        "></script>
 
-    </head>
-    <body class="font-vintage h-full">
-        {% block body %} meow :3 {% endblock body %}
-    </body>
+<head>
+    {% tailwind_css %}
+    <link rel="icon" href="{% static 'favicon.png' %}" />
+    <link rel="stylesheet" href="/twisted/tailwindcsstheme/static/css/dist/styles.css">
+    <title>Twisted</title>
+    {% block css %} {% endblock css %}
+    {% block js %}{% endblock js %}
     <script>
-        // Timezone settings
-        const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; // e.g. "America/New_York"
-        document.cookie = "django_timezone=" + timezone;
+        function createWindow(title, src) {
+            window.parent.postMessage({
+                'type': 'internal',
+                'action': 'open',
+                'title': title,
+                'src': src
+            }, '*')
+        }
     </script>
-</html>
+    <script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
+    <script src="
+        https://cdn.jsdelivr.net/npm/dompurify@3.4.12/dist/purify.min.js
+        "></script>
+
+</head>
+
+<body class="font-vintage h-full">
+    {% block body %} meow :3 {% endblock body %}
+</body>
+<script>
+    // Timezone settings
+    const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; // e.g. "America/New_York"
+    document.cookie = "django_timezone=" + timezone;
+</script>
+
+</html>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/pathways.html b/twisted/twisted_site/templates/client/pathways.html
index 0772011..be47194 100644
--- a/twisted/twisted_site/templates/client/pathways.html
+++ b/twisted/twisted_site/templates/client/pathways.html
@@ -1,118 +1,187 @@
-{% extends "client/osbase.html" %} {% load static time_filters humanizelib maths mathfilters %} {% block body %}
-<div class="bg-surface flex flex-col w-full h-full">
-    <div class="flex-1 sunken-panel font-vintage overflow-y-scroll p-4">
+{% extends "client/osbase.html" %}
+{% load static time_filters humanizelib maths mathfilters %}
+
+{% block body %}
+<div class="bg-card text-card-foreground flex flex-col w-full h-full min-h-0">
+
+    <div class="flex-1 min-h-0 overflow-y-auto sunken-panel p-3 sm:p-4 font-vintage">
+
         {% if not pathways %}
-        <div>
-            <div>
-                No pathways yet! :(
-            </div>
-            <div>
-                Come check later
+        <div class="flex flex-col items-center justify-center min-h-full text-center py-12">
+            <div class="text-4xl mb-3">:(</div>
+            <div class="text-xl font-bold">No pathways yet!</div>
+            <div class="text-sm text-muted-foreground mt-1">
+                Come check later.
             </div>
         </div>
         {% endif %}
+
+
         {% if current_pathways %}
-        <div class="text-center">
-            <div class="text-xl">
-                Current pathway{{ current_pathways|pluralize }}
+        <section class="mb-5">
+            <div class="flex items-center gap-2 mb-3">
+                <div class="h-px bg-border flex-1"></div>
+                <h1 class="text-lg sm:text-xl font-bold whitespace-nowrap">
+                    Current Pathway{{ current_pathways|pluralize }}
+                </h1>
+                <div class="h-px bg-border flex-1"></div>
             </div>
-            <div>
+
+            <div class="grid gap-3">
                 {% for pathway_info in current_pathways %}
-                <div class="mt-2">
-                    <div class="text-3xl font-bold">
-                        {{ pathway_info.pathway.name|default:"none! please dm @kavyansh." }}
-                    </div>
-                    <div class="text-xl">
-                        {{ pathway_info.minutes_spent|minutes_to_hours_minutes }}/{{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }} completed
-                    </div>
-                    <div class="text-md flex w-fit mx-auto gap-2">
-                        <div>
-                            Started
-                            <span class="underline decoration-dotted" title="{{ pathway_info.pathway.start }}">
-                                {{ pathway_info.pathway.start|naturaltime }}
-                            </span>
+                <div class="bg-background border border-primary p-3 sm:p-4 shadow-sm">
+                    <div class="flex flex-col sm:flex-row sm:items-center gap-2 sm:gap-4">
+                        <div class="flex-1 min-w-0">
+                            <h2 class="text-xl sm:text-2xl font-bold truncate">
+                                {{ pathway_info.pathway.name|default:"none! please dm @kavyansh." }}
+                            </h2>
+
+                            <div class="text-sm text-muted-foreground mt-1">
+                                Started
+                                <span class="underline decoration-dotted" title="{{ pathway_info.pathway.start }}">
+                                    {{ pathway_info.pathway.start|naturaltime }}
+                                </span>
+
+                                <span class="mx-1">&bullet;</span>
+
+                                Ends
+                                <span class="underline decoration-dotted" title="{{ pathway_info.pathway.end }}">
+                                    {{ pathway_info.pathway.end|naturaltime }}
+                                </span>
+                            </div>
                         </div>
-                        &bullet;
-                        <div>
-                            Ends
-                            <span class="underline decoration-dotted" title="{{ pathway_info.pathway.end }}">
-                                {{ pathway_info.pathway.end|naturaltime }}
-                            </span>
+
+                        <div class="bg-secondary border border-border px-3 py-2 text-center shrink-0">
+                            <div class="text-lg sm:text-xl font-bold">
+                                {{ pathway_info.minutes_spent|minutes_to_hours_minutes }}
+                            </div>
+                            <div class="text-xs text-muted-foreground">
+                                of {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }}
+                            </div>
                         </div>
                     </div>
                 </div>
                 {% endfor %}
             </div>
-        </div>
+        </section>
         {% endif %}
-        <div class="{% if past_pathways and future_pathways %}grid grid-cols-2{% endif %} mt-4 gap-2">
+        <div
+            class="{% if past_pathways and future_pathways %}grid grid-cols-1 lg:grid-cols-2{% else %}block{% endif %} gap-4">
+
             {% if past_pathways %}
-            <div>
-                <h1 class="text-center font-black text-xl!">
-                    Past pathways
-                </h1>
+            <section>
+
+                <div class="flex items-center gap-2 mb-2">
+                    <div class="h-px bg-border flex-1"></div>
+                    <h1 class="font-bold text-lg whitespace-nowrap">
+                        Past Pathways
+                    </h1>
+                    <div class="h-px bg-border flex-1"></div>
+                </div>
+
                 <div class="grid gap-2">
                     {% for pathway_info in past_pathways %}
-                    <div class="border {% if pathway_info.unlocked %}bg-lime-800 border-lime-600{% else %}bg-twisted-800 border-twisted-600{% endif %} p-1">
-                        <div class="flex gap-2">
-                            <h2 class="flex-1 font-bold text-lg!">{{ pathway_info.pathway.name }}</h2>
-                            <p>{{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} long</p>
+                    <div
+                        class="border p-3 {% if pathway_info.unlocked %}bg-success/20 border-success{% else %}bg-muted border-border{% endif %}">
+
+                        <div class="flex flex-col sm:flex-row sm:items-start gap-1 sm:gap-3">
+                            <h2 class="flex-1 min-w-0 font-bold text-base sm:text-lg">
+                                {{ pathway_info.pathway.name }}
+                            </h2>
+
+                            <span class="text-xs text-muted-foreground whitespace-nowrap">
+                                {{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }}
+                                long
+                            </span>
                         </div>
-                        <div>
-                            started
-                            <span
-                                class="underline decoration-dotted"
-                                title="{{ pathway_info.pathway.start }}">
-                                {{ pathway_info.pathway.start|naturalday }}</span>
-                            and ended
-                            <span
-                                class="underline decoration-dotted"
-                                title="{{ pathway_info.pathway.end }}"
-                            >{{ pathway_info.pathway.end|naturalday }}</span>
-                            </title>
+
+                        <div class="text-sm mt-2">
+                            Started
+                            <span class="underline decoration-dotted" title="{{ pathway_info.pathway.start }}">
+                                {{ pathway_info.pathway.start|naturalday }}
+                            </span>
+
+                            <span class="mx-1">&bullet;</span>
+
+                            Ended
+                            <span class="underline decoration-dotted" title="{{ pathway_info.pathway.end }}">
+                                {{ pathway_info.pathway.end|naturalday }}
+                            </span>
                         </div>
-                        <div>
-                            {{ pathway_info.minutes_spent|minutes_to_hours_minutes }}/{{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }} spent
+
+                        <div class="text-sm text-muted-foreground mt-1">
+                            {{ pathway_info.minutes_spent|minutes_to_hours_minutes }}
+                            /
+                            {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }}
+                            spent
                         </div>
+
                     </div>
                     {% endfor %}
                 </div>
-            </div>
+
+            </section>
             {% endif %}
+
+
             {% if future_pathways %}
-            <div>
-                <h1 class="text-center font-bold text-xl!">
-                    Future pathways
-                </h1>
+            <section>
+
+                <div class="flex items-center gap-2 mb-2">
+                    <div class="h-px bg-border flex-1"></div>
+                    <h1 class="font-bold text-lg whitespace-nowrap">
+                        Future Pathways
+                    </h1>
+                    <div class="h-px bg-border flex-1"></div>
+                </div>
+
                 <div class="grid gap-2">
                     {% for pathway_info in future_pathways %}
-                    <div class="bg-twisted-800 border border-twisted-600 p-1">
-                        <div class="flex gap-2">
-                            <h2 class="flex-1 font-bold text-lg!">{{ pathway_info.pathway.name }}</h2>
-                            <p>{{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} long</p>
+                    <div class="bg-muted border border-border p-3">
+
+                        <div class="flex flex-col sm:flex-row sm:items-start gap-1 sm:gap-3">
+                            <h2 class="flex-1 min-w-0 font-bold text-base sm:text-lg">
+                                {{ pathway_info.pathway.name }}
+                            </h2>
+
+                            <span class="text-xs text-muted-foreground whitespace-nowrap">
+                                {{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }}
+                                long
+                            </span>
                         </div>
-                        <div>
-                            starts
-                            <span
-                                class="underline decoration-dotted"
-                                title="{{ pathway_info.pathway.start }}">
-                                {{ pathway_info.pathway.start|naturalday }}</span>
-                            and ends
-                            <span
-                                class="underline decoration-dotted"
-                                title="{{ pathway_info.pathway.end }}"
-                            >{{ pathway_info.pathway.end|naturalday }}</span>
-                            </title>
+
+                        <div class="text-sm mt-2">
+                            Starts
+                            <span class="underline decoration-dotted" title="{{ pathway_info.pathway.start }}">
+                                {{ pathway_info.pathway.start|naturalday }}
+                            </span>
+
+                            <span class="mx-1">&bullet;</span>
+
+                            Ends
+                            <span class="underline decoration-dotted" title="{{ pathway_info.pathway.end }}">
+                                {{ pathway_info.pathway.end|naturalday }}
+                            </span>
                         </div>
+
                     </div>
                     {% endfor %}
                 </div>
-            </div>
+
+            </section>
             {% endif %}
+
         </div>
+
     </div>
-    <div class="sticky status-field-border font-vintage">
-        <div class="mx-1">{{ pathways|length }} pathway{{ pathways|length|pluralize }}</div>
+
+
+    <div class="status-field-border font-vintage shrink-0 border-t p-1 border-border">
+        <div class="mx-1 text-sm">
+            {{ pathways|length }}
+            pathway{{ pathways|length|pluralize }}
+        </div>
     </div>
+
 </div>
-{% endblock body %}
+{% endblock body %}
\ No newline at end of file

From 585f480d4592455b94f430f06640212c94e5f1d9 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 25 Aug 2026 16:27:16 +0530
Subject: [PATCH 077/118] Change 'login' to 'start twisting' on the homepage

---
 twisted/twisted_site/templates/client/homepage.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index f77d055..c499b65 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -77,7 +77,7 @@
 
             <button type="submit"
               class="border border-primary bg-primary px-10 py-3 font-vintage text-2xl font-bold text-primary-foreground shadow-[4px_4px_0_var(--color-dark-black)] transition hover:translate-x-[2px] hover:translate-y-[2px] hover:shadow-[2px_2px_0_var(--color-dark-black)] active:translate-x-[4px] active:translate-y-[4px] active:shadow-none">
-              login →
+              start twisting →
             </button>
           </form>
           {% endif %}

From db6cf46962f8ae229774c27b9507740fbdc2b6b2 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 25 Aug 2026 16:31:37 +0530
Subject: [PATCH 078/118] Move reload button to the front of the title bar and
 move future pathways above past pathways

---
 .../templates/client/dashboard.html           | 16 +++----
 .../templates/client/pathways.html            | 42 +++++++++----------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index c6b0d18..7c9c1fe 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -118,15 +118,17 @@
     <div class="absolute window resize flex flex-col overflow-hidden bg-card border-2 border-dark-black shadow-lg"
         style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px;">
         <div
-            class="title-bar w-full h-8 shrink-0 flex items-center justify-between bg-primary text-primary-foreground px-2 select-none">
-            <label class="title-bar-text font-bold truncate">TITLE</label>
+        class="title-bar w-full h-8 shrink-0 flex items-center justify-between bg-primary text-primary-foreground px-2 select-none">
+        <div class="flex gap-2">
+            <button
+                class="reload-button h-5 w-5 flex items-center justify-center bg-card text-card-foreground border border-border hover:bg-secondary"
+                type="button" aria-label="Reload">
+                ↻
+            </button>
+            <label class="title-bar-text font-bold truncate">[ title card ]</label>
+        </div>
 
             <div class="title-bar-controls flex items-center gap-1">
-                <button
-                    class="reload-button h-5 w-5 flex items-center justify-center bg-card text-card-foreground border border-border hover:bg-secondary"
-                    type="button" aria-label="Reload">
-                    ↻
-                </button>
 
                 <button id="max-button"
                     class=" max-button h-5 w-5 flex items-center justify-center bg-card text-card-foreground border border-border hover:bg-secondary"
diff --git a/twisted/twisted_site/templates/client/pathways.html b/twisted/twisted_site/templates/client/pathways.html
index be47194..63304f0 100644
--- a/twisted/twisted_site/templates/client/pathways.html
+++ b/twisted/twisted_site/templates/client/pathways.html
@@ -68,21 +68,20 @@ <h2 class="text-xl sm:text-2xl font-bold truncate">
         <div
             class="{% if past_pathways and future_pathways %}grid grid-cols-1 lg:grid-cols-2{% else %}block{% endif %} gap-4">
 
-            {% if past_pathways %}
+            {% if future_pathways %}
             <section>
 
                 <div class="flex items-center gap-2 mb-2">
                     <div class="h-px bg-border flex-1"></div>
                     <h1 class="font-bold text-lg whitespace-nowrap">
-                        Past Pathways
+                        Future Pathways
                     </h1>
                     <div class="h-px bg-border flex-1"></div>
                 </div>
 
                 <div class="grid gap-2">
-                    {% for pathway_info in past_pathways %}
-                    <div
-                        class="border p-3 {% if pathway_info.unlocked %}bg-success/20 border-success{% else %}bg-muted border-border{% endif %}">
+                    {% for pathway_info in future_pathways %}
+                    <div class="bg-muted border border-border p-3">
 
                         <div class="flex flex-col sm:flex-row sm:items-start gap-1 sm:gap-3">
                             <h2 class="flex-1 min-w-0 font-bold text-base sm:text-lg">
@@ -96,26 +95,19 @@ <h2 class="flex-1 min-w-0 font-bold text-base sm:text-lg">
                         </div>
 
                         <div class="text-sm mt-2">
-                            Started
+                            Starts
                             <span class="underline decoration-dotted" title="{{ pathway_info.pathway.start }}">
                                 {{ pathway_info.pathway.start|naturalday }}
                             </span>
 
                             <span class="mx-1">&bullet;</span>
 
-                            Ended
+                            Ends
                             <span class="underline decoration-dotted" title="{{ pathway_info.pathway.end }}">
                                 {{ pathway_info.pathway.end|naturalday }}
                             </span>
                         </div>
 
-                        <div class="text-sm text-muted-foreground mt-1">
-                            {{ pathway_info.minutes_spent|minutes_to_hours_minutes }}
-                            /
-                            {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }}
-                            spent
-                        </div>
-
                     </div>
                     {% endfor %}
                 </div>
@@ -123,21 +115,21 @@ <h2 class="flex-1 min-w-0 font-bold text-base sm:text-lg">
             </section>
             {% endif %}
 
-
-            {% if future_pathways %}
+            {% if past_pathways %}
             <section>
 
                 <div class="flex items-center gap-2 mb-2">
                     <div class="h-px bg-border flex-1"></div>
                     <h1 class="font-bold text-lg whitespace-nowrap">
-                        Future Pathways
+                        Past Pathways
                     </h1>
                     <div class="h-px bg-border flex-1"></div>
                 </div>
 
                 <div class="grid gap-2">
-                    {% for pathway_info in future_pathways %}
-                    <div class="bg-muted border border-border p-3">
+                    {% for pathway_info in past_pathways %}
+                    <div
+                        class="border p-3 {% if pathway_info.unlocked %}bg-success/20 border-success{% else %}bg-muted border-border{% endif %}">
 
                         <div class="flex flex-col sm:flex-row sm:items-start gap-1 sm:gap-3">
                             <h2 class="flex-1 min-w-0 font-bold text-base sm:text-lg">
@@ -151,19 +143,26 @@ <h2 class="flex-1 min-w-0 font-bold text-base sm:text-lg">
                         </div>
 
                         <div class="text-sm mt-2">
-                            Starts
+                            Started
                             <span class="underline decoration-dotted" title="{{ pathway_info.pathway.start }}">
                                 {{ pathway_info.pathway.start|naturalday }}
                             </span>
 
                             <span class="mx-1">&bullet;</span>
 
-                            Ends
+                            Ended
                             <span class="underline decoration-dotted" title="{{ pathway_info.pathway.end }}">
                                 {{ pathway_info.pathway.end|naturalday }}
                             </span>
                         </div>
 
+                        <div class="text-sm text-muted-foreground mt-1">
+                            {{ pathway_info.minutes_spent|minutes_to_hours_minutes }}
+                            /
+                            {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }}
+                            spent
+                        </div>
+
                     </div>
                     {% endfor %}
                 </div>
@@ -171,6 +170,7 @@ <h2 class="flex-1 min-w-0 font-bold text-base sm:text-lg">
             </section>
             {% endif %}
 
+
         </div>
 
     </div>

From ff212907f8d9ade8cbb0141b50522e732cbf6340 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 25 Aug 2026 17:22:00 +0530
Subject: [PATCH 079/118] Split homepage taskbar into a cotton component and
 theme faqs.html

---
 .../twisted_site/templates/client/faqs.html   | 170 +++------
 .../templates/client/homepage.html            | 346 ++----------------
 .../templates/cotton/homepage_taskbar.html    | 302 +++++++++++++++
 3 files changed, 368 insertions(+), 450 deletions(-)
 create mode 100644 twisted/twisted_site/templates/cotton/homepage_taskbar.html

diff --git a/twisted/twisted_site/templates/client/faqs.html b/twisted/twisted_site/templates/client/faqs.html
index 8e2a346..e1caa37 100644
--- a/twisted/twisted_site/templates/client/faqs.html
+++ b/twisted/twisted_site/templates/client/faqs.html
@@ -1,24 +1,47 @@
 {% extends "base.html" %}
 {% load static %}
 {% block body %}
+
 <a href="https://hackclub.com" target="_blank" rel="noopener" class="fixed top-0 left-4 z-50">
-  <img src="https://assets.hackclub.com/flag-orpheus-top.svg" alt="Hack Club" class="w-48 flag-wave origin-top">
+  <img src="https://assets.hackclub.com/flag-orpheus-top.svg" alt="Hack Club" class="w-30 flag-wave">
 </a>
-<div class="bg-cover min-h-screen bg-surface text-absolute-white p-4 sm:p-8 pb-20">
 
-  <div id="faqs" class="max-w-3xl mx-auto bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
-    <div class="flex items-center justify-between bg-twisted-600 text-absolute-white px-2 py-1">
-      <span class="font-bold text-sm">
-        <button onclick="location='{% url 'homepage' %}'" class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">←</button>
-        FAQs.exe
-      </span>
+<div class="min-h-screen bg-gradbg text-foreground px-3 py-4 sm:px-6 sm:py-8 md:px-8 md:py-10 pb-20">
+  <main
+    class="flex flex-col shadow-sm shadow-primary mx-auto w-full max-w-4xl overflow-hidden border border-border bg-card max-h-[85%]">
+    <header class="flex items-center justify-between border-b border-border bg-secondary px-2 py-1.5 sm:px-3 sm:py-2">
+      <div class="flex items-center gap-2">
+        <a href="{% url 'homepage' %}">
+          <div class="flex h-5 w-5 items-center justify-center bg-primary text-[10px] font-bold text-primary-foreground">
+            ←
+          </div>
+        </a>
+
+        <span class="font-mono text-sm font-semibold tracking-wide">
+          faqs.exe
+        </span>
+      </div>
+
       <div class="flex gap-1">
-        <span class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">_</span>
-        <span class="bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">□</span>
-        <span onclick="location='{% url 'homepage' %}'" class="cursor-pointer bg-twisted-400 text-dark-black border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black px-2 leading-none">×</span>
+        <button type="button" aria-label="Minimize"
+          class="flex h-7 w-8 items-center justify-center border border-border bg-card text-card-foreground transition hover:bg-muted">
+          −
+        </button>
+
+        <button type="button" aria-label="Maximize"
+          class="flex h-7 w-8 items-center justify-center border border-border bg-card text-card-foreground transition hover:bg-muted">
+          □
+        </button>
+        <a href="{% url 'homepage' %}">
+          <button type="button" aria-label="Close"
+            class="flex h-7 w-8 items-center justify-center border border-border bg-card text-card-foreground transition hover:border-destructive hover:bg-destructive hover:text-destructive-foreground">
+            ×
+          </button>
+        </a>
       </div>
-    </div>
-    <div class="p-6 space-y-5">
+    </header>
+
+    <div class="p-6 space-y-5 overflow-y-auto grow">
       <div>
         <p class="font-bold text-twisted-200">Q: What is Twisted?</p>
         <p>A: Twisted is a YSWS where you complete 7 pathways of challenges, keep up your streak for bonus rewards, and earn a laptop and PC at the end!</p>
@@ -44,123 +67,14 @@
         <p>A: The beta launches 10 days before the main start — so late August!</p>
       </div>
     </div>
-  </div>
-
+  </main>
 </div>
 
-<div class="fixed bottom-0 left-0 right-0 z-50 flex items-center justify-between bg-twisted-400 border-t-2 border-t-twisted-200 px-1 py-1">
-  <button id="twist-btn" class="flex items-center gap-1 bg-twisted-600 text-absolute-white font-bold px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-    <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5"> Twist 
-  </button>
- <div  class="flex items-center gap-2">
-              <div id="speaker-btn" onclick="toggleMusic()" class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-                <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg">
-                    <rect x="2" y="6" width="2" height="4" fill="#CAB3E1"/>
-                    <rect x="4" y="5" width="2" height="6" fill="#CAB3E1"/>
-                    <rect x="6" y="4" width="2" height="8" fill="#CAB3E1"/>
-                    <rect x="8" y="2" width="2" height="12" fill="#CAB3E1"/>
-                    <g id="sound-waves">
-                        <rect x="12" y="5" width="2" height="6" fill="#8364A2"/>
-                        <rect x="15" y="3" width="2" height="10" fill="#8364A2"/>
-                    </g>
-                </svg>
-            </div>
-
-   <canvas id="spectrum" width="100" height="24" class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
-  <div id="taskbar-clock" class="bg-twisted-600 text-absolute-white px-3 py-1 border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200 min-w-20 text-center">
-    00:00 00
-  </div>
- </div>
-
-<audio id="bg-music" loop>
-  <source src="{% static 'audio/bg.mp3' %}" type="audio/mpeg">
-</audio>
-<script>
-  const music = document.getElementById("bg-music");
-  const savedTime = parseFloat(sessionStorage.getItem("musicTime") || "0");
-  const wasPlaying = sessionStorage.getItem("musicPlaying") === "true";
-  if (savedTime) music.currentTime = savedTime;
-
-  let audioCtx, analyser, dataArray, sourceConnected = false;
-  const canvas = document.getElementById("spectrum");
-  const ctx = canvas ? canvas.getContext("2d") : null;
-
-  function initAudioGraph() {
-    if (sourceConnected) return;
-    const AC = window.AudioContext || window.webkitAudioContext;
-    if (!AC) return;
-    audioCtx = new AC();
-    const source = audioCtx.createMediaElementSource(music);
-    analyser = audioCtx.createAnalyser();
-    analyser.fftSize = 64;
-    source.connect(analyser);
-    analyser.connect(audioCtx.destination);
-    dataArray = new Uint8Array(analyser.frequencyBinCount);
-    sourceConnected = true;
-    drawSpectrum();
-  }
-
-  function playMusic() {
-    initAudioGraph();
-    if (audioCtx && audioCtx.state === "suspended") audioCtx.resume();
-    music.play().catch(() => {});
-  }
-
-  function toggleMusic() {
-    if (music.paused) { playMusic(); }
-    else { music.pause(); }
-  }
-
-  
-  if (wasPlaying) {
-    const resume = () => {
-      playMusic();
-      ["click","keydown","scroll","mousemove","touchstart"].forEach(e =>
-        document.removeEventListener(e, resume));
-    };
-    ["click","keydown","scroll","mousemove","touchstart"].forEach(e =>
-      document.addEventListener(e, resume, { once: true }));
-  }
 
-  
-  setInterval(() => {
-    sessionStorage.setItem("musicTime", music.currentTime);
-    sessionStorage.setItem("musicPlaying", (!music.paused).toString());
-  }, 400);
-  window.addEventListener("beforeunload", () => {
-    sessionStorage.setItem("musicTime", music.currentTime);
-    sessionStorage.setItem("musicPlaying", (!music.paused).toString());
-  });
+{% comment %}
+Check out twisted_site/templates/cotton/homepage_taskbar.html
+to change the taskbar :p                           - Kavyansh
+{% endcomment %}
+<c-homepage_taskbar />
 
-  function drawSpectrum() {
-    if (!ctx) return;
-    requestAnimationFrame(drawSpectrum);
-    ctx.fillStyle = "#1E072F";
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
-    if (!analyser || music.paused) return;
-    analyser.getByteFrequencyData(dataArray);
-    const bars = 8, barWidth = canvas.width / bars, pixel = 3;
-    for (let i = 0; i < bars; i++) {
-      const value = dataArray[i] / 255;
-      const barHeight = Math.floor((value * canvas.height) / pixel) * pixel;
-      for (let y = 0; y < barHeight; y += pixel) {
-        const ratio = y / canvas.height;
-        ctx.fillStyle = ratio > 0.6 ? "#CAB3E1" : ratio > 0.3 ? "#8364A2" : "#5A4471";
-        ctx.fillRect(i * barWidth + 1, canvas.height - y - pixel, barWidth - 2, pixel - 1);
-      }
-    }
-  }
-  function updateClock() {
-        const now = new Date();
-        let h = now.getHours();
-        const m = now.getMinutes().toString().padStart(2, "0");
-        const ampm = h >= 12 ? "PM" : "AM";
-        h = h % 12 || 12;
-        document.getElementById("taskbar-clock").textContent = `${h}:${m} ${ampm}`;
-    }
-    
-    setInterval(updateClock, 1000);
-    updateClock(); 
-    drawSpectrum();
-</script>
 {% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html
index c499b65..af9384d 100644
--- a/twisted/twisted_site/templates/client/homepage.html
+++ b/twisted/twisted_site/templates/client/homepage.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load static %}
-
 {% block body %}
 
 <a href="https://hackclub.com" target="_blank" rel="noopener" class="fixed top-0 left-4 z-50">
@@ -56,7 +55,7 @@
           </div>
 
           <p class="font-vintage text-sm sm:text-md md:text-lg leading-relaxed text-foreground">
-            Hii!!! Join a twisted YSWS where you build cool projects,
+            Join a twisted YSWS where you build cool projects,
             complete challenges, and work your way through a
             roadmap to earn a PC.
           </p>
@@ -64,29 +63,29 @@
 
         <div id="rsvp">
           {% if login_enabled != 'false' %}
-          {% if user.is_authenticated %}
-          <a href="{% url 'dashboard' %}">
-            <button type="button"
-              class="w-full sm:w-auto border border-primary bg-primary px-6 sm:px-10 py-3 font-vintage text-xl sm:text-2xl font-bold text-primary-foreground shadow-xs shadow-white transition hover:translate-x-[2px] hover:translate-y-[2px] hover:shadow-sm active:translate-x-[4px] active:translate-y-[4px] active:shadow-none">
-              enter twisted →
-            </button>
-          </a>
-          {% else %}
-          <form method="post" action="{% url 'login' %}">
-            {% csrf_token %}
-
-            <button type="submit"
-              class="border border-primary bg-primary px-10 py-3 font-vintage text-2xl font-bold text-primary-foreground shadow-[4px_4px_0_var(--color-dark-black)] transition hover:translate-x-[2px] hover:translate-y-[2px] hover:shadow-[2px_2px_0_var(--color-dark-black)] active:translate-x-[4px] active:translate-y-[4px] active:shadow-none">
-              start twisting →
-            </button>
-          </form>
-          {% endif %}
+            {% if user.is_authenticated %}
+            <a href="{% url 'dashboard' %}">
+              <button type="button"
+                class="w-full sm:w-auto border border-primary bg-primary px-6 sm:px-10 py-3 font-vintage text-xl sm:text-2xl font-bold text-primary-foreground shadow-xs shadow-white transition hover:translate-x-[2px] hover:translate-y-[2px] hover:shadow-sm active:translate-x-[4px] active:translate-y-[4px] active:shadow-none">
+                enter twisted →
+              </button>
+            </a>
+            {% else %}
+            <form method="post" action="{% url 'login' %}">
+              {% csrf_token %}
+
+              <button type="submit"
+                class="border border-primary bg-primary px-10 py-3 font-vintage text-2xl font-bold text-primary-foreground shadow-[4px_4px_0_var(--color-dark-black)] transition hover:translate-x-[2px] hover:translate-y-[2px] hover:shadow-[2px_2px_0_var(--color-dark-black)] active:translate-x-[4px] active:translate-y-[4px] active:shadow-none">
+                start twisting →
+              </button>
+            </form>
+            {% endif %}
           {% endif %}
         </div>
       </div>
     </section>
   </main>
-  <nav class="grid grid-cols-1 sm:grid-cols-3 gap-2 mt-6 max-w-4xl justify-self-center">
+  <nav class="grid grid-cols-3 gap-2 mt-6 max-w-4xl justify-self-center">
     <a href="https://hackclub.enterprise.slack.com/archives/C0A8G9BSCSG"
       class="flex items-center justify-center border border-border bg-secondary px-3 py-2.5 font-mono text-sm font-semibold text-secondary-foreground transition hover:border-primary hover:bg-primary hover:text-primary-foreground">
       Slack
@@ -104,306 +103,9 @@
   </nav>
 </div>
 
-<div
-  class="fixed bottom-0 left-0 right-0 z-50 flex h-12 items-center justify-between gap-2 border-t border-border bg-card px-2 sm:px-3">
-  <button id="twist-btn"
-    class="flex shrink-0 items-center gap-1.5 sm:gap-2 border border-border bg-secondary px-2 sm:px-3 py-1.5 font-mono text-xs sm:text-sm font-bold text-secondary-foreground transition hover:bg-primary hover:text-primary-foreground">
-    <img src="{% static 'images/twisted_logo.png' %}" class="h-4 w-6 object-contain" alt="">
-    Twisted
-  </button>
-
-  <div class="flex items-center gap-2">
-    <button id="speaker-btn" type="button" onclick="toggleMusic()" aria-label="Toggle music"
-      class="flex h-8 items-center border border-border bg-secondary px-2 text-secondary-foreground transition hover:bg-muted">
-      <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
-        xmlns="http://www.w3.org/2000/svg">
-        <rect x="2" y="6" width="2" height="4" fill="#E0A7FF" />
-        <rect x="4" y="5" width="2" height="6" fill="#E0A7FF" />
-        <rect x="6" y="4" width="2" height="8" fill="#E0A7FF" />
-        <rect x="8" y="2" width="2" height="12" fill="#E0A7FF" />
-
-        <g id="sound-waves">
-          <rect x="12" y="5" width="2" height="6" fill="#B96CFF" />
-          <rect x="15" y="3" width="2" height="10" fill="#B96CFF" />
-        </g>
-      </svg>
-    </button>
-
-    <canvas id="spectrum" width="100" height="24" class="hidden border border-border sm:block"></canvas>
-
-    <div id="taskbar-clock"
-      class="min-w-20 border border-border bg-background px-3 py-1.5 text-center font-mono text-xs text-foreground">
-      00:00 AM
-    </div>
-  </div>
-</div>
-
-
-<audio id="bg-music" loop>
-  <source src="{% static 'audio/bg.mp3' %}" type="audio/mpeg">
-</audio>
-
-
-<script>
-  const music = document.getElementById("bg-music");
-
-  const savedTime =
-    parseFloat(sessionStorage.getItem("musicTime") || "0");
-
-  const wasPlaying =
-    sessionStorage.getItem("musicPlaying") === "true";
-
-  if (savedTime) {
-    music.currentTime = savedTime;
-  }
-
-
-  let audioCtx;
-  let analyser;
-  let dataArray;
-  let sourceConnected = false;
-
-  const canvas = document.getElementById("spectrum");
-  const ctx = canvas ? canvas.getContext("2d") : null;
-
-
-  function getThemeColor(variable) {
-    return getComputedStyle(document.documentElement)
-      .getPropertyValue(variable)
-      .trim();
-  }
-
-
-  function initAudioGraph() {
-    if (sourceConnected) return;
-
-    const AC =
-      window.AudioContext ||
-      window.webkitAudioContext;
-
-    if (!AC) return;
-
-    audioCtx = new AC();
-
-    const source =
-      audioCtx.createMediaElementSource(music);
-
-    analyser = audioCtx.createAnalyser();
-
-    analyser.fftSize = 64;
-
-    source.connect(analyser);
-    analyser.connect(audioCtx.destination);
-
-    dataArray =
-      new Uint8Array(analyser.frequencyBinCount);
-
-    sourceConnected = true;
-
-    drawSpectrum();
-  }
-
-
-  function playMusic() {
-    initAudioGraph();
-
-    if (
-      audioCtx &&
-      audioCtx.state === "suspended"
-    ) {
-      audioCtx.resume();
-    }
-
-    music.play().catch(() => { });
-  }
-
-
-  function toggleMusic() {
-    if (music.paused) {
-      playMusic();
-    } else {
-      music.pause();
-    }
-  }
-
-
-  if (wasPlaying) {
-
-    const resume = () => {
-
-      playMusic();
-
-      [
-        "click",
-        "keydown",
-        "scroll",
-        "mousemove",
-        "touchstart"
-      ].forEach(event => {
-        document.removeEventListener(event, resume);
-      });
-
-    };
-
-    [
-      "click",
-      "keydown",
-      "scroll",
-      "mousemove",
-      "touchstart"
-    ].forEach(event => {
-      document.addEventListener(
-        event,
-        resume,
-        { once: true }
-      );
-    });
-
-  }
-
-
-  setInterval(() => {
-
-    sessionStorage.setItem(
-      "musicTime",
-      music.currentTime
-    );
-
-    sessionStorage.setItem(
-      "musicPlaying",
-      (!music.paused).toString()
-    );
-
-  }, 400);
-
-
-  window.addEventListener("beforeunload", () => {
-
-    sessionStorage.setItem(
-      "musicTime",
-      music.currentTime
-    );
-
-    sessionStorage.setItem(
-      "musicPlaying",
-      (!music.paused).toString()
-    );
-
-  });
-
-
-  function drawSpectrum() {
-
-    if (!ctx) return;
-
-    requestAnimationFrame(drawSpectrum);
-
-    const background =
-      getThemeColor("--color-background");
-
-    const low =
-      getThemeColor("--color-twisted-600");
-
-    const medium =
-      getThemeColor("--color-twisted-400");
-
-    const high =
-      getThemeColor("--color-twisted-200");
-
-
-    ctx.fillStyle = background;
-    ctx.fillRect(
-      0,
-      0,
-      canvas.width,
-      canvas.height
-    );
-
-
-    if (!analyser || music.paused) return;
-
-
-    analyser.getByteFrequencyData(dataArray);
-
-    const bars = 8;
-    const barWidth = canvas.width / bars;
-    const pixel = 3;
-
-
-    for (let i = 0; i < bars; i++) {
-
-      const value =
-        dataArray[i] / 255;
-
-      const barHeight =
-        Math.floor(
-          (value * canvas.height) / pixel
-        ) * pixel;
-
-
-      for (
-        let y = 0;
-        y < barHeight;
-        y += pixel
-      ) {
-
-        const ratio =
-          y / canvas.height;
-
-
-        ctx.fillStyle =
-          ratio > 0.6
-            ? high
-            : ratio > 0.3
-              ? medium
-              : low;
-
-
-        ctx.fillRect(
-          i * barWidth + 1,
-          canvas.height - y - pixel,
-          barWidth - 2,
-          pixel - 1
-        );
-
-      }
-
-    }
-
-  }
-
-
-  function updateClock() {
-
-    const now = new Date();
-
-    let hours = now.getHours();
-
-    const minutes =
-      now.getMinutes()
-        .toString()
-        .padStart(2, "0");
-
-    const ampm =
-      hours >= 12 ? "PM" : "AM";
-
-    hours =
-      hours % 12 || 12;
-
-
-    document.getElementById(
-      "taskbar-clock"
-    ).textContent =
-      `${hours}:${minutes} ${ampm}`;
-
-  }
-
-
-  setInterval(updateClock, 1000);
-
-  updateClock();
-  drawSpectrum();
-
-</script>
-
+{% comment %}
+Check out twisted_site/templates/cotton/homepage_taskbar.html
+to change the taskbar :p                           - Kavyansh
+{% endcomment %}
+<c-homepage_taskbar />
 {% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/homepage_taskbar.html b/twisted/twisted_site/templates/cotton/homepage_taskbar.html
new file mode 100644
index 0000000..6e25918
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/homepage_taskbar.html
@@ -0,0 +1,302 @@
+{% load static %}
+<div
+  class="fixed bottom-0 left-0 right-0 z-50 flex h-12 items-center justify-between gap-2 border-t border-border bg-card px-2 sm:px-3">
+  <button id="twist-btn"
+    class="flex shrink-0 items-center gap-1.5 sm:gap-2 border border-border bg-secondary px-2 sm:px-3 py-1.5 font-mono text-xs sm:text-sm font-bold text-secondary-foreground transition hover:bg-primary hover:text-primary-foreground">
+    <img src="{% static 'images/twisted_logo.png' %}" class="h-4 w-6 object-contain" alt="">
+    Twisted
+  </button>
+
+  <div class="flex items-center gap-2">
+    <button id="speaker-btn" type="button" onclick="toggleMusic()" aria-label="Toggle music"
+      class="flex h-8 items-center border border-border bg-secondary px-2 text-secondary-foreground transition hover:bg-muted">
+      <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
+        xmlns="http://www.w3.org/2000/svg">
+        <rect x="2" y="6" width="2" height="4" fill="#E0A7FF" />
+        <rect x="4" y="5" width="2" height="6" fill="#E0A7FF" />
+        <rect x="6" y="4" width="2" height="8" fill="#E0A7FF" />
+        <rect x="8" y="2" width="2" height="12" fill="#E0A7FF" />
+
+        <g id="sound-waves">
+          <rect x="12" y="5" width="2" height="6" fill="#B96CFF" />
+          <rect x="15" y="3" width="2" height="10" fill="#B96CFF" />
+        </g>
+      </svg>
+    </button>
+
+    <canvas id="spectrum" width="100" height="24" class="hidden border border-border sm:block"></canvas>
+
+    <div id="taskbar-clock"
+      class="min-w-20 border border-border bg-background px-3 py-1.5 text-center font-mono text-xs text-foreground">
+      00:00 AM
+    </div>
+  </div>
+</div>
+
+
+<audio id="bg-music" loop>
+  <source src="{% static 'audio/bg.mp3' %}" type="audio/mpeg">
+</audio>
+
+
+<script>
+  const music = document.getElementById("bg-music");
+
+  const savedTime =
+    parseFloat(sessionStorage.getItem("musicTime") || "0");
+
+  const wasPlaying =
+    sessionStorage.getItem("musicPlaying") === "true";
+
+  if (savedTime) {
+    music.currentTime = savedTime;
+  }
+
+
+  let audioCtx;
+  let analyser;
+  let dataArray;
+  let sourceConnected = false;
+
+  const canvas = document.getElementById("spectrum");
+  const ctx = canvas ? canvas.getContext("2d") : null;
+
+
+  function getThemeColor(variable) {
+    return getComputedStyle(document.documentElement)
+      .getPropertyValue(variable)
+      .trim();
+  }
+
+
+  function initAudioGraph() {
+    if (sourceConnected) return;
+
+    const AC =
+      window.AudioContext ||
+      window.webkitAudioContext;
+
+    if (!AC) return;
+
+    audioCtx = new AC();
+
+    const source =
+      audioCtx.createMediaElementSource(music);
+
+    analyser = audioCtx.createAnalyser();
+
+    analyser.fftSize = 64;
+
+    source.connect(analyser);
+    analyser.connect(audioCtx.destination);
+
+    dataArray =
+      new Uint8Array(analyser.frequencyBinCount);
+
+    sourceConnected = true;
+
+    drawSpectrum();
+  }
+
+
+  function playMusic() {
+    initAudioGraph();
+
+    if (
+      audioCtx &&
+      audioCtx.state === "suspended"
+    ) {
+      audioCtx.resume();
+    }
+
+    music.play().catch(() => { });
+  }
+
+
+  function toggleMusic() {
+    if (music.paused) {
+      playMusic();
+    } else {
+      music.pause();
+    }
+  }
+
+
+  if (wasPlaying) {
+
+    const resume = () => {
+
+      playMusic();
+
+      [
+        "click",
+        "keydown",
+        "scroll",
+        "mousemove",
+        "touchstart"
+      ].forEach(event => {
+        document.removeEventListener(event, resume);
+      });
+
+    };
+
+    [
+      "click",
+      "keydown",
+      "scroll",
+      "mousemove",
+      "touchstart"
+    ].forEach(event => {
+      document.addEventListener(
+        event,
+        resume,
+        { once: true }
+      );
+    });
+
+  }
+
+
+  setInterval(() => {
+
+    sessionStorage.setItem(
+      "musicTime",
+      music.currentTime
+    );
+
+    sessionStorage.setItem(
+      "musicPlaying",
+      (!music.paused).toString()
+    );
+
+  }, 400);
+
+
+  window.addEventListener("beforeunload", () => {
+
+    sessionStorage.setItem(
+      "musicTime",
+      music.currentTime
+    );
+
+    sessionStorage.setItem(
+      "musicPlaying",
+      (!music.paused).toString()
+    );
+
+  });
+
+
+  function drawSpectrum() {
+
+    if (!ctx) return;
+
+    requestAnimationFrame(drawSpectrum);
+
+    const background =
+      getThemeColor("--color-background");
+
+    const low =
+      getThemeColor("--color-twisted-600");
+
+    const medium =
+      getThemeColor("--color-twisted-400");
+
+    const high =
+      getThemeColor("--color-twisted-200");
+
+
+    ctx.fillStyle = background;
+    ctx.fillRect(
+      0,
+      0,
+      canvas.width,
+      canvas.height
+    );
+
+
+    if (!analyser || music.paused) return;
+
+
+    analyser.getByteFrequencyData(dataArray);
+
+    const bars = 8;
+    const barWidth = canvas.width / bars;
+    const pixel = 3;
+
+
+    for (let i = 0; i < bars; i++) {
+
+      const value =
+        dataArray[i] / 255;
+
+      const barHeight =
+        Math.floor(
+          (value * canvas.height) / pixel
+        ) * pixel;
+
+
+      for (
+        let y = 0;
+        y < barHeight;
+        y += pixel
+      ) {
+
+        const ratio =
+          y / canvas.height;
+
+
+        ctx.fillStyle =
+          ratio > 0.6
+            ? high
+            : ratio > 0.3
+              ? medium
+              : low;
+
+
+        ctx.fillRect(
+          i * barWidth + 1,
+          canvas.height - y - pixel,
+          barWidth - 2,
+          pixel - 1
+        );
+
+      }
+
+    }
+
+  }
+
+
+  function updateClock() {
+
+    const now = new Date();
+
+    let hours = now.getHours();
+
+    const minutes =
+      now.getMinutes()
+        .toString()
+        .padStart(2, "0");
+
+    const ampm =
+      hours >= 12 ? "PM" : "AM";
+
+    hours =
+      hours % 12 || 12;
+
+
+    document.getElementById(
+      "taskbar-clock"
+    ).textContent =
+      `${hours}:${minutes} ${ampm}`;
+
+  }
+
+
+  setInterval(updateClock, 1000);
+
+  updateClock();
+  drawSpectrum();
+
+</script>

From 0a10080bd64c9438871077f9df5fc73717758c11 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 25 Aug 2026 18:07:18 +0530
Subject: [PATCH 080/118] Change taskbar and start menu on dashboard

---
 .../templates/client/dashboard.html           | 72 ++++++++-----------
 .../twisted_site/templates/client/osbase.html |  2 +-
 2 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 7c9c1fe..9977d5b 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -3,7 +3,7 @@
     <img src="{% static 'images/twisted_logo.png' %}" alt=""
         class="fixed inset-0 z-0 bg-[url('static/images/twisted_logo.png')] pointer-events-none select-none my-auto justify-self-center opacity-60 bg-contain bg-scale scale-95 drop-shadow-lg shadow-primary" />
     <div class="relative z-10">
-        <div class="p-4 flex flex-col flex-wrap content-start gap-3 w-full h-full overflow-y-hidden">
+        <div class="flex flex-col flex-wrap content-start gap-3 w-full h-full overflow-y-hidden">
             {% if user.profile.is_staff %}
             <div class="font-vintage w-fit cursor-pointer select-none">
                 <a href="{% url 'admin.dash' %}" target="_blank">
@@ -32,25 +32,13 @@
             <div class="relative">
                 <button onclick="toggleStartMenu(event)"
                     class="flex shrink-0 items-center gap-1.5 sm:gap-2 border border-border bg-secondary px-2 sm:px-3 py-1.5 font-mono text-xs sm:text-sm font-bold text-secondary-foreground transition hover:bg-primary hover:text-primary-foreground">
-                    <img src="{% static 'images/twisted_logo.png' %}" alt="" class="w-8 h-5" /> Twist
+                    <img src="{% static 'images/twisted_logo.png' %}" class="h-4 w-6 object-contain" alt="">
+                    Twisted
                 </button>
 
-                <div id="start-menu" style="display: none; position: fixed; bottom: 36px; left: 4px; width: 520px"
-                    class="z-[10000] bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
-                    <div class="flex">
-                        <div class="flex-1 bg-twisted-999 p-2 space-y-0.5">
-                            {% for i in "0123456789" %}
-                            <button data-url="{% url 'fr.projects' %}"
-                                onclick="newWindow('Projects', this.dataset.url); toggleStartMenu(event)">
-                                class="w-full flex items-center gap-3 px-2 py-1.5 text-absolute-white text-left
-                                hover:bg-twisted-600">
-                                <img src="{% static 'images/round-square.jpg' %}" alt=""
-                                    class="w-7 h-7 object-cover border border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shrink-0" />
-                                <span class="text-sm">Projects</span>
-                            </button>
-                            {% endfor %}
-                        </div>
-
+                <div id="start-menu" style="display: none;"
+                    class="z-[10000] fixed bottom-12 left-1 bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
+                    <div class="flex h-80">
                         <div class="w-44 bg-twisted-600 p-3 pt-10 flex flex-col">
                             <div class="text-center mb-3">
                                 <img src="{{ user.profile.slack_pfp_url }}" alt=""
@@ -64,12 +52,11 @@
                                 class="font-vintage space-y-1 text-absolute-white text-sm border-t border-twisted-800 pt-2">
                                 {% if user.is_staff %}
                                 <a href="/admin/"
-                                    class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Supadmin
+                                    class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Admin
                                     Panel</a>
                                 {% endif %}
-                                <a href="#"
-                                    class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Settings</a>
-                                <a href="#" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Help</a>
+                                <a href="https://docs.twisted.hackclub.com/" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Docs</a>
+                                <button class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Docs</button>
                             </div>
                         </div>
                     </div>
@@ -89,27 +76,30 @@
             <div id="taskbar-windows" class="flex-1 flex items-center gap-1 px-2 overflow-x-auto"></div>
 
             <div class="flex items-center gap-2">
-                <div id="speaker-btn" onclick="toggleMusic()"
-                    class="cursor-pointer bg-twisted-600 px-2 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
-                    <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <rect x="2" y="6" width="2" height="4" fill="#CAB3E1" />
-                        <rect x="4" y="5" width="2" height="6" fill="#CAB3E1" />
-                        <rect x="6" y="4" width="2" height="8" fill="#CAB3E1" />
-                        <rect x="8" y="2" width="2" height="12" fill="#CAB3E1" />
-                        <g id="sound-waves">
-                            <rect x="12" y="5" width="2" height="6" fill="#8364A2" />
-                            <rect x="15" y="3" width="2" height="10" fill="#8364A2" />
-                        </g>
-                    </svg>
-                </div>
-                <canvas id="spectrum" width="100" height="24"
-                    class="border-2 border-t-dark-black border-l-dark-black border-r-twisted-200 border-b-twisted-200"></canvas>
+                <button id="speaker-btn" type="button" onclick="toggleMusic()" aria-label="Toggle music"
+                class="flex h-8 items-center border border-border bg-secondary px-2 text-secondary-foreground transition hover:bg-muted">
+                <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <rect x="2" y="6" width="2" height="4" fill="#E0A7FF" />
+                    <rect x="4" y="5" width="2" height="6" fill="#E0A7FF" />
+                    <rect x="6" y="4" width="2" height="8" fill="#E0A7FF" />
+                    <rect x="8" y="2" width="2" height="12" fill="#E0A7FF" />
+
+                    <g id="sound-waves">
+                    <rect x="12" y="5" width="2" height="6" fill="#B96CFF" />
+                    <rect x="15" y="3" width="2" height="10" fill="#B96CFF" />
+                    </g>
+                </svg>
+                </button>
+
+                <canvas id="spectrum" width="100" height="24" class="hidden border border-border sm:block"></canvas>
+
                 <div id="taskbar-clock"
-                    class="!font-vintage !text-base !bg-twisted-600 !text-absolute-white !px-3 !py-1 !border-2 !border-t-dark-black !border-l-dark-black !border-r-twisted-200 !border-b-twisted-200 min-w-20 text-center">
-                    00:00 00
+                class="min-w-20 border border-border bg-background px-3 py-1.5 text-center font-mono text-xs text-foreground">
+                00:00 AM
                 </div>
             </div>
+
         </nav>
     </div>
 </main>
@@ -175,7 +165,7 @@
         false,
     );
 
-    function newWindow(title, src, w = 400, h = 400) {
+    function newWindow(title, src, w = 600, h = 600) {
         const template = document.getElementById("window-template");
         const container = document.getElementById("windows-container");
         const clone = template.content.cloneNode(true);
diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index 2a66a19..b4ebfe4 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -1,6 +1,6 @@
 {% load static tailwind_tags static %}
 <!DOCTYPE html>
-<html style="font-size: 12px; background: #1E072F;" class="w-full h-full">
+<html style="background: #1E072F;" class="w-full h-full">
 
 <head>
     {% tailwind_css %}

From 0bddee95e18c3e0ab6faa01709a8bdbefca65a9e Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 25 Aug 2026 18:08:21 +0530
Subject: [PATCH 081/118] Remove orphan button in the twisted menu

---
 twisted/twisted_site/templates/client/dashboard.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 9977d5b..c8cf4d8 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -56,7 +56,6 @@
                                     Panel</a>
                                 {% endif %}
                                 <a href="https://docs.twisted.hackclub.com/" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Docs</a>
-                                <button class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Docs</button>
                             </div>
                         </div>
                     </div>

From 61675320ba0307f65fccec478a61e0e19d72c86d Mon Sep 17 00:00:00 2001
From: CoolCream <mahasankarshant@gmail.com>
Date: Tue, 25 Aug 2026 18:08:54 +0530
Subject: [PATCH 082/118] completed all the project page dialogs too.

---
 .../templates/client/projects/create.html     | 113 +++++--
 .../templates/client/projects/detail.html     | 311 ++++++++++++++----
 .../client/projects/journal/delete.html       | 117 +++++--
 .../projects/journal/new_hackatime.html       |  10 +-
 .../projects/journal/new_journal.base.html    | 157 ++++++---
 .../templates/client/projects/list.html       | 105 ++++--
 .../templates/client/projects/settings.html   | 134 ++++++--
 .../templates/client/projects/ship.html       | 126 +++++--
 .../twisted_site/templates/cotton/mdedit.html | 222 ++++++++-----
 .../templates/cotton/mdpreview.html           |   3 +-
 10 files changed, 952 insertions(+), 346 deletions(-)

diff --git a/twisted/twisted_site/templates/client/projects/create.html b/twisted/twisted_site/templates/client/projects/create.html
index d47b00f..dc15c90 100644
--- a/twisted/twisted_site/templates/client/projects/create.html
+++ b/twisted/twisted_site/templates/client/projects/create.html
@@ -1,38 +1,103 @@
-{% extends "client/osbase.html" %} {% block body %}
-<div class="bg-surface flex flex-col w-full h-full font-vintage">
+{% extends "client/osbase.html" %}
+
+{% block body %}
+<div class="flex h-full w-full flex-col bg-surface font-vintage text-foreground">
+
     {% if complete %}
-    <div class="text-center">
-        <div class="text-xl">
-            Your project has been created!
-        </div>
-        <div>
-            You can now close this window.
+
+    <div class="flex min-h-0 flex-1 items-center justify-center p-6">
+        <div class="w-full max-w-md border border-border bg-card p-6 text-center">
+            <div
+                class="mx-auto mb-4 flex h-14 w-14 items-center justify-center border border-border bg-secondary text-2xl">
+                ✓
+            </div>
+
+            <div class="text-xl font-bold text-foreground">
+                Project created!
+            </div>
+
+            <div class="mt-2 text-sm text-muted-foreground">
+                Your project has been successfully created.
+            </div>
+
+            <div class="mt-4 border-t border-border pt-3 text-xs text-subtle-foreground">
+                You can now close this window.
+            </div>
         </div>
     </div>
+
     {% else %}
-    <form method="post" class="h-max w-full flex-1 scrollbar-win9x">
+
+    <form method="post" class="flex min-h-0 flex-1 flex-col">
         {% csrf_token %}
-        <div class="field-row-stacked">
-            <label for="name">Project name</label>
-            <input id="name" name="name" type="text" required />
+
+        <div class="shrink-0 border-b border-border bg-card px-4 py-3">
+            <div class="text-lg font-bold">
+                Create a new project
+            </div>
+            <div class="mt-0.5 text-xs text-muted-foreground">
+                Enter the details for your project below.
+            </div>
         </div>
-        <div class="field-row-stacked">
-            <label for="description">Project description</label>
-            <textarea id="description" name="description" rows="4" required></textarea>
+
+        <div class="min-h-0 flex-1 overflow-y-auto bg-background p-4">
+
+            <div class="space-y-4">
+
+                <div class="space-y-1">
+                    <label for="name" class="block text-sm font-bold">
+                        Project name
+                    </label>
+
+                    <input id="name" name="name" type="text" required placeholder="My awesome project"
+                        class="w-full border border-border bg-card px-3 py-2 text-sm text-foreground outline-none placeholder:text-muted-foreground focus:border-primary focus:ring-2 focus:ring-primary/30">
+                </div>
+
+                <div class="space-y-1">
+                    <label for="description" class="block text-sm font-bold">
+                        Project description
+                    </label>
+
+                    <textarea id="description" name="description" rows="5" required placeholder="What are you building?"
+                        class="w-full resize-y border border-border bg-card px-3 py-2 text-sm text-foreground outline-none placeholder:text-muted-foreground focus:border-primary focus:ring-2 focus:ring-primary/30"></textarea>
+                </div>
+
+                <div class="space-y-1">
+                    <label for="type" class="block text-sm font-bold">
+                        Project type
+                    </label>
+
+                    <select id="type" name="type" required
+                        class="w-full border border-border bg-card px-3 py-2 text-sm text-foreground outline-none focus:border-primary focus:ring-2 focus:ring-primary/30">
+                        <option value="" disabled selected hidden>
+                            Select an option
+                        </option>
+                        <option value="software">
+                            Software
+                        </option>
+                        <option value="hardware">
+                            Hardware
+                        </option>
+                    </select>
+                </div>
+
+            </div>
+
         </div>
 
-        <div class="mt-2 field-row-stacked">
-            <label for="type">Project type</label>
-            <select id="type" name="type" required>
-                <option value="" disabled selected hidden>Select an option</option>
-                <option value="software">Software</option>
-                <option value="hardware">Hardware</option>
-            </select>
+        <div class="flex shrink-0 items-center justify-end border-t border-border bg-card px-3 py-2">
+            <div class="flex gap-2">
+                <button type="submit"
+                    class="border border-primary bg-primary px-4 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80 active:translate-y-px">
+                    Create project
+                </button>
+            </div>
+
         </div>
 
-        <button class="mt-2">Create</button>
     </form>
 
     {% endif %}
+
 </div>
-{% endblock body %}
+{% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 062c7c1..d92431d 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -1,99 +1,268 @@
-{% extends "client/osbase.html" %} {% load static time_filters humanize %} {% block body %}
-<div class="bg-surface flex flex-col w-full h-full font-vintage">
-    <div class="flex mb-2">
-        <div class="flex-1">
-            <input type="hidden" value="{{ project.project_name }}" id="project-title">
-            <div class="text-xl">
-                {{ project.project_name }} ({{ project.get_project_type_display }})
+{% extends "client/osbase.html" %}
+{% load static time_filters humanize %}
+
+{% block body %}
+<div class="flex h-full w-full flex-col bg-surface font-vintage text-foreground">
+
+    <input type="hidden" value="{{ project.project_name }}" id="project-title">
+
+    <div class="shrink-0 border-b border-border bg-card p-3">
+
+        <div class="flex flex-wrap items-start gap-3">
+
+            <div class="min-w-0 flex-1">
+                <div class="flex flex-wrap items-center gap-2">
+                    <h1 class="wrap-break-word text-xl font-bold">
+                        {{ project.project_name }}
+                    </h1>
+
+                    <span class="border border-border bg-secondary px-2 py-0.5 text-xs text-secondary-foreground">
+                        {{ project.get_project_type_display }}
+                    </span>
+
+                    {% if project.is_shipped %}
+                    <span class="border border-success bg-success/20 px-2 py-0.5 text-xs text-success">
+                        SHIPPED
+                    </span>
+                    {% endif %}
+                </div>
+
+                <p class="mt-1 max-w-2xl break-words text-sm text-muted-foreground">
+                    {{ project.project_description }}
+                </p>
             </div>
-            <div>{{ project.project_description }}</div>
-        </div>
-        <div class="flex flex-col text-right">
-            {% if project.repo_url and project.time_logged > 60 %}
-            {% if not project.is_shipped %}
+
+            <div class="flex shrink-0 flex-wrap gap-1">
+                {% if project.repo_url and project.time_logged > 60 %}
+                {% if not project.is_shipped %}
                 <a href="{% url 'fr.projects.ship' project.id %}">
-                    <button>Submit project</button>
+                    <button
+                        class="border border-primary bg-primary px-3 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80 active:translate-y-px">
+                        ship project
+                    </button>
                 </a>
-            {% endif %}
-            {% endif %}
-            {% if not project.is_shipped %}
+                {% endif %}
+                {% endif %}
+
+                {% if not project.is_shipped %}
                 <a href="{% url 'fr.projects.settings' project.id %}">
-                    <button>Settings</button>
+                    <button
+                        class="border border-border bg-secondary px-3 py-1.5 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px">
+                        Settings
+                    </button>
                 </a>
-            {% endif %}
+                {% endif %}
+            </div>
+
         </div>
+
     </div>
-    <div class="mb-2">
-        <div class="flex gap-4">
-            <!-- <div>
-                <div>
-                    Time spent
-                </div>
-                <div class="text-right">
-                    {{ project.time_spent|minutes_to_hours_minutes }}
+
+    <div class="min-h-0 flex-1 overflow-y-auto bg-background p-3">
+
+        <div class="mb-3 grid grid-cols-2 gap-2 sm:grid-cols-2">
+
+            <div class="border border-border bg-card p-3">
+                <div class="text-xs uppercase text-muted-foreground">
+                    Time logged
                 </div>
-            </div> -->
-            <div>
-                <div>Time logged</div>
-                <div class="text-right">
+
+                <div class="mt-1 text-2xl font-bold text-primary">
                     {{ project.time_logged|minutes_to_hours_minutes }}
                 </div>
             </div>
+
+            <div class="border border-border bg-card p-3">
+                <div class="text-xs uppercase text-muted-foreground">
+                    Journals
+                </div>
+
+                <div class="mt-1 text-2xl font-bold">
+                    {{ project.journals.count }}
+                </div>
+            </div>
+
         </div>
+
         {% if project.is_shipped %}
-            <div>
-                Your project is shipped and now read-only.
+        <div class="mb-3 border border-success bg-success/10 p-3">
+            <div class="font-bold text-success">
+                Project shipped
             </div>
+
+            <div class="mt-1 text-sm text-muted-foreground">
+                This project is now read-only.
+            </div>
+        </div>
         {% endif %}
+
         {% if not project.hackatime_project_name %}
-        <div class="border border-twisted-400 p-1 m-1 w-fit">
-            Hi! I noticed you don't have a hackatime project linked yet. You can link a hackatime project over at the
-            <a href="{% url 'fr.projects.settings' project.pk %}">project settings</a>.
-        </div>
-        {% else %}
-        {% if not project.repo_url %}
-        <div class="border border-twisted-400 p-1 m-1 w-fit">
-            Hi! You don't have a repo linked yet. You can link a repo over at the
-            <a href="{% url 'fr.projects.settings' project.pk %}">project settings</a>.
+
+        <div class="mb-3 border border-warning bg-warning/10 p-3">
+            <div class="font-bold text-warning">
+                Hackatime project not linked bru...
+            </div>
+
+            <div class="mt-1 text-sm text-muted-foreground">
+                Vro link a Hackatime project to start tracking time on ts project.
+            </div>
+
+            <a href="{% url 'fr.projects.settings' project.pk %}"
+                class="mt-2 inline-block text-sm text-primary underline hover:text-accent">
+                Open project settings
+            </a>
         </div>
-        {% endif %}
-        {% endif %}
-        {% if not project.is_shipped %}
-        <div>
-            <button onclick="createWindow('journal: ' + document.getElementById('project-title').value, '{% url 'fr.projects.journals.new.hackatime' project.pk %}')">New journal...</button>
+
+        {% elif not project.repo_url %}
+
+        <div class="mb-3 border border-warning bg-warning/10 p-3">
+            <div class="font-bold text-warning">
+                VRO repository not linked
+            </div>
+
+            <div class="mt-1 text-sm text-muted-foreground">
+                Link a repository before shipping your project.
+            </div>
+
+            <a href="{% url 'fr.projects.settings' project.pk %}"
+                class="mt-2 inline-block text-sm text-primary underline hover:text-accent">
+                Open project settings
+            </a>
         </div>
+
         {% endif %}
-    </div>
-    <div>
-        {% for journal in project.journals.all|dictsortreversed:"created_at" %}
-        <div class="p-4 m-2 rounded-lg bg-twisted-600">
-            <div class="flex gap-1">
-                <div class="flex-1 flex gap-1">
-                    <div>{{ journal.reduced_minutes|minutes_to_hours_minutes }} logged via {{ journal.get_type_display }}</div>
-                    •
-                    <div title="{{ journal.created_at }}">{{ journal.created_at|naturaltime }}</div>
-                </div>
-                {% if project.user == request.user %}
-                <div class="flex gap-2">
-                    {% if not project.is_shipped %}
-                    {% if journal.type == "untracked" %}
-                    <div title="Delete" onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'delete journal', 'src': '{% url 'fr.projects.journals.delete' journal.pk %}'}, '*')" class="w-7 h-7 bg-twisted-800 p-1 rounded-md cursor-pointer">
-                        <img draggable="false" class="w-full h-full image-render-pixelated" src="{% static 'icons/delete.png' %}" alt="">
+
+        <div class="border border-border bg-card">
+
+            <div
+                class="flex flex-wrap items-center justify-between gap-2 border-b border-border bg-secondary px-3 py-2">
+
+                <div>
+                    <div class="font-bold">
+                        Project journal
                     </div>
-                    {% endif %}
-                    <div title="Edit" class="w-7 h-7 bg-twisted-800 p-1 rounded-md cursor-pointer">
-                        <img draggable="false" class="w-full h-full image-render-pixelated" src="{% static 'icons/edit.png' %}" alt="">
+
+                    <div class="text-xs text-muted-foreground">
+                        Devlogs and progress....
                     </div>
-                    {% endif %}
                 </div>
+
+                {% if not project.is_shipped %}
+                <button
+                    onclick="createWindow('journal: ' + document.getElementById('project-title').value, '{% url 'fr.projects.journals.new.hackatime' project.pk %}')"
+                    class="border border-border bg-primary px-3 py-1 text-sm font-bold text-primary-foreground hover:bg-primary/80 active:translate-y-px">
+                    + New journal
+                </button>
                 {% endif %}
+
             </div>
-            <div>
-                <c-mdpreview class="w-full zoom-100 **:[&_img]:zoom-50">{{ journal.content }}</c-mdpreview>
+
+            <div class="p-2">
+
+                {% for journal in project.journals.all|dictsortreversed:"created_at" %}
+
+                <article class="mb-2 border border-border bg-background last:mb-0">
+
+                    <div class="flex flex-wrap items-center gap-2 border-b border-border bg-card px-3 py-2">
+
+                        <div class="min-w-0 flex-1 text-sm">
+                            <span class="font-bold">
+                                {{ journal.reduced_minutes|minutes_to_hours_minutes }}
+                            </span>
+
+                            <span class="text-muted-foreground">
+                                logged via {{ journal.get_type_display }}
+                            </span>
+
+                            <span class="mx-1 text-subtle">
+                                •
+                            </span>
+
+                            <span class="text-muted-foreground" title="{{ journal.created_at }}">
+                                {{ journal.created_at|naturaltime }}
+                            </span>
+                        </div>
+
+                        {% if project.user == request.user %}
+                        {% if not project.is_shipped %}
+
+                        <div class="flex shrink-0 gap-1">
+
+                            {% if journal.type == "untracked" %}
+                            <button title="Delete"
+                                onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'Delete journal', 'src': '{% url 'fr.projects.journals.delete' journal.pk %}'}, '*')"
+                                class="flex h-7 w-7 items-center justify-center border border-border bg-secondary p-1 hover:bg-destructive hover:text-destructive-foreground">
+                                <img draggable="false" class="image-render-pixelated h-full w-full"
+                                    src="{% static 'icons/delete.png' %}" alt="Delete">
+                            </button>
+                            {% endif %}
+
+                            <button title="Edit"
+                                class="flex h-7 w-7 items-center justify-center border border-border bg-secondary p-1 hover:bg-primary hover:text-primary-foreground">
+                                <img draggable="false" class="image-render-pixelated h-full w-full"
+                                    src="{% static 'icons/edit.png' %}" alt="Edit">
+                            </button>
+
+                        </div>
+
+                        {% endif %}
+                        {% endif %}
+
+                    </div>
+
+                    <div class="min-w-0 max-w-full overflow-hidden p-3">
+                        <c-mdpreview
+                            class="block min-w-0 max-w-full overflow-hidden wrap-break-word zoom-100 **:[&_img]:zoom-50 [&_pre]:max-w-full [&_pre]:overflow-x-auto [&_pre]:whitespace-pre-wrap [&_pre]:wrap-break-word [&_code]:wrap-break-word [&_img]:max-w-full [&_table]:block [&_table]:max-w-full [&_table]:overflow-x-auto">
+                            {{ journal.content }}
+                        </c-mdpreview>
+                    </div>
+
+                </article>
+
+                {% empty %}
+
+                <div class="px-4 py-10 text-center">
+
+                    <div
+                        class="mx-auto mb-3 flex h-14 w-14 items-center justify-center border border-border bg-secondary text-xs">
+                        replace with image pf
+                    </div>
+
+                    <div class="font-bold">
+                        No journal entries
+                    </div>
+
+                    <div class="mt-1 text-sm text-muted-foreground">
+                        Your project progress will appear here... after you journal
+                    </div>
+
+                    {% if not project.is_shipped %}
+                    <button
+                        onclick="createWindow('journal: ' + document.getElementById('project-title').value, '{% url 'fr.projects.journals.new.hackatime' project.pk %}')"
+                        class="mt-4 border border-border bg-primary px-4 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80">
+                        + New journal
+                    </button>
+                    {% endif %}
+
+                </div>
+
+                {% endfor %}
+
             </div>
         </div>
-        {% endfor %}
+
     </div>
-</div>
 
-{% endblock body %}
+    <div
+        class="status-field-border flex shrink-0 items-center justify-between bg-card p-2 border-t border-border text-xs">
+        <span>
+            {{ project.journals.count }} journal{{ project.journals.count|pluralize }}
+        </span>
+
+        <span>
+            {{ project.time_logged|minutes_to_hours_minutes }} logged
+        </span>
+    </div>
+
+</div>
+{% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/journal/delete.html b/twisted/twisted_site/templates/client/projects/journal/delete.html
index a07b988..ccf4a1b 100644
--- a/twisted/twisted_site/templates/client/projects/journal/delete.html
+++ b/twisted/twisted_site/templates/client/projects/journal/delete.html
@@ -1,40 +1,109 @@
 {% extends "client/osbase.html" %} {% load static time_filters %}
 {% block body %}
-<div class="font-vintage">
+
+<div class="w-full h-full flex flex-col bg-surface text-foreground font-vintage">
+
     {% if not success %}
-    <div class="p-2">
-        <div>
-            <div class="grid grid-cols-2 w-fit gap-x-4">
-                <div>Time logged:</div>
-                <div>{{ journal.reduced_minutes|minutes_to_hours_minutes }}</div>
-                <div>Journal type:</div>
-                <div>{{ journal.get_type_display }}</div>
-                <div>Created:</div>
-                <div>{{ journal.created_at }}</div>
+    <div class="shrink-0 flex items-center bg-primary text-primary-foreground px-3 py-2 border-b border-border">
+        <span class="font-bold text-lg">Delete journal</span>
+    </div>
+
+    <div class="flex-1 min-h-0 overflow-y-auto p-4">
+
+        <div class="border border-border bg-card p-3">
+
+            <div class="text-lg font-bold mb-3 border-b border-border pb-2">
+                Journal information
+            </div>
+
+            <div class="grid grid-cols-[auto_1fr] gap-x-6 gap-y-2 text-sm">
+
+                <div class="text-muted-foreground">
+                    Time logged
+                </div>
+
+                <div>
+                    {{ journal.reduced_minutes|minutes_to_hours_minutes }}
+                </div>
+
+                <div class="text-muted-foreground">
+                    Journal type
+                </div>
+
+                <div>
+                    {{ journal.get_type_display }}
+                </div>
+
+                <div class="text-muted-foreground">
+                    Created
+                </div>
+
+                <div>
+                    {{ journal.created_at }}
+                </div>
+
             </div>
         </div>
-        <div class="mt-4">
-            <div>
+
+        <div class="mt-4 border border-destructive bg-destructive/10 p-3">
+
+            <div class="font-bold text-lg">
+                Are you sure?
+            </div>
+
+            <div class="mt-1 text-sm">
                 Are you sure you want to delete this journal?
             </div>
-            <div>
+
+            <div class="mt-1 text-sm text-muted-foreground">
                 It will be lost forever (a long time!)
             </div>
-            <form method="post" action="{% url 'fr.projects.journals.delete' journal.pk %}">
-                {% csrf_token %}
-                <button>Yes, delete it</button>
-            </form>
+
         </div>
+
+    </div>
+
+    <div class="shrink-0 flex items-center justify-end gap-2 border-t border-border bg-card p-2">
+
+        <button type="button" onclick="window.parent.postMessage({type: 'internal', action: 'close'}, '*')"
+            class="px-4 py-1 border border-border bg-secondary text-secondary-foreground hover:bg-primary hover:text-primary-foreground">
+            Cancel
+        </button>
+
+        <form method="post" action="{% url 'fr.projects.journals.delete' journal.pk %}">
+            {% csrf_token %}
+            <button type="submit"
+                class="px-4 py-1 border-2  bg-destructive text-destructive-foreground hover:opacity-90 ">
+                Yes, delete it
+            </button>
+        </form>
+
     </div>
+
     {% else %}
-    <div class="text-center mt-4">
-        <div class="text-2xl">
-            Your journal has been deleted
-        </div>
-        <div>
-            You can now close this window
+
+    <div class="flex-1 flex flex-col items-center justify-center text-center p-6">
+
+        <div class="border border-success text-foreground bg-success/20 p-6 max-w-sm w-full">
+
+            <div class="text-2xl text-success font-bold mb-2">
+                Journal deleted
+            </div>
+
+            <div>
+                Your journal has been deleted :C
+            </div>
+
+            <div class="mt-1 text-sm">
+                You can now close this window.
+            </div>
+
         </div>
+
     </div>
+
     {% endif %}
+
 </div>
-{% endblock body %}
+
+{% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
index bbfd7fd..9b2331b 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
@@ -1,9 +1,11 @@
 {% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %}
 {% block links %}
 {% if project.project_type == 'hardware' %}
-<button disabled>Hackatime</button>
-    <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
-        <button>untracked</button>
-    </a>
+<button disabled
+    class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">Hackatime</button>
+<a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
+    <button
+        class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">untracked</button>
+</a>
 {% endif %}
 {% endblock links %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
index 09dd47d..cc6394a 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
@@ -1,55 +1,134 @@
-{% extends "client/osbase.html" %} {% load static time_filters %} {% block body %}
+{% extends "client/osbase.html" %}
+{% load static time_filters %}
+
+{% block body %}
 
 <script type="speculationrules">
 {
   "prerender": [
     {
-    "source": "list",
-    "urls": ["{% url 'fr.projects.journals.new.hackatime' project.id %}", "{% url 'fr.projects.journals.new.untracked' project.id %}"],
-    "eagerness": "eager"
-}]
+      "source": "list",
+      "urls": [
+        "{% url 'fr.projects.journals.new.hackatime' project.id %}",
+        "{% url 'fr.projects.journals.new.untracked' project.id %}"
+      ],
+      "eagerness": "eager"
+    }
+  ]
 }
 </script>
 
+<div class="bg-surface text-foreground flex flex-col w-full h-full font-vintage overflow-hidden">
 
-<div class="bg-surface flex flex-col w-full h-full font-vintage">
     {% if not success %}
-    <div class="text-4xl">New journal for {{ project.project_name }}</div>
-    <div>
-        {% block links %}
-        <a href="{% url 'fr.projects.journals.new.hackatime' project.id %}">
-            <button>Hackatime</button>
-        </a>
-        {% if project.project_type == 'hardware' %}
-        <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
-            <button>untracked</button>
-        </a>
-        {% endif %} {% endblock links %}
-    </div>
-    {% if info %}
-    <div class="bg-twisted-400 rounded-md p-1 my-1">{{ info|safe }}</div>
-    {% endif %}
-    <div>
-        {% block journal_log_message %}
-        This journal will log {{ log_minutes|minutes_to_hours_minutes }}.
-        {% endblock journal_log_message %}
+
+    <div class="shrink-0 flex items-center justify-between bg-card border-b border-border px-3 py-2">
+        <div class="text-xl font-bold">
+            New journal
+        </div>
+        <div class="text-sm text-muted-foreground truncate">
+            Project: <u> {{ project.project_name }}</u>
+        </div>
     </div>
-    <form method="post" class="h-full flex flex-col">
-        {% csrf_token %}
-        {% block form %}
-        {% block preform %}{% endblock preform %}
-        <c-mdedit class="flex-1" />
-        <div>
-            <button class="mt-4">Log journal</button>
+
+    <div class="flex-1 min-h-0 overflow-y-auto p-3">
+
+        <div class="mb-3">
+            <div class="text-sm font-bold mb-1">
+                Journal
+            </div>
+
+            <div class="flex flex-wrap gap-2">
+                {% block links %}
+
+                <a href="{% url 'fr.projects.journals.new.hackatime' project.id %}">
+                    <button type="button"
+                        class="px-3 py-1.5 bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
+                        Hackatime
+                    </button>
+                </a>
+
+                {% if project.project_type == 'hardware' %}
+                <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
+                    <button type="button"
+                        class="px-3 py-1.5 bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
+                        Untracked
+                    </button>
+                </a>
+                {% endif %}
+
+                {% endblock links %}
+            </div>
+        </div>
+
+        {% if info %}
+        <div class="mb-3 border border-warning bg-warning/30 px-3 py-2">
+            <div class="text-xs font-bold text-warning mb-1">
+                huh?
+            </div>
+            <div class="text-sm ">
+                {{ info|safe }}
+            </div>
         </div>
-        {% endblock form %}
-    </form>
+        {% endif %}
+
+        <div class="mb-3 border border-border bg-background px-3 py-2">
+            <span class="font-bold">
+                Time:
+            </span>
+
+            {% block journal_log_message %}
+            This journal will log {{ log_minutes|minutes_to_hours_minutes }}.
+            {% endblock journal_log_message %}
+        </div>
+
+        <form method="post" class="h-full min-h-0 flex flex-col">
+            {% csrf_token %}
+
+            {% block form %}
+
+            {% block preform %}
+            {% endblock preform %}
+
+            <div class="flex-1 max-h-70 border border-border bg-card">
+                <c-mdedit class="h-full overflow-auto "></c-mdedit>
+            </div>
+
+            <div class="flex justify-end pt-3">
+                <button type="submit"
+                    class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">
+                    Log journal
+                </button>
+            </div>
+
+            {% endblock form %}
+        </form>
+
+    </div>
+
     {% else %}
-    <div class="text-center">
-        <h2>Your journal has been logged!</h2>
-        <p>You can now close this page.</p>
-        <button onclick="location = location">Log another journal!</button>
+
+    <div class="flex-1 flex items-center justify-center p-6 text-center">
+        <div class="border border-success bg-success/30 p-6 max-w-sm">
+
+            <div class="text-2xl font-bold mb-2">
+                Journal logged!
+            </div>
+
+            <p class="text-sm text-muted-foreground mb-4">
+                Your journal has been successfully logged yay!
+            </p>
+
+            <button type="button" onclick="location = location"
+                class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">
+                Log another journal?
+            </button>
+
+        </div>
     </div>
+
     {% endif %}
+
 </div>
-{% endblock body %}
+
+{% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/list.html b/twisted/twisted_site/templates/client/projects/list.html
index 28c050b..232bbf9 100644
--- a/twisted/twisted_site/templates/client/projects/list.html
+++ b/twisted/twisted_site/templates/client/projects/list.html
@@ -1,40 +1,87 @@
 {% extends "client/osbase.html" %}
 {% load static time_filters %}
+
 {% block body %}
-<div class="bg-surface flex flex-col w-full h-full">
-    <div>
-        <button onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'New project...', 'src': '{% url 'fr.projects.create' %}'}, '*');"><span class="underline">N</span>ew project...</button>
+<div class="flex h-full w-full flex-col bg-surface text-foreground font-vintage">
+
+    <div class="flex shrink-0 items-center gap-2 border-b border-border bg-card px-2 py-1">
+        <button
+            onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'New project...', 'src': '{% url 'fr.projects.create' %}'}, '*')"
+            class="flex items-center gap-1 border border-border bg-secondary px-3 py-1 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px">
+            <span class="font-bold">+</span>
+            <span>New project...</span>
+        </button>
     </div>
-    <div
-        class="flex-1 sunken-panel font-vintage overflow-y-scroll p-4"
-    >
-    <div class="flex gap-4 w-full flex-wrap">
-        {% for project in projects %}
-        <input type="hidden" value="{{ project.project_name }}" id="project-{{ project.id }}">
-        <div class="w-16 cursor-pointer" data-project-id="{{ project.id }}" data-project-url="{% url 'fr.projects.detail' project.id %}">
-            <img src="{% static 'images/directory.png' %}" class="w-full">
-            <div class="w-full text-center text-wrap wrap-anywhere" style="text-align: center;">
-                {{ project.project_name }}
+
+    <div class="sunken-panel min-h-0 flex-1 overflow-y-auto bg-background p-3">
+
+        {% if projects %}
+        <div class="flex flex-wrap content-start gap-4">
+
+            {% for project in projects %}
+            <input type="hidden" value="{{ project.project_name }}" id="project-{{ project.id }}">
+
+            <div class="group flex w-24 cursor-pointer flex-col items-center p-2 select-none hover:bg-secondary"
+                data-project-id="{{ project.id }}" data-project-url="{% url 'fr.projects.detail' project.id %}">
+                <div
+                    class="flex h-16 w-16 items-center justify-center border border-transparent p-1 group-hover:border-border group-hover:bg-card">
+                    <img src="{% static 'images/directory.png' %}" alt="" class="h-full w-full object-contain">
+                </div>
+
+                <div
+                    class="mt-1 w-full wrap-break-word text-center text-sm leading-tight text-foreground group-hover:text-primary-foreground">
+                    {{ project.project_name }}
+                </div>
             </div>
+            {% endfor %}
+
         </div>
-        {% endfor %}
-
-    <script>
-        document.querySelectorAll('[data-project-id]').forEach((project) => {
-            project.addEventListener('click', () => {
-                const title = document.getElementById(`project-${project.dataset.projectId}`).value;
-                createWindow(title, project.dataset.projectUrl);
-            });
-        });
-    </script>
 
-    </div>
-    </div>
-    <div class="sticky status-field-border font-vintage">
-        <div class="mx-1">
-            {{ projects|length }} project{{ projects|length|pluralize }}
+        {% else %}
+
+        <div class="flex h-full min-h-48 items-center justify-center">
+            <div class="border border-border bg-card px-8 py-6 text-center shadow-sm">
+                <img src="{% static 'images/directory.png' %}" alt="" class="mx-auto mb-3 h-16 w-16 opacity-70">
+
+                <div class="text-lg font-bold">
+                    No projects yet
+                </div>
+
+                <div class="mt-1 text-sm text-muted-foreground">
+                    Create a project to get started.
+                </div>
+
+                <button
+                    onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'New project...', 'src': '{% url 'fr.projects.create' %}'}, '*')"
+                    class="mt-4 border border-border bg-primary px-4 py-1 text-sm font-bold text-primary-foreground hover:bg-primary/80">
+                    New project
+                </button>
+            </div>
         </div>
+
+        {% endif %}
+
     </div>
+
+    <div class="status-field-border p-1 border-t border-border flex shrink-0 items-center bg-card px-1 text-sm">
+        {{ projects|length }} project{{ projects|length|pluralize }}
+    </div>
+
 </div>
 
-{% endblock body %}
+<script>
+    document.querySelectorAll("[data-project-id]").forEach((project) => {
+        project.addEventListener("click", () => {
+            const title = document.getElementById(
+                `project-${project.dataset.projectId}`
+            ).value;
+
+            createWindow(
+                title,
+                project.dataset.projectUrl
+            );
+        });
+    });
+</script>
+
+{% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/settings.html b/twisted/twisted_site/templates/client/projects/settings.html
index f80febf..66e1d74 100644
--- a/twisted/twisted_site/templates/client/projects/settings.html
+++ b/twisted/twisted_site/templates/client/projects/settings.html
@@ -1,45 +1,119 @@
-{% extends "client/osbase.html" %} {% load static time_filters maths %} {% block body %}
-<div class="bg-surface flex flex-col w-full h-full font-vintage">
-    <div>
+{% extends "client/osbase.html" %}
+{% load static time_filters maths %}
+
+{% block body %}
+<div class="bg-surface text-foreground flex flex-col w-full h-full font-vintage overflow-y-auto">
+    <div class="flex items-center justify-between p-2 border-b border-border bg-card scrollbar-thin">
         <a href="{% url 'fr.projects.detail' project.id %}">
-            <button>Go back</button>
+            <button type="button"
+                class="px-3 py-1 bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
+                ← Go back
+            </button>
         </a>
+
+        <div class="text-lg font-bold">
+            Project settings
+        </div>
     </div>
-    <div class="text-xl">Project settings</div>
-    <form method="post">
+
+    <form method="post" class="p-4 space-y-3">
         {% csrf_token %}
-        <div class="mt-2 field-row-stacked">
-            <label for="name">Project name</label>
-            <input id="name" name="name" type="text" value="{{ project.project_name }}" />
+
+        <div class="flex flex-col gap-1">
+            <label for="name" class="font-bold">
+                Project name
+            </label>
+
+            <input id="name" name="name" required type="text" value="{{ project.project_name }}"
+                class="w-full bg-card text-card-foreground border border-border px-2 py-1 focus:outline-none focus:ring-1 focus:ring-ring" />
         </div>
-        <div class="mt-2 field-row-stacked">
-            <label for="description">Project description</label>
-            <textarea id="description" name="description">{{ project.project_description }}</textarea>
+
+        <div class="flex flex-col gap-1">
+            <label for="description" class="font-bold">
+                Project description
+            </label>
+
+            <textarea id="description" required name="description" rows="4"
+                class="w-full bg-card text-card-foreground border border-border px-2 py-1 resize-y focus:outline-none focus:ring-1 focus:ring-ring">{{ project.project_description }}</textarea>
         </div>
-        <div class="mt-2 field-row-stacked">
-            <label for="type">Project type</label>
-            <select id="type" name="type" required>
-                <option {% if project.project_type == 'software' %}selected{% endif %} value="software">Software</option>
-                <option {% if project.project_type == 'hardware' %}selected{% endif %} value="hardware">Hardware</option>
+
+        <div class="flex flex-col gap-1">
+            <label for="type" class="font-bold">
+                Project type
+            </label>
+
+            <select id="type" name="type" required
+                class="w-full bg-card text-card-foreground border border-border px-2 py-1">
+
+                {% if project.project_type == "software" %}
+                <option value="software" selected>
+                    Software
+                </option>
+                <option value="hardware" class="text-muted-foreground">
+                    Hardware
+                </option>
+                {% else %}
+                <option value="software" class="text-muted-foreground">
+                    Software
+                </option>
+                <option value="hardware" selected>
+                    Hardware
+                </option>
+                {% endif %}
+
             </select>
         </div>
-        <div class="mt-2 field-row-stacked">
-            <label for="hackatime">Hackatime project</label>
-            <select id="hackatime" name="hackatime">
-                <option value="" disabled hidden {% if not project.hackatime_project_name %}selected{% endif %}>Select a project</option>
-                {% for project in hackatime_projects %}
-                {% if project.total_seconds > 300 %}
-                <option value="{{ project.name }}" {% if project.hackatime_project_name == project.name %}selected{% endif %}> {{ project.name }} ({{ project.total_seconds|divide:60|minutes_to_hours_minutes }}) </option>
+
+        <div class="flex flex-col gap-1">
+            <label for="hackatime" class="font-bold">
+                Hackatime project
+            </label>
+
+            <select id="hackatime" name="hackatime"
+                class="w-full bg-card text-card-foreground border border-border px-2 py-1">
+
+                {% if not project.hackatime_project_name %}
+                <option value="" disabled selected hidden class="text-muted-foreground">
+                    Select a project
+                </option>
+                {% endif %}
+
+                {% for hack_project in hackatime_projects %}
+                {% if hack_project.total_seconds > 300 %}
+                {% if project.hackatime_project_name == hack_project.name %}
+                <option value="{{ hack_project.name }}" selected>
+                    {{ hack_project.name }}
+                    ({{ hack_project.total_seconds|divide:60|minutes_to_hours_minutes }})
+                </option>
+                {% else %}
+                <option value="{{ hack_project.name }}">
+                    {{ hack_project.name }}
+                    ({{ hack_project.total_seconds|divide:60|minutes_to_hours_minutes }})
+                </option>
+                {% endif %}
                 {% endif %}
                 {% endfor %}
+
             </select>
         </div>
-        <div class="mt-2 field-row-stacked">
-            <label for="repo">Repo URL</label>
-            <input id="repo" name="repo" type="text" placeholder="https://github.com/<yournamehere>/<yourprojecthere>" value="{{ project.repo_url }}" />
+
+        <div class="flex flex-col gap-1">
+            <label for="repo" class="font-bold">
+                Repo URL
+            </label>
+
+            <input id="repo" name="repo" type="text" placeholder="https://github.com/username/project"
+                value="{{ project.repo_url }}"
+                class="w-full bg-card text-card-foreground border border-border px-2 py-1 focus:outline-none focus:ring-1 focus:ring-ring" />
+        </div>
+
+        <div class="pt-2">
+            <button type="submit"
+                class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">
+                Save changes?
+            </button>
         </div>
-        <button type="submit" class="mt-4">Save</button>
+
     </form>
 </div>
-
-{% endblock body %}
+{% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/ship.html b/twisted/twisted_site/templates/client/projects/ship.html
index 30a60c0..7b42501 100644
--- a/twisted/twisted_site/templates/client/projects/ship.html
+++ b/twisted/twisted_site/templates/client/projects/ship.html
@@ -1,48 +1,108 @@
 {% extends "client/osbase.html" %} {% load static time_filters humanize %}
 {% block body %}
 
-<div class="bg-surface flex flex-col w-full h-full font-vintage">
+<div class="w-full h-full flex flex-col bg-surface font-vintage">
+
     {% if info %}
-    <div class="bg-twisted-400 rounded-md p-1 my-1">{{ info|safe }}</div>
+    <div class="shrink-0 mx-2 mt-2 border border-border bg-twisted-400 p-2">
+        {{ info|safe }}
+    </div>
     {% endif %}
-    
-    <div class="text-center">
-        {% if not success %}
-        <div class="p-4 my-2 bg-twisted-600 text-3xl">READ THE GUIDELINES!</div>
-        <div class="my-2">
-            Please read through our <a href="#">submission guidelines</a> before continuing.
-        </div>
-        <div class="text-3xl my-2">
-            90% of rejections could have taken 5 minutes to fix
+
+    {% if not success %}
+
+    <div class="shrink-0 flex items-center gap-2 bg-accent text-accent-foreground px-3 py-2 border-b border-border">
+        <span class="font-bold text-lg">Submit project</span>
+    </div>
+
+    <div class="flex-1 min-h-0 overflow-y-auto p-4">
+
+        <div class="max-w-xl mx-auto">
+
+            <div class="border-2 border-border bg-twisted-600 p-4 text-center">
+
+                <div class="text-3xl font-bold mb-3">
+                    READ THE GUIDELINES VRO!
+                </div>
+
+                <div class="text-base">
+                    Please read through our
+                    <a href="#" class="underline font-bold hover:text-primary-foreground">
+                        submission guidelines
+                    </a>
+                    before continuing.
+                </div>
+
+            </div>
+
+            <div class="mt-4 border border-border bg-card text-card-foreground p-4 text-center">
+
+                <div class="text-2xl font-bold">
+                    Did yk 90% of rejections could have taken 5 minutes to fix pff?
+                </div>
+
+                <div class="mt-4 text-sm text-muted-foreground">
+                    Our reviewers will manually check your project.
+                </div>
+
+                <div class="mt-2 text-sm">
+                    {% if project.type == 'software' %}
+                    Make sure your project works before shipping it.
+                    {% else %}
+                    Make sure your design is shipped and looks like it will work.
+                    {% endif %}
+                </div>
+
+            </div>
+
         </div>
-        <form method="post" class="my-2">
+
+    </div>
+
+    <div class="shrink-0 flex flex-wrap items-center justify-between gap-2 border-t border-border bg-card p-2">
+
+        <a href="{% url 'fr.projects.detail' project.id %}">
+            <button type="button"
+                class="px-3 py-1 border border-border bg-secondary text-secondary-foreground hover:bg-primary hover:text-primary-foreground">
+                Nevermind
+            </button>
+        </a>
+
+        <form method="post">
             {% csrf_token %}
-            <button class="text-2xl! py-2! px-4!">
-                I have read and am ready to submit!
+            <button type="submit"
+                class="px-4 py-2 text-lg border-2 border-border bg-twisted-400 text-absolute-white hover:bg-twisted-600 ">
+                I have read the guidelines
             </button>
         </form>
-        <a class="my-2" href="{% url 'fr.projects.detail' project.id %}">Nevermind! Take me back.</a>
-        <div class="my-2">
-            <div>
-                Our reviewers will manually check.
+
+    </div>
+
+    {% else %}
+
+
+    <div class="flex-1 flex items-center justify-center p-6">
+
+        <div class="w-full max-w-md border border-success bg-success/30 p-6 text-center">
+
+            <div class="text-3xl font-bold text-success">
+                Success!
             </div>
-            <div>
-                {% if project.type == 'software' %}
-                Make sure your project works before shipping it.
-                {% else %}
-                Make sure your design is shipped and looks like it will work.
-                {% endif %}
+
+            <div class="mt-2 text-foreground">
+                Your project has been submitted for review by the twistwrights!
             </div>
+
+            <div class="mt-4 text-sm text-foreground">
+                you can now close this window.
+            </div>
+
         </div>
-        {% else %}
-        <div class="mt-2 text-2xl">
-            Success!
-        </div>
-        <div>
-            Your project has been submitted for review.
-        </div>
-        {% endif %}
+
     </div>
+
+    {% endif %}
+
 </div>
 
-{% endblock body %}
+{% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/mdedit.html b/twisted/twisted_site/templates/cotton/mdedit.html
index 38317a1..b21544b 100644
--- a/twisted/twisted_site/templates/cotton/mdedit.html
+++ b/twisted/twisted_site/templates/cotton/mdedit.html
@@ -1,99 +1,139 @@
-<div class="flex flex-col {{ class }}">
-    <div>
-        <button id="editbutton" type="button" onclick="switchedit()" disabled>Edit</button>
-        <button id="previewbutton" type="button" onclick="switchpreview()">Preview</button>
+<div class="flex flex-col flex-1 min-h-0 min-w-0 {{ class }} font-vintage">
+
+    <div class="shrink-0 flex items-center gap-1 bg-card border-b border-border p-1">
+        <button id="editbutton" type="button" onclick="switchedit()" disabled
+            class="px-3 py-1 bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
+            Edit
+        </button>
+
+        <button id="previewbutton" type="button" onclick="switchpreview()"
+            class="px-3 py-1 bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
+            Preview
+        </button>
     </div>
-    <div class="flex-1">
-        <div class="!text-lg h-full flex flex-col" id="edittab">
-            <div class="flex-1">
-                <textarea name="content" id="content" class="w-full h-full text-2xl! resize-none" oninput="renderpreview()">{{ content }}</textarea>
-            </div>
+
+    <div class="flex-1 min-h-0 min-w-0 overflow-hidden">
+
+        <div id="edittab" class="flex w-full h-full min-h-0">
+            <textarea name="content" id="content"
+                class="block w-full h-full min-h-0 resize-none bg-background text-foreground p-3 font-mono border-0 outline-none"
+                placeholder="Write your journal entry here..." oninput="renderpreview()">{{ content }}</textarea>
         </div>
-        <div id="previewtab" style="display: none;" class="h-full flex flex-col">
-            <div class="overflow-y-auto flex-1 bg-twisted-600 p-1">
-                <div id="preview" class="zoom-150 [&_h1,h2,h3,h4,h5,h6]:zoom-40 [&_ul,ol]:list-outside [&_ul,ol]:pl-5 [&_ul]:list-disc [&_ol]:list-decimal *:my-1">
+
+        <div id="previewtab" class="hidden w-full h-full min-h-0">
+            <div class="w-full h-full overflow-y-auto bg-background p-4">
+                <div id="preview"
+                    class="w-full max-w-full wrap-break-word text-foreground [&_h1]:text-2xl [&_h1]:font-bold [&_h2]:text-xl [&_h2]:font-bold [&_h3]:text-lg [&_h3]:font-bold [&_ul]:list-disc [&_ul]:pl-6 [&_ol]:list-decimal [&_ol]:pl-6 [&_p]:my-2 [&_a]:underline [&_a]:text-primary [&_img]:max-w-full">
                 </div>
             </div>
         </div>
+
     </div>
-    
-    <script>
-        textbox = document.querySelector('#content')
-        console.log(textbox)
-        csrfToken = "{{ csrf_token }}"
-    
-        function generateRandomString(length) {
-            const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-            let result = '';
-            for (let i = 0; i < length; i++) {
-                result += chars.charAt(Math.floor(Math.random() * chars.length));
-            }
-            return result;
-        }
-    
-        function renderpreview() {
-            console.log('rendering...');
-            content = textbox.value;
-            parsed = DOMPurify.sanitize(marked.parse(content));
-            document.getElementById('preview').innerHTML = parsed;
-        }
-        function switchedit() {
-            document.getElementById('previewtab').style.display = 'none';
-            document.getElementById('edittab').style.display = null;
-            
-            document.getElementById('editbutton').disabled = true;
-            document.getElementById('previewbutton').disabled = null;
-        }
-        function switchpreview() {
-            document.getElementById('previewtab').style.display = null;
-            document.getElementById('edittab').style.display = 'none';
-    
-            document.getElementById('editbutton').disabled = null;
-            document.getElementById('previewbutton').disabled = true;
+</div>
+
+<script>
+    const textbox = document.querySelector("#content");
+    const csrfToken = "{{ csrf_token }}";
+
+    function generateRandomString(length) {
+        const chars =
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+        let result = "";
+
+        for (let i = 0; i < length; i++) {
+            result += chars.charAt(
+                Math.floor(Math.random() * chars.length)
+            );
         }
-    
-    
-        textbox.addEventListener('paste', (event) => {
-            console.log('paste detect!')
-            const items = (event.clipboardData || window.clipboardData).items;
-    
-            for (let i = 0; i < items.length; i++) {
-                if (!items[i].type.startsWith('image/')) {
-                    continue;
-                }
-                console.log("found image!")
-                const blob = items[i].getAsFile();
-    
-                const id = `![Uploading... ${generateRandomString(5)}]()`
-    
-                textbox.value = textbox.value + id + '\n'
-    
-                const formData = new FormData();
-                formData.append('csrfmiddlewaretoken', csrfToken);
-                formData.append('file', blob);
-                formData.append('ref', 'journals');
-    
-                // 4. Send the POST request to your backend URL
-                response = fetch("{% url 'misc.upload_file' %}", {
-                    method: 'POST',
-                    body: formData, // Fetch automatically sets Content-Type to multipart/form-data
-                });
-                response.then((response) => {
-                    console.log(response);
-                    response.json().then((result) => {
-                        console.log(result);
-                        if (result['status'] == 'ok') {
-                            console.log('Upload successful:', result);
-                            textbox.value = textbox.value.replace(id, `![${result['name']}](${result['link']})`);
-                        } else {
-                            console.log('Upload failed:', result);
-                            textbox.value = textbox.value.replace(id, `![Error: ${result['reason']}]()`);
-                        }
-                        renderpreview()
-                    })
-                });
-                    
+
+        return result;
+    }
+
+    function renderpreview() {
+        const content = textbox.value;
+
+        const parsed = DOMPurify.sanitize(
+            marked.parse(content)
+        );
+
+        document.getElementById("preview").innerHTML = parsed;
+    }
+
+    function switchedit() {
+        document.getElementById("previewtab").classList.add("hidden");
+        document.getElementById("edittab").classList.remove("hidden");
+
+        document.getElementById("editbutton").disabled = true;
+        document.getElementById("previewbutton").disabled = false;
+
+        textbox.focus();
+    }
+
+    function switchpreview() {
+        document.getElementById("edittab").classList.add("hidden");
+        document.getElementById("previewtab").classList.remove("hidden");
+
+        document.getElementById("editbutton").disabled = false;
+        document.getElementById("previewbutton").disabled = true;
+
+        renderpreview();
+    }
+
+    textbox.addEventListener("paste", (event) => {
+        const items =
+            (event.clipboardData || window.clipboardData).items;
+
+        for (let i = 0; i < items.length; i++) {
+
+            if (!items[i].type.startsWith("image/")) {
+                continue;
             }
-        });
-    </script>
-</div>
\ No newline at end of file
+
+            const blob = items[i].getAsFile();
+
+            const id =
+                `![Uploading... ${generateRandomString(5)}]()`;
+
+
+            textbox.value += id + "\n";
+
+            const formData = new FormData();
+
+            formData.append(
+                "csrfmiddlewaretoken",
+                csrfToken
+            );
+
+            formData.append("file", blob);
+            formData.append("ref", "journals");
+
+            fetch("{% url 'misc.upload_file' %}", {
+                method: "POST",
+                body: formData
+            })
+                .then(response => response.json())
+                .then(result => {
+
+                    if (result.status === "ok") {
+
+                        textbox.value =
+                            textbox.value.replace(
+                                id,
+                                `![${result.name}](${result.link})`
+                            );
+
+                    } else {
+
+                        textbox.value =
+                            textbox.value.replace(
+                                id,
+                                `![Error: ${result.reason}]()`
+                            );
+                    }
+
+                    renderpreview();
+                });
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/mdpreview.html b/twisted/twisted_site/templates/cotton/mdpreview.html
index 40ecf4a..cabd9b5 100644
--- a/twisted/twisted_site/templates/cotton/mdpreview.html
+++ b/twisted/twisted_site/templates/cotton/mdpreview.html
@@ -1,5 +1,6 @@
 <div class="{{ class }}">
-    <div class="w-full previewdiv zoom-100 [&_h1,h2,h3,h4,h5,h6]:zoom-40 [&_ul,ol]:list-outside [&_ul,ol]:pl-5 [&_ul]:list-disc [&_ol]:list-decimal *:my-1">
+    <div
+        class="w-full previewdiv zoom-100 [&_h1,h2,h3,h4,h5,h6]:zoom-40 [&_ul,ol]:list-outside [&_ul,ol]:pl-5 [&_ul]:list-disc [&_ol]:list-decimal *:my-1">
     </div>
     <textarea class="textbox">{{ slot }}</textarea>
     <script>

From 55e5706a20b7b3dd878e712097a708fc4932667b Mon Sep 17 00:00:00 2001
From: CoolCream <mahasankarshant@gmail.com>
Date: Tue, 25 Aug 2026 18:15:32 +0530
Subject: [PATCH 083/118] fixed some sizing

---
 .../templates/client/dashboard.html           | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index c8cf4d8..cf8e2ea 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -7,21 +7,23 @@
             {% if user.profile.is_staff %}
             <div class="font-vintage w-fit cursor-pointer select-none">
                 <a href="{% url 'admin.dash' %}" target="_blank">
-                    <div class="size-20 bg-secondary border rounded-md flex items-center justify-center text-4xl">🛡️
+                    <div class="size-15 bg-secondary border rounded-md flex items-center justify-center text-3xl">🛡️
                     </div>
-                    <span class="text-white block text-center">Admin</span>
+                    <span class="text-white block text-center text-sm">Admin</span>
                 </a>
             </div>
             {% endif %}
             <div class="font-vintage w-fit cursor-pointer select-none" data-url="{% url 'fr.projects' %}"
                 onclick="newWindow('Projects', this.dataset.url)">
-                <div class="size-20 bg-secondary border rounded-md flex items-center justify-center text-4xl">📂</div>
-                <span class="block text-center">Projects</span>
+                <div class="size-15 bg-secondary border rounded-md flex items-center justify-center">
+                    <img src="{% static 'images/directory.png' %}" class="size-10" alt="">
+                </div>
+                <span class="block text-center text-sm">Projects</span>
             </div>
             <div class="font-vintage w-fit cursor-pointer select-none" data-url="{% url 'fr.pathways' %}"
                 onclick="newWindow('Pathways', this.dataset.url)">
-                <div class="size-20 bg-secondary border rounded-md flex items-center justify-center text-4xl">🛣️</div>
-                <span class="block text-center">Pathways</span>
+                <div class="size-15 bg-secondary border rounded-md flex items-center justify-center text-3xl">🛣️</div>
+                <span class="block text-center text-sm">Pathways</span>
             </div>
         </div>
 
@@ -37,7 +39,7 @@
                 </button>
 
                 <div id="start-menu" style="display: none;"
-                    class="z-[10000] fixed bottom-12 left-1 bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
+                    class="z-10000 fixed bottom-12 left-1 bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
                     <div class="flex h-80">
                         <div class="w-44 bg-twisted-600 p-3 pt-10 flex flex-col">
                             <div class="text-center mb-3">
@@ -51,11 +53,11 @@
                             <div
                                 class="font-vintage space-y-1 text-absolute-white text-sm border-t border-twisted-800 pt-2">
                                 {% if user.is_staff %}
-                                <a href="/admin/"
-                                    class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Admin
+                                <a href="/admin/" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Admin
                                     Panel</a>
                                 {% endif %}
-                                <a href="https://docs.twisted.hackclub.com/" class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Docs</a>
+                                <a href="https://docs.twisted.hackclub.com/"
+                                    class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Docs</a>
                             </div>
                         </div>
                     </div>
@@ -76,26 +78,26 @@
 
             <div class="flex items-center gap-2">
                 <button id="speaker-btn" type="button" onclick="toggleMusic()" aria-label="Toggle music"
-                class="flex h-8 items-center border border-border bg-secondary px-2 text-secondary-foreground transition hover:bg-muted">
-                <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <rect x="2" y="6" width="2" height="4" fill="#E0A7FF" />
-                    <rect x="4" y="5" width="2" height="6" fill="#E0A7FF" />
-                    <rect x="6" y="4" width="2" height="8" fill="#E0A7FF" />
-                    <rect x="8" y="2" width="2" height="12" fill="#E0A7FF" />
-
-                    <g id="sound-waves">
-                    <rect x="12" y="5" width="2" height="6" fill="#B96CFF" />
-                    <rect x="15" y="3" width="2" height="10" fill="#B96CFF" />
-                    </g>
-                </svg>
+                    class="flex h-8 items-center border border-border bg-secondary px-2 text-secondary-foreground transition hover:bg-muted">
+                    <svg id="speaker-icon" width="20" height="16" viewBox="0 0 20 16" shape-rendering="crispEdges"
+                        xmlns="http://www.w3.org/2000/svg">
+                        <rect x="2" y="6" width="2" height="4" fill="#E0A7FF" />
+                        <rect x="4" y="5" width="2" height="6" fill="#E0A7FF" />
+                        <rect x="6" y="4" width="2" height="8" fill="#E0A7FF" />
+                        <rect x="8" y="2" width="2" height="12" fill="#E0A7FF" />
+
+                        <g id="sound-waves">
+                            <rect x="12" y="5" width="2" height="6" fill="#B96CFF" />
+                            <rect x="15" y="3" width="2" height="10" fill="#B96CFF" />
+                        </g>
+                    </svg>
                 </button>
 
                 <canvas id="spectrum" width="100" height="24" class="hidden border border-border sm:block"></canvas>
 
                 <div id="taskbar-clock"
-                class="min-w-20 border border-border bg-background px-3 py-1.5 text-center font-mono text-xs text-foreground">
-                00:00 AM
+                    class="min-w-20 border border-border bg-background px-3 py-1.5 text-center font-mono text-xs text-foreground">
+                    00:00 AM
                 </div>
             </div>
 
@@ -107,15 +109,15 @@
     <div class="absolute window resize flex flex-col overflow-hidden bg-card border-2 border-dark-black shadow-lg"
         style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px;">
         <div
-        class="title-bar w-full h-8 shrink-0 flex items-center justify-between bg-primary text-primary-foreground px-2 select-none">
-        <div class="flex gap-2">
-            <button
-                class="reload-button h-5 w-5 flex items-center justify-center bg-card text-card-foreground border border-border hover:bg-secondary"
-                type="button" aria-label="Reload">
-                ↻
-            </button>
-            <label class="title-bar-text font-bold truncate">[ title card ]</label>
-        </div>
+            class="title-bar w-full h-8 shrink-0 flex items-center justify-between bg-primary text-primary-foreground px-2 select-none">
+            <div class="flex gap-2">
+                <button
+                    class="reload-button h-5 w-5 flex items-center justify-center bg-card text-card-foreground border border-border hover:bg-secondary"
+                    type="button" aria-label="Reload">
+                    ↻
+                </button>
+                <label class="title-bar-text font-bold truncate">[ title card ]</label>
+            </div>
 
             <div class="title-bar-controls flex items-center gap-1">
 

From 98088c6e15ef88ff9fca254d6300e8b93e0fa2f8 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 25 Aug 2026 18:34:23 +0530
Subject: [PATCH 084/118] Tweak projects/list.html a bit

---
 twisted/twisted_site/templates/client/projects/list.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/twisted/twisted_site/templates/client/projects/list.html b/twisted/twisted_site/templates/client/projects/list.html
index 232bbf9..41d8003 100644
--- a/twisted/twisted_site/templates/client/projects/list.html
+++ b/twisted/twisted_site/templates/client/projects/list.html
@@ -16,7 +16,7 @@
     <div class="sunken-panel min-h-0 flex-1 overflow-y-auto bg-background p-3">
 
         {% if projects %}
-        <div class="flex flex-wrap content-start gap-4">
+        <div class="flex flex-wrap content-start gap-2">
 
             {% for project in projects %}
             <input type="hidden" value="{{ project.project_name }}" id="project-{{ project.id }}">
@@ -24,12 +24,12 @@
             <div class="group flex w-24 cursor-pointer flex-col items-center p-2 select-none hover:bg-secondary"
                 data-project-id="{{ project.id }}" data-project-url="{% url 'fr.projects.detail' project.id %}">
                 <div
-                    class="flex h-16 w-16 items-center justify-center border border-transparent p-1 group-hover:border-border group-hover:bg-card">
+                    class="flex h-16 w-16 items-center justify-center border border-transparent p-1">
                     <img src="{% static 'images/directory.png' %}" alt="" class="h-full w-full object-contain">
                 </div>
 
                 <div
-                    class="mt-1 w-full wrap-break-word text-center text-sm leading-tight text-foreground group-hover:text-primary-foreground">
+                    class="mt-1 w-full wrap-break-word text-center text-sm leading-tight text-foreground group-hover:text-secondary-foreground">
                     {{ project.project_name }}
                 </div>
             </div>

From c0e23ce89134cc668098f26fab79fb7e14427b12 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 25 Aug 2026 19:20:43 +0530
Subject: [PATCH 085/118] Tweak some shit

---
 .../templates/client/dashboard.html           |  4 +--
 .../templates/client/projects/create.html     | 14 ++++-----
 .../templates/client/projects/detail.html     | 23 ++++++++++----
 .../projects/journal/new_hackatime.html       |  4 +--
 .../projects/journal/new_journal.base.html    | 31 ++++++-------------
 .../projects/journal/new_untracked.html       | 23 ++++++++------
 .../twisted_site/templates/cotton/mdedit.html |  4 +--
 .../templates/cotton/mdpreview.html           |  6 ++--
 twisted/twisted_site/views/client/journal.py  |  2 +-
 twisted/twisted_site/views/client/projects.py |  6 +---
 10 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index cf8e2ea..6d03565 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -156,8 +156,8 @@
             const data = event.data;
             if (data.type != "internal") return;
             if (data.action == "open") {
-                let w = 400,
-                    h = 400;
+                let w = 600,
+                    h = 600;
                 if (data.width) w = data.width;
                 if (data.height) h = data.height;
                 newWindow(data.title, data.src, w, h);
diff --git a/twisted/twisted_site/templates/client/projects/create.html b/twisted/twisted_site/templates/client/projects/create.html
index dc15c90..94f5d1b 100644
--- a/twisted/twisted_site/templates/client/projects/create.html
+++ b/twisted/twisted_site/templates/client/projects/create.html
@@ -31,7 +31,7 @@
     <form method="post" class="flex min-h-0 flex-1 flex-col">
         {% csrf_token %}
 
-        <div class="shrink-0 border-b border-border bg-card px-4 py-3">
+        <div class="shrink-0 border-b border-border bg-card px-4 py-2">
             <div class="text-lg font-bold">
                 Create a new project
             </div>
@@ -40,9 +40,9 @@
             </div>
         </div>
 
-        <div class="min-h-0 flex-1 overflow-y-auto bg-background p-4">
+        <div class="min-h-0 flex-1 overflow-y-auto bg-background p-3 pt-1">
 
-            <div class="space-y-4">
+            <div class="space-y-2 flex flex-col h-full">
 
                 <div class="space-y-1">
                     <label for="name" class="block text-sm font-bold">
@@ -53,16 +53,16 @@
                         class="w-full border border-border bg-card px-3 py-2 text-sm text-foreground outline-none placeholder:text-muted-foreground focus:border-primary focus:ring-2 focus:ring-primary/30">
                 </div>
 
-                <div class="space-y-1">
+                <div class="space-y-1 flex-1">
                     <label for="description" class="block text-sm font-bold">
                         Project description
                     </label>
 
-                    <textarea id="description" name="description" rows="5" required placeholder="What are you building?"
-                        class="w-full resize-y border border-border bg-card px-3 py-2 text-sm text-foreground outline-none placeholder:text-muted-foreground focus:border-primary focus:ring-2 focus:ring-primary/30"></textarea>
+                    <textarea id="description" name="description" rows="1" required placeholder="What are you building?"
+                        class="w-full h-full resize-none border border-border bg-card px-3 py-2 text-sm text-foreground outline-none placeholder:text-muted-foreground focus:border-primary focus:ring-2 focus:ring-primary/30"></textarea>
                 </div>
 
-                <div class="space-y-1">
+                <div class="space-y-1 mt-6">
                     <label for="type" class="block text-sm font-bold">
                         Project type
                     </label>
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index d92431d..83be5fc 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -96,7 +96,7 @@ <h1 class="wrap-break-word text-xl font-bold">
         </div>
         {% endif %}
 
-        {% if not project.hackatime_project_name %}
+        {% if not project.hackatime_project_name and project.project_type != 'hardware' %}
 
         <div class="mb-3 border border-warning bg-warning/10 p-3">
             <div class="font-bold text-warning">
@@ -129,7 +129,23 @@ <h1 class="wrap-break-word text-xl font-bold">
                 Open project settings
             </a>
         </div>
+        
+        {% elif project.time_logged < 60 %}
+        <div class="mb-3 border border-warning bg-warning/10 p-3">
+            <div class="font-bold text-warning">
+                log more time!
+            </div>
 
+            <div class="mt-1 text-sm text-muted-foreground">
+                Log atleast 60 minutes before shipping your project.
+            </div>
+
+            <button
+                onclick="createWindow('journal: ' + document.getElementById('project-title').value, '{% url 'fr.projects.journals.new.hackatime' project.pk %}')"
+                class="mt-4 border border-border bg-primary px-4 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80">
+                + New journal
+            </button>
+        </div>
         {% endif %}
 
         <div class="border border-border bg-card">
@@ -223,11 +239,6 @@ <h1 class="wrap-break-word text-xl font-bold">
 
                 <div class="px-4 py-10 text-center">
 
-                    <div
-                        class="mx-auto mb-3 flex h-14 w-14 items-center justify-center border border-border bg-secondary text-xs">
-                        replace with image pf
-                    </div>
-
                     <div class="font-bold">
                         No journal entries
                     </div>
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
index 9b2331b..357aded 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html
@@ -1,8 +1,8 @@
 {% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %}
 {% block links %}
 {% if project.project_type == 'hardware' %}
-<button disabled
-    class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">Hackatime</button>
+<button
+    class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border bg-primary/80">Hackatime</button>
 <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
     <button
         class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">untracked</button>
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
index cc6394a..96542e8 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_journal.base.html
@@ -18,7 +18,7 @@
 }
 </script>
 
-<div class="bg-surface text-foreground flex flex-col w-full h-full font-vintage overflow-hidden">
+<div class="bg-surface text-foreground flex flex-col w-full h-full font-vintage">
 
     {% if not success %}
 
@@ -31,13 +31,10 @@
         </div>
     </div>
 
-    <div class="flex-1 min-h-0 overflow-y-auto p-3">
+    <div class="flex flex-col flex-1 min-h-0 overflow-y-auto p-3">
 
+        {% if project.project_type == 'hardware' %}
         <div class="mb-3">
-            <div class="text-sm font-bold mb-1">
-                Journal
-            </div>
-
             <div class="flex flex-wrap gap-2">
                 {% block links %}
 
@@ -48,41 +45,33 @@
                     </button>
                 </a>
 
-                {% if project.project_type == 'hardware' %}
                 <a href="{% url 'fr.projects.journals.new.untracked' project.id %}">
                     <button type="button"
                         class="px-3 py-1.5 bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
                         Untracked
                     </button>
                 </a>
-                {% endif %}
-
+                
                 {% endblock links %}
             </div>
         </div>
+        {% endif %}
 
         {% if info %}
         <div class="mb-3 border border-warning bg-warning/30 px-3 py-2">
-            <div class="text-xs font-bold text-warning mb-1">
-                huh?
-            </div>
             <div class="text-sm ">
                 {{ info|safe }}
             </div>
         </div>
         {% endif %}
 
+        {% block journal_log_message %}
         <div class="mb-3 border border-border bg-background px-3 py-2">
-            <span class="font-bold">
-                Time:
-            </span>
-
-            {% block journal_log_message %}
             This journal will log {{ log_minutes|minutes_to_hours_minutes }}.
-            {% endblock journal_log_message %}
         </div>
-
-        <form method="post" class="h-full min-h-0 flex flex-col">
+        {% endblock journal_log_message %}
+        
+        <form method="post" class="flex-1 min-h-0 flex flex-col">
             {% csrf_token %}
 
             {% block form %}
@@ -90,7 +79,7 @@
             {% block preform %}
             {% endblock preform %}
 
-            <div class="flex-1 max-h-70 border border-border bg-card">
+            <div class="flex-1 border border-border bg-card">
                 <c-mdedit class="h-full overflow-auto "></c-mdedit>
             </div>
 
diff --git a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
index 656dace..d71e829 100644
--- a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
+++ b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html
@@ -1,21 +1,26 @@
-{% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %} {% block links %}
+{% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %}
+{% block links %}
 <a href="{% url 'fr.projects.journals.new.hackatime' project.id %}">
-    <button>Hackatime</button>
+    <button class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">
+        Hackatime
+    </button>
 </a>
-{% if project.project_type == 'hardware' %}
-<button disabled>untracked</button>
-{% endif %} {% endblock links %} {% block journal_log_message %} {% endblock journal_log_message %} {% block preform %}
-<div>
-    This journal will log
+<button class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border bg-primary/80">Untracked</button>
+{% endblock links %}
+{% block journal_log_message %}
+{% endblock journal_log_message %}
+{% block preform %}
+<div class="mb-3 border border-border bg-background px-3 py-2">
+    Log
     <input
         value="1"
         name="time_logged"
         type="number"
         min="0"
         max="{{ max_mins }}"
-        class="no-spinner! text-right"
+        class="no-spinner! text-right border border-border p-1"
         oninput="if(Number(this.value) > {{ max_mins }}) this.value = {{ max_mins }};"
     />
-    minutes.
+    minutes
 </div>
 {% endblock preform %}
diff --git a/twisted/twisted_site/templates/cotton/mdedit.html b/twisted/twisted_site/templates/cotton/mdedit.html
index b21544b..03f3597 100644
--- a/twisted/twisted_site/templates/cotton/mdedit.html
+++ b/twisted/twisted_site/templates/cotton/mdedit.html
@@ -2,12 +2,12 @@
 
     <div class="shrink-0 flex items-center gap-1 bg-card border-b border-border p-1">
         <button id="editbutton" type="button" onclick="switchedit()" disabled
-            class="px-3 py-1 bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
+            class="px-3 py-1 disabled:bg-primary disabled:text-primary-foreground bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
             Edit
         </button>
 
         <button id="previewbutton" type="button" onclick="switchpreview()"
-            class="px-3 py-1 bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
+            class="px-3 py-1 disabled:bg-primary disabled:text-primary-foreground bg-secondary text-secondary-foreground border border-border hover:bg-primary hover:text-primary-foreground">
             Preview
         </button>
     </div>
diff --git a/twisted/twisted_site/templates/cotton/mdpreview.html b/twisted/twisted_site/templates/cotton/mdpreview.html
index cabd9b5..6697ce8 100644
--- a/twisted/twisted_site/templates/cotton/mdpreview.html
+++ b/twisted/twisted_site/templates/cotton/mdpreview.html
@@ -1,12 +1,12 @@
 <div class="{{ class }}">
     <div
-        class="w-full previewdiv zoom-100 [&_h1,h2,h3,h4,h5,h6]:zoom-40 [&_ul,ol]:list-outside [&_ul,ol]:pl-5 [&_ul]:list-disc [&_ol]:list-decimal *:my-1">
+        class="w-full previewdiv max-w-full wrap-break-word text-foreground [&_h1]:text-2xl [&_h1]:font-bold [&_h2]:text-xl [&_h2]:font-bold [&_h3]:text-lg [&_h3]:font-bold [&_ul]:list-disc [&_ul]:pl-6 [&_ol]:list-decimal [&_ol]:pl-6 [&_p]:my-2 [&_a]:underline [&_a]:text-primary [&_img]:max-w-full">
     </div>
-    <textarea class="textbox">{{ slot }}</textarea>
+    <textarea class="textbox hidden">{{ slot }}</textarea>
     <script>
         function rendermarkdown() {
             elem = document.currentScript.parentElement.querySelector('.textbox')
-            content = elem.value;
+            content = elem.value.trim();
             elem.classList.add('hidden')
             parsed = DOMPurify.sanitize(marked.parse(content));
             elem.parentElement.querySelector('.previewdiv');
diff --git a/twisted/twisted_site/views/client/journal.py b/twisted/twisted_site/views/client/journal.py
index a76ba24..b034287 100644
--- a/twisted/twisted_site/views/client/journal.py
+++ b/twisted/twisted_site/views/client/journal.py
@@ -85,7 +85,7 @@ def post(self, request, id):
         return self.get(request, id, context={"success": True})
 
 
-UNTRACKED_MAX_LOGGABLE_MINUTES = 180
+UNTRACKED_MAX_LOGGABLE_MINUTES = 60
 
 class NewProjectUntrackedJournal(View):
     def get(self, request, id, info=None, context={}):
diff --git a/twisted/twisted_site/views/client/projects.py b/twisted/twisted_site/views/client/projects.py
index 9959cdd..9495b4d 100644
--- a/twisted/twisted_site/views/client/projects.py
+++ b/twisted/twisted_site/views/client/projects.py
@@ -50,8 +50,4 @@ def post(self, request):
             project_type=project_type,
         )
 
-        return render(
-            request,
-            "client/projects/create.html",
-            {"complete": True},
-        )
+        return redirect('fr.projects')

From 57176f359633acbc7077c8958d777a3bf02b34d7 Mon Sep 17 00:00:00 2001
From: CoolCream <mahasankarshant@gmail.com>
Date: Tue, 25 Aug 2026 19:34:20 +0530
Subject: [PATCH 086/118] scroll bar

---
 twisted/docker-compose.yml                    |  4 +++
 twisted/mysite/settings.py                    |  2 +-
 .../static_src/src/styles.css                 | 33 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/twisted/docker-compose.yml b/twisted/docker-compose.yml
index 89a9b89..120300c 100644
--- a/twisted/docker-compose.yml
+++ b/twisted/docker-compose.yml
@@ -11,6 +11,10 @@ services:
   db:
     image: postgres:16
     restart: unless-stopped
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 5s
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index a8eadd3..6f93297 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -165,7 +165,7 @@
 STATIC_URL = 'static/'
 STATIC_ROOT = BASE_DIR / 'static'
 CSRF_COOKIE_HTTPONLY = False
-NPM_BIN_PATH = os.environ.get("NPM_BIN_PATH", "npm")
+NPM_BIN_PATH = r"C:\Program Files\nodejs\npm.cmd"
 
 # Jazzmin Settings
 JAZZMIN_SETTINGS = {
diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index 5ea20be..3593588 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -147,4 +147,37 @@ progress {
 progress::-webkit-progress-bar {
   background-color: var(--color-primary);
   height: 100%;
+}
+
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+::-webkit-scrollbar-track {
+  background: #1E072F;
+}
+
+::-webkit-scrollbar-thumb {
+  background: var(--color-primary);
+  border: 2px solid #1E072F;
+  border-radius: 10px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: var(--color-accent);
+}
+
+::-webkit-scrollbar-button {
+  background: var(--color-primary);
+  border: 2px solid #1E072F;
+  border-radius: 10px;
+}
+
+::-webkit-scrollbar-button:hover {
+  background: var(--color-accent);
+}
+
+::-webkit-scrollbar-corner {
+  background: #1E072F;
 }
\ No newline at end of file

From 91cb16f382847a8421cf51218c48b7774eb6aed8 Mon Sep 17 00:00:00 2001
From: Kavyansh Khaitan <73186427+KavyanshKhaitan2@users.noreply.github.com>
Date: Tue, 25 Aug 2026 19:46:40 +0530
Subject: [PATCH 087/118] Update NPM_BIN_PATH to use environment variable

---
 twisted/mysite/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 7c259f8..75ae03c 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -164,7 +164,7 @@
 STATIC_URL = 'static/'
 STATIC_ROOT = BASE_DIR / 'static'
 CSRF_COOKIE_HTTPONLY = False
-NPM_BIN_PATH = r"C:\Program Files\nodejs\npm.cmd"
+NPM_BIN_PATH = os.environ.get("NPM_BIN_PATH", "npm")
 
 # Django Messages Framework
 MESSAGE_STORAGE = "django.contrib.messages.storage.cookie.CookieStorage"

From fa2e1c90d3ce38e4a7885881a247282a25d7c3db Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 25 Aug 2026 20:56:10 +0530
Subject: [PATCH 088/118] misc. changes

---
 twisted/common/templates/base.html            |  2 +-
 .../static_src/src/styles.css                 | 80 ++++++++++++++++++-
 .../templates/admin/pathways/detail.html      |  7 ++
 .../templates/client/dashboard.html           | 22 ++---
 .../twisted_site/templates/client/osbase.html |  2 +-
 .../templates/cotton/pathway_card.html        | 80 ++++++++++---------
 .../templates/cotton/sidebar/index.html       | 10 ++-
 twisted/twisted_site/views/admin/pathways.py  |  1 +
 8 files changed, 148 insertions(+), 56 deletions(-)

diff --git a/twisted/common/templates/base.html b/twisted/common/templates/base.html
index 5f4423b..aeea556 100644
--- a/twisted/common/templates/base.html
+++ b/twisted/common/templates/base.html
@@ -6,7 +6,7 @@
     <link rel="icon" href="{% static 'favicon.png' %}" />
     <title>Twisted</title>
 </head>
-<body class="font-vintage">
+<body class="font-vintage os">
     {% block body %}
     meow :3
     {% endblock body %}
diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index 913fa05..58d876f 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -28,6 +28,42 @@
   font-display: swap;
 }
 
+:root {
+    /* Accent: primary buttons, links, focus ring, active states */
+    --color-accent: var(--color-red-500);
+    --color-accent-content: var(--color-red-600);
+    --color-accent-foreground: #ffffff;
+
+    /* Corner radius, by role */
+    --radius-control: 0.375rem;
+    --radius-box: 0.5rem;
+
+    /* Form controls */
+    --focus-ring-width: 3px;
+    --shadow-input: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+
+    /* Structural surfaces */
+    --shadow-box: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+}
+
+.dark {
+  /* Dark mode: lighter accent so it stays vivid on dark surfaces */
+  --color-accent: var(--color-red-400);
+  --color-accent-content: var(--color-red-300);
+  --color-accent-foreground: var(--color-red-950);
+  --color-primary: var(--color-red-600);
+  --color-primary-foreground: var(--color-accent-foreground);
+}
+
+.os {
+  --color-accent: #E0A7FF;
+  --color-accent-foreground: #24102F;
+
+  --color-primary: #B96CFF;
+  --color-primary-foreground: #190B24;
+
+}
+
 @theme {
   --font-vintage: "Pirkkala", sans-serif;
   --font-latin: "Figtree", sans-serif;
@@ -183,5 +219,47 @@ progress::-webkit-progress-bar {
 }
 
 @utility no-scrollbar {
-  @apply [scrollbar-none] [&::-webkit-scrollbar]:hidden;
+  @apply [scrollbar-width:none] [&::-webkit-scrollbar]:hidden;
 }
+
+
+
+.resize-handle {
+  position: absolute;
+  z-index: 10;
+}
+
+.resize-n,
+.resize-s {
+  left: 8px;
+  right: 8px;
+  height: 6px;
+  cursor: ns-resize;
+}
+
+.resize-n { top: 0; }
+.resize-s { bottom: 0; }
+
+.resize-e,
+.resize-w {
+  top: 8px;
+  bottom: 8px;
+  width: 6px;
+  cursor: ew-resize;
+}
+
+.resize-e { right: 0; }
+.resize-w { left: 0; }
+
+.resize-ne,
+.resize-nw,
+.resize-se,
+.resize-sw {
+  width: 8px;
+  height: 8px;
+}
+
+.resize-ne { top: 0; right: 0; cursor: ne-resize; }
+.resize-nw { top: 0; left: 0; cursor: nw-resize; }
+.resize-se { bottom: 0; right: 0; cursor: se-resize; }
+.resize-sw { bottom: 0; left: 0; cursor: sw-resize; }
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/pathways/detail.html b/twisted/twisted_site/templates/admin/pathways/detail.html
index 4d79ca2..abdae62 100644
--- a/twisted/twisted_site/templates/admin/pathways/detail.html
+++ b/twisted/twisted_site/templates/admin/pathways/detail.html
@@ -1,3 +1,10 @@
 <c-base>
     <div>Work in progress!</div>
+    <div>
+        Pathway name:
+        {{ pathway.name }}
+    </div>
+    <div>
+        TODO: Work on this!
+    </div>
 </c-base>
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 4786826..0bad7de 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -6,7 +6,7 @@
         <div class="flex flex-col flex-wrap content-start gap-3 w-full h-full overflow-y-hidden">
             {% if user.profile.is_staff %}
             <div class="font-vintage w-fit cursor-pointer select-none">
-                <a href="{% url 'admin.dash' %}" target="_blank">
+                <a href="{% url 'admin.dash' %}">
                     <div class="size-15 bg-secondary border rounded-md flex items-center justify-center text-3xl">🛡️
                     </div>
                     <span class="text-white block text-center text-sm">Admin</span>
@@ -138,16 +138,16 @@
         <div class="window-body min-h-0 flex-1 overflow-hidden">
             <iframe class="w-full h-full block src-frame select-none border-0" src="about:blank"
                 frameborder="0"></iframe>
+            </div>
+            <div class="resize-handle resize-n"></div>
+            <div class="resize-handle resize-s"></div>
+            <div class="resize-handle resize-e"></div>
+            <div class="resize-handle resize-w"></div>
+            <div class="resize-handle resize-ne"></div>
+            <div class="resize-handle resize-nw"></div>
+            <div class="resize-handle resize-se"></div>
+            <div class="resize-handle resize-sw"></div>
         </div>
-        <div class="resize-handle resize-n"></div>
-        <div class="resize-handle resize-s"></div>
-        <div class="resize-handle resize-e"></div>
-        <div class="resize-handle resize-w"></div>
-        <div class="resize-handle resize-ne"></div>
-        <div class="resize-handle resize-nw"></div>
-        <div class="resize-handle resize-se"></div>
-        <div class="resize-handle resize-sw"></div>
-    </div>
 </template>
 
 <audio id="bg-music" loop>
@@ -389,7 +389,7 @@
                         newHeight = Math.max(minH, startHeight - dy);
                         newTop = startTop + (startHeight - newHeight);
                     }
-
+                    
                     mywindow.style.left = newLeft + "px";
                     mywindow.style.top = newTop + "px";
                     mywindow.style.width = newWidth + "px";
diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html
index b4ebfe4..efd0e6d 100644
--- a/twisted/twisted_site/templates/client/osbase.html
+++ b/twisted/twisted_site/templates/client/osbase.html
@@ -1,6 +1,6 @@
 {% load static tailwind_tags static %}
 <!DOCTYPE html>
-<html style="background: #1E072F;" class="w-full h-full">
+<html style="background: #1E072F;" class="os w-full h-full">
 
 <head>
     {% tailwind_css %}
diff --git a/twisted/twisted_site/templates/cotton/pathway_card.html b/twisted/twisted_site/templates/cotton/pathway_card.html
index 9eaa97e..fb1a52c 100644
--- a/twisted/twisted_site/templates/cotton/pathway_card.html
+++ b/twisted/twisted_site/templates/cotton/pathway_card.html
@@ -1,42 +1,44 @@
 {% load humanize maths mathfilters %}
-<c-ui.card class="bg-ink-900 hover:bg-ink-800">
-    <h3 class="text-lg font-bold">{{ pathway.name }}</h3>
-    <div class="flex flex-col gap-2">
-        <div>
-            <p class="text-ink-400">Start</p>
-            <p title="local time">{{ pathway.start }}</p>
-            {% if pathway.didnt_start %}
-            <p>({{ pathway.start|naturaltime }})</p>
+<a href="{% url 'admin.pathways.detail' pathway.id %}">
+    <c-ui.card class="bg-ink-900 hover:bg-ink-800">
+        <h3 class="text-lg font-bold">{{ pathway.name }}</h3>
+        <div class="flex flex-col gap-2">
+            <div>
+                <p class="text-ink-400">Start</p>
+                <p title="local time">{{ pathway.start }}</p>
+                {% if pathway.didnt_start %}
+                <p>({{ pathway.start|naturaltime }})</p>
+                {% endif %}
+            </div>
+            <div>
+                <p class="text-ink-400">End</p>
+                <p title="local time">{{ pathway.end }}</p>
+                {% if pathway.in_progress %}
+                <p>({{ pathway.end|naturaltime }})</p>
+                {% endif %}
+            </div>
+            {% if not pathway.didnt_start %}
+            <div>
+                <p class="text-ink-400">Qualified</p>
+                <p title="local time">{{ pathway.qualified_participants|length }} participant{{ pathway.qualified_participants|pluralize }}</p>
+                {% if pathway.qualified_participants %}
+                <p class="mt-2">
+                    <c-ui.avatar.group>
+                    {% for user in pathway.qualified_participants %}
+                        {% if forloop.counter < 8 %}
+                            <c-ui.tooltip content="{{ user.profile.slack_username }}">
+                                <c-ui.avatar class="ring-2 ring-ink-900" title="{{ user.profile.slack_username }}" src="{{ user.profile.slack_pfp_url }}" alt="Jane Doe" />
+                            </c-ui.tooltip>
+                        {% endif %}
+                        {% if forloop.counter == 8 %}
+                            <c-ui.avatar initials="+{{ pathway.qualified_participants|length|sub:7 }}" />
+                        {% endif %}
+                    {% endfor %}
+                    </c-ui.avatar.group>
+                </p>
+                {% endif %}
+            </div>
             {% endif %}
         </div>
-        <div>
-            <p class="text-ink-400">End</p>
-            <p title="local time">{{ pathway.end }}</p>
-            {% if pathway.in_progress %}
-            <p>({{ pathway.end|naturaltime }})</p>
-            {% endif %}
-        </div>
-        {% if not pathway.didnt_start %}
-        <div>
-            <p class="text-ink-400">Qualified</p>
-            <p title="local time">{{ pathway.qualified_participants|length }} participant{{ pathway.qualified_participants|pluralize }}</p>
-            {% if pathway.qualified_participants %}
-            <p class="mt-2">
-                <c-ui.avatar.group>
-                {% for user in pathway.qualified_participants %}
-                    {% if forloop.counter < 8 %}
-                        <c-ui.tooltip content="{{ user.profile.slack_username }}">
-                            <c-ui.avatar class="ring-2 ring-ink-900" title="{{ user.profile.slack_username }}" src="{{ user.profile.slack_pfp_url }}" alt="Jane Doe" />
-                        </c-ui.tooltip>
-                    {% endif %}
-                    {% if forloop.counter == 8 %}
-                        <c-ui.avatar initials="+{{ pathway.qualified_participants|length|sub:7 }}" />
-                    {% endif %}
-                {% endfor %}
-                </c-ui.avatar.group>
-            </p>
-            {% endif %}
-        </div>
-        {% endif %}
-    </div>
-</c-ui.card>
\ No newline at end of file
+    </c-ui.card>
+</a>
diff --git a/twisted/twisted_site/templates/cotton/sidebar/index.html b/twisted/twisted_site/templates/cotton/sidebar/index.html
index ed34e86..b08b580 100644
--- a/twisted/twisted_site/templates/cotton/sidebar/index.html
+++ b/twisted/twisted_site/templates/cotton/sidebar/index.html
@@ -12,9 +12,12 @@
                 </label>
             </div>
         </c-slot>
-        <c-ui.button size="xs" variant="ghost" @click="drawerOpen = true">
-            <img src="https://icons.hackclub.com/api/icons/white/align-left" class="size-10" />
-        </c-ui.button>
+        <div class="flex">
+            <div class="flex-1"></div>
+            <c-ui.button size="xs" variant="ghost" @click="drawerOpen = true">
+                <img src="https://icons.hackclub.com/api/icons/white/align-left" class="size-10" />
+            </c-ui.button>
+        </div>
         <c-slot name="content">{{ slot }}</c-slot>
         <c-slot name="footer">
             <div class="flex p-2">
@@ -37,6 +40,7 @@
         <div class="flex-1 my-2">{{ slot }}</div>
         <div>
             <div class="mx-auto w-full border-gray-700 border-t"></div>
+            <c-sidebar.item icon="back" href="{% url 'dashboard' %}">Back to Twisted</c-sidebar.item>
             <div class="flex p-2">
                 <img class="size-8 rounded-full" src="{{ request.user.profile.slack_pfp_url }}" alt="" />
                 <label class="my-auto ml-2">@{{ request.user.profile.slack_username }}</label>
diff --git a/twisted/twisted_site/views/admin/pathways.py b/twisted/twisted_site/views/admin/pathways.py
index 9b56d4c..0df12f7 100644
--- a/twisted/twisted_site/views/admin/pathways.py
+++ b/twisted/twisted_site/views/admin/pathways.py
@@ -108,4 +108,5 @@ def post(self, request):
 class PathwayDetailView(AdminView):
     def get(self, request, id):
         context = self.get_context_data(page="pathways", subpage="detail")
+        context['pathway'] = Pathway.objects.get(id=id)
         return render(request, "admin/pathways/detail.html", context=context)

From 2d17197a48598a9ce7c00cf45b6486500a36c99a Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Wed, 26 Aug 2026 06:48:49 +0530
Subject: [PATCH 089/118] Remove the thumb buttons on the scrollbar

---
 twisted/tailwindcsstheme/static_src/src/styles.css | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index 58d876f..f3299a6 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -204,16 +204,6 @@ progress::-webkit-progress-bar {
   background: var(--color-accent);
 }
 
-::-webkit-scrollbar-button {
-  background: var(--color-primary);
-  border: 2px solid #1E072F;
-  border-radius: 10px;
-}
-
-::-webkit-scrollbar-button:hover {
-  background: var(--color-accent);
-}
-
 ::-webkit-scrollbar-corner {
   background: #1E072F;
 }

From f6c283799541c4ee6b05c4bc701b9149ace60cdc Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Wed, 26 Aug 2026 06:52:28 +0530
Subject: [PATCH 090/118] Try fixing deployments

---
 twisted/tailwindcsstheme/static_src/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twisted/tailwindcsstheme/static_src/package.json b/twisted/tailwindcsstheme/static_src/package.json
index 2893e2e..8af9a09 100644
--- a/twisted/tailwindcsstheme/static_src/package.json
+++ b/twisted/tailwindcsstheme/static_src/package.json
@@ -6,7 +6,7 @@
     "start": "npm run dev",
     "build": "npm run build:clean && npm run build:tailwind",
     "build:clean": "rimraf ../static/css/dist",
-    "build:tailwind": "cross-env NODE_ENV=production postcss ./src/styles.css -o ../static/css/dist/styles.css --minify && postcss ./src/win98.css -o ../static/css/dist/win98.css --minify",
+    "build:tailwind": "cross-env NODE_ENV=production \"postcss ./src/styles.css -o ../static/css/dist/styles.css --minify && postcss ./src/win98.css -o ../static/css/dist/win98.css --minify\"",
     "dev": "concurrently \"cross-env NODE_ENV=development postcss ./src/styles.css -o ../static/css/dist/styles.css --watch\" \"cross-env NODE_ENV=development postcss ./src/win98.css -o ../static/css/dist/win98.css --watch\""
   },
   "keywords": [],

From e04a40ebf5a1ea81991fb09c2080f3aba70a161a Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Wed, 26 Aug 2026 07:01:16 +0530
Subject: [PATCH 091/118] Remove unnecessary 98.css builds

---
 twisted/tailwindcsstheme/static_src/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/twisted/tailwindcsstheme/static_src/package.json b/twisted/tailwindcsstheme/static_src/package.json
index 8af9a09..550a80c 100644
--- a/twisted/tailwindcsstheme/static_src/package.json
+++ b/twisted/tailwindcsstheme/static_src/package.json
@@ -6,8 +6,8 @@
     "start": "npm run dev",
     "build": "npm run build:clean && npm run build:tailwind",
     "build:clean": "rimraf ../static/css/dist",
-    "build:tailwind": "cross-env NODE_ENV=production \"postcss ./src/styles.css -o ../static/css/dist/styles.css --minify && postcss ./src/win98.css -o ../static/css/dist/win98.css --minify\"",
-    "dev": "concurrently \"cross-env NODE_ENV=development postcss ./src/styles.css -o ../static/css/dist/styles.css --watch\" \"cross-env NODE_ENV=development postcss ./src/win98.css -o ../static/css/dist/win98.css --watch\""
+    "build:tailwind": "cross-env NODE_ENV=production postcss ./src/styles.css -o ../static/css/dist/styles.css --minify",
+    "dev": "cross-env NODE_ENV=development postcss ./src/styles.css -o ../static/css/dist/styles.css --watch"
   },
   "keywords": [],
   "author": "",

From 3d51150a307397311d722eebd6a177902e72f3e0 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Wed, 26 Aug 2026 22:19:01 +0530
Subject: [PATCH 092/118] Add a UI mockup for project status

---
 .../templates/client/dashboard.html           |   2 +-
 .../templates/client/projects/detail.html     | 251 +++++++++---------
 twisted/twisted_site/views/client/project.py  |  12 +-
 3 files changed, 135 insertions(+), 130 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 0bad7de..f517d48 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -106,7 +106,7 @@
 </main>
 
 <template id="window-template">
-    <div class="absolute window resize flex flex-col overflow-hidden bg-card border-2 border-dark-black shadow-lg"
+    <div class="absolute resize window flex flex-col overflow-hidden bg-card border-2 border-dark-black shadow-lg"
         style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px;">
         <div
             class="title-bar w-full h-8 shrink-0 flex items-center justify-between bg-primary text-primary-foreground px-2 select-none">
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 83be5fc..7b2ffe1 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -1,29 +1,19 @@
-{% extends "client/osbase.html" %}
-{% load static time_filters humanize %}
-
-{% block body %}
+{% extends "client/osbase.html" %} {% load static time_filters humanize %} {% block body %}
 <div class="flex h-full w-full flex-col bg-surface font-vintage text-foreground">
-
-    <input type="hidden" value="{{ project.project_name }}" id="project-title">
+    <input type="hidden" value="{{ project.project_name }}" id="project-title" />
 
     <div class="shrink-0 border-b border-border bg-card p-3">
-
         <div class="flex flex-wrap items-start gap-3">
-
             <div class="min-w-0 flex-1">
                 <div class="flex flex-wrap items-center gap-2">
-                    <h1 class="wrap-break-word text-xl font-bold">
-                        {{ project.project_name }}
-                    </h1>
+                    <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
 
                     <span class="border border-border bg-secondary px-2 py-0.5 text-xs text-secondary-foreground">
                         {{ project.get_project_type_display }}
                     </span>
 
                     {% if project.is_shipped %}
-                    <span class="border border-success bg-success/20 px-2 py-0.5 text-xs text-success">
-                        SHIPPED
-                    </span>
+                    <span class="border border-success bg-success/20 px-2 py-0.5 text-xs text-success"> SHIPPED </span>
                     {% endif %}
                 </div>
 
@@ -33,39 +23,31 @@ <h1 class="wrap-break-word text-xl font-bold">
             </div>
 
             <div class="flex shrink-0 flex-wrap gap-1">
-                {% if project.repo_url and project.time_logged > 60 %}
-                {% if not project.is_shipped %}
+                {% if project.repo_url and project.time_logged > 60 %} {% if not project.is_shipped %}
                 <a href="{% url 'fr.projects.ship' project.id %}">
                     <button
-                        class="border border-primary bg-primary px-3 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80 active:translate-y-px">
+                        class="border border-primary bg-primary px-3 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80 active:translate-y-px"
+                    >
                         ship project
                     </button>
                 </a>
-                {% endif %}
-                {% endif %}
-
-                {% if not project.is_shipped %}
+                {% endif %} {% endif %} {% if not project.is_shipped %}
                 <a href="{% url 'fr.projects.settings' project.id %}">
                     <button
-                        class="border border-border bg-secondary px-3 py-1.5 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px">
+                        class="border border-border bg-secondary px-3 py-1.5 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px"
+                    >
                         Settings
                     </button>
                 </a>
                 {% endif %}
             </div>
-
         </div>
-
     </div>
 
     <div class="min-h-0 flex-1 overflow-y-auto bg-background p-3">
-
         <div class="mb-3 grid grid-cols-2 gap-2 sm:grid-cols-2">
-
             <div class="border border-border bg-card p-3">
-                <div class="text-xs uppercase text-muted-foreground">
-                    Time logged
-                </div>
+                <div class="text-xs uppercase text-muted-foreground">Time logged</div>
 
                 <div class="mt-1 text-2xl font-bold text-primary">
                     {{ project.time_logged|minutes_to_hours_minutes }}
@@ -73,42 +55,84 @@ <h1 class="wrap-break-word text-xl font-bold">
             </div>
 
             <div class="border border-border bg-card p-3">
-                <div class="text-xs uppercase text-muted-foreground">
-                    Journals
-                </div>
+                <div class="text-xs uppercase text-muted-foreground">Journals</div>
 
-                <div class="mt-1 text-2xl font-bold">
-                    {{ project.journals.count }}
-                </div>
+                <div class="mt-1 text-2xl font-bold">{{ project.journals.count }}</div>
             </div>
-
         </div>
 
         {% if project.is_shipped %}
         <div class="mb-3 border border-success bg-success/10 p-3">
-            <div class="font-bold text-success">
-                Project shipped
-            </div>
-
-            <div class="mt-1 text-sm text-muted-foreground">
-                This project is now read-only.
+            <div class="font-bold text-success">Project shipped</div>
+
+            <div class="mt-1 text-sm text-muted-foreground">This project is now read-only.</div>
+
+            <div class="mt-2 flex w-full overflow-auto gap-4 items-center justify-center">
+                <div class="w-24 mb-auto">
+                    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-green-700">
+                        <svg
+                            class="size-10 mx-auto my-auto text-green-400"
+                            viewBox="-8 -12 40 40"
+                            id="meteor-icon-kit__solid-checkmark"
+                            fill="none"
+                            xmlns="http://www.w3.org/2000/svg"
+                        >
+                            <path
+                                fill-rule="evenodd"
+                                clip-rule="evenodd"
+                                d="M3.06066 6.4393C2.47487 5.85355 1.52513 5.85355 0.93934 6.4393C0.353553 7.0251 0.353553 7.9749 0.93934 8.5607L7.93934 15.5607C8.52513 16.1464 9.47487 16.1464 10.0607 15.5607L23.0607 2.56066C23.6464 1.97487 23.6464 1.02513 23.0607 0.43934C22.4749 -0.14645 21.5251 -0.14645 20.9393 0.43934L9 12.3787L3.06066 6.4393z"
+                                fill="currentColor"
+                            />
+                        </svg>
+                    </div>
+                    <p class="text-center w-full text-sm">first pass</p>
+                </div>
+                <div class="w-24 mb-auto">
+                    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-red-700">
+                        <svg
+                            class="size-10 mx-auto my-auto text-red-400"
+                            fill-rule="evenodd"
+                            clip-rule="evenodd"
+                            stroke-linejoin="round"
+                            stroke-miterlimit="1.414"
+                            xmlns="http://www.w3.org/2000/svg"
+                            aria-label="view-close"
+                            viewBox="0 0 32 32"
+                            preserveAspectRatio="xMidYMid meet"
+                            fill="currentColor"
+                            width="256"
+                            height="256"
+                        >
+                            <path
+                                d="M11.121,9.707c-0.39,-0.391 -1.024,-0.391 -1.414,0c-0.391,0.39 -0.391,1.024 0,1.414l4.95,4.95l-4.95,4.95c-0.391,0.39 -0.391,1.023 0,1.414c0.39,0.39 1.024,0.39 1.414,0l4.95,-4.95l4.95,4.95c0.39,0.39 1.023,0.39 1.414,0c0.39,-0.391 0.39,-1.024 0,-1.414l-4.95,-4.95l4.95,-4.95c0.39,-0.39 0.39,-1.024 0,-1.414c-0.391,-0.391 -1.024,-0.391 -1.414,0l-4.95,4.95l-4.95,-4.95Z"
+                            />
+                        </svg>
+                    </div>
+                    <p class="text-center w-full text-sm">second pass</p>
+                </div>
+                <div class="w-24 mb-auto">
+                    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full"></div>
+                    <p class="text-center w-full text-sm">fraud check</p>
+                </div>
+                <div class="w-24 mb-auto">
+                    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full"></div>
+                    <p class="text-center w-full text-sm">final review</p>
+                </div>
             </div>
         </div>
-        {% endif %}
-
-        {% if not project.hackatime_project_name and project.project_type != 'hardware' %}
+        {% endif %} {% if not project.hackatime_project_name and project.project_type != 'hardware' %}
 
         <div class="mb-3 border border-warning bg-warning/10 p-3">
-            <div class="font-bold text-warning">
-                Hackatime project not linked bru...
-            </div>
+            <div class="font-bold text-warning">Hackatime project not linked bru...</div>
 
             <div class="mt-1 text-sm text-muted-foreground">
                 Vro link a Hackatime project to start tracking time on ts project.
             </div>
 
-            <a href="{% url 'fr.projects.settings' project.pk %}"
-                class="mt-2 inline-block text-sm text-primary underline hover:text-accent">
+            <a
+                href="{% url 'fr.projects.settings' project.pk %}"
+                class="mt-2 inline-block text-sm text-primary underline hover:text-accent"
+            >
                 Open project settings
             </a>
         </div>
@@ -116,132 +140,117 @@ <h1 class="wrap-break-word text-xl font-bold">
         {% elif not project.repo_url %}
 
         <div class="mb-3 border border-warning bg-warning/10 p-3">
-            <div class="font-bold text-warning">
-                VRO repository not linked
-            </div>
+            <div class="font-bold text-warning">VRO repository not linked</div>
 
-            <div class="mt-1 text-sm text-muted-foreground">
-                Link a repository before shipping your project.
-            </div>
+            <div class="mt-1 text-sm text-muted-foreground">Link a repository before shipping your project.</div>
 
-            <a href="{% url 'fr.projects.settings' project.pk %}"
-                class="mt-2 inline-block text-sm text-primary underline hover:text-accent">
+            <a
+                href="{% url 'fr.projects.settings' project.pk %}"
+                class="mt-2 inline-block text-sm text-primary underline hover:text-accent"
+            >
                 Open project settings
             </a>
         </div>
-        
+
         {% elif project.time_logged < 60 %}
         <div class="mb-3 border border-warning bg-warning/10 p-3">
-            <div class="font-bold text-warning">
-                log more time!
-            </div>
+            <div class="font-bold text-warning">log more time!</div>
 
-            <div class="mt-1 text-sm text-muted-foreground">
-                Log atleast 60 minutes before shipping your project.
-            </div>
+            <div class="mt-1 text-sm text-muted-foreground">Log atleast 60 minutes before shipping your project.</div>
 
             <button
                 onclick="createWindow('journal: ' + document.getElementById('project-title').value, '{% url 'fr.projects.journals.new.hackatime' project.pk %}')"
-                class="mt-4 border border-border bg-primary px-4 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80">
+                class="mt-4 border border-border bg-primary px-4 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80"
+            >
                 + New journal
             </button>
         </div>
         {% endif %}
 
         <div class="border border-border bg-card">
-
             <div
-                class="flex flex-wrap items-center justify-between gap-2 border-b border-border bg-secondary px-3 py-2">
-
+                class="flex flex-wrap items-center justify-between gap-2 border-b border-border bg-secondary px-3 py-2"
+            >
                 <div>
-                    <div class="font-bold">
-                        Project journal
-                    </div>
+                    <div class="font-bold">Project journal</div>
 
-                    <div class="text-xs text-muted-foreground">
-                        Devlogs and progress....
-                    </div>
+                    <div class="text-xs text-muted-foreground">Devlogs and progress....</div>
                 </div>
 
                 {% if not project.is_shipped %}
                 <button
                     onclick="createWindow('journal: ' + document.getElementById('project-title').value, '{% url 'fr.projects.journals.new.hackatime' project.pk %}')"
-                    class="border border-border bg-primary px-3 py-1 text-sm font-bold text-primary-foreground hover:bg-primary/80 active:translate-y-px">
+                    class="border border-border bg-primary px-3 py-1 text-sm font-bold text-primary-foreground hover:bg-primary/80 active:translate-y-px"
+                >
                     + New journal
                 </button>
                 {% endif %}
-
             </div>
 
             <div class="p-2">
-
                 {% for journal in project.journals.all|dictsortreversed:"created_at" %}
 
                 <article class="mb-2 border border-border bg-background last:mb-0">
-
                     <div class="flex flex-wrap items-center gap-2 border-b border-border bg-card px-3 py-2">
-
                         <div class="min-w-0 flex-1 text-sm">
-                            <span class="font-bold">
-                                {{ journal.reduced_minutes|minutes_to_hours_minutes }}
-                            </span>
+                            <span class="font-bold"> {{ journal.reduced_minutes|minutes_to_hours_minutes }} </span>
 
-                            <span class="text-muted-foreground">
-                                logged via {{ journal.get_type_display }}
-                            </span>
+                            <span class="text-muted-foreground"> logged via {{ journal.get_type_display }} </span>
 
-                            <span class="mx-1 text-subtle">
-                                •
-                            </span>
+                            <span class="mx-1 text-subtle"> • </span>
 
                             <span class="text-muted-foreground" title="{{ journal.created_at }}">
                                 {{ journal.created_at|naturaltime }}
                             </span>
                         </div>
 
-                        {% if project.user == request.user %}
-                        {% if not project.is_shipped %}
+                        {% if project.user == request.user %} {% if not project.is_shipped %}
 
                         <div class="flex shrink-0 gap-1">
-
                             {% if journal.type == "untracked" %}
-                            <button title="Delete"
+                            <button
+                                title="Delete"
                                 onclick="window.parent.postMessage({'type': 'internal', 'action': 'open', 'title': 'Delete journal', 'src': '{% url 'fr.projects.journals.delete' journal.pk %}'}, '*')"
-                                class="flex h-7 w-7 items-center justify-center border border-border bg-secondary p-1 hover:bg-destructive hover:text-destructive-foreground">
-                                <img draggable="false" class="image-render-pixelated h-full w-full"
-                                    src="{% static 'icons/delete.png' %}" alt="Delete">
+                                class="flex h-7 w-7 items-center justify-center border border-border bg-secondary p-1 hover:bg-destructive hover:text-destructive-foreground"
+                            >
+                                <img
+                                    draggable="false"
+                                    class="image-render-pixelated h-full w-full"
+                                    src="{% static 'icons/delete.png' %}"
+                                    alt="Delete"
+                                />
                             </button>
                             {% endif %}
 
-                            <button title="Edit"
-                                class="flex h-7 w-7 items-center justify-center border border-border bg-secondary p-1 hover:bg-primary hover:text-primary-foreground">
-                                <img draggable="false" class="image-render-pixelated h-full w-full"
-                                    src="{% static 'icons/edit.png' %}" alt="Edit">
+                            <button
+                                title="Edit"
+                                class="flex h-7 w-7 items-center justify-center border border-border bg-secondary p-1 hover:bg-primary hover:text-primary-foreground"
+                            >
+                                <img
+                                    draggable="false"
+                                    class="image-render-pixelated h-full w-full"
+                                    src="{% static 'icons/edit.png' %}"
+                                    alt="Edit"
+                                />
                             </button>
-
                         </div>
 
-                        {% endif %}
-                        {% endif %}
-
+                        {% endif %} {% endif %}
                     </div>
 
                     <div class="min-w-0 max-w-full overflow-hidden p-3">
                         <c-mdpreview
-                            class="block min-w-0 max-w-full overflow-hidden wrap-break-word zoom-100 **:[&_img]:zoom-50 [&_pre]:max-w-full [&_pre]:overflow-x-auto [&_pre]:whitespace-pre-wrap [&_pre]:wrap-break-word [&_code]:wrap-break-word [&_img]:max-w-full [&_table]:block [&_table]:max-w-full [&_table]:overflow-x-auto">
+                            class="block min-w-0 max-w-full overflow-hidden wrap-break-word zoom-100 **:[&_img]:zoom-50 [&_pre]:max-w-full [&_pre]:overflow-x-auto [&_pre]:whitespace-pre-wrap [&_pre]:wrap-break-word [&_code]:wrap-break-word [&_img]:max-w-full [&_table]:block [&_table]:max-w-full [&_table]:overflow-x-auto"
+                        >
                             {{ journal.content }}
                         </c-mdpreview>
                     </div>
-
                 </article>
 
                 {% empty %}
 
                 <div class="px-4 py-10 text-center">
-
-                    <div class="font-bold">
-                        No journal entries
-                    </div>
+                    <div class="font-bold">No journal entries</div>
 
                     <div class="mt-1 text-sm text-muted-foreground">
                         Your project progress will appear here... after you journal
@@ -250,30 +259,24 @@ <h1 class="wrap-break-word text-xl font-bold">
                     {% if not project.is_shipped %}
                     <button
                         onclick="createWindow('journal: ' + document.getElementById('project-title').value, '{% url 'fr.projects.journals.new.hackatime' project.pk %}')"
-                        class="mt-4 border border-border bg-primary px-4 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80">
+                        class="mt-4 border border-border bg-primary px-4 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80"
+                    >
                         + New journal
                     </button>
                     {% endif %}
-
                 </div>
 
                 {% endfor %}
-
             </div>
         </div>
-
     </div>
 
     <div
-        class="status-field-border flex shrink-0 items-center justify-between bg-card p-2 border-t border-border text-xs">
-        <span>
-            {{ project.journals.count }} journal{{ project.journals.count|pluralize }}
-        </span>
-
-        <span>
-            {{ project.time_logged|minutes_to_hours_minutes }} logged
-        </span>
-    </div>
+        class="status-field-border flex shrink-0 items-center justify-between bg-card p-2 border-t border-border text-xs"
+    >
+        <span> {{ project.journals.count }} journal{{ project.journals.count|pluralize }} </span>
 
+        <span> {{ project.time_logged|minutes_to_hours_minutes }} logged </span>
+    </div>
 </div>
-{% endblock body %}
\ No newline at end of file
+{% endblock body %}
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index 5de057a..e7bcd0c 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -1,11 +1,10 @@
+from requests import HTTPError
 from markdown_it.rules_inline import image
 from django.http import JsonResponse
 from django.views import View
 from django.shortcuts import render, redirect
 from ...models import Profile, Project, Journal, ProjectShip
 from ... import hackatime
-import re
-import math
 
 # Create your views here.
 class ProjectDetail(View):
@@ -52,9 +51,12 @@ def get(self, request, id):
         profile = request.user.profile
         context["profile"] = profile
 
-        context["hackatime_projects"] = hackatime.projects(
-            profile.hackatime_access_token
-        )
+        try:
+            context["hackatime_projects"] = hackatime.projects(
+                profile.hackatime_access_token
+            )
+        except HTTPError:
+            context['hackatime_projects'] = []
 
         return render(
             request,

From ff1372bb75cbc3413e9fd147329465a81b402a64 Mon Sep 17 00:00:00 2001
From: Rohan317685 <dsairohan@gmail.com>
Date: Thu, 27 Aug 2026 02:36:47 +0100
Subject: [PATCH 093/118] Fix: Overlapped window resizing

---
 twisted/twisted_site/templates/client/dashboard.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index f517d48..733b942 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -286,6 +286,13 @@
         container = document.getElementById("windows-container");
         container.moveBefore(win, null);
 
+        document.querySelectorAll(".window").forEach((w) => {
+            w.style.zIndex = "";
+            w.querySelectorAll(".resize-handle").forEach((h) => (h.style.pointerEvents = "none"));
+        });
+        win.style.zIndex = "100";
+        win.querySelectorAll(".resize-handle").forEach((h) => (h.style.pointerEvents = "auto"));
+
         const btn = document.querySelector('#taskbar-windows button[data-win-id="' + id + '"]');
         if (btn) btn.classList.add("!bg-twisted-999");
     }

From 8fa4d9a23086a6f9acba2d41c26d881092b7e7da Mon Sep 17 00:00:00 2001
From: CoolCream <mahasankarshant@gmail.com>
Date: Thu, 27 Aug 2026 19:45:08 +0530
Subject: [PATCH 094/118] start + task

---
 .../tailwindcsstheme/static_src/package.json  |  6 ++--
 .../static_src/src/styles.css                 |  6 +---
 .../templates/admin/pathways/list.html        | 17 +++++++---
 .../templates/client/dashboard.html           | 33 ++++++++++++++-----
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/twisted/tailwindcsstheme/static_src/package.json b/twisted/tailwindcsstheme/static_src/package.json
index 2893e2e..1e44e6e 100644
--- a/twisted/tailwindcsstheme/static_src/package.json
+++ b/twisted/tailwindcsstheme/static_src/package.json
@@ -6,8 +6,8 @@
     "start": "npm run dev",
     "build": "npm run build:clean && npm run build:tailwind",
     "build:clean": "rimraf ../static/css/dist",
-    "build:tailwind": "cross-env NODE_ENV=production postcss ./src/styles.css -o ../static/css/dist/styles.css --minify && postcss ./src/win98.css -o ../static/css/dist/win98.css --minify",
-    "dev": "concurrently \"cross-env NODE_ENV=development postcss ./src/styles.css -o ../static/css/dist/styles.css --watch\" \"cross-env NODE_ENV=development postcss ./src/win98.css -o ../static/css/dist/win98.css --watch\""
+    "build:tailwind": "cross-env NODE_ENV=production postcss ./src/styles.css -o ../static/css/dist/styles.css --minify",
+    "dev": "cross-env NODE_ENV=development postcss ./src/styles.css -o ../static/css/dist/styles.css --watch"
   },
   "keywords": [],
   "author": "",
@@ -25,4 +25,4 @@
     "rimraf": "^6.1.3",
     "tailwindcss": "^4.3.0"
   }
-}
+}
\ No newline at end of file
diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index 913fa05..3593588 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -180,8 +180,4 @@ progress::-webkit-progress-bar {
 
 ::-webkit-scrollbar-corner {
   background: #1E072F;
-}
-
-@utility no-scrollbar {
-  @apply [scrollbar-none] [&::-webkit-scrollbar]:hidden;
-}
+}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/pathways/list.html b/twisted/twisted_site/templates/admin/pathways/list.html
index 50570ad..6e3ba4c 100644
--- a/twisted/twisted_site/templates/admin/pathways/list.html
+++ b/twisted/twisted_site/templates/admin/pathways/list.html
@@ -6,13 +6,19 @@ <h1 class="text-center md:text-left me-4 font-semibold text-3xl mt-auto">
             </h1>
             <a href="{% url 'admin.pathways.create' %}">
                 <c-ui.button variant="primary">
-                    <svg class="inline-block size-6" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" xmlns="http://www.w3.org/2000/svg" aria-label="plus" viewBox="0 0 32 32" preserveAspectRatio="xMidYMid meet" fill="currentColor" width="256" height="256"><path d="M16,6c5.1,0 7.247,0.575 8.336,1.664c1.089,1.089 1.664,3.236 1.664,8.336c0,5.1 -0.575,7.247 -1.664,8.336c-1.089,1.089 -3.236,1.664 -8.336,1.664c-5.1,0 -7.247,-0.575 -8.336,-1.664c-1.089,-1.089 -1.664,-3.236 -1.664,-8.336c0,-5.1 0.575,-7.247 1.664,-8.336c1.089,-1.089 3.236,-1.664 8.336,-1.664Zm0,-2c10,0 12,2 12,12c0,10 -2,12 -12,12c-10,0 -12,-2 -12,-12c0,-10 2,-12 12,-12Zm-1,8c0,-0.552 0.448,-1 1,-1c0.552,0 1,0.448 1,1l0,3l3,0c0.552,0 1,0.448 1,1c0,0.552 -0.448,1 -1,1l-3,0l0,3c0,0.552 -0.448,1 -1,1c-0.552,0 -1,-0.448 -1,-1l0,-3l-3,0c-0.552,0 -1,-0.448 -1,-1c0,-0.552 0.448,-1 1,-1l3,0l0,-3Z"/></svg>
+                    <svg class="inline-block size-6" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round"
+                        stroke-miterlimit="1.414" xmlns="http://www.w3.org/2000/svg" aria-label="plus"
+                        viewBox="0 0 32 32" preserveAspectRatio="xMidYMid meet" fill="currentColor" width="256"
+                        height="256">
+                        <path
+                            d="M16,6c5.1,0 7.247,0.575 8.336,1.664c1.089,1.089 1.664,3.236 1.664,8.336c0,5.1 -0.575,7.247 -1.664,8.336c-1.089,1.089 -3.236,1.664 -8.336,1.664c-5.1,0 -7.247,-0.575 -8.336,-1.664c-1.089,-1.089 -1.664,-3.236 -1.664,-8.336c0,-5.1 0.575,-7.247 1.664,-8.336c1.089,-1.089 3.236,-1.664 8.336,-1.664Zm0,-2c10,0 12,2 12,12c0,10 -2,12 -12,12c-10,0 -12,-2 -12,-12c0,-10 2,-12 12,-12Zm-1,8c0,-0.552 0.448,-1 1,-1c0.552,0 1,0.448 1,1l0,3l3,0c0.552,0 1,0.448 1,1c0,0.552 -0.448,1 -1,1l-3,0l0,3c0,0.552 -0.448,1 -1,1c-0.552,0 -1,-0.448 -1,-1l0,-3l-3,0c-0.552,0 -1,-0.448 -1,-1c0,-0.552 0.448,-1 1,-1l3,0l0,-3Z" />
+                    </svg>
                     Create new
                 </c-ui.button>
             </a>
         </div>
         <div class="min-h-0 overflow-y-hidden flex gap-2 *:min-w-80 *:w-200 grow max-h-full bg-slate-950">
-            <div class="bg-purple-950/40 border border-purple-900 rounded-md p-2 h-full overflow-y-auto no-scrollbar">
+            <div class="bg-purple-950/40 border border-purple-900 rounded-md p-2 h-full overflow-y-auto scrollbar-none">
                 <h1 class="font-semibold mb-2 mx-2">
                     Not started ({{ future_pathways|length }} item{{ future_pathways|pluralize }})
                 </h1>
@@ -22,7 +28,7 @@ <h1 class="font-semibold mb-2 mx-2">
                     {% endfor %}
                 </div>
             </div>
-            <div class="bg-orange-950/40 border border-orange-900 rounded-md p-2 h-full overflow-y-auto no-scrollbar">
+            <div class="bg-orange-950/40 border border-orange-900 rounded-md p-2 h-full overflow-y-auto scrollbar-none">
                 <h1 class="font-semibold mb-2 mx-2">
                     In progress ({{ current_pathways|length }} item{{ current_pathways|pluralize }})
                 </h1>
@@ -32,7 +38,8 @@ <h1 class="font-semibold mb-2 mx-2">
                     {% endfor %}
                 </div>
             </div>
-            <div class="bg-emerald-950/40 border border-emerald-900 rounded-md p-2 h-full overflow-y-auto no-scrollbar">
+            <div
+                class="bg-emerald-950/40 border border-emerald-900 rounded-md p-2 h-full overflow-y-auto scrollbar-none">
                 <h1 class="font-semibold mb-2 mx-2">
                     Ended ({{ past_pathways|length }} item{{ past_pathways|pluralize }})
                 </h1>
@@ -44,4 +51,4 @@ <h1 class="font-semibold mb-2 mx-2">
             </div>
         </div>
     </div>
-</c-base>
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 4786826..20de8e0 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -39,12 +39,12 @@
                 </button>
 
                 <div id="start-menu" style="display: none;"
-                    class="z-10000 fixed bottom-12 left-1 bg-twisted-800 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg">
+                    class="z-10000 fixed bottom-13 left-5 border-2 border-border shadow-[2px_2px_0px_0px] shadow-accent rounded-md">
                     <div class="flex h-80">
-                        <div class="w-44 bg-twisted-600 p-3 pt-10 flex flex-col">
-                            <div class="text-center mb-3">
+                        <div class="w-44 bg-card p-3 pt-10 flex flex-col rounded-md">
+                            <div class="text-center mb-3 rounded-lg ">
                                 <img src="{{ user.profile.slack_pfp_url }}" alt=""
-                                    class="w-16 h-16 object-cover mx-auto mb-1 -mt-12 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black shadow-lg" />
+                                    class="w-16 h-16 rounded-lg object-cover mx-auto mb-1 -mt-12 border-2 border-border shadow-lg" />
                                 <div class="text-absolute-white font-bold text-sm font-vintage">
                                     {{ profile.slack_username|default:user.username }}
                                 </div>
@@ -57,16 +57,31 @@
                                     Panel</a>
                                 {% endif %}
                                 <a href="https://docs.twisted.hackclub.com/"
-                                    class="block text-absolute-white px-2 py-1 hover:bg-twisted-800">Docs</a>
+                                    class="text-card-foreground px-2 py-1 w-full flex items-center justify-between hover:bg-accent hover:text-accent-foreground transition text-xl">
+                                    <svg fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round"
+                                        stroke-miterlimit="1.414" xmlns="http://www.w3.org/2000/svg"
+                                        aria-label="clipboard-text" viewBox="0 0 32 32"
+                                        preserveAspectRatio="xMidYMid meet" fill="currentColor" width="24" height="24">
+                                        <path
+                                            d="M10 14C10 13.448 10.448 13 11 13H22C22.552 13 23 13.448 23 14C23 14.552 22.552 15 22 15H11C10.448 15 10 14.552 10 14Z" />
+                                        <path
+                                            d="M10 18C10 17.448 10.448 17 11 17H22C22.552 17 23 17.448 23 18C23 18.552 22.552 19 22 19H11C10.448 19 10 18.552 10 18Z" />
+                                        <path
+                                            d="M10 22C10 21.448 10.448 21 11 21H19C19.552 21 20 21.448 20 22C20 22.552 19.552 23 19 23H11C10.448 23 10 22.552 10 22Z" />
+                                        <path
+                                            d="M17.96 3.93119C17.9648 3.95466 17.9674 3.97763 17.9679 4H20C20.552 4 21 4.448 21 5V5.25323V7C21 7.09511 20.9867 7.18713 20.9619 7.27431C20.8425 7.69308 20.4569 8 20 8H12C11.5431 8 11.1575 7.69308 11.0381 7.27431C11.0381 7.27409 11.038 7.27388 11.038 7.27366C11.0132 7.18668 11 7.09487 11 7V5.25323V5C11 4.448 11.448 4 12 4H14.0321C14.0326 3.97763 14.0352 3.95466 14.04 3.93119C14.224 3.02719 15.034 2.31519 16 2.31519C16.965 2.31519 17.776 3.02719 17.96 3.93119ZM6 17C6 9.14915 6.42432 6.39217 10 5.45705V7C10 7.18211 10.0244 7.35854 10.07 7.52622C9.563 7.71106 9.28679 7.92979 9.099 8.155C8.779 8.539 8.458 9.249 8.255 10.752C8.046 12.283 8 14.274 8 17C8 19.725 8.046 21.717 8.255 23.248C8.458 24.751 8.779 25.461 9.099 25.845C9.375 26.176 9.842 26.493 10.952 26.709C12.164 26.95 13.744 27 16 27C18.256 27 19.836 26.95 21.048 26.709C22.158 26.493 22.625 26.176 22.901 25.845C23.221 25.461 23.542 24.751 23.744 23.248C23.954 21.717 24 19.725 24 17C24 14.274 23.954 12.283 23.744 10.752C23.542 9.249 23.221 8.539 22.901 8.155C22.7132 7.92979 22.437 7.71106 21.93 7.52622C21.9756 7.35854 22 7.18211 22 7V5.45705C25.5757 6.39217 26 9.14915 26 17C26 28 25.167 29 16 29C6.833 29 6 28 6 17Z" />
+                                    </svg>
+                                    Docs
+                                </a>
                             </div>
                         </div>
                     </div>
 
-                    <div class="flex items-center justify-between bg-twisted-400 p-2 border-t-2 border-t-twisted-200">
-                        <form method="post" action="{% url 'logout' %}">
+                    <div class="flex items-center justify-between p-2 bg-card rounded-b-md">
+                        <form method="post" action="{% url 'logout' %}" class="w-full">
                             {% csrf_token %}
                             <button type="submit"
-                                class="text-absolute-white text-sm px-3 py-1 border-2 border-t-twisted-200 border-l-twisted-200 border-r-dark-black border-b-dark-black active:border-t-dark-black active:border-l-dark-black active:border-r-twisted-200 active:border-b-twisted-200">
+                                class="border border-border bg-secondary px-2 sm:px-3 py-1.5 font-mono text-xs sm:text-sm font-bold text-secondary-foreground w-full transition hover:bg-accent/60 hover:text-primary-foreground text-center">
                                 Logout
                             </button>
                         </form>
@@ -107,7 +122,7 @@
 
 <template id="window-template">
     <div class="absolute window resize flex flex-col overflow-hidden bg-card border-2 border-dark-black shadow-lg"
-        style="min-width: 200px; min-height: 200px; left: 300px; top: 300px; width: 300px; height: 300px;">
+        style="min-width: 40vw; min-height: 40vh; left: 300px; top: 300px; width: 300px; height: 300px;">
         <div
             class="title-bar w-full h-8 shrink-0 flex items-center justify-between bg-primary text-primary-foreground px-2 select-none">
             <div class="flex gap-2">

From 5293b990a03fe3e44aa46ea8db8c5f3d7878fe9e Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 27 Aug 2026 19:46:54 +0530
Subject: [PATCH 095/118] Fix issue with devving on windows

---
 ...atus_projectship_final_message_and_more.py | 57 +++++++++++++++++++
 .../templates/admin/debug/review.html         | 14 +++++
 .../templates/cotton/project_ship_mark.html   | 11 ++++
 .../templates/cotton/svg/check.html           | 14 +++++
 .../templates/cotton/svg/cross.html           | 18 ++++++
 twisted/twisted_site/views/admin/dashboard.py |  2 +-
 6 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py
 create mode 100644 twisted/twisted_site/templates/admin/debug/review.html
 create mode 100644 twisted/twisted_site/templates/cotton/project_ship_mark.html
 create mode 100644 twisted/twisted_site/templates/cotton/svg/check.html
 create mode 100644 twisted/twisted_site/templates/cotton/svg/cross.html

diff --git a/twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py b/twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py
new file mode 100644
index 0000000..a0069c9
--- /dev/null
+++ b/twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py
@@ -0,0 +1,57 @@
+# Generated by Django 6.0.7 on 2026-08-27 10:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0018_pathway'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='projectship',
+            name='status',
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='final_message',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='final_status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='final_updated_at',
+            field=models.DateTimeField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='fraud_message',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='fraud_status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='fraud_updated_at',
+            field=models.DateTimeField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='t1_status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='t2_status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+    ]
diff --git a/twisted/twisted_site/templates/admin/debug/review.html b/twisted/twisted_site/templates/admin/debug/review.html
new file mode 100644
index 0000000..976ce36
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/debug/review.html
@@ -0,0 +1,14 @@
+<c-base>
+    <div class="bg-red-900 text-center mb-2">
+        REVIEW IN DEBUG MODE (DEBUG_REVIEW=True in settings)
+    </div>
+    <div class="flex flex-col gap-2">
+        {% for ship in ships %}
+        <c-ui.card>
+            <div>
+                {{ ship }}
+            </div>
+        </c-ui.card>
+        {% endfor %}
+    </div>
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/project_ship_mark.html b/twisted/twisted_site/templates/cotton/project_ship_mark.html
new file mode 100644
index 0000000..9a5a78f
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/project_ship_mark.html
@@ -0,0 +1,11 @@
+{% if status == 'pending' %}
+<div class="mx-auto border flex border-border size-12 mb-2 rounded-full"></div>
+{% elif status == 'approved' %}
+<div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-green-700">
+    <c-svg.check class="size-10 mx-auto my-auto text-green-400" />
+</div>
+{% elif status == "rejected" or status == "requested_changes" %}
+    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-red-700">
+        <c-svg.cross class="size-10 mx-auto my-auto text-red-400" />
+    </div>
+{% endif %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/svg/check.html b/twisted/twisted_site/templates/cotton/svg/check.html
new file mode 100644
index 0000000..f96ada0
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/svg/check.html
@@ -0,0 +1,14 @@
+<svg
+                            class="{{ class }}"
+                            viewBox="-8 -12 40 40"
+                            id="meteor-icon-kit__solid-checkmark"
+                            fill="none"
+                            xmlns="http://www.w3.org/2000/svg"
+                        >
+                            <path
+                                fill-rule="evenodd"
+                                clip-rule="evenodd"
+                                d="M3.06066 6.4393C2.47487 5.85355 1.52513 5.85355 0.93934 6.4393C0.353553 7.0251 0.353553 7.9749 0.93934 8.5607L7.93934 15.5607C8.52513 16.1464 9.47487 16.1464 10.0607 15.5607L23.0607 2.56066C23.6464 1.97487 23.6464 1.02513 23.0607 0.43934C22.4749 -0.14645 21.5251 -0.14645 20.9393 0.43934L9 12.3787L3.06066 6.4393z"
+                                fill="currentColor"
+                            />
+                        </svg>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/svg/cross.html b/twisted/twisted_site/templates/cotton/svg/cross.html
new file mode 100644
index 0000000..2e917dd
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/svg/cross.html
@@ -0,0 +1,18 @@
+<svg
+    class="{{ class }}"
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    stroke-linejoin="round"
+    stroke-miterlimit="1.414"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-label="view-close"
+    viewBox="0 0 32 32"
+    preserveAspectRatio="xMidYMid meet"
+    fill="currentColor"
+    width="256"
+    height="256"
+>
+    <path
+        d="M11.121,9.707c-0.39,-0.391 -1.024,-0.391 -1.414,0c-0.391,0.39 -0.391,1.024 0,1.414l4.95,4.95l-4.95,4.95c-0.391,0.39 -0.391,1.023 0,1.414c0.39,0.39 1.024,0.39 1.414,0l4.95,-4.95l4.95,4.95c0.39,0.39 1.023,0.39 1.414,0c0.39,-0.391 0.39,-1.024 0,-1.414l-4.95,-4.95l4.95,-4.95c0.39,-0.39 0.39,-1.024 0,-1.414c-0.391,-0.391 -1.024,-0.391 -1.414,0l-4.95,4.95l-4.95,-4.95Z"
+    />
+</svg>
diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
index a0010e9..edeb329 100644
--- a/twisted/twisted_site/views/admin/dashboard.py
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -19,7 +19,7 @@ def get(self, request):
             hours = journal.reduced_minutes / 60
             hours_logged += hours
             
-            date = journal.created_at.date().strftime("%a, %-d %b")
+            date = journal.created_at.date().strftime("%a, %d %b")
             hours_logged_chart[date] = hours_logged_chart.get(date, 0) + hours
             
             logged_project_type[journal.project.get_project_type_display()] += hours

From 6f8a65b153e513095d536646654a1c6ef62c7f20 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 27 Aug 2026 19:47:42 +0530
Subject: [PATCH 096/118] Push fix for devving on Windows

---
 twisted/twisted_site/views/admin/dashboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
index a0010e9..edeb329 100644
--- a/twisted/twisted_site/views/admin/dashboard.py
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -19,7 +19,7 @@ def get(self, request):
             hours = journal.reduced_minutes / 60
             hours_logged += hours
             
-            date = journal.created_at.date().strftime("%a, %-d %b")
+            date = journal.created_at.date().strftime("%a, %d %b")
             hours_logged_chart[date] = hours_logged_chart.get(date, 0) + hours
             
             logged_project_type[journal.project.get_project_type_display()] += hours

From cba91d5df002bd6fe6a544b3dec47a785a093a8d Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 27 Aug 2026 21:32:30 +0530
Subject: [PATCH 097/118] Add debug admin review panel

---
 twisted/.env.example                          |  2 +
 twisted/mysite/settings.py                    |  1 +
 .../static_src/src/styles.css                 | 28 +++---
 twisted/twisted_site/models.py                | 75 +++++++++++---
 .../templates/admin/debug/review.html         | 97 +++++++++++++++++++
 .../templates/client/projects/detail.html     | 46 +--------
 .../templates/cotton/project_ship_mark.html   | 13 +++
 .../templates/cotton/svg/cross.html           | 18 ++++
 .../templates/cotton/svg/tick.html            | 14 +++
 twisted/twisted_site/views/admin/review.py    | 48 +++++++++
 10 files changed, 270 insertions(+), 72 deletions(-)
 create mode 100644 twisted/twisted_site/templates/admin/debug/review.html
 create mode 100644 twisted/twisted_site/templates/cotton/project_ship_mark.html
 create mode 100644 twisted/twisted_site/templates/cotton/svg/cross.html
 create mode 100644 twisted/twisted_site/templates/cotton/svg/tick.html

diff --git a/twisted/.env.example b/twisted/.env.example
index f138bca..6542311 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -1,6 +1,8 @@
 SECRET_KEY=<insert-super-secure-secret-here>
 LOGIN_ENABLED=true # possible options: 'true,false,maybe'
+
 DEBUG=true
+DEBUG_REVIEW=true
 
 POSTGRES_DB = django
 POSTGRES_USER = django
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 75ae03c..316cc66 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -28,6 +28,7 @@
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.environ.get('DEBUG', 'false').lower() in ['true', 'on', '1']
+DEBUG_REVIEW = os.environ.get('DEBUG_REVIEW', str(DEBUG)).lower() in ['true', 'on', '1']
 
 USE_X_FORWARDED_HOST = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
diff --git a/twisted/tailwindcsstheme/static_src/src/styles.css b/twisted/tailwindcsstheme/static_src/src/styles.css
index f3299a6..c5b515b 100644
--- a/twisted/tailwindcsstheme/static_src/src/styles.css
+++ b/twisted/tailwindcsstheme/static_src/src/styles.css
@@ -53,6 +53,7 @@
   --color-accent-foreground: var(--color-red-950);
   --color-primary: var(--color-red-600);
   --color-primary-foreground: var(--color-accent-foreground);
+  --color-surface: var(--color-zinc-900)
 }
 
 .os {
@@ -62,6 +63,18 @@
   --color-primary: #B96CFF;
   --color-primary-foreground: #190B24;
 
+  --color-twisted-200: #E0A7FF;
+  --color-twisted-400: #B96CFF;
+  --color-twisted-600: #8C3ED1;
+  --color-twisted-800: #61268F;
+  --color-twisted-999: #3A1750;
+
+  --color-absolute-white: #FFFFFF;
+  --color-fair-gray: #B8ADBF;
+  --color-dark-black: #120817;
+
+  --color-surface: #2E153C;
+  --color-dark: #1B0D25;
 }
 
 @theme {
@@ -106,19 +119,6 @@
 
   --color-destructive: #FF6B7A;
   --color-destructive-foreground: #2A080D;
-
-  --color-twisted-200: #E0A7FF;
-  --color-twisted-400: #B96CFF;
-  --color-twisted-600: #8C3ED1;
-  --color-twisted-800: #61268F;
-  --color-twisted-999: #3A1750;
-
-  --color-absolute-white: #FFFFFF;
-  --color-fair-gray: #B8ADBF;
-  --color-dark-black: #120817;
-
-  --color-surface: #2E153C;
-  --color-dark: #1B0D25;
 }
 
 button {
@@ -212,8 +212,6 @@ progress::-webkit-progress-bar {
   @apply [scrollbar-width:none] [&::-webkit-scrollbar]:hidden;
 }
 
-
-
 .resize-handle {
   position: absolute;
   z-index: 10;
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 5c26dfc..d6ae4d6 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -122,11 +122,16 @@ def time_spent(self):
     def hackatime_time_unjournaled(self):
         return self.time_spent() - self.hackatime_logged(include_all_minutes=True)
 
+    def latest_ship(self):
+        ship = self.ships.order_by('-created_at').first()
+        return ship
+    
     def is_shipped(self):
-        ships = ProjectShip.objects.filter(project=self)
-        for ship in ships:
-            if ship.status not in ["rejected", "requested_changes"]:
-                return ship
+        latest_ship = self.latest_ship()
+        if latest_ship is None:
+            return False
+        if latest_ship.latest_status() not in ['requested_changes']:
+            return True
         return False
 
 
@@ -149,11 +154,10 @@ def __str__(self):
 
 
 PROJECT_SHIP_STATUSES = {
-    "created": "Awaiting review",
-    "rejected": "Rejected ship",
-    "requested_changes": "Requested Changes",
-    "reqchecked": "Checked by T1",
-    "approved": "Approved by T2",
+    "pending": "Awaiting review",
+    "requested_changes": "Changes Requested",
+    "rejected": "Rejected",
+    "approved": "Approved"
 }
 
 
@@ -162,18 +166,59 @@ class ProjectShip(models.Model):
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
+    
+    t1_status = models.CharField(default="pending", choices=PROJECT_SHIP_STATUSES, max_length=200)
     t1_updated_at = models.DateTimeField(default=None, null=True)
-    t2_updated_at = models.DateTimeField(default=None, null=True)
-
     t1_message = models.TextField(blank=True, default="")
+
+    t2_status = models.CharField(default="pending", choices=PROJECT_SHIP_STATUSES, max_length=200)
+    t2_updated_at = models.DateTimeField(default=None, null=True)
     t2_message = models.TextField(blank=True, default="")
 
-    status = models.CharField(
-        max_length=200, choices=PROJECT_SHIP_STATUSES, default="created"
-    )
+    fraud_status = models.CharField(default="pending", choices=PROJECT_SHIP_STATUSES, max_length=200)
+    fraud_updated_at = models.DateTimeField(default=None, null=True)
+    fraud_message = models.TextField(blank=True, default="")
+
+    final_status = models.CharField(default="pending", choices=PROJECT_SHIP_STATUSES, max_length=200)
+    final_updated_at = models.DateTimeField(default=None, null=True)
+    final_message = models.TextField(blank=True, default="")
+
+
+    def latest_status(self):
+        if self.final_status:
+            return self.final_status
+        if self.fraud_status:
+            return self.fraud_status
+        if self.t2_status:
+            return self.t2_status
+        if self.t1_status:
+            return self.t1_status
+    
+    
+    def save(self, *args, **kwargs):
+        if not self.pk:  # Check if object already exists in the database
+            return super().save(*args, **kwargs)
+        
+        original = ProjectShip.objects.get(pk=self.pk)
+
+        if original.t1_status != self.t1_status or original.t1_message != self.t1_message:
+            self.t1_updated_at = timezone.now()
+        
+        if original.t2_status != self.t2_status or original.t2_message != self.t2_message:
+            self.t2_updated_at = timezone.now()
+        
+        if original.fraud_status != self.fraud_status or original.fraud_message != self.fraud_message:
+            self.fraud_updated_at = timezone.now()
+        
+        if original.final_status != self.final_status or original.final_message != self.final_message:
+            self.final_updated_at = timezone.now()
+        
+        return super().save(*args, **kwargs)
 
+
+    
     def __str__(self):
-        return f"Ship created at {self.created_at} ({PROJECT_SHIP_STATUSES.get(str(self.status), self.status)})"
+        return f"Ship created at {self.created_at} ({PROJECT_SHIP_STATUSES.get(str(self.latest_status()), self.latest_status())})"
 
 
 class Pathway(models.Model):
diff --git a/twisted/twisted_site/templates/admin/debug/review.html b/twisted/twisted_site/templates/admin/debug/review.html
new file mode 100644
index 0000000..4d23001
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/debug/review.html
@@ -0,0 +1,97 @@
+<c-base>
+<div class="text-center bg-red-900 rounded-md mb-4">
+    DEBUG_REVIEW is set to true in .env! Please do not use this in production!
+    If this is a production environment, please switch DEBUG_REVIEW to false!
+</div>
+<div class="flex flex-col gap-2">
+    {% for ship in ships %}
+    <div>
+        <c-ui.card>
+            <h1 class="text-xl font-bold">
+                Ship for
+                {{ ship.project.project_name }}
+            </h1>
+            <div>
+                Created {{ ship.created_at }} //
+                Updated {{ ship.updated_at }}
+            </div>
+            <div>
+                <form method="post">
+                    {% csrf_token %}
+                    <input type="hidden" name="id" value="{{ ship.id }}">
+                    <c-ui.table>
+                        <thead>
+                            <tr>
+                                <th>T1</th>
+                                <th>T2</th>
+                                <th>Fraud</th>
+                                <th>Final</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <td>{{ ship.t1_updated_at }}</td>
+                                <td>{{ ship.t2_updated_at }}</td>
+                                <td>{{ ship.fraud_updated_at }}</td>
+                                <td>{{ ship.final_updated_at }}</td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <c-ui.select name="t1_status" placeholder="Select an option">
+                                        <c-ui.select.option value="pending" selected="{% if ship.t1_status == 'pending' %}True{% endif %}">pending</c-ui.select.option>
+                                        <c-ui.select.option value="requested_changes" selected="{% if ship.t1_status == 'requested_changes' %}True{% endif %}">requested_changes</c-ui.select.option>
+                                        <c-ui.select.option value="rejected" selected="{% if ship.t1_status == 'rejected' %}True{% endif %}">rejected</c-ui.select.option>
+                                        <c-ui.select.option value="approved" selected="{% if ship.t1_status == 'approved' %}True{% endif %}">approved</c-ui.select.option>
+                                    </c-ui.select>
+                                </td>
+                                <td>
+                                    <c-ui.select name="t2_status" placeholder="Select an option">
+                                        <c-ui.select.option value="pending" selected="{% if ship.t2_status == 'pending' %}True{% endif %}">pending</c-ui.select.option>
+                                        <c-ui.select.option value="requested_changes" selected="{% if ship.t2_status == 'requested_changes' %}True{% endif %}">requested_changes</c-ui.select.option>
+                                        <c-ui.select.option value="rejected" selected="{% if ship.t2_status == 'rejected' %}True{% endif %}">rejected</c-ui.select.option>
+                                        <c-ui.select.option value="approved" selected="{% if ship.t2_status == 'approved' %}True{% endif %}">approved</c-ui.select.option>
+                                    </c-ui.select>
+                                </td>
+                                <td>
+                                    <c-ui.select name="fraud_status" placeholder="Select an option">
+                                        <c-ui.select.option value="pending" selected="{% if ship.fraud_status == 'pending' %}True{% endif %}">pending</c-ui.select.option>
+                                        <c-ui.select.option value="requested_changes" selected="{% if ship.fraud_status == 'requested_changes' %}True{% endif %}">requested_changes</c-ui.select.option>
+                                        <c-ui.select.option value="rejected" selected="{% if ship.fraud_status == 'rejected' %}True{% endif %}">rejected</c-ui.select.option>
+                                        <c-ui.select.option value="approved" selected="{% if ship.fraud_status == 'approved' %}True{% endif %}">approved</c-ui.select.option>
+                                    </c-ui.select>
+                                </td>
+                                <td>
+                                    <c-ui.select name="final_status" placeholder="Select an option">
+                                        <c-ui.select.option value="pending" selected="{% if ship.final_status == 'pending' %}True{% endif %}">pending</c-ui.select.option>
+                                        <c-ui.select.option value="requested_changes" selected="{% if ship.final_status == 'requested_changes' %}True{% endif %}">requested_changes</c-ui.select.option>
+                                        <c-ui.select.option value="rejected" selected="{% if ship.final_status == 'rejected' %}True{% endif %}">rejected</c-ui.select.option>
+                                        <c-ui.select.option value="approved" selected="{% if ship.final_status == 'approved' %}True{% endif %}">approved</c-ui.select.option>
+                                    </c-ui.select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <textarea name="t1_message">{{ ship.t1_message }}</textarea>
+                                </td>
+                                <td>
+                                    <textarea name="t2_message">{{ ship.t2_message }}</textarea>
+                                </td>
+                                <td>
+                                    <textarea name="fraud_message">{{ ship.fraud_message }}</textarea>
+                                </td>
+                                <td>
+                                    <textarea name="final_message">{{ ship.final_message }}</textarea>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </c-ui.table>
+                    <div class="mt-2 text-right">
+                        <c-ui.button type="submit">Update</c-ui.button>
+                    </div>
+                </form>
+            </div>
+        </c-ui.card>
+    </div>
+    {% endfor %}
+</div>
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 7b2ffe1..420f524 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -67,55 +67,17 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
 
             <div class="mt-1 text-sm text-muted-foreground">This project is now read-only.</div>
 
-            <div class="mt-2 flex w-full overflow-auto gap-4 items-center justify-center">
+            <div class="mt-2 flex w-full overflow-auto gap-4 items-center justify-center md:justify-start">
                 <div class="w-24 mb-auto">
-                    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-green-700">
-                        <svg
-                            class="size-10 mx-auto my-auto text-green-400"
-                            viewBox="-8 -12 40 40"
-                            id="meteor-icon-kit__solid-checkmark"
-                            fill="none"
-                            xmlns="http://www.w3.org/2000/svg"
-                        >
-                            <path
-                                fill-rule="evenodd"
-                                clip-rule="evenodd"
-                                d="M3.06066 6.4393C2.47487 5.85355 1.52513 5.85355 0.93934 6.4393C0.353553 7.0251 0.353553 7.9749 0.93934 8.5607L7.93934 15.5607C8.52513 16.1464 9.47487 16.1464 10.0607 15.5607L23.0607 2.56066C23.6464 1.97487 23.6464 1.02513 23.0607 0.43934C22.4749 -0.14645 21.5251 -0.14645 20.9393 0.43934L9 12.3787L3.06066 6.4393z"
-                                fill="currentColor"
-                            />
-                        </svg>
-                    </div>
+                    <c-project-ship-mark status="{{ project.latest_ship.t1_status }}" />
                     <p class="text-center w-full text-sm">first pass</p>
                 </div>
                 <div class="w-24 mb-auto">
-                    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-red-700">
-                        <svg
-                            class="size-10 mx-auto my-auto text-red-400"
-                            fill-rule="evenodd"
-                            clip-rule="evenodd"
-                            stroke-linejoin="round"
-                            stroke-miterlimit="1.414"
-                            xmlns="http://www.w3.org/2000/svg"
-                            aria-label="view-close"
-                            viewBox="0 0 32 32"
-                            preserveAspectRatio="xMidYMid meet"
-                            fill="currentColor"
-                            width="256"
-                            height="256"
-                        >
-                            <path
-                                d="M11.121,9.707c-0.39,-0.391 -1.024,-0.391 -1.414,0c-0.391,0.39 -0.391,1.024 0,1.414l4.95,4.95l-4.95,4.95c-0.391,0.39 -0.391,1.023 0,1.414c0.39,0.39 1.024,0.39 1.414,0l4.95,-4.95l4.95,4.95c0.39,0.39 1.023,0.39 1.414,0c0.39,-0.391 0.39,-1.024 0,-1.414l-4.95,-4.95l4.95,-4.95c0.39,-0.39 0.39,-1.024 0,-1.414c-0.391,-0.391 -1.024,-0.391 -1.414,0l-4.95,4.95l-4.95,-4.95Z"
-                            />
-                        </svg>
-                    </div>
+                    <c-project-ship-mark status="{{ project.latest_ship.t2_status }}" />
                     <p class="text-center w-full text-sm">second pass</p>
                 </div>
                 <div class="w-24 mb-auto">
-                    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full"></div>
-                    <p class="text-center w-full text-sm">fraud check</p>
-                </div>
-                <div class="w-24 mb-auto">
-                    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full"></div>
+                    <c-project-ship-mark status="{{ project.latest_ship.final_status }}" />
                     <p class="text-center w-full text-sm">final review</p>
                 </div>
             </div>
diff --git a/twisted/twisted_site/templates/cotton/project_ship_mark.html b/twisted/twisted_site/templates/cotton/project_ship_mark.html
new file mode 100644
index 0000000..95c3af6
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/project_ship_mark.html
@@ -0,0 +1,13 @@
+{% if status == 'pending' %}
+<div class="mx-auto border flex border-border size-12 mb-2 rounded-full"></div>
+{% elif status == 'approved' %}
+<div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-green-700">
+    <c-svg.tick class="size-10 mx-auto my-auto text-green-400" />
+</div>
+{% elif status == 'rejected' or status == 'requested_changes' %}
+<div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-red-700">
+    <c-svg.cross class="size-10 mx-auto my-auto text-red-400" />
+</div>
+{% else %}
+<div class="mx-auto border flex border-border size-12 mb-2">No status found!</div>
+{% endif %}
diff --git a/twisted/twisted_site/templates/cotton/svg/cross.html b/twisted/twisted_site/templates/cotton/svg/cross.html
new file mode 100644
index 0000000..2e917dd
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/svg/cross.html
@@ -0,0 +1,18 @@
+<svg
+    class="{{ class }}"
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    stroke-linejoin="round"
+    stroke-miterlimit="1.414"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-label="view-close"
+    viewBox="0 0 32 32"
+    preserveAspectRatio="xMidYMid meet"
+    fill="currentColor"
+    width="256"
+    height="256"
+>
+    <path
+        d="M11.121,9.707c-0.39,-0.391 -1.024,-0.391 -1.414,0c-0.391,0.39 -0.391,1.024 0,1.414l4.95,4.95l-4.95,4.95c-0.391,0.39 -0.391,1.023 0,1.414c0.39,0.39 1.024,0.39 1.414,0l4.95,-4.95l4.95,4.95c0.39,0.39 1.023,0.39 1.414,0c0.39,-0.391 0.39,-1.024 0,-1.414l-4.95,-4.95l4.95,-4.95c0.39,-0.39 0.39,-1.024 0,-1.414c-0.391,-0.391 -1.024,-0.391 -1.414,0l-4.95,4.95l-4.95,-4.95Z"
+    />
+</svg>
diff --git a/twisted/twisted_site/templates/cotton/svg/tick.html b/twisted/twisted_site/templates/cotton/svg/tick.html
new file mode 100644
index 0000000..f0de869
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/svg/tick.html
@@ -0,0 +1,14 @@
+<svg
+    class="{{ class }}"
+    viewBox="-8 -12 40 40"
+    id="meteor-icon-kit__solid-checkmark"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+>
+    <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M3.06066 6.4393C2.47487 5.85355 1.52513 5.85355 0.93934 6.4393C0.353553 7.0251 0.353553 7.9749 0.93934 8.5607L7.93934 15.5607C8.52513 16.1464 9.47487 16.1464 10.0607 15.5607L23.0607 2.56066C23.6464 1.97487 23.6464 1.02513 23.0607 0.43934C22.4749 -0.14645 21.5251 -0.14645 20.9393 0.43934L9 12.3787L3.06066 6.4393z"
+        fill="currentColor"
+    />
+</svg>
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/review.py b/twisted/twisted_site/views/admin/review.py
index 3680dc4..7617c31 100644
--- a/twisted/twisted_site/views/admin/review.py
+++ b/twisted/twisted_site/views/admin/review.py
@@ -1,8 +1,56 @@
+from django.contrib import messages
+from django.http import HttpResponse
 from .admin import AdminView
 from django.shortcuts import render, redirect
+from django.conf import settings
+from ...models import ProjectShip
 
 # Create your views here.
 class ReviewView(AdminView):
     def get(self, request):
+        if settings.DEBUG_REVIEW:
+            return self.debug_get(request)
+        
         context = self.get_context_data(page='review')
         return render(request, "admin/review.html", context=context)
+    
+    def post(self, request):
+        if settings.DEBUG_REVIEW:
+            return self.debug_post(request)
+        
+        context = self.get_context_data(page='review')
+        return redirect(self.request.path_info)
+    
+    def debug_get(self, request):
+        context = self.get_context_data(page='review')
+        context['ships'] = ProjectShip.objects.all().order_by('-created_at')
+        return render(request, "admin/debug/review.html", context=context)
+    
+    def debug_post(self, request):
+        id = request.POST['id']
+        
+        t1_status = request.POST['t1_status']
+        t2_status = request.POST['t2_status']
+        fraud_status = request.POST['fraud_status']
+        final_status = request.POST['final_status']
+        
+        t1_message = request.POST['t1_message']
+        t2_message = request.POST['t2_message']
+        fraud_message = request.POST['fraud_message']
+        final_message = request.POST['final_message']
+        
+        ship = ProjectShip.objects.get(id=id)
+
+        ship.t1_status = t1_status
+        ship.t2_status = t2_status
+        ship.fraud_status = fraud_status
+        ship.final_status = final_status
+
+        ship.t1_message = t1_message
+        ship.t2_message = t2_message
+        ship.fraud_message = fraud_message
+        ship.final_message = final_message
+
+        ship.save()
+        messages.info(request, f"Ship with id {id} updated.")
+        return redirect(self.request.path_info)
\ No newline at end of file

From 0a615e90a963344ae3bda14f4ea1eaa88e7cbe19 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 28 Aug 2026 21:02:18 +0530
Subject: [PATCH 098/118] Revert "Fix issue with devving on windows"

This reverts commit 5293b990a03fe3e44aa46ea8db8c5f3d7878fe9e.
---
 ...atus_projectship_final_message_and_more.py | 57 -------------------
 .../templates/admin/debug/review.html         | 14 -----
 .../templates/cotton/project_ship_mark.html   | 11 ----
 .../templates/cotton/svg/check.html           | 14 -----
 .../templates/cotton/svg/cross.html           | 18 ------
 twisted/twisted_site/views/admin/dashboard.py |  2 +-
 6 files changed, 1 insertion(+), 115 deletions(-)
 delete mode 100644 twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py
 delete mode 100644 twisted/twisted_site/templates/admin/debug/review.html
 delete mode 100644 twisted/twisted_site/templates/cotton/project_ship_mark.html
 delete mode 100644 twisted/twisted_site/templates/cotton/svg/check.html
 delete mode 100644 twisted/twisted_site/templates/cotton/svg/cross.html

diff --git a/twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py b/twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py
deleted file mode 100644
index a0069c9..0000000
--- a/twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Generated by Django 6.0.7 on 2026-08-27 10:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('twisted_site', '0018_pathway'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='projectship',
-            name='status',
-        ),
-        migrations.AddField(
-            model_name='projectship',
-            name='final_message',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AddField(
-            model_name='projectship',
-            name='final_status',
-            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
-        ),
-        migrations.AddField(
-            model_name='projectship',
-            name='final_updated_at',
-            field=models.DateTimeField(default=None, null=True),
-        ),
-        migrations.AddField(
-            model_name='projectship',
-            name='fraud_message',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AddField(
-            model_name='projectship',
-            name='fraud_status',
-            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
-        ),
-        migrations.AddField(
-            model_name='projectship',
-            name='fraud_updated_at',
-            field=models.DateTimeField(default=None, null=True),
-        ),
-        migrations.AddField(
-            model_name='projectship',
-            name='t1_status',
-            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
-        ),
-        migrations.AddField(
-            model_name='projectship',
-            name='t2_status',
-            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
-        ),
-    ]
diff --git a/twisted/twisted_site/templates/admin/debug/review.html b/twisted/twisted_site/templates/admin/debug/review.html
deleted file mode 100644
index 976ce36..0000000
--- a/twisted/twisted_site/templates/admin/debug/review.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<c-base>
-    <div class="bg-red-900 text-center mb-2">
-        REVIEW IN DEBUG MODE (DEBUG_REVIEW=True in settings)
-    </div>
-    <div class="flex flex-col gap-2">
-        {% for ship in ships %}
-        <c-ui.card>
-            <div>
-                {{ ship }}
-            </div>
-        </c-ui.card>
-        {% endfor %}
-    </div>
-</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/project_ship_mark.html b/twisted/twisted_site/templates/cotton/project_ship_mark.html
deleted file mode 100644
index 9a5a78f..0000000
--- a/twisted/twisted_site/templates/cotton/project_ship_mark.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% if status == 'pending' %}
-<div class="mx-auto border flex border-border size-12 mb-2 rounded-full"></div>
-{% elif status == 'approved' %}
-<div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-green-700">
-    <c-svg.check class="size-10 mx-auto my-auto text-green-400" />
-</div>
-{% elif status == "rejected" or status == "requested_changes" %}
-    <div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-red-700">
-        <c-svg.cross class="size-10 mx-auto my-auto text-red-400" />
-    </div>
-{% endif %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/svg/check.html b/twisted/twisted_site/templates/cotton/svg/check.html
deleted file mode 100644
index f96ada0..0000000
--- a/twisted/twisted_site/templates/cotton/svg/check.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg
-                            class="{{ class }}"
-                            viewBox="-8 -12 40 40"
-                            id="meteor-icon-kit__solid-checkmark"
-                            fill="none"
-                            xmlns="http://www.w3.org/2000/svg"
-                        >
-                            <path
-                                fill-rule="evenodd"
-                                clip-rule="evenodd"
-                                d="M3.06066 6.4393C2.47487 5.85355 1.52513 5.85355 0.93934 6.4393C0.353553 7.0251 0.353553 7.9749 0.93934 8.5607L7.93934 15.5607C8.52513 16.1464 9.47487 16.1464 10.0607 15.5607L23.0607 2.56066C23.6464 1.97487 23.6464 1.02513 23.0607 0.43934C22.4749 -0.14645 21.5251 -0.14645 20.9393 0.43934L9 12.3787L3.06066 6.4393z"
-                                fill="currentColor"
-                            />
-                        </svg>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/svg/cross.html b/twisted/twisted_site/templates/cotton/svg/cross.html
deleted file mode 100644
index 2e917dd..0000000
--- a/twisted/twisted_site/templates/cotton/svg/cross.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg
-    class="{{ class }}"
-    fill-rule="evenodd"
-    clip-rule="evenodd"
-    stroke-linejoin="round"
-    stroke-miterlimit="1.414"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-label="view-close"
-    viewBox="0 0 32 32"
-    preserveAspectRatio="xMidYMid meet"
-    fill="currentColor"
-    width="256"
-    height="256"
->
-    <path
-        d="M11.121,9.707c-0.39,-0.391 -1.024,-0.391 -1.414,0c-0.391,0.39 -0.391,1.024 0,1.414l4.95,4.95l-4.95,4.95c-0.391,0.39 -0.391,1.023 0,1.414c0.39,0.39 1.024,0.39 1.414,0l4.95,-4.95l4.95,4.95c0.39,0.39 1.023,0.39 1.414,0c0.39,-0.391 0.39,-1.024 0,-1.414l-4.95,-4.95l4.95,-4.95c0.39,-0.39 0.39,-1.024 0,-1.414c-0.391,-0.391 -1.024,-0.391 -1.414,0l-4.95,4.95l-4.95,-4.95Z"
-    />
-</svg>
diff --git a/twisted/twisted_site/views/admin/dashboard.py b/twisted/twisted_site/views/admin/dashboard.py
index edeb329..a0010e9 100644
--- a/twisted/twisted_site/views/admin/dashboard.py
+++ b/twisted/twisted_site/views/admin/dashboard.py
@@ -19,7 +19,7 @@ def get(self, request):
             hours = journal.reduced_minutes / 60
             hours_logged += hours
             
-            date = journal.created_at.date().strftime("%a, %d %b")
+            date = journal.created_at.date().strftime("%a, %-d %b")
             hours_logged_chart[date] = hours_logged_chart.get(date, 0) + hours
             
             logged_project_type[journal.project.get_project_type_display()] += hours

From eb9173f8c7d14e16b3bc11d514e677b2275ac98f Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 28 Aug 2026 21:18:02 +0530
Subject: [PATCH 099/118] Add error logging for gunicorn

---
 twisted/entrypoint.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/twisted/entrypoint.sh b/twisted/entrypoint.sh
index ea881b5..8fddaab 100644
--- a/twisted/entrypoint.sh
+++ b/twisted/entrypoint.sh
@@ -6,6 +6,4 @@ uv run gunicorn -w 3 mysite.wsgi:application \
     --threads=4 \
     --worker-class=gthread \
     --log-level info \
-    --access-logfile - \
-    --error-logfile - \
     --capture-output

From 64f119b4da01f72c680b6e60d3886c4f62ec823a Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 28 Aug 2026 21:28:58 +0530
Subject: [PATCH 100/118] this should fix error logging :hs:

---
 twisted/mysite/settings.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 316cc66..53606dd 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -169,3 +169,19 @@
 
 # Django Messages Framework
 MESSAGE_STORAGE = "django.contrib.messages.storage.cookie.CookieStorage"
+
+
+# Logging
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,  # Keeps Gunicorn's loggers active
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+        },
+    },
+    'root': {
+        'handlers': ['console'],
+        'level': 'INFO',
+    },
+}

From af038a4daceecc9f96ee3e2e99448223ee70fc61 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 28 Aug 2026 21:31:27 +0530
Subject: [PATCH 101/118] Rename docker target to 'build' instead of the
 misleading 'development'

---
 twisted/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twisted/Dockerfile b/twisted/Dockerfile
index c8cec61..1d607c5 100644
--- a/twisted/Dockerfile
+++ b/twisted/Dockerfile
@@ -1,5 +1,5 @@
 ### Build ###
-FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim AS development
+FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim AS build
 
 ENV DEBIAN_FRONTEND=noninteractive
 

From af7e40af1cf6b46ced377bb5abf53b3fce0ed093 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sun, 30 Aug 2026 14:01:48 +0530
Subject: [PATCH 102/118] Added a migration i forgot to add before

---
 ...atus_projectship_final_message_and_more.py | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py

diff --git a/twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py b/twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py
new file mode 100644
index 0000000..d8c0efb
--- /dev/null
+++ b/twisted/twisted_site/migrations/0019_remove_projectship_status_projectship_final_message_and_more.py
@@ -0,0 +1,57 @@
+# Generated by Django 6.0.7 on 2026-08-28 15:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0018_pathway'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='projectship',
+            name='status',
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='final_message',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='final_status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='final_updated_at',
+            field=models.DateTimeField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='fraud_message',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='fraud_status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='fraud_updated_at',
+            field=models.DateTimeField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='t1_status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='t2_status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+    ]

From b1a7b560d5531eaa4c2533ca9d18bcf2578331a3 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Mon, 31 Aug 2026 21:38:22 +0530
Subject: [PATCH 103/118] QoL features

---
 twisted/twisted_site/models.py                |   8 +-
 .../templates/client/dashboard.html           |  20 +++-
 .../templates/client/projects/detail.html     | 101 +++++++++++-----
 .../templates/client/projects/ship.html       |  11 +-
 .../templates/cotton/project_ship_mark.html   |   4 +-
 .../templates/cotton/ship_message.html        |  18 +++
 twisted/twisted_site/views/client/auth.py     | 113 +++++++++++-------
 .../twisted_site/views/client/dashboard.py    |  20 +++-
 twisted/twisted_site/views/client/project.py  |  56 +++++----
 9 files changed, 233 insertions(+), 118 deletions(-)
 create mode 100644 twisted/twisted_site/templates/cotton/ship_message.html

diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index d6ae4d6..9e62ae2 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -185,13 +185,13 @@ class ProjectShip(models.Model):
 
 
     def latest_status(self):
-        if self.final_status:
+        if self.final_status != 'pending':
             return self.final_status
-        if self.fraud_status:
+        if self.fraud_status != 'pending':
             return self.fraud_status
-        if self.t2_status:
+        if self.t2_status != 'pending':
             return self.t2_status
-        if self.t1_status:
+        if self.t1_status != 'pending':
             return self.t1_status
     
     
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index b5dca24..a020af1 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -1,9 +1,9 @@
 {% extends "client/osbase.html" %} {% load static %} {% block body %}
-<main class="h-full w-full bg-gradbg text-foreground p-5 overflow-clip">
+<main class="h-full w-full bg-gradbg text-foreground overflow-clip">
     <img src="{% static 'images/twisted_logo.png' %}" alt=""
         class="fixed inset-0 z-0 bg-[url('static/images/twisted_logo.png')] pointer-events-none select-none my-auto justify-self-center opacity-60 bg-contain bg-scale scale-95 drop-shadow-lg shadow-primary" />
     <div class="relative z-10">
-        <div class="flex flex-col flex-wrap content-start gap-3 w-full h-full overflow-y-hidden">
+        <div class="flex flex-col flex-wrap content-start gap-3 w-full h-full overflow-y-hidden p-5">
             {% if user.profile.is_staff %}
             <div class="font-vintage w-fit cursor-pointer select-none">
                 <a href="{% url 'admin.dash' %}">
@@ -189,7 +189,7 @@
         false,
     );
 
-    function newWindow(title, src, w = 600, h = 600) {
+    function newWindow(title, src, w = 600, h = 600, x=null, y=null) {
         const template = document.getElementById("window-template");
         const container = document.getElementById("windows-container");
         const clone = template.content.cloneNode(true);
@@ -199,9 +199,11 @@
 
         win.querySelector(".title-bar-text").textContent = title;
         win.querySelector(".src-frame").src = src;
+        console.log(x, y);
+        
+        if (x === null) x = Math.random() * (window.innerWidth - w);
+        if (y === null) y = Math.random() * (window.innerHeight - w);
 
-        x = Math.random() * (window.innerWidth - w);
-        y = Math.random() * (window.innerHeight - w);
 
         win.style.left = x + "px";
         win.style.top = y + "px";
@@ -541,4 +543,12 @@
     drawSpectrum();
 </script>
 
+{% if startup_windows %}
+<div id="_startup" class="hidden">
+    {% for window in startup_windows %}
+    <iframe data-href="{{ window.href }}" data-title="{{ window.title }}" onload="console.log('loading...'); newWindow(this.dataset.title, this.dataset.href, 600, 600, 50, 50)"></iframe>
+    {% endfor %}
+</div>
+{% endif %}
+
 {% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 420f524..90a1064 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -13,7 +13,11 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                     </span>
 
                     {% if project.is_shipped %}
-                    <span class="border border-success bg-success/20 px-2 py-0.5 text-xs text-success"> SHIPPED </span>
+                    {% if project.latest_ship.latest_status == 'rejected' %}
+                    <span class="border border-red-600 bg-red-600/20 px-2 py-0.5 text-xs text-red-600"> permanently rejected </span>
+                    {% else %}
+                    <span class="border border-success bg-success/20 px-2 py-0.5 text-xs text-success"> shipped </span>
+                    {% endif %}
                     {% endif %}
                 </div>
 
@@ -21,8 +25,9 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                     {{ project.project_description }}
                 </p>
             </div>
-
+            
             <div class="flex shrink-0 flex-wrap gap-1">
+                {% if project.user == request.user %}
                 {% if project.repo_url and project.time_logged > 60 %} {% if not project.is_shipped %}
                 <a href="{% url 'fr.projects.ship' project.id %}">
                     <button
@@ -31,7 +36,8 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                         ship project
                     </button>
                 </a>
-                {% endif %} {% endif %} {% if not project.is_shipped %}
+                {% endif %} {% endif %}
+                {% if not project.is_shipped %}
                 <a href="{% url 'fr.projects.settings' project.id %}">
                     <button
                         class="border border-border bg-secondary px-3 py-1.5 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px"
@@ -40,6 +46,15 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                     </button>
                 </a>
                 {% endif %}
+                {% endif %}
+                <button
+                    class="border border-border bg-secondary px-3 py-1.5 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px"
+                    data-url="{{ request.scheme }}://{{ request.get_host }}{% url 'dashboard' %}?project={{ project.id }}"
+                    onclick="setTimeout(() => {alert(`copying ${this.dataset.url}`)}); navigator.clipboard.writeText(this.dataset.url)"
+                >
+                    Copy share link
+                </button>
+
             </div>
         </div>
     </div>
@@ -62,28 +77,9 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
         </div>
 
         {% if project.is_shipped %}
-        <div class="mb-3 border border-success bg-success/10 p-3">
-            <div class="font-bold text-success">Project shipped</div>
-
-            <div class="mt-1 text-sm text-muted-foreground">This project is now read-only.</div>
-
-            <div class="mt-2 flex w-full overflow-auto gap-4 items-center justify-center md:justify-start">
-                <div class="w-24 mb-auto">
-                    <c-project-ship-mark status="{{ project.latest_ship.t1_status }}" />
-                    <p class="text-center w-full text-sm">first pass</p>
-                </div>
-                <div class="w-24 mb-auto">
-                    <c-project-ship-mark status="{{ project.latest_ship.t2_status }}" />
-                    <p class="text-center w-full text-sm">second pass</p>
-                </div>
-                <div class="w-24 mb-auto">
-                    <c-project-ship-mark status="{{ project.latest_ship.final_status }}" />
-                    <p class="text-center w-full text-sm">final review</p>
-                </div>
-            </div>
-        </div>
-        {% endif %} {% if not project.hackatime_project_name and project.project_type != 'hardware' %}
+        {% endif %}
 
+        {% if not project.hackatime_project_name and project.project_type != 'hardware' %}
         <div class="mb-3 border border-warning bg-warning/10 p-3">
             <div class="font-bold text-warning">Hackatime project not linked bru...</div>
 
@@ -98,9 +94,7 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                 Open project settings
             </a>
         </div>
-
         {% elif not project.repo_url %}
-
         <div class="mb-3 border border-warning bg-warning/10 p-3">
             <div class="font-bold text-warning">VRO repository not linked</div>
 
@@ -113,7 +107,6 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                 Open project settings
             </a>
         </div>
-
         {% elif project.time_logged < 60 %}
         <div class="mb-3 border border-warning bg-warning/10 p-3">
             <div class="font-bold text-warning">log more time!</div>
@@ -134,7 +127,7 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                 class="flex flex-wrap items-center justify-between gap-2 border-b border-border bg-secondary px-3 py-2"
             >
                 <div>
-                    <div class="font-bold">Project journal</div>
+                    <div class="font-bold">Project activity</div>
 
                     <div class="text-xs text-muted-foreground">Devlogs and progress....</div>
                 </div>
@@ -150,8 +143,9 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
             </div>
 
             <div class="p-2">
-                {% for journal in project.journals.all|dictsortreversed:"created_at" %}
-
+                {% for activity_item in journals %}
+                {% if activity_item.content %} {# bad way to check if activity item is a journal #}
+                {% with activity_item as journal %}
                 <article class="mb-2 border border-border bg-background last:mb-0">
                     <div class="flex flex-wrap items-center gap-2 border-b border-border bg-card px-3 py-2">
                         <div class="min-w-0 flex-1 text-sm">
@@ -208,6 +202,53 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                         </c-mdpreview>
                     </div>
                 </article>
+                {% endwith %}
+                {% elif activity_item.t1_status %} {# bad way to check if activity item is a ship #}
+                {% with activity_item as ship %}
+                {% if ship.final_status != 'pending' %}
+                <c-ship-message title="final check complete" status="{{ ship.get_final_status_display }}" :time="ship.final_updated_at">
+                    {{ ship.final_message|default:"no message!"|linebreaksbr }}
+                </c-ship-message>
+                {% endif %}
+                {% if ship.t2_status != 'pending' %}
+                <c-ship-message title="second pass complete" status="{{ ship.get_t2_status_display }}" :time="ship.t2_updated_at">
+                    {{ ship.t2_message|default:"no message!"|linebreaksbr }}
+                </c-ship-message>
+                {% endif %}
+                {% if ship.t1_status != 'pending' %}
+                <c-ship-message title="first pass complete" status="{{ ship.get_t1_status_display }}" :time="ship.t1_updated_at">
+                    {{ ship.t1_message|default:"no message!"|linebreaksbr }}
+                </c-ship-message>
+                {% endif %}
+                <div class="mb-3 border border-success bg-success/10">
+                    <div class="p-2 px-3 border-b border-success flex gap-2">
+                        <span class="font-bold text-success">Project shipped</span>
+                        <span class="mx-1 text-success opacity-50"> • </span>
+                        <span class="text-success opacity-50" title="{{ ship.created_at }}">
+                            {{ ship.created_at|naturaltime }}
+                        </span>
+                    </div>
+                    <div class="p-3">
+                        <div class="mt-1 text-sm text-muted-foreground">This project is now read-only.</div>
+
+                        <div class="mt-2 flex w-full overflow-auto gap-4 items-center justify-center md:justify-start">
+                            <div class="w-24 mb-auto">
+                                <c-project-ship-mark status="{{ ship.t1_status }}" />
+                                <p class="text-center w-full text-sm">first pass</p>
+                            </div>
+                            <div class="w-24 mb-auto">
+                                <c-project-ship-mark status="{{ ship.t2_status }}" />
+                                <p class="text-center w-full text-sm">second pass</p>
+                            </div>
+                            <div class="w-24 mb-auto">
+                                <c-project-ship-mark status="{{ ship.final_status }}" />
+                                <p class="text-center w-full text-sm">final review</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                {% endwith %}
+                {% endif %}
 
                 {% empty %}
 
diff --git a/twisted/twisted_site/templates/client/projects/ship.html b/twisted/twisted_site/templates/client/projects/ship.html
index 7b42501..0918eab 100644
--- a/twisted/twisted_site/templates/client/projects/ship.html
+++ b/twisted/twisted_site/templates/client/projects/ship.html
@@ -1,7 +1,7 @@
 {% extends "client/osbase.html" %} {% load static time_filters humanize %}
 {% block body %}
 
-<div class="w-full h-full flex flex-col bg-surface font-vintage">
+<div class="w-full h-full flex flex-col bg-surface text-foreground font-vintage">
 
     {% if info %}
     <div class="shrink-0 mx-2 mt-2 border border-border bg-twisted-400 p-2">
@@ -11,7 +11,7 @@
 
     {% if not success %}
 
-    <div class="shrink-0 flex items-center gap-2 bg-accent text-accent-foreground px-3 py-2 border-b border-border">
+    <div class="shrink-0 flex items-center gap-2 bg-card px-3 py-2 border-b border-border">
         <span class="font-bold text-lg">Submit project</span>
     </div>
 
@@ -27,9 +27,8 @@
 
                 <div class="text-base">
                     Please read through our
-                    <a href="#" class="underline font-bold hover:text-primary-foreground">
-                        submission guidelines
-                    </a>
+                    <a href="https://docs.twisted.hackclub.com/shipping/" class="underline font-bold hover:text-primary" target="_blank">
+                        submission guidelines</a>
                     before continuing.
                 </div>
 
@@ -38,7 +37,7 @@
             <div class="mt-4 border border-border bg-card text-card-foreground p-4 text-center">
 
                 <div class="text-2xl font-bold">
-                    Did yk 90% of rejections could have taken 5 minutes to fix pff?
+                    Did yk 90% of rejections could have taken 5 minutes to fix?
                 </div>
 
                 <div class="mt-4 text-sm text-muted-foreground">
diff --git a/twisted/twisted_site/templates/cotton/project_ship_mark.html b/twisted/twisted_site/templates/cotton/project_ship_mark.html
index 95c3af6..70366f6 100644
--- a/twisted/twisted_site/templates/cotton/project_ship_mark.html
+++ b/twisted/twisted_site/templates/cotton/project_ship_mark.html
@@ -1,11 +1,11 @@
 {% if status == 'pending' %}
 <div class="mx-auto border flex border-border size-12 mb-2 rounded-full"></div>
 {% elif status == 'approved' %}
-<div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-green-700">
+<div class="mx-auto border flex border-green-400 size-12 mb-2 rounded-full bg-green-700">
     <c-svg.tick class="size-10 mx-auto my-auto text-green-400" />
 </div>
 {% elif status == 'rejected' or status == 'requested_changes' %}
-<div class="mx-auto border flex border-border size-12 mb-2 rounded-full bg-red-700">
+<div class="mx-auto border flex border-red-400 size-12 mb-2 rounded-full bg-red-700">
     <c-svg.cross class="size-10 mx-auto my-auto text-red-400" />
 </div>
 {% else %}
diff --git a/twisted/twisted_site/templates/cotton/ship_message.html b/twisted/twisted_site/templates/cotton/ship_message.html
new file mode 100644
index 0000000..4d01cd0
--- /dev/null
+++ b/twisted/twisted_site/templates/cotton/ship_message.html
@@ -0,0 +1,18 @@
+{% load time_filters humanize %} 
+<div class="mb-3 border border-border bg-background">
+    <div class="p-2 px-3 border-b border-border flex gap-2">
+        <span class="font-bold text-accent">{{ title }}</span>
+        <span class="mx-1 text-accent"> • </span>
+        <span class="text-accent" title="{{ time }}">
+            {{ time|naturaltime }}
+        </span>
+        <span class="mx-1 text-accent"> • </span>
+        <span class="text-accent">{{ status }}</span>
+    </div>
+    <div class="p-3">
+        <div>Message from the reviewer</div>
+        <div class="mt-1 text-sm text-muted-foreground">
+            {{ slot }}
+        </div>
+    </div>
+</div>
diff --git a/twisted/twisted_site/views/client/auth.py b/twisted/twisted_site/views/client/auth.py
index 0772367..d64c2be 100644
--- a/twisted/twisted_site/views/client/auth.py
+++ b/twisted/twisted_site/views/client/auth.py
@@ -18,13 +18,18 @@
     server_metadata_url="https://auth.hackclub.com/.well-known/openid-configuration",
     client_id=os.environ["HCA_CLIENT_ID"],
     client_secret=os.environ["HCA_CLIENT_SECRET"],
-    client_kwargs={"scope": "openid email name profile verification_status slack_id"},
+    client_kwargs={
+        "scope": "openid profile email phone address birthdate slack_id verification_status"
+    },
 )
 
 
 class LoginView(View):
     def post(self, request):
-        if request.user.is_authenticated and request.user.profile.hackatime_access_token:
+        if (
+            request.user.is_authenticated
+            and request.user.profile.hackatime_access_token
+        ):
             return redirect("dashboard")
 
         redirect_uri = os.environ["HCA_REDIRECT_URI"]
@@ -32,13 +37,16 @@ def post(self, request):
         response = oauth.hca.authorize_redirect(request, redirect_uri)
         return response
 
+
 class AuthCallbackView(View):
     def get(self, request):
-        if os.environ.get("LOGIN_ENABLED") == 'false':
-            return JsonResponse({"error": "Not allowed! DM @kavyansh. if this is a mistake!"})
-        
+        if os.environ.get("LOGIN_ENABLED") == "false":
+            return JsonResponse(
+                {"error": "Not allowed! DM @kavyansh. if this is a mistake!"}
+            )
+
         token = oauth.hca.authorize_access_token(request)
-        
+
         userinfo = token.get("userinfo")
         if not userinfo:
             userinfo = oauth.hackclub.userinfo(token=token)
@@ -58,16 +66,15 @@ def get(self, request):
                 "first_name": userinfo.get("given_name", ""),
                 "last_name": userinfo.get("family_name", ""),
             },
-        )  
+        )
 
         if slack_id:
             try:
                 slack_user = slack_bot.users_info(user=slack_id)["user"]
                 slack_profile = slack_user["profile"]
 
-                display_name = (
-                    slack_profile.get("display_name")
-                    or slack_profile.get("real_name")
+                display_name = slack_profile.get("display_name") or slack_profile.get(
+                    "real_name"
                 )
                 avatar_url = slack_profile.get("image_512")
 
@@ -84,66 +91,80 @@ def get(self, request):
         profile.ysws_eligible = ysws_eligible
         profile.save()
 
-        if os.environ.get("LOGIN_ENABLED") == 'maybe':
+        if os.environ.get("LOGIN_ENABLED") == "maybe":
             if not profile.is_allowed:
-                return JsonResponse({"error": "Not allowed! DM @kavyansh. if this is a mistake!"})
-        
+                return JsonResponse(
+                    {"error": "Not allowed! DM @kavyansh. if this is a mistake!"}
+                )
+
         login(request, user)
-        
+
         if not profile.hackatime_access_token:
-            HACKATIME_CLIENT_ID = os.environ['HACKATIME_CLIENT_ID']
-            HACKATIME_REDIRECT_URI = os.environ['HACKATIME_REDIRECT_URI']
-            scopes = 'profile+read'
-            
-            profile.hackatime_state = str(random.randint(0,10**20))
+            HACKATIME_CLIENT_ID = os.environ["HACKATIME_CLIENT_ID"]
+            HACKATIME_REDIRECT_URI = os.environ["HACKATIME_REDIRECT_URI"]
+            scopes = "profile+read"
+
+            profile.hackatime_state = str(random.randint(0, 10**20))
             profile.save()
-            
-            return redirect(f'https://hackatime.hackclub.com/oauth/authorize?client_id={HACKATIME_CLIENT_ID}&redirect_uri={HACKATIME_REDIRECT_URI}&response_type=code&scope={scopes}&state={profile.hackatime_state}')
-        
+
+            return redirect(
+                f"https://hackatime.hackclub.com/oauth/authorize?client_id={HACKATIME_CLIENT_ID}&redirect_uri={HACKATIME_REDIRECT_URI}&response_type=code&scope={scopes}&state={profile.hackatime_state}"
+            )
+
         return redirect("dashboard")
 
+
 class HackatimeCallbackView(View):
     def get(self, request):
-        if os.environ.get("LOGIN_ENABLED") == 'false':
+        if os.environ.get("LOGIN_ENABLED") == "false":
             return JsonResponse("not allowed!")
-        
+
         profile = request.user.profile
-        
-        state = request.GET['state']
+
+        state = request.GET["state"]
         if state != profile.hackatime_state:
             profile.hackatime_state = ""
             profile.save()
-            return JsonResponse({"error": "State mismatch; Auth failed. Please contact support with the error code if this is unexpected!"})
+            return JsonResponse(
+                {
+                    "error": "State mismatch; Auth failed. Please contact support with the error code if this is unexpected!"
+                }
+            )
         profile.hackatime_state = ""
         profile.save()
-        
-        code = request.GET['code']
-        HACKATIME_CLIENT_ID = os.environ['HACKATIME_CLIENT_ID']
-        HACKATIME_CLIENT_SECRET = os.environ['HACKATIME_CLIENT_SECRET']
-        HACKATIME_REDIRECT_URI = os.environ['HACKATIME_REDIRECT_URI']
-        resp = requests.post("https://hackatime.hackclub.com/oauth/token", data={
-            "client_id": HACKATIME_CLIENT_ID,
-            "client_secret": HACKATIME_CLIENT_SECRET,
-            "code": code,
-            "redirect_uri": HACKATIME_REDIRECT_URI,
-            "grant_type": "authorization_code",
-        })
+
+        code = request.GET["code"]
+        HACKATIME_CLIENT_ID = os.environ["HACKATIME_CLIENT_ID"]
+        HACKATIME_CLIENT_SECRET = os.environ["HACKATIME_CLIENT_SECRET"]
+        HACKATIME_REDIRECT_URI = os.environ["HACKATIME_REDIRECT_URI"]
+        resp = requests.post(
+            "https://hackatime.hackclub.com/oauth/token",
+            data={
+                "client_id": HACKATIME_CLIENT_ID,
+                "client_secret": HACKATIME_CLIENT_SECRET,
+                "code": code,
+                "redirect_uri": HACKATIME_REDIRECT_URI,
+                "grant_type": "authorization_code",
+            },
+        )
         resp.raise_for_status()
         data = resp.json()
-        access_token = data['access_token']
-        
+        access_token = data["access_token"]
+
         me = hackatime.me(access_token)
         if profile.slack_id != me.slack_id:
-            return JsonResponse({"error": "Slack ID mismatch. Please contact support with the error code if this is unexpected!"})
+            return JsonResponse(
+                {
+                    "error": "Slack ID mismatch. Please contact support with the error code if this is unexpected!"
+                }
+            )
 
         profile.hackatime_access_token = access_token
         profile.save()
-        return redirect('dashboard')
+        return redirect("dashboard")
 
-        
-        
 
 class LogoutView(View):
     def post(self, request):
         logout(request)
-        return redirect('homepage')
\ No newline at end of file
+        return redirect("homepage")
diff --git a/twisted/twisted_site/views/client/dashboard.py b/twisted/twisted_site/views/client/dashboard.py
index 87dc37e..e6c6090 100644
--- a/twisted/twisted_site/views/client/dashboard.py
+++ b/twisted/twisted_site/views/client/dashboard.py
@@ -1,5 +1,6 @@
 from django.views import View
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, resolve_url
+from ...models import Project
 
 # Create your views here.
 class DashboardView(View):
@@ -7,6 +8,19 @@ def get(self, request):
         if self.request.user.is_anonymous:
             return redirect('homepage')
         profile = self.request.user.profile
-        return render(request, "client/dashboard.html", {
+        
+        context = {
             "profile": profile
-        })
\ No newline at end of file
+        }
+        
+        startup_windows = []
+        
+        project_id = request.GET.get('project')
+        
+        if project_id:
+            project = Project.objects.get(id=project_id)
+            startup_windows.append({"href": resolve_url('fr.projects.detail', project.id), "title": project.project_name})
+        
+        context['startup_windows'] = startup_windows
+        
+        return render(request, "client/dashboard.html", context)
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index e7bcd0c..b2e5275 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -1,4 +1,5 @@
 from requests import HTTPError
+from itertools import chain
 from markdown_it.rules_inline import image
 from django.http import JsonResponse
 from django.views import View
@@ -6,6 +7,7 @@
 from ...models import Profile, Project, Journal, ProjectShip
 from ... import hackatime
 
+
 # Create your views here.
 class ProjectDetail(View):
     def get(self, request, id):
@@ -20,6 +22,12 @@ def get(self, request, id):
         project = Project.objects.get(id=id)
         context["project"] = project
 
+        journals = project.journals.all()
+        ships = project.ships.all()
+
+        context["journals"] = list(chain(journals, ships))
+        context["journals"].sort(key=lambda x: x.created_at, reverse=True)
+
         if project.user == request.user:
             context["owner"] = True
         else:
@@ -43,8 +51,8 @@ def get(self, request, id):
         context["project"] = project
 
         if project.is_shipped():
-            return redirect('fr.projects.detail', id)
-        
+            return redirect("fr.projects.detail", id)
+
         if project.user != request.user:
             return redirect("dashboard")
 
@@ -56,7 +64,7 @@ def get(self, request, id):
                 profile.hackatime_access_token
             )
         except HTTPError:
-            context['hackatime_projects'] = []
+            context["hackatime_projects"] = []
 
         return render(
             request,
@@ -73,8 +81,8 @@ def post(self, request, id):
             return redirect("dashboard")
 
         if project.is_shipped():
-            return redirect('fr.projects.detail', id)
-        
+            return redirect("fr.projects.detail", id)
+
         project.project_name = request.POST["name"]
         project.project_description = request.POST["description"]
         project.project_type = request.POST["type"]
@@ -83,36 +91,40 @@ def post(self, request, id):
         project.save()
         return redirect("fr.projects.detail", project.id)
 
+
 class SubmitProject(View):
     def get(self, request, id, context={}):
         if self.request.user.is_anonymous:
-            return redirect('homepage')
-        
+            return redirect("homepage")
+
         project = Project.objects.get(id=id)
         if project.user != request.user:
-            return redirect('dashboard')
-        
+            return redirect("dashboard")
+
         if not project.user.profile.ysws_eligible:
-            context["info"] = "You are not YSWS eligible yet! Please get IDVd! Get help with it at #identity-help! (if you think this is a mistake, please ask in #twisted-help)"
-        
-        
-        context['project'] = project
-        return render(request, 'client/projects/ship.html', context)
+            context["info"] = (
+                "You are not YSWS eligible yet! Please get IDVd! Get help with it at #identity-help! (if you think this is a mistake, please ask in #twisted-help)"
+            )
+
+        context["project"] = project
+        return render(request, "client/projects/ship.html", context)
 
     def post(self, request, id, context={}):
         if self.request.user.is_anonymous:
-            return redirect('homepage')
-        
+            return redirect("homepage")
+
         project = Project.objects.get(id=id)
         if project.user != request.user:
-            return redirect('dashboard')
-        
+            return redirect('fr.project.detail', project.id)
+
         if project.is_shipped():
-            return self.get(request, id, context={"info": "silly! you have already shipped."})
-        
+            return self.get(
+                request, id, context={"info": "silly! you have already shipped."}
+            )
+
         if not project.user.profile.ysws_eligible:
             return self.get(request, id)
-        
+
         ship = ProjectShip(project=project)
         ship.save()
-        return self.get(request, id, context={'success': True})
\ No newline at end of file
+        return redirect('fr.project.detail', project.id)

From 056947c1e8c8e9537a912737438267615f744ef1 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 1 Sep 2026 08:43:20 +0530
Subject: [PATCH 104/118] Make changes, add referral system

---
 .../migrations/0020_profile_twists.py         | 18 +++++
 ...le_my_referral_code_profile_referred_by.py | 24 ++++++
 .../0022_alter_profile_referred_by.py         | 19 +++++
 twisted/twisted_site/models.py                |  5 ++
 .../templates/client/dashboard.html           |  8 ++
 .../templates/client/referrals.html           | 77 +++++++++++++++++++
 .../{components => cotton}/button.html        |  2 +-
 twisted/twisted_site/urls.py                  |  1 +
 twisted/twisted_site/views/client/__init__.py |  3 +-
 twisted/twisted_site/views/client/auth.py     |  8 ++
 twisted/twisted_site/views/client/homepage.py | 26 ++++++-
 .../twisted_site/views/client/referrals.py    | 33 ++++++++
 12 files changed, 219 insertions(+), 5 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0020_profile_twists.py
 create mode 100644 twisted/twisted_site/migrations/0021_profile_my_referral_code_profile_referred_by.py
 create mode 100644 twisted/twisted_site/migrations/0022_alter_profile_referred_by.py
 create mode 100644 twisted/twisted_site/templates/client/referrals.html
 rename twisted/twisted_site/templates/{components => cotton}/button.html (98%)
 create mode 100644 twisted/twisted_site/views/client/referrals.py

diff --git a/twisted/twisted_site/migrations/0020_profile_twists.py b/twisted/twisted_site/migrations/0020_profile_twists.py
new file mode 100644
index 0000000..fd7fe54
--- /dev/null
+++ b/twisted/twisted_site/migrations/0020_profile_twists.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0.7 on 2026-08-31 16:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0019_remove_projectship_status_projectship_final_message_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='twists',
+            field=models.IntegerField(default=0),
+        ),
+    ]
diff --git a/twisted/twisted_site/migrations/0021_profile_my_referral_code_profile_referred_by.py b/twisted/twisted_site/migrations/0021_profile_my_referral_code_profile_referred_by.py
new file mode 100644
index 0000000..83e9e3b
--- /dev/null
+++ b/twisted/twisted_site/migrations/0021_profile_my_referral_code_profile_referred_by.py
@@ -0,0 +1,24 @@
+# Generated by Django 6.0.7 on 2026-08-31 16:17
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0020_profile_twists'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='my_referral_code',
+            field=models.CharField(blank=True, default='', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='referred_by',
+            field=models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='twisted_site.profile'),
+        ),
+    ]
diff --git a/twisted/twisted_site/migrations/0022_alter_profile_referred_by.py b/twisted/twisted_site/migrations/0022_alter_profile_referred_by.py
new file mode 100644
index 0000000..b378f21
--- /dev/null
+++ b/twisted/twisted_site/migrations/0022_alter_profile_referred_by.py
@@ -0,0 +1,19 @@
+# Generated by Django 6.0.7 on 2026-08-31 16:18
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0021_profile_my_referral_code_profile_referred_by'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='referred_by',
+            field=models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='referrals', to='twisted_site.profile'),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 9e62ae2..6f243b2 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -38,6 +38,11 @@ class Profile(models.Model):
 
     is_staff = models.BooleanField(default=False)
     is_allowed = models.BooleanField(default=False)
+    
+    twists = models.IntegerField(default=0)
+    
+    referred_by = models.ForeignKey('twisted_site.Profile', on_delete=models.PROTECT, null=True, default=None, related_name="referrals")
+    my_referral_code = models.CharField(max_length=200, blank=True, default="")
 
     def shipped_projects(self):
         shipped_projects = []
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index a020af1..e58dc89 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -25,6 +25,11 @@
                 <div class="size-15 bg-secondary border rounded-md flex items-center justify-center text-3xl">🛣️</div>
                 <span class="block text-center text-sm">Pathways</span>
             </div>
+            <div class="font-vintage w-fit cursor-pointer select-none" data-url="{% url 'fr.referrals' %}"
+                onclick="newWindow('Referrals', this.dataset.url)">
+                <div class="size-15 bg-secondary border rounded-md flex items-center justify-center text-3xl">👥</div>
+                <span class="block text-center text-sm">Referrals</span>
+            </div>
         </div>
 
         <div id="windows-container"></div>
@@ -48,6 +53,9 @@
                                 <div class="text-absolute-white font-bold text-sm font-vintage">
                                     {{ profile.slack_username|default:user.username }}
                                 </div>
+                                <div class="text-absolute-white text-sm font-vintage">
+                                    {{ profile.twists }} twists
+                                </div>
                             </div>
 
                             <div
diff --git a/twisted/twisted_site/templates/client/referrals.html b/twisted/twisted_site/templates/client/referrals.html
new file mode 100644
index 0000000..1ead88c
--- /dev/null
+++ b/twisted/twisted_site/templates/client/referrals.html
@@ -0,0 +1,77 @@
+{% extends "client/osbase.html" %}
+{% load static time_filters humanizelib maths mathfilters %}
+
+{% block body %}
+<div class="bg-card text-card-foreground flex flex-col w-full h-full min-h-0">
+
+    {% if profile.referred_by %}
+    <fieldset class="m-2 p-4 pt-2 border border-border">
+        <legend class="text-left px-2">Referred By</legend>
+        
+        <div class="flex align-middle gap-2 ">
+            <img class="size-8 rounded-md" src="{{ profile.referred_by.slack_pfp_url }}">
+    
+            <div class="my-auto font-bold">
+                {{ profile.referred_by.slack_username }}
+            </div>
+        </div>
+
+    </fieldset>
+    {% endif %}
+
+    <div class="border border-border m-4">
+        <div>
+            <h1 class="text-center font-bold">
+                Your referral URL (case sensitive!)
+            </h1>
+            <div class="text-center">
+                <a class="text-accent" href="{{ request.scheme }}://{{ request.get_host }}{% url 'homepage' %}?ref={{ profile.my_referral_code }}">{{ request.scheme }}://{{ request.get_host }}{% url 'homepage' %}?ref={{ profile.my_referral_code|default:"error!" }}</a>
+            </div>
+        </div>
+    </div>
+
+    <div class="flex-1 min-h-0 overflow-y-auto sunken-panel p-3 sm:p-4 font-vintage">
+
+        <div class="flex items-center gap-2 mb-3">
+            <div class="h-px bg-border flex-1"></div>
+            <h1 class="text-lg sm:text-xl font-bold whitespace-nowrap">
+                Past Referrals ({{ profile.referrals.count }})
+            </h1>
+            <div class="h-px bg-border flex-1"></div>
+        </div>
+        {% if profile.referrals.count %}
+        <div class="flex flex-col">
+            {% for referral in profile.referrals.all %}
+            <div class="border border-border m-1 p-2">
+                <div class="flex align-middle gap-2 ">
+                    <img class="size-8 rounded-md" src="{{ referral.slack_pfp_url }}">
+            
+                    <div class="my-auto">
+                        <div class="font-bold">
+                            {{ referral.slack_username }}
+                        </div>
+                        <div>
+                            YSWS eligible: {{ referral.ysws_eligible|yesno }}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {% endfor %}
+        </div>
+        {% else %}
+        <div class="text-center">No referrals yet!</div>
+        {% endif %}
+
+
+    </div>
+
+
+    <div class="status-field-border font-vintage shrink-0 border-t p-1 border-border">
+        <div class="mx-1 text-sm">
+            {{ profile.referrals.count }}
+            referral{{ profile.referrals.count|pluralize }}
+        </div>
+    </div>
+
+</div>
+{% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/components/button.html b/twisted/twisted_site/templates/cotton/button.html
similarity index 98%
rename from twisted/twisted_site/templates/components/button.html
rename to twisted/twisted_site/templates/cotton/button.html
index efbeb9b..fa616d3 100644
--- a/twisted/twisted_site/templates/components/button.html
+++ b/twisted/twisted_site/templates/cotton/button.html
@@ -28,5 +28,5 @@
 
         {{ class }}
     ">
-    {{ text }}
+    {{ slot }}
 </button>
\ No newline at end of file
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index 32dfc5d..b312f36 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -26,6 +26,7 @@
     path("dashboard/frame/projects/<int:id>/journals/new/untracked/", client.NewProjectUntrackedJournal.as_view(), name="fr.projects.journals.new.untracked"),
     path("dashboard/frame/journals/delete/<int:id>/", client.DeleteJournal.as_view(), name="fr.projects.journals.delete"),
     path("dashboard/frame/pathways/", client.PathwaysView.as_view(), name="fr.pathways"),
+    path("dashboard/frame/referrals/", client.ReferralsView.as_view(), name="fr.referrals"),
 
     path("admin/", admin.DashboardView.as_view(), name="admin.dash"),
     path("admin/users/", admin.UsersView.as_view(), name="admin.users"),
diff --git a/twisted/twisted_site/views/client/__init__.py b/twisted/twisted_site/views/client/__init__.py
index b68b5fc..4421a98 100644
--- a/twisted/twisted_site/views/client/__init__.py
+++ b/twisted/twisted_site/views/client/__init__.py
@@ -3,4 +3,5 @@
 from .projects import ListProjects, CreateProject
 from .project import ProjectDetail, ProjectSettings, SubmitProject
 from .journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal, DeleteJournal
-from .pathways import PathwaysView
\ No newline at end of file
+from .pathways import PathwaysView
+from .referrals import ReferralsView
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/auth.py b/twisted/twisted_site/views/client/auth.py
index d64c2be..fff52df 100644
--- a/twisted/twisted_site/views/client/auth.py
+++ b/twisted/twisted_site/views/client/auth.py
@@ -89,6 +89,14 @@ def get(self, request):
         profile.slack_username = display_name
         profile.slack_pfp_url = avatar_url
         profile.ysws_eligible = ysws_eligible
+        
+        referral_code = self.request.COOKIES.get('referral')
+        if created and referral_code:
+            referral_profiles = Profile.objects.filter(my_referral_code=referral_code)
+            if referral_profiles:
+                referral_profile = referral_profiles.get()
+                profile.referred_by = referral_profile
+        
         profile.save()
 
         if os.environ.get("LOGIN_ENABLED") == "maybe":
diff --git a/twisted/twisted_site/views/client/homepage.py b/twisted/twisted_site/views/client/homepage.py
index 78da9c5..9008576 100644
--- a/twisted/twisted_site/views/client/homepage.py
+++ b/twisted/twisted_site/views/client/homepage.py
@@ -2,15 +2,35 @@
 from django.shortcuts import render
 import os
 
+
 # Create your views here.
 class HomepageView(View):
     def get(self, request):
-        if os.environ.get("LOGIN_ENABLED") == 'false':
+        if os.environ.get("LOGIN_ENABLED") == "false":
             login_enabled = False
         else:
             login_enabled = True
-        return render(request, "client/homepage.html", {"login_enabled": login_enabled})
+        
+        referral_code = request.GET.get("ref")
+        
+        response = render(
+            request,
+            "client/homepage.html",
+            {"login_enabled": login_enabled},
+        )
+        
+        if referral_code:
+            response.set_cookie(
+                'referral',
+                referral_code,
+                max_age=60*60, # 1 hour
+                httponly=True,
+                samesite='Lax'
+            )
+
+        return response
+
 
 class FaqsView(View):
     def get(self, request):
-        return render(request, "client/faqs.html")
\ No newline at end of file
+        return render(request, "client/faqs.html")
diff --git a/twisted/twisted_site/views/client/referrals.py b/twisted/twisted_site/views/client/referrals.py
new file mode 100644
index 0000000..0ddeb28
--- /dev/null
+++ b/twisted/twisted_site/views/client/referrals.py
@@ -0,0 +1,33 @@
+from django.utils import timezone
+from django.http import JsonResponse, HttpResponse
+from django.views import View
+from django.shortcuts import render, redirect
+from ...models import Profile
+import random
+import string
+
+
+# Create your views here.
+class ReferralsView(View):
+    def get(self, request):
+        if self.request.user.is_anonymous:
+            return redirect("homepage")
+        
+        context = {}
+        
+        context['profile'] = profile = request.user.profile
+        
+        if not profile.my_referral_code:
+            while True:
+                current_code = ''.join([random.choice(string.ascii_letters + string.digits) for _ in range(12)])
+                if len(Profile.objects.filter(my_referral_code=current_code)) == 0:
+                    profile.my_referral_code = current_code
+                    profile.save()
+                    break
+
+
+        return render(
+            request,
+            "client/referrals.html",
+            context=context
+        )

From c48122640dbeb2981be5306d82f212417e211715 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 1 Sep 2026 09:01:52 +0530
Subject: [PATCH 105/118] Add referral indicators

---
 .../templates/client/referrals.html           | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/twisted/twisted_site/templates/client/referrals.html b/twisted/twisted_site/templates/client/referrals.html
index 1ead88c..d21853b 100644
--- a/twisted/twisted_site/templates/client/referrals.html
+++ b/twisted/twisted_site/templates/client/referrals.html
@@ -19,13 +19,16 @@
     </fieldset>
     {% endif %}
 
-    <div class="border border-border m-4">
+    <div class="border border-border m-4 p-2">
         <div>
             <h1 class="text-center font-bold">
                 Your referral URL (case sensitive!)
             </h1>
             <div class="text-center">
                 <a class="text-accent" href="{{ request.scheme }}://{{ request.get_host }}{% url 'homepage' %}?ref={{ profile.my_referral_code }}">{{ request.scheme }}://{{ request.get_host }}{% url 'homepage' %}?ref={{ profile.my_referral_code|default:"error!" }}</a>
+                <div>
+                    For someone to be considered a referral, they must be ID verified and log atleast an hour.
+                </div>
             </div>
         </div>
     </div>
@@ -50,8 +53,33 @@ <h1 class="text-lg sm:text-xl font-bold whitespace-nowrap">
                         <div class="font-bold">
                             {{ referral.slack_username }}
                         </div>
-                        <div>
-                            YSWS eligible: {{ referral.ysws_eligible|yesno }}
+                        <div class="flex align-middle gap-2">
+                            {% if referral.ysws_eligible %}
+                            <div class="bg-success-foreground border border-success text-success aspect-square h-4 my-auto text-center text-sm">
+                                ✓
+                            </div>
+                            {% else %}
+                            <div class="bg-warning-foreground border border-warning text-warning aspect-square h-4 my-auto text-center text-sm">
+                                ✗
+                            </div>
+                            {% endif %}
+                            <span>
+                                YSWS eligible: {{ referral.ysws_eligible|yesno }}
+                            </span>
+                        </div>
+                        <div class="flex align-middle gap-2">
+                            {% if referral.time_logged > 60 %}
+                            <div class="bg-success-foreground border border-success text-success aspect-square h-4 my-auto text-center text-sm">
+                                ✓
+                            </div>
+                            {% else %}
+                            <div class="bg-warning-foreground border border-warning text-warning aspect-square h-4 my-auto text-center text-sm">
+                                ✗
+                            </div>
+                            {% endif %}
+                            <span>
+                                Time logged: {{ referral.time_logged|minutes_to_hours_minutes }}/1h
+                            </span>
                         </div>
                     </div>
                 </div>

From 159566c48062af35cac845598f4b130c1810815b Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 1 Sep 2026 15:47:20 +0530
Subject: [PATCH 106/118] Add some audit logs

---
 .../twisted_site/migrations/0023_auditlog.py  | 27 +++++++
 .../migrations/0024_auditlog_timestamp.py     | 20 +++++
 twisted/twisted_site/models.py                | 12 +++
 .../twisted_site/templates/admin/logs.html    | 75 +++++++++++++++++++
 twisted/twisted_site/urls.py                  |  1 +
 twisted/twisted_site/views/admin/__init__.py  |  1 +
 twisted/twisted_site/views/admin/admin.py     | 13 +++-
 .../twisted_site/views/admin/audit_logs.py    | 11 +++
 twisted/twisted_site/views/admin/users.py     |  9 +++
 9 files changed, 167 insertions(+), 2 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0023_auditlog.py
 create mode 100644 twisted/twisted_site/migrations/0024_auditlog_timestamp.py
 create mode 100644 twisted/twisted_site/templates/admin/logs.html
 create mode 100644 twisted/twisted_site/views/admin/audit_logs.py

diff --git a/twisted/twisted_site/migrations/0023_auditlog.py b/twisted/twisted_site/migrations/0023_auditlog.py
new file mode 100644
index 0000000..5cf5e6c
--- /dev/null
+++ b/twisted/twisted_site/migrations/0023_auditlog.py
@@ -0,0 +1,27 @@
+# Generated by Django 6.0.7 on 2026-09-01 08:34
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0022_alter_profile_referred_by'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AuditLog',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('path', models.CharField(max_length=400)),
+                ('post', models.BooleanField()),
+                ('pii', models.BooleanField(default=False)),
+                ('additional_context', models.JSONField(default={})),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='audit_logs', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/twisted/twisted_site/migrations/0024_auditlog_timestamp.py b/twisted/twisted_site/migrations/0024_auditlog_timestamp.py
new file mode 100644
index 0000000..e21ce8c
--- /dev/null
+++ b/twisted/twisted_site/migrations/0024_auditlog_timestamp.py
@@ -0,0 +1,20 @@
+# Generated by Django 6.0.7 on 2026-09-01 08:36
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0023_auditlog'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='auditlog',
+            name='timestamp',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 6f243b2..744fbbb 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -355,3 +355,15 @@ def qualified_participants(self):
     
     def __str__(self):
         return self.name
+
+class AuditLog(models.Model):
+    timestamp = models.DateTimeField(auto_now_add=True)
+    user = models.ForeignKey(User, on_delete=models.PROTECT, related_name='audit_logs')
+    path = models.CharField(max_length=400)
+    post = models.BooleanField()
+    pii = models.BooleanField(default=False)
+
+    additional_context = models.JSONField(default={})
+    
+    def __str__(self):
+        return f"Audit log for {self.user.profile.slack_username}. PII: {self.pii}"
diff --git a/twisted/twisted_site/templates/admin/logs.html b/twisted/twisted_site/templates/admin/logs.html
new file mode 100644
index 0000000..b1caab0
--- /dev/null
+++ b/twisted/twisted_site/templates/admin/logs.html
@@ -0,0 +1,75 @@
+<c-base>
+<div>
+    <div class="mb-4">
+        <h1 class="text-center md:text-left me-4 font-semibold text-3xl mt-auto">
+            Audit Logs ({{ logs.count }})
+        </h1>
+        <p class="italic">
+            are others doing something naughty..?
+        </p>
+    </div>
+    <div>
+        <div class="flex flex-col gap-4">
+            {% for log in logs %}
+            <c-ui.card padding="sm">
+                <div class="flex gap-4 mb-1">
+                    <div class="flex gap-2">
+                        <img class="size-6 rounded-md" src="{{ log.user.profile.slack_pfp_url }}">
+                        <span class="font-bold">
+                            {{ log.user.profile.slack_username }}
+                        </span>
+                    </div>
+                    <div>
+                        {% if log.pii %}
+                        <c-ui.badge color="red">PII: Yes</c-ui.badge>
+                        {% else %}
+                        <c-ui.badge>PII: No</c-ui.badge>
+                        {% endif %}
+                    </div>
+                    <div title="your local time">
+                        <c-ui.badge>
+                            {{ log.timestamp }}
+                        </c-ui.badge>
+                    </div>
+                </div>
+                <div class="flex gap-2">
+                    <c-ui.badge>
+                        {{ log.post|yesno:"POST,GET" }}
+                    </c-ui.badge>
+                    <span>
+                        {{ log.path }}
+                    </span>
+                </div>
+                {% if log.additional_context %}
+                <div>
+                    <label class="text-white/40 uppercase text-xs">Additional info</label>
+                    <div>
+                        
+                        {% for key, val in log.additional_context.items %}
+                        <div class="flex gap-1">
+                            {% if key|slice:"-5:" == "__img" %}
+                            <c-ui.badge>
+                                {{ key|slice:":-5" }}
+                            </c-ui.badge>
+                            <span>
+                                <img src="{{ val }}" alt="{{ key }}" class="size-6 rounded-md">
+                            </span>
+                            {% else %}
+                            <c-ui.badge>
+                                {{ key }}
+                            </c-ui.badge>
+                            <span>
+                                {{ val }}
+                            </span>
+                            {% endif %}
+                        </div>
+                        {% endfor %}
+                    </div>
+                </div>
+                {% endif %}
+            </c-ui.card>
+            {% endfor %}
+        </div>
+    </div>
+</div>
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index b312f36..c32c5e2 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -38,4 +38,5 @@
     path("admin/shop/", admin.ShopView.as_view(), name="admin.shop"),
     path("admin/review/", admin.ReviewView.as_view(), name="admin.review"),
     path("admin/announcements/", admin.AnnouncementsView.as_view(), name="admin.announcements"),
+    path("admin/logs/", admin.AuditLogsView.as_view(), name="admin.logs"),
 ]
diff --git a/twisted/twisted_site/views/admin/__init__.py b/twisted/twisted_site/views/admin/__init__.py
index e88f93d..d2ffe18 100644
--- a/twisted/twisted_site/views/admin/__init__.py
+++ b/twisted/twisted_site/views/admin/__init__.py
@@ -5,3 +5,4 @@
 from .shop import ShopView
 from .review import ReviewView
 from .announcements import AnnouncementsView
+from .audit_logs import AuditLogsView
diff --git a/twisted/twisted_site/views/admin/admin.py b/twisted/twisted_site/views/admin/admin.py
index 5cef33f..0d9e578 100644
--- a/twisted/twisted_site/views/admin/admin.py
+++ b/twisted/twisted_site/views/admin/admin.py
@@ -4,6 +4,7 @@
 import json
 from typing import Literal
 from django_htmx.http import trigger_client_event
+from ...models import AuditLog
 
 @dataclass
 class SidebarLink:
@@ -19,13 +20,14 @@ def get_context_data(self, page, subpage=None) -> dict:
         context['page'] = page
         context['subpage'] = subpage
         context["sidebar_links"] = [
-            SidebarLink(name="dashboard", icon="analytics", text="Dashboard", href=resolve_url('admin.dash')),
+            SidebarLink(name="dashboard", icon="analytics", text="Analytics", href=resolve_url('admin.dash')),
             SidebarLink(name="users", icon="profile", text="Users", href=resolve_url('admin.users')),
             SidebarLink(name="pathways", icon="controls", text="Pathways", href=resolve_url('admin.pathways')),
             SidebarLink(name="fulfillment", icon="list", text="Fulfillment", href=resolve_url('admin.fulfillment')),
             SidebarLink(name="shop", icon="bag-add", text="Shop", href=resolve_url('admin.shop')),
-            SidebarLink(name="review", icon="reply", text="Review", href=resolve_url('admin.review')),
+            SidebarLink(name="review", icon="message-new", text="Review", href=resolve_url('admin.review')),
             SidebarLink(name="announcements", icon="important", text="Announcements", href=resolve_url('admin.announcements')),
+            SidebarLink(name="logs", icon="view", text="Audit Logs", href=resolve_url('admin.logs')),
         ]
         context['profile'] = self.request.user.profile
         return context
@@ -36,5 +38,12 @@ def dispatch(self, request, *args, **kwargs):
             return redirect('homepage')
         if not request.user.profile.is_staff:
             return redirect('dashboard')
+        self.audit_log = AuditLog(
+            user=request.user,
+            path=self.request.get_full_path(),
+            post=(request.method.lower() == 'post'),
+            additional_context={}
+        )
         response = super().dispatch(request, *args, **kwargs)
+        self.audit_log.save()
         return response
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/audit_logs.py b/twisted/twisted_site/views/admin/audit_logs.py
new file mode 100644
index 0000000..04a131a
--- /dev/null
+++ b/twisted/twisted_site/views/admin/audit_logs.py
@@ -0,0 +1,11 @@
+from django.template.response import TemplateResponse
+from .admin import AdminView
+from django.shortcuts import render, redirect
+from ...models import AuditLog
+
+# Create your views here.
+class AuditLogsView(AdminView):
+    def get(self, request):
+        context = self.get_context_data(page='logs')
+        context['logs'] = AuditLog.objects.order_by('-timestamp').all()
+        return TemplateResponse(request, "admin/logs.html", context=context)
diff --git a/twisted/twisted_site/views/admin/users.py b/twisted/twisted_site/views/admin/users.py
index a38e9cb..3b1b03e 100644
--- a/twisted/twisted_site/views/admin/users.py
+++ b/twisted/twisted_site/views/admin/users.py
@@ -36,15 +36,24 @@ class UserDetailView(AdminView):
     def get(self, request, id):
         context = self.get_context_data(page='users', subpage='detail')
         user = User.objects.get(id=id)
+
+        self.audit_log.additional_context['user_pfp__img'] = user.profile.slack_pfp_url
+        self.audit_log.additional_context['user'] = user.profile.slack_username
+        
         context['user'] = user
         context['login_maybe'] = os.environ.get("LOGIN_ENABLED") == 'maybe'
         return TemplateResponse(request, "admin/user.html", context)
     
     def post(self, request, id):
         user = User.objects.get(id=id)
+
+        self.audit_log.additional_context['user_pfp__img'] = user.profile.slack_pfp_url
+        self.audit_log.additional_context['user'] = user.profile.slack_username
+
         if request.POST.get('action') == 'toggle_is_allowed':
             prof = user.profile
             prof.is_allowed = not prof.is_allowed
+            self.audit_log.additional_context['is_allowed'] = f"Set to {prof.is_allowed}"
             prof.save()
             resp = redirect(self.request.path)
             resp["HX-Trigger"] = json.dumps({

From 6ce387d3715c04b65d01ae2c602e3a54043f76cb Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Tue, 1 Sep 2026 22:06:37 +0530
Subject: [PATCH 107/118] Make changes :p

---
 twisted/.env.example                          |  7 +++++--
 .../0025_alter_auditlog_additional_context.py | 18 +++++++++++++++++
 twisted/twisted_site/models.py                |  2 +-
 .../twisted_site/templates/admin/logs.html    | 13 +++++++++++-
 twisted/twisted_site/views/admin/admin.py     |  3 +--
 .../twisted_site/views/admin/audit_logs.py    | 20 ++++++++++++++++++-
 6 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0025_alter_auditlog_additional_context.py

diff --git a/twisted/.env.example b/twisted/.env.example
index 6542311..7e9befe 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -2,7 +2,6 @@ SECRET_KEY=<insert-super-secure-secret-here>
 LOGIN_ENABLED=true # possible options: 'true,false,maybe'
 
 DEBUG=true
-DEBUG_REVIEW=true
 
 POSTGRES_DB = django
 POSTGRES_USER = django
@@ -31,4 +30,8 @@ R2_ACCESS_KEY = <your-access-key>
 R2_SECRET_KEY = <your-secret-key>
 R2_BUCKET = <your-bucket>
 R2_PUBLIC_URL = <your-public-url>
-R2_TOKEN = 
\ No newline at end of file
+R2_TOKEN = 
+
+DEBUG_REVIEW=true
+ARI_INGEST_ENDPOINT=
+ARI_SIGNING_SECRET=
\ No newline at end of file
diff --git a/twisted/twisted_site/migrations/0025_alter_auditlog_additional_context.py b/twisted/twisted_site/migrations/0025_alter_auditlog_additional_context.py
new file mode 100644
index 0000000..4df221c
--- /dev/null
+++ b/twisted/twisted_site/migrations/0025_alter_auditlog_additional_context.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0.7 on 2026-09-01 10:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0024_auditlog_timestamp'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='auditlog',
+            name='additional_context',
+            field=models.JSONField(default=None, null=True),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 744fbbb..904e082 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -363,7 +363,7 @@ class AuditLog(models.Model):
     post = models.BooleanField()
     pii = models.BooleanField(default=False)
 
-    additional_context = models.JSONField(default={})
+    additional_context = models.JSONField(null=True, default=None)
     
     def __str__(self):
         return f"Audit log for {self.user.profile.slack_username}. PII: {self.pii}"
diff --git a/twisted/twisted_site/templates/admin/logs.html b/twisted/twisted_site/templates/admin/logs.html
index b1caab0..5025a1e 100644
--- a/twisted/twisted_site/templates/admin/logs.html
+++ b/twisted/twisted_site/templates/admin/logs.html
@@ -2,11 +2,19 @@
 <div>
     <div class="mb-4">
         <h1 class="text-center md:text-left me-4 font-semibold text-3xl mt-auto">
-            Audit Logs ({{ logs.count }})
+            Audit Logs ({{ log_count }})
         </h1>
         <p class="italic">
             are others doing something naughty..?
         </p>
+        <div class="mt-2">
+            <c-ui.pagination :page_obj="logs" />
+        </div>
+    </div>
+    <div class="mb-4">
+        <form action="">
+            
+        </form>
     </div>
     <div>
         <div class="flex flex-col gap-4">
@@ -71,5 +79,8 @@ <h1 class="text-center md:text-left me-4 font-semibold text-3xl mt-auto">
             {% endfor %}
         </div>
     </div>
+    <div class="mt-4">
+        <c-ui.pagination :page_obj="logs" />
+    </div>
 </div>
 </c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/views/admin/admin.py b/twisted/twisted_site/views/admin/admin.py
index 0d9e578..4ce9ec1 100644
--- a/twisted/twisted_site/views/admin/admin.py
+++ b/twisted/twisted_site/views/admin/admin.py
@@ -27,7 +27,7 @@ def get_context_data(self, page, subpage=None) -> dict:
             SidebarLink(name="shop", icon="bag-add", text="Shop", href=resolve_url('admin.shop')),
             SidebarLink(name="review", icon="message-new", text="Review", href=resolve_url('admin.review')),
             SidebarLink(name="announcements", icon="important", text="Announcements", href=resolve_url('admin.announcements')),
-            SidebarLink(name="logs", icon="view", text="Audit Logs", href=resolve_url('admin.logs')),
+            SidebarLink(name="logs", icon="view", text="Audit Logs", href=resolve_url('admin.logs')+"?page=1"),
         ]
         context['profile'] = self.request.user.profile
         return context
@@ -42,7 +42,6 @@ def dispatch(self, request, *args, **kwargs):
             user=request.user,
             path=self.request.get_full_path(),
             post=(request.method.lower() == 'post'),
-            additional_context={}
         )
         response = super().dispatch(request, *args, **kwargs)
         self.audit_log.save()
diff --git a/twisted/twisted_site/views/admin/audit_logs.py b/twisted/twisted_site/views/admin/audit_logs.py
index 04a131a..f18e35f 100644
--- a/twisted/twisted_site/views/admin/audit_logs.py
+++ b/twisted/twisted_site/views/admin/audit_logs.py
@@ -1,11 +1,29 @@
+from django.db.models.query_utils import Q
 from django.template.response import TemplateResponse
 from .admin import AdminView
 from django.shortcuts import render, redirect
 from ...models import AuditLog
+from django.core.paginator import Paginator
 
 # Create your views here.
 class AuditLogsView(AdminView):
     def get(self, request):
+        page_number = request.GET.get('page')
+        if page_number is None:
+            return redirect(self.request.get_full_path()+'?page=1')
+        
         context = self.get_context_data(page='logs')
-        context['logs'] = AuditLog.objects.order_by('-timestamp').all()
+        
+        auditlogs = AuditLog.objects.order_by('-timestamp')
+        
+        context_mode = request.GET.get('context_mode', 'false') == 'true'
+        if context_mode:
+            auditlogs = auditlogs.exclude(
+                Q(additional_context__isnull=True) | 
+                Q(additional_context={})
+            )
+        
+        paginator = Paginator(auditlogs, 250, orphans=50)
+        context['logs'] = paginator.get_page(page_number)
+        context['log_count'] = len(auditlogs)
         return TemplateResponse(request, "admin/logs.html", context=context)

From 31e070ceb8d89cb6cd340a674a297a4873f78295 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2026 16:41:26 +0000
Subject: [PATCH 108/118] Bump cryptography from 49.0.0 to 50.0.0

Bumps [cryptography](https://github.com/pyca/cryptography) from 49.0.0 to 50.0.0.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/49.0.0...50.0.0)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-version: 50.0.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 uv.lock | 82 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/uv.lock b/uv.lock
index 06ed01f..007ccfd 100644
--- a/uv.lock
+++ b/uv.lock
@@ -357,52 +357,52 @@ wheels = [
 
 [[package]]
 name = "cryptography"
-version = "49.0.0"
+version = "50.0.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cffi", marker = "platform_python_implementation != 'PyPy'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/1f/99/d1c90d6041656cc6ee229dc99cd67fd0cd5aec3c5f7d72fffc27cc750054/cryptography-49.0.0.tar.gz", hash = "sha256:f89660a348f4f78a92366240a61404e337586ef7f5909a2fef59ca88ef505493", size = 854345, upload-time = "2026-06-12T20:02:30.512Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/de/41/6cbdcf9142d00fe82836fbb51e503e58088575cf7a0fe1dbff6695bf0840/cryptography-50.0.0.tar.gz", hash = "sha256:eeac2acb5a20ed25e0ad6d1df9891a520b78b404266b6d11778f25d5d691a6c9", size = 880201, upload-time = "2026-07-31T14:25:10.11Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9b/22/adf66990e63584a68dfb50c24f48a125c07b1699899381c8151e63ed458c/cryptography-49.0.0-cp311-abi3-macosx_11_0_arm64.whl", hash = "sha256:966fe0e9c67490071f14c0d2b1cb2dfb3023c5ce39457343931415f08382f2db", size = 4032100, upload-time = "2026-06-12T20:02:32.143Z" },
-    { url = "https://files.pythonhosted.org/packages/09/41/3797cfaf69cae04a13ee78ebd83f0678d9c02b4779d21ce24445326f1a69/cryptography-49.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:36d1709f992593689b45bda411498d62c6e365f2ca00b84657d4dadd24de16db", size = 4692978, upload-time = "2026-06-12T20:01:21.305Z" },
-    { url = "https://files.pythonhosted.org/packages/e6/8b/43011f7ebe515a8aa20d61f290a326cd890c2e738e16e59eaff8d9c3a412/cryptography-49.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0e959b578856a3924bc0cbb710fc12c387b9412a951389f3ca61704a9e25f325", size = 4716422, upload-time = "2026-06-12T20:01:48.566Z" },
-    { url = "https://files.pythonhosted.org/packages/4a/91/01ce7303a4579e6d3a6abef01bd322848e9ea7a219adcabc5048b9033571/cryptography-49.0.0-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:53ecee2e23f7169b6117e99fc8a944e5e50f79e69758a83b52a00cb98ab2b2d2", size = 4700503, upload-time = "2026-06-12T20:02:47.091Z" },
-    { url = "https://files.pythonhosted.org/packages/62/99/a2c95cf8293f07491e9e27c20cc4dcd18176d944e674679adeb1d0173fd6/cryptography-49.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:2eda353d8a27bcbcaa4cbed18994a74ab4d19a2ca897db188ea269ab9b71419b", size = 5309779, upload-time = "2026-06-12T20:02:08.987Z" },
-    { url = "https://files.pythonhosted.org/packages/20/2c/0622f20ff02b2ef32558733443805dc82fd4c275be01b2d19d14676f3a1b/cryptography-49.0.0-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2afe9051da7ae7bd5905da5a949280c7d2bb75682e188f650a9d0f2756b834c6", size = 4749683, upload-time = "2026-06-12T20:02:03.335Z" },
-    { url = "https://files.pythonhosted.org/packages/a3/5b/c5246635d5fd3b64e0d45ae10e99fd32fe9676a79915ccfe5a61ba9af1a5/cryptography-49.0.0-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:0b82e28ee398a386f0807bba7884d30f25218855690f45115831bcce5d90822c", size = 4337874, upload-time = "2026-06-12T20:02:54.323Z" },
-    { url = "https://files.pythonhosted.org/packages/6d/88/05563c7fe2e914e87d1a536d06fe83e66b4e1d95cb593e05aea375531da8/cryptography-49.0.0-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:ccac2bfebc306b862133e3bb71f3f6ee8bb525240089b2d952e4144b3a6d5da7", size = 4700283, upload-time = "2026-06-12T20:01:34.822Z" },
-    { url = "https://files.pythonhosted.org/packages/c4/b6/d7696e4e890d6ae1469935164c9e5215c557671cb78d6e3f458ccceaa632/cryptography-49.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:d0527ce944105f257f605a827d6ebead966c752038b6e8656abb9c5edee6fc68", size = 5265844, upload-time = "2026-06-12T20:01:24.09Z" },
-    { url = "https://files.pythonhosted.org/packages/a9/3c/f3ad17eecc1a57b0ba236dc01f90e783c51f4a2f35f64777cc4f47a184b2/cryptography-49.0.0-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:cbc77da8c523d5abd028635ba850a6966fcee2c82e2bf65a41d1d8afe0f98be9", size = 4749290, upload-time = "2026-06-12T20:01:30.848Z" },
-    { url = "https://files.pythonhosted.org/packages/4f/01/339573cf1023163a400b0b5d16f6d507de413b9f60be6fd1b77feeaf6737/cryptography-49.0.0-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b87e65d263b3e5d3bb92a57e2a6638e2f31110fa7aa890c7b2dbba42248d0a3f", size = 4834612, upload-time = "2026-06-12T20:01:29.246Z" },
-    { url = "https://files.pythonhosted.org/packages/71/fd/577302e213a1be9468f92d1afef66fcf1ef83d516819d9992ca547f592bd/cryptography-49.0.0-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:66ec79c3904820572d7e987abdf304281f141d37ad9a489b8e97066e7b9b6459", size = 4980804, upload-time = "2026-06-12T20:01:42.853Z" },
-    { url = "https://files.pythonhosted.org/packages/1f/09/f42b1d190c5ba75f72062a387f8030d1d75f6ab035788f1d9c4b01de6525/cryptography-49.0.0-cp311-abi3-win_amd64.whl", hash = "sha256:e5dfc1e64de5677cec922ffa8da89c546d0415bf6efdf081842e5d44c84e1f0e", size = 3810026, upload-time = "2026-06-12T20:02:39.262Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/9e/db72b3ae7fc9cfad53e630e56c6ae83b9b6ff0bf3718ffb8012d20b3aabf/cryptography-49.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:73a205dce83953d131a4aa1e0fd917a2fd1c5b1eef251e9d7152efefcbf5caf7", size = 4013892, upload-time = "2026-06-12T20:02:10.735Z" },
-    { url = "https://files.pythonhosted.org/packages/86/12/c48a424f38db03027be9f7ed5c7dc5de9933dbee992865f98b13727a009d/cryptography-49.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:196ecd6a36e4e9aa10270393bb98d8df88fccee0bf1e5128b91ae4eb4375896d", size = 4678835, upload-time = "2026-06-12T20:02:48.743Z" },
-    { url = "https://files.pythonhosted.org/packages/68/28/8a3ad4653662c93fc44dc4e5d8fd374c25c42e07b34bbfbadf49cf57a5a8/cryptography-49.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7abcee80084cda3f7691f3eb1ce480d8df49cec637b429aa35986c1de71738aa", size = 4697239, upload-time = "2026-06-12T20:02:56.03Z" },
-    { url = "https://files.pythonhosted.org/packages/a8/b2/2193fc74f81aee4f9b62733133b73b5176718932ed8f2e4b03fa040480a6/cryptography-49.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:4ae387c9cb68ea569ca17e490d66d8142b81c3cc814bf179974b7d146e490bbb", size = 4685593, upload-time = "2026-06-12T20:02:50.666Z" },
-    { url = "https://files.pythonhosted.org/packages/47/f1/1d3eaa243bfc5de4a187b22aa8c048b3e4980bfbe830ac46e6bac2e66947/cryptography-49.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:f37d847238971164fdbc68ade6f6574aecc9c0af714190e2083429ff68f4ce9d", size = 5289961, upload-time = "2026-06-12T20:01:46.468Z" },
-    { url = "https://files.pythonhosted.org/packages/58/39/2d51306721330c486495853eda1c567880ff036de15a14c4b74f399934af/cryptography-49.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:c2bc30226390d60ea19d9f82b19db005fe0452154a23c1c410c12ea801e43561", size = 4731145, upload-time = "2026-06-12T20:02:16.832Z" },
-    { url = "https://files.pythonhosted.org/packages/17/50/983e838c7fd0d87fd8c969bcdd328edaf5f756e38df5281637424c155873/cryptography-49.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:07cab27cc7b7e0fd28e5e26bb9eeedde5c135c868b46de4a27845abe94af6122", size = 4321719, upload-time = "2026-06-12T20:02:52.611Z" },
-    { url = "https://files.pythonhosted.org/packages/a7/f5/8f571d7e27c55bce9f76f026143bcb1e040a4233149ecca0bea5fa5dd5f7/cryptography-49.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:b20133d204d2bb56ba047642199603876c872026ca53e79c35b83772ab2cc505", size = 4685209, upload-time = "2026-06-12T20:02:07.282Z" },
-    { url = "https://files.pythonhosted.org/packages/e7/84/0e27016a6fc5a0886f797018b26aa42f40c09a82332bff77822a451deaaa/cryptography-49.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:b970c6da94d5bb18629db453d14f2a1300f6bf59b61e9b82377931ef95504866", size = 5246285, upload-time = "2026-06-12T20:01:32.439Z" },
-    { url = "https://files.pythonhosted.org/packages/11/2d/5e1fb307cb5931881516b464c98774b3f2c36b5d4bb9a2830253cf553cad/cryptography-49.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:d8ecde755e2e91bf773fc94e8c9d730cd7f2007004cb492263a794ec3899a1c8", size = 4730441, upload-time = "2026-06-12T20:02:01.469Z" },
-    { url = "https://files.pythonhosted.org/packages/e4/c0/bff5a02ee731d207d6a1ed51732549d8c53d2bc8da1d10ec6f2844201d68/cryptography-49.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e3fb64c420688e5319ae25113a354015abbd8dffbfbc41781a1ea66fc7622ac3", size = 4815869, upload-time = "2026-06-12T20:01:36.574Z" },
-    { url = "https://files.pythonhosted.org/packages/b9/26/814681d14248d95d73d5c3eea0c39a94eb8302df966f670a2c60de90974b/cryptography-49.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:32703d93296f5c1f4b53349ad3a250c2cae0fdecd3a3dd5d47e616d8d616af27", size = 4960948, upload-time = "2026-06-12T20:02:18.688Z" },
-    { url = "https://files.pythonhosted.org/packages/4c/fe/93ecac273d3738939d023612ad12cca9a3740a5345d69fda04134c43fd96/cryptography-49.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:33cd0565932807baddb67b96dbee92f2c374b5c89dee09fd74079aeb8c8dba61", size = 3799153, upload-time = "2026-06-12T20:01:39.059Z" },
-    { url = "https://files.pythonhosted.org/packages/19/2a/5bb823f5bedcf80718cea7fbc95ec5515cca3769633c4b01a32be7f30e7c/cryptography-49.0.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:ec5e529fb80935c94fe7b729f9972b50e351a0e6b50aa294fd5cabb109fcc29a", size = 4025947, upload-time = "2026-06-12T20:01:25.745Z" },
-    { url = "https://files.pythonhosted.org/packages/3d/df/40577043ca124e17012f408ddddaeb213b856336ac82ddb3bc915f39e29f/cryptography-49.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f78ff2c9ed8dc2d036b0f4d640e22522213d047c1b14e61205a7e55c80a494d4", size = 4692429, upload-time = "2026-06-12T20:01:53.628Z" },
-    { url = "https://files.pythonhosted.org/packages/2c/99/2d13299eb3dd27b02dcfaafcc91d6b5cb3329f7cbd6d8f51921acd566c1a/cryptography-49.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:35b151772baff2c74cba7fa290ceaff4c3b11c0c881eb93eb5dbc05a7cfbba18", size = 4700968, upload-time = "2026-06-12T20:02:45.383Z" },
-    { url = "https://files.pythonhosted.org/packages/a5/4d/9c0cd02f95e2602dd5e563da149ee0830abef3537be8b34dc56281ebe27a/cryptography-49.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:0f21641cf4b30fca7aee061ced0ec7ad7b073518088b7c9969a297c0ae796c69", size = 4697758, upload-time = "2026-06-12T20:01:41.13Z" },
-    { url = "https://files.pythonhosted.org/packages/24/01/186c825898477d77e2324d5360fefe622ff1d8d1963ec0554e2cada8ec77/cryptography-49.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:9e82dcc8e56052715fb18b2429e3bca4823b1629136a2084fc45a9a5cecb9b64", size = 5298863, upload-time = "2026-06-12T20:02:24.579Z" },
-    { url = "https://files.pythonhosted.org/packages/b8/7b/62cbbab75d0659865bf0273790031544a0b16c8072d258f9428dcd8190dc/cryptography-49.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:6f2debedf9ca60cf1d5bd466475638af5130f89965605cd818484d19987d3a21", size = 4735983, upload-time = "2026-06-12T20:01:50.14Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/72/3e798c064bc39e471008075d0f9bc9daf77a80879c092e4a8e170c585ed4/cryptography-49.0.0-cp39-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:8c25ceb16df5b9435f3f6a9829204985b0e0cbee3b48aacd432c7d2c850b44d9", size = 4334173, upload-time = "2026-06-12T20:01:44.743Z" },
-    { url = "https://files.pythonhosted.org/packages/f0/ee/6fca21d1ac73e06f8bef71940abfd4d2f6472b4bca284d770f32bd4086f6/cryptography-49.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:28d8b15e6275f12c8a207dc309dfa957903c927d08d0cc937ee3f63f200693cc", size = 4697298, upload-time = "2026-06-12T20:02:20.918Z" },
-    { url = "https://files.pythonhosted.org/packages/67/d0/a5fcd3515f0bae49a7b6d0413cc1bdccdcc1fc0047037a0d480642cdc5d6/cryptography-49.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:6fc361c34fb6aac015ce19435876635e5c6d21db31998b0920f675f131e043b8", size = 5254338, upload-time = "2026-06-12T20:02:22.737Z" },
-    { url = "https://files.pythonhosted.org/packages/a0/84/84fe36f19caf857d61cb7fc9c63035a47ffabd84ea12d1d393148efa3615/cryptography-49.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:2400ef9c9e2299a25614eb1dea3db54a69b1349efd043bfac9c67630d136df36", size = 4735650, upload-time = "2026-06-12T20:02:41.389Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/a0/db537264e234f7273a73ec020873d6d6b39dfd8a53db78b550ca8320440e/cryptography-49.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:67e1d20ad9ef3a563c59ef22e7a8a0b8210bd26604369ea4a30a7c66aefe504e", size = 4834820, upload-time = "2026-06-12T20:01:51.847Z" },
-    { url = "https://files.pythonhosted.org/packages/93/77/8df9eb486495979bccecd1062e2eaf435250e84437040295b57d09048b0b/cryptography-49.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:42b0684e0e40cf26122427802486f6d93aea593612603a94fbf260c7eb1e9c1b", size = 4967968, upload-time = "2026-06-12T20:02:12.524Z" },
-    { url = "https://files.pythonhosted.org/packages/c2/e6/f60198ea8d9dfa15fff9ed4ca02ce362f6eadd9ba757dcc50634c4257b63/cryptography-49.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:026ac7423e6fa66872d3bf889be5974507da3944f866f704fa200eadacd00001", size = 3785547, upload-time = "2026-06-12T20:02:26.847Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/5c/59086b4aac5e879d38ddbcf74e4be7ade89cebc3eb199a55da998c3bb46a/cryptography-50.0.0-cp311-abi3-macosx_11_0_arm64.whl", hash = "sha256:031e2d5dd4bb9caa3ca9c82e5a197fd8ae680232cee62603d1a813f3f07e3d03", size = 4001252, upload-time = "2026-07-31T14:23:33.331Z" },
+    { url = "https://files.pythonhosted.org/packages/57/ef/8f2df13c7216bcad3e1c74e07f6e193d93e998e114f524a53877c9af27ad/cryptography-50.0.0-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fd9192b7b70c573d7f214eb1ae35e00d359f6f5e4b27c7e21e30de1fc6204645", size = 4719554, upload-time = "2026-07-31T14:23:35.611Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/41/029086c34d91052fc3b88bcc8056f709a7c915c7a23b235a54eb800b1c97/cryptography-50.0.0-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:06a32a980526a6ab9a4b9bf8f7385800791e2bb960903cb6b530e4817509a3b7", size = 4702130, upload-time = "2026-07-31T14:23:37.635Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/ff/b6ce0954962e7f7b969f850a883744197bb3910bdfd7b6da162eab7d9f68/cryptography-50.0.0-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:a1b30560f2acc95aa8b2e06e716a13dbfc97314747b80d9707e307f77b40d6b3", size = 4725244, upload-time = "2026-07-31T14:23:39.471Z" },
+    { url = "https://files.pythonhosted.org/packages/06/1e/63a1027cb7fec360a182208e1b7767d5aa1fe57be3d6aa856e69a321edc0/cryptography-50.0.0-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:8d89f3976b10b4ce31118de72329025f70d2c6ead14a8217c5514dd2c6d5a78f", size = 5342265, upload-time = "2026-07-31T14:23:41.286Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/72/a1116d683a6d7ece94590013882515de087edf9ef0e6292aae615a44df73/cryptography-50.0.0-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:b42a28c1844fd9de8f3f7d540e36b66f3a9c83fceac7170ebc7a6a19edd9dcae", size = 4734609, upload-time = "2026-07-31T14:23:43.139Z" },
+    { url = "https://files.pythonhosted.org/packages/15/37/36a9c479bbe49acea2636c7fd3360d20f7b7e079c300352011c44850b181/cryptography-50.0.0-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:900131fafd8aead39ac7dd3a7e833be754c17a95cfd91221636949fe4eb0aa8a", size = 4356517, upload-time = "2026-07-31T14:23:44.939Z" },
+    { url = "https://files.pythonhosted.org/packages/32/98/8a151d64367204cbc63ec65d37502f1d9c53cf4bfc6ec3c532614dbec60d/cryptography-50.0.0-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:07949c449a1abcf60d1ee6e88956d89404c7df3c8258f46589e912988e551987", size = 4724529, upload-time = "2026-07-31T14:23:46.93Z" },
+    { url = "https://files.pythonhosted.org/packages/22/f6/ec13b470172126464a86bf54d2294a46d29837fc51ba3e45d4047946fb5e/cryptography-50.0.0-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:f89831ef99dd7dd169ab06d63a831adb9e20a87aac6d380266bbda5823349169", size = 5299852, upload-time = "2026-07-31T14:23:48.851Z" },
+    { url = "https://files.pythonhosted.org/packages/da/3a/f05e32c99d440c9bb891ea0e36c9091891e36be5a9a87ab2ee6ea20729f6/cryptography-50.0.0-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:82148ec5bddac30b51a5b3c1945075f896fa022cb93f8e4a01e9f6ee95292c5f", size = 4734462, upload-time = "2026-07-31T14:23:50.861Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/dc/bd72b26be8953f80625f63151efd38eee71c76ca6cf591c08ff34615a79e/cryptography-50.0.0-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1489e263a8048bb8b6a8bac662eb2d402ea5d2b7b4699b72f385f1e2772db105", size = 4852708, upload-time = "2026-07-31T14:23:52.715Z" },
+    { url = "https://files.pythonhosted.org/packages/27/20/c930314a2ab476d15dec966ec87e2e9637bb02b06106b12c0396c57bb603/cryptography-50.0.0-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:7cec5b856506da6defb290f30c9ee687d5f5e8cb0bd3f6459dde43b0b4fa40ef", size = 5004179, upload-time = "2026-07-31T14:23:54.887Z" },
+    { url = "https://files.pythonhosted.org/packages/32/2e/c9db68a0c4bfa28e310707527c0ee3a2bd254104d2e02e68f368e197aa4c/cryptography-50.0.0-cp311-abi3-win_amd64.whl", hash = "sha256:bd1c592e4d5974f0d08d4888e432157adba757c66da0246918e43677fafa2d30", size = 3840395, upload-time = "2026-07-31T14:23:56.677Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/fb/951032a3bf22a5697c83183fb6294a4843772947a70e616c57b3ff5f522e/cryptography-50.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:49e7d93abdbd2990caced757e5fade25302f719c3c8fb6e6fff2dde98999fc41", size = 3989258, upload-time = "2026-07-31T14:23:58.881Z" },
+    { url = "https://files.pythonhosted.org/packages/d4/67/91eb047e69c5e845f2f14b8a2e4a1aab0f283cb885531e9e22c8adb176bc/cryptography-50.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:19736989797678c6af1e55cd49055cdbcb55d8f6b5583ac5335f933aba9101dc", size = 4700648, upload-time = "2026-07-31T14:24:00.702Z" },
+    { url = "https://files.pythonhosted.org/packages/30/82/85f0f7425c856b9f96459411eb12e74ef72df9caf6f8f15bf23a33ff131f/cryptography-50.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:80b63928fa35083b33966ce1efb70e5b9607181e49dcd1c22c8c005e319f667f", size = 4682442, upload-time = "2026-07-31T14:24:02.538Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/28/b555a365adff1cca2fbe7b9e487d68a40de6bc67ff2cb587473eb43de0e7/cryptography-50.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:d58c3db7cd6eed54e6c06744db55456b65ebd7492ddeae9c1e93cfca7aa857d3", size = 4707596, upload-time = "2026-07-31T14:24:04.394Z" },
+    { url = "https://files.pythonhosted.org/packages/72/d8/f52538140cc719df62a01cf87d1c7142318d235817109d6f4054d7c352d6/cryptography-50.0.0-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:df2a58a472f332225671c35b0a830208b86d004f82baa8530fa3782c85646533", size = 5314552, upload-time = "2026-07-31T14:24:06.31Z" },
+    { url = "https://files.pythonhosted.org/packages/38/14/6120e5bd7c5aa022ad15424ba4d5c5269d0d9448ed4d55e492ea91e3c1c4/cryptography-50.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:11b74db56cdbe3cdee6e3f6982ecb70334fa10dce99ed58bf7894aaaa3b2a037", size = 4717113, upload-time = "2026-07-31T14:24:08.349Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/71/190bf38c3ee2e0f8efc9860ae100c9df4169742eef274b91e7aa1cb133b9/cryptography-50.0.0-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:f59e38625469987d7ef6d495323c55e7db6c212eaf6112267e0d3b565a2e9c9f", size = 4338580, upload-time = "2026-07-31T14:24:10.227Z" },
+    { url = "https://files.pythonhosted.org/packages/3a/63/504ccfbbe61fd8aa983f7f146399cdf034c72c2fc55f5b2dfdcdcdb20c99/cryptography-50.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:ecfed7367f965a0328cfbdd70da860f15441f002f613185668c6e6ebf5a0ac11", size = 4707038, upload-time = "2026-07-31T14:24:12.169Z" },
+    { url = "https://files.pythonhosted.org/packages/01/77/2cf79bbfc4d12ca106437a6e170d6aaa01a373e93093118aaaef0e801bd4/cryptography-50.0.0-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:9aa87839c383bdbab6ef865787a1fb877af8dd03464c4400322726feaaadfc6d", size = 5273110, upload-time = "2026-07-31T14:24:14.38Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/45/8aae2972c520145377ea3559a605a899bebe227bf070b33cdb445929a9b9/cryptography-50.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:6ba6a53445bd3cfa809ef3ef5f1589aa6ba08784a1d962bf47d0940e871dab1c", size = 4716439, upload-time = "2026-07-31T14:24:16.415Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/20/4fe50b619a48c2525cc46e2dbc1ac490708d704be5d467bdaac6dc955682/cryptography-50.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:3f5735ffe4996d28b809371756219f5354864902a3b9e7c0b9ee87041209fc9c", size = 4837383, upload-time = "2026-07-31T14:24:18.553Z" },
+    { url = "https://files.pythonhosted.org/packages/92/91/3a31366e183343d3703f8995c095f5734676bd6938118047e50fcf279eb4/cryptography-50.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1b4a266766514614f8aa60416e71f2fc6e575d36e7bdc90f644fadb2f4b75b95", size = 4985772, upload-time = "2026-07-31T14:24:20.385Z" },
+    { url = "https://files.pythonhosted.org/packages/74/9a/02ffe35b2853d121689871eb5dce862092562b3a1ed5cc98f1aaed441506/cryptography-50.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:12b9c6996425c76ea6c457ace4f3073e715b8c545add07cd1a8f3a4f90691269", size = 3816291, upload-time = "2026-07-31T14:24:22.125Z" },
+    { url = "https://files.pythonhosted.org/packages/03/37/73d005be173aff344af30e9fd2a576575cb2391a7101d9cd3842e1fa8cce/cryptography-50.0.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:ccdc4a71a4dabae05de219404f9f4abc38e3b58422177ff93d0da05967dafa07", size = 4036009, upload-time = "2026-07-31T14:24:24.122Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/c6/7a6202a534e32103a285b7834a120869557fe198d51d7cfe59754c8bda9c/cryptography-50.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:910e1d2668e7de9648f2bcee30e180db2a6b15c30f887d7c4c93ddf96e3992e3", size = 4745252, upload-time = "2026-07-31T14:24:26.118Z" },
+    { url = "https://files.pythonhosted.org/packages/85/4f/0fa8c2f4428198f15d9ff8d63400e27afbf94ce833f6108da1eb3753f945/cryptography-50.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:a91296cb61e8df6f86d0c19cc4068228da256bf59bf86049fbd821084565327f", size = 4728939, upload-time = "2026-07-31T14:24:27.994Z" },
+    { url = "https://files.pythonhosted.org/packages/d1/63/54dd723490ba2dc09b299682c10b38db38f159728bcaae8c591b8af2f22d/cryptography-50.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:e722f16708d854fe924790e051061f6704a472c3bac347b6fd88033ea8dd0dc5", size = 4748483, upload-time = "2026-07-31T14:24:30.254Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/dd/7c77d26285cc7f6991efce64a0f5b4f9383bfa5dd8c5033003eaf7db4cdb/cryptography-50.0.0-cp39-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:d764dcf130c428ef66786f866dd750f53182bc608813489915e9fc106bb0c82f", size = 5367599, upload-time = "2026-07-31T14:24:32.457Z" },
+    { url = "https://files.pythonhosted.org/packages/46/c9/f60aed34c013f317f92817b6c171c2d22a78270fa41109bd4b08af26b194/cryptography-50.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:105110f43a471dbd0060b9c9516cb8a6a79233631a04cc2ba16f28323ac6e025", size = 4762647, upload-time = "2026-07-31T14:24:34.599Z" },
+    { url = "https://files.pythonhosted.org/packages/be/f3/f9a0173b139372c3a48ed98154b45cc6b9de17c789d5ab552e621c293609/cryptography-50.0.0-cp39-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:828743d939e9629bc267b8e2d08d8bb67cd4319c771a33d4b18b22dd8fb7440a", size = 4385197, upload-time = "2026-07-31T14:24:36.647Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/36/83bb81f6e569bc38e1e4a7bc80f29b46bb9601920bc455fc8e888f5d5742/cryptography-50.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:2a8183b489dc1f7f80f135780fadc1108f14b31b8a40411c7a5b17425f65f28b", size = 4748095, upload-time = "2026-07-31T14:24:39.493Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/16/d3008eff98c764979865834c3d386d4fd041b5f52e7f34fc29ac1a5eb515/cryptography-50.0.0-cp39-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:6e7d61120573a7f2cd94cc095f9e81f6967c61ccdf194285aa143ecec8e0b708", size = 5325948, upload-time = "2026-07-31T14:24:41.556Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/f8/d97f9603efda3888187bfdb893f26c41be4735c10631d05d284ee6b047c4/cryptography-50.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:37fdb0d0111f1e2ff07139dfb79f1b49531f8e213c46f1163dd7642979b58c47", size = 4762400, upload-time = "2026-07-31T14:24:43.636Z" },
+    { url = "https://files.pythonhosted.org/packages/64/a2/4615c8f7d81a00b1d6e6afe19f694e1543582349fb5f4076f6cb5dc36485/cryptography-50.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:c87f62a3d3b9888ed0fdde100ec06aa61ca9cd44bad9057d1dff9a516b5f5bb9", size = 4878208, upload-time = "2026-07-31T14:24:45.522Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/1a/efcfb02f91407149a0dacffffab791f7e19bf6385f63b3666dc8b5e5c9c8/cryptography-50.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:65c2c3add92b45fd0709db8594536aea39c2a67af0e27ffcf049c498501140b7", size = 5037050, upload-time = "2026-07-31T14:24:47.697Z" },
+    { url = "https://files.pythonhosted.org/packages/57/30/4a22984d4f1bdfb8c054f07a92bc176b97a3134cc1d6c4b3bffb1f3688b4/cryptography-50.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:d24fead1d4d076e1bfb006dcec392074a3cd8d7b4fc8a595aa64073b2b7a96ba", size = 3874135, upload-time = "2026-07-31T14:24:50.085Z" },
 ]
 
 [[package]]

From 1484e461f54b6e707d52d9d8a0d3c080d6285c20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2026 16:41:37 +0000
Subject: [PATCH 109/118] Bump sqlparse from 0.5.5 to 0.6.0

Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.5.5 to 0.6.0.
- [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG)
- [Commits](https://github.com/andialbrecht/sqlparse/compare/0.5.5...0.6.0)

---
updated-dependencies:
- dependency-name: sqlparse
  dependency-version: 0.6.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 uv.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uv.lock b/uv.lock
index 06ed01f..7ecd40e 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1151,11 +1151,11 @@ wheels = [
 
 [[package]]
 name = "sqlparse"
-version = "0.5.5"
+version = "0.6.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/90/76/437d71068094df0726366574cf3432a4ed754217b436eb7429415cf2d480/sqlparse-0.5.5.tar.gz", hash = "sha256:e20d4a9b0b8585fdf63b10d30066c7c94c5d7a7ec47c889a2d83a3caa93ff28e", size = 120815, upload-time = "2025-12-19T07:17:45.073Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/5f/d3/3f06a1006f2261d1342aefb3c71eed02f5d4ca5bdbecd86ebc12ad38306e/sqlparse-0.6.0.tar.gz", hash = "sha256:113c35c75365ab9cc9c7231d68c6428fb11c085fc8e9eb1ad659b7ddbf6cd2b9", size = 178477, upload-time = "2026-08-13T19:16:06.396Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl", hash = "sha256:12a08b3bf3eec877c519589833aed092e2444e68240a3577e8e26148acc7b1ba", size = 46138, upload-time = "2025-12-19T07:17:46.573Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/50/f00935da0ec7cbf325f8dc4f772ae46fbc7b672dd62876e73f0a94adda57/sqlparse-0.6.0-py3-none-any.whl", hash = "sha256:b861c0288ce2fa56209a9a6412d2e066ac664b3873b89c26c9d8415e8e32996f", size = 50070, upload-time = "2026-08-13T19:16:04.062Z" },
 ]
 
 [[package]]

From 400fefe1e11545f089a2433972d3ceae7521ad58 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 3 Sep 2026 21:05:19 +0530
Subject: [PATCH 110/118] Required playable url to ship && added a pathway
 detail view

---
 .../migrations/0026_project_playable_url.py   | 18 ++++
 twisted/twisted_site/models.py                | 19 +++-
 .../templates/admin/pathways/detail.html      | 91 +++++++++++++++++--
 .../twisted_site/templates/admin/user.html    |  4 +-
 .../templates/client/projects/detail.html     | 15 ++-
 .../templates/client/projects/settings.html   | 10 ++
 .../templates/cotton/pathway_card.html        |  4 +-
 twisted/twisted_site/views/admin/admin.py     |  1 +
 twisted/twisted_site/views/admin/pathways.py  | 25 ++++-
 twisted/twisted_site/views/client/project.py  |  7 ++
 10 files changed, 176 insertions(+), 18 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0026_project_playable_url.py

diff --git a/twisted/twisted_site/migrations/0026_project_playable_url.py b/twisted/twisted_site/migrations/0026_project_playable_url.py
new file mode 100644
index 0000000..32151ad
--- /dev/null
+++ b/twisted/twisted_site/migrations/0026_project_playable_url.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0.7 on 2026-09-03 15:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0025_alter_auditlog_additional_context'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='project',
+            name='playable_url',
+            field=models.CharField(blank=True, default='', max_length=200),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 904e082..0efde9b 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -83,6 +83,7 @@ class Project(models.Model):
 
     hackatime_project_name = models.CharField(max_length=200, blank=True, default="")
     repo_url = models.CharField(max_length=200, blank=True, default="")
+    playable_url = models.CharField(max_length=200, blank=True, default="")
 
     def __str__(self):
         return self.project_name
@@ -135,9 +136,7 @@ def is_shipped(self):
         latest_ship = self.latest_ship()
         if latest_ship is None:
             return False
-        if latest_ship.latest_status() not in ['requested_changes']:
-            return True
-        return False
+        return latest_ship.latest_status() != 'requested_changes'
 
 
 class Journal(models.Model):
@@ -196,8 +195,18 @@ def latest_status(self):
             return self.fraud_status
         if self.t2_status != 'pending':
             return self.t2_status
-        if self.t1_status != 'pending':
-            return self.t1_status
+        return self.t1_status
+    
+    def get_latest_status_display(self):
+        if self.final_status != 'pending':
+            string = "Final"
+        elif self.fraud_status != 'pending':
+            string = "Fraud"
+        elif self.t2_status != 'pending':
+            string = "T2"
+        else:
+            string = "T1"
+        return string +": "+PROJECT_SHIP_STATUSES[self.latest_status()]
     
     
     def save(self, *args, **kwargs):
diff --git a/twisted/twisted_site/templates/admin/pathways/detail.html b/twisted/twisted_site/templates/admin/pathways/detail.html
index abdae62..19a67ec 100644
--- a/twisted/twisted_site/templates/admin/pathways/detail.html
+++ b/twisted/twisted_site/templates/admin/pathways/detail.html
@@ -1,10 +1,87 @@
+{% load time_filters %}
 <c-base>
-    <div>Work in progress!</div>
     <div>
-        Pathway name:
-        {{ pathway.name }}
+        <c-ui.breadcrumbs>
+            <c-ui.breadcrumbs.item href="{% url 'admin.dash' %}">Admin</c-ui.breadcrumbs.item>
+            <c-ui.breadcrumbs.item href="{% url 'admin.pathways' %}">Pathways</c-ui.breadcrumbs.item>
+            <c-ui.breadcrumbs.item :current="True">{{ pathway.name }}</c-ui.breadcrumbs.item>
+        </c-ui.breadcrumbs>
+
+        <c-ui.card class="mt-2 bg-ink-900">
+            <div class="flex items-center gap-2 flex-wrap">
+                <h1 class="text-2xl font-bold">{{ pathway.name }}</h1>
+                {% if pathway.in_progress %}
+                <c-ui.badge color="orange">In progress</c-ui.badge>
+                {% elif pathway.didnt_start %}
+                <c-ui.badge color="green">Not started</c-ui.badge>
+                {% elif pathway.ended %}
+                <c-ui.badge color="ink">Ended</c-ui.badge>
+                {% endif %}
+            </div>
+            <div class="mt-2 grid gap-4 grid-cols-2 lg:grid-cols-4">
+                <div>
+                    <p class="text-ink-400 text-sm">Start</p>
+                    <p title="local time">{{ pathway.start }}</p>
+                </div>
+                <div>
+                    <p class="text-ink-400 text-sm">End</p>
+                    <p title="local time">{{ pathway.end }}</p>
+                </div>
+                <div>
+                    <p class="text-ink-400 text-sm">Minimum time required</p>
+                    <p>{{ pathway.min_mins|minutes_to_hours_minutes }}</p>
+                </div>
+                <div>
+                    <p class="text-ink-400 text-sm">Qualified participants</p>
+                    <p>{{ qualified_count }} / {{ participants|length }}</p>
+                </div>
+            </div>
+        </c-ui.card>
+
+        <div class="mt-4">
+            <h2 class="text-lg font-semibold mb-2">Participants</h2>
+            {% if participants %}
+            <c-ui.card class="bg-ink-900 p-0">
+                <c-ui.table>
+                    <thead>
+                        <tr>
+                            <th>Participant</th>
+                            <th>Time logged</th>
+                            <th>Progress</th>
+                            <th>Status</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for participant in participants %}
+                        <tr>
+                            <td>
+                                <a href="{% url 'admin.users.detail' participant.user.id %}" class="flex items-center gap-2">
+                                    <c-ui.avatar size="sm" src="{{ participant.user.profile.slack_pfp_url }}" />
+                                    @{{ participant.user.profile.slack_username }}
+                                </a>
+                            </td>
+                            <td>{{ participant.mins|minutes_to_hours_minutes }}</td>
+                            <td class="min-w-32">
+                                <c-ui.progress value="{{ participant.percent }}" color="{% if participant.qualified %}green{% else %}accent{% endif %}" show_value="True" />
+                            </td>
+                            <td>
+                                {% if participant.qualified %}
+                                <c-ui.badge color="green">Qualified</c-ui.badge>
+                                {% else %}
+                                <c-ui.badge color="ink">In progress</c-ui.badge>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </c-ui.table>
+            </c-ui.card>
+            {% else %}
+            <c-ui.card class="bg-ink-900">
+                <h1 class="text-lg font-bold">No participants yet</h1>
+                <p>Nobody has logged time towards this pathway.</p>
+            </c-ui.card>
+            {% endif %}
+        </div>
     </div>
-    <div>
-        TODO: Work on this!
-    </div>
-</c-base>
+</c-base>
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/admin/user.html b/twisted/twisted_site/templates/admin/user.html
index 888f6c3..2935041 100644
--- a/twisted/twisted_site/templates/admin/user.html
+++ b/twisted/twisted_site/templates/admin/user.html
@@ -38,8 +38,8 @@ <h1 class="text-lg font-bold">{{ project }}</h1>
                 </div>
                 <div>
                     <c-ui.badge>{{ project.get_project_type_display }}</c-ui.badge>
-                    {% if project.is_shipped %}
-                    <c-ui.badge>{{ project.is_shipped.get_status_display }}</c-ui.badge>
+                    {% if project.latest_ship %}
+                    <c-ui.badge>{{ project.latest_ship.get_latest_status_display }}</c-ui.badge>
                     {% endif %}
                 </div>
                 <div>
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 90a1064..62ba2f9 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -28,7 +28,7 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
             
             <div class="flex shrink-0 flex-wrap gap-1">
                 {% if project.user == request.user %}
-                {% if project.repo_url and project.time_logged > 60 %} {% if not project.is_shipped %}
+                {% if project.repo_url and project.playable_url and project.time_logged > 60 %} {% if not project.is_shipped %}
                 <a href="{% url 'fr.projects.ship' project.id %}">
                     <button
                         class="border border-primary bg-primary px-3 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80 active:translate-y-px"
@@ -107,6 +107,19 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                 Open project settings
             </a>
         </div>
+        {% elif not project.playable_url %}
+        <div class="mb-3 border border-warning bg-warning/10 p-3">
+            <div class="font-bold text-warning">Playable URL not set</div>
+
+            <div class="mt-1 text-sm text-muted-foreground">Add a playable URL before shipping your project.</div>
+
+            <a
+                href="{% url 'fr.projects.settings' project.pk %}"
+                class="mt-2 inline-block text-sm text-primary underline hover:text-accent"
+            >
+                Open project settings
+            </a>
+        </div>
         {% elif project.time_logged < 60 %}
         <div class="mb-3 border border-warning bg-warning/10 p-3">
             <div class="font-bold text-warning">log more time!</div>
diff --git a/twisted/twisted_site/templates/client/projects/settings.html b/twisted/twisted_site/templates/client/projects/settings.html
index 66e1d74..1a86e02 100644
--- a/twisted/twisted_site/templates/client/projects/settings.html
+++ b/twisted/twisted_site/templates/client/projects/settings.html
@@ -107,6 +107,16 @@
                 class="w-full bg-card text-card-foreground border border-border px-2 py-1 focus:outline-none focus:ring-1 focus:ring-ring" />
         </div>
 
+        <div class="flex flex-col gap-1">
+            <label for="playable_url" class="font-bold">
+                Playable URL
+            </label>
+
+            <input id="playable_url" name="playable_url" type="text" placeholder="{% if project.project_type == 'hardware' %}https://youtube.com/watch?v=abcdef{% else %}https://myapp.website.com{% endif %}"
+                value="{{ project.playable_url }}"
+                class="w-full bg-card text-card-foreground border border-border px-2 py-1 focus:outline-none focus:ring-1 focus:ring-ring" />
+        </div>
+
         <div class="pt-2">
             <button type="submit"
                 class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">
diff --git a/twisted/twisted_site/templates/cotton/pathway_card.html b/twisted/twisted_site/templates/cotton/pathway_card.html
index fb1a52c..eab3062 100644
--- a/twisted/twisted_site/templates/cotton/pathway_card.html
+++ b/twisted/twisted_site/templates/cotton/pathway_card.html
@@ -19,8 +19,10 @@ <h3 class="text-lg font-bold">{{ pathway.name }}</h3>
             </div>
             {% if not pathway.didnt_start %}
             <div>
+                <p class="text-ink-400">Participated</p>
+                <p>{{ pathway.mins_spent_per_participant|length }} participant{{ pathway.mins_spent_per_participant|pluralize }}</p>
                 <p class="text-ink-400">Qualified</p>
-                <p title="local time">{{ pathway.qualified_participants|length }} participant{{ pathway.qualified_participants|pluralize }}</p>
+                <p title="local time">{{ pathway.qualified_participants|length }} qualified</p>
                 {% if pathway.qualified_participants %}
                 <p class="mt-2">
                     <c-ui.avatar.group>
diff --git a/twisted/twisted_site/views/admin/admin.py b/twisted/twisted_site/views/admin/admin.py
index 4ce9ec1..ec23df6 100644
--- a/twisted/twisted_site/views/admin/admin.py
+++ b/twisted/twisted_site/views/admin/admin.py
@@ -42,6 +42,7 @@ def dispatch(self, request, *args, **kwargs):
             user=request.user,
             path=self.request.get_full_path(),
             post=(request.method.lower() == 'post'),
+            additional_context={}
         )
         response = super().dispatch(request, *args, **kwargs)
         self.audit_log.save()
diff --git a/twisted/twisted_site/views/admin/pathways.py b/twisted/twisted_site/views/admin/pathways.py
index 0df12f7..22cb57f 100644
--- a/twisted/twisted_site/views/admin/pathways.py
+++ b/twisted/twisted_site/views/admin/pathways.py
@@ -1,7 +1,7 @@
 from django.http import HttpResponse
 from .admin import AdminView
 from django.shortcuts import render, redirect
-from ...models import Pathway
+from ...models import Pathway, User
 from django.utils import timezone
 from django.contrib import messages
 
@@ -108,5 +108,26 @@ def post(self, request):
 class PathwayDetailView(AdminView):
     def get(self, request, id):
         context = self.get_context_data(page="pathways", subpage="detail")
-        context['pathway'] = Pathway.objects.get(id=id)
+        pathway = Pathway.objects.get(id=id)
+        context['pathway'] = pathway
+
+        self.audit_log.additional_context['pathway_name'] = pathway.name
+        
+        mins_per_participant = pathway.mins_spent_per_participant()
+        users = User.objects.filter(id__in=mins_per_participant.keys()).select_related("profile")
+
+        participants = [
+            {
+                "user": user,
+                "mins": mins_per_participant[user.id],
+                "percent": min(100, round(mins_per_participant[user.id] / pathway.min_mins * 100)) if pathway.min_mins else 0,
+                "qualified": mins_per_participant[user.id] >= pathway.min_mins,
+            }
+            for user in users
+        ]
+        participants.sort(key=lambda p: p["mins"], reverse=True)
+
+        context["participants"] = participants
+        context["qualified_count"] = sum(1 for p in participants if p["qualified"])
+
         return render(request, "admin/pathways/detail.html", context=context)
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index b2e5275..fe676f9 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -88,6 +88,7 @@ def post(self, request, id):
         project.project_type = request.POST["type"]
         project.hackatime_project_name = request.POST.get("hackatime", "")
         project.repo_url = request.POST["repo"]
+        project.playable_url = request.POST.get("playable_url", "")
         project.save()
         return redirect("fr.projects.detail", project.id)
 
@@ -101,6 +102,9 @@ def get(self, request, id, context={}):
         if project.user != request.user:
             return redirect("dashboard")
 
+        if not project.playable_url:
+            return redirect("fr.projects.detail", id)
+
         if not project.user.profile.ysws_eligible:
             context["info"] = (
                 "You are not YSWS eligible yet! Please get IDVd! Get help with it at #identity-help! (if you think this is a mistake, please ask in #twisted-help)"
@@ -122,6 +126,9 @@ def post(self, request, id, context={}):
                 request, id, context={"info": "silly! you have already shipped."}
             )
 
+        if not project.playable_url:
+            return redirect("fr.projects.detail", id)
+
         if not project.user.profile.ysws_eligible:
             return self.get(request, id)
 

From d61e1c123a0690892d1099c783a7057c592e7a9b Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 3 Sep 2026 21:26:17 +0530
Subject: [PATCH 111/118] Add discover page

---
 twisted/twisted_site/models.py                |  6 ++
 .../templates/client/dashboard.html           |  5 +
 .../templates/client/discover.html            | 96 +++++++++++++++++++
 twisted/twisted_site/urls.py                  |  1 +
 twisted/twisted_site/views/client/__init__.py |  3 +-
 twisted/twisted_site/views/client/discover.py | 19 ++++
 6 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 twisted/twisted_site/templates/client/discover.html
 create mode 100644 twisted/twisted_site/views/client/discover.py

diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 0efde9b..28723f9 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -137,6 +137,12 @@ def is_shipped(self):
         if latest_ship is None:
             return False
         return latest_ship.latest_status() != 'requested_changes'
+    
+    def is_approved(self):
+        latest_ship = self.latest_ship()
+        if latest_ship is None:
+            return False
+        return latest_ship.final_status == 'approved'
 
 
 class Journal(models.Model):
diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index e58dc89..9a00e74 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -30,6 +30,11 @@
                 <div class="size-15 bg-secondary border rounded-md flex items-center justify-center text-3xl">👥</div>
                 <span class="block text-center text-sm">Referrals</span>
             </div>
+            <div class="font-vintage w-fit cursor-pointer select-none" data-url="{% url 'fr.discover' %}"
+                onclick="newWindow('Discover', this.dataset.url)">
+                <div class="size-15 bg-secondary border rounded-md flex items-center justify-center text-3xl">🧭</div>
+                <span class="block text-center text-sm">Discover</span>
+            </div>
         </div>
 
         <div id="windows-container"></div>
diff --git a/twisted/twisted_site/templates/client/discover.html b/twisted/twisted_site/templates/client/discover.html
new file mode 100644
index 0000000..338b12e
--- /dev/null
+++ b/twisted/twisted_site/templates/client/discover.html
@@ -0,0 +1,96 @@
+{% extends "client/osbase.html" %}
+{% load static time_filters %}
+
+{% block body %}
+<div class="flex h-full w-full flex-col bg-surface text-foreground font-vintage">
+
+    <div class="flex shrink-0 items-center gap-4 border-b border-border bg-card px-3 py-2">
+        <span class="text-sm text-muted-foreground">discover projects from the community</span>
+    </div>
+
+    <div class="sunken-panel min-h-0 flex-1 overflow-y-auto bg-background p-3">
+
+        {% if projects %}
+        <div class="grid grid-cols-1 gap-2 sm:grid-cols-2 lg:grid-cols-3">
+
+            {% for project in projects %}
+            <input type="hidden" value="{{ project.project_name }}" id="discover-project-{{ project.id }}">
+
+            <div class="group flex cursor-pointer flex-col gap-2 border border-border bg-card p-3 select-none hover:bg-secondary"
+                data-project-id="{{ project.id }}" data-project-url="{% url 'fr.projects.detail' project.id %}">
+
+                <div class="flex items-start justify-between gap-2">
+                    <h3 class="wrap-break-word text-sm font-bold text-card-foreground group-hover:text-secondary-foreground">
+                        {{ project.project_name }}
+                    </h3>
+                    <div class="flex shrink-0 flex-wrap justify-end gap-1">
+                        {% if project.is_approved %}
+                        <span class="border border-success bg-success/20 px-2 py-0.5 text-xs text-success">shipped</span>
+                        {% endif %}
+                        <span class="border border-border group-hover:bg-muted bg-secondary px-2 py-0.5 text-xs text-secondary-foreground">
+                            {{ project.time_logged|minutes_to_hours_minutes }}
+                        </span>
+                        <span class="border border-border group-hover:bg-muted bg-secondary px-2 py-0.5 text-xs text-secondary-foreground">
+                            {{ project.get_project_type_display }}
+                        </span>
+                    </div>
+                </div>
+
+                <p class="line-clamp-3 text-xs text-muted-foreground group-hover:text-secondary-foreground/80">
+                    {{ project.project_description }}
+                </p>
+
+                <div class="mt-auto flex items-center gap-2 border-t border-border pt-2">
+                    <img src="{{ project.user.profile.slack_pfp_url }}" alt=""
+                        class="h-5 w-5 shrink-0 rounded-sm border border-border object-cover">
+                    <span class="truncate text-xs text-muted-foreground group-hover:text-secondary-foreground/80">
+                        {{ project.user.profile.slack_username|default:project.user.username }}
+                    </span>
+                </div>
+            </div>
+            {% endfor %}
+
+        </div>
+
+        {% else %}
+
+        <div class="flex h-full min-h-48 items-center justify-center">
+            <div class="border border-border bg-card px-8 py-6 text-center shadow-sm">
+                <div class="mx-auto mb-3 text-5xl">🧭</div>
+
+                <div class="text-lg font-bold">
+                    No projects yet
+                </div>
+
+                <div class="mt-1 text-sm text-muted-foreground">
+                    Projects from everyone will show up here.
+                </div>
+            </div>
+        </div>
+
+        {% endif %}
+
+    </div>
+
+    <div class="status-field-border p-1 border-t border-border flex shrink-0 items-center bg-card px-1 text-sm">
+        {{ projects|length }} project{{ projects|length|pluralize }}
+    </div>
+
+</div>
+
+<script>
+    document.querySelectorAll("[data-project-id]").forEach((project) => {
+        project.addEventListener("click", () => {
+            const title = document.getElementById(
+                `discover-project-${project.dataset.projectId}`
+            ).value;
+
+            createWindow(
+                title,
+                project.dataset.projectUrl
+            );
+        });
+    });
+</script>
+
+{% endblock body %}
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index c32c5e2..840263c 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -27,6 +27,7 @@
     path("dashboard/frame/journals/delete/<int:id>/", client.DeleteJournal.as_view(), name="fr.projects.journals.delete"),
     path("dashboard/frame/pathways/", client.PathwaysView.as_view(), name="fr.pathways"),
     path("dashboard/frame/referrals/", client.ReferralsView.as_view(), name="fr.referrals"),
+    path("dashboard/frame/discover/", client.DiscoverView.as_view(), name="fr.discover"),
 
     path("admin/", admin.DashboardView.as_view(), name="admin.dash"),
     path("admin/users/", admin.UsersView.as_view(), name="admin.users"),
diff --git a/twisted/twisted_site/views/client/__init__.py b/twisted/twisted_site/views/client/__init__.py
index 4421a98..7e3545f 100644
--- a/twisted/twisted_site/views/client/__init__.py
+++ b/twisted/twisted_site/views/client/__init__.py
@@ -4,4 +4,5 @@
 from .project import ProjectDetail, ProjectSettings, SubmitProject
 from .journal import NewProjectHackatimeJournal, NewProjectUntrackedJournal, DeleteJournal
 from .pathways import PathwaysView
-from .referrals import ReferralsView
\ No newline at end of file
+from .referrals import ReferralsView
+from .discover import DiscoverView
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/discover.py b/twisted/twisted_site/views/client/discover.py
new file mode 100644
index 0000000..bd6e17a
--- /dev/null
+++ b/twisted/twisted_site/views/client/discover.py
@@ -0,0 +1,19 @@
+from django.views import View
+from django.shortcuts import render, redirect
+from ...models import Project
+
+
+class DiscoverView(View):
+    def get(self, request):
+        if self.request.user.is_anonymous:
+            return redirect("homepage")
+
+        projects = Project.objects.select_related("user", "user__profile").order_by(
+            "-created_at"
+        )
+
+        return render(
+            request,
+            "client/discover.html",
+            {"projects": projects},
+        )

From 8e623033fd795b8698684d18e12b85c80f3b9d29 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Thu, 3 Sep 2026 21:38:42 +0530
Subject: [PATCH 112/118] Make the dashboard's taskbutton a bit better in terms
 of how its rendered

---
 .../templates/client/dashboard.html           | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index 9a00e74..cb4b961 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -182,11 +182,18 @@
     <source src="{% static 'audio/bg.mp3' %}" type="audio/mpeg" />
 </audio>
 
+<template id="taskbutton-template">
+    <button onclick="focusWindow(this.dataset.winId)" class="flex items-center gap-1 !bg-twisted-600 !text-absolute-white text-sm !px-2 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black max-w-40">
+        <img src="{% static 'images/round-square.jpg' %}" class="size-4 object-cover shrink-0">
+        <span class="truncate taskbtn-title"></span>
+    </button>
+</template>
+
 <script>
     let windowCounter = 0;
     let currentMaximisedWindow = null;
 
-    window.addEventListener(
+    window.addEventListener( // newWindow from iframe events 
         "message",
         (event) => {
             const data = event.data;
@@ -227,18 +234,11 @@
         const realWin = container.querySelector('[data-win-id="' + id + '"]');
 
         // Taskbar button with round png icon
-        const taskBtn = document.createElement("button");
+        const taskbutton_template = document.getElementById("taskbutton-template");
+        const template_clone = taskbutton_template.content.cloneNode(true);
+        const taskBtn = template_clone.querySelector('button')
         taskBtn.dataset.winId = id;
-        taskBtn.className =
-            "flex items-center gap-1 !bg-twisted-600 !text-absolute-white text-sm !px-2 !py-1 !border-2 !border-t-twisted-200 !border-l-twisted-200 !border-r-dark-black !border-b-dark-black max-w-40";
-        const taskIcon = document.createElement("img");
-        taskIcon.src = '{% static "images/round-square.jpg" %}';
-        taskIcon.className = "w-4 h-4 object-cover shrink-0";
-        const taskTitle = document.createElement("span");
-        taskTitle.className = "truncate";
-        taskTitle.textContent = title;
-        taskBtn.append(taskIcon, taskTitle);
-        taskBtn.onclick = () => focusWindow(id);
+        taskBtn.querySelector(".taskbtn-title").textContent = title;
         document.getElementById("taskbar-windows").appendChild(taskBtn);
 
         realWin.querySelector(".title-bar").addEventListener("mousedown", () => focusWindow(id));
@@ -256,7 +256,6 @@
             frame.src = frame.src;
         });
         realWin.querySelector(".close-button").addEventListener("mouseup", () => {
-            console.log("close!");
             realWin.remove();
             taskBtn.remove();
         });

From d1cc946410a68c7dbc7a59fe4403181f06c8575d Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 4 Sep 2026 15:57:14 +0530
Subject: [PATCH 113/118] Add screenshot field and other QoL

---
 twisted/mysite/settings.py                    |  5 ++
 ...hca_access_token_project_screenshot_url.py | 23 +++++
 twisted/twisted_site/models.py                |  3 +
 .../templates/client/projects/detail.html     | 15 +++-
 .../templates/client/projects/list.html       |  4 +
 .../templates/client/projects/settings.html   | 83 +++++++++++++++++++
 twisted/twisted_site/urls.py                  |  4 +-
 twisted/twisted_site/views/client/auth.py     |  1 +
 twisted/twisted_site/views/client/project.py  |  7 ++
 .../views/{misc.py => image_upload.py}        |  4 +-
 10 files changed, 145 insertions(+), 4 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0027_profile_hca_access_token_project_screenshot_url.py
 rename twisted/twisted_site/views/{misc.py => image_upload.py} (95%)

diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 53606dd..366d059 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -185,3 +185,8 @@
         'level': 'INFO',
     },
 }
+
+# Ari (Review)
+# https://ari.hackclub.com/docs/webhooks
+ARI_INGEST_ENDPOINT = os.environ.get('ARI_INGEST_ENDPOINT')
+ARI_SIGNING_SECRET = os.environ.get('ARI_SIGNING_SECRET')
\ No newline at end of file
diff --git a/twisted/twisted_site/migrations/0027_profile_hca_access_token_project_screenshot_url.py b/twisted/twisted_site/migrations/0027_profile_hca_access_token_project_screenshot_url.py
new file mode 100644
index 0000000..d88875c
--- /dev/null
+++ b/twisted/twisted_site/migrations/0027_profile_hca_access_token_project_screenshot_url.py
@@ -0,0 +1,23 @@
+# Generated by Django 6.0.7 on 2026-09-04 02:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0026_project_playable_url'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='hca_access_token',
+            field=models.CharField(blank=True, default='', max_length=2000),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='screenshot_url',
+            field=models.CharField(blank=True, default='', max_length=500),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 28723f9..ad146b1 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -36,6 +36,8 @@ class Profile(models.Model):
     hackatime_access_token = models.CharField(max_length=2000, blank=True, default="")
     hackatime_state = models.CharField(max_length=100, blank=True, default="")
 
+    hca_access_token = models.CharField(max_length=2000, blank=True, default="")
+    
     is_staff = models.BooleanField(default=False)
     is_allowed = models.BooleanField(default=False)
     
@@ -84,6 +86,7 @@ class Project(models.Model):
     hackatime_project_name = models.CharField(max_length=200, blank=True, default="")
     repo_url = models.CharField(max_length=200, blank=True, default="")
     playable_url = models.CharField(max_length=200, blank=True, default="")
+    screenshot_url = models.CharField(max_length=500, blank=True, default="")
 
     def __str__(self):
         return self.project_name
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 62ba2f9..555f3e5 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -28,7 +28,7 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
             
             <div class="flex shrink-0 flex-wrap gap-1">
                 {% if project.user == request.user %}
-                {% if project.repo_url and project.playable_url and project.time_logged > 60 %} {% if not project.is_shipped %}
+                {% if project.repo_url and project.playable_url and project.screenshot_url and project.time_logged > 60 %} {% if not project.is_shipped %}
                 <a href="{% url 'fr.projects.ship' project.id %}">
                     <button
                         class="border border-primary bg-primary px-3 py-1.5 text-sm font-bold text-primary-foreground hover:bg-primary/80 active:translate-y-px"
@@ -120,6 +120,19 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                 Open project settings
             </a>
         </div>
+        {% elif not project.screenshot_url %}
+        <div class="mb-3 border border-warning bg-warning/10 p-3">
+            <div class="font-bold text-warning">Screenshot not set</div>
+
+            <div class="mt-1 text-sm text-muted-foreground">Add a screenshot before shipping your project.</div>
+
+            <a
+                href="{% url 'fr.projects.settings' project.pk %}"
+                class="mt-2 inline-block text-sm text-primary underline hover:text-accent"
+            >
+                Open project settings
+            </a>
+        </div>
         {% elif project.time_logged < 60 %}
         <div class="mb-3 border border-warning bg-warning/10 p-3">
             <div class="font-bold text-warning">log more time!</div>
diff --git a/twisted/twisted_site/templates/client/projects/list.html b/twisted/twisted_site/templates/client/projects/list.html
index 41d8003..1cdcde1 100644
--- a/twisted/twisted_site/templates/client/projects/list.html
+++ b/twisted/twisted_site/templates/client/projects/list.html
@@ -25,7 +25,11 @@
                 data-project-id="{{ project.id }}" data-project-url="{% url 'fr.projects.detail' project.id %}">
                 <div
                     class="flex h-16 w-16 items-center justify-center border border-transparent p-1">
+                    {% if project.screenshot_url %}
+                    <img src="{{ project.screenshot_url }}" alt="" class="h-full w-full object-cover">
+                    {% else %}
                     <img src="{% static 'images/directory.png' %}" alt="" class="h-full w-full object-contain">
+                    {% endif %}
                 </div>
 
                 <div
diff --git a/twisted/twisted_site/templates/client/projects/settings.html b/twisted/twisted_site/templates/client/projects/settings.html
index 1a86e02..ead70ba 100644
--- a/twisted/twisted_site/templates/client/projects/settings.html
+++ b/twisted/twisted_site/templates/client/projects/settings.html
@@ -117,6 +117,28 @@
                 class="w-full bg-card text-card-foreground border border-border px-2 py-1 focus:outline-none focus:ring-1 focus:ring-ring" />
         </div>
 
+        <div class="flex flex-col gap-1">
+            <label for="screenshot" class="font-bold">
+                Screenshot
+            </label>
+
+            {% if project.screenshot_url %}
+            <img id="screenshot_preview" src="{{ project.screenshot_url }}" alt="Project screenshot"
+                class="max-h-48 w-auto border border-border object-contain bg-card" />
+            {% else %}
+            <img id="screenshot_preview" src="" alt="" class="hidden max-h-48 w-auto border border-border object-contain bg-card" />
+            {% endif %}
+
+            <input id="screenshot" type="file" accept="image/*"
+                class="w-full bg-card text-card-foreground border border-border px-2 py-1 focus:outline-none focus:ring-1 focus:ring-ring" />
+
+            <span class="text-xs text-muted-foreground">or paste an image anywhere on this page</span>
+
+            <span id="screenshot_status" class="text-xs text-muted-foreground"></span>
+
+            <input id="screenshot_url" name="screenshot_url" type="hidden" value="{{ project.screenshot_url }}" />
+        </div>
+
         <div class="pt-2">
             <button type="submit"
                 class="px-4 py-2 bg-primary text-primary-foreground border-2 border-border hover:bg-primary/80">
@@ -126,4 +148,65 @@
 
     </form>
 </div>
+
+<script>
+    const screenshotInput = document.getElementById("screenshot");
+    const screenshotUrlField = document.getElementById("screenshot_url");
+    const screenshotPreview = document.getElementById("screenshot_preview");
+    const screenshotStatus = document.getElementById("screenshot_status");
+
+    function uploadScreenshot(file) {
+        screenshotStatus.textContent = "Uploading...";
+
+        const formData = new FormData();
+        formData.append("csrfmiddlewaretoken", "{{ csrf_token }}");
+        formData.append("file", file);
+        formData.append("ref", "project_screenshot");
+
+        fetch("{% url 'misc.upload_file' %}", {
+            method: "POST",
+            body: formData
+        })
+            .then(response => response.json())
+            .then(result => {
+                if (result.status === "ok") {
+                    screenshotUrlField.value = result.link;
+                    screenshotPreview.src = result.link;
+                    screenshotPreview.classList.remove("hidden");
+                    screenshotStatus.textContent = "";
+                } else {
+                    screenshotStatus.textContent = `Error: ${result.reason || result.error}`;
+                }
+            })
+            .catch(() => {
+                screenshotStatus.textContent = "Error: upload failed";
+            });
+    }
+
+    screenshotInput.addEventListener("change", () => {
+        const file = screenshotInput.files[0];
+        if (!file) {
+            return;
+        }
+
+        uploadScreenshot(file);
+    });
+
+    document.addEventListener("paste", (event) => {
+        const items = (event.clipboardData || window.clipboardData).items;
+
+        for (let i = 0; i < items.length; i++) {
+            if (!items[i].type.startsWith("image/")) {
+                continue;
+            }
+
+            const blob = items[i].getAsFile();
+            if (blob) {
+                uploadScreenshot(blob);
+            }
+
+            break;
+        }
+    });
+</script>
 {% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/urls.py b/twisted/twisted_site/urls.py
index 840263c..19ea57c 100644
--- a/twisted/twisted_site/urls.py
+++ b/twisted/twisted_site/urls.py
@@ -2,13 +2,15 @@
 from django.urls import path
 from .views import client
 from .views import admin
-from .views.misc import upload_file
+from .views.image_upload import upload_file
+from .views.ari import AriView
 
 urlpatterns = [
     path('', view=client.HomepageView.as_view(), name="homepage"),
     path('faqs/', view=client.FaqsView.as_view(), name="faqs"),
 
     path("api/upload_image/", upload_file, name="misc.upload_file"),
+    path("api/ari/", AriView.as_view(), name="ari"),
     
     path("auth/login/", LoginView.as_view(), name="login"),
     path("oauth/callback/", AuthCallbackView.as_view(), name="auth_callback"),
diff --git a/twisted/twisted_site/views/client/auth.py b/twisted/twisted_site/views/client/auth.py
index fff52df..0f90387 100644
--- a/twisted/twisted_site/views/client/auth.py
+++ b/twisted/twisted_site/views/client/auth.py
@@ -89,6 +89,7 @@ def get(self, request):
         profile.slack_username = display_name
         profile.slack_pfp_url = avatar_url
         profile.ysws_eligible = ysws_eligible
+        profile.hca_access_token = token['access_token']
         
         referral_code = self.request.COOKIES.get('referral')
         if created and referral_code:
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index fe676f9..05d6e04 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -89,6 +89,7 @@ def post(self, request, id):
         project.hackatime_project_name = request.POST.get("hackatime", "")
         project.repo_url = request.POST["repo"]
         project.playable_url = request.POST.get("playable_url", "")
+        project.screenshot_url = request.POST.get("screenshot_url", "")
         project.save()
         return redirect("fr.projects.detail", project.id)
 
@@ -105,6 +106,9 @@ def get(self, request, id, context={}):
         if not project.playable_url:
             return redirect("fr.projects.detail", id)
 
+        if not project.screenshot_url:
+            return redirect("fr.projects.detail", id)
+
         if not project.user.profile.ysws_eligible:
             context["info"] = (
                 "You are not YSWS eligible yet! Please get IDVd! Get help with it at #identity-help! (if you think this is a mistake, please ask in #twisted-help)"
@@ -129,6 +133,9 @@ def post(self, request, id, context={}):
         if not project.playable_url:
             return redirect("fr.projects.detail", id)
 
+        if not project.screenshot_url:
+            return redirect("fr.projects.detail", id)
+
         if not project.user.profile.ysws_eligible:
             return self.get(request, id)
 
diff --git a/twisted/twisted_site/views/misc.py b/twisted/twisted_site/views/image_upload.py
similarity index 95%
rename from twisted/twisted_site/views/misc.py
rename to twisted/twisted_site/views/image_upload.py
index d8cc0f8..619e8aa 100644
--- a/twisted/twisted_site/views/misc.py
+++ b/twisted/twisted_site/views/image_upload.py
@@ -69,7 +69,7 @@ def file_uploader(request, image):
     """
     try:
         ext = Path(image.name).suffix.lower()
-        filename = f"{str(uuid4())}-{str(image.size)}-{slugify(Path(image.name).stem)}{ext}"
+        filename = f"{str(uuid4())}-{str(image.size)}/{slugify(Path(image.name).stem)}{ext}"
         original_filename = Path(image.name).stem
         s3.upload_fileobj(
             image,
@@ -82,7 +82,7 @@ def file_uploader(request, image):
 
         return {
             "status": "ok",
-            "link": f"{os.environ['R2_PUBLIC_URL']}/{filename}",
+            "link": f"{os.environ['R2_PUBLIC_URL']}{filename}",
             "name": original_filename,
             "size": image.size,
         }

From f004c39e773461b5e35b47820d3c4df7131d4b9e Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 4 Sep 2026 17:52:52 +0530
Subject: [PATCH 114/118] Add Ari integration (kinda?)

---
 twisted/twisted_site/ari.py                   | 119 ++++++++++++++++++
 .../templates/client/projects/detail.html     |  23 ++--
 twisted/twisted_site/views/ari.py             |  11 ++
 twisted/twisted_site/views/client/project.py  |  10 +-
 4 files changed, 154 insertions(+), 9 deletions(-)
 create mode 100644 twisted/twisted_site/ari.py
 create mode 100644 twisted/twisted_site/views/ari.py

diff --git a/twisted/twisted_site/ari.py b/twisted/twisted_site/ari.py
new file mode 100644
index 0000000..4f44f0c
--- /dev/null
+++ b/twisted/twisted_site/ari.py
@@ -0,0 +1,119 @@
+from urllib.error import HTTPError
+import hashlib
+import hmac
+import json
+from collections.abc import Iterable
+from typing import Literal
+
+import requests
+from django.conf import settings
+
+from .models import Journal, Project, ProjectShip
+
+from io import StringIO
+
+ARI_INGEST_ENDPOINT = settings.ARI_INGEST_ENDPOINT
+ARI_SIGNING_SECRET = settings.ARI_SIGNING_SECRET
+
+
+def send_request(method: Literal["GET", "POST"], data=None, endpoint="", jsonify=True):
+    if jsonify or data is None:
+        data = json.dumps(data)
+
+    if method == 'POST':
+        key_bytes = ARI_SIGNING_SECRET.encode("utf-8")
+        message_bytes = data.encode("utf-8")
+
+        hmac_object = hmac.new(key_bytes, message_bytes, hashlib.sha256)
+        hex_signature = hmac_object.hexdigest()
+        headers = {
+            "X-Ari-Signature": hex_signature,
+            "Content-Type": "application/json",
+        }
+    else:
+        message_bytes = None
+        headers = {
+            "Authorization": f"Bearer {ARI_SIGNING_SECRET}"
+        }
+    req = requests.request(
+        method,
+        ARI_INGEST_ENDPOINT + endpoint,
+        data=message_bytes,
+        headers=headers,
+    )
+    return req
+
+# external_id = "twisted-{project.id}"
+def send_ship(ship: ProjectShip):
+    if settings.DEBUG_REVIEW:
+        return
+    external_id = f"twisted-{ship.project.id}"
+
+    untracked_time = 0
+    if ship.project.project_type == "hardware":
+        for journal in ship.project.journals.filter(type="untracked"):
+            untracked_time += journal.reduced_minutes
+
+    maker = {
+        "email": ship.project.user.email,
+        "name": ship.project.user.profile.slack_username,
+        "slack_id": ship.project.user.profile.slack_id,
+        "program_hours": untracked_time/60
+    }
+
+    title = ship.project.project_name
+    description = ship.project.project_description
+
+    repo_url = ship.project.repo_url
+    demo_url = ship.project.playable_url
+
+    track = ship.project.project_type
+    shipped_at = ship.created_at.isoformat()
+
+    thumbnail_url = ship.project.screenshot_url
+
+    hackatime_projects = [ship.project.hackatime_project_name]
+
+    meta = {
+        "project_url": f"https://twisted.hackclub.com/dashboard/?project={ship.project.id}",
+        "admin_project_url": f"https://twisted.hackclub.com/admin/projects/{ship.project.id}",
+    }
+
+    journals = []
+    orm_journals: Iterable[Journal] = ship.project.journals.all()
+    for journal in orm_journals:
+        content = f"# Journal type: {journal.get_type_display()}\n\n{journal.content}"
+        journals.append(
+            {
+                "at": journal.created_at.isoformat(),
+                "minutes": journal.reduced_minutes,
+                "text": content,
+                "markdown": content,
+            }
+        )
+
+    r = send_request(
+        "POST",
+        {
+            "external_id": external_id,
+            "maker": maker,
+            "title": title,
+            "description": description,
+            "repo_url": repo_url,
+            "demo_url": demo_url,
+            "track": track,
+            "shipped_at": shipped_at,
+            "thumbnail_url": thumbnail_url,
+            "hackatime_projects": hackatime_projects,
+            "evidence": ['commits', 'elapsed', 'devlog'],
+            "meta": meta
+        },
+    )
+    resp = r.content
+    r.raise_for_status()
+
+def get_project_status(project: Project):
+    r = send_request('GET', endpoint=f"/status?external_id=twisted-{project.id}")
+    _resp = r.content
+    r.raise_for_status()
+    return r.json()
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 555f3e5..a92be00 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -47,13 +47,22 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                 </a>
                 {% endif %}
                 {% endif %}
-                <button
-                    class="border border-border bg-secondary px-3 py-1.5 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px"
-                    data-url="{{ request.scheme }}://{{ request.get_host }}{% url 'dashboard' %}?project={{ project.id }}"
-                    onclick="setTimeout(() => {alert(`copying ${this.dataset.url}`)}); navigator.clipboard.writeText(this.dataset.url)"
-                >
-                    Copy share link
-                </button>
+                <div class="group relative">
+                    <button
+                        class="border border-border bg-secondary px-3 py-1.5 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px"
+                        data-url="{{ request.scheme }}://{{ request.get_host }}{% url 'dashboard' %}?project={{ project.id }}"
+                        onclick="navigator.clipboard.writeText(this.dataset.url).catch(() => alert('Failed to copy link'))"
+                    >
+                        Copy share link
+                    </button>
+                    <div
+                        class="absolute right-0 top-full z-10 mt-1 hidden max-w-xs cursor-pointer break-all border border-border bg-card px-2 py-1 text-xs text-muted-foreground group-hover:block"
+                        data-url="{{ request.scheme }}://{{ request.get_host }}{% url 'dashboard' %}?project={{ project.id }}"
+                        onclick="navigator.clipboard.writeText(this.dataset.url).catch(() => alert('Failed to copy link'))"
+                    >
+                        {{ request.scheme }}://{{ request.get_host }}{% url 'dashboard' %}?project={{ project.id }}
+                    </div>
+                </div>
 
             </div>
         </div>
diff --git a/twisted/twisted_site/views/ari.py b/twisted/twisted_site/views/ari.py
new file mode 100644
index 0000000..e831d3f
--- /dev/null
+++ b/twisted/twisted_site/views/ari.py
@@ -0,0 +1,11 @@
+from django.shortcuts import render
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.views.decorators.csrf import csrf_exempt
+
+
+# Create your views here.
+@method_decorator(csrf_exempt, name='dispatch')
+class AriView(View):
+    def get(self, request):
+        return ...
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index 05d6e04..2072c4e 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -4,9 +4,10 @@
 from django.http import JsonResponse
 from django.views import View
 from django.shortcuts import render, redirect
+
 from ...models import Profile, Project, Journal, ProjectShip
 from ... import hackatime
-
+from ... import ari
 
 # Create your views here.
 class ProjectDetail(View):
@@ -141,4 +142,9 @@ def post(self, request, id, context={}):
 
         ship = ProjectShip(project=project)
         ship.save()
-        return redirect('fr.project.detail', project.id)
+        try:
+            ari.send_ship(ship)
+        except Exception as e:
+            ship.delete()
+            raise e
+        return redirect('fr.projects.detail', project.id)

From 3cb6d71b94ad864b01294345328cd73315f70329 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Fri, 4 Sep 2026 18:07:25 +0530
Subject: [PATCH 115/118] Better feedback for copy button

---
 .../templates/client/projects/detail.html     | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index a92be00..43e7f67 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -47,22 +47,47 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                 </a>
                 {% endif %}
                 {% endif %}
-                <div class="group relative">
+                <div class="group relative pb-1">
                     <button
-                        class="border border-border bg-secondary px-3 py-1.5 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px"
+                        class="inline-flex items-center justify-center border border-border bg-secondary px-3 py-1.5 text-sm text-secondary-foreground hover:bg-primary hover:text-primary-foreground active:translate-y-px"
                         data-url="{{ request.scheme }}://{{ request.get_host }}{% url 'dashboard' %}?project={{ project.id }}"
-                        onclick="navigator.clipboard.writeText(this.dataset.url).catch(() => alert('Failed to copy link'))"
+                        onclick="copyShareLink(this, true)"
                     >
                         Copy share link
                     </button>
                     <div
-                        class="absolute right-0 top-full z-10 mt-1 hidden max-w-xs cursor-pointer break-all border border-border bg-card px-2 py-1 text-xs text-muted-foreground group-hover:block"
+                        class="absolute right-0 top-full z-10 hidden w-max max-w-sm cursor-pointer break-all border border-border bg-card px-2 py-1 text-xs text-muted-foreground group-hover:block"
                         data-url="{{ request.scheme }}://{{ request.get_host }}{% url 'dashboard' %}?project={{ project.id }}"
-                        onclick="navigator.clipboard.writeText(this.dataset.url).catch(() => alert('Failed to copy link'))"
+                        onclick="copyShareLink(this)"
                     >
                         {{ request.scheme }}://{{ request.get_host }}{% url 'dashboard' %}?project={{ project.id }}
                     </div>
                 </div>
+                <script>
+                    function copyShareLink(el, styled) {
+                        if (el.dataset.originalText === undefined) {
+                            el.dataset.originalText = el.textContent
+                        }
+                        if (styled && !el.style.width) {
+                            el.style.width = el.offsetWidth + "px"
+                        }
+                        navigator.clipboard.writeText(el.dataset.url).then(() => {
+                            clearTimeout(el._copyRevertTimeout)
+                            el.textContent = "Copied!"
+                            if (styled) {
+                                el.classList.remove("bg-secondary", "text-secondary-foreground", "hover:bg-primary", "hover:text-primary-foreground")
+                                el.classList.add("bg-success", "text-success-foreground", "border-success", "hover:bg-success", "hover:text-success-foreground")
+                            }
+                            el._copyRevertTimeout = setTimeout(() => {
+                                el.textContent = el.dataset.originalText
+                                if (styled) {
+                                    el.classList.remove("bg-success", "text-success-foreground", "border-success", "hover:bg-success", "hover:text-success-foreground")
+                                    el.classList.add("bg-secondary", "text-secondary-foreground", "hover:bg-primary", "hover:text-primary-foreground")
+                                }
+                            }, 1500)
+                        }).catch(() => alert("Failed to copy link"))
+                    }
+                </script>
 
             </div>
         </div>

From 04f58f0810d9dd72ecc707cf9fc5937a6b465641 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 5 Sep 2026 17:47:00 +0530
Subject: [PATCH 116/118] Added full ari integration

---
 twisted/.env.example                          |   3 +-
 twisted/mysite/settings.py                    |   5 +-
 twisted/twisted_site/ari.py                   |  79 ++++-
 ...move_projectship_final_message_and_more.py |  86 ++++++
 ...9_projectship_final_audit_note_and_more.py |  28 ++
 twisted/twisted_site/models.py                |  74 +----
 .../templates/admin/debug/review.html         |  71 +++--
 .../twisted_site/templates/admin/user.html    |   2 +-
 .../templates/client/projects/detail.html     |  25 +-
 twisted/twisted_site/views/admin/review.py    |  36 +--
 twisted/twisted_site/views/ari.py             | 270 +++++++++++++++++-
 twisted/twisted_site/views/client/project.py  |  13 +-
 twisted/twisted_site/views/image_upload.py    |  32 ++-
 13 files changed, 564 insertions(+), 160 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0028_remove_projectship_final_message_and_more.py
 create mode 100644 twisted/twisted_site/migrations/0029_projectship_final_audit_note_and_more.py

diff --git a/twisted/.env.example b/twisted/.env.example
index 7e9befe..624d072 100644
--- a/twisted/.env.example
+++ b/twisted/.env.example
@@ -34,4 +34,5 @@ R2_TOKEN =
 
 DEBUG_REVIEW=true
 ARI_INGEST_ENDPOINT=
-ARI_SIGNING_SECRET=
\ No newline at end of file
+ARI_SIGNING_SECRET=
+ARI_WEBHOOK_SECRET=
\ No newline at end of file
diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 366d059..0b658a6 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -189,4 +189,7 @@
 # Ari (Review)
 # https://ari.hackclub.com/docs/webhooks
 ARI_INGEST_ENDPOINT = os.environ.get('ARI_INGEST_ENDPOINT')
-ARI_SIGNING_SECRET = os.environ.get('ARI_SIGNING_SECRET')
\ No newline at end of file
+ARI_SIGNING_SECRET = os.environ.get('ARI_SIGNING_SECRET')
+# Separate from ARI_SIGNING_SECRET: signs deliveries Ari sends to us (Settings -> Webhooks),
+# not requests we send to Ari.
+ARI_WEBHOOK_SECRET = os.environ.get('ARI_WEBHOOK_SECRET')
\ No newline at end of file
diff --git a/twisted/twisted_site/ari.py b/twisted/twisted_site/ari.py
index 4f44f0c..682182e 100644
--- a/twisted/twisted_site/ari.py
+++ b/twisted/twisted_site/ari.py
@@ -1,7 +1,7 @@
-from urllib.error import HTTPError
 import hashlib
 import hmac
 import json
+import time
 from collections.abc import Iterable
 from typing import Literal
 
@@ -10,26 +10,57 @@
 
 from .models import Journal, Project, ProjectShip
 
-from io import StringIO
 
 ARI_INGEST_ENDPOINT = settings.ARI_INGEST_ENDPOINT
 ARI_SIGNING_SECRET = settings.ARI_SIGNING_SECRET
+ARI_WEBHOOK_SECRET = settings.ARI_WEBHOOK_SECRET
 
+# Deliveries older than this are rejected, per the "How delivery works" doc.
+WEBHOOK_MAX_AGE_SECONDS = 5 * 60
+
+
+def verify_webhook_signature(body: bytes, timestamp: str, delivery_id: str, signature: str) -> bool:
+    """Verifies an outbound delivery from Ari (the X-Ari-Signature/-Timestamp/-Delivery-Id
+    headers on review.* and ship.updated webhooks). Signed with ARI_WEBHOOK_SECRET, which is
+    separate from ARI_SIGNING_SECRET (that one signs requests we send to Ari)."""
+    if not (timestamp and delivery_id and signature):
+        return False
+
+    try:
+        if abs(time.time() - int(timestamp)) > WEBHOOK_MAX_AGE_SECONDS:
+            return False
+    except ValueError:
+        return False
+
+    key_bytes = ARI_WEBHOOK_SECRET.encode("utf-8")
+    message_bytes = f"{timestamp}.{delivery_id}.".encode("utf-8") + body
+    expected_signature = hmac.new(key_bytes, message_bytes, hashlib.sha256).hexdigest()
+
+    return hmac.compare_digest(expected_signature, signature)
+
+
+def get_hex_signature(content):
+    key_bytes = ARI_SIGNING_SECRET.encode("utf-8")
+    try:
+        message_bytes = content.encode("utf-8")
+    except Exception:
+        message_bytes = content
+
+    hmac_object = hmac.new(key_bytes, message_bytes, hashlib.sha256)
+    hex_signature = hmac_object.hexdigest()
+
+    return hex_signature
 
 def send_request(method: Literal["GET", "POST"], data=None, endpoint="", jsonify=True):
     if jsonify or data is None:
         data = json.dumps(data)
 
     if method == 'POST':
-        key_bytes = ARI_SIGNING_SECRET.encode("utf-8")
-        message_bytes = data.encode("utf-8")
-
-        hmac_object = hmac.new(key_bytes, message_bytes, hashlib.sha256)
-        hex_signature = hmac_object.hexdigest()
         headers = {
-            "X-Ari-Signature": hex_signature,
+            "X-Ari-Signature": get_hex_signature(data),
             "Content-Type": "application/json",
         }
+        message_bytes = data.encode("utf-8")
     else:
         message_bytes = None
         headers = {
@@ -106,6 +137,7 @@ def send_ship(ship: ProjectShip):
             "thumbnail_url": thumbnail_url,
             "hackatime_projects": hackatime_projects,
             "evidence": ['commits', 'elapsed', 'devlog'],
+            "journals": journals,
             "meta": meta
         },
     )
@@ -116,4 +148,33 @@ def get_project_status(project: Project):
     r = send_request('GET', endpoint=f"/status?external_id=twisted-{project.id}")
     _resp = r.content
     r.raise_for_status()
-    return r.json()
\ No newline at end of file
+    return r.json()
+
+# ARI's phases go: (processing | fraud_review | review | under_review) -- reviewer
+# hasn't decided yet -- then second_pass -- reviewer decided, an organizer still has
+# to confirm it -- then reviewed, where `decision` is locked in. withdrawn/reverted
+# are terminal/reset states outside that normal flow.
+_ARI_DECISION_TO_SHIP_STATUS = {
+    "approved": "approved",
+    "changes": "requested_changes",
+    "rejected": "rejected",
+}
+
+
+def ship_passes_from_status(status: dict | None) -> tuple[str, str]:
+    """Maps an ARI /status response into (first_pass_status, second_pass_status),
+    using the PROJECT_SHIP_STATUSES vocabulary (pending/approved/rejected/requested_changes)."""
+    if not status:
+        return "pending", "pending"
+
+    phase = status.get("phase")
+    decision = _ARI_DECISION_TO_SHIP_STATUS.get(status.get("decision"), "pending")
+
+    if phase == "second_pass":
+        return decision, "pending"
+    if phase == "reviewed":
+        return decision, decision
+    if phase == "withdrawn":
+        return "rejected", "rejected"
+    # processing, fraud_review, review, under_review, reverted, or unknown
+    return "pending", "pending"
diff --git a/twisted/twisted_site/migrations/0028_remove_projectship_final_message_and_more.py b/twisted/twisted_site/migrations/0028_remove_projectship_final_message_and_more.py
new file mode 100644
index 0000000..de3123b
--- /dev/null
+++ b/twisted/twisted_site/migrations/0028_remove_projectship_final_message_and_more.py
@@ -0,0 +1,86 @@
+# Generated by Django 6.0.7 on 2026-09-05 05:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0027_profile_hca_access_token_project_screenshot_url'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='projectship',
+            name='final_message',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='final_status',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='final_updated_at',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='fraud_message',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='fraud_status',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='fraud_updated_at',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='t1_message',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='t1_status',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='t1_updated_at',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='t2_message',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='t2_status',
+        ),
+        migrations.RemoveField(
+            model_name='projectship',
+            name='t2_updated_at',
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='audit_note',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='deflation_reason',
+            field=models.CharField(blank=True, default='', max_length=255),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='note_to_maker',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='technical_features',
+            field=models.CharField(blank=True, default='', max_length=255),
+        ),
+    ]
diff --git a/twisted/twisted_site/migrations/0029_projectship_final_audit_note_and_more.py b/twisted/twisted_site/migrations/0029_projectship_final_audit_note_and_more.py
new file mode 100644
index 0000000..d16c85c
--- /dev/null
+++ b/twisted/twisted_site/migrations/0029_projectship_final_audit_note_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 6.0.7 on 2026-09-05 06:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0028_remove_projectship_final_message_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='projectship',
+            name='final_audit_note',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='final_note_to_maker',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='projectship',
+            name='final_status',
+            field=models.CharField(choices=[('pending', 'Awaiting review'), ('requested_changes', 'Changes Requested'), ('rejected', 'Rejected'), ('approved', 'Approved')], default='pending', max_length=200),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index ad146b1..39bc6b6 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -3,6 +3,7 @@
 from django.db import models
 from django.utils import timezone
 from . import hackatime
+from .slack import slack_bot
 
 User = get_user_model()
 
@@ -139,13 +140,13 @@ def is_shipped(self):
         latest_ship = self.latest_ship()
         if latest_ship is None:
             return False
-        return latest_ship.latest_status() != 'requested_changes'
-    
+        return latest_ship.status != 'requested_changes'
+
     def is_approved(self):
         latest_ship = self.latest_ship()
         if latest_ship is None:
             return False
-        return latest_ship.final_status == 'approved'
+        return latest_ship.status == 'approved'
 
 
 class Journal(models.Model):
@@ -170,7 +171,7 @@ def __str__(self):
     "pending": "Awaiting review",
     "requested_changes": "Changes Requested",
     "rejected": "Rejected",
-    "approved": "Approved"
+    "approved": "Approved",
 }
 
 
@@ -179,69 +180,20 @@ class ProjectShip(models.Model):
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
-    
-    t1_status = models.CharField(default="pending", choices=PROJECT_SHIP_STATUSES, max_length=200)
-    t1_updated_at = models.DateTimeField(default=None, null=True)
-    t1_message = models.TextField(blank=True, default="")
 
-    t2_status = models.CharField(default="pending", choices=PROJECT_SHIP_STATUSES, max_length=200)
-    t2_updated_at = models.DateTimeField(default=None, null=True)
-    t2_message = models.TextField(blank=True, default="")
+    status = models.CharField(default="pending", choices=PROJECT_SHIP_STATUSES, max_length=200)
 
-    fraud_status = models.CharField(default="pending", choices=PROJECT_SHIP_STATUSES, max_length=200)
-    fraud_updated_at = models.DateTimeField(default=None, null=True)
-    fraud_message = models.TextField(blank=True, default="")
+    note_to_maker = models.TextField(blank=True, default="")
+    audit_note = models.TextField(blank=True, default="")
+    technical_features = models.CharField(blank=True, default="", max_length=255)
+    deflation_reason = models.CharField(blank=True, default="", max_length=255)
 
     final_status = models.CharField(default="pending", choices=PROJECT_SHIP_STATUSES, max_length=200)
-    final_updated_at = models.DateTimeField(default=None, null=True)
-    final_message = models.TextField(blank=True, default="")
-
-
-    def latest_status(self):
-        if self.final_status != 'pending':
-            return self.final_status
-        if self.fraud_status != 'pending':
-            return self.fraud_status
-        if self.t2_status != 'pending':
-            return self.t2_status
-        return self.t1_status
-    
-    def get_latest_status_display(self):
-        if self.final_status != 'pending':
-            string = "Final"
-        elif self.fraud_status != 'pending':
-            string = "Fraud"
-        elif self.t2_status != 'pending':
-            string = "T2"
-        else:
-            string = "T1"
-        return string +": "+PROJECT_SHIP_STATUSES[self.latest_status()]
-    
-    
-    def save(self, *args, **kwargs):
-        if not self.pk:  # Check if object already exists in the database
-            return super().save(*args, **kwargs)
-        
-        original = ProjectShip.objects.get(pk=self.pk)
+    final_note_to_maker = models.TextField(blank=True, default="")
+    final_audit_note = models.TextField(blank=True, default="")
 
-        if original.t1_status != self.t1_status or original.t1_message != self.t1_message:
-            self.t1_updated_at = timezone.now()
-        
-        if original.t2_status != self.t2_status or original.t2_message != self.t2_message:
-            self.t2_updated_at = timezone.now()
-        
-        if original.fraud_status != self.fraud_status or original.fraud_message != self.fraud_message:
-            self.fraud_updated_at = timezone.now()
-        
-        if original.final_status != self.final_status or original.final_message != self.final_message:
-            self.final_updated_at = timezone.now()
-        
-        return super().save(*args, **kwargs)
-
-
-    
     def __str__(self):
-        return f"Ship created at {self.created_at} ({PROJECT_SHIP_STATUSES.get(str(self.latest_status()), self.latest_status())})"
+        return f"Ship created at {self.created_at} ({self.get_status_display()})"  # ty:ignore[unresolved-attribute]
 
 
 class Pathway(models.Model):
diff --git a/twisted/twisted_site/templates/admin/debug/review.html b/twisted/twisted_site/templates/admin/debug/review.html
index 4d23001..76da221 100644
--- a/twisted/twisted_site/templates/admin/debug/review.html
+++ b/twisted/twisted_site/templates/admin/debug/review.html
@@ -22,44 +22,49 @@ <h1 class="text-xl font-bold">
                     <c-ui.table>
                         <thead>
                             <tr>
-                                <th>T1</th>
-                                <th>T2</th>
-                                <th>Fraud</th>
-                                <th>Final</th>
+                                <th>Status</th>
+                                <th>Note to maker</th>
+                                <th>Audit note (internal)</th>
+                                <th>Technical features (internal)</th>
+                                <th>Deflation reason (internal)</th>
                             </tr>
                         </thead>
                         <tbody>
-                            <tr>
-                                <td>{{ ship.t1_updated_at }}</td>
-                                <td>{{ ship.t2_updated_at }}</td>
-                                <td>{{ ship.fraud_updated_at }}</td>
-                                <td>{{ ship.final_updated_at }}</td>
-                            </tr>
                             <tr>
                                 <td>
-                                    <c-ui.select name="t1_status" placeholder="Select an option">
-                                        <c-ui.select.option value="pending" selected="{% if ship.t1_status == 'pending' %}True{% endif %}">pending</c-ui.select.option>
-                                        <c-ui.select.option value="requested_changes" selected="{% if ship.t1_status == 'requested_changes' %}True{% endif %}">requested_changes</c-ui.select.option>
-                                        <c-ui.select.option value="rejected" selected="{% if ship.t1_status == 'rejected' %}True{% endif %}">rejected</c-ui.select.option>
-                                        <c-ui.select.option value="approved" selected="{% if ship.t1_status == 'approved' %}True{% endif %}">approved</c-ui.select.option>
+                                    <c-ui.select name="status" placeholder="Select an option">
+                                        <c-ui.select.option value="pending" selected="{% if ship.status == 'pending' %}True{% endif %}">pending</c-ui.select.option>
+                                        <c-ui.select.option value="requested_changes" selected="{% if ship.status == 'requested_changes' %}True{% endif %}">requested_changes</c-ui.select.option>
+                                        <c-ui.select.option value="rejected" selected="{% if ship.status == 'rejected' %}True{% endif %}">rejected</c-ui.select.option>
+                                        <c-ui.select.option value="approved" selected="{% if ship.status == 'approved' %}True{% endif %}">approved</c-ui.select.option>
                                     </c-ui.select>
                                 </td>
                                 <td>
-                                    <c-ui.select name="t2_status" placeholder="Select an option">
-                                        <c-ui.select.option value="pending" selected="{% if ship.t2_status == 'pending' %}True{% endif %}">pending</c-ui.select.option>
-                                        <c-ui.select.option value="requested_changes" selected="{% if ship.t2_status == 'requested_changes' %}True{% endif %}">requested_changes</c-ui.select.option>
-                                        <c-ui.select.option value="rejected" selected="{% if ship.t2_status == 'rejected' %}True{% endif %}">rejected</c-ui.select.option>
-                                        <c-ui.select.option value="approved" selected="{% if ship.t2_status == 'approved' %}True{% endif %}">approved</c-ui.select.option>
-                                    </c-ui.select>
+                                    <textarea name="note_to_maker">{{ ship.note_to_maker }}</textarea>
                                 </td>
                                 <td>
-                                    <c-ui.select name="fraud_status" placeholder="Select an option">
-                                        <c-ui.select.option value="pending" selected="{% if ship.fraud_status == 'pending' %}True{% endif %}">pending</c-ui.select.option>
-                                        <c-ui.select.option value="requested_changes" selected="{% if ship.fraud_status == 'requested_changes' %}True{% endif %}">requested_changes</c-ui.select.option>
-                                        <c-ui.select.option value="rejected" selected="{% if ship.fraud_status == 'rejected' %}True{% endif %}">rejected</c-ui.select.option>
-                                        <c-ui.select.option value="approved" selected="{% if ship.fraud_status == 'approved' %}True{% endif %}">approved</c-ui.select.option>
-                                    </c-ui.select>
+                                    <textarea name="audit_note">{{ ship.audit_note }}</textarea>
+                                </td>
+                                <td>
+                                    <input type="text" name="technical_features" value="{{ ship.technical_features }}">
                                 </td>
+                                <td>
+                                    <input type="text" name="deflation_reason" value="{{ ship.deflation_reason }}">
+                                </td>
+                            </tr>
+                        </tbody>
+                    </c-ui.table>
+                    <h2 class="mt-3 font-bold">Final review (manual sign-off)</h2>
+                    <c-ui.table>
+                        <thead>
+                            <tr>
+                                <th>Final status</th>
+                                <th>Final note to maker</th>
+                                <th>Final audit note (internal)</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
                                 <td>
                                     <c-ui.select name="final_status" placeholder="Select an option">
                                         <c-ui.select.option value="pending" selected="{% if ship.final_status == 'pending' %}True{% endif %}">pending</c-ui.select.option>
@@ -68,19 +73,11 @@ <h1 class="text-xl font-bold">
                                         <c-ui.select.option value="approved" selected="{% if ship.final_status == 'approved' %}True{% endif %}">approved</c-ui.select.option>
                                     </c-ui.select>
                                 </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <textarea name="t1_message">{{ ship.t1_message }}</textarea>
-                                </td>
-                                <td>
-                                    <textarea name="t2_message">{{ ship.t2_message }}</textarea>
-                                </td>
                                 <td>
-                                    <textarea name="fraud_message">{{ ship.fraud_message }}</textarea>
+                                    <textarea name="final_note_to_maker">{{ ship.final_note_to_maker }}</textarea>
                                 </td>
                                 <td>
-                                    <textarea name="final_message">{{ ship.final_message }}</textarea>
+                                    <textarea name="final_audit_note">{{ ship.final_audit_note }}</textarea>
                                 </td>
                             </tr>
                         </tbody>
diff --git a/twisted/twisted_site/templates/admin/user.html b/twisted/twisted_site/templates/admin/user.html
index 2935041..6336ae7 100644
--- a/twisted/twisted_site/templates/admin/user.html
+++ b/twisted/twisted_site/templates/admin/user.html
@@ -39,7 +39,7 @@ <h1 class="text-lg font-bold">{{ project }}</h1>
                 <div>
                     <c-ui.badge>{{ project.get_project_type_display }}</c-ui.badge>
                     {% if project.latest_ship %}
-                    <c-ui.badge>{{ project.latest_ship.get_latest_status_display }}</c-ui.badge>
+                    <c-ui.badge>{{ project.latest_ship.get_status_display }}</c-ui.badge>
                     {% endif %}
                 </div>
                 <div>
diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html
index 43e7f67..f2bd3ac 100644
--- a/twisted/twisted_site/templates/client/projects/detail.html
+++ b/twisted/twisted_site/templates/client/projects/detail.html
@@ -13,7 +13,7 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                     </span>
 
                     {% if project.is_shipped %}
-                    {% if project.latest_ship.latest_status == 'rejected' %}
+                    {% if project.latest_ship.status == 'rejected' %}
                     <span class="border border-red-600 bg-red-600/20 px-2 py-0.5 text-xs text-red-600"> permanently rejected </span>
                     {% else %}
                     <span class="border border-success bg-success/20 px-2 py-0.5 text-xs text-success"> shipped </span>
@@ -263,21 +263,16 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
                     </div>
                 </article>
                 {% endwith %}
-                {% elif activity_item.t1_status %} {# bad way to check if activity item is a ship #}
+                {% elif activity_item.status %} {# bad way to check if activity item is a ship #}
                 {% with activity_item as ship %}
-                {% if ship.final_status != 'pending' %}
-                <c-ship-message title="final check complete" status="{{ ship.get_final_status_display }}" :time="ship.final_updated_at">
-                    {{ ship.final_message|default:"no message!"|linebreaksbr }}
-                </c-ship-message>
-                {% endif %}
-                {% if ship.t2_status != 'pending' %}
-                <c-ship-message title="second pass complete" status="{{ ship.get_t2_status_display }}" :time="ship.t2_updated_at">
-                    {{ ship.t2_message|default:"no message!"|linebreaksbr }}
+                {% if ship.status != 'pending' %}
+                <c-ship-message title="reviewer note" status="{{ ship.get_status_display }}" :time="ship.updated_at">
+                    {{ ship.note_to_maker|default:"no message!"|linebreaksbr }}
                 </c-ship-message>
                 {% endif %}
-                {% if ship.t1_status != 'pending' %}
-                <c-ship-message title="first pass complete" status="{{ ship.get_t1_status_display }}" :time="ship.t1_updated_at">
-                    {{ ship.t1_message|default:"no message!"|linebreaksbr }}
+                {% if ship.final_status != 'pending' %}
+                <c-ship-message title="final review complete" status="{{ ship.get_final_status_display }}" :time="ship.updated_at">
+                    {{ ship.final_note_to_maker|default:"no message!"|linebreaksbr }}
                 </c-ship-message>
                 {% endif %}
                 <div class="mb-3 border border-success bg-success/10">
@@ -293,11 +288,11 @@ <h1 class="wrap-break-word text-xl font-bold">{{ project.project_name }}</h1>
 
                         <div class="mt-2 flex w-full overflow-auto gap-4 items-center justify-center md:justify-start">
                             <div class="w-24 mb-auto">
-                                <c-project-ship-mark status="{{ ship.t1_status }}" />
+                                <c-project-ship-mark status="{{ first_pass_status }}" />
                                 <p class="text-center w-full text-sm">first pass</p>
                             </div>
                             <div class="w-24 mb-auto">
-                                <c-project-ship-mark status="{{ ship.t2_status }}" />
+                                <c-project-ship-mark status="{{ second_pass_status }}" />
                                 <p class="text-center w-full text-sm">second pass</p>
                             </div>
                             <div class="w-24 mb-auto">
diff --git a/twisted/twisted_site/views/admin/review.py b/twisted/twisted_site/views/admin/review.py
index 7617c31..d13ace6 100644
--- a/twisted/twisted_site/views/admin/review.py
+++ b/twisted/twisted_site/views/admin/review.py
@@ -28,28 +28,28 @@ def debug_get(self, request):
     
     def debug_post(self, request):
         id = request.POST['id']
-        
-        t1_status = request.POST['t1_status']
-        t2_status = request.POST['t2_status']
-        fraud_status = request.POST['fraud_status']
+
+        status = request.POST['status']
+        note_to_maker = request.POST['note_to_maker']
+        audit_note = request.POST['audit_note']
+        technical_features = request.POST['technical_features']
+        deflation_reason = request.POST['deflation_reason']
+
         final_status = request.POST['final_status']
-        
-        t1_message = request.POST['t1_message']
-        t2_message = request.POST['t2_message']
-        fraud_message = request.POST['fraud_message']
-        final_message = request.POST['final_message']
-        
+        final_note_to_maker = request.POST['final_note_to_maker']
+        final_audit_note = request.POST['final_audit_note']
+
         ship = ProjectShip.objects.get(id=id)
 
-        ship.t1_status = t1_status
-        ship.t2_status = t2_status
-        ship.fraud_status = fraud_status
-        ship.final_status = final_status
+        ship.status = status
+        ship.note_to_maker = note_to_maker
+        ship.audit_note = audit_note
+        ship.technical_features = technical_features
+        ship.deflation_reason = deflation_reason
 
-        ship.t1_message = t1_message
-        ship.t2_message = t2_message
-        ship.fraud_message = fraud_message
-        ship.final_message = final_message
+        ship.final_status = final_status
+        ship.final_note_to_maker = final_note_to_maker
+        ship.final_audit_note = final_audit_note
 
         ship.save()
         messages.info(request, f"Ship with id {id} updated.")
diff --git a/twisted/twisted_site/views/ari.py b/twisted/twisted_site/views/ari.py
index e831d3f..34fe3bf 100644
--- a/twisted/twisted_site/views/ari.py
+++ b/twisted/twisted_site/views/ari.py
@@ -1,11 +1,277 @@
+import json
+from django.http import HttpResponseNotAllowed, HttpResponse
 from django.shortcuts import render
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.csrf import csrf_exempt
+from ..ari import verify_webhook_signature
+from ..models import ProjectShip, Project
+from ..slack import slack_bot
 
 
+def _escape_mrkdwn(text):
+    return text.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
+
+
+def _quote_block(value):
+    lines = _escape_mrkdwn(value).splitlines() or ['']
+    return '\n'.join(f'> {line}' for line in lines)
+
+
+def _build_ship_update_blocks(project, changes):
+    blocks = [
+        {
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": f":package: Your ship for *{_escape_mrkdwn(project.project_name)}* has been updated by a reviewer!",
+            },
+        },
+    ]
+
+    for change in changes:
+        blocks.append({"type": "divider"})
+        field_name = _escape_mrkdwn(change['field'].replace('_', ' ').title())
+        blocks.append({
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": (
+                    f"*{field_name}* changed\n\n"
+                    f"*Old:*\n{_quote_block(change['old_value'])}\n\n"
+                    f"*New:*\n{_quote_block(change['new_value'])}"
+                ),
+            },
+        })
+
+    return blocks
+
+
+def _build_review_changes_blocks(project, note_to_maker):
+    return [
+        {
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": f":memo: Your ship for *{_escape_mrkdwn(project.project_name)}* needs some changes!",
+            },
+        },
+        {"type": "divider"},
+        {
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": f"*Note from reviewer:*\n{_quote_block(note_to_maker)}",
+            },
+        },
+        {"type": "divider"},
+        {
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": "Feel free to drop us a message over at #twisted-help if you think this is a mistake!",
+            },
+        },
+    ]
+
+
+def _build_review_approved_blocks(project, note_to_maker):
+    blocks = [
+        {
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": f":tada: Your ship for *{_escape_mrkdwn(project.project_name)}* was approved!",
+            },
+        },
+    ]
+    if note_to_maker:
+        blocks.append({"type": "divider"})
+        blocks.append({
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": f"*Note from reviewer:*\n{_quote_block(note_to_maker)}",
+            },
+        })
+    return blocks
+
+
+def _build_review_rejected_blocks(project, note_to_maker):
+    blocks = [
+        {
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": f":x: Your ship for *{_escape_mrkdwn(project.project_name)}* was rejected.",
+            },
+        },
+    ]
+    if note_to_maker:
+        blocks.append({"type": "divider"})
+        blocks.append({
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": f"*Note from reviewer:*\n{_quote_block(note_to_maker)}",
+            },
+        })
+    blocks.append({"type": "divider"})
+    blocks.append({
+        "type": "section",
+        "text": {
+            "type": "mrkdwn",
+            "text": "Feel free to drop us a message over at #twisted-help if you think this is a mistake!",
+        },
+    })
+    return blocks
+
+
+def _build_review_reverted_blocks(project):
+    return [
+        {
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": f":leftwards_arrow_with_hook: The decision on your ship for *{_escape_mrkdwn(project.project_name)}* was reverted, it's back with reviewers.",
+            },
+        },
+    ]
+
+
+def _build_review_requeued_blocks(project):
+    return [
+        {
+            "type": "section",
+            "text": {
+                "type": "mrkdwn",
+                "text": f":repeat: Your ship for *{_escape_mrkdwn(project.project_name)}* is back in the review queue for another look.",
+            },
+        },
+    ]
+
 # Create your views here.
 @method_decorator(csrf_exempt, name='dispatch')
 class AriView(View):
-    def get(self, request):
-        return ...
+    def post(self, request):
+        body = request.body
+
+        if not verify_webhook_signature(
+            body,
+            request.headers.get('X-Ari-Timestamp', ''),
+            request.headers.get('X-Ari-Delivery-Id', ''),
+            request.headers.get('X-Ari-Signature', ''),
+        ):
+            return HttpResponse(status=401)
+
+        data = json.loads(body)
+
+        if data['external_id']:
+            project_id = int(data['external_id'].removeprefix('twisted-'))
+            project = Project.objects.get(id=project_id)
+
+        if data['event'] == 'ship.updated':
+            project.project_name = data['ship']['title']
+            project.project_description = data['ship']['description']
+            project.project_type = data['ship']['track']
+            project.screenshot_url = data['ship']['thumbnail_url']
+            project.repo_url = data['ship']['repo_url']
+            project.playable_url = data['ship']['demo_url']
+            project.hackatime_project_name = data['ship']['hackatime_projects'][0]
+            project.save()
+            slack_bot.send_blocks(
+                channel=project.user.profile.slack_id,
+                blocks=_build_ship_update_blocks(project, data['changes']),
+                text=f"Your ship for {project.project_name} has been updated by a reviewer!",
+            )
+
+            return HttpResponse('Request processed!')
+    
+        if data['event'] == 'review.changes':
+            if data['decision'] != 'changes':
+                return
+            note_to_maker = data['review']['note_to_maker']
+
+            ship:ProjectShip = project.latest_ship()
+
+            ship.status = 'requested_changes'  # ty:ignore[invalid-assignment]
+            ship.note_to_maker = note_to_maker
+            ship.save()
+
+            slack_bot.send_blocks(
+                channel=project.user.profile.slack_id,
+                blocks=_build_review_changes_blocks(project, note_to_maker),
+                text=f"Your ship for {project.project_name} needs some changes!",
+            )
+
+            return HttpResponse('Request processed!')
+
+        if data['event'] == 'review.approved':
+            review = data['review']
+            note_to_maker = review.get('note_to_maker', '')
+            justification = review.get('justification') or {}
+
+            ship: ProjectShip = project.latest_ship()
+            ship.status = 'approved'  # ty:ignore[invalid-assignment]
+            ship.note_to_maker = note_to_maker
+            ship.audit_note = review.get('audit_note', '')
+            ship.technical_features = justification.get('technical_features', '')
+            ship.deflation_reason = justification.get('deflation_reason', '')
+            ship.save()
+
+            slack_bot.send_blocks(
+                channel=project.user.profile.slack_id,
+                blocks=_build_review_approved_blocks(project, note_to_maker),
+                text=f"Your ship for {project.project_name} was approved!",
+            )
+
+            return HttpResponse('Request processed!')
+
+        if data['event'] == 'review.rejected':
+            review = data['review']
+            note_to_maker = review.get('note_to_maker', '')
+            justification = review.get('justification') or {}
+
+            ship: ProjectShip = project.latest_ship()
+            ship.status = 'rejected'  # ty:ignore[invalid-assignment]
+            ship.note_to_maker = note_to_maker
+            ship.audit_note = review.get('audit_note', '')
+            ship.technical_features = justification.get('technical_features', '')
+            ship.deflation_reason = justification.get('deflation_reason', '')
+            ship.save()
+
+            slack_bot.send_blocks(
+                channel=project.user.profile.slack_id,
+                blocks=_build_review_rejected_blocks(project, note_to_maker),
+                text=f"Your ship for {project.project_name} was rejected.",
+            )
+
+            return HttpResponse('Request processed!')
+
+        if data['event'] == 'review.reverted':
+            ship: ProjectShip = project.latest_ship()
+            ship.status = 'pending'  # ty:ignore[invalid-assignment]
+            ship.save()
+
+            slack_bot.send_blocks(
+                channel=project.user.profile.slack_id,
+                blocks=_build_review_reverted_blocks(project),
+                text=f"The decision on your ship for {project.project_name} was reverted.",
+            )
+
+            return HttpResponse('Request processed!')
+
+        if data['event'] == 'review.requeued':
+            ship: ProjectShip = project.latest_ship()
+            ship.status = 'pending'  # ty:ignore[invalid-assignment]
+            ship.save()
+
+            slack_bot.send_blocks(
+                channel=project.user.profile.slack_id,
+                blocks=_build_review_requeued_blocks(project),
+                text=f"Your ship for {project.project_name} is back in the review queue.",
+            )
+
+            return HttpResponse('Request processed!')
+
+        return HttpResponse('Event ignored')
\ No newline at end of file
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index 2072c4e..0be1034 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -1,4 +1,4 @@
-from requests import HTTPError
+from requests import HTTPError, RequestException
 from itertools import chain
 from markdown_it.rules_inline import image
 from django.http import JsonResponse
@@ -29,6 +29,17 @@ def get(self, request, id):
         context["journals"] = list(chain(journals, ships))
         context["journals"].sort(key=lambda x: x.created_at, reverse=True)
 
+        context["first_pass_status"] = "pending"
+        context["second_pass_status"] = "pending"
+        if project.latest_ship() is not None:
+            try:
+                status = ari.get_project_status(project)
+                context["first_pass_status"], context["second_pass_status"] = (
+                    ari.ship_passes_from_status(status)
+                )
+            except RequestException:
+                pass
+
         if project.user == request.user:
             context["owner"] = True
         else:
diff --git a/twisted/twisted_site/views/image_upload.py b/twisted/twisted_site/views/image_upload.py
index 619e8aa..a73e451 100644
--- a/twisted/twisted_site/views/image_upload.py
+++ b/twisted/twisted_site/views/image_upload.py
@@ -63,38 +63,42 @@ def upload_file(request):
     )
 
 
-def file_uploader(request, image):
-    """
-    Basic imgur uploader return as json data.
-    """
+def _upload_fileobj(fileobj, filename, content_type, size):
     try:
-        ext = Path(image.name).suffix.lower()
-        filename = f"{str(uuid4())}-{str(image.size)}/{slugify(Path(image.name).stem)}{ext}"
-        original_filename = Path(image.name).stem
+        ext = Path(filename).suffix.lower()
+        stored_name = f"{str(uuid4())}-{size}/{slugify(Path(filename).stem)}{ext}"
+        original_filename = Path(filename).stem
         s3.upload_fileobj(
-            image,
+            fileobj,
             os.environ["R2_BUCKET"],
-            filename,
+            stored_name,
             ExtraArgs={
-                "ContentType": image.content_type,
+                "ContentType": content_type,
             },
         )
 
         return {
             "status": "ok",
-            "link": f"{os.environ['R2_PUBLIC_URL']}{filename}",
+            "link": f"{os.environ['R2_PUBLIC_URL']}{stored_name}",
             "name": original_filename,
-            "size": image.size,
+            "size": size,
         }
 
     except (ClientError, BotoCoreError) as e:
         return {
-                "status": "error", 
+                "status": "error",
                 "error": str(e)
             }
 
     except Exception as e:
         return {
-            "status": "error", 
+            "status": "error",
             "error": f"Unknown Error Occurred: {str(e)}",
         }
+
+
+def file_uploader(request, image):
+    """
+    Basic imgur uploader return as json data.
+    """
+    return _upload_fileobj(image, image.name, image.content_type, image.size)

From 22f40b0bd9bdb4e6d728c2a26199fbce31e2eda1 Mon Sep 17 00:00:00 2001
From: KavyanshKhaitan2 <kavyanshkhaitan11@gmail.com>
Date: Sat, 5 Sep 2026 18:35:50 +0530
Subject: [PATCH 117/118] Add QoL features, and fix a few critical bugs

---
 twisted/mysite/settings.py                    |  9 +++++
 twisted/twisted_site/admin.py                 |  4 --
 twisted/twisted_site/hackatime.py             | 14 ++++---
 ...0_alter_journal_minutes_worked_and_more.py | 24 ++++++++++++
 twisted/twisted_site/models.py                |  5 ++-
 twisted/twisted_site/slack.py                 |  5 ++-
 .../twisted_site/templates/admin/user.html    |  2 +-
 .../twisted_site/templates/admin/users.html   |  3 +-
 .../templates/client/discover.html            | 34 ++++++++++++++++-
 .../templates/client/projects/create.html     | 27 -------------
 .../templates/cotton/project_ship_mark.html   |  2 +
 .../twisted_site/views/admin/audit_logs.py    |  2 +-
 twisted/twisted_site/views/admin/pathways.py  |  6 +--
 twisted/twisted_site/views/admin/review.py    |  4 +-
 twisted/twisted_site/views/admin/users.py     | 11 ++++--
 twisted/twisted_site/views/ari.py             | 18 +++++++--
 twisted/twisted_site/views/client/auth.py     | 38 +++++++++++--------
 .../twisted_site/views/client/dashboard.py    |  4 +-
 twisted/twisted_site/views/client/discover.py |  8 +++-
 twisted/twisted_site/views/client/journal.py  | 26 ++++++-------
 twisted/twisted_site/views/client/project.py  | 28 ++++++++------
 twisted/twisted_site/views/client/projects.py |  6 +--
 twisted/twisted_site/views/image_upload.py    |  8 ++++
 23 files changed, 181 insertions(+), 107 deletions(-)
 create mode 100644 twisted/twisted_site/migrations/0030_alter_journal_minutes_worked_and_more.py

diff --git a/twisted/mysite/settings.py b/twisted/mysite/settings.py
index 0b658a6..6933734 100644
--- a/twisted/mysite/settings.py
+++ b/twisted/mysite/settings.py
@@ -33,6 +33,15 @@
 USE_X_FORWARDED_HOST = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
+# Behind the TLS-terminating proxy above, cookies should never travel over plain
+# HTTP once we're not in local dev.
+SESSION_COOKIE_SECURE = not DEBUG
+CSRF_COOKIE_SECURE = not DEBUG
+SECURE_SSL_REDIRECT = not DEBUG
+SECURE_HSTS_SECONDS = 0 if DEBUG else 60 * 60 * 24 * 365
+SECURE_HSTS_INCLUDE_SUBDOMAINS = not DEBUG
+SECURE_HSTS_PRELOAD = not DEBUG
+
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 allowed_hosts_raw = os.getenv("ALLOWED_HOSTS", "127.0.0.1,localhost")
diff --git a/twisted/twisted_site/admin.py b/twisted/twisted_site/admin.py
index 07dba64..8c38f3f 100644
--- a/twisted/twisted_site/admin.py
+++ b/twisted/twisted_site/admin.py
@@ -1,7 +1,3 @@
 from django.contrib import admin
-from .models import Profile, Project, Journal
 
 # Register your models here.
-admin.site.register(Profile)
-admin.site.register(Project)
-admin.site.register(Journal)
diff --git a/twisted/twisted_site/hackatime.py b/twisted/twisted_site/hackatime.py
index 904a0f4..91f49a6 100644
--- a/twisted/twisted_site/hackatime.py
+++ b/twisted/twisted_site/hackatime.py
@@ -52,13 +52,15 @@ def projects(
     projects: list[str] | None = None,
 ) -> list[HackatimeProject]:
     """Returns the user's projects with time totals."""
+    params = {"include_archived": "true" if include_archived else "false"}
+    if start is not None:
+        params["start"] = start.isoformat()
+    if projects is not None:
+        params["projects"] = ",".join(projects)
+
     resp = requests.get(
-        (
-            HACKATIME_ROOT_URL + "/api/v1/authenticated/projects"
-            f"?include_archived={'true' if include_archived else 'false'}"
-            f"&start={str(start.isoformat()) if start is not None else ''}"
-            f"&projects={','.join(projects) if projects is not None else ''}"
-        ),
+        HACKATIME_ROOT_URL + "/api/v1/authenticated/projects",
+        params=params,
         headers=authhelper(access_token),
     )
     resp.raise_for_status()
diff --git a/twisted/twisted_site/migrations/0030_alter_journal_minutes_worked_and_more.py b/twisted/twisted_site/migrations/0030_alter_journal_minutes_worked_and_more.py
new file mode 100644
index 0000000..2405650
--- /dev/null
+++ b/twisted/twisted_site/migrations/0030_alter_journal_minutes_worked_and_more.py
@@ -0,0 +1,24 @@
+# Generated by Django 6.0.7 on 2026-09-05 12:54
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twisted_site', '0029_projectship_final_audit_note_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='journal',
+            name='minutes_worked',
+            field=models.IntegerField(validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+        migrations.AlterField(
+            model_name='journal',
+            name='reduced_minutes',
+            field=models.IntegerField(validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+    ]
diff --git a/twisted/twisted_site/models.py b/twisted/twisted_site/models.py
index 39bc6b6..1941cb7 100644
--- a/twisted/twisted_site/models.py
+++ b/twisted/twisted_site/models.py
@@ -1,5 +1,6 @@
 from django.db.models import TextField
 from django.contrib.auth import get_user_model
+from django.core.validators import MinValueValidator
 from django.db import models
 from django.utils import timezone
 from . import hackatime
@@ -160,8 +161,8 @@ class Journal(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
-    minutes_worked = models.IntegerField()
-    reduced_minutes = models.IntegerField()
+    minutes_worked = models.IntegerField(validators=[MinValueValidator(0)])
+    reduced_minutes = models.IntegerField(validators=[MinValueValidator(0)])
 
     def __str__(self):
         return f"{self.reduced_minutes} mins on {self.project}"
diff --git a/twisted/twisted_site/slack.py b/twisted/twisted_site/slack.py
index cbf727b..4238e0d 100644
--- a/twisted/twisted_site/slack.py
+++ b/twisted/twisted_site/slack.py
@@ -155,7 +155,10 @@ def error_log(
             **kwargs,
         )
 
-        thread_text = f"```{error}```"
+        # Break up any backticks in the error text so it can't close the code
+        # fence early and have the remainder render as live Slack mrkdwn.
+        safe_error = error.replace("`", "`​")
+        thread_text = f"```{safe_error}```"
 
         if mention:
             thread_text += f"\n\nCC: {mention}"
diff --git a/twisted/twisted_site/templates/admin/user.html b/twisted/twisted_site/templates/admin/user.html
index 6336ae7..36a99ab 100644
--- a/twisted/twisted_site/templates/admin/user.html
+++ b/twisted/twisted_site/templates/admin/user.html
@@ -63,7 +63,7 @@ <h1 class="text-lg font-bold">
     </div>
     {% if login_maybe %}
     <div class="mt-4">
-        <form method="post">
+        <form method="post" onsubmit="return confirm('Toggle this user\'s allowed state?');">
             {% csrf_token %}
             <input type="hidden" name="action" value="toggle_is_allowed">
             <c-ui.button type="submit">Toggle allowed state</c-ui.button>
diff --git a/twisted/twisted_site/templates/admin/users.html b/twisted/twisted_site/templates/admin/users.html
index ea61d79..ae0d8d4 100644
--- a/twisted/twisted_site/templates/admin/users.html
+++ b/twisted/twisted_site/templates/admin/users.html
@@ -13,6 +13,7 @@
                 placeholder="Search Users..."
                 autocomplete="off"
                 value="{{ request.GET.search }}"
+                autofocus
             >
                 <c-slot name="left_addon">
                     <svg
@@ -81,7 +82,7 @@ <h3 class="text-lg font-semibold mb-1">
         </div>
     </div>
     <div class="mt-100">
-        <form method="post">
+        <form method="post" onsubmit="return confirm('This will immediately log out every user on the site. Are you sure?');">
             {% csrf_token %}
             <input type="hidden" name="action" value="logoutall">
             hehe click this funny button to log everyone out:
diff --git a/twisted/twisted_site/templates/client/discover.html b/twisted/twisted_site/templates/client/discover.html
index 338b12e..732dd76 100644
--- a/twisted/twisted_site/templates/client/discover.html
+++ b/twisted/twisted_site/templates/client/discover.html
@@ -72,8 +72,38 @@ <h3 class="wrap-break-word text-sm font-bold text-card-foreground group-hover:te
 
     </div>
 
-    <div class="status-field-border p-1 border-t border-border flex shrink-0 items-center bg-card px-1 text-sm">
-        {{ projects|length }} project{{ projects|length|pluralize }}
+    <div class="status-field-border p-1 border-t border-border flex shrink-0 items-center justify-between gap-2 bg-card px-1 text-sm">
+        <span>{{ paginator.count }} project{{ paginator.count|pluralize }}</span>
+
+        {% if paginator.num_pages > 1 %}
+        <div class="flex items-center gap-1">
+            {% if projects.has_previous %}
+            <a href="?page={{ projects.previous_page_number }}"
+                class="border border-border bg-secondary px-2 py-0.5 text-xs text-secondary-foreground hover:bg-muted">
+                &larr; prev
+            </a>
+            {% else %}
+            <span class="border border-border bg-secondary px-2 py-0.5 text-xs text-muted-foreground opacity-50">
+                &larr; prev
+            </span>
+            {% endif %}
+
+            <span class="px-2 text-xs text-muted-foreground">
+                page {{ projects.number }} of {{ paginator.num_pages }}
+            </span>
+
+            {% if projects.has_next %}
+            <a href="?page={{ projects.next_page_number }}"
+                class="border border-border bg-secondary px-2 py-0.5 text-xs text-secondary-foreground hover:bg-muted">
+                next &rarr;
+            </a>
+            {% else %}
+            <span class="border border-border bg-secondary px-2 py-0.5 text-xs text-muted-foreground opacity-50">
+                next &rarr;
+            </span>
+            {% endif %}
+        </div>
+        {% endif %}
     </div>
 
 </div>
diff --git a/twisted/twisted_site/templates/client/projects/create.html b/twisted/twisted_site/templates/client/projects/create.html
index 94f5d1b..f5b2127 100644
--- a/twisted/twisted_site/templates/client/projects/create.html
+++ b/twisted/twisted_site/templates/client/projects/create.html
@@ -3,31 +3,6 @@
 {% block body %}
 <div class="flex h-full w-full flex-col bg-surface font-vintage text-foreground">
 
-    {% if complete %}
-
-    <div class="flex min-h-0 flex-1 items-center justify-center p-6">
-        <div class="w-full max-w-md border border-border bg-card p-6 text-center">
-            <div
-                class="mx-auto mb-4 flex h-14 w-14 items-center justify-center border border-border bg-secondary text-2xl">
-                ✓
-            </div>
-
-            <div class="text-xl font-bold text-foreground">
-                Project created!
-            </div>
-
-            <div class="mt-2 text-sm text-muted-foreground">
-                Your project has been successfully created.
-            </div>
-
-            <div class="mt-4 border-t border-border pt-3 text-xs text-subtle-foreground">
-                You can now close this window.
-            </div>
-        </div>
-    </div>
-
-    {% else %}
-
     <form method="post" class="flex min-h-0 flex-1 flex-col">
         {% csrf_token %}
 
@@ -97,7 +72,5 @@
 
     </form>
 
-    {% endif %}
-
 </div>
 {% endblock body %}
\ No newline at end of file
diff --git a/twisted/twisted_site/templates/cotton/project_ship_mark.html b/twisted/twisted_site/templates/cotton/project_ship_mark.html
index 70366f6..d32f965 100644
--- a/twisted/twisted_site/templates/cotton/project_ship_mark.html
+++ b/twisted/twisted_site/templates/cotton/project_ship_mark.html
@@ -8,6 +8,8 @@
 <div class="mx-auto border flex border-red-400 size-12 mb-2 rounded-full bg-red-700">
     <c-svg.cross class="size-10 mx-auto my-auto text-red-400" />
 </div>
+{% elif status == 'unavailable' %}
+<div class="mx-auto border flex border-yellow-400 size-12 mb-2 rounded-full bg-yellow-700" title="Status check unavailable, try again later">?</div>
 {% else %}
 <div class="mx-auto border flex border-border size-12 mb-2">No status found!</div>
 {% endif %}
diff --git a/twisted/twisted_site/views/admin/audit_logs.py b/twisted/twisted_site/views/admin/audit_logs.py
index f18e35f..d33890f 100644
--- a/twisted/twisted_site/views/admin/audit_logs.py
+++ b/twisted/twisted_site/views/admin/audit_logs.py
@@ -25,5 +25,5 @@ def get(self, request):
         
         paginator = Paginator(auditlogs, 250, orphans=50)
         context['logs'] = paginator.get_page(page_number)
-        context['log_count'] = len(auditlogs)
+        context['log_count'] = auditlogs.count()
         return TemplateResponse(request, "admin/logs.html", context=context)
diff --git a/twisted/twisted_site/views/admin/pathways.py b/twisted/twisted_site/views/admin/pathways.py
index 22cb57f..7b479cb 100644
--- a/twisted/twisted_site/views/admin/pathways.py
+++ b/twisted/twisted_site/views/admin/pathways.py
@@ -1,6 +1,6 @@
 from django.http import HttpResponse
 from .admin import AdminView
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, get_object_or_404
 from ...models import Pathway, User
 from django.utils import timezone
 from django.contrib import messages
@@ -80,7 +80,7 @@ def post(self, request):
             if not end_time:
                 return self.get(request, "No end time selected!", errcontext)
             
-            if not min_mins:
+            if min_mins <= 0:
                 return self.get(request, "Minimum minutes must be greater than zero!", errcontext)
         
         current_tz_offset = timezone.datetime.now(timezone.get_current_timezone()).strftime('%z')
@@ -108,7 +108,7 @@ def post(self, request):
 class PathwayDetailView(AdminView):
     def get(self, request, id):
         context = self.get_context_data(page="pathways", subpage="detail")
-        pathway = Pathway.objects.get(id=id)
+        pathway = get_object_or_404(Pathway, id=id)
         context['pathway'] = pathway
 
         self.audit_log.additional_context['pathway_name'] = pathway.name
diff --git a/twisted/twisted_site/views/admin/review.py b/twisted/twisted_site/views/admin/review.py
index d13ace6..4895ecd 100644
--- a/twisted/twisted_site/views/admin/review.py
+++ b/twisted/twisted_site/views/admin/review.py
@@ -1,7 +1,7 @@
 from django.contrib import messages
 from django.http import HttpResponse
 from .admin import AdminView
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, get_object_or_404
 from django.conf import settings
 from ...models import ProjectShip
 
@@ -39,7 +39,7 @@ def debug_post(self, request):
         final_note_to_maker = request.POST['final_note_to_maker']
         final_audit_note = request.POST['final_audit_note']
 
-        ship = ProjectShip.objects.get(id=id)
+        ship = get_object_or_404(ProjectShip, id=id)
 
         ship.status = status
         ship.note_to_maker = note_to_maker
diff --git a/twisted/twisted_site/views/admin/users.py b/twisted/twisted_site/views/admin/users.py
index 3b1b03e..4a836e4 100644
--- a/twisted/twisted_site/views/admin/users.py
+++ b/twisted/twisted_site/views/admin/users.py
@@ -2,7 +2,7 @@
 from django.template.response import TemplateResponse
 from django.http import HttpResponse
 from .admin import AdminView
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, get_object_or_404
 from ...models import User, Profile
 from django.db.models import Q
 import os
@@ -28,14 +28,17 @@ def get(self, request):
 
     def post(self, request):
         if request.POST.get('action') == 'logoutall':
+            session_count = Session.objects.count()
             Session.objects.all().delete()
-        
+            self.audit_log.additional_context['action'] = 'logoutall'
+            self.audit_log.additional_context['sessions_deleted'] = session_count
+
         return redirect(self.request.path)
     
 class UserDetailView(AdminView):
     def get(self, request, id):
         context = self.get_context_data(page='users', subpage='detail')
-        user = User.objects.get(id=id)
+        user = get_object_or_404(User, id=id)
 
         self.audit_log.additional_context['user_pfp__img'] = user.profile.slack_pfp_url
         self.audit_log.additional_context['user'] = user.profile.slack_username
@@ -45,7 +48,7 @@ def get(self, request, id):
         return TemplateResponse(request, "admin/user.html", context)
     
     def post(self, request, id):
-        user = User.objects.get(id=id)
+        user = get_object_or_404(User, id=id)
 
         self.audit_log.additional_context['user_pfp__img'] = user.profile.slack_pfp_url
         self.audit_log.additional_context['user'] = user.profile.slack_username
diff --git a/twisted/twisted_site/views/ari.py b/twisted/twisted_site/views/ari.py
index 34fe3bf..be2784a 100644
--- a/twisted/twisted_site/views/ari.py
+++ b/twisted/twisted_site/views/ari.py
@@ -1,5 +1,5 @@
 import json
-from django.http import HttpResponseNotAllowed, HttpResponse
+from django.http import HttpResponseNotAllowed, HttpResponse, HttpResponseBadRequest
 from django.shortcuts import render
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -166,9 +166,19 @@ def post(self, request):
 
         data = json.loads(body)
 
-        if data['external_id']:
-            project_id = int(data['external_id'].removeprefix('twisted-'))
+        external_id = data.get('external_id')
+        if not external_id:
+            return HttpResponseBadRequest('Missing external_id')
+
+        try:
+            project_id = int(external_id.removeprefix('twisted-'))
             project = Project.objects.get(id=project_id)
+        except (ValueError, Project.DoesNotExist):  # ty:ignore[unresolved-attribute]
+            return HttpResponseBadRequest('Invalid external_id')
+
+        event = data.get('event')
+        if not event:
+            return HttpResponseBadRequest('Missing event')
 
         if data['event'] == 'ship.updated':
             project.project_name = data['ship']['title']
@@ -189,7 +199,7 @@ def post(self, request):
     
         if data['event'] == 'review.changes':
             if data['decision'] != 'changes':
-                return
+                return HttpResponse('Event ignored')
             note_to_maker = data['review']['note_to_maker']
 
             ship:ProjectShip = project.latest_ship()
diff --git a/twisted/twisted_site/views/client/auth.py b/twisted/twisted_site/views/client/auth.py
index 0f90387..dc695db 100644
--- a/twisted/twisted_site/views/client/auth.py
+++ b/twisted/twisted_site/views/client/auth.py
@@ -5,7 +5,8 @@
 import os
 from authlib.integrations.django_client import OAuth
 from django.views import View
-import random
+import secrets
+import hmac
 
 from ...models import Profile
 from ... import hackatime
@@ -56,6 +57,14 @@ def get(self, request):
         sub = userinfo.get("sub")
         clean_sub = sub.replace("!", "_")
         slack_id = userinfo.get("slack_id", "")
+        if not slack_id:
+            return JsonResponse(
+                {
+                    "error": "Twisted requires a Slack account linked to Hack Club Identity. "
+                    "Please sign up for Slack and link it at https://auth.hackclub.com, then try logging in again."
+                }
+            )
+
         verification_status = userinfo.get("verification_status", "")
         ysws_eligible = userinfo.get("ysws_eligible", False)
         user_model = get_user_model()
@@ -68,20 +77,19 @@ def get(self, request):
             },
         )
 
-        if slack_id:
-            try:
-                slack_user = slack_bot.users_info(user=slack_id)["user"]
-                slack_profile = slack_user["profile"]
+        try:
+            slack_user = slack_bot.users_info(user=slack_id)["user"]
+            slack_profile = slack_user["profile"]
 
-                display_name = slack_profile.get("display_name") or slack_profile.get(
-                    "real_name"
-                )
-                avatar_url = slack_profile.get("image_512")
+            display_name = slack_profile.get("display_name") or slack_profile.get(
+                "real_name"
+            )
+            avatar_url = slack_profile.get("image_512")
 
-            except Exception as e:
-                print("Slack profile fetch failed", e)
-                display_name = name
-                avatar_url = os.environ["DEFAULT_PFP"]
+        except Exception as e:
+            print("Slack profile fetch failed", e)
+            display_name = name
+            avatar_url = os.environ["DEFAULT_PFP"]
 
         profile, created = Profile.objects.get_or_create(user=user)  # ty:ignore[unresolved-attribute]
         profile.verification_status = verification_status
@@ -113,7 +121,7 @@ def get(self, request):
             HACKATIME_REDIRECT_URI = os.environ["HACKATIME_REDIRECT_URI"]
             scopes = "profile+read"
 
-            profile.hackatime_state = str(random.randint(0, 10**20))
+            profile.hackatime_state = secrets.token_urlsafe(32)
             profile.save()
 
             return redirect(
@@ -131,7 +139,7 @@ def get(self, request):
         profile = request.user.profile
 
         state = request.GET["state"]
-        if state != profile.hackatime_state:
+        if not hmac.compare_digest(state, profile.hackatime_state):
             profile.hackatime_state = ""
             profile.save()
             return JsonResponse(
diff --git a/twisted/twisted_site/views/client/dashboard.py b/twisted/twisted_site/views/client/dashboard.py
index e6c6090..dfe3ca0 100644
--- a/twisted/twisted_site/views/client/dashboard.py
+++ b/twisted/twisted_site/views/client/dashboard.py
@@ -1,5 +1,5 @@
 from django.views import View
-from django.shortcuts import render, redirect, resolve_url
+from django.shortcuts import render, redirect, resolve_url, get_object_or_404
 from ...models import Project
 
 # Create your views here.
@@ -18,7 +18,7 @@ def get(self, request):
         project_id = request.GET.get('project')
         
         if project_id:
-            project = Project.objects.get(id=project_id)
+            project = get_object_or_404(Project, id=project_id)
             startup_windows.append({"href": resolve_url('fr.projects.detail', project.id), "title": project.project_name})
         
         context['startup_windows'] = startup_windows
diff --git a/twisted/twisted_site/views/client/discover.py b/twisted/twisted_site/views/client/discover.py
index bd6e17a..442a8e9 100644
--- a/twisted/twisted_site/views/client/discover.py
+++ b/twisted/twisted_site/views/client/discover.py
@@ -1,7 +1,10 @@
 from django.views import View
 from django.shortcuts import render, redirect
+from django.core.paginator import Paginator
 from ...models import Project
 
+PROJECTS_PER_PAGE = 120
+
 
 class DiscoverView(View):
     def get(self, request):
@@ -12,8 +15,11 @@ def get(self, request):
             "-created_at"
         )
 
+        paginator = Paginator(projects, PROJECTS_PER_PAGE)
+        page_obj = paginator.get_page(request.GET.get("page"))
+
         return render(
             request,
             "client/discover.html",
-            {"projects": projects},
+            {"projects": page_obj, "paginator": paginator},
         )
diff --git a/twisted/twisted_site/views/client/journal.py b/twisted/twisted_site/views/client/journal.py
index b034287..0a8d438 100644
--- a/twisted/twisted_site/views/client/journal.py
+++ b/twisted/twisted_site/views/client/journal.py
@@ -1,7 +1,7 @@
 from markdown_it.rules_inline import image
 from django.http import JsonResponse
 from django.views import View
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, get_object_or_404
 from ...models import Profile, Project, Journal
 from ... import hackatime
 import re
@@ -17,7 +17,7 @@ def get(self, request, id, info=None, context={}):
         if self.request.user.is_anonymous:
             return redirect("homepage")
 
-        project = Project.objects.get(id=id)
+        project = get_object_or_404(Project, id=id)
         if project.user != request.user:
             return redirect("dashboard")
 
@@ -38,7 +38,7 @@ def get(self, request, id, info=None, context={}):
         )
 
     def post(self, request, id):
-        project = Project.objects.get(id=id)
+        project = get_object_or_404(Project, id=id)
         if project.user != request.user:
             return redirect("dashboard")
 
@@ -93,14 +93,14 @@ def get(self, request, id, info=None, context={}):
         if self.request.user.is_anonymous:
             return redirect("homepage")
         
-        project = Project.objects.get(id=id)
+        project = get_object_or_404(Project, id=id)
 
-        if project.project_type == 'software':
-            return redirect('fr.projects.journals.new.hackatime')
-        
         if project.user != request.user:
             return redirect("dashboard")
 
+        if project.project_type == 'software':
+            return redirect('fr.projects.journals.new.hackatime')
+
         context["project"] = project
 
         log_minutes = project.hackatime_time_unjournaled()
@@ -120,7 +120,7 @@ def get(self, request, id, info=None, context={}):
         )
 
     def post(self, request, id):
-        project = Project.objects.get(id=id)
+        project = get_object_or_404(Project, id=id)
         if project.user != request.user:
             return redirect("dashboard")
         
@@ -175,7 +175,7 @@ def get(self, request, id, context={'success': False}):
             return redirect('homepage')
         
         if id is not None:
-            journal = Journal.objects.get(id=id)
+            journal = get_object_or_404(Journal, id=id)
             if journal.project.is_shipped():
                 return redirect('fr.projects.detail', journal.project.id)
 
@@ -196,11 +196,9 @@ def get(self, request, id, context={'success': False}):
     def post(self, request, id):
         if request.user.is_anonymous:
             return redirect('homepage')
-        print('hi', flush=True)
-        
-        journal = Journal.objects.get(id=id)
-        print(journal)
-        
+
+        journal = get_object_or_404(Journal, id=id)
+
         if journal.project.is_shipped():
             return redirect('fr.projects.detail', journal.project.id)
 
diff --git a/twisted/twisted_site/views/client/project.py b/twisted/twisted_site/views/client/project.py
index 0be1034..0acddbb 100644
--- a/twisted/twisted_site/views/client/project.py
+++ b/twisted/twisted_site/views/client/project.py
@@ -1,11 +1,10 @@
 from requests import HTTPError, RequestException
 from itertools import chain
 from markdown_it.rules_inline import image
-from django.http import JsonResponse
+from django.http import JsonResponse, HttpResponse
 from django.views import View
-from django.shortcuts import render, redirect
-
-from ...models import Profile, Project, Journal, ProjectShip
+from django.shortcuts import render, redirect, get_object_or_404
+from ...models import Profile, Project, Journal, ProjectShip, PROJECT_TYPE_CHOICES
 from ... import hackatime
 from ... import ari
 
@@ -20,7 +19,7 @@ def get(self, request, id):
         profile: Profile = request.user.profile
         context["profile"] = profile
 
-        project = Project.objects.get(id=id)
+        project = get_object_or_404(Project, id=id)
         context["project"] = project
 
         journals = project.journals.all()
@@ -38,7 +37,8 @@ def get(self, request, id):
                     ari.ship_passes_from_status(status)
                 )
             except RequestException:
-                pass
+                context["first_pass_status"] = "unavailable"
+                context["second_pass_status"] = "unavailable"
 
         if project.user == request.user:
             context["owner"] = True
@@ -59,7 +59,7 @@ def get(self, request, id):
 
         context = {}
 
-        project = Project.objects.get(id=id)
+        project = get_object_or_404(Project, id=id)
         context["project"] = project
 
         if project.is_shipped():
@@ -88,16 +88,20 @@ def post(self, request, id):
         if self.request.user.is_anonymous:
             return redirect("homepage")
 
-        project = Project.objects.get(id=id)
+        project = get_object_or_404(Project, id=id)
         if project.user != request.user:
             return redirect("dashboard")
 
         if project.is_shipped():
             return redirect("fr.projects.detail", id)
 
+        project_type = request.POST["type"]
+        if project_type not in PROJECT_TYPE_CHOICES:
+            return HttpResponse("naughty! you arent supposed to do this!")
+
         project.project_name = request.POST["name"]
         project.project_description = request.POST["description"]
-        project.project_type = request.POST["type"]
+        project.project_type = project_type
         project.hackatime_project_name = request.POST.get("hackatime", "")
         project.repo_url = request.POST["repo"]
         project.playable_url = request.POST.get("playable_url", "")
@@ -111,7 +115,7 @@ def get(self, request, id, context={}):
         if self.request.user.is_anonymous:
             return redirect("homepage")
 
-        project = Project.objects.get(id=id)
+        project = get_object_or_404(Project, id=id)
         if project.user != request.user:
             return redirect("dashboard")
 
@@ -133,9 +137,9 @@ def post(self, request, id, context={}):
         if self.request.user.is_anonymous:
             return redirect("homepage")
 
-        project = Project.objects.get(id=id)
+        project = get_object_or_404(Project, id=id)
         if project.user != request.user:
-            return redirect('fr.project.detail', project.id)
+            return redirect('fr.projects.detail', project.id)
 
         if project.is_shipped():
             return self.get(
diff --git a/twisted/twisted_site/views/client/projects.py b/twisted/twisted_site/views/client/projects.py
index 9495b4d..4aa49ae 100644
--- a/twisted/twisted_site/views/client/projects.py
+++ b/twisted/twisted_site/views/client/projects.py
@@ -26,11 +26,7 @@ def get(self, request):
         if self.request.user.is_anonymous:
             return redirect('homepage')
         
-        return render(
-            request,
-            "client/projects/create.html",
-            {"complete": False},
-        )
+        return render(request, "client/projects/create.html")
 
     def post(self, request):
         if self.request.user.is_anonymous:
diff --git a/twisted/twisted_site/views/image_upload.py b/twisted/twisted_site/views/image_upload.py
index a73e451..d325330 100644
--- a/twisted/twisted_site/views/image_upload.py
+++ b/twisted/twisted_site/views/image_upload.py
@@ -12,6 +12,8 @@
 from uuid import uuid4
 from botocore.exceptions import ClientError, BotoCoreError
 
+ALLOWED_CONTENT_TYPES = {"image/png", "image/jpeg", "image/webp", "image/gif"}
+
 s3 = boto3.client(
     "s3",
     endpoint_url=os.environ["R2_ENDPOINT"],
@@ -25,6 +27,12 @@ def upload_file(request):
     if request.method == "POST":
         if "file" in request.FILES:
             file = request.FILES["file"]
+
+            if file.content_type not in ALLOWED_CONTENT_TYPES:
+                return JsonResponse(
+                    {"status": "error", "reason": "Only PNG, JPEG, WEBP, or GIF images are allowed!"}
+                )
+
             # The size limit is a server-side policy; never let the client raise it.
             max_file_mb = 10
 

From 10690e4808e7384c8d79a60d98ab5bc1f9e33678 Mon Sep 17 00:00:00 2001
From: Kavyansh Khaitan <73186427+KavyanshKhaitan2@users.noreply.github.com>
Date: Tue, 8 Sep 2026 15:47:43 +0530
Subject: [PATCH 118/118] Potential fix for pull request finding 'CodeQL /
 Client-side URL redirect'

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
---
 .../templates/client/dashboard.html           | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html
index cb4b961..8dbf98e 100644
--- a/twisted/twisted_site/templates/client/dashboard.html
+++ b/twisted/twisted_site/templates/client/dashboard.html
@@ -193,9 +193,22 @@
     let windowCounter = 0;
     let currentMaximisedWindow = null;
 
+    function getSafeInternalUrl(urlValue) {
+        try {
+            const parsed = new URL(urlValue, window.location.origin);
+            const allowedProtocols = ["http:", "https:"];
+            if (!allowedProtocols.includes(parsed.protocol)) return null;
+            if (parsed.origin !== window.location.origin) return null;
+            return parsed.href;
+        } catch (_) {
+            return null;
+        }
+    }
+
     window.addEventListener( // newWindow from iframe events 
         "message",
         (event) => {
+            if (event.origin !== window.location.origin) return;
             const data = event.data;
             if (data.type != "internal") return;
             if (data.action == "open") {
@@ -203,7 +216,9 @@
                     h = 600;
                 if (data.width) w = data.width;
                 if (data.height) h = data.height;
-                newWindow(data.title, data.src, w, h);
+                const safeSrc = getSafeInternalUrl(data.src);
+                if (!safeSrc) return;
+                newWindow(data.title, safeSrc, w, h);
             }
         },
         false,
@@ -218,7 +233,9 @@
         win.dataset.winId = id;
 
         win.querySelector(".title-bar-text").textContent = title;
-        win.querySelector(".src-frame").src = src;
+        const safeSrc = getSafeInternalUrl(src);
+        if (!safeSrc) return;
+        win.querySelector(".src-frame").src = safeSrc;
         console.log(x, y);
         
         if (x === null) x = Math.random() * (window.innerWidth - w);