From 0cd623e5f493efa0b13d25b6fbd304ef8ad455e4 Mon Sep 17 00:00:00 2001
From: corbreedy <peter.kuntner@uni-bamberg.de>
Date: Wed, 13 Oct 2021 11:02:43 +0200
Subject: [PATCH] favicon DSGVO

---
 README.md                   |  21 ++++++++++++++++++++-
 hpst/static/img/favicon.ico | Bin 0 -> 1406 bytes
 hpst/templates/index.html   |   4 ++--
 hpst/templates/st_base.html |  23 +++++++++++++++++++++--
 sinnestau/settings.py       |   2 ++
 5 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 hpst/static/img/favicon.ico

diff --git a/README.md b/README.md
index 2e392fc..87a2f92 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,26 @@ On django:
 
 	#apt install grub2-common net-tools openssh-server gnupg virtualenv git-core  libmysqlclient-dev gcc python-dev python3-dev
 
-
+	/etc/systemd/system/uwsgi.service
+~~~~
+[Unit]
+Description=uWSGI instance to serve sinnes-tau
+
+[Service]
+User = www-data
+Group = www-data
+#WorkingDirectory=/srv/www/sinnes-tau/server/
+#Environment="PATH=/srv/www/sinnes-tau/server/var/www/flaskapp/venv/bin"
+#ExecStart=/var/www/flaskapp/venv/bin/uwsgi --ini myproject.ini
+
+ExecStartPre=-/usr/bin/bash -c 'mkdir -p /run/uwsgi; chown www-data:www-data /run/uwsgi'
+#ExecStart=/usr/bin/bash -c 'cd /srv/www/sinnes-tau; source venv3/bin/activate; cd server;uwsgi  --socket 127.0.0.1:8081  --wsgi-file sinnestau/wsgi.py  --uid=www-data --gid=www-data'
+ExecStart=/usr/bin/bash -c 'cd /srv/www/sinnes-tau; source venv3/bin/activate; cd server;uwsgi  --socket 127.0.0.1:8081  --wsgi-file sinnestau/wsgi.py'
+[Install]
+WantedBy=multi-user.target
+~~~~
+
+	systemctl daemon-reload
 
 
 Peter Kuntner 2021
diff --git a/hpst/static/img/favicon.ico b/hpst/static/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..761c6f5d57275dda72b4a129ebd16d5c3809d4e3
GIT binary patch
literal 1406
zcmZQzU<5(|0R|w+!H~hqz#zuJz@P!dKp_SNAO?wp0V9M$X8-^HpW)I%Z-#&W{xKM&
zbTSyF_A>nY|Ciy{=@|@$$-N9eo*x5>_b?a&@&BKn7`|Se#bA)!&G7xfCWg=7e=zJi
zb)8|~xmyfx_5?G$UdYPeRX&5^FVM_UFd71*Auu#TfD;HnWd#JV19`ka4C6ytFaaj0
z1dPvs&WGv)%Co_Y0MbCNun?mB0qN#p<AW*?<YWf2xY@WNd=`k2BG6I`q!$EOp)`z-
bLBpIP3RMVG53-$;i=PX@hloIIql^RqtSK?F

literal 0
HcmV?d00001

diff --git a/hpst/templates/index.html b/hpst/templates/index.html
index b60c9a3..d834988 100644
--- a/hpst/templates/index.html
+++ b/hpst/templates/index.html
@@ -204,7 +204,7 @@ Ziel ist eine Anregung zur Selbstreflektion und die Überwindung von Konflikten.
 	  </a>
 	  {% empty %}
 	  <li class="w3-padding-16">
-            <img src="img/lama_f.jpg" alt="Image" class="w3-left w3-margin-right" style="width:50px">
+            <img src="{% static 'img/lama_f.jpg' %}" alt="Image" class="w3-left w3-margin-right" style="width:50px">
             <span class="w3-large">Zur Zeit keine Termin</span>
           </li>
 	  {% endfor %}
@@ -315,7 +315,7 @@ Kronach / Fischbach<br>
         <i class="fa fa-phone fa-fw w3-hover-text-black w3-xlarge w3-margin-right"></i> Phone: 0152/21700463<br>
         <i class="fa fa-envelope fa-fw w3-hover-text-black w3-xlarge w3-margin-right"></i> Email: info@sinnes-tau.de<br>
       </div>
-      <p>Swing by for a cup of <i class="fa fa-coffee"></i>, or leave me a note:</p>
+      <p>Komme auf eine Tasse <i class="fa fa-coffee"></i> vorbei, oder hinterlasse mir eine Nachricht:</p>
       <form action="/action_page.php" target="_blank">
         <div class="w3-row-padding" style="margin:0 -16px 8px -16px">
           <div class="w3-half">
diff --git a/hpst/templates/st_base.html b/hpst/templates/st_base.html
index 2eab2e9..c712c2b 100644
--- a/hpst/templates/st_base.html
+++ b/hpst/templates/st_base.html
@@ -6,10 +6,10 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="{% static 'css/w3.css' %}">
-<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
 <link rel="stylesheet" href="{% static 'css/sinnes-tau.css' %}">
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato">
 <link rel="stylesheet" href="{% static 'css/all.css' %}">
+<link rel="shortcut icon" href="{%  static 'img/favicon.ico' %}">
 <style>
 body,h1,h2,h3,h4,h5,h6 {font-family: "Lato", sans-serif;}
 body, html {
@@ -20,7 +20,7 @@ body, html {
 {% block style %}<!-- Style here -->{% endblock %}
 
 </style>
-
+<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/cookieconsent@3/build/cookieconsent.min.css" />
 <body>
 <!-- Navbar (sit on top) -->
 <div class="w3-top">
@@ -113,6 +113,25 @@ function openCity(evt, cityName) {
   evt.currentTarget.classList.add("w3-light-grey");
 }
     
+</script>
+<script src="https://cdn.jsdelivr.net/npm/cookieconsent@3/build/cookieconsent.min.js" data-cfasync="false"></script>
+<script>
+window.cookieconsent.initialise({
+  "palette": {
+    "popup": {
+      "background": "#9a8b69"
+    },
+    "button": {
+      "background": "#afed71"
+    }
+  },
+  "content": {
+    "message": "Wir benutzen ausschließlich notwendige Cookies für diese Website",
+    "dismiss": "Einverstanden",
+    "link": "Mehr Info",
+    "href": "/impressum"
+  }
+});
 </script>
 
 </body>
diff --git a/sinnestau/settings.py b/sinnestau/settings.py
index 5fc1c38..4dfbc13 100644
--- a/sinnestau/settings.py
+++ b/sinnestau/settings.py
@@ -12,6 +12,7 @@ https://docs.djangoproject.com/en/3.2/ref/settings/
 
 from pathlib import Path
 
+
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -133,3 +134,4 @@ STATIC_ROOT =  str(BASE_DIR.joinpath('build/static'))
 # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+