domenk
/
prelom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to make sitemap work, during migrations add blog aswell'

main
Domen Kosmač 2022-12-06 17:45:10 +01:00
parent e5331e09fd
commit 2624e48703
5 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/notesfrombelow/settings.py
View File

@ -52,6 +52,7 @@ INSTALLED_APPS = [
'blog', 'blog',
'uploads', 'uploads',
'notesfrombelow', 'notesfrombelow',
'matomo'
] ]
ADD_REVERSION_ADMIN = True ADD_REVERSION_ADMIN = True
@ -242,14 +243,19 @@ LOGGING = {
} }
EMAIL_HOST = 'smtp.sendgrid.net' EMAIL_HOST = 'kompot.si'
EMAIL_HOST_USER = 'notesfrombelow' EMAIL_HOST_USER = 'prelom'
EMAIL_HOST_PASSWORD = os.environ.get('SENDGRID_PASSWORD') #EMAIL_HOST_PASSWORD = os.environ.get('SENDGRID_PASSWORD')
EMAIL_HOST_PASSWORD = 'jiaReiz7tie6'
EMAIL_PORT = 587 EMAIL_PORT = 587
EMAIL_USE_TLS = True EMAIL_USE_TLS = True
SITE_URL = 'https://prelom.je' SITE_URL = 'https://prelom.je'
ADMINS = [ ADMINS = [
('piskr', 'domenkosmac@gmail.com'), ('piskr', 'domenkosmac@gmail.com'),
] ]
SERVER_EMAIL = 'editors@notesfrombelow.org' SERVER_EMAIL = 'prelom@prelom.je'
FILE_UPLOAD_PERMISSIONS=0o640 FILE_UPLOAD_PERMISSIONS=0o640
# MATOMO analitika
MATOMO_URL = 'https://anal.kompot.si/'
MATOMO_SITE_ID = 2

2
django/notesfrombelow/urls.py
View File

@ -64,5 +64,5 @@ urlpatterns = [
path('tag/<slug:slug>', journal.views.TagView.as_view(), name='tag'), path('tag/<slug:slug>', journal.views.TagView.as_view(), name='tag'),
path('rss/', ArticleFeed()), path('rss/', ArticleFeed()),
path('<slug:slug>', cms.views.PageView.as_view(), name='page'), 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) ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

24
django/templates/base.html
View File

@ -1,14 +1,15 @@
{% extends 'superbase.html' %} {% extends 'superbase.html' %}
{% block meta %} {% block meta %}
<meta property="og:title" content="{% block title %}{% endblock %}"> <meta property="og:title" content="{% block title %}{% endblock %}">
<meta property="og:description" content="{% block description %}{% 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: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:url" content="https://{{ request.get_host }}{{ request.get_full_path }}">
<meta property="og:type" content="{% block pagetype %}website{% endblock %}" /> <meta property="og:type" content="{% block pagetype %}website{% endblock %}" />
<meta property="og:site_name" content="Prelom" /> <meta property="og:site_name" content="Prelom" />
<meta name="twitter:card" content="{% block twittercard %}summary_large_image{% endblock %}" /> <meta name="twitter:card" content="{% block twittercard %}summary_large_image{% endblock %}" />
<meta name="twitter:site" content="Prelom" /> <meta name="twitter:site" content="Prelom" />
{% load matomo_tags %}
{% endblock %} {% endblock %}
{% block body %} {% block body %}
@ -16,7 +17,8 @@
{% block content %} {% block content %}
{% endblock %} {% endblock %}
{% include 'footer.html' %} {% include 'footer.html' %}
<script src="/static/js/jquery.min.js" 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/semantic.min.js" type="text/javascript"></script>
<script src="/static/js/scripts.js?2" type="text/javascript"></script> <script src="/static/js/scripts.js?2" type="text/javascript"></script>
{% tracking_code %}
{% endblock %} {% endblock %}

7
django/templates/superbase.html
View File

@ -3,13 +3,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <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 http-equiv="content-type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="Prelom je spletni časopis" /> <meta name="description" content="Prelom je spletni časopis" />

1
requirements.txt
View File

@ -9,6 +9,7 @@ django-debug-toolbar==1.9.1
django-imagekit==4.0.2 django-imagekit==4.0.2
django-reversion==2.0.13 django-reversion==2.0.13
-e git+https://github.com/jedie/django-reversion-compare.git@a0abed6454708b5c85c4173768589dc951d2e768#egg=django_reversion_compare -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 Fabric3==1.13.1.post1
gunicorn==19.7.1 gunicorn==19.7.1
idna==2.6 idna==2.6