Skip to content
Snippets Groups Projects
Commit 58635877 authored by Jonathan Weth's avatar Jonathan Weth :keyboard: Committed by Julian
Browse files

Integrate django-iconify and iconify with AlekSIS

parent f1c9b0b1
No related branches found
No related tags found
1 merge request!686Resolve "Change material icon set"
......@@ -147,6 +147,7 @@ INSTALLED_APPS = [
"django_filters",
"oauth2_provider",
"rest_framework",
"dj_iconify.apps.DjIconifyConfig",
]
merge_app_settings("INSTALLED_APPS", INSTALLED_APPS, True)
......@@ -559,6 +560,8 @@ YARN_INSTALLED_APPS = [
"sortablejs",
"@sentry/tracing",
"luxon",
"@iconify/iconify",
"@iconify/json",
]
merge_app_settings("YARN_INSTALLED_APPS", YARN_INSTALLED_APPS, True)
......@@ -592,6 +595,7 @@ ANY_JS = {
"Sentry": {"js_url": JS_URL + "/@sentry/tracing/build/bundle.tracing.js"},
"cleavejs": {"js_url": JS_URL + "/cleave.js/dist/cleave.min.js"},
"luxon": {"js_url": JS_URL + "/luxon/build/global/luxon.min.js"},
"iconify": {"js_url": JS_URL + "/@iconify/iconify/dist/iconify.min.js"},
}
merge_app_settings("ANY_JS", ANY_JS, True)
......@@ -611,6 +615,8 @@ SASS_PROCESSOR_INCLUDE_DIRS = [
os.path.join(STATIC_ROOT, "public"),
]
ICONIFY_JSON_ROOT = os.path.join(JS_ROOT, "@iconify", "json")
ADMINS = _settings.get(
"contact.admins", [(AUTH_INITIAL_SUPERUSER["username"], AUTH_INITIAL_SUPERUSER["email"])]
)
......
......@@ -937,3 +937,7 @@ $person-logo-size: 20vh;
@extend .application-circle;
object-fit: cover;
}
svg.iconify {
@extend i;
}
......@@ -53,6 +53,9 @@
</script>
{% endif %}
<script type="text/javascript" src="{% url 'config.js' %}"></script>
{% include_js "iconify" %}
{# Include jQuery early to provide $(document).ready #}
{% include_js "jQuery" %}
......
......@@ -314,6 +314,7 @@ urlpatterns = [
name="assign_permission",
),
path("pdfs/<int:pk>/", views.RedirectToPDFFile.as_view(), name="redirect_to_pdf_file"),
path("icons/", include("dj_iconify.urls")),
]
# Use custom server error handler to get a request object in the template
......
......@@ -126,6 +126,7 @@ python-gnupg = "^0.4.7"
sentry-sdk = {version = "^1.4.3", optional = true}
django-cte = "^1.1.5"
pycountry = "^22.0.0"
django-iconify = "^0.1.0"
[tool.poetry.extras]
ldap = ["django-auth-ldap"]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment