diff --git a/apps/authentication/fixtures/defaultuser.json b/apps/authentication/fixtures/defaultuser.json index 3d5be43..4a5cdd3 100644 --- a/apps/authentication/fixtures/defaultuser.json +++ b/apps/authentication/fixtures/defaultuser.json @@ -205,7 +205,7 @@ "fields": { "password": "pbkdf2_sha256$260000$h4zLYmIeMQgJ0ko41i6dxo$Gwe0TV75ibdJTtqdTOOs5ucOEhA9DUM/bwxjagVhKKg=", "last_login": "2024-01-13T20:53:38.159Z", - "icon": "../static/assets/images/defaultuser.webp", + "icon": "../static/images/defaultuser.webp", "email": "admin@mail.com", "forename": "Default", "surname": "Admin User", diff --git a/apps/authentication/migrations/0003_alter_user_icon.py b/apps/authentication/migrations/0003_alter_user_icon.py new file mode 100644 index 0000000..d8e57a4 --- /dev/null +++ b/apps/authentication/migrations/0003_alter_user_icon.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.16 on 2024-01-18 10:46 + +import apps.authentication.models +from django.db import migrations, models +import pathlib + + +class Migration(migrations.Migration): + + dependencies = [ + ('authentication', '0002_auto_20240112_1604'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='icon', + field=models.ImageField(default=pathlib.PurePosixPath('/mnt/code/ticket-website/static/images/defaultuser.webp'), storage=apps.authentication.models.OverwriteStorage(), upload_to=apps.authentication.models.IconPathGenerator(), verbose_name='profile picture'), + ), + ] diff --git a/apps/authentication/models.py b/apps/authentication/models.py index fd41278..3766e90 100644 --- a/apps/authentication/models.py +++ b/apps/authentication/models.py @@ -4,6 +4,7 @@ from uuid import uuid4 import os from django.db import models +from django.conf import settings from django.utils import timezone from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin from django.utils.translation import gettext_lazy as _ @@ -69,7 +70,7 @@ class User(AbstractBaseUser, PermissionsMixin): icon = models.ImageField( _("profile picture"), upload_to=IconPathGenerator(), - default="../static/assets/images/defaultuser.webp", + default=settings.BASE_DIR / "static/images/defaultuser.webp", storage=OverwriteStorage() ) email = models.EmailField( diff --git a/apps/static/assets/5.2_bootstrap.css b/apps/static/5.2_bootstrap.css similarity index 100% rename from apps/static/assets/5.2_bootstrap.css rename to apps/static/5.2_bootstrap.css diff --git a/apps/static/assets/bootstrap.min.js b/apps/static/bootstrap.min.js similarity index 100% rename from apps/static/assets/bootstrap.min.js rename to apps/static/bootstrap.min.js diff --git a/apps/static/assets/css/adminator.css b/apps/static/css/adminator.css similarity index 100% rename from apps/static/assets/css/adminator.css rename to apps/static/css/adminator.css diff --git a/apps/static/assets/css/bootstrap.css b/apps/static/css/bootstrap.css similarity index 100% rename from apps/static/assets/css/bootstrap.css rename to apps/static/css/bootstrap.css diff --git a/apps/static/assets/css/colours.css b/apps/static/css/colours.css similarity index 100% rename from apps/static/assets/css/colours.css rename to apps/static/css/colours.css diff --git a/apps/static/assets/css/datepicker.css b/apps/static/css/datepicker.css similarity index 100% rename from apps/static/assets/css/datepicker.css rename to apps/static/css/datepicker.css diff --git a/apps/static/assets/css/fontawesome.css b/apps/static/css/fontawesome.css similarity index 100% rename from apps/static/assets/css/fontawesome.css rename to apps/static/css/fontawesome.css diff --git a/apps/static/assets/css/index.css b/apps/static/css/index.css similarity index 100% rename from apps/static/assets/css/index.css rename to apps/static/css/index.css diff --git a/apps/static/assets/css/index.css.map b/apps/static/css/index.css.map similarity index 100% rename from apps/static/assets/css/index.css.map rename to apps/static/css/index.css.map diff --git a/apps/static/assets/css/index.min.css b/apps/static/css/index.min.css similarity index 100% rename from apps/static/assets/css/index.min.css rename to apps/static/css/index.min.css diff --git a/apps/static/assets/css/jquery.dataTables.min.css b/apps/static/css/jquery.dataTables.min.css similarity index 100% rename from apps/static/assets/css/jquery.dataTables.min.css rename to apps/static/css/jquery.dataTables.min.css diff --git a/apps/static/assets/css/jvectormap.css b/apps/static/css/jvectormap.css similarity index 100% rename from apps/static/assets/css/jvectormap.css rename to apps/static/css/jvectormap.css diff --git a/apps/static/assets/css/scrollbar.css b/apps/static/css/scrollbar.css similarity index 100% rename from apps/static/assets/css/scrollbar.css rename to apps/static/css/scrollbar.css diff --git a/apps/static/assets/css/select2-bootstrap.min.css b/apps/static/css/select2-bootstrap.min.css similarity index 100% rename from apps/static/assets/css/select2-bootstrap.min.css rename to apps/static/css/select2-bootstrap.min.css diff --git a/apps/static/assets/css/select2.min.css b/apps/static/css/select2.min.css similarity index 100% rename from apps/static/assets/css/select2.min.css rename to apps/static/css/select2.min.css diff --git a/apps/static/assets/css/themify-icons.css b/apps/static/css/themify-icons.css similarity index 100% rename from apps/static/assets/css/themify-icons.css rename to apps/static/css/themify-icons.css diff --git a/apps/static/assets/fonts/icons/fontawesome/FontAwesome.otf b/apps/static/fonts/icons/fontawesome/FontAwesome.otf similarity index 100% rename from apps/static/assets/fonts/icons/fontawesome/FontAwesome.otf rename to apps/static/fonts/icons/fontawesome/FontAwesome.otf diff --git a/apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.eot b/apps/static/fonts/icons/fontawesome/fontawesome-webfont.eot similarity index 100% rename from apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.eot rename to apps/static/fonts/icons/fontawesome/fontawesome-webfont.eot diff --git a/apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.svg b/apps/static/fonts/icons/fontawesome/fontawesome-webfont.svg similarity index 100% rename from apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.svg rename to apps/static/fonts/icons/fontawesome/fontawesome-webfont.svg diff --git a/apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.ttf b/apps/static/fonts/icons/fontawesome/fontawesome-webfont.ttf similarity index 100% rename from apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.ttf rename to apps/static/fonts/icons/fontawesome/fontawesome-webfont.ttf diff --git a/apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.woff b/apps/static/fonts/icons/fontawesome/fontawesome-webfont.woff similarity index 100% rename from apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.woff rename to apps/static/fonts/icons/fontawesome/fontawesome-webfont.woff diff --git a/apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.woff2 b/apps/static/fonts/icons/fontawesome/fontawesome-webfont.woff2 similarity index 100% rename from apps/static/assets/fonts/icons/fontawesome/fontawesome-webfont.woff2 rename to apps/static/fonts/icons/fontawesome/fontawesome-webfont.woff2 diff --git a/apps/static/assets/fonts/icons/themify/themify.eot b/apps/static/fonts/icons/themify/themify.eot similarity index 100% rename from apps/static/assets/fonts/icons/themify/themify.eot rename to apps/static/fonts/icons/themify/themify.eot diff --git a/apps/static/assets/fonts/icons/themify/themify.svg b/apps/static/fonts/icons/themify/themify.svg similarity index 100% rename from apps/static/assets/fonts/icons/themify/themify.svg rename to apps/static/fonts/icons/themify/themify.svg diff --git a/apps/static/assets/fonts/icons/themify/themify.ttf b/apps/static/fonts/icons/themify/themify.ttf similarity index 100% rename from apps/static/assets/fonts/icons/themify/themify.ttf rename to apps/static/fonts/icons/themify/themify.ttf diff --git a/apps/static/assets/fonts/icons/themify/themify.woff b/apps/static/fonts/icons/themify/themify.woff similarity index 100% rename from apps/static/assets/fonts/icons/themify/themify.woff rename to apps/static/fonts/icons/themify/themify.woff diff --git a/apps/static/assets/images/404.png b/apps/static/images/404.png similarity index 100% rename from apps/static/assets/images/404.png rename to apps/static/images/404.png diff --git a/apps/static/assets/images/500.png b/apps/static/images/500.png similarity index 100% rename from apps/static/assets/images/500.png rename to apps/static/images/500.png diff --git a/apps/static/assets/images/bg.jpg b/apps/static/images/bg.jpg similarity index 100% rename from apps/static/assets/images/bg.jpg rename to apps/static/images/bg.jpg diff --git a/apps/static/assets/images/datatables/sort_asc.png b/apps/static/images/datatables/sort_asc.png similarity index 100% rename from apps/static/assets/images/datatables/sort_asc.png rename to apps/static/images/datatables/sort_asc.png diff --git a/apps/static/assets/images/datatables/sort_asc_disabled.png b/apps/static/images/datatables/sort_asc_disabled.png similarity index 100% rename from apps/static/assets/images/datatables/sort_asc_disabled.png rename to apps/static/images/datatables/sort_asc_disabled.png diff --git a/apps/static/assets/images/datatables/sort_both.png b/apps/static/images/datatables/sort_both.png similarity index 100% rename from apps/static/assets/images/datatables/sort_both.png rename to apps/static/images/datatables/sort_both.png diff --git a/apps/static/assets/images/datatables/sort_desc.png b/apps/static/images/datatables/sort_desc.png similarity index 100% rename from apps/static/assets/images/datatables/sort_desc.png rename to apps/static/images/datatables/sort_desc.png diff --git a/apps/static/assets/images/datatables/sort_desc_disabled.png b/apps/static/images/datatables/sort_desc_disabled.png similarity index 100% rename from apps/static/assets/images/datatables/sort_desc_disabled.png rename to apps/static/images/datatables/sort_desc_disabled.png diff --git a/apps/static/assets/images/defaultuser.webp b/apps/static/images/defaultuser.webp similarity index 100% rename from apps/static/assets/images/defaultuser.webp rename to apps/static/images/defaultuser.webp diff --git a/apps/static/assets/images/logo.png b/apps/static/images/logo.png similarity index 100% rename from apps/static/assets/images/logo.png rename to apps/static/images/logo.png diff --git a/apps/static/assets/images/logo.svg b/apps/static/images/logo.svg similarity index 100% rename from apps/static/assets/images/logo.svg rename to apps/static/images/logo.svg diff --git a/apps/static/assets/js/ckeditor.js b/apps/static/js/ckeditor.js similarity index 100% rename from apps/static/assets/js/ckeditor.js rename to apps/static/js/ckeditor.js diff --git a/apps/static/assets/js/index.js b/apps/static/js/index.js similarity index 100% rename from apps/static/assets/js/index.js rename to apps/static/js/index.js diff --git a/apps/static/assets/js/index.min.js b/apps/static/js/index.min.js similarity index 100% rename from apps/static/assets/js/index.min.js rename to apps/static/js/index.min.js diff --git a/apps/static/assets/js/jquery-3.6.0.min.js b/apps/static/js/jquery-3.6.0.min.js similarity index 100% rename from apps/static/assets/js/jquery-3.6.0.min.js rename to apps/static/js/jquery-3.6.0.min.js diff --git a/apps/static/assets/js/jquery.dataTables.min.js b/apps/static/js/jquery.dataTables.min.js similarity index 100% rename from apps/static/assets/js/jquery.dataTables.min.js rename to apps/static/js/jquery.dataTables.min.js diff --git a/apps/static/assets/js/maps/index.js.map b/apps/static/js/maps/index.js.map similarity index 100% rename from apps/static/assets/js/maps/index.js.map rename to apps/static/js/maps/index.js.map diff --git a/apps/static/assets/js/select2.min.js b/apps/static/js/select2.min.js similarity index 100% rename from apps/static/assets/js/select2.min.js rename to apps/static/js/select2.min.js diff --git a/apps/static/assets/js/tickets.js b/apps/static/js/tickets.js similarity index 96% rename from apps/static/assets/js/tickets.js rename to apps/static/js/tickets.js index b43c506..7f39196 100644 --- a/apps/static/assets/js/tickets.js +++ b/apps/static/js/tickets.js @@ -1,5 +1,5 @@ var displayedTicketID = -1; - filters = {"ordering": "-edit_timestamp"}; + filters = {"ordering": "-edit_timestamp", "page_size": 100}; editor = null; searchTimeout = null; loadingTickets = false; @@ -49,7 +49,7 @@ $(document).ready(function() { }) setupFilter("#filterSidebar .filter-department", "author__department"); - setupFilter("#filterSidebar .filter-tag", "tags"); + setupFilter("#filterSidebar .filter-tags", "tags"); setupFilter("#filterSidebar .filter-priority", "priority"); loadFilterCounts(); @@ -162,7 +162,7 @@ function getOrdinalSuffix(day) { function updateFilterCounts(filterType, data) { $("#filterSidebar .filter-" + filterType).each(function() { var uuid = $(this).find("input[type=checkbox],input[type=radio]").val(); - var count = data[filterType + '_counts'][uuid]; + var count = data[filterType][uuid]; $(this).find(".badge").text(count); }); } @@ -173,11 +173,12 @@ function loadFilterCounts() { type: "GET", success: function(data) { updateFilterCounts('priority', data); - updateFilterCounts('tag', data); + updateFilterCounts('tags', data); updateFilterCounts('department', data); - $("#filterPriorityAll .badge").text(data.ticket_count); - $("#filterDepartmentAll .badge").text(data.ticket_count) - $("#ticketCounts .total").text(data.ticket_count) + + $("#filterPriorityAll .badge").text(data.tickets); + $("#filterDepartmentAll .badge").text(data.tickets) + $("#ticketCounts .total").text(data.tickets) }, error: function(data) { console.error(JSON.stringify(data, null, 4)) diff --git a/apps/templates/accounts/login.html b/apps/templates/accounts/login.html index d34d277..06e20b7 100644 --- a/apps/templates/accounts/login.html +++ b/apps/templates/accounts/login.html @@ -1,4 +1,5 @@ {% extends "layouts/base-authentication.html" %} +{% load static %} {% block title %} Sign IN {% endblock title %} @@ -8,10 +9,10 @@ {% block content %}
-
+
- +
diff --git a/apps/templates/accounts/register.html b/apps/templates/accounts/register.html index 8b47922..71daf31 100644 --- a/apps/templates/accounts/register.html +++ b/apps/templates/accounts/register.html @@ -1,4 +1,5 @@ {% extends "layouts/base-authentication.html" %} +{% load static %} {% block title %} Register {% endblock title %} @@ -8,10 +9,10 @@ {% block content %}
-
+
- +
diff --git a/apps/templates/home/page-404.html b/apps/templates/home/page-404.html index 1df2e06..1d35d03 100644 --- a/apps/templates/home/page-404.html +++ b/apps/templates/home/page-404.html @@ -1,4 +1,5 @@ {% extends "layouts/base-error.html" %} +{% load static %} {% block title %} Error 404 {% endblock title %} @@ -9,7 +10,7 @@
- # + #
diff --git a/apps/templates/home/page-500.html b/apps/templates/home/page-500.html index 2d808b0..6f8c9ab 100644 --- a/apps/templates/home/page-500.html +++ b/apps/templates/home/page-500.html @@ -1,4 +1,5 @@ {% extends "layouts/base-error.html" %} +{% load static %} {% block title %} Error 500 {% endblock title %} @@ -9,7 +10,7 @@
- # + #
@@ -17,7 +18,7 @@

Internal server error

Something goes wrong with our servers, please try again later.

diff --git a/apps/templates/home/signin.html b/apps/templates/home/signin.html index f408bfc..dd117bd 100644 --- a/apps/templates/home/signin.html +++ b/apps/templates/home/signin.html @@ -1,4 +1,5 @@ {% extends "layouts/base-authentication.html" %} +{% load static %} {% block title %} Sign IN {% endblock title %} @@ -8,10 +9,10 @@ {% block content %}
-
+
- +
diff --git a/apps/templates/home/signup.html b/apps/templates/home/signup.html index 50531ab..36a7a29 100644 --- a/apps/templates/home/signup.html +++ b/apps/templates/home/signup.html @@ -1,4 +1,5 @@ {% extends "layouts/base-authentication.html" %} +{% load static %} {% block title %} Register {% endblock title %} @@ -8,10 +9,10 @@ {% block content %}
-
+
- +
diff --git a/apps/templates/home/tickets.html b/apps/templates/home/tickets.html index 699bc5d..1ee9587 100644 --- a/apps/templates/home/tickets.html +++ b/apps/templates/home/tickets.html @@ -5,7 +5,7 @@ {% block stylesheets %} - + {% endblock stylesheets %} {% block content %} @@ -17,7 +17,7 @@