Merge pull request #10 from juntagrico/1.6

1.6

Author: pascalfree

.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+# This workflow will cookiecut the code and roughly check if the result works.
+
+name: ci
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main, release/** ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      JUNTAGRICO_SECRET_KEY: fake
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+    - name: run cookiecutter
+      run: |
+        pip install cookiecutter
+        cookiecutter . --no-input
+    - name: test run app
+      run: |
+        cd code
+        pip install -r requirements.txt
+        python -m manage collectstatic
+        python -m manage test juntagrico.tests.test_profile

{{cookiecutter.code}}/requirements.txt

@@ -1,3 +1,3 @@
-juntagrico~=1.5.0
+juntagrico~=1.6.0
 gunicorn==22.0.0
-psycopg2==2.8.4
+psycopg>=3.1.8

{{cookiecutter.code}}/{{cookiecutter.project_slug}}/settings.py

@@ -30,11 +30,13 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.admin',
+    '{{cookiecutter.project_slug}}',
     'juntagrico',
+    'fontawesomefree',
+    'import_export',
     'impersonate',
     'crispy_forms',
     'adminsortable2',
-    '{{cookiecutter.project_slug}}',
     'polymorphic',
 ]
 
@@ -126,8 +128,14 @@
 STATIC_URL = 'static/'
 STATIC_ROOT = BASE_DIR / 'static'
 
-STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
-
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
+}
 
 # django.contrib.sites Settings
 
@@ -141,7 +149,7 @@
     'django.contrib.auth.backends.ModelBackend'
 )
 
-LOGIN_REDIRECT_URL = "/my/home"
+LOGIN_REDIRECT_URL = "/"
 
 
 # django.contrib.sessions Settings
@@ -161,6 +169,11 @@
 CRISPY_TEMPLATE_PACK = 'bootstrap4'
 
 
+# import_export Settings
+
+IMPORT_EXPORT_EXPORT_PERMISSION_CODE = 'view'
+
+
 # juntagrico Settings
 
 WHITELIST_EMAILS = []
@@ -192,6 +205,11 @@ def whitelist_email_from_env(var_env_name):
             "ESR" : "{{cookiecutter.ESR}}"}
 SHARE_PRICE = "{{cookiecutter.share_price}}"
 
-INFO_EMAIL = "{{cookiecutter.info_email}}"
-SERVER_URL = "{{cookiecutter.server_url}}"
+CONTACTS = {
+    "general": "{{cookiecutter.info_email}}"
+}
+ORGANISATION_WEBSITE = {
+    'name': "{{cookiecutter.server_url}}",
+    'url': "https://{{cookiecutter.server_url}}"
+}
 STYLES = {'static': ['{{cookiecutter.project_slug}}/css/customize.css']}

{{cookiecutter.code}}/{{cookiecutter.project_slug}}/urls.py

@@ -6,5 +6,4 @@
     path('admin/', admin.site.urls),
     path('impersonate/', include('impersonate.urls')),
     path('', include('juntagrico.urls')),
-    path('', juntagrico.views.home),
 ]