From 2624e487035d0c8c9364ed9adaf3ed970aa59bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Kosma=C4=8D?= <domenk@kompot-produkcija.kompot.si>
Date: Tue, 6 Dec 2022 17:45:10 +0100
Subject: [PATCH] Changes to make sitemap work, during migrations add blog
 aswell'

---
 django/notesfrombelow/settings.py | 14 ++++++++++----
 django/notesfrombelow/urls.py     |  2 +-
 django/templates/base.html        | 24 +++++++++++++-----------
 django/templates/superbase.html   |  7 -------
 requirements.txt                  |  1 +
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/django/notesfrombelow/settings.py b/django/notesfrombelow/settings.py
index 51c1076..fdca09f 100644
--- a/django/notesfrombelow/settings.py
+++ b/django/notesfrombelow/settings.py
@@ -52,6 +52,7 @@ INSTALLED_APPS = [
     'blog',
     'uploads',
     'notesfrombelow',
+    'matomo'
 ]
 ADD_REVERSION_ADMIN = True
 
@@ -242,14 +243,19 @@ LOGGING = {
 }
 
 
-EMAIL_HOST = 'smtp.sendgrid.net'
-EMAIL_HOST_USER = 'notesfrombelow'
-EMAIL_HOST_PASSWORD = os.environ.get('SENDGRID_PASSWORD')
+EMAIL_HOST = 'kompot.si'
+EMAIL_HOST_USER = 'prelom'
+#EMAIL_HOST_PASSWORD = os.environ.get('SENDGRID_PASSWORD')
+EMAIL_HOST_PASSWORD = 'jiaReiz7tie6'
 EMAIL_PORT = 587
 EMAIL_USE_TLS = True
 SITE_URL = 'https://prelom.je'
 ADMINS = [
     ('piskr', 'domenkosmac@gmail.com'),
 ]
-SERVER_EMAIL = 'editors@notesfrombelow.org'
+SERVER_EMAIL = 'prelom@prelom.je'
 FILE_UPLOAD_PERMISSIONS=0o640
+
+# MATOMO analitika
+MATOMO_URL = 'https://anal.kompot.si/'
+MATOMO_SITE_ID = 2
diff --git a/django/notesfrombelow/urls.py b/django/notesfrombelow/urls.py
index c9dec83..f6c6f59 100644
--- a/django/notesfrombelow/urls.py
+++ b/django/notesfrombelow/urls.py
@@ -64,5 +64,5 @@ urlpatterns = [
     path('tag/<slug:slug>', journal.views.TagView.as_view(), name='tag'),
     path('rss/', ArticleFeed()),
     path('<slug:slug>', cms.views.PageView.as_view(), name='page'),
-    path('sitemap.xml', sitemap, {'sitemaps': sitemaps}, name='sitemap'),
+    path('sitemap.xml', sitemap, {'sitemaps': sitemaps}, name='django.contrib.sitemaps.views.sitemap'),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/django/templates/base.html b/django/templates/base.html
index 70f852f..4de0d21 100644
--- a/django/templates/base.html
+++ b/django/templates/base.html
@@ -1,14 +1,15 @@
 {% extends 'superbase.html' %}
 
 {% block meta %}
-<meta property="og:title" content="{% block title %}{% endblock %}">
-<meta property="og:description" content="{% block description %}{% endblock %}">
-<meta property="og:image" content="https://{{ request.get_host }}{% block image %}/static/img/favicon-180x180.png{% endblock %}">
-<meta property="og:url" content="https://{{ request.get_host }}{{ request.get_full_path }}">
-<meta property="og:type" content="{% block pagetype %}website{% endblock %}" />
-<meta property="og:site_name" content="Prelom" />
-<meta name="twitter:card" content="{% block twittercard %}summary_large_image{% endblock %}" />
-<meta name="twitter:site" content="Prelom" />
+  <meta property="og:title" content="{% block title %}{% endblock %}">
+  <meta property="og:description" content="{% block description %}{% endblock %}">
+  <meta property="og:image" content="https://{{ request.get_host }}{% block image %}/static/img/favicon-180x180.png{% endblock %}">
+  <meta property="og:url" content="https://{{ request.get_host }}{{ request.get_full_path }}">
+  <meta property="og:type" content="{% block pagetype %}website{% endblock %}" />
+  <meta property="og:site_name" content="Prelom" />
+  <meta name="twitter:card" content="{% block twittercard %}summary_large_image{% endblock %}" />
+  <meta name="twitter:site" content="Prelom" />
+  {% load matomo_tags %} 
 {% endblock %}
 
 {% block body %}
@@ -16,7 +17,8 @@
 {% block content %}
 {% endblock %}
 {% include 'footer.html' %}
-<script src="/static/js/jquery.min.js" type="text/javascript"></script>
-<script src="/static/js/semantic.min.js" type="text/javascript"></script>
-<script src="/static/js/scripts.js?2" type="text/javascript"></script>
+  <script src="/static/js/jquery.min.js" type="text/javascript"></script>
+  <script src="/static/js/semantic.min.js" type="text/javascript"></script>
+  <script src="/static/js/scripts.js?2" type="text/javascript"></script>
+  {% tracking_code %}
 {% endblock %}
diff --git a/django/templates/superbase.html b/django/templates/superbase.html
index 6d8ffb0..e3c4885 100644
--- a/django/templates/superbase.html
+++ b/django/templates/superbase.html
@@ -3,13 +3,6 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-ETRV6BRQDF"></script>
-    <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('js', new Date());
-    gtag('config', 'G-ETRV6BRQDF');
-    </script>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="Prelom je spletni časopis" />
diff --git a/requirements.txt b/requirements.txt
index 1a100ab..a4787f8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,7 @@ django-debug-toolbar==1.9.1
 django-imagekit==4.0.2
 django-reversion==2.0.13
 -e git+https://github.com/jedie/django-reversion-compare.git@a0abed6454708b5c85c4173768589dc951d2e768#egg=django_reversion_compare
+django-matomo==0.1.6
 Fabric3==1.13.1.post1
 gunicorn==19.7.1
 idna==2.6