From 0837d77c06a9a3d410a01c88b9f2c07ca1bc815e Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Mon, 14 Aug 2023 14:09:42 +0200 Subject: [PATCH 1/2] remove senlii; add open by-laws microsites; checkout v3 --- .github/workflows/deploy.yml | 72 ++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b47ed918f..802def464 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,7 +12,7 @@ jobs: name: Deploy to africanlii.org runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -27,7 +27,7 @@ jobs: name: Deploy to lawlibrary runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -38,30 +38,13 @@ jobs: git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/lawlibrary-peachjam' git_push_flags: '--force' - deploy-senlii: - if: ${{ always() }} - needs: deploy-eswatinilii - name: Deploy to senlii - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: git push to senlii.org - uses: dokku/github-action@master - with: - ssh_private_key: ${{ secrets.SSH_DEPLOYMENT_KEY }} - git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/senlii-peachjam' - git_push_flags: '--force' - deploy-ulii: if: ${{ always() }} needs: deploy-agp name: Deploy to ulii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -78,7 +61,7 @@ jobs: name: Deploy to zanzibarlii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -93,7 +76,7 @@ jobs: name: Deploy to malawilii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -110,7 +93,7 @@ jobs: name: Deploy to ghalii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -127,7 +110,7 @@ jobs: name: Deploy to zambialii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -146,7 +129,7 @@ jobs: name: Deploy to namiblii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -164,7 +147,7 @@ jobs: name: Deploy to seylii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -182,7 +165,7 @@ jobs: name: Deploy to lesotholii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -200,7 +183,7 @@ jobs: name: Deploy to sierralii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -219,7 +202,7 @@ jobs: name: Deploy to zimlii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -237,7 +220,7 @@ jobs: name: Deploy to tcilii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -254,7 +237,7 @@ jobs: name: Deploy to tanzlii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -271,7 +254,7 @@ jobs: name: Deploy to eswatinilii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -288,7 +271,7 @@ jobs: name: Deploy to nigerialii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -305,7 +288,7 @@ jobs: name: Deploy to open-by-laws runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -316,13 +299,30 @@ jobs: git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/open-by-laws' git_push_flags: '--force' + deploy-obl-microsites: + if: ${{ always() }} + needs: deploy-open-by-laws + name: Deploy to open by-laws microsites + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: git push to openbylaws.org.za + uses: dokku/github-action@master + with: + ssh_private_key: ${{ secrets.SSH_DEPLOYMENT_KEY }} + git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/obl-microsites' + git_push_flags: '--force' + deploy-lii: if: ${{ always() }} - needs: deploy-senlii + needs: deploy-eswatinilii name: Deploy to lii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 From d0776b00a1f9b09ba39cd33ac97ec005d7691032 Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Mon, 14 Aug 2023 14:11:01 +0200 Subject: [PATCH 2/2] remove senlii files --- africanlii/settings.py | 1 - peachjam/views/documents.py | 4 -- senlii/__init__.py | 0 senlii/apps.py | 6 -- senlii/locale/en/LC_MESSAGES/django.mo | Bin 380 -> 0 bytes senlii/locale/en/LC_MESSAGES/django.po | 75 -------------------- senlii/locale/fr/LC_MESSAGES/django.mo | Bin 1230 -> 0 bytes senlii/locale/fr/LC_MESSAGES/django.po | 75 -------------------- senlii/locale/pt/LC_MESSAGES/django.mo | Bin 1229 -> 0 bytes senlii/locale/pt/LC_MESSAGES/django.po | 75 -------------------- senlii/locale/sw/LC_MESSAGES/django.mo | Bin 1226 -> 0 bytes senlii/locale/sw/LC_MESSAGES/django.po | 75 -------------------- senlii/settings.py | 21 ------ senlii/static/stylesheets/_variables.scss | 1 - senlii/static/stylesheets/senlii.scss | 10 --- senlii/templates/liiweb/home.html | 21 ------ senlii/templates/peachjam/_header.html | 36 ---------- senlii/templates/peachjam/layouts/main.html | 7 -- senlii/templates/senlii/home.html | 5 -- senlii/urls.py | 8 --- senlii/views/__init__.py | 1 - senlii/views/home.py | 14 ---- 22 files changed, 435 deletions(-) delete mode 100644 senlii/__init__.py delete mode 100644 senlii/apps.py delete mode 100644 senlii/locale/en/LC_MESSAGES/django.mo delete mode 100644 senlii/locale/en/LC_MESSAGES/django.po delete mode 100644 senlii/locale/fr/LC_MESSAGES/django.mo delete mode 100644 senlii/locale/fr/LC_MESSAGES/django.po delete mode 100644 senlii/locale/pt/LC_MESSAGES/django.mo delete mode 100644 senlii/locale/pt/LC_MESSAGES/django.po delete mode 100644 senlii/locale/sw/LC_MESSAGES/django.mo delete mode 100644 senlii/locale/sw/LC_MESSAGES/django.po delete mode 100644 senlii/settings.py delete mode 100644 senlii/static/stylesheets/_variables.scss delete mode 100644 senlii/static/stylesheets/senlii.scss delete mode 100644 senlii/templates/liiweb/home.html delete mode 100644 senlii/templates/peachjam/_header.html delete mode 100644 senlii/templates/peachjam/layouts/main.html delete mode 100644 senlii/templates/senlii/home.html delete mode 100644 senlii/urls.py delete mode 100644 senlii/views/__init__.py delete mode 100644 senlii/views/home.py diff --git a/africanlii/settings.py b/africanlii/settings.py index dc0f66a6a..942678e70 100644 --- a/africanlii/settings.py +++ b/africanlii/settings.py @@ -15,7 +15,6 @@ "lesotholii", "malawilii", "namiblii", - "senlii", "seylii", "sierralii", "tanzlii", diff --git a/peachjam/views/documents.py b/peachjam/views/documents.py index 55c053e1f..42e9c3d60 100644 --- a/peachjam/views/documents.py +++ b/peachjam/views/documents.py @@ -50,10 +50,6 @@ class RedirectResolver: "place_code": [], "domain": "openbylaws.org.za", }, - "senlii": { - "country_code": "sn", - "domain": "senlii.org", - }, "seylii": { "country_code": "sc", "domain": "seylii.org", diff --git a/senlii/__init__.py b/senlii/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/senlii/apps.py b/senlii/apps.py deleted file mode 100644 index 8ae3f22a0..000000000 --- a/senlii/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class SenLIIConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" - name = "senlii" diff --git a/senlii/locale/en/LC_MESSAGES/django.mo b/senlii/locale/en/LC_MESSAGES/django.mo deleted file mode 100644 index 71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmYL@K~KUk7=|%=+R?Lz&%}d9i{c3jGZa>EvE7z2Nc2{r&Y96JZ6W$Y{CoZuJ5A(G zp7i_Dx9RhJeDu}vIq;l#&OC>nD^HugXY4QU{MmN?lNtRkR}RH%w3NnHT4Bh@vF%H^(V-=Ii1iQ$Qo9Pt!I1Rhe%oml#`f^NEGFCKEL->Rc=KoQ6a?!10%_7(V7ey8`V`;n{war z20Z3;uifk31QV^CRQ|iq#``$=;jWunRB8aLH({)F;i8zL{=V00y-I_qTIqGAN(}v% i$^}`yHKImSZ8jEzYJOK6-VWez49^vuhS0kh1f3tbb!oc* diff --git a/senlii/locale/en/LC_MESSAGES/django.po b/senlii/locale/en/LC_MESSAGES/django.po deleted file mode 100644 index 7671f3bb2..000000000 --- a/senlii/locale/en/LC_MESSAGES/django.po +++ /dev/null @@ -1,75 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-11 14:05+0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: settings.py:12 -msgid "French" -msgstr "" - -#: settings.py:13 -msgid "English" -msgstr "" - -#: templates/liiweb/home.html:6 -msgid "Recent Judgments" -msgstr "" - -#: templates/liiweb/home.html:7 -msgid "View more judgments" -msgstr "" - -#: templates/liiweb/home.html:11 -msgid "Recent Legislation" -msgstr "" - -#: templates/liiweb/home.html:12 -msgid "View more legislation" -msgstr "" - -#: templates/liiweb/home.html:16 -msgid "Recent Articles" -msgstr "" - -#: templates/liiweb/home.html:18 -msgid "View more articles" -msgstr "" - -#: templates/peachjam/_header.html:9 -msgid "Judgments" -msgstr "" - -#: templates/peachjam/_header.html:15 -msgid "Legislation" -msgstr "" - -#: templates/peachjam/_header.html:21 -msgid "Taxonomy" -msgstr "" - -#: templates/peachjam/_header.html:27 -msgid "Articles" -msgstr "" - -#: templates/peachjam/_header.html:33 -msgid "About" -msgstr "" - -#: templates/senlii/home.html:4 -msgid "Home" -msgstr "" diff --git a/senlii/locale/fr/LC_MESSAGES/django.mo b/senlii/locale/fr/LC_MESSAGES/django.mo deleted file mode 100644 index 238932407bfe32b44e6ed62e9dc278e33ae419ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1230 zcma))&2AGh5XTLaLYMMYz69#Q2P8nkO?F$FvQ?2nnm|!1sx+;*Rqn>wINGcudqdj` z>J1JYfg2Yts8_@r@$8(7mP z@PW0!)1U;;f(kqX?t_!yAvgiP2B*Nc;5qOEXmfr7FM(gc8L$u9Jm1pu5AX`kzrbtY z3`u2&IX5B2`RkB7l#MBGYqrIdzQ3)cL-ORp)?g zOR+~gN(;(|%9*P@(#w3&nDT~JZ4o4Ft--d1Hh7Fr=O6BR&Bl^&o1Q2%7xUb6xz}ti z~t`*t!X2gFWtrhSil%osH+LCSFRLgst*K_|(gL^DO^>xr;Pk@LkWT za+9#S=CQ3@X#`by9QJr9SY7arPmg;w^7^!?cPce!eQmv*JPlY>fT#+Ua*o@dkAG|)BdAV|HQDhRi7@5y+D;;xJWQ4ME9aNMvB95fY zMJnKt$cZ>tE$ytAH#dt<%A2`H8x2%*UG-P+K*&YQN&k>`wdyL9O=c03$)&+$^0@!m z?utRs6Eeblh9aHM{!uod!^xz&e`H71WEV46bu41&6(pTgDaf{x+IH2@#+__bGpC^K Nk^0zOL8Gz6 1);\n" -"X-Crowdin-Project: 39b2fd8e1f2e7f60a21a2ff40372741a\n" -"X-Crowdin-Project-ID: 4\n" -"X-Crowdin-Language: fr\n" -"X-Crowdin-File: /main/senlii/locale/en/LC_MESSAGES/django.po\n" -"X-Crowdin-File-ID: 112\n" - -#: settings.py:12 -msgid "French" -msgstr "Français" - -#: settings.py:13 -msgid "English" -msgstr "Anglais" - -#: templates/liiweb/home.html:6 -msgid "Recent Judgments" -msgstr "Jugements récents" - -#: templates/liiweb/home.html:7 -msgid "View more judgments" -msgstr "Voir plus de jugements" - -#: templates/liiweb/home.html:11 -msgid "Recent Legislation" -msgstr "Législation récente" - -#: templates/liiweb/home.html:12 -msgid "View more legislation" -msgstr "Voir plus de législation" - -#: templates/liiweb/home.html:16 -msgid "Recent Articles" -msgstr "Articles récents" - -#: templates/liiweb/home.html:18 -msgid "View more articles" -msgstr "Voir plus d'articles" - -#: templates/peachjam/_header.html:9 -msgid "Judgments" -msgstr "Jugements" - -#: templates/peachjam/_header.html:15 -msgid "Legislation" -msgstr "Législation" - -#: templates/peachjam/_header.html:21 -msgid "Taxonomy" -msgstr "Taxonomie" - -#: templates/peachjam/_header.html:27 -msgid "Articles" -msgstr "Articles" - -#: templates/peachjam/_header.html:33 -msgid "About" -msgstr "À propos" - -#: templates/senlii/home.html:4 -msgid "Home" -msgstr "Accueil" - diff --git a/senlii/locale/pt/LC_MESSAGES/django.mo b/senlii/locale/pt/LC_MESSAGES/django.mo deleted file mode 100644 index 6ef626898b9db8f9003c279baae04eb88d4c1e54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1229 zcma))J#Q015QY~B0gmvY076137STYlv3(A4xX3~wvBAg|R%{{~6s^ze^IGR!>-J2N zjxG%i63`P0BuW~7fd2y}l=S=p-aVf`1PvqYJ-c%|^UjXu$MV8^0=t5>g7psTCf3p^ zd|+MhEGWVApa#!@hu|Xk8e9O6!3*FU@FMsDv^h_}tKe5~861H&&-e8F6TF7=Z}0}V zc$$!3*sp+AcLB+*o|AGJwDGq`y)tlhl$E?z3dm=I@#-sTMEw|I&5V?*k3Z3;VcXQnBbk?%@f?HV2 zac5TybQH6i31pi+8U}_nwMU)$Gqx*UNt=Z2@K|`%&ANG(z0Y#%G+Xd;u2bbEX3dBz z`*Iy2sLE9^rJOtsg-6$=2o-LwpKCv#+pY1h{fVC z&J02>)h6}3JTf9KK5v%U#_XOI?udw$l&{-T1s>gK$=Iof!-$8htfRj1s2U_kQ*<}! zcw4-y=Py9$lNuHEDu<>YTeQL%b`~$CENfs8GsG zsC^!aj8K{C_I|C@Xly+$H8SlUx~NwN`mf+bD2Kk2hHgb78O=Z&Qo&@7z8Fj~{! TfwlEa9lbf-sWY9|aRGk-smMP8 diff --git a/senlii/locale/pt/LC_MESSAGES/django.po b/senlii/locale/pt/LC_MESSAGES/django.po deleted file mode 100644 index 704aa6692..000000000 --- a/senlii/locale/pt/LC_MESSAGES/django.po +++ /dev/null @@ -1,75 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-11 14:05+0300\n" -"PO-Revision-Date: 2023-05-16 07:12\n" -"Last-Translator: \n" -"Language-Team: Portuguese\n" -"Language: pt_PT\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Crowdin-Project: 39b2fd8e1f2e7f60a21a2ff40372741a\n" -"X-Crowdin-Project-ID: 4\n" -"X-Crowdin-Language: pt\n" -"X-Crowdin-File: /main/senlii/locale/en/LC_MESSAGES/django.po\n" -"X-Crowdin-File-ID: 112\n" - -#: settings.py:12 -msgid "French" -msgstr "Francês" - -#: settings.py:13 -msgid "English" -msgstr "Inglês" - -#: templates/liiweb/home.html:6 -msgid "Recent Judgments" -msgstr "Julgamentos Recentes" - -#: templates/liiweb/home.html:7 -msgid "View more judgments" -msgstr "Ver mais julgamentos" - -#: templates/liiweb/home.html:11 -msgid "Recent Legislation" -msgstr "Legislação recente" - -#: templates/liiweb/home.html:12 -msgid "View more legislation" -msgstr "Ver mais legislação" - -#: templates/liiweb/home.html:16 -msgid "Recent Articles" -msgstr "Artigos Recentes" - -#: templates/liiweb/home.html:18 -msgid "View more articles" -msgstr "Ver mais artigos" - -#: templates/peachjam/_header.html:9 -msgid "Judgments" -msgstr "Julgamentos" - -#: templates/peachjam/_header.html:15 -msgid "Legislation" -msgstr "Legislação" - -#: templates/peachjam/_header.html:21 -msgid "Taxonomy" -msgstr "Taxonomia" - -#: templates/peachjam/_header.html:27 -msgid "Articles" -msgstr "Artigos" - -#: templates/peachjam/_header.html:33 -msgid "About" -msgstr "Sobre" - -#: templates/senlii/home.html:4 -msgid "Home" -msgstr "Página inicial" - diff --git a/senlii/locale/sw/LC_MESSAGES/django.mo b/senlii/locale/sw/LC_MESSAGES/django.mo deleted file mode 100644 index 95665f3be98fa1558bdd8b67dece57bbde6620d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1226 zcma))&rTCT9LEPm#1+M0jEUheCLZ)Kw7XP_+w_3Y3bs{37vhafyVKpFyEDzqE~T7I zJa{pl)Cb@ZJoo~>gGasi1U`YkDce87#b5I4XXd-}`3+$bs`f3A_$G0nP#60%w8mfj593fH#3(fF|b|@DA`Ra0&PwX!88X?!SO{;r<7B z4>)%Pq2F*`2Acdcklb({XaN_2rp^PP$@3`tPBIpNrvFmLX2vei#J>ZYdLJ{MW&8$& zvgkJW$jlsO2KY2I6K{4gGP4I`SI>bKfVZ-<=@CX4_GtP?8!ee8XhS8u9Wjk6B8a#S zQB^U~4$-!Z8G4!eLCi#=QJn=`M>OG5pgqK18T29AbXLiS7#m-uuIyQAWokD)K=oAY! zwf0y~s)RIjz=+)WRD$llZ0&1gt^$sJF6uBl-O%HUvzE9s#Bd1Pf=ke zmkNUFR0Jsv81Wd5UEJ)`kVkwhyIA)RYZa@p)2K{3v{&-hrW6S*jd+6|R7%)MlIum3 zixO^!RB4u!_q{4vpS&|wJ4}&^XiJ}qz{Tq=o>;q4s%S*2QpMWEqBp$ivQxt6$MR!= zAC|HGq-4Dzn@aW}mSk)Dk6m4gAv;?xE==VbZNQ8=C0BU_bLC&Od?`%9WnH5Iiho!_rYL4O5+>2JO;_q8f+cnPR8r*r8@E6ulax zaf=F$w$pAJr>Ge+#c39TPbuE!#~jzF;;nT2>au -

{% trans 'Recent Judgments' %}

- {% trans 'View more judgments' as text %} - {% include 'peachjam/_recent_document_list.html' with documents=recent_judgments view_more_text=text view_more_url_name='judgment_list' %} - -
-

{% trans 'Recent Legislation' %}

- {% trans 'View more legislation' as text %} - {% include 'peachjam/_recent_document_list.html' with documents=recent_legislation view_more_text=text view_more_url_name='legislation_list' %} -
-
-

{% trans 'Recent Articles' %}

- {% include 'peachjam/_article_list.html' with articles=recent_articles %} - {% trans "View more articles" %} -
-{% endblock %} -{% block second-column-content %}{% endblock %} diff --git a/senlii/templates/peachjam/_header.html b/senlii/templates/peachjam/_header.html deleted file mode 100644 index f064d5b81..000000000 --- a/senlii/templates/peachjam/_header.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends 'peachjam/_header.html' %} -{% load static i18n %} -{% block top-bar %}{% endblock %} -{% block navbar-logo %}SenLII{% endblock %} -{% block nav-items %} -
  • - - {% trans 'Judgments' %} - -
    • -
  • - - {% trans 'Legislation' %} - -
    • -
  • - - {% trans 'Taxonomy' %} - -
    • -
  • - - {% trans 'Articles' %} - -
    • -
  • - - {% trans 'About' %} - -
    • -{% endblock %} diff --git a/senlii/templates/peachjam/layouts/main.html b/senlii/templates/peachjam/layouts/main.html deleted file mode 100644 index 4ea44bd41..000000000 --- a/senlii/templates/peachjam/layouts/main.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "peachjam/layouts/main.html" %} -{% load sass_tags %} -{% block head-css %} - -{% endblock %} diff --git a/senlii/templates/senlii/home.html b/senlii/templates/senlii/home.html deleted file mode 100644 index f2b1b2ff4..000000000 --- a/senlii/templates/senlii/home.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "liiweb/home.html" %} -{% load static i18n %} -{% block title %} - {% trans 'Home' %} -{% endblock %} diff --git a/senlii/urls.py b/senlii/urls.py deleted file mode 100644 index 7dcce59a5..000000000 --- a/senlii/urls.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.urls import include, path - -from senlii import views - -urlpatterns = [ - path("", views.HomePageView.as_view(), name="home_page"), - path("", include("liiweb.urls")), -] diff --git a/senlii/views/__init__.py b/senlii/views/__init__.py deleted file mode 100644 index 795f5f87d..000000000 --- a/senlii/views/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .home import * # noqa diff --git a/senlii/views/home.py b/senlii/views/home.py deleted file mode 100644 index eb7717c6a..000000000 --- a/senlii/views/home.py +++ /dev/null @@ -1,14 +0,0 @@ -from liiweb.views import HomePageView as BaseHomePageView -from peachjam.models import Article - - -class HomePageView(BaseHomePageView): - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context["recent_articles"] = ( - Article.objects.prefetch_related("topics") - .select_related("author") - .order_by("-date")[:5] - ) - - return context