From d52f2cb957a9e37c8523de4def6f4898797b6182 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Fri, 7 Jun 2024 10:51:38 +0200 Subject: [PATCH 1/6] [#21] display version in admin --- src/openklant/utils/context_processors.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openklant/utils/context_processors.py b/src/openklant/utils/context_processors.py index 1ad23a8f..de54f75c 100644 --- a/src/openklant/utils/context_processors.py +++ b/src/openklant/utils/context_processors.py @@ -8,6 +8,7 @@ def settings(request): "SITE_TITLE", "PROJECT_NAME", "VNG_COMPONENTS_BRANCH", + "ENVIRONMENT_SHOWN_IN_ADMIN", "RELEASE", "GIT_SHA", ) From 81f75708883f21bfe212f7aa1375d7255d33ea5f Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Thu, 20 Jun 2024 17:02:29 +0200 Subject: [PATCH 2/6] [#21] reuse open-api-framework admin template --- src/openklant/scss/admin/_admin_theme.scss | 43 +++----------------- src/openklant/templates/admin/base_site.html | 19 +-------- 2 files changed, 7 insertions(+), 55 deletions(-) diff --git a/src/openklant/scss/admin/_admin_theme.scss b/src/openklant/scss/admin/_admin_theme.scss index 965d9660..70b0a28a 100644 --- a/src/openklant/scss/admin/_admin_theme.scss +++ b/src/openklant/scss/admin/_admin_theme.scss @@ -46,6 +46,12 @@ DO NOT PUT ANY TARGET APP-SPECIFIC RULES HERE. --object-tools-bg: #888; --object-tools-hover-bg: #{$color_dark}; + // version styling + --version-fg: #{$color-secondary-dark}; + + // environment styling + --environment-button-fg: #{$color-secondary}; + // custom variables --form-input-bg: var(--body-bg); --react-tab-border-color: #{$color-secondary-dark}; @@ -263,43 +269,6 @@ div.breadcrumbs { background: none !important; } -/* Footer */ -.login .version { - text-align: center; -} -.version { - padding: 0 30px; - color: $color_secondary_dark; - font-size: smaller; -} - -#footer { - display: flex; - justify-content: space-between; - align-items: center; -} - -/** - * Environment banner - */ -.env { - display: block; - line-height: 35px; - text-align: center; - font-weight: bold; - text-transform: uppercase; - color: $color_secondary; - background-color: $color_dark; - position: fixed; - top: 0; - height: 35px; - width: 300px; - left: 50%; - margin-left: -150px; - z-index: 1000001; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2); -} - /** * Django form field lengths */ diff --git a/src/openklant/templates/admin/base_site.html b/src/openklant/templates/admin/base_site.html index d8351cb1..2e2befad 100644 --- a/src/openklant/templates/admin/base_site.html +++ b/src/openklant/templates/admin/base_site.html @@ -1,4 +1,4 @@ -{% extends "admin/base.html" %} +{% extends "open_api_framework/admin/base_site.html" %} {% load i18n static %} {% block title %}{{ title }} | {{ settings.PROJECT_NAME }}{% endblock %} @@ -30,20 +30,3 @@

{{ settings.PROJECT_NAME }} {% endblock %} {% block nav-global %}{% endblock %} - -{% block messages %} - {% if settings.ENVIRONMENT_SHOWN_IN_ADMIN %} -
{{ settings.ENVIRONMENT }}
- {% endif %} - {{ block.super }} -{% endblock %} - -{% block footer %} - -{% endblock %} From 10da8923b5d8d2ec6ed9cfc40d56cfb45e9185c1 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Thu, 20 Jun 2024 17:08:43 +0200 Subject: [PATCH 3/6] [#21] add git package Note that this package should be removed whenever open-api-framework has a new release --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 7a4be92d..a54ed49b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco git \ build-essential \ libpq-dev \ + git \ && rm -rf /var/lib/apt/lists/* WORKDIR /app From 9c3c374bf509f270a3691f47242c07feeb993004 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Mon, 24 Jun 2024 11:22:38 +0200 Subject: [PATCH 4/6] [#21] update open-api-framework version --- src/openklant/scss/admin/_admin_theme.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openklant/scss/admin/_admin_theme.scss b/src/openklant/scss/admin/_admin_theme.scss index 70b0a28a..3632b891 100644 --- a/src/openklant/scss/admin/_admin_theme.scss +++ b/src/openklant/scss/admin/_admin_theme.scss @@ -46,12 +46,6 @@ DO NOT PUT ANY TARGET APP-SPECIFIC RULES HERE. --object-tools-bg: #888; --object-tools-hover-bg: #{$color_dark}; - // version styling - --version-fg: #{$color-secondary-dark}; - - // environment styling - --environment-button-fg: #{$color-secondary}; - // custom variables --form-input-bg: var(--body-bg); --react-tab-border-color: #{$color-secondary-dark}; @@ -62,6 +56,12 @@ DO NOT PUT ANY TARGET APP-SPECIFIC RULES HERE. --input-group-text-bg: #{$color-secondary-dark}; --input-group-text-fg: #{$color-dark}; --formio-dropdown-highlighted-bg: #f2f2f2; + + // version styling + --version-fg: var(--body-quiet-color); + + // environment styling + --env-button-fg: #{$color-secondary}; } @media (prefers-color-scheme: dark) { From 40b49e4556f50acae46f09eb636437f0dcce0445 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Thu, 27 Jun 2024 16:55:53 +0200 Subject: [PATCH 5/6] [#21] pin `open-api-framework` to `0.5.0` --- requirements/base.txt | 4 +++- requirements/ci.txt | 7 ++++++- requirements/dev.txt | 7 ++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 4466244d..cd35807e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,6 +14,8 @@ asgiref==3.8.1 # django-cors-headers asn1crypto==1.5.1 # via webauthn +async-timeout==4.0.3 + # via redis attrs==23.2.0 # via # glom @@ -227,7 +229,7 @@ mozilla-django-oidc-db==0.15.0 # via open-api-framework notifications-api-common==0.2.2 # via commonground-api-common -open-api-framework==0.4.2 +open-api-framework==0.5.0 # via -r requirements/base.in orderedmultidict==1.0.1 # via furl diff --git a/requirements/ci.txt b/requirements/ci.txt index ed9537de..34d414d1 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -29,6 +29,11 @@ asn1crypto==1.5.1 # webauthn astroid==3.1.0 # via pylint +async-timeout==4.0.3 + # via + # -c requirements/base.txt + # -r requirements/base.txt + # redis attrs==23.2.0 # via # -c requirements/base.txt @@ -479,7 +484,7 @@ notifications-api-common==0.2.2 # -c requirements/base.txt # -r requirements/base.txt # commonground-api-common -open-api-framework==0.4.2 +open-api-framework==0.5.0 # via # -c requirements/base.txt # -r requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index bbe660b0..ee25f1c6 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -35,6 +35,11 @@ astroid==3.1.0 # -c requirements/ci.txt # -r requirements/ci.txt # pylint +async-timeout==4.0.3 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt + # redis attrs==23.2.0 # via # -c requirements/ci.txt @@ -539,7 +544,7 @@ notifications-api-common==0.2.2 # -c requirements/ci.txt # -r requirements/ci.txt # commonground-api-common -open-api-framework==0.4.2 +open-api-framework==0.5.0 # via # -c requirements/ci.txt # -r requirements/ci.txt From dcddca1bed5a833e916b6e29b2edbd9638c3dc13 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Tue, 16 Jul 2024 12:33:54 +0200 Subject: [PATCH 6/6] [#21] remove git for docker setup Was previously used to pin `open-api-framework` with a git commit hash and thereby let CI pass --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a54ed49b..7a4be92d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,6 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco git \ build-essential \ libpq-dev \ - git \ && rm -rf /var/lib/apt/lists/* WORKDIR /app