diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9960ea88b6e4732e99e45a484065c94c61ef605a..e5654666e1d9c9a0de03a4b7ecdc2b796a9f1960 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: docker: stage: docker - image: docker:23 + image: docker:24 services: - docker:dind before_script: diff --git a/core/settings.py b/core/settings.py index bd70adb4a7be64dd6c81503bbd5937b575981746..912e93d6d3226c15a82756cb816c190544a8e309 100644 --- a/core/settings.py +++ b/core/settings.py @@ -131,7 +131,7 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" LOGIN_REDIRECT_URL = "/" LOGOUT_REDIRECT_URL = "/" -EMAIL_BACKEND = "django.mail.backends.smtp.EmailBackend" +EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend" EMAIL_USE_TLS = True EMAIL_HOST = env.get("EMAIL_HOST") EMAIL_HOST_USER = env.get("EMAIL_USER") diff --git a/renovate.json b/renovate.json index f9d887136aeb35238b5ff87dc4ba1222dc9ac92f..ad6004beadbd24efbccf6f71beeeff5c4bca6c50 100644 --- a/renovate.json +++ b/renovate.json @@ -19,7 +19,6 @@ } ], "dependencyDashboard": true, - "dependencyDashboardAutoclose": true, "extends": [ "config:base", "github>whitesource/merge-confidence:beta", diff --git a/requirements.txt b/requirements.txt index 17c6176b9065fa547b3057720bcff2958b079e60..ec32f7fb9597ea3d16cca1a2754602951883b00c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ Django==4.2.1 -whitenoise==6.4.0 -gunicorn==20.1.0 \ No newline at end of file +whitenoise==6.5.0 +gunicorn==21.2.0 \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 830b0399f7b7424658e7414ac3d56531482a3db7..98ce67113dd5b1f1873f67cba2073c262c5a8b3b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,9 +7,10 @@ <title>{% block title %}Core{% endblock %}</title> <link href="{% static 'core/css/output.css' %}" rel="stylesheet" type="text/css"> {# <meta http-equiv="refresh" content="10">#} + {% block head %}{% endblock %} </head> <body> -<div class="navbar mb-2 shadow-lg bg-neutral text-neutral-content rounded-box"> +<div class="navbar shadow-lg bg-neutral text-neutral-content rounded-box max-h-24 mb-3.5"> <div class="flex-none lg:hidden"> <label for="my-drawer-3" class="btn btn-square btn-ghost"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" @@ -20,7 +21,7 @@ </label> </div> <div class="flex-1 px-2 mx-2 navbar-start"> - <a href="{% url 'home_view' %}" class="text-lg font-bold"> + <a href="{% url 'home_view' %}" class="text-lg font-bold align-middle"> {% block home_logo %}DaisyUI{% endblock %} </a> </div> @@ -52,23 +53,22 @@ </div> </div> </div> -<div class="drawer drawer-mobile"> +<div class="drawer drawer-mobile pt-20" style="margin-top:-5rem;"> <input id="my-drawer-3" type="checkbox" class="drawer-toggle"/> <div class="drawer-content flex flex-col"> <!-- Navbar --> <!-- Page content here --> <main> - <div class="p-4 lg:pl-0"> + <div class="p-4 mb-20 lg:mb-0"> {% block content %} {% endblock %} </div> </main> </div> - <div class="drawer-side sm:shadow-lg sm:rounded-box m-4"> + <div class="drawer-side shadow-lg rounded-box lg:ml-4"> <label for="my-drawer-3" class="drawer-overlay"></label> - <ul class="menu p-4 w-fit m-w-xs bg-base-100"> - <!-- Sidebar content here --> + <ul class="menu p-4 w-fit m-w-xs mb-20 lg:mb-0 bg-base-100"> {% block sidebar_list %} <li><a>Sidebar Item 1</a></li> <li><a>Sidebar Item 2</a></li>