From 8ea637c96e338fecd1933902392d674110dabff7 Mon Sep 17 00:00:00 2001 From: Lewin Kelly Date: Tue, 8 Sep 2026 14:12:06 -0400 Subject: [PATCH 01/24] Format HTML templates with djLint --- twisted/common/templates/base.html | 27 +- .../templates/admin/announcements.html | 10 +- .../templates/admin/dashboard.html | 40 +- .../templates/admin/debug/review.html | 182 ++++--- .../templates/admin/fulfillment.html | 10 +- .../twisted_site/templates/admin/logs.html | 148 +++--- .../templates/admin/pathways/create.html | 33 +- .../templates/admin/pathways/detail.html | 101 ++-- .../templates/admin/pathways/list.html | 30 +- .../twisted_site/templates/admin/review.html | 10 +- .../twisted_site/templates/admin/shop.html | 10 +- .../twisted_site/templates/admin/user.html | 276 +++++----- .../twisted_site/templates/admin/users.html | 105 ++-- .../templates/client/dashboard.html | 393 ++++++++------ .../templates/client/discover.html | 158 +++--- .../twisted_site/templates/client/faqs.html | 127 ++--- .../templates/client/homepage.html | 184 +++---- .../twisted_site/templates/client/osbase.html | 40 +- .../templates/client/pathways.html | 234 +++++---- .../templates/client/projects/create.html | 110 ++-- .../templates/client/projects/detail.html | 491 +++++++++--------- .../client/projects/journal/delete.html | 121 ++--- .../projects/journal/new_hackatime.html | 19 +- .../projects/journal/new_journal.base.html | 148 +++--- .../projects/journal/new_untracked.html | 33 +- .../templates/client/projects/list.html | 119 +++-- .../templates/client/projects/settings.html | 242 +++++---- .../templates/client/projects/ship.html | 123 ++--- .../templates/client/referrals.html | 148 +++--- .../twisted_site/templates/cotton/base.html | 95 ++-- .../twisted_site/templates/cotton/button.html | 57 +- .../templates/cotton/homepage_taskbar.html | 67 ++- .../twisted_site/templates/cotton/mdedit.html | 25 +- .../templates/cotton/mdpreview.html | 5 +- .../templates/cotton/pathway_card.html | 51 +- .../templates/cotton/project_ship_mark.html | 32 +- .../templates/cotton/ship_message.html | 3 +- .../templates/cotton/sidebar/index.html | 27 +- .../templates/cotton/sidebar/item.html | 10 +- .../templates/cotton/svg/cross.html | 30 +- .../templates/cotton/svg/tick.html | 21 +- 41 files changed, 2175 insertions(+), 1920 deletions(-) diff --git a/twisted/common/templates/base.html b/twisted/common/templates/base.html index aeea556..cc320bf 100644 --- a/twisted/common/templates/base.html +++ b/twisted/common/templates/base.html @@ -1,19 +1,20 @@ {% load tailwind_tags static %} - - {% tailwind_css %} - {% block head %}{% endblock head %} - - Twisted - - - {% block body %} + + {% tailwind_css %} + {% block head %} + {% endblock head %} + + Twisted + + + {% block body %} meow :3 - {% endblock body %} - - - \ No newline at end of file + + diff --git a/twisted/twisted_site/templates/admin/announcements.html b/twisted/twisted_site/templates/admin/announcements.html index b8ebd1b..7494269 100644 --- a/twisted/twisted_site/templates/admin/announcements.html +++ b/twisted/twisted_site/templates/admin/announcements.html @@ -1,5 +1,9 @@ - Primary Button -Default Button + +Primary Button + + +Default Button + - \ 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 b2d7928..aa53f2f 100644 --- a/twisted/twisted_site/templates/admin/dashboard.html +++ b/twisted/twisted_site/templates/admin/dashboard.html @@ -1,19 +1,33 @@ - +

Welcome back, {{ user.profile.slack_username }}!

- See statistics + +See statistics + - Manage Users + +Manage Users + - Edit Pathways - Fulfill orders - Edit shop - Review projects - Announce stuff + +Edit Pathways + + +Fulfill orders + + +Edit shop + + +Review projects + + +Announce stuff +

@@ -34,7 +48,7 @@

Welcome back, {{ user.profile.slack_usern - - -{% if startup_windows %} - -{% endif %} + + + {% if startup_windows %} + + {% endif %} -{% endblock body %} \ No newline at end of file +{% endblock body %} diff --git a/twisted/twisted_site/templates/client/discover.html b/twisted/twisted_site/templates/client/discover.html index 732dd76..1dc227e 100644 --- a/twisted/twisted_site/templates/client/discover.html +++ b/twisted/twisted_site/templates/client/discover.html @@ -2,113 +2,117 @@ {% load static time_filters %} {% block body %} -
+
-
- discover projects from the community -
+
+ discover projects from the community +
-
+
- {% if projects %} -
+ {% if projects %} +
- {% for project in projects %} - + {% for project in projects %} + -
+
-
-

+
+

{{ project.project_name }} -

-
- {% if project.is_approved %} - shipped - {% endif %} - +

+
+ {% if project.is_approved %} + shipped + {% endif %} + {{ project.time_logged|minutes_to_hours_minutes }} - - + + {{ project.get_project_type_display }} - -
-
+ +
+
-

+

{{ project.project_description }} -

+

-
- - +
+ + {{ project.user.profile.slack_username|default:project.user.username }} - -
-
- {% endfor %} + +
+
+ {% endfor %} -
+
- {% else %} + {% else %} -
-
-
🧭
+
+
+
🧭
-
+
No projects yet -
+
-
+
Projects from everyone will show up here. +
+
-
-
- {% endif %} - -
+ {% endif %} -
- {{ paginator.count }} project{{ paginator.count|pluralize }} +
- {% if paginator.num_pages > 1 %} -
- {% if projects.has_previous %} - - ← prev - - {% else %} - - ← prev - - {% endif %} +
+ {{ paginator.count }} project{{ paginator.count|pluralize }} + + {% if paginator.num_pages > 1 %} +
+ {% if projects.has_previous %} + + ← prev + + {% else %} + + ← prev + + {% endif %} - + page {{ projects.number }} of {{ paginator.num_pages }} - + - {% if projects.has_next %} - - next → - - {% else %} - - next → - + {% if projects.has_next %} + + next → + + {% else %} + + next → + + {% endif %} +
{% endif %}
- {% endif %} -
-
+
- + {% endblock body %} diff --git a/twisted/twisted_site/templates/client/faqs.html b/twisted/twisted_site/templates/client/faqs.html index e1caa37..f54ab1d 100644 --- a/twisted/twisted_site/templates/client/faqs.html +++ b/twisted/twisted_site/templates/client/faqs.html @@ -2,79 +2,86 @@ {% load static %} {% block body %} - - Hack Club - + + Hack Club + -
-
-
-
- -
+
+
+
+
+ +
← -
- +
+ - + faqs.exe - -
+ +
-
- + - - - + + - -
-
+ + +
+ -
-
-

Q: What is Twisted?

-

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!

-
-
-

Q: What is a YSWS?

-

A: YSWS stands for "You Ship, We Ship" — a Hack Club program where you build and ship cool projects, and in return you get real rewards.

-
-
-

Q: Is it free?

-

A: Yes! Twisted is completely free to participate in.

-
-
-

Q: What is Hack Club?

-

A: Hack Club is a global nonprofit network of teen hackers, makers, and coders who build projects together and support each other.

-
-
-

Q: When does it start?

-

A: Twisted kicks off in the first week of September!

-
-
-

Q: When does the beta launch?

-

A: The beta launches 10 days before the main start — so late August!

-
+
+
+

Q: What is Twisted?

+

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!

+
+
+

Q: What is a YSWS?

+

A: YSWS stands for "You Ship, We Ship" — a Hack Club program where you build and ship cool projects, and in return you get real rewards.

+
+
+

Q: Is it free?

+

A: Yes! Twisted is completely free to participate in.

+
+
+

Q: What is Hack Club?

+

A: Hack Club is a global nonprofit network of teen hackers, makers, and coders who build projects together and support each other.

+
+
+

Q: When does it start?

+

A: Twisted kicks off in the first week of September!

+
+
+

Q: When does the beta launch?

+

A: The beta launches 10 days before the main start — so late August!

+
+
+
- - -{% comment %} + {% comment %} Check out twisted_site/templates/cotton/homepage_taskbar.html to change the taskbar :p - Kavyansh -{% endcomment %} - + {% endcomment %} + -{% endblock body %} \ No newline at end of file +{% endblock body %} diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html index 82d3b40..56f828c 100644 --- a/twisted/twisted_site/templates/client/homepage.html +++ b/twisted/twisted_site/templates/client/homepage.html @@ -2,120 +2,128 @@ {% load static %} {% block body %} - - Hack Club - - -
-
-
-
-
+ + Hack Club + + +
+
+
+
+
T -
+
- + twisted.exe - -
+ +
-
- + - + - -
-
- -
-
-
- Twisted -
- -
-
- + +
+ + +
+
+
+ Twisted +
+ +
+
+ message from the orgs - + - -
+ +
-

+

Join a twisted YSWS where you build cool projects, complete challenges, and work your way through a roadmap to earn a PC. -

-
- -
- {% if login_enabled != 'false' %} - {% if user.is_authenticated %} - -
+ +
+ {% if login_enabled != "false" %} + {% if user.is_authenticated %} + + - - {% else %} -
- {% csrf_token %} - - + + {% else %} + + {% csrf_token %} + + -
- {% endif %} - {% endif %} -
-
-
-
-
+ + + + - + + + -{% comment %} + {% comment %} Check out twisted_site/templates/cotton/homepage_taskbar.html to change the taskbar :p - Kavyansh -{% endcomment %} - -{% endblock body %} \ No newline at end of file + {% endcomment %} + +{% endblock body %} diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html index efd0e6d..ef08c06 100644 --- a/twisted/twisted_site/templates/client/osbase.html +++ b/twisted/twisted_site/templates/client/osbase.html @@ -2,14 +2,18 @@ - - {% tailwind_css %} - - - Twisted - {% block css %} {% endblock css %} - {% block js %}{% endblock js %} - - - + - + - - {% block body %} meow :3 {% endblock body %} - - + - \ 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 63304f0..c14e7fb 100644 --- a/twisted/twisted_site/templates/client/pathways.html +++ b/twisted/twisted_site/templates/client/pathways.html @@ -2,186 +2,196 @@ {% load static time_filters humanizelib maths mathfilters %} {% block body %} -
+
-
+
- {% if not pathways %} -
-
:(
-
No pathways yet!
-
+ {% if not pathways %} +
+
:(
+
No pathways yet!
+
Come check later. -
-
- {% endif %} +
+
+ {% endif %} - {% if current_pathways %} -
-
-
-

+ {% if current_pathways %} +
+
+
+
+

Current Pathway{{ current_pathways|pluralize }} -

-
-
+

+
+
+
-
- {% for pathway_info in current_pathways %} -
-
-
-

+
+ {% for pathway_info in current_pathways %} +
+
+
+

{{ pathway_info.pathway.name|default:"none! please dm @kavyansh." }} -

+

-
+
Started - + {{ pathway_info.pathway.start|naturaltime }} - + - • + • Ends - + {{ pathway_info.pathway.end|naturaltime }} - -
-
+ +
+
-
-
+
+
{{ pathway_info.minutes_spent|minutes_to_hours_minutes }} -
-
+
+
of {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }} +
+
+
-
+ {% endfor %}
-
- {% endfor %} -
- - {% endif %} -
+ + {% endif %} +
- {% if future_pathways %} -
+ {% if future_pathways %} +
-
-
-

+
+
+
+

Future Pathways -

-
-
+

+
+
+
-
- {% for pathway_info in future_pathways %} -
+
+ {% for pathway_info in future_pathways %} +
-
-

+
+

{{ pathway_info.pathway.name }} -

+

- + {{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} long - -
+ +
-
+
Starts - + {{ pathway_info.pathway.start|naturalday }} - + - • + • Ends - + {{ pathway_info.pathway.end|naturalday }} - -
+ +
-
- {% endfor %} -
+
+ {% endfor %} +
- - {% endif %} + + {% endif %} - {% if past_pathways %} -
+ {% if past_pathways %} +
-
-
-

+
+
+
+

Past Pathways -

-
-
+

+
+
+
-
- {% for pathway_info in past_pathways %} -
+
+ {% for pathway_info in past_pathways %} +
-
-

+
+

{{ pathway_info.pathway.name }} -

+

- + {{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} long - -
+ +
-
+
Started - + {{ pathway_info.pathway.start|naturalday }} - + - • + • Ended - + {{ pathway_info.pathway.end|naturalday }} - -
+ +
-
+
{{ pathway_info.minutes_spent|minutes_to_hours_minutes }} / {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }} spent +
+ +
+ {% endfor %}
-
- {% endfor %} -
+
+ {% endif %} -
- {% endif %} +
-
- -
-
+
+
{{ pathways|length }} pathway{{ pathways|length|pluralize }} +
-
-
-{% endblock body %} \ No newline at end of file + +{% endblock body %} diff --git a/twisted/twisted_site/templates/client/projects/create.html b/twisted/twisted_site/templates/client/projects/create.html index f5b2127..477a49f 100644 --- a/twisted/twisted_site/templates/client/projects/create.html +++ b/twisted/twisted_site/templates/client/projects/create.html @@ -1,76 +1,86 @@ {% extends "client/osbase.html" %} {% block body %} -
+
-
- {% csrf_token %} + + {% csrf_token %} -
-
+
+
Create a new project -
-
+
+
Enter the details for your project below. +
-
-
+
-
+
-
-
-
- -
-
- -
+ +
-
+
- + -
-{% endblock body %} \ No newline at end of file +
+{% endblock body %} diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html index f2bd3ac..9894afb 100644 --- a/twisted/twisted_site/templates/client/projects/detail.html +++ b/twisted/twisted_site/templates/client/projects/detail.html @@ -1,69 +1,68 @@ -{% extends "client/osbase.html" %} {% load static time_filters humanize %} {% block body %} -
- +{% extends "client/osbase.html" %} +{% load static time_filters humanize %} -
-
-
-
-

{{ project.project_name }}

+{% block body %} +
+ - +
+
+
+
+

{{ project.project_name }}

+ + {{ project.get_project_type_display }} - + - {% if project.is_shipped %} - {% if project.latest_ship.status == 'rejected' %} - permanently rejected - {% else %} - shipped - {% endif %} - {% endif %} -
+ {% if project.is_shipped %} + {% if project.latest_ship.status == "rejected" %} + permanently rejected + {% else %} + shipped + {% endif %} + {% endif %} +
-

+

{{ project.project_description }} -

-
- -
- {% if project.user == request.user %} - {% if project.repo_url and project.playable_url and project.screenshot_url and project.time_logged > 60 %} {% if not project.is_shipped %} - -
+ +
+ {% if project.user == request.user %} + {% if project.repo_url and project.playable_url and project.screenshot_url and project.time_logged > 60 %} + + {% if not project.is_shipped %} + + - - {% endif %} {% endif %} - {% if not project.is_shipped %} - - + + {% endif %} + + {% endif %} + {% if not project.is_shipped %} + + - - {% endif %} - {% endif %} -
- + + {% endif %} + {% endif %} +
+ - -
- + +
-
-
-
-
-
Time logged
+
+
+
+
Time logged
-
+
{{ project.time_logged|minutes_to_hours_minutes }} +
-
-
-
Journals
+
+
Journals
-
{{ project.journals.count }}
+
{{ project.journals.count }}
+
-
- {% if project.is_shipped %} - {% endif %} + {% if project.is_shipped %} + {% endif %} - {% if not project.hackatime_project_name and project.project_type != 'hardware' %} -
-
Hackatime project not linked bru...
+ {% if not project.hackatime_project_name and project.project_type != "hardware" %} +
+
Hackatime project not linked bru...
-
+
Vro link a Hackatime project to start tracking time on ts project. -
+
- + Open project settings - -
- {% elif not project.repo_url %} -
-
VRO repository not linked
+ +
+ {% elif not project.repo_url %} +
+
VRO repository not linked
-
Link a repository before shipping your project.
+
Link a repository before shipping your project.
- + Open project settings - -
- {% elif not project.playable_url %} -
-
Playable URL not set
+ +
+ {% elif not project.playable_url %} +
+
Playable URL not set
-
Add a playable URL before shipping your project.
+
Add a playable URL before shipping your project.
- + Open project settings - -
- {% elif not project.screenshot_url %} -
-
Screenshot not set
+ +
+ {% elif not project.screenshot_url %} +
+
Screenshot not set
-
Add a screenshot before shipping your project.
+
Add a screenshot before shipping your project.
- + Open project settings - -
- {% elif project.time_logged < 60 %} -
-
log more time!
+ +
+ {% elif project.time_logged < 60 %} +
+
log more time!
-
Log atleast 60 minutes before shipping your project.
+
Log atleast 60 minutes before shipping your project.
- -
- {% endif %} + +
+ {% endif %} -
-
-
-
Project activity
+
+
+
+
Project activity
-
Devlogs and progress....
-
+
Devlogs and progress....
+
- {% if not project.is_shipped %} - - {% endif %} -
+ + {% endif %} +
-
- {% for activity_item in journals %} - {% if activity_item.content %} {# bad way to check if activity item is a journal #} - {% with activity_item as journal %} -
-
-
- {{ journal.reduced_minutes|minutes_to_hours_minutes }} +
+ {% for activity_item in journals %} + {% if activity_item.content %} + {# bad way to check if activity item is a journal #} + {% with activity_item as journal %} +
+
+
+ {{ journal.reduced_minutes|minutes_to_hours_minutes }} - logged via {{ journal.get_type_display }} + logged via {{ journal.get_type_display }} - • + • - + {{ journal.created_at|naturaltime }} - -
- - {% if project.user == request.user %} {% if not project.is_shipped %} - -
- {% if journal.type == "untracked" %} - - {% endif %} - - -
- - {% endif %} {% endif %} -
- -
- + +
+ + {% if project.user == request.user %} + + {% if not project.is_shipped %} + +
+ {% if journal.type == "untracked" %} + + {% endif %} + + +
+ + {% endif %} + + {% endif %} +
+ +
+ {{ journal.content }} - -
-
- {% endwith %} - {% elif activity_item.status %} {# bad way to check if activity item is a ship #} - {% with activity_item as ship %} - {% if ship.status != 'pending' %} - + +
+ + {% endwith %} + {% elif activity_item.status %} + {# bad way to check if activity item is a ship #} + {% with activity_item as ship %} + {% if ship.status != "pending" %} + {{ ship.note_to_maker|default:"no message!"|linebreaksbr }} - - {% endif %} - {% if ship.final_status != 'pending' %} - + + {% endif %} + {% if ship.final_status != "pending" %} + {{ ship.final_note_to_maker|default:"no message!"|linebreaksbr }} - - {% endif %} -
-
- Project shipped - • - + + {% endif %} +
+
+ Project shipped + • + {{ ship.created_at|naturaltime }} - -
-
-
This project is now read-only.
- -
-
- -

first pass

-
-
- -

second pass

-
-
- -

final review

-
-
-
-
- {% endwith %} - {% endif %} - - {% empty %} - -
-
No journal entries
- -
+ +
+
+
This project is now read-only.
+ +
+
+ +

first pass

+
+
+ +

second pass

+
+
+ +

final review

+
+
+
+
+ {% endwith %} + {% endif %} + + {% empty %} + +
+
No journal entries
+ +
Your project progress will appear here... after you journal -
+
- {% if not project.is_shipped %} - - {% endif %} -
+ + {% endif %} +
- {% endfor %} + {% endfor %} +
-
-
- {{ project.journals.count }} journal{{ project.journals.count|pluralize }} +
+ {{ project.journals.count }} journal{{ project.journals.count|pluralize }} - {{ project.time_logged|minutes_to_hours_minutes }} logged + {{ project.time_logged|minutes_to_hours_minutes }} logged +
-
{% endblock body %} diff --git a/twisted/twisted_site/templates/client/projects/journal/delete.html b/twisted/twisted_site/templates/client/projects/journal/delete.html index ccf4a1b..0f02396 100644 --- a/twisted/twisted_site/templates/client/projects/journal/delete.html +++ b/twisted/twisted_site/templates/client/projects/journal/delete.html @@ -1,109 +1,112 @@ -{% extends "client/osbase.html" %} {% load static time_filters %} +{% extends "client/osbase.html" %} +{% load static time_filters %} {% block body %} -
+
- {% if not success %} -
- Delete journal -
+ {% if not success %} +
+ Delete journal +
-
+
-
+
-
+
Journal information -
+
-
+
-
+
Time logged -
+
-
+
{{ journal.reduced_minutes|minutes_to_hours_minutes }} -
+
-
+
Journal type -
+
-
+
{{ journal.get_type_display }} -
+
-
+
Created -
+
-
+
{{ journal.created_at }} -
+
-
-
+
+
-
+
-
+
Are you sure? -
+
-
+
Are you sure you want to delete this journal? -
+
-
+
It will be lost forever (a long time!) -
+
-
+
-
+
-
+
- + -
- {% csrf_token %} - -
+ + -
+
- {% else %} + {% else %} -
+
-
+
-
+
Journal deleted -
+
-
+
Your journal has been deleted :C -
+
-
+
You can now close this window. -
+
-
+
-
+
- {% endif %} + {% endif %} -
+
-{% endblock body %} \ No newline at end of file +{% 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 357aded..b2b35c6 100644 --- a/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html +++ b/twisted/twisted_site/templates/client/projects/journal/new_hackatime.html @@ -1,11 +1,10 @@ -{% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %} +{% extends "client/projects/journal/new_journal.base.html" %} +{% load static time_filters %} {% block links %} -{% if project.project_type == 'hardware' %} - - - - -{% endif %} -{% endblock links %} \ No newline at end of file + {% if project.project_type == "hardware" %} + + + + + {% endif %} +{% endblock links %} 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 96542e8..020b948 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 @@ -3,7 +3,7 @@ {% block body %} - + -
+
- {% if not success %} + {% if not success %} -
-
+
+
New journal -
-
- Project: {{ project.project_name }} -
-
+
+
+ Project: {{ project.project_name }} +
+
-
+
- {% if project.project_type == 'hardware' %} -
-
- {% block links %} + {% if project.project_type == "hardware" %} +
+
+ {% block links %} - - - + + - - - - - {% endblock links %} -
-
- {% endif %} + + + + {% endblock links %} +
+
+ {% endif %} - {% if info %} -
-
+ {% if info %} +
+
{{ info|safe }} -
-
- {% endif %} +
+
+ {% endif %} - {% block journal_log_message %} -
+ {% block journal_log_message %} +
This journal will log {{ log_minutes|minutes_to_hours_minutes }}. -
- {% endblock journal_log_message %} - -
- {% csrf_token %} +
+ {% endblock journal_log_message %} - {% block form %} + + {% csrf_token %} - {% block preform %} - {% endblock preform %} + {% block form %} -
- -
+ {% block preform %} + {% endblock preform %} -
- -
+ +
- {% endblock form %} - + {% endblock form %} + -
+
- {% else %} + {% else %} -
-
+
+
-
+
Journal logged! -
+
-

+

Your journal has been successfully logged yay! -

+

- + -
-
+
+
- {% endif %} + {% endif %} -
+
-{% endblock body %} \ No newline at end of file +{% 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 d71e829..a49b491 100644 --- a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html +++ b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html @@ -1,26 +1,25 @@ -{% extends "client/projects/journal/new_journal.base.html" %} {% load static time_filters %} +{% extends "client/projects/journal/new_journal.base.html" %} +{% load static time_filters %} {% block links %} - - - - + + + {% endblock links %} {% block journal_log_message %} {% endblock journal_log_message %} {% block preform %} -
+
Log - + minutes -
+
{% endblock preform %} diff --git a/twisted/twisted_site/templates/client/projects/list.html b/twisted/twisted_site/templates/client/projects/list.html index 1cdcde1..fe4ef9e 100644 --- a/twisted/twisted_site/templates/client/projects/list.html +++ b/twisted/twisted_site/templates/client/projects/list.html @@ -2,78 +2,83 @@ {% load static time_filters %} {% block body %} -
- -
- -
- -
- - {% if projects %} -
- - {% for project in projects %} - - -
-
- {% if project.screenshot_url %} - - {% else %} - - {% endif %} -
+
+ +
+ +
-
+
+ + {% if projects %} +
+ + {% for project in projects %} + + +
+
+ {% if project.screenshot_url %} + + {% else %} + + {% endif %} +
+ +
{{ project.project_name }} -
-
- {% endfor %} +
+
+ {% endfor %} -
+
- {% else %} + {% else %} -
-
- +
+
+ -
+
No projects yet -
+
-
+
Create a project to get started. -
+
- -
-
+ +
+
- {% endif %} + {% endif %} -
+
-
+
{{ projects|length }} project{{ projects|length|pluralize }} -
+
-
+
- + -{% endblock body %} \ No newline at end of file +{% endblock body %} diff --git a/twisted/twisted_site/templates/client/projects/settings.html b/twisted/twisted_site/templates/client/projects/settings.html index ead70ba..9a6b290 100644 --- a/twisted/twisted_site/templates/client/projects/settings.html +++ b/twisted/twisted_site/templates/client/projects/settings.html @@ -2,154 +2,180 @@ {% load static time_filters maths %} {% block body %} -
-
- - - + + -
+
Project settings +
-
-
- {% csrf_token %} + + {% csrf_token %} -
-
-
-
-
-
-
-
-
- -
+ +
- -
+ +
- -{% endblock body %} \ No newline at end of file + +{% endblock body %} diff --git a/twisted/twisted_site/templates/client/projects/ship.html b/twisted/twisted_site/templates/client/projects/ship.html index 0918eab..83c66de 100644 --- a/twisted/twisted_site/templates/client/projects/ship.html +++ b/twisted/twisted_site/templates/client/projects/ship.html @@ -1,107 +1,110 @@ -{% extends "client/osbase.html" %} {% load static time_filters humanize %} +{% extends "client/osbase.html" %} +{% load static time_filters humanize %} {% block body %} -
+
- {% if info %} -
+ {% if info %} +
{{ info|safe }} -
- {% endif %} +
+ {% endif %} - {% if not success %} + {% if not success %} -
- Submit project -
+
+ Submit project +
-
+
-
+
-
+
-
+
READ THE GUIDELINES VRO! -
+
-
+
Please read through our - - submission guidelines + + submission guidelines before continuing. -
+
-
+
-
+
-
+
Did yk 90% of rejections could have taken 5 minutes to fix? -
+
-
+
Our reviewers will manually check your project. -
+
-
- {% if project.type == 'software' %} +
+ {% if project.type == "software" %} Make sure your project works before shipping it. - {% else %} + {% else %} Make sure your design is shipped and looks like it will work. - {% endif %} -
+ {% endif %} +
-
+
-
+
-
+
-
+
- - - + + -
- {% csrf_token %} - -
+ + -
+
- {% else %} + {% else %} -
+
-
+
-
+
Success! -
+
-
+
Your project has been submitted for review by the twistwrights! -
+
-
+
you can now close this window. -
+
-
+
-
+
- {% endif %} + {% endif %} -
+
-{% endblock body %} \ No newline at end of file +{% endblock body %} diff --git a/twisted/twisted_site/templates/client/referrals.html b/twisted/twisted_site/templates/client/referrals.html index d21853b..8241066 100644 --- a/twisted/twisted_site/templates/client/referrals.html +++ b/twisted/twisted_site/templates/client/referrals.html @@ -2,104 +2,108 @@ {% load static time_filters humanizelib maths mathfilters %} {% block body %} -
+
- {% if profile.referred_by %} -
- Referred By - -
- - -
+ {% if profile.referred_by %} +
+ Referred By + +
+ + +
{{ profile.referred_by.slack_username }} -
-
+
+
-
- {% endif %} + + {% endif %} -
-
-

+
+

+
+ {{ request.scheme }}://{{ request.get_host }}{% url 'homepage' %}?ref={{ profile.my_referral_code|default:"error!" }} +
For someone to be considered a referral, they must be ID verified and log atleast an hour. +
-
-
+
-
-
-

+
+
+
+

Past Referrals ({{ profile.referrals.count }}) -

-
-
- {% if profile.referrals.count %} -
- {% for referral in profile.referrals.all %} -
-
- - -
-
+

+
+
+
+ {% if profile.referrals.count %} +
+ {% for referral in profile.referrals.all %} +
+
+ + +
+
{{ referral.slack_username }} -
-
- {% if referral.ysws_eligible %} -
+
+
+ {% if referral.ysws_eligible %} +
✓ -
- {% else %} -
+
+ {% else %} +
✗ -
- {% endif %} - +
+ {% endif %} + YSWS eligible: {{ referral.ysws_eligible|yesno }} - -
-
- {% if referral.time_logged > 60 %} -
+ +
+
+ {% if referral.time_logged > 60 %} +
✓ -
- {% else %} -
+
+ {% else %} +
✗ -
- {% endif %} - +
+ {% endif %} + Time logged: {{ referral.time_logged|minutes_to_hours_minutes }}/1h - + +
+
+
-
+ {% endfor %}
-
- {% endfor %} -
- {% else %} -
No referrals yet!
- {% endif %} + {% else %} +
No referrals yet!
+ {% endif %} -
+
-
-
+
+
{{ profile.referrals.count }} referral{{ profile.referrals.count|pluralize }} +
-
-
-{% endblock body %} \ No newline at end of file +
+{% endblock body %} diff --git a/twisted/twisted_site/templates/cotton/base.html b/twisted/twisted_site/templates/cotton/base.html index 299e814..f62f091 100644 --- a/twisted/twisted_site/templates/cotton/base.html +++ b/twisted/twisted_site/templates/cotton/base.html @@ -1,57 +1,64 @@ {% load static tailwind_tags django_htmx %} - - - + + + - {% htmx_script %} - - {% tailwind_css %} - Admin - Twisted - + {% htmx_script %} + + {% tailwind_css %} + Admin - Twisted + {{ head }} - - - - {% if error %} -
- -
- {% endif %} + +
+ {% endif %} -
-
- - {% for link in sidebar_links %} - {{ link.text }} - {% endfor %} - -
-
+
+
+ + {% for link in sidebar_links %} + {{ link.text }} + {% endfor %} + +
+
{{ slot }} +
-
- - + + - - - - + + + + - {% if messages %} - {% for message in messages %} -
- -
- {% endfor %} - {% endif %} - + +
+ {% endfor %} + {% endif %} + diff --git a/twisted/twisted_site/templates/cotton/button.html b/twisted/twisted_site/templates/cotton/button.html index fa616d3..3e0edb4 100644 --- a/twisted/twisted_site/templates/cotton/button.html +++ b/twisted/twisted_site/templates/cotton/button.html @@ -1,32 +1,27 @@ - \ 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 index 6e25918..b970a8e 100644 --- a/twisted/twisted_site/templates/cotton/homepage_taskbar.html +++ b/twisted/twisted_site/templates/cotton/homepage_taskbar.html @@ -1,41 +1,52 @@ {% load static %} -
- - -
- - - -
+
+ + + + +
00:00 AM +
-
diff --git a/twisted/twisted_site/templates/cotton/mdedit.html b/twisted/twisted_site/templates/cotton/mdedit.html index 03f3597..231adee 100644 --- a/twisted/twisted_site/templates/cotton/mdedit.html +++ b/twisted/twisted_site/templates/cotton/mdedit.html @@ -1,13 +1,18 @@
- -
@@ -15,15 +20,17 @@
- +
@@ -136,4 +143,4 @@ }); } }); - \ 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 6697ce8..9934d5b 100644 --- a/twisted/twisted_site/templates/cotton/mdpreview.html +++ b/twisted/twisted_site/templates/cotton/mdpreview.html @@ -1,6 +1,5 @@
-
+
-
\ No newline at end of file +
diff --git a/twisted/twisted_site/templates/cotton/pathway_card.html b/twisted/twisted_site/templates/cotton/pathway_card.html index eab3062..e61a79d 100644 --- a/twisted/twisted_site/templates/cotton/pathway_card.html +++ b/twisted/twisted_site/templates/cotton/pathway_card.html @@ -7,39 +7,42 @@

{{ pathway.name }}

Start

{{ pathway.start }}

{% if pathway.didnt_start %} -

({{ pathway.start|naturaltime }})

+

({{ pathway.start|naturaltime }})

{% endif %}

End

{{ pathway.end }}

{% if pathway.in_progress %} -

({{ pathway.end|naturaltime }})

+

({{ pathway.end|naturaltime }})

{% endif %}
{% if not pathway.didnt_start %} -
-

Participated

-

{{ pathway.mins_spent_per_participant|length }} participant{{ pathway.mins_spent_per_participant|pluralize }}

-

Qualified

-

{{ pathway.qualified_participants|length }} qualified

- {% if pathway.qualified_participants %} -

- - {% for user in pathway.qualified_participants %} - {% if forloop.counter < 8 %} - - - - {% endif %} - {% if forloop.counter == 8 %} - - {% endif %} - {% endfor %} - -

- {% endif %} -
+
+

Participated

+

{{ pathway.mins_spent_per_participant|length }} participant{{ pathway.mins_spent_per_participant|pluralize }}

+

Qualified

+

{{ pathway.qualified_participants|length }} qualified

+ {% if pathway.qualified_participants %} +

+ + {% for user in pathway.qualified_participants %} + {% if forloop.counter < 8 %} + + + + {% endif %} + {% if forloop.counter == 8 %} + + {% endif %} + {% endfor %} + +

+ {% endif %} +
{% endif %}
diff --git a/twisted/twisted_site/templates/cotton/project_ship_mark.html b/twisted/twisted_site/templates/cotton/project_ship_mark.html index 533f23f..5796e3b 100644 --- a/twisted/twisted_site/templates/cotton/project_ship_mark.html +++ b/twisted/twisted_site/templates/cotton/project_ship_mark.html @@ -1,17 +1,19 @@ -{% if status == 'pending' %} -
-{% elif status == 'approved' %} -
- -
-{% elif status == 'rejected' or status == 'requested_changes' %} -
- -
-{% elif status == 'unavailable' %} -
- ? -
+{% if status == "pending" %} +
+
+{% elif status == "approved" %} +
+ +
+{% elif status == "rejected" or status == "requested_changes" %} +
+ +
+{% elif status == "unavailable" %} +
+ ? +
{% else %} -
No status found!
+
No status found!
{% endif %} diff --git a/twisted/twisted_site/templates/cotton/ship_message.html b/twisted/twisted_site/templates/cotton/ship_message.html index 4d01cd0..875efc3 100644 --- a/twisted/twisted_site/templates/cotton/ship_message.html +++ b/twisted/twisted_site/templates/cotton/ship_message.html @@ -1,4 +1,5 @@ -{% load time_filters humanize %} +{% load time_filters humanize %} +
{{ title }} diff --git a/twisted/twisted_site/templates/cotton/sidebar/index.html b/twisted/twisted_site/templates/cotton/sidebar/index.html index b08b580..f8e4e0f 100644 --- a/twisted/twisted_site/templates/cotton/sidebar/index.html +++ b/twisted/twisted_site/templates/cotton/sidebar/index.html @@ -13,15 +13,21 @@
-
+
+
- +
- {{ slot }} + +{{ slot }} +
- +
@@ -36,16 +42,21 @@
-
+
+
{{ slot }}
-
+
+
Back to Twisted
- +
-
+
+
diff --git a/twisted/twisted_site/templates/cotton/sidebar/item.html b/twisted/twisted_site/templates/cotton/sidebar/item.html index 5f75106..9b71a29 100644 --- a/twisted/twisted_site/templates/cotton/sidebar/item.html +++ b/twisted/twisted_site/templates/cotton/sidebar/item.html @@ -1,11 +1,15 @@
- {{ icon }} - {{ icon }} + {{ icon }} + {{ icon }}
{{ slot }}
- \ 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 index 2e917dd..ffd064b 100644 --- a/twisted/twisted_site/templates/cotton/svg/cross.html +++ b/twisted/twisted_site/templates/cotton/svg/cross.html @@ -1,18 +1,14 @@ - - + + diff --git a/twisted/twisted_site/templates/cotton/svg/tick.html b/twisted/twisted_site/templates/cotton/svg/tick.html index f0de869..40cdaed 100644 --- a/twisted/twisted_site/templates/cotton/svg/tick.html +++ b/twisted/twisted_site/templates/cotton/svg/tick.html @@ -1,14 +1,7 @@ - - - \ No newline at end of file + + + From c505e0729d78acc5cdfad2bfaa63721126df90f6 Mon Sep 17 00:00:00 2001 From: Lewin Kelly Date: Tue, 8 Sep 2026 14:12:40 -0400 Subject: [PATCH 02/24] Fixes for leading spaces --- twisted/common/templates/base.html | 2 +- .../templates/admin/announcements.html | 5 +- .../templates/admin/dashboard.html | 54 +++---- .../templates/admin/debug/review.html | 14 +- .../templates/admin/fulfillment.html | 5 +- .../twisted_site/templates/admin/logs.html | 34 ++--- .../templates/admin/pathways/create.html | 14 +- .../templates/admin/pathways/detail.html | 16 +-- .../templates/admin/pathways/list.html | 14 +- .../twisted_site/templates/admin/review.html | 5 +- .../twisted_site/templates/admin/shop.html | 5 +- .../twisted_site/templates/admin/user.html | 55 +++----- .../twisted_site/templates/admin/users.html | 12 +- .../templates/client/dashboard.html | 106 +++++--------- .../templates/client/discover.html | 57 ++------ .../twisted_site/templates/client/faqs.html | 23 +-- .../templates/client/homepage.html | 57 +++----- .../twisted_site/templates/client/osbase.html | 9 +- .../templates/client/pathways.html | 133 +++++------------- .../templates/client/projects/create.html | 51 ++----- .../templates/client/projects/detail.html | 120 ++++------------ .../client/projects/journal/delete.html | 92 +++--------- .../projects/journal/new_journal.base.html | 54 ++----- .../projects/journal/new_untracked.html | 6 +- .../templates/client/projects/list.html | 33 +---- .../templates/client/projects/settings.html | 93 +++--------- .../templates/client/projects/ship.html | 76 ++-------- .../templates/client/referrals.html | 60 ++------ .../twisted_site/templates/cotton/base.html | 11 +- .../twisted_site/templates/cotton/button.html | 25 +--- .../templates/cotton/homepage_taskbar.html | 28 ++-- .../twisted_site/templates/cotton/mdedit.html | 7 - .../templates/cotton/project_ship_mark.html | 3 +- .../templates/cotton/ship_message.html | 13 +- .../templates/cotton/sidebar/index.html | 16 +-- .../templates/cotton/sidebar/item.html | 4 +- .../templates/cotton/svg/cross.html | 2 +- .../templates/cotton/svg/tick.html | 2 +- 38 files changed, 337 insertions(+), 979 deletions(-) diff --git a/twisted/common/templates/base.html b/twisted/common/templates/base.html index cc320bf..16b440a 100644 --- a/twisted/common/templates/base.html +++ b/twisted/common/templates/base.html @@ -9,7 +9,7 @@ {% block body %} - meow :3 + meow :3 {% endblock body %} - {% if startup_windows %} {% endif %} - {% endblock body %} diff --git a/twisted/twisted_site/templates/client/discover.html b/twisted/twisted_site/templates/client/discover.html index 1dc227e..16ff245 100644 --- a/twisted/twisted_site/templates/client/discover.html +++ b/twisted/twisted_site/templates/client/discover.html @@ -1,117 +1,85 @@ {% extends "client/osbase.html" %} {% load static time_filters %} - {% block body %}
-
discover projects from the community
-
- {% if projects %}
- {% for project in projects %} -
-

- {{ project.project_name }} + {{ project.project_name }}

{% if project.is_approved %} shipped {% endif %} - {{ project.time_logged|minutes_to_hours_minutes }} + {{ project.time_logged|minutes_to_hours_minutes }} - {{ project.get_project_type_display }} + {{ project.get_project_type_display }}
-

- {{ project.project_description }} + {{ project.project_description }}

-
- {{ project.user.profile.slack_username|default:project.user.username }} + {{ project.user.profile.slack_username|default:project.user.username }}
{% endfor %} -
- {% else %} -
🧭
- -
- No projects yet -
- -
- Projects from everyone will show up here. -
+
No projects yet
+
Projects from everyone will show up here.
- {% endif %} -
-
{{ paginator.count }} project{{ paginator.count|pluralize }} - {% if paginator.num_pages > 1 %}
{% if projects.has_previous %} - ← prev + ← prev {% else %} - - ← prev - + ← prev {% endif %} - - - page {{ projects.number }} of {{ paginator.num_pages }} - - + page {{ projects.number }} of {{ paginator.num_pages }} {% if projects.has_next %} - next → + next → {% else %} - - next → - + next → {% endif %}
{% endif %}
-
- - {% endblock body %} diff --git a/twisted/twisted_site/templates/client/faqs.html b/twisted/twisted_site/templates/client/faqs.html index f54ab1d..bf4ed29 100644 --- a/twisted/twisted_site/templates/client/faqs.html +++ b/twisted/twisted_site/templates/client/faqs.html @@ -1,7 +1,6 @@ {% extends "base.html" %} {% load static %} {% block body %} - -
-
- ← -
+
←
 - - - faqs.exe - + faqs.exe
-
-
-

Q: What is Twisted?

@@ -76,12 +66,9 @@
- - {% comment %} Check out twisted_site/templates/cotton/homepage_taskbar.html to change the taskbar :p - Kavyansh {% endcomment %} - {% endblock body %} diff --git a/twisted/twisted_site/templates/client/homepage.html b/twisted/twisted_site/templates/client/homepage.html index 56f828c..84970a4 100644 --- a/twisted/twisted_site/templates/client/homepage.html +++ b/twisted/twisted_site/templates/client/homepage.html @@ -1,7 +1,6 @@ {% extends "base.html" %} {% load static %} {% block body %} - -
-
- T -
- - - twisted.exe - +
T
+ twisted.exe
-
- -
-
@@ -52,39 +41,32 @@ alt="Twisted" class="mx-auto w-[min(65vw,20rem)] h-auto drop-shadow-sm drop-shadow-primary">
-
- - message from the orgs - - - + message from the orgs +
-

- Join a twisted YSWS where you build cool projects, - complete challenges, and work your way through a - roadmap to earn a PC. + Join a twisted YSWS where you build cool projects, + complete challenges, and work your way through a + roadmap to earn a PC.

-
{% if login_enabled != "false" %} {% if user.is_authenticated %} {% else %}
{% csrf_token %} -
{% endif %} @@ -96,31 +78,26 @@
- {% comment %} Check out twisted_site/templates/cotton/homepage_taskbar.html to change the taskbar :p - Kavyansh diff --git a/twisted/twisted_site/templates/client/osbase.html b/twisted/twisted_site/templates/client/osbase.html index ef08c06..ad9771c 100644 --- a/twisted/twisted_site/templates/client/osbase.html +++ b/twisted/twisted_site/templates/client/osbase.html @@ -1,7 +1,6 @@ {% load static tailwind_tags static %} - {% tailwind_css %} @@ -9,7 +8,6 @@ href="/twisted/tailwindcsstheme/static/css/dist/styles.css"> Twisted {% block css %} - {% endblock css %} {% block js %} {% endblock js %} @@ -27,16 +25,11 @@ - - - - {% block body %} meow :3 {% endblock body %} - + {% block body %} meow :3 {% endblock body %} - diff --git a/twisted/twisted_site/templates/client/pathways.html b/twisted/twisted_site/templates/client/pathways.html index c14e7fb..430d7b1 100644 --- a/twisted/twisted_site/templates/client/pathways.html +++ b/twisted/twisted_site/templates/client/pathways.html @@ -1,67 +1,47 @@ {% extends "client/osbase.html" %} {% load static time_filters humanizelib maths mathfilters %} - {% block body %}
-
- {% if not pathways %}
:(
No pathways yet!
-
- Come check later. -
+
Come check later.
{% endif %} - - {% if current_pathways %}
-
-
-

- Current Pathway{{ current_pathways|pluralize }} -

-
-
+
+

Current Pathway{{ current_pathways|pluralize }}

+
-
{% for pathway_info in current_pathways %}

- {{ pathway_info.pathway.name|default:"none! please dm @kavyansh." }} + {{ pathway_info.pathway.name|default:"none! please dm @kavyansh." }}

-
- Started + Started - {{ pathway_info.pathway.start|naturaltime }} + {{ pathway_info.pathway.start|naturaltime }} - • - - Ends + Ends - {{ pathway_info.pathway.end|naturaltime }} + {{ pathway_info.pathway.end|naturaltime }}
-
-
- {{ pathway_info.minutes_spent|minutes_to_hours_minutes }} -
-
- of {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }} -
+
{{ pathway_info.minutes_spent|minutes_to_hours_minutes }}
+
of {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }}
@@ -70,128 +50,89 @@

{% endif %}
- {% if future_pathways %}
-
-
-
-

- Future Pathways -

-
-
+
+

Future Pathways

+
-
{% for pathway_info in future_pathways %}
-
-

- {{ pathway_info.pathway.name }} -

- +

{{ pathway_info.pathway.name }}

- {{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} - long + {{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} + long
-
- Starts + Starts - {{ pathway_info.pathway.start|naturalday }} + {{ pathway_info.pathway.start|naturalday }} - • - - Ends + Ends - {{ pathway_info.pathway.end|naturalday }} + {{ pathway_info.pathway.end|naturalday }}
-
{% endfor %}
-
{% endif %} - {% if past_pathways %}
-
-
-
-

- Past Pathways -

-
-
+
+

Past Pathways

+
-
{% for pathway_info in past_pathways %}
-
-

- {{ pathway_info.pathway.name }} -

- +

{{ pathway_info.pathway.name }}

- {{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} - long + {{ pathway_info.pathway.end|sub:pathway_info.pathway.start|naturaldelta }} + long
-
- Started + Started - {{ pathway_info.pathway.start|naturalday }} + {{ pathway_info.pathway.start|naturalday }} - • - - Ended + Ended - {{ pathway_info.pathway.end|naturalday }} + {{ pathway_info.pathway.end|naturalday }}
-
- {{ pathway_info.minutes_spent|minutes_to_hours_minutes }} - / - {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }} - spent + {{ pathway_info.minutes_spent|minutes_to_hours_minutes }} + / + {{ pathway_info.pathway.min_mins|minutes_to_hours_minutes }} + spent
-
{% endfor %}
-
{% endif %} - -
-
- -
- {{ pathways|length }} - pathway{{ pathways|length|pluralize }} + {{ pathways|length }} + pathway{{ pathways|length|pluralize }}
-
{% endblock body %} diff --git a/twisted/twisted_site/templates/client/projects/create.html b/twisted/twisted_site/templates/client/projects/create.html index 477a49f..dab790f 100644 --- a/twisted/twisted_site/templates/client/projects/create.html +++ b/twisted/twisted_site/templates/client/projects/create.html @@ -1,29 +1,16 @@ {% extends "client/osbase.html" %} - {% block body %}
-
{% csrf_token %} -
-
- Create a new project -
-
- Enter the details for your project below. -
+
Create a new project
+
Enter the details for your project below.
-
-
-
- - +
-
- - +
-
- - +
-
-
-
-
-
-
{% endblock body %} diff --git a/twisted/twisted_site/templates/client/projects/detail.html b/twisted/twisted_site/templates/client/projects/detail.html index 9894afb..3713dc3 100644 --- a/twisted/twisted_site/templates/client/projects/detail.html +++ b/twisted/twisted_site/templates/client/projects/detail.html @@ -1,51 +1,41 @@ {% extends "client/osbase.html" %} {% load static time_filters humanize %} - {% block body %}
-

{{ project.project_name }}

- - {{ project.get_project_type_display }} + {{ project.get_project_type_display }} - {% if project.is_shipped %} {% if project.latest_ship.status == "rejected" %} - permanently rejected + permanently rejected {% else %} - shipped + shipped {% endif %} {% endif %}
- -

- {{ project.project_description }} -

+

{{ project.project_description }}

-
{% if project.user == request.user %} {% if project.repo_url and project.playable_url and project.screenshot_url and project.time_logged > 60 %} - {% if not project.is_shipped %} {% endif %} - {% endif %} {% if not project.is_shipped %} {% endif %} @@ -53,13 +43,11 @@

{{ project.project_name }}

+ onclick="copyShareLink(this, true)">Copy share link
-
-
Time logged
- -
- {{ project.time_logged|minutes_to_hours_minutes }} -
+
{{ project.time_logged|minutes_to_hours_minutes }}
-
Journals
-
{{ project.journals.count }}
- - {% if project.is_shipped %} - {% endif %} - + {% if project.is_shipped %}{% endif %} {% if not project.hackatime_project_name and project.project_type != "hardware" %}
Hackatime project not linked bru...
-
- Vro link a Hackatime project to start tracking time on ts project. + Vro link a Hackatime project to start tracking time on ts project.
- - Open project settings + Open project settings
{% elif not project.repo_url %}
VRO repository not linked
-
Link a repository before shipping your project.
- - Open project settings + Open project settings
{% elif not project.playable_url %}
Playable URL not set
-
Add a playable URL before shipping your project.
- - Open project settings + Open project settings
{% elif not project.screenshot_url %}
Screenshot not set
-
Add a screenshot before shipping your project.
- - Open project settings + Open project settings
{% elif project.time_logged < 60 %}
log more time!
-
Log atleast 60 minutes before shipping your project.
-
{% endif %} -
Project activity
-
Devlogs and progress....
- {% if not project.is_shipped %} {% endif %}
-
{% for activity_item in journals %} {% if activity_item.content %} @@ -195,21 +159,13 @@

{{ project.project_name }}

- {{ journal.reduced_minutes|minutes_to_hours_minutes }} - - logged via {{ journal.get_type_display }} - - • - - - {{ journal.created_at|naturaltime }} - + {{ journal.reduced_minutes|minutes_to_hours_minutes }} + logged via {{ journal.get_type_display }} + • + {{ journal.created_at|naturaltime }}
- {% if project.user == request.user %} - {% if not project.is_shipped %} -
{% if journal.type == "untracked" %}

alt="Delete" /> {% endif %} - - {% endif %} - {% endif %} -
- {{ journal.content }} + {{ journal.content }}
@@ -250,27 +202,24 @@

{{ project.project_name }}

- {{ ship.note_to_maker|default:"no message!"|linebreaksbr }} + {{ ship.note_to_maker|default:"no message!"|linebreaksbr }} {% endif %} {% if ship.final_status != "pending" %} - {{ ship.final_note_to_maker|default:"no message!"|linebreaksbr }} + {{ ship.final_note_to_maker|default:"no message!"|linebreaksbr }} {% endif %}
Project shipped - • - - {{ ship.created_at|naturaltime }} - + • + {{ ship.created_at|naturaltime }}
This project is now read-only.
-
@@ -289,33 +238,24 @@

{{ project.project_name }}

{% endwith %} {% endif %} - {% empty %} -
No journal entries
- -
- Your project progress will appear here... after you journal -
- +
Your project progress will appear here... after you journal
{% if not project.is_shipped %} {% endif %}
- {% endfor %}
-
- {{ project.journals.count }} journal{{ project.journals.count|pluralize }} - - {{ project.time_logged|minutes_to_hours_minutes }} logged + {{ project.journals.count }} journal{{ project.journals.count|pluralize }} + {{ project.time_logged|minutes_to_hours_minutes }} logged
{% endblock body %} diff --git a/twisted/twisted_site/templates/client/projects/journal/delete.html b/twisted/twisted_site/templates/client/projects/journal/delete.html index 0f02396..a1f35e1 100644 --- a/twisted/twisted_site/templates/client/projects/journal/delete.html +++ b/twisted/twisted_site/templates/client/projects/journal/delete.html @@ -1,112 +1,52 @@ {% extends "client/osbase.html" %} {% load static time_filters %} {% block body %} -
- {% if not success %}
Delete journal
-
-
- -
- Journal information -
- +
Journal information
- -
- Time logged -
- -
- {{ journal.reduced_minutes|minutes_to_hours_minutes }} -
- -
- Journal type -
- -
- {{ journal.get_type_display }} -
- -
- Created -
- -
- {{ journal.created_at }} -
- +
Time logged
+
{{ journal.reduced_minutes|minutes_to_hours_minutes }}
+
Journal type
+
{{ journal.get_type_display }}
+
Created
+
{{ journal.created_at }}
-
- -
- Are you sure? -
- -
- Are you sure you want to delete this journal? -
- -
- It will be lost forever (a long time!) -
- +
Are you sure?
+
Are you sure you want to delete this journal?
+
It will be lost forever (a long time!)
-
-
- -
{% csrf_token %}
-
- {% else %} -
-
- -
- Journal deleted -
- -
- Your journal has been deleted :C -
- -
- You can now close this window. -
- +
Journal deleted
+
Your journal has been deleted :C
+
You can now close this window.
-
- {% endif %} -
- {% endblock body %} 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 020b948..0c5f910 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,8 +1,6 @@ {% extends "client/osbase.html" %} {% load static time_filters %} - {% block body %} - -
- {% if not success %} -
-
- New journal -
+
New journal
Project: {{ project.project_name }}
-
- {% if project.project_type == "hardware" %}
{% block links %} - - - {% endblock links %}
{% endif %} - {% if info %}
-
- {{ info|safe }} -
+
{{ info|safe }}
{% endif %} - {% block journal_log_message %}
- This journal will log {{ log_minutes|minutes_to_hours_minutes }}. + This journal will log {{ log_minutes|minutes_to_hours_minutes }}.
{% endblock journal_log_message %} -
{% csrf_token %} - {% block form %} - {% block preform %} {% endblock preform %} -
-
- {% endblock form %}
-
- {% else %} -
- -
- Journal logged! -
- -

- Your journal has been successfully logged yay! -

- +
Journal logged!
+

Your journal has been successfully logged yay!

-
- {% endif %} -
- {% 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 a49b491..6766fa9 100644 --- a/twisted/twisted_site/templates/client/projects/journal/new_untracked.html +++ b/twisted/twisted_site/templates/client/projects/journal/new_untracked.html @@ -3,7 +3,7 @@ {% block links %} @@ -12,7 +12,7 @@ {% endblock journal_log_message %} {% block preform %}
- Log + Log - minutes + minutes
{% endblock preform %} diff --git a/twisted/twisted_site/templates/client/projects/list.html b/twisted/twisted_site/templates/client/projects/list.html index fe4ef9e..e999a32 100644 --- a/twisted/twisted_site/templates/client/projects/list.html +++ b/twisted/twisted_site/templates/client/projects/list.html @@ -1,9 +1,7 @@ {% extends "client/osbase.html" %} {% load static time_filters %} - {% block body %}
-
-
- {% if projects %}
- {% for project in projects %} -
@@ -36,48 +30,32 @@ class="h-full w-full object-contain"> {% endif %}
-
- {{ project.project_name }} + {{ project.project_name }}
{% endfor %} -
- {% else %} -
- -
- No projects yet -
- -
- Create a project to get started. -
- +
No projects yet
+
Create a project to get started.
- {% endif %} -
-
- {{ projects|length }} project{{ projects|length|pluralize }} + {{ projects|length }} project{{ projects|length|pluralize }}
- - - {% endblock body %} diff --git a/twisted/twisted_site/templates/client/projects/settings.html b/twisted/twisted_site/templates/client/projects/settings.html index 9a6b290..a377681 100644 --- a/twisted/twisted_site/templates/client/projects/settings.html +++ b/twisted/twisted_site/templates/client/projects/settings.html @@ -1,29 +1,20 @@ {% extends "client/osbase.html" %} {% load static time_filters maths %} - {% block body %}
- -
- Project settings -
+
Project settings
-
{% csrf_token %} -
- - +
-
- - +
-
- - +
-
- - +
-
- - +
-
- - +
-
- - + {% if project.screenshot_url %} {% endif %} - - or paste an image anywhere on this page - -
-
-
- {% endif %} -
@@ -39,14 +37,10 @@ {% endfor %}
-
- {{ slot }} -
+
{{ slot }}
- - @@ -54,7 +48,6 @@ src="https://cdn.jsdelivr.net/npm/@alpinejs/focus@3.x.x/dist/cdn.min.js"> - {% if messages %} {% for message in messages %}
diff --git a/twisted/twisted_site/templates/cotton/button.html b/twisted/twisted_site/templates/cotton/button.html index 3e0edb4..8c4cbb6 100644 --- a/twisted/twisted_site/templates/cotton/button.html +++ b/twisted/twisted_site/templates/cotton/button.html @@ -1,27 +1,4 @@ diff --git a/twisted/twisted_site/templates/cotton/homepage_taskbar.html b/twisted/twisted_site/templates/cotton/homepage_taskbar.html index b970a8e..c162166 100644 --- a/twisted/twisted_site/templates/cotton/homepage_taskbar.html +++ b/twisted/twisted_site/templates/cotton/homepage_taskbar.html @@ -5,9 +5,8 @@ - Twisted + Twisted -
- -
- 00:00 AM + 00:00 AM
- - - - From 6a6845b24239feaaf3e490c788fcca270332ce0e Mon Sep 17 00:00:00 2001 From: Lewin Kelly Date: Tue, 8 Sep 2026 16:03:36 -0400 Subject: [PATCH 17/24] Remove inline styles in favour of Tailwind classes --- twisted/twisted_site/templates/client/dashboard.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/twisted/twisted_site/templates/client/dashboard.html b/twisted/twisted_site/templates/client/dashboard.html index cbf2699..5ae50d5 100644 --- a/twisted/twisted_site/templates/client/dashboard.html +++ b/twisted/twisted_site/templates/client/dashboard.html @@ -150,11 +150,7 @@