From 2e855d6f23ec6651c51055e875fd80765acafc25 Mon Sep 17 00:00:00 2001 From: nickmwangemi Date: Mon, 22 Jan 2024 22:41:29 +0300 Subject: [PATCH 1/6] Setup civlii --- civlii/__init__.py | 0 civlii/apps.py | 6 +++ civlii/settings.py | 15 +++++++ civlii/static/stylesheets/_variables.scss | 1 + civlii/static/stylesheets/civlii.scss | 10 +++++ civlii/templates/liiweb/home.html | 10 +++++ civlii/templates/peachjam/_header.html | 33 ++++++++++++++ civlii/templates/peachjam/about.html | 50 +++++++++++++++++++++ civlii/templates/peachjam/layouts/main.html | 7 +++ civlii/templates/peachjam/terms_of_use.html | 8 ++++ 10 files changed, 140 insertions(+) create mode 100644 civlii/__init__.py create mode 100644 civlii/apps.py create mode 100644 civlii/settings.py create mode 100644 civlii/static/stylesheets/_variables.scss create mode 100644 civlii/static/stylesheets/civlii.scss create mode 100644 civlii/templates/liiweb/home.html create mode 100644 civlii/templates/peachjam/_header.html create mode 100644 civlii/templates/peachjam/about.html create mode 100644 civlii/templates/peachjam/layouts/main.html create mode 100644 civlii/templates/peachjam/terms_of_use.html diff --git a/civlii/__init__.py b/civlii/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/civlii/apps.py b/civlii/apps.py new file mode 100644 index 000000000..4c50f26c9 --- /dev/null +++ b/civlii/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class CIVLIIConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "civlii" diff --git a/civlii/settings.py b/civlii/settings.py new file mode 100644 index 000000000..a87cbc987 --- /dev/null +++ b/civlii/settings.py @@ -0,0 +1,15 @@ +from django.utils.translation import gettext_lazy as _ + +from liiweb.settings import * # noqa + +INSTALLED_APPS = ["civlii.apps.CIVLIIConfig"] + INSTALLED_APPS # noqa + + +JAZZMIN_SETTINGS["site_title"] = "CIVLII" # noqa +JAZZMIN_SETTINGS["site_header"] = "CIVLII" # noqa +JAZZMIN_SETTINGS["site_brand"] = "civlii.laws.africa" # noqa + +LANGUAGES = [ + ("en", _("English")), + ("fr", _("French")), +] diff --git a/civlii/static/stylesheets/_variables.scss b/civlii/static/stylesheets/_variables.scss new file mode 100644 index 000000000..f11ab0c22 --- /dev/null +++ b/civlii/static/stylesheets/_variables.scss @@ -0,0 +1 @@ +$primary: #326fd1; diff --git a/civlii/static/stylesheets/civlii.scss b/civlii/static/stylesheets/civlii.scss new file mode 100644 index 000000000..3bda1445e --- /dev/null +++ b/civlii/static/stylesheets/civlii.scss @@ -0,0 +1,10 @@ +@import "variables"; +@import "stylesheets/liiweb"; + +footer { + background-color: $gray-100; +} + +.btn.btn-primary { + color: #fff; +} diff --git a/civlii/templates/liiweb/home.html b/civlii/templates/liiweb/home.html new file mode 100644 index 000000000..4f9c8090b --- /dev/null +++ b/civlii/templates/liiweb/home.html @@ -0,0 +1,10 @@ +{% extends "liiweb/home.html" %} +{% load i18n static %} +{% block hero-headings %} +

{% trans "Welcome to the Côte d'Ivoire Legal Information Institute" %}

+

+ {% blocktrans trimmed %} + Free access to the law of Côte d'Ivoire. CIVLII is a member of the community of African LIIs and of the Free Access to Law Movement. + {% endblocktrans %} +

+{% endblock %} diff --git a/civlii/templates/peachjam/_header.html b/civlii/templates/peachjam/_header.html new file mode 100644 index 000000000..4a9be3dc1 --- /dev/null +++ b/civlii/templates/peachjam/_header.html @@ -0,0 +1,33 @@ +{% extends 'peachjam/_header.html' %} +{% load static i18n %} +{% block top-bar %}{% endblock %} +{% block navbar-logo %} + {{ APP_NAME }} + CIVLII +{% endblock %} +{% block nav-items %} +
  • + + {% trans 'Judgments' %} + +
    • +
  • + + {% trans 'Legislation' %} + +
    • +
  • + + {% trans 'Gazettes' %} + +
    • +
  • + + {% trans 'About' %} + +
    • +{% endblock %} diff --git a/civlii/templates/peachjam/about.html b/civlii/templates/peachjam/about.html new file mode 100644 index 000000000..52478844c --- /dev/null +++ b/civlii/templates/peachjam/about.html @@ -0,0 +1,50 @@ +{% extends "peachjam/layouts/main.html" %} +{% load i18n %} +{% block title %} + {% trans 'About' %} +{% endblock %} +{% block page-content %} +
    +
    +

    {% trans 'About CIVLII' %}

    +

    + {% blocktrans trimmed %} + CIVLII is a member of the community of African LIIs and of the Free Access to Law Movement. + {% endblocktrans %} +

    +

    AfricanLII

    +

    + {% blocktrans trimmed %} + AfricanLII is a part of the + Democratic + Governance and Rights Unit at the Faculty of Law, University of Cape Town + (UCT), South Africa. AfricanLII helps individuals, organizations, and governments build and maintain sustainable + free access to law portals, and reach the people of Africa and beyond. + {% endblocktrans %} +

    +

    Laws.Africa

    +

    + {% blocktrans trimmed %} + Laws.Africa is a South Africa + non-profit organisation that digitises African legal information for public use. + Open access to digital African legal information helps communities to thrive, businesses to succeed, and judicial + officers and civil servants to deliver services efficiently and effectively. + {% endblocktrans %} +

    +

    {% trans 'Contact us' %}

    +
    + {% blocktrans trimmed %} +
    + info@laws.africa +
    +
    + facebook.com/africanlii +
    +
    + twitter.com/AfricanLII +
    + {% endblocktrans %} +
    +
    +
    +{% endblock %} diff --git a/civlii/templates/peachjam/layouts/main.html b/civlii/templates/peachjam/layouts/main.html new file mode 100644 index 000000000..d176e1b9f --- /dev/null +++ b/civlii/templates/peachjam/layouts/main.html @@ -0,0 +1,7 @@ +{% extends "peachjam/layouts/main.html" %} +{% load sass_tags %} +{% block head-css %} + +{% endblock %} diff --git a/civlii/templates/peachjam/terms_of_use.html b/civlii/templates/peachjam/terms_of_use.html new file mode 100644 index 000000000..e923f0a44 --- /dev/null +++ b/civlii/templates/peachjam/terms_of_use.html @@ -0,0 +1,8 @@ +{% extends "peachjam/terms_of_use.html" %} +{% block terms-of-use-content %} + {% with organisation_name="CIVLII" org_link_text="https://civlii.laws.africa/" robots_link_text="https://civlii.laws.africa/robots.txt" contact_email="info@laws.africa" %} + {% with who_are_we="CIVLII is a member of the community of African LIIs and of the Free Access to Law Movement." %} + {% include "peachjam/_terms_of_use_content.html" %} + {% endwith %} + {% endwith %} +{% endblock %} From 592022f9c64c693847bf03b28340cc8906e8e3e7 Mon Sep 17 00:00:00 2001 From: nickmwangemi Date: Mon, 22 Jan 2024 22:50:16 +0300 Subject: [PATCH 2/6] Update footers --- africanlii/templates/peachjam/_footer.html | 3 +++ civlii/settings.py | 2 +- liiweb/templates/peachjam/_footer.html | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/africanlii/templates/peachjam/_footer.html b/africanlii/templates/peachjam/_footer.html index feb27f490..3667c1b25 100644 --- a/africanlii/templates/peachjam/_footer.html +++ b/africanlii/templates/peachjam/_footer.html @@ -56,6 +56,9 @@
    {% trans 'About' %} {{ APP_NAME }}
    AfricanLII
    +
    + CIVLII +
    GhaLII
    diff --git a/civlii/settings.py b/civlii/settings.py index a87cbc987..37277a2d2 100644 --- a/civlii/settings.py +++ b/civlii/settings.py @@ -10,6 +10,6 @@ JAZZMIN_SETTINGS["site_brand"] = "civlii.laws.africa" # noqa LANGUAGES = [ - ("en", _("English")), ("fr", _("French")), + ("en", _("English")), ] diff --git a/liiweb/templates/peachjam/_footer.html b/liiweb/templates/peachjam/_footer.html index 702cf9224..f065b7045 100644 --- a/liiweb/templates/peachjam/_footer.html +++ b/liiweb/templates/peachjam/_footer.html @@ -39,6 +39,9 @@
    {% trans 'Other African Legal Information Institutions' %}
    AfricanLII
    +
    + CIVLII +
    GhaLII
    From 1c9e651636c2a2548f437411a5fdd3c2e7fa83bf Mon Sep 17 00:00:00 2001 From: nickmwangemi Date: Wed, 24 Jan 2024 08:10:12 +0300 Subject: [PATCH 3/6] Remove gazettes navbar link --- civlii/templates/peachjam/_header.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/civlii/templates/peachjam/_header.html b/civlii/templates/peachjam/_header.html index 4a9be3dc1..7eda45525 100644 --- a/civlii/templates/peachjam/_header.html +++ b/civlii/templates/peachjam/_header.html @@ -18,12 +18,6 @@ {% trans 'Legislation' %} -
  • - - {% trans 'Gazettes' %} - -
  • From 33bfc6a9bdd5d632055829d79ae2c6c4f3117a59 Mon Sep 17 00:00:00 2001 From: nickmwangemi Date: Wed, 24 Jan 2024 08:12:20 +0300 Subject: [PATCH 4/6] Remove civlii from footer links --- africanlii/templates/peachjam/_footer.html | 3 --- liiweb/templates/peachjam/_footer.html | 3 --- 2 files changed, 6 deletions(-) diff --git a/africanlii/templates/peachjam/_footer.html b/africanlii/templates/peachjam/_footer.html index 3667c1b25..feb27f490 100644 --- a/africanlii/templates/peachjam/_footer.html +++ b/africanlii/templates/peachjam/_footer.html @@ -56,9 +56,6 @@
    {% trans 'About' %} {{ APP_NAME }}
    AfricanLII
    -
    - CIVLII -
    GhaLII
    diff --git a/liiweb/templates/peachjam/_footer.html b/liiweb/templates/peachjam/_footer.html index f065b7045..702cf9224 100644 --- a/liiweb/templates/peachjam/_footer.html +++ b/liiweb/templates/peachjam/_footer.html @@ -39,9 +39,6 @@
    {% trans 'Other African Legal Information Institutions' %}
    AfricanLII
    -
    - CIVLII -
    GhaLII
    From 68529dbbf8feee0b0c000b21017c9215241c461b Mon Sep 17 00:00:00 2001 From: nickmwangemi Date: Mon, 29 Jan 2024 10:14:33 +0300 Subject: [PATCH 5/6] Add cote d'ivoire to resolver mappings --- peachjam/resolver.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/peachjam/resolver.py b/peachjam/resolver.py index c92900812..b2006757a 100644 --- a/peachjam/resolver.py +++ b/peachjam/resolver.py @@ -7,6 +7,10 @@ class RedirectResolver: "country_code": "aa", "domain": "africanlii.org", }, + "civlii": { + "country_code": "ci", + "domain": "civlii.laws.africa", + }, "eswatinilii": { "country_code": "sz", "domain": "eswatinilii.org", From e88b0922f55a8b81189cf9a84aeed5ca35b20624 Mon Sep 17 00:00:00 2001 From: nickmwangemi Date: Mon, 29 Jan 2024 11:26:25 +0300 Subject: [PATCH 6/6] Add deployemt workflow for civlii --- .github/workflows/deploy.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 338da6cf5..09a91c65f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -350,10 +350,26 @@ jobs: git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/mauritiuslii-peachjam' git_push_flags: '--force' + deploy-civlii: + if: ${{ !cancelled() }} + needs: deploy-mauritiuslii + name: Deploy to civlii + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: git push to civlii.laws.africa + uses: dokku/github-action@master + with: + ssh_private_key: ${{ secrets.SSH_DEPLOYMENT_KEY }} + git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/civlii-peachjam' + git_push_flags: '--force' deploy-lii: if: ${{ !cancelled() }} - needs: deploy-mauritiuslii + needs: deploy-civlii name: Deploy to lii runs-on: ubuntu-latest steps: