added poetry(docker is not working for now), minor changes for pipeliner, updated admin

This commit is contained in:
Alexander Karpov 2022-12-20 19:21:39 +03:00
parent 6c641393ed
commit 3d3688eb6e
6 changed files with 122 additions and 2 deletions

View File

@ -54,4 +54,5 @@ class Storage(BaseStorage):
class RunnerStorage(BaseStorage):
# TODO: move to cacheops
data = models.JSONField(default=dict)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

View File

@ -15,6 +15,7 @@
<!-- Latest compiled and minified Bootstrap CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.2/font/bootstrap-icons.css">
<script src="https://kit.fontawesome.com/32fd82c823.js" crossorigin="anonymous"></script>
<!-- Your stuff: Third-party CSS libraries go here -->
<!-- This file stores project-specific CSS -->

View File

@ -42,11 +42,33 @@
# DATABASES
# ------------------------------------------------------------------------------
# https://docs.djangoproject.com/en/dev/ref/settings/#databases
DATABASES = {"default": env.db("DATABASE_URL"), "memory": env.db("REDIS_URL")}
DATABASES = {"default": env.db("DATABASE_URL")}
DATABASES["default"]["ATOMIC_REQUESTS"] = True
# https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-DEFAULT_AUTO_FIELD
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
# CACHES
# ------------------------------------------------------------------------------
CACHE_TTL = 60 * 1500
CACHES = {
"default": {
"BACKEND": "django_redis.cache.RedisCache",
"LOCATION": env.db("REDIS_URL"),
"OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient"},
"KEY_PREFIX": "example",
}
}
SESSION_ENGINE = "django.contrib.sessions.backends.cache"
SESSION_CACHE_ALIAS = "default"
CACHEOPS_DEFAULTS = {"timeout": 60 * 60}
CACHEOPS = {
"auth.user": {"ops": "get", "timeout": 60 * 15},
"auth.*": {"ops": ("fetch", "get")},
"auth.permission": {"ops": "all"},
"*.*": {},
}
# URLS
# ------------------------------------------------------------------------------
# https://docs.djangoproject.com/en/dev/ref/settings/#root-urlconf
@ -64,6 +86,8 @@
"django.contrib.messages",
"django.contrib.staticfiles",
"django.contrib.humanize", # Handy template tags
# required for jazzmin to work
"jazzmin",
"django.contrib.admin",
"django.forms",
]
@ -83,6 +107,8 @@
"ckeditor_uploader",
"colorfield",
"polymorphic",
"cacheops",
"extra_settings",
]
HEALTH_CHECKS = [
@ -445,3 +471,18 @@
},
},
}
# JAZZMIN
# ------------------------------------------------------------------------------
JAZZMIN_SETTINGS = {
"site_title": "sanspie's site admin",
"site_header": "site admin",
"site_brand": "sanspie's site",
"site_logo": "/images/favicons/favicon.ico",
"login_logo": "/images/favicons/favicon.ico",
"site_icon": None,
"welcome_sign": "welcum back",
"copyright": "admin on akarpov.ru",
"user_avatar": "image_cropped",
}

76
poetry.lock generated
View File

@ -758,6 +758,23 @@ amazon-ses = ["boto3"]
dev = ["flake8", "sphinx", "sphinx-rtd-theme", "tox", "twine", "wheel"]
postal = ["cryptography"]
[[package]]
name = "django-cacheops"
version = "6.1"
description = "A slick ORM cache with automatic granular event-driven invalidation for Django."
category = "main"
optional = false
python-versions = ">=3.5"
files = [
{file = "django-cacheops-6.1.tar.gz", hash = "sha256:b684ef39fd434189d3cbb7d85417cd972af635289a032447982473b4a89f727d"},
]
[package.dependencies]
django = ">=2.1"
funcy = ">=1.8,<2.0"
redis = ">=3.0.0"
six = ">=1.4.0"
[[package]]
name = "django-celery-beat"
version = "2.4.0"
@ -898,6 +915,21 @@ files = [
[package.dependencies]
Django = ">=3.2"
[[package]]
name = "django-extra-settings"
version = "0.7.0"
description = "easily manage typed extra settings using the django admin."
category = "main"
optional = false
python-versions = "*"
files = [
{file = "django-extra-settings-0.7.0.tar.gz", hash = "sha256:65b4f29612b3f6a9a35c6ae61a00d9cc7a9aa0c046d1d60af8d0cff2387f1448"},
{file = "django_extra_settings-0.7.0-py3-none-any.whl", hash = "sha256:b3e4afd071a6d88b6df91e27aa5cb751b864fcb0ea30290d2f90ef4dcd970ef1"},
]
[package.dependencies]
jsonfield = ">=3.0.0"
[[package]]
name = "django-health-check"
version = "3.17.0"
@ -929,6 +961,21 @@ files = [
{file = "django_ipware-4.0.2-py2.py3-none-any.whl", hash = "sha256:878dbb06a87e25550798e9ef3204ed70a200dd8b15e47dcef848cf08244f04c9"},
]
[[package]]
name = "django-jazzmin"
version = "2.6.0"
description = "Drop-in theme for django admin, that utilises AdminLTE 3 & Bootstrap 4 to make yo' admin look jazzy"
category = "main"
optional = false
python-versions = ">=3.6.2"
files = [
{file = "django_jazzmin-2.6.0-py3-none-any.whl", hash = "sha256:fb554c2d564649c65243b13385121fdbdda58521f49544f9d7cb9c414a4908d4"},
{file = "django_jazzmin-2.6.0.tar.gz", hash = "sha256:5bb07055cf19183030724f976904fd8b6337559727959340a43832fab0531812"},
]
[package.dependencies]
django = ">=2.2"
[[package]]
name = "django-js-asset"
version = "2.0.0"
@ -1287,6 +1334,18 @@ prometheus-client = ">=0.8.0"
pytz = "*"
tornado = ">=5.0.0,<7.0.0"
[[package]]
name = "funcy"
version = "1.17"
description = "A fancy and practical functional tools"
category = "main"
optional = false
python-versions = "*"
files = [
{file = "funcy-1.17-py2.py3-none-any.whl", hash = "sha256:ba7af5e58bfc69321aaf860a1547f18d35e145706b95d1b3c966abc4f0b60309"},
{file = "funcy-1.17.tar.gz", hash = "sha256:40b9b9a88141ae6a174df1a95861f2b82f2fdc17669080788b73a3ed9370e968"},
]
[[package]]
name = "gunicorn"
version = "20.1.0"
@ -1595,6 +1654,21 @@ MarkupSafe = ">=2.0"
[package.extras]
i18n = ["Babel (>=2.7)"]
[[package]]
name = "jsonfield"
version = "3.1.0"
description = "A reusable Django field that allows you to store validated JSON in your model."
category = "main"
optional = false
python-versions = ">=3.6"
files = [
{file = "jsonfield-3.1.0-py3-none-any.whl", hash = "sha256:df857811587f252b97bafba42e02805e70a398a7a47870bc6358a0308dd689ed"},
{file = "jsonfield-3.1.0.tar.gz", hash = "sha256:7e4e84597de21eeaeeaaa7cc5da08c61c48a9b64d0c446b2d71255d01812887a"},
]
[package.dependencies]
Django = ">=2.2"
[[package]]
name = "jsonschema"
version = "4.17.3"
@ -3376,4 +3450,4 @@ files = [
[metadata]
lock-version = "2.0"
python-versions = "^3.11"
content-hash = "ea4879ce74181cb2075bea3aa09b0d233047801866150a92426840b645b02567"
content-hash = "c163862a492e9f69cff2fa7d414523161eb4d30d3b0a360c80179243115fb75e"

View File

@ -60,6 +60,9 @@ sentry-sdk = "^1.12.0"
django-anymail = {extras = ["mailgun"], version = "^8.6"}
psycopg2-binary = "^2.9.5"
django-polymorphic = "^3.1.0"
django-jazzmin = "^2.6.0"
django-cacheops = "^6.1"
django-extra-settings = "^0.7.0"
[build-system]