Skip to content
Snippets Groups Projects
Verified Commit 40733301 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	poetry.lock
parents 1acaa727 a4200e15
No related branches found
No related tags found
1 merge request!85Resolve "Migrate to materialize-css"
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 105 additions and 236 deletions
biscuit/core/cronjobs.py deleted 100644 → 0
+ 0
− 18
View file @ 1acaa727
from django.conf import settings
from django.core import management
from django_cron import CronJobBase, Schedule
class Backup(CronJobBase):
RUN_AT_TIMES = settings.DBBACKUP_CRON_TIMES
RETRY_AFTER_FAILURE_MINS = 5
schedule = Schedule(
run_at_times=RUN_AT_TIMES, retry_after_failure_mins=RETRY_AFTER_FAILURE_MINS
)
code = "biscuit.core.Backup"
def do(self):
management.call_command("dbbackup", "-z")
management.call_command("mediabackup", "-z")
biscuit/core/menus.py
+ 10
− 1
View file @ 40733301
......@@ -76,6 +76,15 @@ MENUS = {
"menu_generator.validators.is_superuser",
],
},
{
"name": _("Settings"),
"url": "site_settings",
"icon": "settings",
"validators": [
"menu_generator.validators.is_authenticated",
"menu_generator.validators.is_superuser",
],
},
],
},
{
......@@ -113,7 +122,7 @@ MENUS = {
"name": _("BiscuIT Software"),
"url": "#",
"submenu": [
{"name": _("Website"), "url": "https://biscuit.edugit.org/"},
{"name": _("Website"), "url": "https://biscuit.edugit.io/"},
{"name": "Teckids e.V.", "url": "https://www.teckids.org/"},
],
},
......
biscuit/core/settings.py
+ 2
− 12
View file @ 40733301
......@@ -53,9 +53,7 @@ INSTALLED_APPS = [
"settings_context_processor",
"sass_processor",
"easyaudit",
"dbbackup",
"dbsettings",
"django_cron",
"bootstrap4",
"django_any_js",
"django_yarnpkg",
......@@ -254,8 +252,8 @@ SELECT2_I18N_PATH = JS_URL + "/select2/dist/js/i18n"
ANY_JS = {
"DataTables": {"js_url": JS_URL + "/datatables/media/js/jquery.dataTables.min.js"},
"DataTables-Bootstrap4": {
"css_url": JS_URL + "/datatables/media/css/dataTables.bootstrap4.min.css",
"js_url": JS_URL + "/datatables/media/js/dataTables.bootstrap4.min.js",
"css_url": JS_URL + "/datatables/media/css/jquery.dataTables.min.css",
"js_url": JS_URL + "/datatables/media/js/jquery.dataTables.min.js",
},
"material-design-icons": {"css_url": JS_URL + "@mdi/font/css/materialdesignicons.css"},
}
......@@ -298,14 +296,6 @@ IMPERSONATE = {"USE_HTTP_REFERER": True, "REQUIRE_SUPERUSER": True, "ALLOW_SUPER
DJANGO_TABLES2_TEMPLATE = "django_tables2/bootstrap4.html"
DBBACKUP_STORAGE = _settings.get("backup.storage", "django.core.files.storage.FileSystemStorage")
DBBACKUP_STORAGE_OPTIONS = {"location": _settings.get("backup.location", "/var/backups/biscuit")}
DBBACKUP_CLEANUP_KEEP = _settings.get("backup.keep.database", 10)
DBBACKUP_CLEANUP_KEEP_MEDIA = _settings.get("backup.keep.media", 10)
DBBACKUP_CRON_TIMES = _settings.get("backup.times", None) or ["03:57"]
CRON_CLASSES = ["biscuit.core.cronjobs.Backup"]
ANONYMIZE_ENABLED = _settings.get("maintenance.anonymisable", True)
LOGIN_URL = "two_factor:login"
......
biscuit/core/static/js/main.js deleted 100644 → 0
+ 0
− 28
View file @ 1acaa727
$(document).ready( function () {
$('table.datatable').each(function (index) {
$(this).DataTable({
"paging": false
});
});
$('*:not(a, span)[data-poload]').each(function() {
$(this).find('a, span').attr('data-poload', $(this).attr('data-poload'));
$(this).removeAttr('data-poload');
});
$('*[data-poload]').popover({
html: true,
animation: true,
placement: 'auto',
contianer: 'body',
trigger: 'hover'
}).on("inserted.bs.popover", function() {
var trigger_el = $(this);
var popover_id = trigger_el.attr("aria-describedby");
var popover_el = $('#' + popover_id);
$.get(trigger_el.data('poload'), function(d) {
popover_el.html(d);
});
});
});
biscuit/core/templates/core/base.html
+ 0
− 1
View file @ 40733301
......@@ -17,7 +17,6 @@
{% block bootstrap4_extra_script %}
{% include_js "DataTables" %}
{% include_js "DataTables-Bootstrap4" %}
<script type="text/javascript" src="{% static 'js/main.js' %}" /></script>
{% endblock %}
{% block bootstrap4_content %}
......
biscuit/core/templates/core/person_card.html deleted 100644 → 0
+ 0
− 21
View file @ 1acaa727
{# -*- engine:django -*- #}
{% load static cropping %}
<div class="card shadow">
<div class="card-header">{{ person.first_name }} {{ person.last_name }}</div>
<div class="card-body">
<div class="row no-gutters">
<div class="col-sm">
{% if person.photo %}
<img class="person-img" src="{% cropped_thumbnail person 'photo_cropping' max_size='300x400' %}" alt="{{ person.first_name }} {{ person.last_name }}" />
{% else %}
<img class="person-img" src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}" />
{% endif %}
</div>
<div class="col-sm">
<p class="card-text">{{ person.date_of_birth|date }}</p>
</div>
</div>
</div>
</div>
biscuit/core/templates/core/system_status.html
+ 0
− 20
View file @ 40733301
......@@ -44,24 +44,4 @@
</li>
</ul>
</div>
<div class="card">
<div class="card-header bg-light text-dark">
{% blocktrans %}Recent backup cron jobs{% endblocktrans %}
</div>
<ul class="list-group list-group-flush">
{% for backup in backups %}
<li class="list-group-item d-flex justify-content-between align-items-center">
<div>
<p>{{ backup.end_time }}</p>
</div>
{% if backup.is_success %}
<span class="badge badge-success mdi mdi-check"> </span>
{% else %}
<span class="badge badge-danger mdi mdi-error"> </span>
{% endif %}
</li>
{% endfor %}
</ul>
</div>
{% endblock %}
biscuit/core/urls.py
+ 2
− 3
View file @ 40733301
......@@ -22,12 +22,11 @@ urlpatterns = [
path("persons", views.persons, name="persons"),
path("persons/accounts", views.persons_accounts, name="persons_accounts"),
path("person", views.person, name="person"),
path("person/<int:id_>", views.person, {"template": "full"}, name="person_by_id"),
path("person/<int:id_>/card", views.person, {"template": "card"}, name="person_by_id_card"),
path("person/<int:id_>", views.person, name="person_by_id"),
path("person/<int:id_>/edit", views.edit_person, name="edit_person_by_id"),
path("groups", views.groups, name="groups"),
path("group/create", views.edit_group, name="create_group"),
path("group/<int:id_>", views.group, {"template": "full"}, name="group_by_id"),
path("group/<int:id_>", views.group, name="group_by_id"),
path("group/<int:id_>/edit", views.edit_group, name="edit_group_by_id"),
path("", views.index, name="index"),
path("maintenance-mode/", include("maintenance_mode.urls")),
......
biscuit/core/views.py
+ 4
− 9
View file @ 40733301
......@@ -5,7 +5,6 @@ from django.http import Http404, HttpRequest, HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.utils.translation import ugettext_lazy as _
from django_cron.models import CronJobLog
from django_tables2 import RequestConfig
from .decorators import admin_required
......@@ -42,7 +41,7 @@ def persons(request: HttpRequest) -> HttpResponse:
@login_required
def person(request: HttpRequest, id_: int, template: str) -> HttpResponse:
def person(request: HttpRequest, id_: int) -> HttpResponse:
context = {}
# Get person and check access
......@@ -62,11 +61,11 @@ def person(request: HttpRequest, id_: int, template: str) -> HttpResponse:
RequestConfig(request).configure(groups_table)
context["groups_table"] = groups_table
return render(request, "core/person_%s.html" % template, context)
return render(request, "core/person_full.html", context)
@login_required
def group(request: HttpRequest, id_: int, template: str) -> HttpResponse:
def group(request: HttpRequest, id_: int) -> HttpResponse:
context = {}
# Get group and check if it exist
......@@ -97,7 +96,7 @@ def group(request: HttpRequest, id_: int, template: str) -> HttpResponse:
RequestConfig(request).configure(owners_table)
context["owners_table"] = owners_table
return render(request, "core/group_%s.html" % template, context)
return render(request, "core/group_full.html", context)
@login_required
......@@ -187,10 +186,6 @@ def data_management(request: HttpRequest) -> HttpResponse:
def system_status(request: HttpRequest) -> HttpResponse:
context = {}
context["backups"] = CronJobLog.objects.filter(code="biscuit.core.Backup").order_by(
"-end_time"
)[:10]
return render(request, "core/system_status.html", context)
......
dev.sh
+ 2
− 1
View file @ 40733301
......@@ -9,10 +9,11 @@ case "$1" in
set -e
cd "$(dirname "$0")"
remove_pip_metadata
poetry lock
poetry install
for d in apps/official/*; do
remove_pip_metadata
poetry run sh -c "cd $d; poetry install"
poetry run sh -c "cd $d; poetry lock; poetry install"
done
remove_pip_metadata
poetry run ./manage.py compilemessages
......
docs/dev/01_setup.rst
+ 1
− 1
View file @ 40733301
......@@ -81,7 +81,7 @@ development server against a local PostgreSQL database with password
:alt: Screenshot of index page
After installing the development environment with default settings,
you should see the index page with the BOotstrap style.
you should see the index page with the Bootstrap style.
.. _Poetry: https://poetry.eustace.io/
.. _Poetry installation methods: https://poetry.eustace.io/docs/#installation
......
poetry.lock
+ 77
− 111
View file @ 40733301
This diff is collapsed.
pyproject.toml
+ 4
− 6
View file @ 40733301
......@@ -20,17 +20,17 @@ classifiers = [
[tool.poetry.dependencies]
python = "^3.7"
Django = "^2.2"
Django = "^3.0"
django-any-js = "^1.0"
django-bootstrap4 = "^1.0"
django-debug-toolbar = "^2.0"
django-easy-audit = "^1.1"
django-easy-audit = {version ="^1.2rc1", allow-prereleases = true}
django-middleware-global-request = "^0.1.2"
django-menu-generator = "^1.0.4"
django-tables2 = "^2.1"
Pillow = "^6.1"
Pillow = "^7.0"
django-phonenumber-field = {version = ">=3.0, <5.0", extras = ["phonenumbers"]}
django-sass-processor = "^0.7.3"
django-sass-processor = "^0.8"
libsass = "^0.19.2"
colour = "^0.1.5"
dynaconf = {version = "^2.0", extras = ["yaml", "toml", "ini"]}
......@@ -42,8 +42,6 @@ easy-thumbnails = "^2.6"
django-image-cropping = "^1.2"
django-impersonate = "^1.4"
python-memcached = "^1.59"
django-dbbackup = "^3.2"
django-cron = "^0.5.1"
django-hattori = "^0.2"
psycopg2 = "^2.8"
django_select2 = "^7.1"
......
tox.ini
+ 3
− 4
View file @ 40733301
......@@ -9,9 +9,6 @@ skip_install = true
envdir = {toxworkdir}/globalenv
commands_pre = ./dev.sh install-all
commands =
poetry run python manage.py compilemessages
poetry run python manage.py yarn install
poetry run python manage.py collectstatic --no-input --clear
poetry run pytest --cov=. {posargs} biscuit/ apps/official/
[testenv:selenium]
......@@ -28,7 +25,9 @@ commands =
poetry run flake8 {posargs} biscuit/ apps/official/
[testenv:security]
commands = poetry run safety check --full-report
commands =
poetry show --no-dev
poetry run safety check --full-report
[testenv:build]
commands_pre =
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment