mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-08 21:45:30 +00:00
Port to Django 5.2 (#635)
* Port to Django 5.2 * Pin pluggy to 1.2.0 Any newer and the mystery importlib metadata error appears. Weird! >_> * Update for premailer changed default * Update view logic for is_ajax being changed to a template context processor * Port a few more tests to pytest proper Having two distinct test flavours is giving me a headache * Version 1 dockerfile Makes a VERY big image, I suspect we can optimise this a lot... * Optimise dockerfile a little lot a bit * fix(users): change logout link to POST request * fix(tests): fix some syntax errors in test code still got lots of failed tests :( * fix: replace deprecated Django APIs * ci: update Dockerfile * ci: update Dockerfile * fix(dependencies+tests): update EoL/vulnerable dependencies and improve test stability * Upgrade Python from 3.10 to 3.12 * Update frontend dependencies, replace node-sass with sass * chore(logging): ignore dangling obj reference warning from pypdf * ci: update compose.yml for prod deployment - Add Nginx as a reverse proxy - Add cert-selfsign.sh for generating self-signed certificates - Add certbot-issue.sh for Let's Encrypt certificate issuance and renewal - Add cron-install.sh and cron-uninstall.sh for system cron management - Add .env.example as an environment variable template * style: reformat code * ci: add more sleep trying to pass tests * ci: ignore browser-based tests during ci testing * fix: create home for the new user during Dockerfile building * chore: remove heroku conf file * fix: RIGS not franken anymore * fix: restore is_ajax as a boolean and split out the context processor * test: remove Selenium interaction tests and their CI workarounds * fix: harden production settings (CSRF origins, env casts, ADMINS) and drop dead debug toolbar code * deploy: serve static files from nginx, pin PGDATA, and make cert scripts loud on failure * build: switch .dockerignore to an allowlist * build: drop unused dependencies, soft-pin the rest and target Python 3.14 * build: move image to Python 3.14 / Node 24 and force DEBUG off * ci: add dependabot config for uv, npm, docker and actions * build: narrow Sass deprecation silencing to @import and require Node 24 * build: provide placeholder env for collectstatic now that DEBUG is off in the image * deploy: add plain-HTTP nginx config for local development and use it in compose * deploy: remove self-signed cert script * build: make the image multi-arch with official node and python base images * ci: lint and test on PRs, build the image on PRs and push it to GHCR on master * docs: add local running and sample data instructions * fix: report a form error instead of crashing when big power has no Power MIC * fix: upgrade pypdf and urllib3 to patched releases * fix: apply non-breaking npm audit fixes * fix: strip whitespace in ALLOWED_HOSTS and drop misleading HSTS preload * deploy: add a pyrigs healthcheck and make nginx wait for it * build: pin the uv image version * fix: correct the check-in person picker condition and use BeautifulSoup's string argument * refactor: replace unique_together with UniqueConstraint * build: replace pycodestyle with ruff and fix what it found Removes unused imports and variables, and fixes a few real problems it surfaced: - EventCheckIn.active() referenced an undefined name and raised NameError; it now returns whether the check-in has no end time - RIGS.admin defined EventChecklistAdmin twice; the second is now PowerTestRecordAdmin - RIGS/tests/conftest.py used date/timedelta without importing them - the signal-registering imports in apps.py are kept with noqa pycodestyle config in setup.cfg is dropped. * style: format the codebase with ruff * style: normalise line endings, trailing whitespace and end-of-file newlines * ci: run ruff and file hygiene through prek, and document it --------- Co-authored-by: Hang <me@hangxu.me> Co-authored-by: Joe Banks <joe@jb3.dev>
This commit is contained in:
@@ -76,7 +76,7 @@
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% if page_title and not request.is_ajax %}
|
||||
{% if page_title and not is_ajax %}
|
||||
<h2>{{page_title|safe}}</h2>
|
||||
{% endif %}
|
||||
{% block content %}{% endblock %}
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
{% block js %}{% endblock %}
|
||||
{% block content %}{% endblock %}
|
||||
{% block content %}{% endblock %}
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
{% endif %}
|
||||
<script>
|
||||
$('.modal').modal('hide');
|
||||
</script>
|
||||
</script>
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
{% include associated2|safe %}
|
||||
{% endif %}
|
||||
|
||||
{% if not request.is_ajax %}
|
||||
{% if not is_ajax %}
|
||||
<div class="row py-2">
|
||||
<div class="col-sm-12 text-right">
|
||||
{% if can_edit %}
|
||||
@@ -59,7 +59,7 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% if request.is_ajax %}
|
||||
{% if is_ajax %}
|
||||
{% block footer %}
|
||||
<div class="row py-2">
|
||||
<div class="col-sm-12 text-right">
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
{% endif %}
|
||||
|
||||
{% for page in page_numbers %}
|
||||
{% ifequal page page_obj.number %}
|
||||
{% if page == page_obj.number %}
|
||||
<li class="page-item active"><a class="page-link" href="#">{{ page }}</a></li>
|
||||
{% else %}
|
||||
<li class="page-item"><a class="page-link" href="?{% url_replace request 'page' page %}" class="page">{{ page }}</a></li>
|
||||
{% endifequal %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{% if show_last %}
|
||||
|
||||
@@ -7,4 +7,4 @@
|
||||
<h2>Logout Successful</h2>
|
||||
<p>You have successfully been logged out of RIGS</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
{% block content %}
|
||||
<div class="col-sm-12">
|
||||
<h1>{% trans 'Password change successful' %}</h1>
|
||||
|
||||
|
||||
<p>{% trans "Your password has been changed" %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
{% block content %}
|
||||
<div class="col-sm-12">
|
||||
<h1>{% trans 'Password reset complete' %}</h1>
|
||||
|
||||
|
||||
<p>{% trans "Your password has been set. You may go ahead and log in now." %}</p>
|
||||
|
||||
|
||||
<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
<div class="col-sm-12">
|
||||
|
||||
<h1>{% trans 'Enter new password' %}</h1>
|
||||
|
||||
|
||||
<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
|
||||
|
||||
|
||||
<div class="col-sm-8 col-sm-offset-2 well">
|
||||
<form action="" method="post" role="form" class="">{% csrf_token %}
|
||||
{% if form.errors %}
|
||||
@@ -47,13 +47,13 @@
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
{% else %}
|
||||
|
||||
|
||||
<h1>{% trans 'Password reset unsuccessful' %}</h1>
|
||||
|
||||
|
||||
<p>{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}</p>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
{% endif %}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
{% block content %}
|
||||
<div class="col-sm-12">
|
||||
<h1>{% trans 'Password reset successful' %}</h1>
|
||||
|
||||
|
||||
<p>{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
{% block content %}
|
||||
<div class="col-sm-12">
|
||||
<h1>Password Reset</h1>
|
||||
|
||||
|
||||
<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p>
|
||||
|
||||
|
||||
<div class="col-sm-8 col-sm-offset-2 well">
|
||||
<form action="" method="POST" role="form" class="">{% csrf_token %}
|
||||
{% if form.errors %}
|
||||
@@ -32,4 +32,4 @@
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -7,4 +7,4 @@
|
||||
<h2>Thanks for registering</h2>
|
||||
<p>Thanks for registering with RIGS, further details will be emailed to you.</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
|
||||
{% extends is_ajax|yesno:"base_ajax.html,base.html" %}
|
||||
|
||||
{% block title %}Search Help{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
{% if not request.is_ajax %}
|
||||
{% if not is_ajax %}
|
||||
<div class="col-sm-12">
|
||||
<h1>Search Help</h1>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user